diff --git a/admin_ai_model.php b/admin/ai_model.php
similarity index 100%
rename from admin_ai_model.php
rename to admin/ai_model.php
diff --git a/admin_ai_provider.php b/admin/ai_provider.php
similarity index 100%
rename from admin_ai_provider.php
rename to admin/ai_provider.php
diff --git a/admin_api.php b/admin/api.php
similarity index 100%
rename from admin_api.php
rename to admin/api.php
diff --git a/admin_app_log.php b/admin/app_log.php
similarity index 100%
rename from admin_app_log.php
rename to admin/app_log.php
diff --git a/admin_audit_log.php b/admin/audit_log.php
similarity index 100%
rename from admin_audit_log.php
rename to admin/audit_log.php
diff --git a/admin_backup.php b/admin/backup.php
similarity index 100%
rename from admin_backup.php
rename to admin/backup.php
diff --git a/admin_category.php b/admin/category.php
similarity index 100%
rename from admin_category.php
rename to admin/category.php
diff --git a/admin_custom_link.php b/admin/custom_link.php
similarity index 100%
rename from admin_custom_link.php
rename to admin/custom_link.php
diff --git a/admin_debug.php b/admin/debug.php
similarity index 100%
rename from admin_debug.php
rename to admin/debug.php
diff --git a/admin_document_template.php b/admin/document_template.php
similarity index 100%
rename from admin_document_template.php
rename to admin/document_template.php
diff --git a/admin_document_template_details.php b/admin/document_template_details.php
similarity index 100%
rename from admin_document_template_details.php
rename to admin/document_template_details.php
diff --git a/admin_identity_provider.php b/admin/identity_provider.php
similarity index 100%
rename from admin_identity_provider.php
rename to admin/identity_provider.php
diff --git a/admin/includes/side_nav.php b/admin/includes/side_nav.php
index 23e8af1a..fe134d33 100644
--- a/admin/includes/side_nav.php
+++ b/admin/includes/side_nav.php
@@ -1,6 +1,6 @@
 <!-- Main Sidebar Container -->
 <aside class="main-sidebar sidebar-dark-<?php echo nullable_htmlentities($config_theme); ?> d-print-none">
-    <a class="brand-link pb-1 mt-1" href="clients.php">
+    <a class="brand-link pb-1 mt-1" href="../">
         <p class="h6">
             <i class="nav-icon fas fa-arrow-left ml-3 mr-2"></i>
             <span class="brand-text">
@@ -28,7 +28,7 @@
                     </a>
                 </li>
                 <li class="nav-item">
-                    <a href="admin_api.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "admin_api.php") {echo "active";} ?>">
+                    <a href="api.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "api.php") {echo "active";} ?>">
                         <i class="nav-icon fas fa-key"></i>
                         <p>API Keys</p>
                     </a>
@@ -36,50 +36,50 @@
                 <li class="nav-header">TAGS & CATEGORIES</li>
 
                 <li class="nav-item">
-                    <a href="admin_tag.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_tag.php' ? 'active' : ''); ?>">
+                    <a href="tag.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'tag.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-tags"></i>
                         <p>Tags</p>
                     </a>
                 </li>
                 <li class="nav-item">
-                    <a href="admin_category.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_category.php' ? 'active' : ''); ?>">
+                    <a href="category.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'category.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-list-ul"></i>
                         <p>Categories</p>
                     </a>
                 </li>
                 <?php if ($config_module_enable_accounting) { ?>
                     <li class="nav-item">
-                        <a href="admin_tax.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_tax.php' ? 'active' : ''); ?>">
+                        <a href="tax.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'tax.php' ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-balance-scale"></i>
                             <p>Taxes</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="admin_payment_method.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_payment_method.php' ? 'active' : ''); ?>">
+                        <a href="payment_method.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'payment_method.php' ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-hand-holding-usd"></i>
                             <p>Payment Methods</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="admin_payment_provider.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_payment_provider.php' ? 'active' : ''); ?>">
+                        <a href="payment_provider.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'payment_provider.php' ? 'active' : ''); ?>">
                             <i class="nav-icon far fa-credit-card"></i>
                             <p>Payment Providers</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="admin_saved_payment_method.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_saved_payment_method.php' ? 'active' : ''); ?>">
+                        <a href="saved_payment_method.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'saved_payment_method.php' ? 'active' : ''); ?>">
                             <i class="nav-icon far fa-credit-card"></i>
                             <p>Saved Payments</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="admin_ai_provider.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_ai_provider.php' ? 'active' : ''); ?>">
+                        <a href="ai_provider.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'ai_provider.php' ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-robot"></i>
                             <p>AI Providers</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="admin_ai_model.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_ai_model.php' ? 'active' : ''); ?>">
+                        <a href="ai_model.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'ai_model.php' ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-robot"></i>
                             <p>AI Models</p>
                         </a>
@@ -87,14 +87,14 @@
                 <?php } ?>
                 <?php if ($config_module_enable_ticketing) { ?>
                     <li class="nav-item">
-                        <a href="admin_ticket_status.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_ticket_status.php' ? 'active' : ''); ?>">
+                        <a href="ticket_status.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'ticket_status.php' ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-info-circle"></i>
                             <p>Ticket Statuses</p>
                         </a>
                     </li>
                 <?php } ?>
                 <li class="nav-item">
-                    <a href="admin_custom_link.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_custom_link.php' ? 'active' : ''); ?>">
+                    <a href="custom_link.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'custom_link.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-external-link-alt"></i>
                         <p>Custom Links</p>
                     </a>
@@ -104,31 +104,31 @@
                     <li class="nav-header">TEMPLATES</li>
 
                     <li class="nav-item">
-                        <a href="admin_project_template.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['admin_project_template.php', 'admin_project_template_details.php']) ? 'active' : ''); ?>">
+                        <a href="project_template.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['project_template.php', 'project_template_details.php']) ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-project-diagram"></i>
                             <p>Project Templates</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="admin_ticket_template.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['admin_ticket_template.php', 'admin_ticket_template_details.php']) ? 'active' : ''); ?>">
+                        <a href="ticket_template.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['ticket_template.php', 'ticket_template_details.php']) ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>Ticket Templates</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="admin_vendor_template.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_vendor_template.php' ? 'active' : ''); ?>">
+                        <a href="vendor_template.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'vendor_template.php' ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-building"></i>
                             <p>Vendor Templates</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="admin_software_template.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_software_template.php' ? 'active' : ''); ?>">
+                        <a href="software_template.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'software_template.php' ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-rocket"></i>
                             <p>License Templates</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="admin_document_template.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['admin_document_template.php', 'admin_document_template_details.php']) ? 'active' : ''); ?>">
+                        <a href="document_template.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['document_template.php', 'document_template_details.php']) ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-file"></i>
                             <p>Document Templates</p>
                         </a>
@@ -138,44 +138,44 @@
                 <li class="nav-header">MAINTENANCE</li>
 
                 <li class="nav-item">
-                    <a href="admin_mail_queue.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_mail_queue.php' ? 'active' : ''); ?>">
+                    <a href="mail_queue.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'mail_queue.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-mail-bulk"></i>
                         <p>Mail Queue</p>
                     </a>
                 </li>
                 <li class="nav-item">
-                    <a href="admin_audit_log.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_audit_log.php' ? 'active' : ''); ?>">
+                    <a href="audit_log.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'audit_log.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-history"></i>
                         <p>Audit Logs</p>
                     </a>
                 </li>
                 <li class="nav-item">
-                    <a href="admin_app_log.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_app_log.php' ? 'active' : ''); ?>">
+                    <a href="app_log.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'app_log.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-history"></i>
                         <p>App Logs</p>
                     </a>
                 </li>
                 <li class="nav-item">
-                    <a href="admin_backup.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_backup.php' ? 'active' : ''); ?>">
+                    <a href="backup.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'backup.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-cloud-upload-alt"></i>
                         <p>Backup</p>
                     </a>
                 </li>
                 <li class="nav-item">
-                    <a href="admin_debug.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_debug.php' ? 'active' : ''); ?>">
+                    <a href="debug.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'debug.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-bug"></i>
                         <p>Debug</p>
                     </a>
                 </li>
                 <li class="nav-item">
-                    <a href="admin_update.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_update.php' ? 'active' : ''); ?>">
+                    <a href="update.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'update.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-download"></i>
                         <p>Update</p>
                     </a>
                 </li>
 
                 <!-- SETTINGS Section -->
-                <li class="nav-item has-treeview mt-2 <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['admin_settings_company.php', 'admin_settings_localization.php', 'admin_settings_theme.php', 'admin_settings_security.php', 'admin_settings_mail.php', 'admin_settings_notification.php', 'admin_settings_default.php', 'admin_settings_invoice.php', 'admin_settings_quote.php', 'admin_settings_online_payment.php', 'admin_settings_online_payment_clients.php', 'admin_settings_project.php', 'admin_settings_ticket.php', 'admin_settings_ai.php', 'admin_identity_provider.php', 'admin_settings_telemetry.php', 'admin_settings_module.php']) ? 'menu-open' : ''); ?>">
+                <li class="nav-item has-treeview mt-2 <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['settings_company.php', 'settings_localization.php', 'settings_theme.php', 'settings_security.php', 'settings_mail.php', 'settings_notification.php', 'settings_default.php', 'settings_invoice.php', 'settings_quote.php', 'settings_online_payment.php', 'settings_online_payment_clients.php', 'settings_project.php', 'settings_ticket.php', 'settings_ai.php', 'identity_provider.php', 'settings_telemetry.php', 'settings_module.php']) ? 'menu-open' : ''); ?>">
                     <a href="#" class="nav-link">
                         <p>
                             SETTINGS
@@ -184,69 +184,69 @@
                     </a>
                     <ul class="nav nav-treeview">
                         <li class="nav-item">
-                            <a href="admin_settings_company.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_company.php' ? 'active' : ''); ?>">
+                            <a href="settings_company.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_company.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fa fa-briefcase"></i>
                                 <p>Company Details</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="admin_settings_localization.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_localization.php' ? 'active' : ''); ?>">
+                            <a href="settings_localization.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_localization.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fa fa-globe"></i>
                                 <p>Localization</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="admin_settings_theme.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_theme.php' ? 'active' : ''); ?>">
+                            <a href="settings_theme.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_theme.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fa fa-paint-brush"></i>
                                 <p>Theme</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="admin_settings_security.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_security.php' ? 'active' : ''); ?>">
+                            <a href="settings_security.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_security.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fas fa-shield-alt"></i>
                                 <p>Security</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="admin_settings_mail.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_mail.php' ? 'active' : ''); ?>">
+                            <a href="settings_mail.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_mail.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon far fa-envelope"></i>
                                 <p>Mail</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="admin_settings_notification.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_notification.php' ? 'active' : ''); ?>">
+                            <a href="settings_notification.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_notification.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon far fa-bell"></i>
                                 <p>Notifications</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="admin_settings_default.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_default.php' ? 'active' : ''); ?>">
+                            <a href="settings_default.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_default.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fas fa-cogs"></i>
                                 <p>Defaults</p>
                             </a>
                         </li>
                         <?php if ($config_module_enable_accounting) { ?>
                             <li class="nav-item">
-                                <a href="admin_settings_invoice.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_invoice.php' ? 'active' : ''); ?>">
+                                <a href="settings_invoice.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_invoice.php' ? 'active' : ''); ?>">
                                     <i class="nav-icon fas fa-file-invoice"></i>
                                     <p>Invoice</p>
                                 </a>
                             </li>
                             <li class="nav-item">
-                                <a href="admin_settings_quote.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_quote.php' ? 'active' : ''); ?>">
+                                <a href="settings_quote.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_quote.php' ? 'active' : ''); ?>">
                                     <i class="nav-icon fas fa-comment-dollar"></i>
                                     <p>Quote</p>
                                 </a>
                             </li>
                             <li class="nav-item">
-                                <a href="admin_settings_online_payment.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_online_payment.php' ? 'active' : ''); ?>">
+                                <a href="settings_online_payment.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_online_payment.php' ? 'active' : ''); ?>">
                                     <i class="nav-icon far fa-credit-card"></i>
                                     <p>Online Payment</p>
                                 </a>
                             </li>
                             <?php if ($config_stripe_enable) { ?>
                                 <li class="nav-item">
-                                    <a href="admin_settings_online_payment_clients.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_online_payment_clients.php' ? 'active' : ''); ?>">
+                                    <a href="settings_online_payment_clients.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_online_payment_clients.php' ? 'active' : ''); ?>">
                                         <i class="nav-icon far fa-credit-card"></i>
                                         <p>Payment/Stripe Clients</p>
                                     </a>
@@ -255,20 +255,20 @@
                         <?php } ?>
                         <?php if ($config_module_enable_ticketing) { ?>
                             <li class="nav-item">
-                                <a href="admin_settings_project.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_project.php' ? 'active' : ''); ?>">
+                                <a href="settings_project.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_project.php' ? 'active' : ''); ?>">
                                     <i class="nav-icon fas fa-project-diagram"></i>
                                     <p>Project</p>
                                 </a>
                             </li>
                             <li class="nav-item">
-                                <a href="admin_settings_ticket.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_ticket.php' ? 'active' : ''); ?>">
+                                <a href="settings_ticket.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_ticket.php' ? 'active' : ''); ?>">
                                     <i class="nav-icon fas fa-life-ring"></i>
                                     <p>Ticket</p>
                                 </a>
                             </li>
                         <?php } ?>
                         <li class="nav-item">
-                            <a href="admin_settings_ai.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_ai.php' ? 'active' : ''); ?>">
+                            <a href="settings_ai.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_ai.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fas fa-robot"></i>
                                 <p>AI</p>
                             </a>
@@ -276,20 +276,20 @@
                         <!-- Currently the only integration is the client portal SSO -->
                         <?php if ($config_client_portal_enable) { ?>
                             <li class="nav-item">
-                                <a href="admin_identity_provider.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_identity_provider.php' ? 'active' : ''); ?>">
+                                <a href="identity_provider.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'identity_provider.php' ? 'active' : ''); ?>">
                                     <i class="nav-icon fas fa-fingerprint"></i>
                                     <p>Identity Provider</p>
                                 </a>
                             </li>
                         <?php } ?>
                         <li class="nav-item">
-                            <a href="admin_settings_telemetry.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_telemetry.php' ? 'active' : ''); ?>">
+                            <a href="settings_telemetry.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_telemetry.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fas fa-satellite-dish"></i>
                                 <p>Telemetry</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="admin_settings_module.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_module.php' ? 'active' : ''); ?>">
+                            <a href="settings_module.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_module.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fas fa-cube"></i>
                                 <p>Modules</p>
                             </a>
diff --git a/admin/index.php b/admin/index.php
new file mode 100644
index 00000000..f30c404d
--- /dev/null
+++ b/admin/index.php
@@ -0,0 +1,4 @@
+<?php
+
+header('Location: users.php');
+
diff --git a/admin_mail_queue.php b/admin/mail_queue.php
similarity index 100%
rename from admin_mail_queue.php
rename to admin/mail_queue.php
diff --git a/admin/modals/users/user_add.php b/admin/modals/users/user_add.php
index cc2ac9d4..9945a08e 100644
--- a/admin/modals/users/user_add.php
+++ b/admin/modals/users/user_add.php
@@ -7,7 +7,7 @@
                     <span>&times;</span>
                 </button>
             </div>
-            <form action="post/user.php" method="post" enctype="multipart/form-data" autocomplete="off">
+            <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
                 <div class="modal-body bg-white">
 
diff --git a/admin_payment_method.php b/admin/payment_method.php
similarity index 100%
rename from admin_payment_method.php
rename to admin/payment_method.php
diff --git a/admin_payment_provider.php b/admin/payment_provider.php
similarity index 100%
rename from admin_payment_provider.php
rename to admin/payment_provider.php
diff --git a/admin/post.php b/admin/post.php
new file mode 100644
index 00000000..d845b57f
--- /dev/null
+++ b/admin/post.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * ITFlow - Admin GET/POST request handler
+ */
+
+require_once "../config.php";
+require_once "../functions.php";
+require_once "../includes/check_login.php";
+
+// Define a variable that we can use to only allow running post files via inclusion (prevents people/bots poking them)
+define('FROM_POST_HANDLER', true);
+
+// Determine which files we should load
+
+// Parse URL & get the path
+$path = parse_url($_SERVER['HTTP_REFERER'], PHP_URL_PATH);
+
+// Get the base name (the page name)
+$module = explode(".", basename($path))[0];
+
+// Strip off any _details bits
+$module = str_ireplace('_details', '', $module);
+
+// Dynamically load admin-related module POST logic
+if (isset($session_is_admin) && $session_is_admin) {
+    // As (almost) every admin setting is only changed from 1 page, we can dynamically load the relevant logic inside this single admin check IF statement
+    //  To add a new admin POST request handler, add a file named after the admin page
+    //    e.g. changes made on the page http://itflow/admin_ticket_statues.php will load the page post/admin/admin_ticket_statues.php to handle the changes
+
+    include_once "post/$module.php";
+    
+}
diff --git a/post/admin/admin_ai_model.php b/admin/post/ai_model.php
similarity index 100%
rename from post/admin/admin_ai_model.php
rename to admin/post/ai_model.php
diff --git a/post/admin/admin_ai_provider.php b/admin/post/ai_provider.php
similarity index 100%
rename from post/admin/admin_ai_provider.php
rename to admin/post/ai_provider.php
diff --git a/post/admin/admin_api.php b/admin/post/api.php
similarity index 100%
rename from post/admin/admin_api.php
rename to admin/post/api.php
diff --git a/post/admin/admin_backup.php b/admin/post/backup.php
similarity index 100%
rename from post/admin/admin_backup.php
rename to admin/post/backup.php
diff --git a/post/admin/admin_category.php b/admin/post/category.php
similarity index 100%
rename from post/admin/admin_category.php
rename to admin/post/category.php
diff --git a/post/user/category_model.php b/admin/post/category_model.php
similarity index 100%
rename from post/user/category_model.php
rename to admin/post/category_model.php
diff --git a/post/admin/admin_custom_field.php b/admin/post/custom_field.php
similarity index 100%
rename from post/admin/admin_custom_field.php
rename to admin/post/custom_field.php
diff --git a/post/admin/admin_custom_field_model.php b/admin/post/custom_field_model.php
similarity index 100%
rename from post/admin/admin_custom_field_model.php
rename to admin/post/custom_field_model.php
diff --git a/post/admin/admin_custom_link.php b/admin/post/custom_link.php
similarity index 100%
rename from post/admin/admin_custom_link.php
rename to admin/post/custom_link.php
diff --git a/post/admin/admin_document_template.php b/admin/post/document_template.php
similarity index 100%
rename from post/admin/admin_document_template.php
rename to admin/post/document_template.php
diff --git a/post/admin/admin_identity_provider.php b/admin/post/identity_provider.php
similarity index 100%
rename from post/admin/admin_identity_provider.php
rename to admin/post/identity_provider.php
diff --git a/post/admin/admin_mail_queue.php b/admin/post/mail_queue.php
similarity index 100%
rename from post/admin/admin_mail_queue.php
rename to admin/post/mail_queue.php
diff --git a/post/admin/admin_payment_method.php b/admin/post/payment_method.php
similarity index 100%
rename from post/admin/admin_payment_method.php
rename to admin/post/payment_method.php
diff --git a/post/admin/admin_payment_provider.php b/admin/post/payment_provider.php
similarity index 100%
rename from post/admin/admin_payment_provider.php
rename to admin/post/payment_provider.php
diff --git a/post/admin/admin_project_template.php b/admin/post/project_template.php
similarity index 100%
rename from post/admin/admin_project_template.php
rename to admin/post/project_template.php
diff --git a/post/admin/admin_saved_payment_method.php b/admin/post/saved_payment_method.php
similarity index 100%
rename from post/admin/admin_saved_payment_method.php
rename to admin/post/saved_payment_method.php
diff --git a/post/admin/admin_settings_ai.php b/admin/post/settings_ai.php
similarity index 100%
rename from post/admin/admin_settings_ai.php
rename to admin/post/settings_ai.php
diff --git a/post/admin/admin_settings_company.php b/admin/post/settings_company.php
similarity index 100%
rename from post/admin/admin_settings_company.php
rename to admin/post/settings_company.php
diff --git a/post/admin/admin_settings_default.php b/admin/post/settings_default.php
similarity index 100%
rename from post/admin/admin_settings_default.php
rename to admin/post/settings_default.php
diff --git a/post/admin/admin_settings_invoice.php b/admin/post/settings_invoice.php
similarity index 100%
rename from post/admin/admin_settings_invoice.php
rename to admin/post/settings_invoice.php
diff --git a/post/admin/admin_settings_localization.php b/admin/post/settings_localization.php
similarity index 100%
rename from post/admin/admin_settings_localization.php
rename to admin/post/settings_localization.php
diff --git a/post/admin/admin_settings_mail.php b/admin/post/settings_mail.php
similarity index 100%
rename from post/admin/admin_settings_mail.php
rename to admin/post/settings_mail.php
diff --git a/post/admin/admin_settings_module.php b/admin/post/settings_module.php
similarity index 100%
rename from post/admin/admin_settings_module.php
rename to admin/post/settings_module.php
diff --git a/post/admin/admin_settings_notification.php b/admin/post/settings_notification.php
similarity index 100%
rename from post/admin/admin_settings_notification.php
rename to admin/post/settings_notification.php
diff --git a/post/admin/admin_settings_online_payment.php b/admin/post/settings_online_payment.php
similarity index 100%
rename from post/admin/admin_settings_online_payment.php
rename to admin/post/settings_online_payment.php
diff --git a/post/admin/admin_settings_online_payment_clients.php b/admin/post/settings_online_payment_clients.php
similarity index 100%
rename from post/admin/admin_settings_online_payment_clients.php
rename to admin/post/settings_online_payment_clients.php
diff --git a/post/admin/admin_settings_project.php b/admin/post/settings_project.php
similarity index 100%
rename from post/admin/admin_settings_project.php
rename to admin/post/settings_project.php
diff --git a/post/admin/admin_settings_quote.php b/admin/post/settings_quote.php
similarity index 100%
rename from post/admin/admin_settings_quote.php
rename to admin/post/settings_quote.php
diff --git a/post/admin/admin_settings_security.php b/admin/post/settings_security.php
similarity index 100%
rename from post/admin/admin_settings_security.php
rename to admin/post/settings_security.php
diff --git a/post/admin/admin_settings_telemetry.php b/admin/post/settings_telemetry.php
similarity index 100%
rename from post/admin/admin_settings_telemetry.php
rename to admin/post/settings_telemetry.php
diff --git a/post/admin/admin_settings_theme.php b/admin/post/settings_theme.php
similarity index 100%
rename from post/admin/admin_settings_theme.php
rename to admin/post/settings_theme.php
diff --git a/post/admin/admin_settings_ticket.php b/admin/post/settings_ticket.php
similarity index 100%
rename from post/admin/admin_settings_ticket.php
rename to admin/post/settings_ticket.php
diff --git a/post/admin/admin_software_template.php b/admin/post/software_template.php
similarity index 100%
rename from post/admin/admin_software_template.php
rename to admin/post/software_template.php
diff --git a/post/admin/admin_tag.php b/admin/post/tag.php
similarity index 100%
rename from post/admin/admin_tag.php
rename to admin/post/tag.php
diff --git a/post/user/tag_model.php b/admin/post/tag_model.php
similarity index 100%
rename from post/user/tag_model.php
rename to admin/post/tag_model.php
diff --git a/post/admin/admin_tax.php b/admin/post/tax.php
similarity index 100%
rename from post/admin/admin_tax.php
rename to admin/post/tax.php
diff --git a/post/admin/admin_ticket_status.php b/admin/post/ticket_status.php
similarity index 100%
rename from post/admin/admin_ticket_status.php
rename to admin/post/ticket_status.php
diff --git a/post/admin/admin_ticket_template.php b/admin/post/ticket_template.php
similarity index 100%
rename from post/admin/admin_ticket_template.php
rename to admin/post/ticket_template.php
diff --git a/post/admin/admin_update.php b/admin/post/update.php
similarity index 100%
rename from post/admin/admin_update.php
rename to admin/post/update.php
diff --git a/admin/post/user_model.php b/admin/post/user_model.php
index ad331c06..6174cfc7 100644
--- a/admin/post/user_model.php
+++ b/admin/post/user_model.php
@@ -1,5 +1,7 @@
 <?php
 
+defined('FROM_POST_HANDLER') || die("Direct file access is not allowed");
+
 $name = sanitizeInput($_POST['name']);
 $email = sanitizeInput($_POST['email']);
 $role = intval($_POST['role']);
diff --git a/admin/post/user.php b/admin/post/users.php
similarity index 99%
rename from admin/post/user.php
rename to admin/post/users.php
index 00a42595..4e2f433f 100644
--- a/admin/post/user.php
+++ b/admin/post/users.php
@@ -4,9 +4,7 @@
  * ITFlow - GET/POST request handler for user (agent) management
  */
 
-require_once "../../config.php";
-require_once "../../functions.php";
-require_once "../../includes/check_login.php";
+defined('FROM_POST_HANDLER') || die("Direct file access is not allowed");
 
 if (isset($_POST['add_user'])) {
 
diff --git a/post/admin/admin_vendor_template.php b/admin/post/vendor_template.php
similarity index 100%
rename from post/admin/admin_vendor_template.php
rename to admin/post/vendor_template.php
diff --git a/admin_project_template.php b/admin/project_template.php
similarity index 100%
rename from admin_project_template.php
rename to admin/project_template.php
diff --git a/admin_project_template_details.php b/admin/project_template_details.php
similarity index 100%
rename from admin_project_template_details.php
rename to admin/project_template_details.php
diff --git a/admin_saved_payment_method.php b/admin/saved_payment_method.php
similarity index 100%
rename from admin_saved_payment_method.php
rename to admin/saved_payment_method.php
diff --git a/admin_settings_ai.php b/admin/settings_ai.php
similarity index 100%
rename from admin_settings_ai.php
rename to admin/settings_ai.php
diff --git a/admin_settings_company.php b/admin/settings_company.php
similarity index 100%
rename from admin_settings_company.php
rename to admin/settings_company.php
diff --git a/admin_settings_custom_fields.php b/admin/settings_custom_fields.php
similarity index 100%
rename from admin_settings_custom_fields.php
rename to admin/settings_custom_fields.php
diff --git a/admin_settings_default.php b/admin/settings_default.php
similarity index 100%
rename from admin_settings_default.php
rename to admin/settings_default.php
diff --git a/admin_settings_invoice.php b/admin/settings_invoice.php
similarity index 100%
rename from admin_settings_invoice.php
rename to admin/settings_invoice.php
diff --git a/admin_settings_localization.php b/admin/settings_localization.php
similarity index 100%
rename from admin_settings_localization.php
rename to admin/settings_localization.php
diff --git a/admin_settings_mail.php b/admin/settings_mail.php
similarity index 100%
rename from admin_settings_mail.php
rename to admin/settings_mail.php
diff --git a/admin_settings_module.php b/admin/settings_module.php
similarity index 100%
rename from admin_settings_module.php
rename to admin/settings_module.php
diff --git a/admin_settings_notification.php b/admin/settings_notification.php
similarity index 100%
rename from admin_settings_notification.php
rename to admin/settings_notification.php
diff --git a/admin_settings_online_payment.php b/admin/settings_online_payment.php
similarity index 100%
rename from admin_settings_online_payment.php
rename to admin/settings_online_payment.php
diff --git a/admin_settings_online_payment_clients.php b/admin/settings_online_payment_clients.php
similarity index 100%
rename from admin_settings_online_payment_clients.php
rename to admin/settings_online_payment_clients.php
diff --git a/admin_settings_project.php b/admin/settings_project.php
similarity index 100%
rename from admin_settings_project.php
rename to admin/settings_project.php
diff --git a/admin_settings_quote.php b/admin/settings_quote.php
similarity index 100%
rename from admin_settings_quote.php
rename to admin/settings_quote.php
diff --git a/admin_settings_security.php b/admin/settings_security.php
similarity index 100%
rename from admin_settings_security.php
rename to admin/settings_security.php
diff --git a/admin_settings_telemetry.php b/admin/settings_telemetry.php
similarity index 100%
rename from admin_settings_telemetry.php
rename to admin/settings_telemetry.php
diff --git a/admin_settings_theme.php b/admin/settings_theme.php
similarity index 100%
rename from admin_settings_theme.php
rename to admin/settings_theme.php
diff --git a/admin_settings_ticket.php b/admin/settings_ticket.php
similarity index 100%
rename from admin_settings_ticket.php
rename to admin/settings_ticket.php
diff --git a/admin_software_template.php b/admin/software_template.php
similarity index 100%
rename from admin_software_template.php
rename to admin/software_template.php
diff --git a/admin_tag.php b/admin/tag.php
similarity index 100%
rename from admin_tag.php
rename to admin/tag.php
diff --git a/admin_tax.php b/admin/tax.php
similarity index 100%
rename from admin_tax.php
rename to admin/tax.php
diff --git a/admin_ticket_status.php b/admin/ticket_status.php
similarity index 100%
rename from admin_ticket_status.php
rename to admin/ticket_status.php
diff --git a/admin_ticket_template.php b/admin/ticket_template.php
similarity index 100%
rename from admin_ticket_template.php
rename to admin/ticket_template.php
diff --git a/admin_ticket_template_details.php b/admin/ticket_template_details.php
similarity index 100%
rename from admin_ticket_template_details.php
rename to admin/ticket_template_details.php
diff --git a/admin_update.php b/admin/update.php
similarity index 100%
rename from admin_update.php
rename to admin/update.php
diff --git a/admin_vendor_template.php b/admin/vendor_template.php
similarity index 100%
rename from admin_vendor_template.php
rename to admin/vendor_template.php
diff --git a/includes/admin_side_nav.php b/includes/admin_side_nav.php
deleted file mode 100644
index de8a97a2..00000000
--- a/includes/admin_side_nav.php
+++ /dev/null
@@ -1,305 +0,0 @@
-<!-- Main Sidebar Container -->
-<aside class="main-sidebar sidebar-dark-<?php echo nullable_htmlentities($config_theme); ?> d-print-none">
-    <a class="brand-link pb-1 mt-1" href="clients.php">
-        <p class="h6">
-            <i class="nav-icon fas fa-arrow-left ml-3 mr-2"></i>
-            <span class="brand-text">
-                Back | <strong>Administration</strong>
-            </span>
-        </p>
-    </a>
-
-    <!-- Sidebar -->
-    <div class="sidebar">
-        <!-- Sidebar Menu -->
-        <nav>
-            <ul class="nav nav-pills nav-sidebar flex-column mt-2" data-widget="treeview" data-accordion="false">
-                <!-- ACCESS Section -->
-                <li class="nav-item">
-                    <a href="admin_user.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "admin_user.php") {echo "active";} ?>">
-                        <i class="nav-icon fas fa-users"></i>
-                        <p>Users</p>
-                    </a>
-                </li>
-                <li class="nav-item">
-                    <a href="admin_role.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "admin_role.php") {echo "active";} ?>">
-                        <i class="nav-icon fas fa-user-shield"></i>
-                        <p>Roles</p>
-                    </a>
-                </li>
-                <li class="nav-item">
-                    <a href="admin_api.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "admin_api.php") {echo "active";} ?>">
-                        <i class="nav-icon fas fa-key"></i>
-                        <p>API Keys</p>
-                    </a>
-                </li>
-                <li class="nav-header">TAGS & CATEGORIES</li>
-
-                <li class="nav-item">
-                    <a href="admin_tag.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_tag.php' ? 'active' : ''); ?>">
-                        <i class="nav-icon fas fa-tags"></i>
-                        <p>Tags</p>
-                    </a>
-                </li>
-                <li class="nav-item">
-                    <a href="admin_category.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_category.php' ? 'active' : ''); ?>">
-                        <i class="nav-icon fas fa-list-ul"></i>
-                        <p>Categories</p>
-                    </a>
-                </li>
-                <?php if ($config_module_enable_accounting) { ?>
-                    <li class="nav-item">
-                        <a href="admin_tax.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_tax.php' ? 'active' : ''); ?>">
-                            <i class="nav-icon fas fa-balance-scale"></i>
-                            <p>Taxes</p>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="admin_payment_method.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_payment_method.php' ? 'active' : ''); ?>">
-                            <i class="nav-icon fas fa-hand-holding-usd"></i>
-                            <p>Payment Methods</p>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="admin_payment_provider.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_payment_provider.php' ? 'active' : ''); ?>">
-                            <i class="nav-icon far fa-credit-card"></i>
-                            <p>Payment Providers</p>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="admin_saved_payment_method.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_saved_payment_method.php' ? 'active' : ''); ?>">
-                            <i class="nav-icon far fa-credit-card"></i>
-                            <p>Saved Payments</p>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="admin_ai_provider.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_ai_provider.php' ? 'active' : ''); ?>">
-                            <i class="nav-icon fas fa-robot"></i>
-                            <p>AI Providers</p>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="admin_ai_model.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_ai_model.php' ? 'active' : ''); ?>">
-                            <i class="nav-icon fas fa-robot"></i>
-                            <p>AI Models</p>
-                        </a>
-                    </li>
-                <?php } ?>
-                <?php if ($config_module_enable_ticketing) { ?>
-                    <li class="nav-item">
-                        <a href="admin_ticket_status.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_ticket_status.php' ? 'active' : ''); ?>">
-                            <i class="nav-icon fas fa-info-circle"></i>
-                            <p>Ticket Statuses</p>
-                        </a>
-                    </li>
-                <?php } ?>
-                <li class="nav-item">
-                    <a href="admin_custom_link.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_custom_link.php' ? 'active' : ''); ?>">
-                        <i class="nav-icon fas fa-external-link-alt"></i>
-                        <p>Custom Links</p>
-                    </a>
-                </li>
-
-                <?php if ($config_module_enable_itdoc) { ?>
-                    <li class="nav-header">TEMPLATES</li>
-
-                    <li class="nav-item">
-                        <a href="admin_project_template.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['admin_project_template.php', 'admin_project_template_details.php']) ? 'active' : ''); ?>">
-                            <i class="nav-icon fas fa-project-diagram"></i>
-                            <p>Project Templates</p>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="admin_ticket_template.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['admin_ticket_template.php', 'admin_ticket_template_details.php']) ? 'active' : ''); ?>">
-                            <i class="nav-icon fas fa-life-ring"></i>
-                            <p>Ticket Templates</p>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="admin_vendor_template.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_vendor_template.php' ? 'active' : ''); ?>">
-                            <i class="nav-icon fas fa-building"></i>
-                            <p>Vendor Templates</p>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="admin_software_template.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_software_template.php' ? 'active' : ''); ?>">
-                            <i class="nav-icon fas fa-rocket"></i>
-                            <p>License Templates</p>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="admin_document_template.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['admin_document_template.php', 'admin_document_template_details.php']) ? 'active' : ''); ?>">
-                            <i class="nav-icon fas fa-file"></i>
-                            <p>Document Templates</p>
-                        </a>
-                    </li>
-                <?php } ?>
-
-                <li class="nav-header">MAINTENANCE</li>
-
-                <li class="nav-item">
-                    <a href="admin_mail_queue.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_mail_queue.php' ? 'active' : ''); ?>">
-                        <i class="nav-icon fas fa-mail-bulk"></i>
-                        <p>Mail Queue</p>
-                    </a>
-                </li>
-                <li class="nav-item">
-                    <a href="admin_audit_log.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_audit_log.php' ? 'active' : ''); ?>">
-                        <i class="nav-icon fas fa-history"></i>
-                        <p>Audit Logs</p>
-                    </a>
-                </li>
-                <li class="nav-item">
-                    <a href="admin_app_log.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_app_log.php' ? 'active' : ''); ?>">
-                        <i class="nav-icon fas fa-history"></i>
-                        <p>App Logs</p>
-                    </a>
-                </li>
-                <li class="nav-item">
-                    <a href="admin_backup.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_backup.php' ? 'active' : ''); ?>">
-                        <i class="nav-icon fas fa-cloud-upload-alt"></i>
-                        <p>Backup</p>
-                    </a>
-                </li>
-                <li class="nav-item">
-                    <a href="admin_debug.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_debug.php' ? 'active' : ''); ?>">
-                        <i class="nav-icon fas fa-bug"></i>
-                        <p>Debug</p>
-                    </a>
-                </li>
-                <li class="nav-item">
-                    <a href="admin_update.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_update.php' ? 'active' : ''); ?>">
-                        <i class="nav-icon fas fa-download"></i>
-                        <p>Update</p>
-                    </a>
-                </li>
-
-                <!-- SETTINGS Section -->
-                <li class="nav-item has-treeview mt-2 <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['admin_settings_company.php', 'admin_settings_localization.php', 'admin_settings_theme.php', 'admin_settings_security.php', 'admin_settings_mail.php', 'admin_settings_notification.php', 'admin_settings_default.php', 'admin_settings_invoice.php', 'admin_settings_quote.php', 'admin_settings_online_payment.php', 'admin_settings_online_payment_clients.php', 'admin_settings_project.php', 'admin_settings_ticket.php', 'admin_settings_ai.php', 'admin_identity_provider.php', 'admin_settings_telemetry.php', 'admin_settings_module.php']) ? 'menu-open' : ''); ?>">
-                    <a href="#" class="nav-link">
-                        <p>
-                            SETTINGS
-                            <i class="right fas fa-angle-left"></i>
-                        </p>
-                    </a>
-                    <ul class="nav nav-treeview">
-                        <li class="nav-item">
-                            <a href="admin_settings_company.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_company.php' ? 'active' : ''); ?>">
-                                <i class="nav-icon fa fa-briefcase"></i>
-                                <p>Company Details</p>
-                            </a>
-                        </li>
-                        <li class="nav-item">
-                            <a href="admin_settings_localization.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_localization.php' ? 'active' : ''); ?>">
-                                <i class="nav-icon fa fa-globe"></i>
-                                <p>Localization</p>
-                            </a>
-                        </li>
-                        <li class="nav-item">
-                            <a href="admin_settings_theme.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_theme.php' ? 'active' : ''); ?>">
-                                <i class="nav-icon fa fa-paint-brush"></i>
-                                <p>Theme</p>
-                            </a>
-                        </li>
-                        <li class="nav-item">
-                            <a href="admin_settings_security.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_security.php' ? 'active' : ''); ?>">
-                                <i class="nav-icon fas fa-shield-alt"></i>
-                                <p>Security</p>
-                            </a>
-                        </li>
-                        <li class="nav-item">
-                            <a href="admin_settings_mail.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_mail.php' ? 'active' : ''); ?>">
-                                <i class="nav-icon far fa-envelope"></i>
-                                <p>Mail</p>
-                            </a>
-                        </li>
-                        <li class="nav-item">
-                            <a href="admin_settings_notification.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_notification.php' ? 'active' : ''); ?>">
-                                <i class="nav-icon far fa-bell"></i>
-                                <p>Notifications</p>
-                            </a>
-                        </li>
-                        <li class="nav-item">
-                            <a href="admin_settings_default.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_default.php' ? 'active' : ''); ?>">
-                                <i class="nav-icon fas fa-cogs"></i>
-                                <p>Defaults</p>
-                            </a>
-                        </li>
-                        <?php if ($config_module_enable_accounting) { ?>
-                            <li class="nav-item">
-                                <a href="admin_settings_invoice.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_invoice.php' ? 'active' : ''); ?>">
-                                    <i class="nav-icon fas fa-file-invoice"></i>
-                                    <p>Invoice</p>
-                                </a>
-                            </li>
-                            <li class="nav-item">
-                                <a href="admin_settings_quote.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_quote.php' ? 'active' : ''); ?>">
-                                    <i class="nav-icon fas fa-comment-dollar"></i>
-                                    <p>Quote</p>
-                                </a>
-                            </li>
-                            <li class="nav-item">
-                                <a href="admin_settings_online_payment.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_online_payment.php' ? 'active' : ''); ?>">
-                                    <i class="nav-icon far fa-credit-card"></i>
-                                    <p>Online Payment</p>
-                                </a>
-                            </li>
-                            <?php if ($config_stripe_enable) { ?>
-                                <li class="nav-item">
-                                    <a href="admin_settings_online_payment_clients.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_online_payment_clients.php' ? 'active' : ''); ?>">
-                                        <i class="nav-icon far fa-credit-card"></i>
-                                        <p>Payment/Stripe Clients</p>
-                                    </a>
-                                </li>
-                            <?php } ?>
-                        <?php } ?>
-                        <?php if ($config_module_enable_ticketing) { ?>
-                            <li class="nav-item">
-                                <a href="admin_settings_project.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_project.php' ? 'active' : ''); ?>">
-                                    <i class="nav-icon fas fa-project-diagram"></i>
-                                    <p>Project</p>
-                                </a>
-                            </li>
-                            <li class="nav-item">
-                                <a href="admin_settings_ticket.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_ticket.php' ? 'active' : ''); ?>">
-                                    <i class="nav-icon fas fa-life-ring"></i>
-                                    <p>Ticket</p>
-                                </a>
-                            </li>
-                        <?php } ?>
-                        <li class="nav-item">
-                            <a href="admin_settings_ai.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_ai.php' ? 'active' : ''); ?>">
-                                <i class="nav-icon fas fa-robot"></i>
-                                <p>AI</p>
-                            </a>
-                        </li>
-                        <!-- Currently the only integration is the client portal SSO -->
-                        <?php if ($config_client_portal_enable) { ?>
-                            <li class="nav-item">
-                                <a href="admin_identity_provider.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_identity_provider.php' ? 'active' : ''); ?>">
-                                    <i class="nav-icon fas fa-fingerprint"></i>
-                                    <p>Identity Provider</p>
-                                </a>
-                            </li>
-                        <?php } ?>
-                        <li class="nav-item">
-                            <a href="admin_settings_telemetry.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_telemetry.php' ? 'active' : ''); ?>">
-                                <i class="nav-icon fas fa-satellite-dish"></i>
-                                <p>Telemetry</p>
-                            </a>
-                        </li>
-                        <li class="nav-item">
-                            <a href="admin_settings_module.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_module.php' ? 'active' : ''); ?>">
-                                <i class="nav-icon fas fa-cube"></i>
-                                <p>Modules</p>
-                            </a>
-                        </li>
-                    </ul>
-                </li>
-            </ul>
-        </nav>
-        <!-- /.sidebar-menu -->
-        <div class="mb-3"></div>
-    </div>
-    <!-- /.sidebar -->
-</aside>
diff --git a/includes/inc_all_admin.php b/includes/inc_all_admin.php
deleted file mode 100644
index 80aabe2d..00000000
--- a/includes/inc_all_admin.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-require_once "config.php";
-require_once "functions.php";
-require_once "check_login.php";
-require_once "page_title.php";
-if (!isset($session_is_admin) || !$session_is_admin) {
-    exit(WORDING_ROLECHECK_FAILED . "<br>Tell your admin: Your role does not have admin access.");
-}
-require_once "header.php";
-require_once "top_nav.php";
-require_once "admin_side_nav.php";
-require_once "inc_wrapper.php";
-require_once "inc_alert_feedback.php";
-require_once "filter_header.php";
-require_once "app_version.php";
diff --git a/includes/inc_all_reports.php b/includes/inc_all_reports.php
deleted file mode 100644
index 37354007..00000000
--- a/includes/inc_all_reports.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-require_once "config.php";
-require_once "functions.php";
-require_once "check_login.php";
-require_once "page_title.php";
-// Reporting Perms
-enforceUserPermission('module_reporting');
-require_once "header.php";
-require_once "top_nav.php";
-require_once "reports_side_nav.php";
-require_once "inc_wrapper.php";
-require_once "inc_alert_feedback.php";
-require_once "filter_header.php";
-
-// Set variable default values
-$largest_income_month = 0;
-$largest_invoice_month = 0;
-$recurring_total = 0;
diff --git a/includes/side_nav.php b/includes/side_nav.php
index 6a800213..ddcf103a 100644
--- a/includes/side_nav.php
+++ b/includes/side_nav.php
@@ -194,7 +194,7 @@
 
                 <?php if (lookupUserPermission("module_reporting") >= 1) { ?>
                     <li class="nav-item mt-3">
-                        <a href="report_overview.php" class="nav-link">
+                        <a href="reports" class="nav-link">
                             <i class="fas fa-chart-line nav-icon"></i>
                             <p>Reports</p>
                             <i class="fas fa-angle-right nav-icon float-right"></i>
diff --git a/includes/top_nav.php b/includes/top_nav.php
index 730e9d60..7445610a 100644
--- a/includes/top_nav.php
+++ b/includes/top_nav.php
@@ -105,7 +105,7 @@
                 <!-- Menu Footer-->
                 <li class="user-footer">
                     <?php if ($session_is_admin) { ?>
-                        <a href="admin_user.php" class="btn btn-default btn-block btn-flat mb-2"><i class="fas fa-user-shield mr-2"></i>Administration</a>
+                        <a href="admin" class="btn btn-default btn-block btn-flat mb-2"><i class="fas fa-user-shield mr-2"></i>Administration</a>
                     <?php } ?>
                     <a href="user_details.php" class="btn btn-default btn-flat"><i class="fas fa-user-cog mr-2"></i>Account</a>
                     <a href="post.php?logout" class="btn btn-default btn-flat float-right"><i class="fas fa-sign-out-alt mr-2"></i>Logout</a>
diff --git a/post/user/account.php b/post/account.php
similarity index 100%
rename from post/user/account.php
rename to post/account.php
diff --git a/post/admin/admin_role.php b/post/admin/admin_role.php
deleted file mode 100644
index af659e70..00000000
--- a/post/admin/admin_role.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/*
- * ITFlow - GET/POST request handler for roles
- */
-
-defined('FROM_POST_HANDLER') || die("Direct file access is not allowed");
-
-if (isset($_POST['add_role'])) {
-
-    validateCSRFToken($_POST['csrf_token']);
-
-    $name = sanitizeInput($_POST['role_name']);
-    $description = sanitizeInput($_POST['role_description']);
-    $admin = intval($_POST['role_is_admin']);
-
-    mysqli_query($mysqli, "INSERT INTO user_roles SET role_name = '$name', role_description = '$description', role_is_admin = $admin");
-
-    $role_id = mysqli_insert_id($mysqli);
-
-    // Logging
-    logAction("User Role", "Create", "$session_name created user role $name", 0, $role_id);
-
-    $_SESSION['alert_message'] = "User Role <strong$name</strong> created";
-
-    header("Location: " . $_SERVER["HTTP_REFERER"]);
-
-}
-
-if (isset($_POST['edit_role'])) {
-
-    validateCSRFToken($_POST['csrf_token']);
-
-    // Update role metadata
-    $role_id = sanitizeInput($_POST['role_id']);
-    $name = sanitizeInput($_POST['role_name']);
-    $description = sanitizeInput($_POST['role_description']);
-    $admin = intval($_POST['role_is_admin']);
-    
-    mysqli_query($mysqli, "UPDATE user_roles SET role_name = '$name', role_description = '$description', role_is_admin = $admin WHERE role_id = $role_id");
-
-    // Update role access levels
-    mysqli_query($mysqli, "DELETE FROM user_role_permissions WHERE user_role_id = $role_id");
-    foreach ($_POST as $key => $value) {
-        if (str_contains($key, '##module_')){
-            $module_id = intval(explode('##', $key)[0]);
-            $access_level = intval($value);
-
-            if ($access_level > 0) {
-                mysqli_query($mysqli, "INSERT INTO user_role_permissions SET user_role_id = $role_id, module_id = $module_id, user_role_permission_level = $access_level");
-            }
-        }
-
-    }
-
-    // Logging
-    logAction("User Role", "Edit", "$session_name edited user role $name", 0, $role_id);
-
-    $_SESSION['alert_message'] = "User Role <strong>$name</strong> edited";
-
-    header("Location: " . $_SERVER["HTTP_REFERER"]);
-}
-
-if (isset($_GET['archive_role'])) {
-
-    validateCSRFToken($_GET['csrf_token']);
-
-    $role_id = intval($_GET['archive_role']);
-
-    // Check role isn't in use
-    $sql_role_user_count = mysqli_query($mysqli, "SELECT COUNT(user_id) FROM users WHERE user_role_id = $role_id AND user_archived_at IS NULL");
-    $role_user_count = mysqli_fetch_row($sql_role_user_count)[0];
-    if ($role_user_count != 0) {
-        $_SESSION['alert_type'] = "error";
-        $_SESSION['alert_message'] = "Role must not in use to archive it";
-        header("Location: " . $_SERVER["HTTP_REFERER"]);
-        exit();
-    }
-
-    mysqli_query($mysqli, "UPDATE user_roles SET role_archived_at = NOW() WHERE role_id = $role_id");
-
-    // Logging
-    $role_details = mysqli_fetch_array(mysqli_query($mysqli, "SELECT role_name FROM user_roles WHERE role_id = $role_id LIMIT 1"));
-    $role_name = sanitizeInput($role_details['role_name']);
-    logAction("User Role", "Archive", "$session_name archived user role $role_name", 0, $role_id);
-
-    $_SESSION['alert_message'] = "User Role archived";
-    header("Location: " . $_SERVER["HTTP_REFERER"]);
-}
\ No newline at end of file
diff --git a/post/admin/admin_user.php b/post/admin/admin_user.php
deleted file mode 100644
index 862e4ea4..00000000
--- a/post/admin/admin_user.php
+++ /dev/null
@@ -1,371 +0,0 @@
-<?php
-
-/*
- * ITFlow - GET/POST request handler for user (agent) management
- */
-
-defined('FROM_POST_HANDLER') || die("Direct file access is not allowed");
-
-if (isset($_POST['add_user'])) {
-
-    validateCSRFToken($_POST['csrf_token']);
-
-    require_once 'post/admin/admin_user_model.php';
-
-    $password = password_hash(trim($_POST['password']), PASSWORD_DEFAULT);
-    $user_specific_encryption_ciphertext = encryptUserSpecificKey(trim($_POST['password']));
-
-    mysqli_query($mysqli, "INSERT INTO users SET user_name = '$name', user_email = '$email', user_password = '$password', user_specific_encryption_ciphertext = '$user_specific_encryption_ciphertext', user_role_id = $role");
-
-    $user_id = mysqli_insert_id($mysqli);
-
-    // Add Client Access Permissions if set
-    if (isset($_POST['clients'])) {
-        foreach($_POST['clients'] as $client_id) {
-            $client_id = intval($client_id);
-            mysqli_query($mysqli,"INSERT INTO user_client_permissions SET user_id = $user_id, client_id = $client_id");
-        }
-    }
-
-    if (!file_exists("uploads/users/$user_id/")) {
-        mkdir("uploads/users/$user_id");
-    }
-
-    // Check for and process image/photo
-    $extended_alert_description = '';
-    if (isset($_FILES['file']['tmp_name'])) {
-        if ($new_file_name = checkFileUpload($_FILES['file'], array('jpg', 'jpeg', 'gif', 'png', 'webp'))) {
-
-            $file_tmp_path = $_FILES['file']['tmp_name'];
-
-            // directory in which the uploaded file will be moved
-            $upload_file_dir = "uploads/users/$user_id/";
-            $dest_path = $upload_file_dir . $new_file_name;
-            move_uploaded_file($file_tmp_path, $dest_path);
-
-            // Set Avatar
-            mysqli_query($mysqli, "UPDATE users SET user_avatar = '$new_file_name' WHERE user_id = $user_id");
-            $extended_alert_description = '. File successfully uploaded.';
-        }
-    }
-
-    // Create Settings
-    mysqli_query($mysqli, "INSERT INTO user_settings SET user_id = $user_id, user_config_force_mfa = $force_mfa");
-
-    $sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = 1");
-    $row = mysqli_fetch_array($sql);
-    $company_name = sanitizeInput($row['company_name']);
-
-    // Sanitize Config vars from get_settings.php
-    $config_mail_from_name = sanitizeInput($config_mail_from_name);
-    $config_mail_from_email = sanitizeInput($config_mail_from_email);
-    $config_ticket_from_email = sanitizeInput($config_ticket_from_email);
-    $config_login_key_secret = mysqli_real_escape_string($mysqli, $config_login_key_secret);
-    $config_base_url = sanitizeInput($config_base_url);
-
-    // Send user e-mail, if specified
-    if (isset($_POST['send_email']) && !empty($config_smtp_host) && filter_var($email, FILTER_VALIDATE_EMAIL)) {
-
-        $password = mysqli_real_escape_string($mysqli, $_POST['password']);
-
-        $subject = "Your new $company_name ITFlow account";
-        $body = "Hello $name,<br><br>An ITFlow account has been setup for you. Please change your password upon login. <br><br>Username: $email <br>Password: $password<br>Login URL: https://$config_base_url/login.php?key=$config_login_key_secret<br><br>--<br>$company_name - Support<br>$config_ticket_from_email";
-
-        $data = [
-            [
-                'from' => $config_mail_from_email,
-                'from_name' => $config_mail_from_name,
-                'recipient' => $email,
-                'recipient_name' => $name,
-                'subject' => $subject,
-                'body' => $body
-            ]
-        ];
-        $mail = addToMailQueue($data);
-
-        if ($mail !== true) {
-            mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Mail', notification = 'Failed to send email to $email'");
-            mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Mail', log_action = 'Error', log_description = 'Failed to send email to $email regarding $subject. $mail', log_ip = '$session_ip', log_user_agent = '$session_user_agent',  log_user_id = $session_user_id, log_entity_id = $user_id");
-        }
-
-    }
-
-    // Logging
-    logAction("User", "Create", "$session_name created user $name", 0, $user_id);
-
-    $_SESSION['alert_message'] = "User <strong>$name</strong> created" . $extended_alert_description;
-
-    header("Location: " . $_SERVER["HTTP_REFERER"]);
-
-}
-
-if (isset($_POST['edit_user'])) {
-
-    validateCSRFToken($_POST['csrf_token']);
-
-    require_once 'post/admin/admin_user_model.php';
-
-    $user_id = intval($_POST['user_id']);
-    $new_password = trim($_POST['new_password']);
-
-    // Update Client Access
-    mysqli_query($mysqli,"DELETE FROM user_client_permissions WHERE user_id = $user_id");
-    if (isset($_POST['clients'])) {
-        foreach($_POST['clients'] as $client_id) {
-            $client_id = intval($client_id);
-            mysqli_query($mysqli,"INSERT INTO user_client_permissions SET user_id = $user_id, client_id = $client_id");
-        }
-    }
-
-    // Get current Avatar
-    $sql = mysqli_query($mysqli, "SELECT user_avatar FROM users WHERE user_id = $user_id");
-    $row = mysqli_fetch_array($sql);
-    $existing_file_name = sanitizeInput($row['user_avatar']);
-
-    $extended_log_description = '';
-    if (!empty($_POST['2fa'])) {
-        $two_fa = $_POST['2fa'];
-    }
-
-    if (!file_exists("uploads/users/$user_id/")) {
-        mkdir("uploads/users/$user_id");
-    }
-
-    // Check for and process image/photo
-    $extended_alert_description = '';
-    if (isset($_FILES['file']['tmp_name'])) {
-        if ($new_file_name = checkFileUpload($_FILES['file'], array('jpg', 'jpeg', 'gif', 'png', 'webp'))) {
-
-            $file_tmp_path = $_FILES['file']['tmp_name'];
-
-            // directory in which the uploaded file will be moved
-            $upload_file_dir = "uploads/users/$user_id/";
-            $dest_path = $upload_file_dir . $new_file_name;
-            move_uploaded_file($file_tmp_path, $dest_path);
-
-            // Delete old file
-            unlink("uploads/users/$user_id/$existing_file_name");
-
-            // Set Avatar
-            mysqli_query($mysqli, "UPDATE users SET user_avatar = '$new_file_name' WHERE user_id = $user_id");
-            $extended_alert_description = '. File successfully uploaded.';
-        
-        }
-    }
-
-    mysqli_query($mysqli, "UPDATE users SET user_name = '$name', user_email = '$email', user_role_id = $role WHERE user_id = $user_id");
-
-    if (!empty($new_password)) {
-        $new_password = password_hash($new_password, PASSWORD_DEFAULT);
-        $user_specific_encryption_ciphertext = encryptUserSpecificKey(trim($_POST['new_password']));
-        mysqli_query($mysqli, "UPDATE users SET user_password = '$new_password', user_specific_encryption_ciphertext = '$user_specific_encryption_ciphertext' WHERE user_id = $user_id");
-        //Extended Logging
-        $extended_log_description .= ", password changed";
-    }
-
-    if (!empty($two_fa) && $two_fa == 'disable') {
-        mysqli_query($mysqli, "UPDATE users SET user_token = '' WHERE user_id = '$user_id'");
-        mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'User', log_action = 'Modify', log_description = '$session_name disabled 2FA for $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id");
-    }
-
-    //Update User Settings
-    mysqli_query($mysqli, "UPDATE user_settings SET user_config_force_mfa = $force_mfa WHERE user_id = $user_id");
-
-    // Logging
-    logAction("User", "Edit", "$session_name edited user $name", 0, $user_id);
-
-    $_SESSION['alert_message'] = "User <strong>$name</strong> updated" . $extended_alert_description;
-
-    header("Location: " . $_SERVER["HTTP_REFERER"]);
-
-}
-
-if (isset($_GET['activate_user'])) {
-
-    validateCSRFToken($_GET['csrf_token']);
-
-    $user_id = intval($_GET['activate_user']);
-
-    // Get User Name
-    $sql = mysqli_query($mysqli, "SELECT * FROM users WHERE user_id = $user_id");
-    $row = mysqli_fetch_array($sql);
-    $user_name = sanitizeInput($row['user_name']);
-
-    mysqli_query($mysqli, "UPDATE users SET user_status = 1 WHERE user_id = $user_id");
-
-    // Logging
-    logAction("User", "Activate", "$session_name activated user $user_name", 0, $user_id);
-
-    $_SESSION['alert_message'] = "User <strong>$user_name</strong> activated";
-
-    header("Location: " . $_SERVER["HTTP_REFERER"]);
-
-}
-
-if (isset($_GET['disable_user'])) {
-
-    validateCSRFToken($_GET['csrf_token']);
-
-    $user_id = intval($_GET['disable_user']);
-
-    // Get User Name
-    $sql = mysqli_query($mysqli, "SELECT * FROM users WHERE user_id = $user_id");
-    $row = mysqli_fetch_array($sql);
-    $user_name = sanitizeInput($row['user_name']);
-
-    mysqli_query($mysqli, "UPDATE users SET user_status = 0 WHERE user_id = $user_id");
-
-    // Un-assign tickets
-    mysqli_query($mysqli, "UPDATE tickets SET ticket_assigned_to = 0 WHERE ticket_assigned_to = $user_id AND ticket_closed_at IS NULL");
-    mysqli_query($mysqli, "UPDATE recurring_tickets SET recurring_ticket_assigned_to = 0 WHERE recurring_ticket_assigned_to = $user_id");
-
-    // Logging
-    logAction("User", "Disable", "$session_name disabled user $name", 0, $user_id);
-
-    $_SESSION['alert_type'] = "error";
-    $_SESSION['alert_message'] = "User <strong>$user_name</strong> disabled";
-
-    header("Location: " . $_SERVER["HTTP_REFERER"]);
-
-}
-
-if (isset($_GET['revoke_remember_me'])) {
-
-    validateCSRFToken($_GET['csrf_token']);
-
-    $user_id = intval($_GET['revoke_remember_me']);
-
-    // Get User Name
-    $row = mysqli_fetch_array(mysqli_query($mysqli, "SELECT * FROM users WHERE user_id = $user_id"));
-    $user_name = sanitizeInput($row['user_name']);
-
-    mysqli_query($mysqli, "DELETE FROM remember_tokens WHERE remember_token_user_id = $user_id");
-
-    // Logging
-    logAction("User", "Edit", "$session_name revoked all remember me tokens for user $user_name", 0, $user_id);
-
-    $_SESSION['alert_type'] = "error";
-    $_SESSION['alert_message'] = "User <strong>$user_name</strong> remember me tokens revoked";
-
-    header("Location: " . $_SERVER["HTTP_REFERER"]);
-
-}
-
-if (isset($_GET['archive_user'])) {
-
-    validateCSRFToken($_GET['csrf_token']);
-
-    // Variables from GET
-    $user_id = intval($_GET['archive_user']);
-    $password = password_hash(randomString(), PASSWORD_DEFAULT);
-
-    // Get user details
-    $sql = mysqli_query($mysqli, "SELECT * FROM users WHERE user_id = $user_id");
-    $row = mysqli_fetch_array($sql);
-    $name = sanitizeInput($row['user_name']);
-
-    // Archive user query
-    mysqli_query($mysqli, "UPDATE users SET user_name = '$name (archived)', user_password = '$password', user_status = 0, user_specific_encryption_ciphertext = '', user_archived_at = NOW() WHERE user_id = $user_id");
-
-    // Logging
-    logAction("User", "Archive", "$session_name archived user $name", 0, $user_id);
-
-    $_SESSION['alert_type'] = "error";
-    $_SESSION['alert_message'] = "User <strong>$name</strong> archived";
-
-    header("Location: " . $_SERVER["HTTP_REFERER"]);
-
-}
-
-if (isset($_POST['export_users_csv'])) {
-
-    //get records from database
-    $sql = mysqli_query($mysqli, "SELECT * FROM users LEFT JOIN user_roles ON user_role_id = role_id ORDER BY user_name ASC");
-
-    $count = mysqli_num_rows($sql);
-
-    if ($count > 0) {
-        $delimiter = ",";
-        $filename = "Users-" . date('Y-m-d') . ".csv";
-
-        //create a file pointer
-        $f = fopen('php://memory', 'w');
-
-        //set column headers
-        $fields = array('Name', 'Email', 'Role', 'Status', 'Creation Date');
-        fputcsv($f, $fields, $delimiter);
-
-        //output each row of the data, format line as csv and write to file pointer
-        while($row = $sql->fetch_assoc()) {
-
-            $user_status = intval($row['user_status']);
-            if ($user_status == 2) {
-                $user_status_display = "Invited";
-            } elseif ($user_status == 1) {
-                $user_status_display = "Active";
-            } else{
-                $user_status_display = "Disabled";
-            }
-
-            $lineData = array($row['user_name'], $row['user_email'], $row['role_name'], $user_status_display, $row['user_created_at']);
-            fputcsv($f, $lineData, $delimiter);
-        }
-
-        //move back to beginning of file
-        fseek($f, 0);
-
-        //set headers to download file rather than displayed
-        header('Content-Type: text/csv');
-        header('Content-Disposition: attachment; filename="' . $filename . '";');
-
-        //output all remaining data on a file pointer
-        fpassthru($f);
-
-        // Logging
-        logAction("User", "Export", "$session_name exported $count user(s) to a CSV file");
-    }
-    exit;
-
-}
-
-if (isset($_POST['ir_reset_user_password'])) {
-
-    // Incident response: allow mass reset of agent passwords
-
-    validateCSRFToken($_POST['csrf_token']);
-
-    // Confirm logged-in user password, for security
-    $admin_password = $_POST['admin_password'];
-    $sql = mysqli_query($mysqli, "SELECT * FROM users WHERE user_id = $session_user_id");
-    $userRow = mysqli_fetch_array($sql);
-    if (!password_verify($admin_password, $userRow['user_password'])) {
-        $_SESSION['alert_type'] = "error";
-        $_SESSION['alert_message'] = "Incorrect password.";
-        header("Location: " . $_SERVER["HTTP_REFERER"]);
-        exit;
-    }
-
-    // Get agents/users, other than the current user
-    $sql_users = mysqli_query($mysqli, "SELECT * FROM users WHERE (user_archived_at IS NULL AND user_id != $session_user_id)");
-
-    // Reset passwords
-    while ($row = mysqli_fetch_array($sql_users)) {
-        $user_id = intval($row['user_id']);
-        $user_email = sanitizeInput($row['user_email']);
-        $new_password = randomString();
-        $user_specific_encryption_ciphertext = encryptUserSpecificKey(trim($new_password));
-
-        echo $user_email . " -- " . $new_password; // Show
-        $new_password = password_hash($new_password, PASSWORD_DEFAULT);
-
-        mysqli_query($mysqli, "UPDATE users SET user_password = '$new_password', user_specific_encryption_ciphertext = '$user_specific_encryption_ciphertext' WHERE user_id = $user_id");
-
-        echo "<br><br>";
-    }
-
-    // Logging
-    logAction("User", "Edit", "$session_name reset ALL user passwords");
-
-    exit; // Stay on the plain text password page
-
-}
diff --git a/post/admin/admin_user_model.php b/post/admin/admin_user_model.php
deleted file mode 100644
index 4652af8a..00000000
--- a/post/admin/admin_user_model.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-defined('FROM_POST_HANDLER') || die("Direct file access is not allowed");
-
-$name = sanitizeInput($_POST['name']);
-$email = sanitizeInput($_POST['email']);
-$role = intval($_POST['role']);
-$force_mfa = intval($_POST['force_mfa'] ?? 0);
diff --git a/post/user/asset.php b/post/asset.php
similarity index 100%
rename from post/user/asset.php
rename to post/asset.php
diff --git a/post/user/asset_interface_model.php b/post/asset_interface_model.php
similarity index 100%
rename from post/user/asset_interface_model.php
rename to post/asset_interface_model.php
diff --git a/post/user/asset_model.php b/post/asset_model.php
similarity index 100%
rename from post/user/asset_model.php
rename to post/asset_model.php
diff --git a/post/user/budget.php b/post/budget.php
similarity index 100%
rename from post/user/budget.php
rename to post/budget.php
diff --git a/post/user/category.php b/post/category.php
similarity index 100%
rename from post/user/category.php
rename to post/category.php
diff --git a/post/admin/admin_category_model.php b/post/category_model.php
similarity index 100%
rename from post/admin/admin_category_model.php
rename to post/category_model.php
diff --git a/post/user/certificate.php b/post/certificate.php
similarity index 100%
rename from post/user/certificate.php
rename to post/certificate.php
diff --git a/post/user/certificate_model.php b/post/certificate_model.php
similarity index 100%
rename from post/user/certificate_model.php
rename to post/certificate_model.php
diff --git a/post/user/client.php b/post/client.php
similarity index 100%
rename from post/user/client.php
rename to post/client.php
diff --git a/post/user/client_model.php b/post/client_model.php
similarity index 100%
rename from post/user/client_model.php
rename to post/client_model.php
diff --git a/post/user/contact.php b/post/contact.php
similarity index 100%
rename from post/user/contact.php
rename to post/contact.php
diff --git a/post/user/contact_model.php b/post/contact_model.php
similarity index 100%
rename from post/user/contact_model.php
rename to post/contact_model.php
diff --git a/post/user/credential.php b/post/credential.php
similarity index 100%
rename from post/user/credential.php
rename to post/credential.php
diff --git a/post/user/credential_model.php b/post/credential_model.php
similarity index 100%
rename from post/user/credential_model.php
rename to post/credential_model.php
diff --git a/post/user/credit.php b/post/credit.php
similarity index 100%
rename from post/user/credit.php
rename to post/credit.php
diff --git a/post/user/document.php b/post/document.php
similarity index 100%
rename from post/user/document.php
rename to post/document.php
diff --git a/post/user/document_model.php b/post/document_model.php
similarity index 100%
rename from post/user/document_model.php
rename to post/document_model.php
diff --git a/post/user/domain.php b/post/domain.php
similarity index 100%
rename from post/user/domain.php
rename to post/domain.php
diff --git a/post/user/domain_model.php b/post/domain_model.php
similarity index 100%
rename from post/user/domain_model.php
rename to post/domain_model.php
diff --git a/post/user/event.php b/post/event.php
similarity index 100%
rename from post/user/event.php
rename to post/event.php
diff --git a/post/user/event_model.php b/post/event_model.php
similarity index 100%
rename from post/user/event_model.php
rename to post/event_model.php
diff --git a/post/user/expense.php b/post/expense.php
similarity index 100%
rename from post/user/expense.php
rename to post/expense.php
diff --git a/post/user/expense_model.php b/post/expense_model.php
similarity index 100%
rename from post/user/expense_model.php
rename to post/expense_model.php
diff --git a/post/user/file.php b/post/file.php
similarity index 100%
rename from post/user/file.php
rename to post/file.php
diff --git a/post/user/folder.php b/post/folder.php
similarity index 100%
rename from post/user/folder.php
rename to post/folder.php
diff --git a/post/user/invoice.php b/post/invoice.php
similarity index 100%
rename from post/user/invoice.php
rename to post/invoice.php
diff --git a/post/user/invoice_model.php b/post/invoice_model.php
similarity index 100%
rename from post/user/invoice_model.php
rename to post/invoice_model.php
diff --git a/post/user/location.php b/post/location.php
similarity index 100%
rename from post/user/location.php
rename to post/location.php
diff --git a/post/user/location_model.php b/post/location_model.php
similarity index 100%
rename from post/user/location_model.php
rename to post/location_model.php
diff --git a/post/user/network.php b/post/network.php
similarity index 100%
rename from post/user/network.php
rename to post/network.php
diff --git a/post/user/network_model.php b/post/network_model.php
similarity index 100%
rename from post/user/network_model.php
rename to post/network_model.php
diff --git a/post/user/product.php b/post/product.php
similarity index 100%
rename from post/user/product.php
rename to post/product.php
diff --git a/post/user/product_model.php b/post/product_model.php
similarity index 100%
rename from post/user/product_model.php
rename to post/product_model.php
diff --git a/post/user/profile.php b/post/profile.php
similarity index 100%
rename from post/user/profile.php
rename to post/profile.php
diff --git a/post/user/project.php b/post/project.php
similarity index 100%
rename from post/user/project.php
rename to post/project.php
diff --git a/post/user/quote.php b/post/quote.php
similarity index 100%
rename from post/user/quote.php
rename to post/quote.php
diff --git a/post/user/quote_model.php b/post/quote_model.php
similarity index 100%
rename from post/user/quote_model.php
rename to post/quote_model.php
diff --git a/post/user/rack.php b/post/rack.php
similarity index 100%
rename from post/user/rack.php
rename to post/rack.php
diff --git a/post/user/revenue.php b/post/revenue.php
similarity index 100%
rename from post/user/revenue.php
rename to post/revenue.php
diff --git a/post/user/service.php b/post/service.php
similarity index 100%
rename from post/user/service.php
rename to post/service.php
diff --git a/post/user/software.php b/post/software.php
similarity index 100%
rename from post/user/software.php
rename to post/software.php
diff --git a/post/user/tag.php b/post/tag.php
similarity index 100%
rename from post/user/tag.php
rename to post/tag.php
diff --git a/post/admin/admin_tag_model.php b/post/tag_model.php
similarity index 100%
rename from post/admin/admin_tag_model.php
rename to post/tag_model.php
diff --git a/post/user/task.php b/post/task.php
similarity index 100%
rename from post/user/task.php
rename to post/task.php
diff --git a/post/user/ticket.php b/post/ticket.php
similarity index 100%
rename from post/user/ticket.php
rename to post/ticket.php
diff --git a/post/user/ticket_recurring_model.php b/post/ticket_recurring_model.php
similarity index 100%
rename from post/user/ticket_recurring_model.php
rename to post/ticket_recurring_model.php
diff --git a/post/user/transfer.php b/post/transfer.php
similarity index 100%
rename from post/user/transfer.php
rename to post/transfer.php
diff --git a/post/user/transfer_model.php b/post/transfer_model.php
similarity index 100%
rename from post/user/transfer_model.php
rename to post/transfer_model.php
diff --git a/post/user/trip.php b/post/trip.php
similarity index 100%
rename from post/user/trip.php
rename to post/trip.php
diff --git a/post/user/trip_model.php b/post/trip_model.php
similarity index 100%
rename from post/user/trip_model.php
rename to post/trip_model.php
diff --git a/post/user/vendor.php b/post/vendor.php
similarity index 100%
rename from post/user/vendor.php
rename to post/vendor.php
diff --git a/post/user/vendor_contact.php b/post/vendor_contact.php
similarity index 100%
rename from post/user/vendor_contact.php
rename to post/vendor_contact.php
diff --git a/post/user/vendor_contact_model.php b/post/vendor_contact_model.php
similarity index 100%
rename from post/user/vendor_contact_model.php
rename to post/vendor_contact_model.php
diff --git a/post/user/vendor_model.php b/post/vendor_model.php
similarity index 100%
rename from post/user/vendor_model.php
rename to post/vendor_model.php
diff --git a/post/xcustom/readme.php b/post/xcustom/readme.php
deleted file mode 100644
index bbfca6b4..00000000
--- a/post/xcustom/readme.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-/*
-    - Custom Pages -
-
-    If you wish to add custom pages to ITFlow, add them to the xcustom folder in the root directory with the prefix "xcustom_"
-        e.g. If your page was called my_page_one, name it "xcustom/xcustom_my_page_one.php"
-    Note: If required, you can use the Custom Links module to have the page show on the user sidebar.
-
-    To process POST data via your custom pages, create a file in this directory (post/xcustom) named after your page (e.g. xcustom_my_page_one.php).
-    The relevant file will be automatically loaded upon a POST request based on the referer - your form just needs to target the standard root/post.php.
-
- */
diff --git a/report_budget.php b/reports/budget.php
similarity index 100%
rename from report_budget.php
rename to reports/budget.php
diff --git a/report_clients_with_balance.php b/reports/clients_with_balance.php
similarity index 100%
rename from report_clients_with_balance.php
rename to reports/clients_with_balance.php
diff --git a/report_credential_rotation.php b/reports/credential_rotation.php
similarity index 100%
rename from report_credential_rotation.php
rename to reports/credential_rotation.php
diff --git a/report_expense_by_vendor.php b/reports/expense_by_vendor.php
similarity index 100%
rename from report_expense_by_vendor.php
rename to reports/expense_by_vendor.php
diff --git a/report_expense_summary.php b/reports/expense_summary.php
similarity index 100%
rename from report_expense_summary.php
rename to reports/expense_summary.php
diff --git a/reports/includes/footer.php b/reports/includes/footer.php
new file mode 100644
index 00000000..60235990
--- /dev/null
+++ b/reports/includes/footer.php
@@ -0,0 +1,53 @@
+<?php
+require_once "../includes/inc_confirm_modal.php";
+?>
+
+<?php
+if (str_contains(basename($_SERVER["PHP_SELF"]), "admin_")) { ?>
+    <p class="text-right font-weight-light">ITFlow <?php echo APP_VERSION ?> &nbsp; · &nbsp; <a target="_blank" href="https://docs.itflow.org">Docs</a> &nbsp; · &nbsp; <a target="_blank" href="https://forum.itflow.org">Forum</a> &nbsp; · &nbsp; <a target="_blank" href="https://services.itflow.org">Services</a></p>
+    <br>
+<?php } ?>
+
+</div><!-- /.container-fluid -->
+</div> <!-- /.content -->
+</div> <!-- /.content-wrapper -->
+</div> <!-- ./wrapper -->
+
+<!-- Set the browser window title to the clients name -->
+<script>document.title = <?php echo json_encode("$tab_title - $page_title"); ?>;</script>
+
+<!-- REQUIRED SCRIPTS -->
+
+<!-- Bootstrap 4 -->
+<script src="../plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
+
+<!-- Custom js-->
+<script src="../plugins/moment/moment.min.js"></script>
+<script src="../plugins/chart.js/Chart.min.js"></script>
+<script src="../plugins/tempusdominus-bootstrap-4/js/tempusdominus-bootstrap-4.min.js"></script>
+<script src='../plugins/daterangepicker/daterangepicker.js'></script>
+<script src='../plugins/select2/js/select2.min.js'></script>
+<script src='../plugins/inputmask/jquery.inputmask.min.js'></script>
+<script src="../plugins/tinymce/tinymce.min.js" referrerpolicy="origin"></script>
+<script src="../plugins/Show-Hide-Passwords-Bootstrap-4/bootstrap-show-password.min.js"></script>
+<script src="../plugins/clipboardjs/clipboard.min.js"></script>
+<script src="../js/keepalive.js"></script>
+<script src="../plugins/DataTables/datatables.min.js"></script>
+<script src="../plugins/intl-tel-input/js/intlTelInput.min.js"></script>
+
+<!-- AdminLTE App -->
+<script src="../plugins/adminlte/js/adminlte.min.js"></script>
+<script src="../js/app.js"></script>
+<script src="../js/ajax_modal.js"></script>
+<script src="../js/confirm_modal.js"></script>
+
+</body>
+</html>
+
+<?php
+
+// Calculate Execution time Uncomment for test
+
+//$time_end = microtime(true);
+//$execution_time = ($time_end - $time_start);
+//echo '<h2>Total Execution Time: '.number_format((float) $execution_time, 10) .' seconds</h2>';
diff --git a/reports/includes/header.php b/reports/includes/header.php
new file mode 100644
index 00000000..8a22fd82
--- /dev/null
+++ b/reports/includes/header.php
@@ -0,0 +1,54 @@
+<?php
+
+    // Calculate Execution time start
+    // uncomment for test
+    // $time_start = microtime(true);
+
+header("X-Frame-Options: DENY");
+
+?>
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta http-equiv="x-ua-compatible" content="ie=edge">
+    <meta name="robots" content="noindex">
+
+    <title><?php echo $session_company_name; ?></title>
+
+    <!-- 
+    Favicon
+    If Fav Icon exists else use the default one 
+    -->
+    <?php if(file_exists('../uploads/favicon.ico')) { ?>
+        <link rel="icon" type="image/x-icon" href="/uploads/favicon.ico">
+    <?php } ?>
+    
+    <!-- Font Awesome Icons -->
+    <link rel="stylesheet" href="../plugins/fontawesome-free/css/all.min.css">
+
+    <!-- Custom Style Sheet -->
+    <link href="../plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css" rel="stylesheet" type="text/css">
+    <link href="../plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css">
+    <link href="../plugins/select2-bootstrap4-theme/select2-bootstrap4.min.css" rel="stylesheet" type="text/css">
+    <link href='../plugins/daterangepicker/daterangepicker.css' rel='stylesheet' />
+    <link href="../plugins/toastr/toastr.min.css" rel="stylesheet">
+    <link href="../plugins/DataTables/datatables.min.css" rel="stylesheet">
+    <link href="../plugins/intl-tel-input/css/intlTelInput.min.css" rel="stylesheet">
+    <!-- CSS to allow regular button to show as block button in mobile response view using the class btn-responsive -->
+    <link href="../css/itflow_custom.css" rel="stylesheet">
+    <!-- Theme style -->
+    <link rel="stylesheet" href="../plugins/adminlte/css/adminlte.min.css">
+    <!-- jQuery -->
+    <script src="../plugins/jquery/jquery.min.js"></script>
+    <script src="../plugins/toastr/toastr.min.js"></script>
+
+</head>
+<body class="
+    hold-transition sidebar-mini layout-fixed layout-navbar-fixed 
+    accent-<?php if (isset($_GET['client_id'])) { echo "blue"; } else { echo nullable_htmlentities($config_theme); } ?>
+    <?php if ($config_theme_dark) { echo "dark-mode"; } ?>
+">
+    <div class="wrapper text-sm">
diff --git a/reports/includes/inc_all_reports.php b/reports/includes/inc_all_reports.php
new file mode 100644
index 00000000..d04ede47
--- /dev/null
+++ b/reports/includes/inc_all_reports.php
@@ -0,0 +1,19 @@
+<?php
+
+require_once "../config.php";
+require_once "../functions.php";
+require_once "../includes/check_login.php";
+require_once "../includes/page_title.php";
+// Reporting Perms
+enforceUserPermission('module_reporting');
+require_once "includes/header.php";
+require_once "../includes/top_nav.php";
+require_once "includes/side_nav.php";
+require_once "../includes/inc_wrapper.php";
+require_once "../includes/inc_alert_feedback.php";
+require_once "../includes/filter_header.php";
+
+// Set variable default values
+$largest_income_month = 0;
+$largest_invoice_month = 0;
+$recurring_total = 0;
diff --git a/reports/includes/modal_footer.php b/reports/includes/modal_footer.php
new file mode 100644
index 00000000..4bbe5766
--- /dev/null
+++ b/reports/includes/modal_footer.php
@@ -0,0 +1,9 @@
+<script src="js/app.js"></script>
+<script src="plugins/Show-Hide-Passwords-Bootstrap-4/bootstrap-show-password.min.js"></script>
+
+<?php
+    $content = ob_get_clean();
+
+    // Return the title and content as a JSON response
+    echo json_encode(['content' => $content]);
+?>
\ No newline at end of file
diff --git a/reports/includes/modal_header.php b/reports/includes/modal_header.php
new file mode 100644
index 00000000..695f098a
--- /dev/null
+++ b/reports/includes/modal_header.php
@@ -0,0 +1,13 @@
+<?php
+
+require_once "../../../config.php";
+require_once "../../../functions.php";
+require_once "../../../includes/check_login.php";
+
+header('Content-Type: application/json');
+
+// Check for the 'id' parameter
+//if (!isset($_GET['id'])) {
+//    echo json_encode(['error' => 'ID missing.']);
+//    exit;
+//}
diff --git a/includes/reports_side_nav.php b/reports/includes/side_nav.php
similarity index 62%
rename from includes/reports_side_nav.php
rename to reports/includes/side_nav.php
index 4eb5c72d..21de1cf7 100644
--- a/includes/reports_side_nav.php
+++ b/reports/includes/side_nav.php
@@ -1,7 +1,7 @@
 <!-- Main Sidebar Container -->
 <aside class="main-sidebar sidebar-dark-primary d-print-none">
 
-    <a class="pb-1 mt-1 brand-link" href="clients.php">
+    <a class="pb-1 mt-1 brand-link" href="../">
         <p class="h5"><i class="nav-icon fas fa-arrow-left ml-3 mr-2"></i>
             <span class="brand-text ">Back | <strong>Reports</strong>
         </p>
@@ -18,61 +18,61 @@
                 <li class="nav-header">FINANCIAL</li>
                 <?php if ($config_module_enable_accounting == 1 && lookupUserPermission("module_financial") >= 1) { ?>
                     <li class="nav-item">
-                        <a href="report_income_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_income_summary.php") { echo "active"; } ?>">
+                        <a href="income_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "income_summary.php") { echo "active"; } ?>">
                             <i class="far fa-circle nav-icon"></i>
                             <p>Income</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="report_income_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_income_by_client.php") { echo "active"; } ?>">
+                        <a href="income_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "income_by_client.php") { echo "active"; } ?>">
                             <i class="far fa-user nav-icon"></i>
                             <p>Income By Client</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="report_recurring_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_recurring_by_client.php") { echo "active"; } ?>">
+                        <a href="recurring_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "recurring_by_client.php") { echo "active"; } ?>">
                             <i class="fa fa-sync nav-icon"></i>
                             <p>Recurring Income By Client</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="report_clients_with_balance.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_clients_with_balance.php") { echo "active"; } ?>">
+                        <a href="clients_with_balance.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "clients_with_balance.php") { echo "active"; } ?>">
                             <i class="fa fa-exclamation-triangle nav-icon"></i>
                             <p>Clients with a Balance</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="report_expense_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_expense_summary.php") { echo "active"; } ?>">
+                        <a href="expense_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "expense_summary.php") { echo "active"; } ?>">
                             <i class="far fa-credit-card nav-icon"></i>
                             <p>Expense</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="report_expense_by_vendor.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_expense_by_vendor.php") { echo "active"; } ?>">
+                        <a href="expense_by_vendor.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "expense_by_vendor.php") { echo "active"; } ?>">
                             <i class="far fa-building nav-icon"></i>
                             <p>Expense By Vendor</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="report_budget.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_budget.php") { echo "active"; } ?>">
+                        <a href="budget.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "budget.php") { echo "active"; } ?>">
                             <i class="fas fa-list nav-icon"></i>
                             <p>Budget</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="report_tax_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_tax_summary.php") { echo "active"; } ?>">
+                        <a href="tax_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "tax_summary.php") { echo "active"; } ?>">
                             <i class="fas fa-percent nav-icon"></i>
                             <p>Tax Summary</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="report_profit_loss.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_profit_loss.php") { echo "active"; } ?>">
+                        <a href="profit_loss.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "profit_loss.php") { echo "active"; } ?>">
                             <i class="fas fa-file-invoice-dollar nav-icon"></i>
                             <p>Profit & Loss</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="report_tickets_unbilled.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_tickets_unbilled.php") { echo "active"; } ?>">
+                        <a href="tickets_unbilled.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "tickets_unbilled.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>Unbilled Tickets</p>
                         </a>
@@ -84,21 +84,21 @@
                 <li class="nav-header">TECHNICAL</li>
                 <?php  if ($config_module_enable_ticketing && lookupUserPermission("module_support") >= 1) { ?>
                     <li class="nav-item">
-                        <a href="report_ticket_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_ticket_summary.php") { echo "active"; } ?>">
+                        <a href="ticket_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "ticket_summary.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>Tickets</p>
                         </a>
                     </li>
 
                     <li class="nav-item">
-                        <a href="report_ticket_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_ticket_by_client.php") { echo "active"; } ?>">
+                        <a href="ticket_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "ticket_by_client.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>Tickets by Client</p>
                         </a>
                     </li>
 
                     <li class="nav-item">
-                        <a href="report_time_by_tech.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_time_by_tech.php") { echo "active"; } ?>">
+                        <a href="time_by_tech.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "time_by_tech.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>Time by Technician</p>
                         </a>
@@ -106,7 +106,7 @@
                 <?php } ?>
                 <?php if (lookupUserPermission("module_credential") >= 1) { ?>
                     <li class="nav-item">
-                        <a href="report_credential_rotation.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_credential_rotation.php") { echo "active"; } ?>">
+                        <a href="credential_rotation.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "credential_rotation.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-key"></i>
                             <p>Credential rotation</p>
                         </a>
diff --git a/report_income_by_client.php b/reports/income_by_client.php
similarity index 100%
rename from report_income_by_client.php
rename to reports/income_by_client.php
diff --git a/report_income_summary.php b/reports/income_summary.php
similarity index 100%
rename from report_income_summary.php
rename to reports/income_summary.php
diff --git a/report_overview.php b/reports/index.php
similarity index 100%
rename from report_overview.php
rename to reports/index.php
diff --git a/report_profit_loss.php b/reports/profit_loss.php
similarity index 100%
rename from report_profit_loss.php
rename to reports/profit_loss.php
diff --git a/report_recurring_by_client.php b/reports/recurring_by_client.php
similarity index 100%
rename from report_recurring_by_client.php
rename to reports/recurring_by_client.php
diff --git a/report_tax_summary.php b/reports/tax_summary.php
similarity index 100%
rename from report_tax_summary.php
rename to reports/tax_summary.php
diff --git a/report_ticket_by_client.php b/reports/ticket_by_client.php
similarity index 100%
rename from report_ticket_by_client.php
rename to reports/ticket_by_client.php
diff --git a/report_ticket_summary.php b/reports/ticket_summary.php
similarity index 100%
rename from report_ticket_summary.php
rename to reports/ticket_summary.php
diff --git a/report_tickets_unbilled.php b/reports/tickets_unbilled.php
similarity index 100%
rename from report_tickets_unbilled.php
rename to reports/tickets_unbilled.php
diff --git a/report_time_by_tech.php b/reports/time_by_tech.php
similarity index 100%
rename from report_time_by_tech.php
rename to reports/time_by_tech.php
diff --git a/user_activity.php b/user/user_activity.php
similarity index 100%
rename from user_activity.php
rename to user/user_activity.php
diff --git a/user_details.php b/user/user_details.php
similarity index 100%
rename from user_details.php
rename to user/user_details.php
diff --git a/user_preferences.php b/user/user_preferences.php
similarity index 100%
rename from user_preferences.php
rename to user/user_preferences.php
diff --git a/user_security.php b/user/user_security.php
similarity index 100%
rename from user_security.php
rename to user/user_security.php