From 95950700d8140f55556bb2c446bf335877d807e8 Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Mon, 28 Jul 2025 17:57:06 -0400
Subject: [PATCH] Moved user items to user directory

---
 admin/includes/side_nav.php                   |   2 +-
 .../modals}/admin_ai_model_add_modal.php      |   0
 .../modals}/admin_ai_provider_add_modal.php   |   0
 .../modals}/admin_api_key_add_modal.php       |   0
 .../modals}/admin_category_add_modal.php      |   0
 .../modals}/admin_custom_link_add_modal.php   |   0
 .../admin_document_template_add_modal.php     |   0
 .../admin_payment_method_add_modal.php        |   0
 .../admin_payment_provider_add_modal.php      |   0
 .../admin_project_template_add_modal.php      |   0
 .../admin_project_template_edit_modal.php     |   0
 ...ect_template_ticket_template_add_modal.php |   0
 .../modals}/admin_role_add_modal.php          |   0
 .../admin_software_template_add_modal.php     |   0
 .../modals}/admin_tag_add_modal.php           |   0
 .../modals}/admin_tax_add_modal.php           |   0
 .../modals}/admin_ticket_status_add_modal.php |   0
 .../admin_ticket_template_add_modal.php       |   0
 .../admin_ticket_template_edit_modal.php      |   0
 .../modals}/admin_user_add_modal.php          |   0
 .../admin_user_all_reset_password_modal.php   |   0
 .../modals}/admin_user_archive_modal.php      |   0
 .../modals}/admin_user_export_modal.php       |   0
 .../modals}/admin_user_invite_modal.php       |   0
 .../admin_vendor_template_add_modal.php       |   0
 admin/post.php                                |   9 +
 admin_role.php                                | 151 ---------
 admin_user.php                                | 239 -------------
 custom/post.php                               |  40 +++
 custom/post/readme.php                        |  13 +
 {xcustom => custom}/readme.php                |   0
 custom/test.php                               |  18 +
 includes/footer.php                           |  36 +-
 includes/header.php                           |  28 +-
 includes/top_nav.php                          |   8 +-
 index.php                                     |  32 +-
 login.php                                     |   2 +-
 post.php                                      |  59 ----
 post/logout.php                               |   4 +-
 reports/includes/footer.php                   |  53 ---
 db.sql => setup/db.sql                        |   0
 setup.php => setup/index.php                  |   0
 accounts.php => user/accounts.php             |   4 +-
 {ajax => user/ajax}/ajax_account_edit.php     |   0
 .../ajax_admin_mail_queue_message_view.php    |   0
 {ajax => user/ajax}/ajax_ai_model_edit.php    |   0
 {ajax => user/ajax}/ajax_ai_provider_edit.php |   0
 {ajax => user/ajax}/ajax_asset_copy.php       |   0
 {ajax => user/ajax}/ajax_asset_details.php    |   0
 {ajax => user/ajax}/ajax_asset_edit.php       |   0
 .../ajax}/ajax_asset_interface_edit.php       |   0
 .../ajax}/ajax_asset_link_credential.php      |   0
 .../ajax}/ajax_asset_link_document.php        |   0
 {ajax => user/ajax}/ajax_asset_link_file.php  |   0
 .../ajax}/ajax_asset_link_service.php         |   0
 .../ajax}/ajax_asset_link_software.php        |   0
 {ajax => user/ajax}/ajax_calendar_edit.php    |   0
 .../ajax}/ajax_calendar_event_edit.php        |   0
 {ajax => user/ajax}/ajax_category_add.php     |   0
 {ajax => user/ajax}/ajax_category_edit.php    |   0
 {ajax => user/ajax}/ajax_certificate_edit.php |   0
 {ajax => user/ajax}/ajax_contact_details.php  |   0
 {ajax => user/ajax}/ajax_contact_edit.php     |   0
 .../ajax}/ajax_contact_link_asset.php         |   0
 .../ajax}/ajax_contact_link_credential.php    |   0
 .../ajax}/ajax_contact_link_document.php      |   0
 .../ajax}/ajax_contact_link_file.php          |   0
 .../ajax}/ajax_contact_link_service.php       |   0
 .../ajax}/ajax_contact_link_software.php      |   0
 .../ajax}/ajax_contact_note_create.php        |   0
 {ajax => user/ajax}/ajax_credential_edit.php  |   0
 {ajax => user/ajax}/ajax_credential_view.php  |   0
 {ajax => user/ajax}/ajax_custom_link_edit.php |   0
 .../ajax}/ajax_custom_ticket_status_edit.php  |   0
 {ajax => user/ajax}/ajax_document_edit.php    |   0
 {ajax => user/ajax}/ajax_document_move.php    |   0
 {ajax => user/ajax}/ajax_document_rename.php  |   0
 .../ajax}/ajax_document_template_edit.php     |   0
 .../ajax}/ajax_document_version_view.php      |   0
 {ajax => user/ajax}/ajax_document_view.php    |   0
 {ajax => user/ajax}/ajax_domain_edit.php      |   0
 {ajax => user/ajax}/ajax_expense_copy.php     |   0
 {ajax => user/ajax}/ajax_expense_edit.php     |   0
 {ajax => user/ajax}/ajax_expense_refund.php   |   0
 {ajax => user/ajax}/ajax_file_move.php        |   0
 {ajax => user/ajax}/ajax_file_rename.php      |   0
 {ajax => user/ajax}/ajax_folder_rename.php    |   0
 .../ajax}/ajax_invoice_apply_credit.php       |   0
 {ajax => user/ajax}/ajax_invoice_copy.php     |   0
 {ajax => user/ajax}/ajax_invoice_edit.php     |   0
 {ajax => user/ajax}/ajax_invoice_pay.php      |   0
 {ajax => user/ajax}/ajax_item_edit.php        |   0
 {ajax => user/ajax}/ajax_location_edit.php    |   0
 {ajax => user/ajax}/ajax_network_edit.php     |   0
 {ajax => user/ajax}/ajax_notifications.php    |   0
 .../ajax}/ajax_payment_method_edit.php        |   0
 .../ajax}/ajax_payment_provider_edit.php      |   0
 {ajax => user/ajax}/ajax_product_edit.php     |   0
 {ajax => user/ajax}/ajax_project_edit.php     |   0
 {ajax => user/ajax}/ajax_quote_copy.php       |   0
 {ajax => user/ajax}/ajax_quote_edit.php       |   0
 {ajax => user/ajax}/ajax_rack_device_add.php  |   0
 {ajax => user/ajax}/ajax_rack_edit.php        |   0
 .../ajax}/ajax_recurring_expense_edit.php     |   0
 .../ajax}/ajax_recurring_invoice_edit.php     |   0
 .../ajax}/ajax_recurring_ticket_edit.php      |   0
 {ajax => user/ajax}/ajax_revenue_edit.php     |   0
 {ajax => user/ajax}/ajax_role_edit.php        |   0
 {ajax => user/ajax}/ajax_service_details.php  |   0
 {ajax => user/ajax}/ajax_service_edit.php     |   0
 {ajax => user/ajax}/ajax_software_edit.php    |   0
 .../ajax}/ajax_software_template_edit.php     |   0
 {ajax => user/ajax}/ajax_tag_add.php          |   0
 {ajax => user/ajax}/ajax_tag_edit.php         |   0
 {ajax => user/ajax}/ajax_tax_edit.php         |   0
 {ajax => user/ajax}/ajax_ticket_assign.php    |   0
 {ajax => user/ajax}/ajax_ticket_billable.php  |   0
 {ajax => user/ajax}/ajax_ticket_contact.php   |   0
 {ajax => user/ajax}/ajax_ticket_edit.php      |   0
 {ajax => user/ajax}/ajax_ticket_priority.php  |   0
 .../ajax}/ajax_ticket_reply_edit.php          |   0
 .../ajax}/ajax_ticket_reply_redact.php        |   0
 {ajax => user/ajax}/ajax_ticket_task_edit.php |   0
 .../ajax}/ajax_ticket_template_task_edit.php  |   0
 {ajax => user/ajax}/ajax_transfer_edit.php    |   0
 {ajax => user/ajax}/ajax_trip_copy.php        |   0
 {ajax => user/ajax}/ajax_trip_edit.php        |   0
 {ajax => user/ajax}/ajax_user_edit.php        |   0
 {ajax => user/ajax}/ajax_vendor_details.php   |   0
 {ajax => user/ajax}/ajax_vendor_edit.php      |   0
 .../ajax}/ajax_vendor_template_edit.php       |   0
 asset_details.php => user/asset_details.php   |   2 +-
 assets.php => user/assets.php                 |   4 +-
 blank.php => user/blank.php                   |   2 +-
 budget.php => user/budget.php                 |   2 +-
 budget_edit.php => user/budget_edit.php       |   2 +-
 calendar.php => user/calendar.php             |   2 +-
 certificates.php => user/certificates.php     |   4 +-
 client_autopay.php => user/client_autopay.php |   4 +-
 .../client_document_details.php               |   2 +-
 .../client_documents.php                      |   4 +-
 client_files.php => user/client_files.php     |   4 +-
 .../client_overview.php                       |   2 +-
 client_racks.php => user/client_racks.php     |   2 +-
 clients.php => user/clients.php               |   4 +-
 .../contact_details.php                       |   2 +-
 contacts.php => user/contacts.php             |   4 +-
 credentials.php => user/credentials.php       |   4 +-
 dashboard.php => user/dashboard.php           |   2 +-
 .../database_updates.php                      |   0
 domains.php => user/domains.php               |   4 +-
 expenses.php => user/expenses.php             |   4 +-
 global_search.php => user/global_search.php   |   2 +-
 .../includes/inc_all.php                      |  10 +-
 user/includes/inc_all_client.php              | 316 ++++++++++++++++++
 user/includes/inc_all_user.php                |  12 +
 {includes => user/includes}/side_nav.php      |   0
 user/index.php                                |  30 ++
 invoice.php => user/invoice.php               |   4 +-
 invoices.php => user/invoices.php             |   4 +-
 locations.php => user/locations.php           |   4 +-
 .../mfa_enforcement.php                       |   0
 {modals => user/modals}/account_add_modal.php |   0
 {modals => user/modals}/asset_add_modal.php   |   0
 .../modals}/asset_bulk_add_ticket_modal.php   |   0
 .../asset_bulk_assign_contact_modal.php       |   0
 .../asset_bulk_assign_location_modal.php      |   0
 ...et_bulk_assign_physical_location_modal.php |   0
 .../modals}/asset_bulk_edit_status_modal.php  |   0
 .../asset_bulk_transfer_client_modal.php      |   0
 .../modals}/asset_export_modal.php            |   0
 .../modals}/asset_import_modal.php            |   0
 .../modals}/asset_interface_add_modal.php     |   0
 ...sset_interface_bulk_edit_network_modal.php |   0
 .../asset_interface_bulk_edit_type_modal.php  |   0
 .../modals}/asset_interface_export_modal.php  |   0
 .../modals}/asset_interface_import_modal.php  |   0
 .../asset_interface_multiple_add_modal.php    |   0
 .../modals}/budget_create_modal.php           |   0
 {modals => user/modals}/budget_edit_modal.php |   0
 .../modals}/calendar_add_modal.php            |   0
 .../modals}/calendar_event_add_modal.php      |   0
 .../modals}/certificate_add_modal.php         |   0
 .../modals}/certificate_export_modal.php      |   0
 .../modals}/client_asset_documents_modal.php  |   0
 ...lient_document_add_file_relation_modal.php |   0
 ...lient_document_add_from_template_modal.php |   0
 .../modals}/client_document_add_modal.php     |   0
 .../client_document_bulk_move_modal.php       |   0
 .../client_document_link_asset_modal.php      |   0
 .../client_document_link_contact_modal.php    |   0
 .../client_document_link_file_modal.php       |   0
 .../client_document_link_software_modal.php   |   0
 .../client_document_link_vendor_modal.php     |   0
 .../modals}/client_file_bulk_move_modal.php   |   0
 .../modals}/client_file_delete_modal.php      |   0
 .../modals}/client_file_link_asset_modal.php  |   0
 .../modals}/client_file_upload_modal.php      |   0
 .../modals}/client_file_view_modal.php        |   0
 .../modals}/client_rack_add_modal.php         |   0
 .../modals}/client_recurring_export_modal.php |   0
 .../modals}/clients/client_add.php            |   0
 .../clients/client_bulk_assign_tags.php       |   0
 .../clients/client_bulk_edit_hourly_rate.php  |   0
 .../clients/client_bulk_edit_industry.php     |   0
 .../clients/client_bulk_edit_referral.php     |   0
 .../modals}/clients/client_bulk_email.php     |   0
 .../modals}/clients/client_credit_add.php     |   0
 .../modals}/clients/client_delete.php         |   0
 .../modals}/clients/client_download_pdf.php   |   0
 .../modals}/clients/client_edit.php           |   0
 .../modals}/clients/client_export.php         |   0
 .../modals}/clients/client_import.php         |   0
 {modals => user/modals}/contact_add_modal.php |   0
 .../modals}/contact_archive_modal.php         |   0
 .../contact_bulk_assign_location_modal.php    |   0
 .../contact_bulk_assign_tags_modal.php        |   0
 .../contact_bulk_edit_department_modal.php    |   0
 .../modals}/contact_bulk_edit_phone_modal.php |   0
 .../modals}/contact_bulk_edit_role_modal.php  |   0
 .../modals}/contact_bulk_email_modal.php      |   0
 .../modals}/contact_create_note_modal.php     |   0
 .../modals}/contact_export_modal.php          |   0
 .../modals}/contact_import_modal.php          |   0
 .../modals}/contact_invite_modal.php          |   0
 .../modals}/credential_add_modal.php          |   0
 .../credential_bulk_assign_tags_modal.php     |   0
 .../modals}/credential_export_modal.php       |   0
 .../modals}/credential_import_modal.php       |   0
 .../modals}/custom_field_create_modal.php     |   0
 .../modals}/custom_field_edit_modal.php       |   0
 .../document_edit_visibility_modal.php        |   0
 {modals => user/modals}/domain_add_modal.php  |   0
 .../modals}/domain_export_modal.php           |   0
 {modals => user/modals}/expense_add_modal.php |   0
 .../expense_bulk_edit_account_modal.php       |   0
 .../expense_bulk_edit_category_modal.php      |   0
 .../expense_bulk_edit_client_modal.php        |   0
 .../modals}/expense_export_modal.php          |   0
 .../modals}/folder_create_modal.php           |   0
 {modals => user/modals}/invoice_add_modal.php |   0
 .../modals}/invoice_add_ticket_modal.php      |   0
 .../invoice_bulk_edit_category_modal.php      |   0
 .../modals}/invoice_export_modal.php          |   0
 .../modals}/invoice_note_modal.php            |   0
 .../invoice_payment_add_bulk_modal.php        |   0
 .../modals}/invoice_recurring_add_modal.php   |   0
 {modals => user/modals}/item_edit_modal.php   |   0
 .../modals}/location_add_modal.php            |   0
 .../location_bulk_assign_tags_modal.php       |   0
 .../modals}/location_export_modal.php         |   0
 .../modals}/location_import_modal.php         |   0
 {modals => user/modals}/network_add_modal.php |   0
 .../modals}/network_export_modal.php          |   0
 .../modals}/payment_export_modal.php          |   0
 {modals => user/modals}/product_add_modal.php |   0
 .../product_bulk_edit_category_modal.php      |   0
 .../modals}/product_export_modal.php          |   0
 {modals => user/modals}/project_add_modal.php |   0
 .../project_link_closed_ticket_modal.php      |   0
 .../modals}/project_link_ticket_modal.php     |   0
 {modals => user/modals}/quote_add_modal.php   |   0
 .../modals}/quote_export_modal.php            |   0
 {modals => user/modals}/quote_note_modal.php  |   0
 .../modals}/quote_to_invoice_modal.php        |   0
 .../recurring_expense_create_modal.php        |   0
 .../modals}/recurring_invoice_add_modal.php   |   0
 .../modals}/recurring_invoice_note_modal.php  |   0
 .../modals}/recurring_payment_add_modal.php   |   0
 .../modals}/recurring_ticket_add_modal.php    |   0
 {modals => user/modals}/revenue_add_modal.php |   0
 {modals => user/modals}/service_add_modal.php |   0
 {modals => user/modals}/share_modal.php       |   0
 .../software_add_from_template_modal.php      |   0
 .../modals}/software_add_modal.php            |   0
 .../modals}/software_export_modal.php         |   0
 {modals => user/modals}/ticket_add_modal.php  |   0
 .../modals}/ticket_add_modal_v2.php           |   0
 .../modals}/ticket_add_watcher_modal.php      |   0
 .../modals}/ticket_bulk_add_project_modal.php |   0
 .../modals}/ticket_bulk_assign_modal.php      |   0
 .../ticket_bulk_edit_category_modal.php       |   0
 .../ticket_bulk_edit_priority_modal.php       |   0
 .../modals}/ticket_bulk_merge_modal.php       |   0
 .../modals}/ticket_bulk_reply_modal.php       |   0
 .../modals}/ticket_bulk_resolve_modal.php     |   0
 .../modals}/ticket_change_client_modal.php    |   0
 .../modals}/ticket_edit_asset_modal.php       |   0
 .../modals}/ticket_edit_schedule_modal.php    |   0
 .../modals}/ticket_edit_vendor_modal.php      |   0
 .../modals}/ticket_export_modal.php           |   0
 .../modals}/ticket_invoice_add_modal.php      |   0
 .../modals}/ticket_merge_modal.php            |   0
 .../modals}/top_nav_tickets_modal.php         |   0
 .../modals}/transfer_add_modal.php            |   0
 {modals => user/modals}/trip_add_modal.php    |   0
 {modals => user/modals}/trip_export_modal.php |   0
 {modals => user/modals}/user_mfa_modal.php    |   0
 .../vendor_add_from_template_modal.php        |   0
 {modals => user/modals}/vendor_add_modal.php  |   0
 .../modals}/vendor_contact_add_modal.php      |   0
 .../modals}/vendor_contact_edit_modal.php     |   0
 .../modals}/vendor_export_modal.php           |   0
 networks.php => user/networks.php             |   4 +-
 notifications.php => user/notifications.php   |   4 +-
 payments.php => user/payments.php             |   4 +-
 user/post.php                                 |  45 +++
 {post => user/post}/account.php               |   0
 {post => user/post}/asset.php                 |   0
 {post => user/post}/asset_interface_model.php |   0
 {post => user/post}/asset_model.php           |   0
 {post => user/post}/budget.php                |   0
 {post => user/post}/category.php              |   0
 {post => user/post}/category_model.php        |   0
 {post => user/post}/certificate.php           |   0
 {post => user/post}/certificate_model.php     |   0
 {post => user/post}/client.php                |   0
 {post => user/post}/client_model.php          |   0
 {post => user/post}/contact.php               |   0
 {post => user/post}/contact_model.php         |   0
 {post => user/post}/credential.php            |   0
 {post => user/post}/credential_model.php      |   0
 {post => user/post}/credit.php                |   0
 {post => user/post}/document.php              |   0
 {post => user/post}/document_model.php        |   0
 {post => user/post}/domain.php                |   0
 {post => user/post}/domain_model.php          |   0
 {post => user/post}/event.php                 |   0
 {post => user/post}/event_model.php           |   0
 {post => user/post}/expense.php               |   0
 {post => user/post}/expense_model.php         |   0
 {post => user/post}/file.php                  |   0
 {post => user/post}/folder.php                |   0
 {post => user/post}/invoice.php               |   0
 {post => user/post}/invoice_model.php         |   0
 {post => user/post}/location.php              |   0
 {post => user/post}/location_model.php        |   0
 {post => user/post}/network.php               |   0
 {post => user/post}/network_model.php         |   0
 {post => user/post}/product.php               |   0
 {post => user/post}/product_model.php         |   0
 {post => user/post}/profile.php               |   0
 {post => user/post}/project.php               |   0
 {post => user/post}/quote.php                 |   0
 {post => user/post}/quote_model.php           |   0
 {post => user/post}/rack.php                  |   0
 {post => user/post}/revenue.php               |   0
 {post => user/post}/service.php               |   0
 {post => user/post}/software.php              |   0
 {post => user/post}/tag.php                   |   0
 {post => user/post}/tag_model.php             |   0
 {post => user/post}/task.php                  |   0
 {post => user/post}/ticket.php                |   0
 .../post}/ticket_recurring_model.php          |   0
 {post => user/post}/transfer.php              |   0
 {post => user/post}/transfer_model.php        |   0
 {post => user/post}/trip.php                  |   0
 {post => user/post}/trip_model.php            |   0
 {post => user/post}/vendor.php                |   0
 {post => user/post}/vendor_contact.php        |   0
 {post => user/post}/vendor_contact_model.php  |   0
 {post => user/post}/vendor_model.php          |   0
 products.php => user/products.php             |   4 +-
 .../project_details.php                       |   2 +-
 projects.php => user/projects.php             |   4 +-
 quote.php => user/quote.php                   |   4 +-
 quotes.php => user/quotes.php                 |   4 +-
 .../recurring_expenses.php                    |   4 +-
 .../recurring_invoice.php                     |   4 +-
 .../recurring_invoices.php                    |   4 +-
 .../recurring_tickets.php                     |   4 +-
 {reports => user/reports}/budget.php          |   0
 .../reports}/clients_with_balance.php         |   0
 .../reports}/credential_rotation.php          |   0
 .../reports}/expense_by_vendor.php            |   0
 {reports => user/reports}/expense_summary.php |   0
 user/reports/includes/footer.php              |  53 +++
 {reports => user/reports}/includes/header.php |  26 +-
 user/reports/includes/inc_all_reports.php     |  19 ++
 .../reports}/includes/modal_footer.php        |   0
 .../reports}/includes/modal_header.php        |   0
 .../reports}/includes/side_nav.php            |   0
 .../reports}/income_by_client.php             |   0
 {reports => user/reports}/income_summary.php  |   0
 {reports => user/reports}/index.php           |   0
 {reports => user/reports}/profit_loss.php     |   0
 .../reports}/recurring_by_client.php          |   0
 {reports => user/reports}/tax_summary.php     |   0
 .../reports}/ticket_by_client.php             |   0
 {reports => user/reports}/ticket_summary.php  |   0
 .../reports}/tickets_unbilled.php             |   0
 {reports => user/reports}/time_by_tech.php    |   0
 revenues.php => user/revenues.php             |   4 +-
 services.php => user/services.php             |   4 +-
 software.php => user/software.php             |   4 +-
 ticket.php => user/ticket.php                 |   4 +-
 tickets.php => user/tickets.php               |   2 +-
 tickets_kanban.php => user/tickets_kanban.php |   0
 tickets_list.php => user/tickets_list.php     |   2 +-
 transfers.php => user/transfers.php           |   4 +-
 trips.php => user/trips.php                   |   4 +-
 user/user_activity.php                        |   2 +-
 user/user_details.php                         |   2 +-
 user/user_preferences.php                     |   2 +-
 user/user_security.php                        |   2 +-
 vendor_details.php => user/vendor_details.php |   2 +-
 vendors.php => user/vendors.php               |   4 +-
 407 files changed, 701 insertions(+), 670 deletions(-)
 rename {modals => admin/modals}/admin_ai_model_add_modal.php (100%)
 rename {modals => admin/modals}/admin_ai_provider_add_modal.php (100%)
 rename {modals => admin/modals}/admin_api_key_add_modal.php (100%)
 rename {modals => admin/modals}/admin_category_add_modal.php (100%)
 rename {modals => admin/modals}/admin_custom_link_add_modal.php (100%)
 rename {modals => admin/modals}/admin_document_template_add_modal.php (100%)
 rename {modals => admin/modals}/admin_payment_method_add_modal.php (100%)
 rename {modals => admin/modals}/admin_payment_provider_add_modal.php (100%)
 rename {modals => admin/modals}/admin_project_template_add_modal.php (100%)
 rename {modals => admin/modals}/admin_project_template_edit_modal.php (100%)
 rename {modals => admin/modals}/admin_project_template_ticket_template_add_modal.php (100%)
 rename {modals => admin/modals}/admin_role_add_modal.php (100%)
 rename {modals => admin/modals}/admin_software_template_add_modal.php (100%)
 rename {modals => admin/modals}/admin_tag_add_modal.php (100%)
 rename {modals => admin/modals}/admin_tax_add_modal.php (100%)
 rename {modals => admin/modals}/admin_ticket_status_add_modal.php (100%)
 rename {modals => admin/modals}/admin_ticket_template_add_modal.php (100%)
 rename {modals => admin/modals}/admin_ticket_template_edit_modal.php (100%)
 rename {modals => admin/modals}/admin_user_add_modal.php (100%)
 rename {modals => admin/modals}/admin_user_all_reset_password_modal.php (100%)
 rename {modals => admin/modals}/admin_user_archive_modal.php (100%)
 rename {modals => admin/modals}/admin_user_export_modal.php (100%)
 rename {modals => admin/modals}/admin_user_invite_modal.php (100%)
 rename {modals => admin/modals}/admin_vendor_template_add_modal.php (100%)
 delete mode 100644 admin_role.php
 delete mode 100644 admin_user.php
 create mode 100644 custom/post.php
 create mode 100644 custom/post/readme.php
 rename {xcustom => custom}/readme.php (100%)
 create mode 100644 custom/test.php
 delete mode 100644 post.php
 delete mode 100644 reports/includes/footer.php
 rename db.sql => setup/db.sql (100%)
 rename setup.php => setup/index.php (100%)
 rename accounts.php => user/accounts.php (98%)
 rename {ajax => user/ajax}/ajax_account_edit.php (100%)
 rename {ajax => user/ajax}/ajax_admin_mail_queue_message_view.php (100%)
 rename {ajax => user/ajax}/ajax_ai_model_edit.php (100%)
 rename {ajax => user/ajax}/ajax_ai_provider_edit.php (100%)
 rename {ajax => user/ajax}/ajax_asset_copy.php (100%)
 rename {ajax => user/ajax}/ajax_asset_details.php (100%)
 rename {ajax => user/ajax}/ajax_asset_edit.php (100%)
 rename {ajax => user/ajax}/ajax_asset_interface_edit.php (100%)
 rename {ajax => user/ajax}/ajax_asset_link_credential.php (100%)
 rename {ajax => user/ajax}/ajax_asset_link_document.php (100%)
 rename {ajax => user/ajax}/ajax_asset_link_file.php (100%)
 rename {ajax => user/ajax}/ajax_asset_link_service.php (100%)
 rename {ajax => user/ajax}/ajax_asset_link_software.php (100%)
 rename {ajax => user/ajax}/ajax_calendar_edit.php (100%)
 rename {ajax => user/ajax}/ajax_calendar_event_edit.php (100%)
 rename {ajax => user/ajax}/ajax_category_add.php (100%)
 rename {ajax => user/ajax}/ajax_category_edit.php (100%)
 rename {ajax => user/ajax}/ajax_certificate_edit.php (100%)
 rename {ajax => user/ajax}/ajax_contact_details.php (100%)
 rename {ajax => user/ajax}/ajax_contact_edit.php (100%)
 rename {ajax => user/ajax}/ajax_contact_link_asset.php (100%)
 rename {ajax => user/ajax}/ajax_contact_link_credential.php (100%)
 rename {ajax => user/ajax}/ajax_contact_link_document.php (100%)
 rename {ajax => user/ajax}/ajax_contact_link_file.php (100%)
 rename {ajax => user/ajax}/ajax_contact_link_service.php (100%)
 rename {ajax => user/ajax}/ajax_contact_link_software.php (100%)
 rename {ajax => user/ajax}/ajax_contact_note_create.php (100%)
 rename {ajax => user/ajax}/ajax_credential_edit.php (100%)
 rename {ajax => user/ajax}/ajax_credential_view.php (100%)
 rename {ajax => user/ajax}/ajax_custom_link_edit.php (100%)
 rename {ajax => user/ajax}/ajax_custom_ticket_status_edit.php (100%)
 rename {ajax => user/ajax}/ajax_document_edit.php (100%)
 rename {ajax => user/ajax}/ajax_document_move.php (100%)
 rename {ajax => user/ajax}/ajax_document_rename.php (100%)
 rename {ajax => user/ajax}/ajax_document_template_edit.php (100%)
 rename {ajax => user/ajax}/ajax_document_version_view.php (100%)
 rename {ajax => user/ajax}/ajax_document_view.php (100%)
 rename {ajax => user/ajax}/ajax_domain_edit.php (100%)
 rename {ajax => user/ajax}/ajax_expense_copy.php (100%)
 rename {ajax => user/ajax}/ajax_expense_edit.php (100%)
 rename {ajax => user/ajax}/ajax_expense_refund.php (100%)
 rename {ajax => user/ajax}/ajax_file_move.php (100%)
 rename {ajax => user/ajax}/ajax_file_rename.php (100%)
 rename {ajax => user/ajax}/ajax_folder_rename.php (100%)
 rename {ajax => user/ajax}/ajax_invoice_apply_credit.php (100%)
 rename {ajax => user/ajax}/ajax_invoice_copy.php (100%)
 rename {ajax => user/ajax}/ajax_invoice_edit.php (100%)
 rename {ajax => user/ajax}/ajax_invoice_pay.php (100%)
 rename {ajax => user/ajax}/ajax_item_edit.php (100%)
 rename {ajax => user/ajax}/ajax_location_edit.php (100%)
 rename {ajax => user/ajax}/ajax_network_edit.php (100%)
 rename {ajax => user/ajax}/ajax_notifications.php (100%)
 rename {ajax => user/ajax}/ajax_payment_method_edit.php (100%)
 rename {ajax => user/ajax}/ajax_payment_provider_edit.php (100%)
 rename {ajax => user/ajax}/ajax_product_edit.php (100%)
 rename {ajax => user/ajax}/ajax_project_edit.php (100%)
 rename {ajax => user/ajax}/ajax_quote_copy.php (100%)
 rename {ajax => user/ajax}/ajax_quote_edit.php (100%)
 rename {ajax => user/ajax}/ajax_rack_device_add.php (100%)
 rename {ajax => user/ajax}/ajax_rack_edit.php (100%)
 rename {ajax => user/ajax}/ajax_recurring_expense_edit.php (100%)
 rename {ajax => user/ajax}/ajax_recurring_invoice_edit.php (100%)
 rename {ajax => user/ajax}/ajax_recurring_ticket_edit.php (100%)
 rename {ajax => user/ajax}/ajax_revenue_edit.php (100%)
 rename {ajax => user/ajax}/ajax_role_edit.php (100%)
 rename {ajax => user/ajax}/ajax_service_details.php (100%)
 rename {ajax => user/ajax}/ajax_service_edit.php (100%)
 rename {ajax => user/ajax}/ajax_software_edit.php (100%)
 rename {ajax => user/ajax}/ajax_software_template_edit.php (100%)
 rename {ajax => user/ajax}/ajax_tag_add.php (100%)
 rename {ajax => user/ajax}/ajax_tag_edit.php (100%)
 rename {ajax => user/ajax}/ajax_tax_edit.php (100%)
 rename {ajax => user/ajax}/ajax_ticket_assign.php (100%)
 rename {ajax => user/ajax}/ajax_ticket_billable.php (100%)
 rename {ajax => user/ajax}/ajax_ticket_contact.php (100%)
 rename {ajax => user/ajax}/ajax_ticket_edit.php (100%)
 rename {ajax => user/ajax}/ajax_ticket_priority.php (100%)
 rename {ajax => user/ajax}/ajax_ticket_reply_edit.php (100%)
 rename {ajax => user/ajax}/ajax_ticket_reply_redact.php (100%)
 rename {ajax => user/ajax}/ajax_ticket_task_edit.php (100%)
 rename {ajax => user/ajax}/ajax_ticket_template_task_edit.php (100%)
 rename {ajax => user/ajax}/ajax_transfer_edit.php (100%)
 rename {ajax => user/ajax}/ajax_trip_copy.php (100%)
 rename {ajax => user/ajax}/ajax_trip_edit.php (100%)
 rename {ajax => user/ajax}/ajax_user_edit.php (100%)
 rename {ajax => user/ajax}/ajax_vendor_details.php (100%)
 rename {ajax => user/ajax}/ajax_vendor_edit.php (100%)
 rename {ajax => user/ajax}/ajax_vendor_template_edit.php (100%)
 rename asset_details.php => user/asset_details.php (99%)
 rename assets.php => user/assets.php (99%)
 rename blank.php => user/blank.php (98%)
 rename budget.php => user/budget.php (98%)
 rename budget_edit.php => user/budget_edit.php (99%)
 rename calendar.php => user/calendar.php (99%)
 rename certificates.php => user/certificates.php (99%)
 rename client_autopay.php => user/client_autopay.php (98%)
 rename client_document_details.php => user/client_document_details.php (99%)
 rename client_documents.php => user/client_documents.php (99%)
 rename client_files.php => user/client_files.php (99%)
 rename client_overview.php => user/client_overview.php (99%)
 rename client_racks.php => user/client_racks.php (99%)
 rename clients.php => user/clients.php (99%)
 rename contact_details.php => user/contact_details.php (99%)
 rename contacts.php => user/contacts.php (99%)
 rename credentials.php => user/credentials.php (99%)
 rename dashboard.php => user/dashboard.php (99%)
 rename database_updates.php => user/database_updates.php (100%)
 rename domains.php => user/domains.php (99%)
 rename expenses.php => user/expenses.php (99%)
 rename global_search.php => user/global_search.php (99%)
 rename reports/includes/inc_all_reports.php => user/includes/inc_all.php (64%)
 create mode 100644 user/includes/inc_all_client.php
 create mode 100644 user/includes/inc_all_user.php
 rename {includes => user/includes}/side_nav.php (100%)
 create mode 100644 user/index.php
 rename invoice.php => user/invoice.php (99%)
 rename invoices.php => user/invoices.php (99%)
 rename locations.php => user/locations.php (99%)
 rename mfa_enforcement.php => user/mfa_enforcement.php (100%)
 rename {modals => user/modals}/account_add_modal.php (100%)
 rename {modals => user/modals}/asset_add_modal.php (100%)
 rename {modals => user/modals}/asset_bulk_add_ticket_modal.php (100%)
 rename {modals => user/modals}/asset_bulk_assign_contact_modal.php (100%)
 rename {modals => user/modals}/asset_bulk_assign_location_modal.php (100%)
 rename {modals => user/modals}/asset_bulk_assign_physical_location_modal.php (100%)
 rename {modals => user/modals}/asset_bulk_edit_status_modal.php (100%)
 rename {modals => user/modals}/asset_bulk_transfer_client_modal.php (100%)
 rename {modals => user/modals}/asset_export_modal.php (100%)
 rename {modals => user/modals}/asset_import_modal.php (100%)
 rename {modals => user/modals}/asset_interface_add_modal.php (100%)
 rename {modals => user/modals}/asset_interface_bulk_edit_network_modal.php (100%)
 rename {modals => user/modals}/asset_interface_bulk_edit_type_modal.php (100%)
 rename {modals => user/modals}/asset_interface_export_modal.php (100%)
 rename {modals => user/modals}/asset_interface_import_modal.php (100%)
 rename {modals => user/modals}/asset_interface_multiple_add_modal.php (100%)
 rename {modals => user/modals}/budget_create_modal.php (100%)
 rename {modals => user/modals}/budget_edit_modal.php (100%)
 rename {modals => user/modals}/calendar_add_modal.php (100%)
 rename {modals => user/modals}/calendar_event_add_modal.php (100%)
 rename {modals => user/modals}/certificate_add_modal.php (100%)
 rename {modals => user/modals}/certificate_export_modal.php (100%)
 rename {modals => user/modals}/client_asset_documents_modal.php (100%)
 rename {modals => user/modals}/client_document_add_file_relation_modal.php (100%)
 rename {modals => user/modals}/client_document_add_from_template_modal.php (100%)
 rename {modals => user/modals}/client_document_add_modal.php (100%)
 rename {modals => user/modals}/client_document_bulk_move_modal.php (100%)
 rename {modals => user/modals}/client_document_link_asset_modal.php (100%)
 rename {modals => user/modals}/client_document_link_contact_modal.php (100%)
 rename {modals => user/modals}/client_document_link_file_modal.php (100%)
 rename {modals => user/modals}/client_document_link_software_modal.php (100%)
 rename {modals => user/modals}/client_document_link_vendor_modal.php (100%)
 rename {modals => user/modals}/client_file_bulk_move_modal.php (100%)
 rename {modals => user/modals}/client_file_delete_modal.php (100%)
 rename {modals => user/modals}/client_file_link_asset_modal.php (100%)
 rename {modals => user/modals}/client_file_upload_modal.php (100%)
 rename {modals => user/modals}/client_file_view_modal.php (100%)
 rename {modals => user/modals}/client_rack_add_modal.php (100%)
 rename {modals => user/modals}/client_recurring_export_modal.php (100%)
 rename {modals => user/modals}/clients/client_add.php (100%)
 rename {modals => user/modals}/clients/client_bulk_assign_tags.php (100%)
 rename {modals => user/modals}/clients/client_bulk_edit_hourly_rate.php (100%)
 rename {modals => user/modals}/clients/client_bulk_edit_industry.php (100%)
 rename {modals => user/modals}/clients/client_bulk_edit_referral.php (100%)
 rename {modals => user/modals}/clients/client_bulk_email.php (100%)
 rename {modals => user/modals}/clients/client_credit_add.php (100%)
 rename {modals => user/modals}/clients/client_delete.php (100%)
 rename {modals => user/modals}/clients/client_download_pdf.php (100%)
 rename {modals => user/modals}/clients/client_edit.php (100%)
 rename {modals => user/modals}/clients/client_export.php (100%)
 rename {modals => user/modals}/clients/client_import.php (100%)
 rename {modals => user/modals}/contact_add_modal.php (100%)
 rename {modals => user/modals}/contact_archive_modal.php (100%)
 rename {modals => user/modals}/contact_bulk_assign_location_modal.php (100%)
 rename {modals => user/modals}/contact_bulk_assign_tags_modal.php (100%)
 rename {modals => user/modals}/contact_bulk_edit_department_modal.php (100%)
 rename {modals => user/modals}/contact_bulk_edit_phone_modal.php (100%)
 rename {modals => user/modals}/contact_bulk_edit_role_modal.php (100%)
 rename {modals => user/modals}/contact_bulk_email_modal.php (100%)
 rename {modals => user/modals}/contact_create_note_modal.php (100%)
 rename {modals => user/modals}/contact_export_modal.php (100%)
 rename {modals => user/modals}/contact_import_modal.php (100%)
 rename {modals => user/modals}/contact_invite_modal.php (100%)
 rename {modals => user/modals}/credential_add_modal.php (100%)
 rename {modals => user/modals}/credential_bulk_assign_tags_modal.php (100%)
 rename {modals => user/modals}/credential_export_modal.php (100%)
 rename {modals => user/modals}/credential_import_modal.php (100%)
 rename {modals => user/modals}/custom_field_create_modal.php (100%)
 rename {modals => user/modals}/custom_field_edit_modal.php (100%)
 rename {modals => user/modals}/document_edit_visibility_modal.php (100%)
 rename {modals => user/modals}/domain_add_modal.php (100%)
 rename {modals => user/modals}/domain_export_modal.php (100%)
 rename {modals => user/modals}/expense_add_modal.php (100%)
 rename {modals => user/modals}/expense_bulk_edit_account_modal.php (100%)
 rename {modals => user/modals}/expense_bulk_edit_category_modal.php (100%)
 rename {modals => user/modals}/expense_bulk_edit_client_modal.php (100%)
 rename {modals => user/modals}/expense_export_modal.php (100%)
 rename {modals => user/modals}/folder_create_modal.php (100%)
 rename {modals => user/modals}/invoice_add_modal.php (100%)
 rename {modals => user/modals}/invoice_add_ticket_modal.php (100%)
 rename {modals => user/modals}/invoice_bulk_edit_category_modal.php (100%)
 rename {modals => user/modals}/invoice_export_modal.php (100%)
 rename {modals => user/modals}/invoice_note_modal.php (100%)
 rename {modals => user/modals}/invoice_payment_add_bulk_modal.php (100%)
 rename {modals => user/modals}/invoice_recurring_add_modal.php (100%)
 rename {modals => user/modals}/item_edit_modal.php (100%)
 rename {modals => user/modals}/location_add_modal.php (100%)
 rename {modals => user/modals}/location_bulk_assign_tags_modal.php (100%)
 rename {modals => user/modals}/location_export_modal.php (100%)
 rename {modals => user/modals}/location_import_modal.php (100%)
 rename {modals => user/modals}/network_add_modal.php (100%)
 rename {modals => user/modals}/network_export_modal.php (100%)
 rename {modals => user/modals}/payment_export_modal.php (100%)
 rename {modals => user/modals}/product_add_modal.php (100%)
 rename {modals => user/modals}/product_bulk_edit_category_modal.php (100%)
 rename {modals => user/modals}/product_export_modal.php (100%)
 rename {modals => user/modals}/project_add_modal.php (100%)
 rename {modals => user/modals}/project_link_closed_ticket_modal.php (100%)
 rename {modals => user/modals}/project_link_ticket_modal.php (100%)
 rename {modals => user/modals}/quote_add_modal.php (100%)
 rename {modals => user/modals}/quote_export_modal.php (100%)
 rename {modals => user/modals}/quote_note_modal.php (100%)
 rename {modals => user/modals}/quote_to_invoice_modal.php (100%)
 rename {modals => user/modals}/recurring_expense_create_modal.php (100%)
 rename {modals => user/modals}/recurring_invoice_add_modal.php (100%)
 rename {modals => user/modals}/recurring_invoice_note_modal.php (100%)
 rename {modals => user/modals}/recurring_payment_add_modal.php (100%)
 rename {modals => user/modals}/recurring_ticket_add_modal.php (100%)
 rename {modals => user/modals}/revenue_add_modal.php (100%)
 rename {modals => user/modals}/service_add_modal.php (100%)
 rename {modals => user/modals}/share_modal.php (100%)
 rename {modals => user/modals}/software_add_from_template_modal.php (100%)
 rename {modals => user/modals}/software_add_modal.php (100%)
 rename {modals => user/modals}/software_export_modal.php (100%)
 rename {modals => user/modals}/ticket_add_modal.php (100%)
 rename {modals => user/modals}/ticket_add_modal_v2.php (100%)
 rename {modals => user/modals}/ticket_add_watcher_modal.php (100%)
 rename {modals => user/modals}/ticket_bulk_add_project_modal.php (100%)
 rename {modals => user/modals}/ticket_bulk_assign_modal.php (100%)
 rename {modals => user/modals}/ticket_bulk_edit_category_modal.php (100%)
 rename {modals => user/modals}/ticket_bulk_edit_priority_modal.php (100%)
 rename {modals => user/modals}/ticket_bulk_merge_modal.php (100%)
 rename {modals => user/modals}/ticket_bulk_reply_modal.php (100%)
 rename {modals => user/modals}/ticket_bulk_resolve_modal.php (100%)
 rename {modals => user/modals}/ticket_change_client_modal.php (100%)
 rename {modals => user/modals}/ticket_edit_asset_modal.php (100%)
 rename {modals => user/modals}/ticket_edit_schedule_modal.php (100%)
 rename {modals => user/modals}/ticket_edit_vendor_modal.php (100%)
 rename {modals => user/modals}/ticket_export_modal.php (100%)
 rename {modals => user/modals}/ticket_invoice_add_modal.php (100%)
 rename {modals => user/modals}/ticket_merge_modal.php (100%)
 rename {modals => user/modals}/top_nav_tickets_modal.php (100%)
 rename {modals => user/modals}/transfer_add_modal.php (100%)
 rename {modals => user/modals}/trip_add_modal.php (100%)
 rename {modals => user/modals}/trip_export_modal.php (100%)
 rename {modals => user/modals}/user_mfa_modal.php (100%)
 rename {modals => user/modals}/vendor_add_from_template_modal.php (100%)
 rename {modals => user/modals}/vendor_add_modal.php (100%)
 rename {modals => user/modals}/vendor_contact_add_modal.php (100%)
 rename {modals => user/modals}/vendor_contact_edit_modal.php (100%)
 rename {modals => user/modals}/vendor_export_modal.php (100%)
 rename networks.php => user/networks.php (99%)
 rename notifications.php => user/notifications.php (98%)
 rename payments.php => user/payments.php (99%)
 create mode 100644 user/post.php
 rename {post => user/post}/account.php (100%)
 rename {post => user/post}/asset.php (100%)
 rename {post => user/post}/asset_interface_model.php (100%)
 rename {post => user/post}/asset_model.php (100%)
 rename {post => user/post}/budget.php (100%)
 rename {post => user/post}/category.php (100%)
 rename {post => user/post}/category_model.php (100%)
 rename {post => user/post}/certificate.php (100%)
 rename {post => user/post}/certificate_model.php (100%)
 rename {post => user/post}/client.php (100%)
 rename {post => user/post}/client_model.php (100%)
 rename {post => user/post}/contact.php (100%)
 rename {post => user/post}/contact_model.php (100%)
 rename {post => user/post}/credential.php (100%)
 rename {post => user/post}/credential_model.php (100%)
 rename {post => user/post}/credit.php (100%)
 rename {post => user/post}/document.php (100%)
 rename {post => user/post}/document_model.php (100%)
 rename {post => user/post}/domain.php (100%)
 rename {post => user/post}/domain_model.php (100%)
 rename {post => user/post}/event.php (100%)
 rename {post => user/post}/event_model.php (100%)
 rename {post => user/post}/expense.php (100%)
 rename {post => user/post}/expense_model.php (100%)
 rename {post => user/post}/file.php (100%)
 rename {post => user/post}/folder.php (100%)
 rename {post => user/post}/invoice.php (100%)
 rename {post => user/post}/invoice_model.php (100%)
 rename {post => user/post}/location.php (100%)
 rename {post => user/post}/location_model.php (100%)
 rename {post => user/post}/network.php (100%)
 rename {post => user/post}/network_model.php (100%)
 rename {post => user/post}/product.php (100%)
 rename {post => user/post}/product_model.php (100%)
 rename {post => user/post}/profile.php (100%)
 rename {post => user/post}/project.php (100%)
 rename {post => user/post}/quote.php (100%)
 rename {post => user/post}/quote_model.php (100%)
 rename {post => user/post}/rack.php (100%)
 rename {post => user/post}/revenue.php (100%)
 rename {post => user/post}/service.php (100%)
 rename {post => user/post}/software.php (100%)
 rename {post => user/post}/tag.php (100%)
 rename {post => user/post}/tag_model.php (100%)
 rename {post => user/post}/task.php (100%)
 rename {post => user/post}/ticket.php (100%)
 rename {post => user/post}/ticket_recurring_model.php (100%)
 rename {post => user/post}/transfer.php (100%)
 rename {post => user/post}/transfer_model.php (100%)
 rename {post => user/post}/trip.php (100%)
 rename {post => user/post}/trip_model.php (100%)
 rename {post => user/post}/vendor.php (100%)
 rename {post => user/post}/vendor_contact.php (100%)
 rename {post => user/post}/vendor_contact_model.php (100%)
 rename {post => user/post}/vendor_model.php (100%)
 rename products.php => user/products.php (99%)
 rename project_details.php => user/project_details.php (99%)
 rename projects.php => user/projects.php (99%)
 rename quote.php => user/quote.php (99%)
 rename quotes.php => user/quotes.php (99%)
 rename recurring_expenses.php => user/recurring_expenses.php (99%)
 rename recurring_invoice.php => user/recurring_invoice.php (99%)
 rename recurring_invoices.php => user/recurring_invoices.php (99%)
 rename recurring_tickets.php => user/recurring_tickets.php (99%)
 rename {reports => user/reports}/budget.php (100%)
 rename {reports => user/reports}/clients_with_balance.php (100%)
 rename {reports => user/reports}/credential_rotation.php (100%)
 rename {reports => user/reports}/expense_by_vendor.php (100%)
 rename {reports => user/reports}/expense_summary.php (100%)
 create mode 100644 user/reports/includes/footer.php
 rename {reports => user/reports}/includes/header.php (51%)
 create mode 100644 user/reports/includes/inc_all_reports.php
 rename {reports => user/reports}/includes/modal_footer.php (100%)
 rename {reports => user/reports}/includes/modal_header.php (100%)
 rename {reports => user/reports}/includes/side_nav.php (100%)
 rename {reports => user/reports}/income_by_client.php (100%)
 rename {reports => user/reports}/income_summary.php (100%)
 rename {reports => user/reports}/index.php (100%)
 rename {reports => user/reports}/profit_loss.php (100%)
 rename {reports => user/reports}/recurring_by_client.php (100%)
 rename {reports => user/reports}/tax_summary.php (100%)
 rename {reports => user/reports}/ticket_by_client.php (100%)
 rename {reports => user/reports}/ticket_summary.php (100%)
 rename {reports => user/reports}/tickets_unbilled.php (100%)
 rename {reports => user/reports}/time_by_tech.php (100%)
 rename revenues.php => user/revenues.php (99%)
 rename services.php => user/services.php (99%)
 rename software.php => user/software.php (99%)
 rename ticket.php => user/ticket.php (99%)
 rename tickets.php => user/tickets.php (99%)
 rename tickets_kanban.php => user/tickets_kanban.php (100%)
 rename tickets_list.php => user/tickets_list.php (99%)
 rename transfers.php => user/transfers.php (99%)
 rename trips.php => user/trips.php (99%)
 rename vendor_details.php => user/vendor_details.php (99%)
 rename vendors.php => user/vendors.php (99%)

diff --git a/admin/includes/side_nav.php b/admin/includes/side_nav.php
index fe134d33..d005e69e 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="../">
+    <a class="brand-link pb-1 mt-1" href="../user">
         <p class="h6">
             <i class="nav-icon fas fa-arrow-left ml-3 mr-2"></i>
             <span class="brand-text">
diff --git a/modals/admin_ai_model_add_modal.php b/admin/modals/admin_ai_model_add_modal.php
similarity index 100%
rename from modals/admin_ai_model_add_modal.php
rename to admin/modals/admin_ai_model_add_modal.php
diff --git a/modals/admin_ai_provider_add_modal.php b/admin/modals/admin_ai_provider_add_modal.php
similarity index 100%
rename from modals/admin_ai_provider_add_modal.php
rename to admin/modals/admin_ai_provider_add_modal.php
diff --git a/modals/admin_api_key_add_modal.php b/admin/modals/admin_api_key_add_modal.php
similarity index 100%
rename from modals/admin_api_key_add_modal.php
rename to admin/modals/admin_api_key_add_modal.php
diff --git a/modals/admin_category_add_modal.php b/admin/modals/admin_category_add_modal.php
similarity index 100%
rename from modals/admin_category_add_modal.php
rename to admin/modals/admin_category_add_modal.php
diff --git a/modals/admin_custom_link_add_modal.php b/admin/modals/admin_custom_link_add_modal.php
similarity index 100%
rename from modals/admin_custom_link_add_modal.php
rename to admin/modals/admin_custom_link_add_modal.php
diff --git a/modals/admin_document_template_add_modal.php b/admin/modals/admin_document_template_add_modal.php
similarity index 100%
rename from modals/admin_document_template_add_modal.php
rename to admin/modals/admin_document_template_add_modal.php
diff --git a/modals/admin_payment_method_add_modal.php b/admin/modals/admin_payment_method_add_modal.php
similarity index 100%
rename from modals/admin_payment_method_add_modal.php
rename to admin/modals/admin_payment_method_add_modal.php
diff --git a/modals/admin_payment_provider_add_modal.php b/admin/modals/admin_payment_provider_add_modal.php
similarity index 100%
rename from modals/admin_payment_provider_add_modal.php
rename to admin/modals/admin_payment_provider_add_modal.php
diff --git a/modals/admin_project_template_add_modal.php b/admin/modals/admin_project_template_add_modal.php
similarity index 100%
rename from modals/admin_project_template_add_modal.php
rename to admin/modals/admin_project_template_add_modal.php
diff --git a/modals/admin_project_template_edit_modal.php b/admin/modals/admin_project_template_edit_modal.php
similarity index 100%
rename from modals/admin_project_template_edit_modal.php
rename to admin/modals/admin_project_template_edit_modal.php
diff --git a/modals/admin_project_template_ticket_template_add_modal.php b/admin/modals/admin_project_template_ticket_template_add_modal.php
similarity index 100%
rename from modals/admin_project_template_ticket_template_add_modal.php
rename to admin/modals/admin_project_template_ticket_template_add_modal.php
diff --git a/modals/admin_role_add_modal.php b/admin/modals/admin_role_add_modal.php
similarity index 100%
rename from modals/admin_role_add_modal.php
rename to admin/modals/admin_role_add_modal.php
diff --git a/modals/admin_software_template_add_modal.php b/admin/modals/admin_software_template_add_modal.php
similarity index 100%
rename from modals/admin_software_template_add_modal.php
rename to admin/modals/admin_software_template_add_modal.php
diff --git a/modals/admin_tag_add_modal.php b/admin/modals/admin_tag_add_modal.php
similarity index 100%
rename from modals/admin_tag_add_modal.php
rename to admin/modals/admin_tag_add_modal.php
diff --git a/modals/admin_tax_add_modal.php b/admin/modals/admin_tax_add_modal.php
similarity index 100%
rename from modals/admin_tax_add_modal.php
rename to admin/modals/admin_tax_add_modal.php
diff --git a/modals/admin_ticket_status_add_modal.php b/admin/modals/admin_ticket_status_add_modal.php
similarity index 100%
rename from modals/admin_ticket_status_add_modal.php
rename to admin/modals/admin_ticket_status_add_modal.php
diff --git a/modals/admin_ticket_template_add_modal.php b/admin/modals/admin_ticket_template_add_modal.php
similarity index 100%
rename from modals/admin_ticket_template_add_modal.php
rename to admin/modals/admin_ticket_template_add_modal.php
diff --git a/modals/admin_ticket_template_edit_modal.php b/admin/modals/admin_ticket_template_edit_modal.php
similarity index 100%
rename from modals/admin_ticket_template_edit_modal.php
rename to admin/modals/admin_ticket_template_edit_modal.php
diff --git a/modals/admin_user_add_modal.php b/admin/modals/admin_user_add_modal.php
similarity index 100%
rename from modals/admin_user_add_modal.php
rename to admin/modals/admin_user_add_modal.php
diff --git a/modals/admin_user_all_reset_password_modal.php b/admin/modals/admin_user_all_reset_password_modal.php
similarity index 100%
rename from modals/admin_user_all_reset_password_modal.php
rename to admin/modals/admin_user_all_reset_password_modal.php
diff --git a/modals/admin_user_archive_modal.php b/admin/modals/admin_user_archive_modal.php
similarity index 100%
rename from modals/admin_user_archive_modal.php
rename to admin/modals/admin_user_archive_modal.php
diff --git a/modals/admin_user_export_modal.php b/admin/modals/admin_user_export_modal.php
similarity index 100%
rename from modals/admin_user_export_modal.php
rename to admin/modals/admin_user_export_modal.php
diff --git a/modals/admin_user_invite_modal.php b/admin/modals/admin_user_invite_modal.php
similarity index 100%
rename from modals/admin_user_invite_modal.php
rename to admin/modals/admin_user_invite_modal.php
diff --git a/modals/admin_vendor_template_add_modal.php b/admin/modals/admin_vendor_template_add_modal.php
similarity index 100%
rename from modals/admin_vendor_template_add_modal.php
rename to admin/modals/admin_vendor_template_add_modal.php
diff --git a/admin/post.php b/admin/post.php
index d845b57f..5ad09ee6 100644
--- a/admin/post.php
+++ b/admin/post.php
@@ -31,3 +31,12 @@ if (isset($session_is_admin) && $session_is_admin) {
     include_once "post/$module.php";
     
 }
+
+// Logout is the same for user and admin
+require_once "../post/logout.php";
+
+// TODO: Find a home for these
+
+require_once "../post/ai.php";
+require_once "../post/misc.php";
+
diff --git a/admin_role.php b/admin_role.php
deleted file mode 100644
index 23aa2dbb..00000000
--- a/admin_role.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-// Default Column Sortby Filter
-$sort = "role_is_admin";
-$order = "DESC";
-
-require_once "includes/inc_all_admin.php";
-
-$sql = mysqli_query(
-    $mysqli,
-    "SELECT SQL_CALC_FOUND_ROWS * FROM user_roles
-    WHERE (role_name LIKE '%$q%' OR role_description LIKE '%$q%')
-    AND role_archived_at IS NULL
-    ORDER BY $sort $order LIMIT $record_from, $record_to"
-);
-
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-?>
-    <div class="alert alert-info text-center"><strong>Roles are still in development. Permissions may not be fully enforced.</strong></div>
-
-    <div class="card card-dark">
-        <div class="card-header py-2">
-            <h3 class="card-title mt-2"><i class="fas fa-fw fa-user-shield mr-2"></i>Roles</h3>
-            <div class="card-tools">
-                <div class="btn-group">
-                    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addRoleModal">
-                        <i class="fas fa-fw fa-user-plus mr-2"></i>New Role
-                    </button>
-                </div>
-            </div>
-        </div>
-        <div class="card-body">
-            <form class="mb-4" autocomplete="off">
-                <div class="row">
-                    <div class="col-md-4">
-                        <div class="input-group">
-                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) {echo stripslashes(nullable_htmlentities($q));} ?>" placeholder="Search Roles">
-                            <div class="input-group-append">
-                                <button class="btn btn-primary"><i class="fa fa-search"></i></button>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </form>
-            <hr>
-            <div class="table-responsive-sm">
-                <table class="table table-striped table-borderless table-hover">
-                    <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?> text-nowrap">
-                    <tr>
-                        <th>
-                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=role_name&order=<?php echo $disp; ?>">
-                                Role <?php if ($sort == 'role_name') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <th>Members</th>
-                        <th>
-                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=role_is_admin&order=<?php echo $disp; ?>">
-                                Admin <?php if ($sort == 'role_is_admin') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <th class="text-center">Action</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <?php
-
-                    while ($row = mysqli_fetch_array($sql)) {
-                        $role_id = intval($row['role_id']);
-                        $role_name = nullable_htmlentities($row['role_name']);
-                        $role_description = nullable_htmlentities($row['role_description']);
-                        $role_admin = intval($row['role_is_admin']);
-                        $role_archived_at = nullable_htmlentities($row['role_archived_at']);
-
-                        // Count number of users that have each role
-                        $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];
-
-                        $sql_users = mysqli_query($mysqli, "SELECT * FROM users WHERE user_role_id = $role_id AND user_archived_at IS NULL");
-                        // Initialize an empty array to hold user names
-                        $user_names = [];
-
-                        // Fetch each row and store the user_name in the array
-                        while($row = mysqli_fetch_assoc($sql_users)) {
-                            $user_names[] = nullable_htmlentities($row['user_name']);
-                        }
-
-                        // Convert the array of user names to a comma-separated string
-                        $user_names_string = implode(",", $user_names);
-
-                        if (empty($user_names_string)) {
-                            $user_names_string = "-";
-                        }
-
-                        ?>
-                        <tr>
-                            <td>
-                                <a class="text-dark text-bold" href="#" data-toggle="modal" data-target="#editRoleModal<?php echo $role_id; ?>">
-                                    <?php echo $role_name; ?>
-                                </a>
-                                <div class="text-secondary"><?php echo $role_description; ?></div>
-                            </td>
-                            <td><?php echo $user_names_string; ?></td>
-                            <td><?php echo $role_admin ? 'Yes' : 'No' ; ?></td>
-                            <td>
-                                <?php if ($role_id !== 3) { ?>
-                                    <div class="dropdown dropleft text-center">
-                                        <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
-                                            <i class="fas fa-ellipsis-h"></i>
-                                        </button>
-                                        <div class="dropdown-menu">
-
-                                            <a class="dropdown-item" href="#"
-                                                data-toggle="ajax-modal"
-                                                data-ajax-url="ajax/ajax_role_edit.php"
-                                                data-ajax-id="<?php echo $role_id; ?>"
-                                                >
-                                                <i class="fas fa-fw fa-user-edit mr-2"></i>Edit
-                                            </a>
-
-                                            <?php if (empty($role_archived_at) && $role_user_count == 0) { ?>
-                                                <div class="dropdown-divider"></div>
-                                                <a class="dropdown-item text-danger confirm-link" href="post.php?archive_role=<?php echo $role_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
-                                                    <i class="fas fa-fw fa-archive mr-2"></i>Archive
-                                                </a>
-                                            <?php } ?>
-
-                                        </div>
-                                    </div>
-                                <?php } ?>
-                            </td>
-                        </tr>
-
-                        <?php
-
-                    }
-
-                    ?>
-
-                    </tbody>
-                </table>
-            </div>
-            <?php require_once "includes/filter_footer.php";
-            ?>
-        </div>
-    </div>
-
-<?php
-
-require_once "modals/admin_role_add_modal.php";
-require_once "includes/footer.php";
diff --git a/admin_user.php b/admin_user.php
deleted file mode 100644
index 35229cbf..00000000
--- a/admin_user.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-
-// Default Column Sortby Filter
-$sort = "user_name";
-$order = "ASC";
-
-require_once "includes/inc_all_admin.php";
-
-$sql = mysqli_query(
-    $mysqli,
-    "SELECT SQL_CALC_FOUND_ROWS * FROM users
-    LEFT JOIN user_roles ON user_role_id = role_id
-    LEFT JOIN user_settings ON users.user_id = user_settings.user_id
-    WHERE (user_name LIKE '%$q%' OR user_email LIKE '%$q%')
-    AND user_type = 1
-    AND user_archived_at IS NULL
-    ORDER BY $sort $order LIMIT $record_from, $record_to"
-);
-
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-?>
-
-<div class="card card-dark">
-    <div class="card-header py-2">
-        <h3 class="card-title mt-2"><i class="fas fa-fw fa-users mr-2"></i>Users</h3>
-        <div class="card-tools">
-            <div class="btn-group">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addUserModal">
-                    <i class="fas fa-fw fa-user-plus mr-2"></i>New User
-                </button>
-                <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
-                <div class="dropdown-menu">
-                    <!--<a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#userInviteModal"><i class="fas fa-paper-plane mr-2"></i>Invite User</a>-->
-                    <?php if ($num_rows[0] > 1) { ?>
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportUserModal"><i class="fa fa-fw fa-download mr-2"></i>Export</a>
-                        <div class="dropdown-divider"></div>
-                        <a class="dropdown-item text-danger" href="#" data-toggle="modal" data-target="#resetAllUserPassModal"><i class="fas fa-skull-crossbones mr-2"></i>IR</a>
-                    <?php } ?>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="card-body">
-        <form class="mb-4" autocomplete="off">
-            <div class="row">
-                <div class="col-md-4">
-                    <div class="input-group">
-                        <input type="search" class="form-control" name="q" value="<?php if (isset($q)) {echo stripslashes(nullable_htmlentities($q));} ?>" placeholder="Search Users">
-                        <div class="input-group-append">
-                            <button class="btn btn-primary"><i class="fa fa-search"></i></button>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-md-8">
-                </div>
-            </div>
-        </form>
-        <hr>
-        <div class="table-responsive-sm">
-            <table class="table table-striped table-borderless table-hover">
-                <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-                <tr>
-                    <th class="text-center">
-                        <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=user_name&order=<?php echo $disp; ?>">
-                            Name <?php if ($sort == 'user_name') { echo $order_icon; } ?>
-                        </a>
-                    </th>
-                    <th>
-                        <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=user_email&order=<?php echo $disp; ?>">
-                            Email <?php if ($sort == 'user_email') { echo $order_icon; } ?>
-                        </a>
-                    </th>
-                    <th>
-                        <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=role_name&order=<?php echo $disp; ?>">
-                            Role <?php if ($sort == 'role_name') { echo $order_icon; } ?>
-                        </a>
-                    </th>
-                    <th>
-                        <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=user_status&order=<?php echo $disp; ?>">
-                            Status <?php if ($sort == 'user_status') { echo $order_icon; } ?>
-                        </a>
-                    </th>
-                    <th class="text-center">MFA</th>
-                    <th>
-                        Last Login
-                    </th>
-                    <th class="text-center">Action</th>
-                </tr>
-                </thead>
-                <tbody>
-                <?php
-
-                while ($row = mysqli_fetch_array($sql)) {
-                    $user_id = intval($row['user_id']);
-                    $user_name = nullable_htmlentities($row['user_name']);
-                    $user_email = nullable_htmlentities($row['user_email']);
-                    $user_status = intval($row['user_status']);
-                    if ($user_status == 2) {
-                        $user_status_display = "<span class='text-info'>Invited</span>";
-                    } elseif ($user_status == 1) {
-                        $user_status_display = "<span class='text-success'>Active</span>";
-                    } else{
-                        $user_status_display = "<span class='text-danger'>Disabled</span>";
-                    }
-                    $user_avatar = nullable_htmlentities($row['user_avatar']);
-                    $user_token = nullable_htmlentities($row['user_token']);
-                    if(empty($user_token)) {
-                        $mfa_status_display = "<i class='fas fa-fw fa-unlock text-danger'></i>";
-                    } else {
-                        $mfa_status_display = "<i class='fas fa-fw fa-lock text-success'></i>";
-                    }
-                    $user_config_force_mfa = intval($row['user_config_force_mfa']);
-                    $user_role = intval($row['user_role_id']);
-                    $user_role_display = nullable_htmlentities($row['role_name']);
-                    $user_initials = nullable_htmlentities(initials($user_name));
-
-                    $sql_last_login = mysqli_query(
-                        $mysqli,
-                        "SELECT * FROM logs
-                        WHERE log_user_id = $user_id AND log_type = 'Login'
-                        ORDER BY log_id DESC LIMIT 1"
-                    );
-                    if (mysqli_num_rows($sql_last_login) == 0) {
-                        $last_login = "<span class='text-bold'>Never logged in</span>";
-                    } else {
-                        $row = mysqli_fetch_array($sql_last_login);
-                        $log_created_at = nullable_htmlentities($row['log_created_at']);
-                        $log_ip = nullable_htmlentities($row['log_ip']);
-                        $log_user_agent = nullable_htmlentities($row['log_user_agent']);
-                        $log_user_os = getOS($log_user_agent);
-                        $log_user_browser = getWebBrowser($log_user_agent);
-                        $last_login = "$log_created_at<small class='text-secondary'><div class='mt-1'>$log_user_os</div><div class='mt-1'>$log_user_browser</div><div class='mt-1'><i class='fa fa-fw fa-globe'></i> $log_ip</div></small>";
-                    }
-
-                    // Get User Client Access Permissions
-                    $user_client_access_sql = mysqli_query($mysqli,"SELECT client_id FROM user_client_permissions WHERE user_id = $user_id");
-                    $client_access_array = [];
-                    while ($row = mysqli_fetch_assoc($user_client_access_sql)) {
-                        $client_access_array[] = intval($row['client_id']);
-                    }
-
-                    $sql_remember_tokens = mysqli_query($mysqli, "SELECT * FROM remember_tokens WHERE remember_token_user_id = $user_id");
-                    $remember_token_count = mysqli_num_rows($sql_remember_tokens);
-
-
-
-                    ?>
-                    <tr>
-                        <td class="text-center">
-                            <a class="text-dark" href="#" 
-                                <?php if ($user_id !== $session_user_id) { // Prevent modifying self ?>
-                                data-toggle="ajax-modal"
-                                data-ajax-url="ajax/ajax_user_edit.php"
-                                data-ajax-id="<?php echo $user_id; ?>"
-                                <?php } ?>
-                                >
-                                <?php if (!empty($user_avatar)) { ?>
-                                    <img class="img-size-50 img-circle" src="<?php echo "uploads/users/$user_id/$user_avatar"; ?>">
-                                <?php } else { ?>
-                                    <span class="fa-stack fa-2x">
-                                        <i class="fa fa-circle fa-stack-2x text-secondary"></i>
-                                        <span class="fa fa-stack-1x text-white"><?php echo $user_initials; ?></span>
-                                    </span>
-                                    <br>
-                                <?php } ?>
-
-                                <div class="text-secondary"><?php echo $user_name; ?></div>
-                            </a>
-                        </td>
-                        <td><a href="mailto:<?php echo $user_email; ?>"><?php echo $user_email; ?></a></td>
-                        <td><?php echo $user_role_display; ?></td>
-                        <td><?php echo $user_status_display; ?></td>
-                        <td class="text-center"><?php echo $mfa_status_display; ?></td>
-                        <td><?php echo $last_login; ?></td>
-                        <td>
-                            <?php if ($user_id !== $session_user_id) {   // Prevent modifying self ?>
-                            <div class="dropdown dropleft text-center">
-                                <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
-                                    <i class="fas fa-ellipsis-h"></i>
-                                </button>
-                                <div class="dropdown-menu">
-                                    <a class="dropdown-item" href="#"
-                                        data-toggle="ajax-modal"
-                                        data-ajax-url="ajax/ajax_user_edit.php"
-                                        data-ajax-id="<?php echo $user_id; ?>"
-                                        >
-                                        <i class="fas fa-fw fa-user-edit mr-2"></i>Edit
-                                    </a>
-                                    <?php if ($remember_token_count > 0) { ?>
-                                    <a class="dropdown-item" href="post.php?revoke_remember_me=<?php echo $user_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>"><i class="fas fa-fw fa-ban mr-2"></i>Revoke <?php echo $remember_token_count; ?> Remember Tokens
-                                    </a>
-                                    <?php } ?>
-                                    <?php if ($user_status == 0) { ?>
-                                        <a class="dropdown-item text-success" href="post.php?activate_user=<?php echo $user_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
-                                            <i class="fas fa-fw fa-user-check mr-2"></i>Activate
-                                        </a>
-                                    <?php }elseif ($user_status == 1) { ?>
-                                        <a class="dropdown-item text-danger" href="post.php?disable_user=<?php echo $user_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
-                                            <i class="fas fa-fw fa-user-slash mr-2"></i>Disable
-                                        </a>
-                                    <?php } ?>
-                                    <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item text-danger" href="#" data-toggle="modal" data-target="#archiveUserModal<?php echo $user_id; ?>">
-                                        <i class="fas fa-fw fa-archive mr-2"></i>Archive
-                                    </a>
-                                </div>
-                            </div>
-                            <?php } ?>
-                        </td>
-                    </tr>
-
-                    <?php
-
-                    require "modals/admin_user_archive_modal.php";
-
-                }
-
-                ?>
-
-                </tbody>
-            </table>
-        </div>
-        <?php require_once "includes/filter_footer.php";
- ?>
-    </div>
-</div>
-<script>
-    function generatePassword() {
-        document.getElementById("password").value = "<?php echo randomString() ?>"
-    }
-</script>
-
-<?php
-require_once "modals/admin_user_add_modal.php";
-require_once "modals/admin_user_invite_modal.php";
-require_once "modals/admin_user_export_modal.php";
-require_once "modals/admin_user_all_reset_password_modal.php";
-require_once "includes/footer.php";
\ No newline at end of file
diff --git a/custom/post.php b/custom/post.php
new file mode 100644
index 00000000..9737b77a
--- /dev/null
+++ b/custom/post.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * ITFlow - Custom 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 (str_contains($module, 'custom')) {
+    // Dynamically load any custom POST logic
+
+    include_once "post/$module.php";
+
+}
+
+// Logout is the same for user and admin
+require_once "../post/logout.php";
+
+// TODO: Find a home for these
+
+require_once "../post/ai.php";
+require_once "../post/misc.php";
diff --git a/custom/post/readme.php b/custom/post/readme.php
new file mode 100644
index 00000000..bbfca6b4
--- /dev/null
+++ b/custom/post/readme.php
@@ -0,0 +1,13 @@
+<?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/xcustom/readme.php b/custom/readme.php
similarity index 100%
rename from xcustom/readme.php
rename to custom/readme.php
diff --git a/custom/test.php b/custom/test.php
new file mode 100644
index 00000000..22e056ed
--- /dev/null
+++ b/custom/test.php
@@ -0,0 +1,18 @@
+<?php
+require_once "../includes/inc_xcustom.php";
+?>
+
+    <!-- Breadcrumbs-->
+    <ol class="breadcrumb">
+        <li class="breadcrumb-item">
+            <a href="index.html">Dashboard</a>
+        </li>
+        <li class="breadcrumb-item active">Blank Page</li>
+    </ol>
+
+    <!-- Page Content -->
+    <h1>Blank Page</h1>
+    <hr>
+    <p>This is a great starting point for new custom pages.</p>
+
+<?php require_once "../includes/footer.php";
diff --git a/includes/footer.php b/includes/footer.php
index 0028c738..60235990 100644
--- a/includes/footer.php
+++ b/includes/footer.php
@@ -1,5 +1,5 @@
 <?php
-require_once "inc_confirm_modal.php";
+require_once "../includes/inc_confirm_modal.php";
 ?>
 
 <?php
@@ -19,27 +19,27 @@ if (str_contains(basename($_SERVER["PHP_SELF"]), "admin_")) { ?>
 <!-- REQUIRED SCRIPTS -->
 
 <!-- Bootstrap 4 -->
-<script src="plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
+<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>
+<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>
+<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>
diff --git a/includes/header.php b/includes/header.php
index 565a0df1..483084e1 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -22,28 +22,28 @@ header("X-Frame-Options: DENY");
     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 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">
+    <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">
+    <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">
+    <link href="../css/itflow_custom.css" rel="stylesheet">
     <!-- Theme style -->
-    <link rel="stylesheet" href="plugins/adminlte/css/adminlte.min.css">
+    <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>
+    <script src="../plugins/jquery/jquery.min.js"></script>
+    <script src="../plugins/toastr/toastr.min.js"></script>
 
 </head>
 <body class="
diff --git a/includes/top_nav.php b/includes/top_nav.php
index 7445610a..f3999766 100644
--- a/includes/top_nav.php
+++ b/includes/top_nav.php
@@ -66,7 +66,7 @@
         <li class="nav-item">
             <a class="nav-link" href="#"
                 data-toggle="ajax-modal"
-                data-ajax-url="ajax/ajax_notifications.php"
+                data-ajax-url="../ajax/ajax_notifications.php"
                 >
                 <i class="fas fa-bell"></i>
                 <?php if ($num_notifications) { ?>
@@ -82,7 +82,7 @@
                 <?php if (empty($session_avatar)) { ?>
                 <i class="fas fa-user-circle mr-1"></i>
                 <?php }else{ ?>
-                <img src="<?php echo "uploads/users/$session_user_id/$session_avatar"; ?>"
+                <img src="<?php echo "../uploads/users/$session_user_id/$session_avatar"; ?>"
                     class="user-image img-circle">
                 <?php } ?>
                 <span
@@ -95,7 +95,7 @@
                     <i class="fas fa-user-circle fa-6x"></i>
                     <?php }else{ ?>
 
-                    <img src="<?php echo "uploads/users/$session_user_id/$session_avatar"; ?>" class="img-circle">
+                    <img src="<?php echo "../uploads/users/$session_user_id/$session_avatar"; ?>" class="img-circle">
                     <?php } ?>
                     <p>
                         <?php echo stripslashes(nullable_htmlentities($session_name)); ?>
@@ -105,7 +105,7 @@
                 <!-- Menu Footer-->
                 <li class="user-footer">
                     <?php if ($session_is_admin) { ?>
-                        <a href="admin" 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/index.php b/index.php
index fa9c67b1..883a4c77 100644
--- a/index.php
+++ b/index.php
@@ -1,30 +1,14 @@
 <?php 
 
 if (file_exists("config.php")) {
-    require_once "includes/inc_all.php";
- ?>
-	<!-- Breadcrumbs-->
-	<ol class="breadcrumb">
-	  <li class="breadcrumb-item">
-	    <a href="index.php">Dashboard</a>
-	  </li>
-	  <li class="breadcrumb-item active">Blank Page</li>
-	</ol>
-
-	<!-- Page Content -->
-	<h1>Blank Page</h1>
-	<hr>
-	<?php
-
-    if (isset($config_start_page)) { ?>
-        <meta http-equiv="refresh" content="0;url=<?php echo $config_start_page; ?>">
-    <?php }
-
-	require_once "includes/footer.php";
-
-
+    //require_once "includes/check_login.php";
+ 
+    if (isset($config_start_page)) {
+        header("Location: /user/$config_start_page");
+    } else {
+        header("Location: /user");
+    }
 } else {
-	header("Location: setup.php");
+	header("Location: /setup");
 }
 
-?>
\ No newline at end of file
diff --git a/login.php b/login.php
index 845665ed..31ab4c01 100644
--- a/login.php
+++ b/login.php
@@ -4,7 +4,7 @@
 header("Content-Security-Policy: default-src 'self'");
 
 if (!file_exists('config.php')) {
-    header("Location: setup.php");
+    header("Location: setup");
     exit;
 }
 
diff --git a/post.php b/post.php
deleted file mode 100644
index 19280020..00000000
--- a/post.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/*
- * ITFlow - Main 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 (str_contains($module, 'admin') && 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/admin/$module.php";
-
-} elseif (str_contains($module, 'xcustom')) {
-    // Dynamically load any custom POST logic
-
-    include_once "post/xcustom/$module.php";
-
-} else {
-
-    // Load all module POST logic
-    //  Loads everything in post/user/
-    //  Eventually, it would be nice to only specifically load what we need like we do for admins
-
-    foreach (glob("post/user/*.php") as $user_module) {
-        if (!preg_match('/_model\.php$/', basename($user_module))) {
-            require_once $user_module;
-        }
-    }
-
-}
-
-// Logout is the same for user and admin
-require_once "post/logout.php";
-
-// TODO: Find a home for these
-
-require_once "post/ai.php";
-require_once "post/misc.php";
diff --git a/post/logout.php b/post/logout.php
index 33c6e31b..74c9598f 100644
--- a/post/logout.php
+++ b/post/logout.php
@@ -24,9 +24,9 @@ if (isset($_GET['logout'])) {
     session_destroy();
 
     if ($config_login_key_required == 1) {
-        header('Location: login.php?key=' . $config_login_key_secret);
+        header('Location: ../login.php?key=' . $config_login_key_secret);
     } else {
-        header('Location: login.php');
+        header('Location: ../login.php');
     }
 }
 
diff --git a/reports/includes/footer.php b/reports/includes/footer.php
deleted file mode 100644
index 60235990..00000000
--- a/reports/includes/footer.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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/db.sql b/setup/db.sql
similarity index 100%
rename from db.sql
rename to setup/db.sql
diff --git a/setup.php b/setup/index.php
similarity index 100%
rename from setup.php
rename to setup/index.php
diff --git a/accounts.php b/user/accounts.php
similarity index 98%
rename from accounts.php
rename to user/accounts.php
index d1b2aecc..16ca6995 100644
--- a/accounts.php
+++ b/user/accounts.php
@@ -124,11 +124,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php require_once "includes/filter_footer.php"; ?>
+            <?php require_once "../includes/filter_footer.php"; ?>
         </div>
     </div>
 
 <?php
 
 require_once "modals/account_add_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/ajax/ajax_account_edit.php b/user/ajax/ajax_account_edit.php
similarity index 100%
rename from ajax/ajax_account_edit.php
rename to user/ajax/ajax_account_edit.php
diff --git a/ajax/ajax_admin_mail_queue_message_view.php b/user/ajax/ajax_admin_mail_queue_message_view.php
similarity index 100%
rename from ajax/ajax_admin_mail_queue_message_view.php
rename to user/ajax/ajax_admin_mail_queue_message_view.php
diff --git a/ajax/ajax_ai_model_edit.php b/user/ajax/ajax_ai_model_edit.php
similarity index 100%
rename from ajax/ajax_ai_model_edit.php
rename to user/ajax/ajax_ai_model_edit.php
diff --git a/ajax/ajax_ai_provider_edit.php b/user/ajax/ajax_ai_provider_edit.php
similarity index 100%
rename from ajax/ajax_ai_provider_edit.php
rename to user/ajax/ajax_ai_provider_edit.php
diff --git a/ajax/ajax_asset_copy.php b/user/ajax/ajax_asset_copy.php
similarity index 100%
rename from ajax/ajax_asset_copy.php
rename to user/ajax/ajax_asset_copy.php
diff --git a/ajax/ajax_asset_details.php b/user/ajax/ajax_asset_details.php
similarity index 100%
rename from ajax/ajax_asset_details.php
rename to user/ajax/ajax_asset_details.php
diff --git a/ajax/ajax_asset_edit.php b/user/ajax/ajax_asset_edit.php
similarity index 100%
rename from ajax/ajax_asset_edit.php
rename to user/ajax/ajax_asset_edit.php
diff --git a/ajax/ajax_asset_interface_edit.php b/user/ajax/ajax_asset_interface_edit.php
similarity index 100%
rename from ajax/ajax_asset_interface_edit.php
rename to user/ajax/ajax_asset_interface_edit.php
diff --git a/ajax/ajax_asset_link_credential.php b/user/ajax/ajax_asset_link_credential.php
similarity index 100%
rename from ajax/ajax_asset_link_credential.php
rename to user/ajax/ajax_asset_link_credential.php
diff --git a/ajax/ajax_asset_link_document.php b/user/ajax/ajax_asset_link_document.php
similarity index 100%
rename from ajax/ajax_asset_link_document.php
rename to user/ajax/ajax_asset_link_document.php
diff --git a/ajax/ajax_asset_link_file.php b/user/ajax/ajax_asset_link_file.php
similarity index 100%
rename from ajax/ajax_asset_link_file.php
rename to user/ajax/ajax_asset_link_file.php
diff --git a/ajax/ajax_asset_link_service.php b/user/ajax/ajax_asset_link_service.php
similarity index 100%
rename from ajax/ajax_asset_link_service.php
rename to user/ajax/ajax_asset_link_service.php
diff --git a/ajax/ajax_asset_link_software.php b/user/ajax/ajax_asset_link_software.php
similarity index 100%
rename from ajax/ajax_asset_link_software.php
rename to user/ajax/ajax_asset_link_software.php
diff --git a/ajax/ajax_calendar_edit.php b/user/ajax/ajax_calendar_edit.php
similarity index 100%
rename from ajax/ajax_calendar_edit.php
rename to user/ajax/ajax_calendar_edit.php
diff --git a/ajax/ajax_calendar_event_edit.php b/user/ajax/ajax_calendar_event_edit.php
similarity index 100%
rename from ajax/ajax_calendar_event_edit.php
rename to user/ajax/ajax_calendar_event_edit.php
diff --git a/ajax/ajax_category_add.php b/user/ajax/ajax_category_add.php
similarity index 100%
rename from ajax/ajax_category_add.php
rename to user/ajax/ajax_category_add.php
diff --git a/ajax/ajax_category_edit.php b/user/ajax/ajax_category_edit.php
similarity index 100%
rename from ajax/ajax_category_edit.php
rename to user/ajax/ajax_category_edit.php
diff --git a/ajax/ajax_certificate_edit.php b/user/ajax/ajax_certificate_edit.php
similarity index 100%
rename from ajax/ajax_certificate_edit.php
rename to user/ajax/ajax_certificate_edit.php
diff --git a/ajax/ajax_contact_details.php b/user/ajax/ajax_contact_details.php
similarity index 100%
rename from ajax/ajax_contact_details.php
rename to user/ajax/ajax_contact_details.php
diff --git a/ajax/ajax_contact_edit.php b/user/ajax/ajax_contact_edit.php
similarity index 100%
rename from ajax/ajax_contact_edit.php
rename to user/ajax/ajax_contact_edit.php
diff --git a/ajax/ajax_contact_link_asset.php b/user/ajax/ajax_contact_link_asset.php
similarity index 100%
rename from ajax/ajax_contact_link_asset.php
rename to user/ajax/ajax_contact_link_asset.php
diff --git a/ajax/ajax_contact_link_credential.php b/user/ajax/ajax_contact_link_credential.php
similarity index 100%
rename from ajax/ajax_contact_link_credential.php
rename to user/ajax/ajax_contact_link_credential.php
diff --git a/ajax/ajax_contact_link_document.php b/user/ajax/ajax_contact_link_document.php
similarity index 100%
rename from ajax/ajax_contact_link_document.php
rename to user/ajax/ajax_contact_link_document.php
diff --git a/ajax/ajax_contact_link_file.php b/user/ajax/ajax_contact_link_file.php
similarity index 100%
rename from ajax/ajax_contact_link_file.php
rename to user/ajax/ajax_contact_link_file.php
diff --git a/ajax/ajax_contact_link_service.php b/user/ajax/ajax_contact_link_service.php
similarity index 100%
rename from ajax/ajax_contact_link_service.php
rename to user/ajax/ajax_contact_link_service.php
diff --git a/ajax/ajax_contact_link_software.php b/user/ajax/ajax_contact_link_software.php
similarity index 100%
rename from ajax/ajax_contact_link_software.php
rename to user/ajax/ajax_contact_link_software.php
diff --git a/ajax/ajax_contact_note_create.php b/user/ajax/ajax_contact_note_create.php
similarity index 100%
rename from ajax/ajax_contact_note_create.php
rename to user/ajax/ajax_contact_note_create.php
diff --git a/ajax/ajax_credential_edit.php b/user/ajax/ajax_credential_edit.php
similarity index 100%
rename from ajax/ajax_credential_edit.php
rename to user/ajax/ajax_credential_edit.php
diff --git a/ajax/ajax_credential_view.php b/user/ajax/ajax_credential_view.php
similarity index 100%
rename from ajax/ajax_credential_view.php
rename to user/ajax/ajax_credential_view.php
diff --git a/ajax/ajax_custom_link_edit.php b/user/ajax/ajax_custom_link_edit.php
similarity index 100%
rename from ajax/ajax_custom_link_edit.php
rename to user/ajax/ajax_custom_link_edit.php
diff --git a/ajax/ajax_custom_ticket_status_edit.php b/user/ajax/ajax_custom_ticket_status_edit.php
similarity index 100%
rename from ajax/ajax_custom_ticket_status_edit.php
rename to user/ajax/ajax_custom_ticket_status_edit.php
diff --git a/ajax/ajax_document_edit.php b/user/ajax/ajax_document_edit.php
similarity index 100%
rename from ajax/ajax_document_edit.php
rename to user/ajax/ajax_document_edit.php
diff --git a/ajax/ajax_document_move.php b/user/ajax/ajax_document_move.php
similarity index 100%
rename from ajax/ajax_document_move.php
rename to user/ajax/ajax_document_move.php
diff --git a/ajax/ajax_document_rename.php b/user/ajax/ajax_document_rename.php
similarity index 100%
rename from ajax/ajax_document_rename.php
rename to user/ajax/ajax_document_rename.php
diff --git a/ajax/ajax_document_template_edit.php b/user/ajax/ajax_document_template_edit.php
similarity index 100%
rename from ajax/ajax_document_template_edit.php
rename to user/ajax/ajax_document_template_edit.php
diff --git a/ajax/ajax_document_version_view.php b/user/ajax/ajax_document_version_view.php
similarity index 100%
rename from ajax/ajax_document_version_view.php
rename to user/ajax/ajax_document_version_view.php
diff --git a/ajax/ajax_document_view.php b/user/ajax/ajax_document_view.php
similarity index 100%
rename from ajax/ajax_document_view.php
rename to user/ajax/ajax_document_view.php
diff --git a/ajax/ajax_domain_edit.php b/user/ajax/ajax_domain_edit.php
similarity index 100%
rename from ajax/ajax_domain_edit.php
rename to user/ajax/ajax_domain_edit.php
diff --git a/ajax/ajax_expense_copy.php b/user/ajax/ajax_expense_copy.php
similarity index 100%
rename from ajax/ajax_expense_copy.php
rename to user/ajax/ajax_expense_copy.php
diff --git a/ajax/ajax_expense_edit.php b/user/ajax/ajax_expense_edit.php
similarity index 100%
rename from ajax/ajax_expense_edit.php
rename to user/ajax/ajax_expense_edit.php
diff --git a/ajax/ajax_expense_refund.php b/user/ajax/ajax_expense_refund.php
similarity index 100%
rename from ajax/ajax_expense_refund.php
rename to user/ajax/ajax_expense_refund.php
diff --git a/ajax/ajax_file_move.php b/user/ajax/ajax_file_move.php
similarity index 100%
rename from ajax/ajax_file_move.php
rename to user/ajax/ajax_file_move.php
diff --git a/ajax/ajax_file_rename.php b/user/ajax/ajax_file_rename.php
similarity index 100%
rename from ajax/ajax_file_rename.php
rename to user/ajax/ajax_file_rename.php
diff --git a/ajax/ajax_folder_rename.php b/user/ajax/ajax_folder_rename.php
similarity index 100%
rename from ajax/ajax_folder_rename.php
rename to user/ajax/ajax_folder_rename.php
diff --git a/ajax/ajax_invoice_apply_credit.php b/user/ajax/ajax_invoice_apply_credit.php
similarity index 100%
rename from ajax/ajax_invoice_apply_credit.php
rename to user/ajax/ajax_invoice_apply_credit.php
diff --git a/ajax/ajax_invoice_copy.php b/user/ajax/ajax_invoice_copy.php
similarity index 100%
rename from ajax/ajax_invoice_copy.php
rename to user/ajax/ajax_invoice_copy.php
diff --git a/ajax/ajax_invoice_edit.php b/user/ajax/ajax_invoice_edit.php
similarity index 100%
rename from ajax/ajax_invoice_edit.php
rename to user/ajax/ajax_invoice_edit.php
diff --git a/ajax/ajax_invoice_pay.php b/user/ajax/ajax_invoice_pay.php
similarity index 100%
rename from ajax/ajax_invoice_pay.php
rename to user/ajax/ajax_invoice_pay.php
diff --git a/ajax/ajax_item_edit.php b/user/ajax/ajax_item_edit.php
similarity index 100%
rename from ajax/ajax_item_edit.php
rename to user/ajax/ajax_item_edit.php
diff --git a/ajax/ajax_location_edit.php b/user/ajax/ajax_location_edit.php
similarity index 100%
rename from ajax/ajax_location_edit.php
rename to user/ajax/ajax_location_edit.php
diff --git a/ajax/ajax_network_edit.php b/user/ajax/ajax_network_edit.php
similarity index 100%
rename from ajax/ajax_network_edit.php
rename to user/ajax/ajax_network_edit.php
diff --git a/ajax/ajax_notifications.php b/user/ajax/ajax_notifications.php
similarity index 100%
rename from ajax/ajax_notifications.php
rename to user/ajax/ajax_notifications.php
diff --git a/ajax/ajax_payment_method_edit.php b/user/ajax/ajax_payment_method_edit.php
similarity index 100%
rename from ajax/ajax_payment_method_edit.php
rename to user/ajax/ajax_payment_method_edit.php
diff --git a/ajax/ajax_payment_provider_edit.php b/user/ajax/ajax_payment_provider_edit.php
similarity index 100%
rename from ajax/ajax_payment_provider_edit.php
rename to user/ajax/ajax_payment_provider_edit.php
diff --git a/ajax/ajax_product_edit.php b/user/ajax/ajax_product_edit.php
similarity index 100%
rename from ajax/ajax_product_edit.php
rename to user/ajax/ajax_product_edit.php
diff --git a/ajax/ajax_project_edit.php b/user/ajax/ajax_project_edit.php
similarity index 100%
rename from ajax/ajax_project_edit.php
rename to user/ajax/ajax_project_edit.php
diff --git a/ajax/ajax_quote_copy.php b/user/ajax/ajax_quote_copy.php
similarity index 100%
rename from ajax/ajax_quote_copy.php
rename to user/ajax/ajax_quote_copy.php
diff --git a/ajax/ajax_quote_edit.php b/user/ajax/ajax_quote_edit.php
similarity index 100%
rename from ajax/ajax_quote_edit.php
rename to user/ajax/ajax_quote_edit.php
diff --git a/ajax/ajax_rack_device_add.php b/user/ajax/ajax_rack_device_add.php
similarity index 100%
rename from ajax/ajax_rack_device_add.php
rename to user/ajax/ajax_rack_device_add.php
diff --git a/ajax/ajax_rack_edit.php b/user/ajax/ajax_rack_edit.php
similarity index 100%
rename from ajax/ajax_rack_edit.php
rename to user/ajax/ajax_rack_edit.php
diff --git a/ajax/ajax_recurring_expense_edit.php b/user/ajax/ajax_recurring_expense_edit.php
similarity index 100%
rename from ajax/ajax_recurring_expense_edit.php
rename to user/ajax/ajax_recurring_expense_edit.php
diff --git a/ajax/ajax_recurring_invoice_edit.php b/user/ajax/ajax_recurring_invoice_edit.php
similarity index 100%
rename from ajax/ajax_recurring_invoice_edit.php
rename to user/ajax/ajax_recurring_invoice_edit.php
diff --git a/ajax/ajax_recurring_ticket_edit.php b/user/ajax/ajax_recurring_ticket_edit.php
similarity index 100%
rename from ajax/ajax_recurring_ticket_edit.php
rename to user/ajax/ajax_recurring_ticket_edit.php
diff --git a/ajax/ajax_revenue_edit.php b/user/ajax/ajax_revenue_edit.php
similarity index 100%
rename from ajax/ajax_revenue_edit.php
rename to user/ajax/ajax_revenue_edit.php
diff --git a/ajax/ajax_role_edit.php b/user/ajax/ajax_role_edit.php
similarity index 100%
rename from ajax/ajax_role_edit.php
rename to user/ajax/ajax_role_edit.php
diff --git a/ajax/ajax_service_details.php b/user/ajax/ajax_service_details.php
similarity index 100%
rename from ajax/ajax_service_details.php
rename to user/ajax/ajax_service_details.php
diff --git a/ajax/ajax_service_edit.php b/user/ajax/ajax_service_edit.php
similarity index 100%
rename from ajax/ajax_service_edit.php
rename to user/ajax/ajax_service_edit.php
diff --git a/ajax/ajax_software_edit.php b/user/ajax/ajax_software_edit.php
similarity index 100%
rename from ajax/ajax_software_edit.php
rename to user/ajax/ajax_software_edit.php
diff --git a/ajax/ajax_software_template_edit.php b/user/ajax/ajax_software_template_edit.php
similarity index 100%
rename from ajax/ajax_software_template_edit.php
rename to user/ajax/ajax_software_template_edit.php
diff --git a/ajax/ajax_tag_add.php b/user/ajax/ajax_tag_add.php
similarity index 100%
rename from ajax/ajax_tag_add.php
rename to user/ajax/ajax_tag_add.php
diff --git a/ajax/ajax_tag_edit.php b/user/ajax/ajax_tag_edit.php
similarity index 100%
rename from ajax/ajax_tag_edit.php
rename to user/ajax/ajax_tag_edit.php
diff --git a/ajax/ajax_tax_edit.php b/user/ajax/ajax_tax_edit.php
similarity index 100%
rename from ajax/ajax_tax_edit.php
rename to user/ajax/ajax_tax_edit.php
diff --git a/ajax/ajax_ticket_assign.php b/user/ajax/ajax_ticket_assign.php
similarity index 100%
rename from ajax/ajax_ticket_assign.php
rename to user/ajax/ajax_ticket_assign.php
diff --git a/ajax/ajax_ticket_billable.php b/user/ajax/ajax_ticket_billable.php
similarity index 100%
rename from ajax/ajax_ticket_billable.php
rename to user/ajax/ajax_ticket_billable.php
diff --git a/ajax/ajax_ticket_contact.php b/user/ajax/ajax_ticket_contact.php
similarity index 100%
rename from ajax/ajax_ticket_contact.php
rename to user/ajax/ajax_ticket_contact.php
diff --git a/ajax/ajax_ticket_edit.php b/user/ajax/ajax_ticket_edit.php
similarity index 100%
rename from ajax/ajax_ticket_edit.php
rename to user/ajax/ajax_ticket_edit.php
diff --git a/ajax/ajax_ticket_priority.php b/user/ajax/ajax_ticket_priority.php
similarity index 100%
rename from ajax/ajax_ticket_priority.php
rename to user/ajax/ajax_ticket_priority.php
diff --git a/ajax/ajax_ticket_reply_edit.php b/user/ajax/ajax_ticket_reply_edit.php
similarity index 100%
rename from ajax/ajax_ticket_reply_edit.php
rename to user/ajax/ajax_ticket_reply_edit.php
diff --git a/ajax/ajax_ticket_reply_redact.php b/user/ajax/ajax_ticket_reply_redact.php
similarity index 100%
rename from ajax/ajax_ticket_reply_redact.php
rename to user/ajax/ajax_ticket_reply_redact.php
diff --git a/ajax/ajax_ticket_task_edit.php b/user/ajax/ajax_ticket_task_edit.php
similarity index 100%
rename from ajax/ajax_ticket_task_edit.php
rename to user/ajax/ajax_ticket_task_edit.php
diff --git a/ajax/ajax_ticket_template_task_edit.php b/user/ajax/ajax_ticket_template_task_edit.php
similarity index 100%
rename from ajax/ajax_ticket_template_task_edit.php
rename to user/ajax/ajax_ticket_template_task_edit.php
diff --git a/ajax/ajax_transfer_edit.php b/user/ajax/ajax_transfer_edit.php
similarity index 100%
rename from ajax/ajax_transfer_edit.php
rename to user/ajax/ajax_transfer_edit.php
diff --git a/ajax/ajax_trip_copy.php b/user/ajax/ajax_trip_copy.php
similarity index 100%
rename from ajax/ajax_trip_copy.php
rename to user/ajax/ajax_trip_copy.php
diff --git a/ajax/ajax_trip_edit.php b/user/ajax/ajax_trip_edit.php
similarity index 100%
rename from ajax/ajax_trip_edit.php
rename to user/ajax/ajax_trip_edit.php
diff --git a/ajax/ajax_user_edit.php b/user/ajax/ajax_user_edit.php
similarity index 100%
rename from ajax/ajax_user_edit.php
rename to user/ajax/ajax_user_edit.php
diff --git a/ajax/ajax_vendor_details.php b/user/ajax/ajax_vendor_details.php
similarity index 100%
rename from ajax/ajax_vendor_details.php
rename to user/ajax/ajax_vendor_details.php
diff --git a/ajax/ajax_vendor_edit.php b/user/ajax/ajax_vendor_edit.php
similarity index 100%
rename from ajax/ajax_vendor_edit.php
rename to user/ajax/ajax_vendor_edit.php
diff --git a/ajax/ajax_vendor_template_edit.php b/user/ajax/ajax_vendor_template_edit.php
similarity index 100%
rename from ajax/ajax_vendor_template_edit.php
rename to user/ajax/ajax_vendor_template_edit.php
diff --git a/asset_details.php b/user/asset_details.php
similarity index 99%
rename from asset_details.php
rename to user/asset_details.php
index 569ba5be..59c07d64 100644
--- a/asset_details.php
+++ b/user/asset_details.php
@@ -1256,4 +1256,4 @@ require_once "modals/credential_add_modal.php";
 require_once "modals/client_document_add_modal.php";
 require_once "modals/client_file_upload_modal.php";
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/assets.php b/user/assets.php
similarity index 99%
rename from assets.php
rename to user/assets.php
index f758e5ef..0d73840e 100644
--- a/assets.php
+++ b/user/assets.php
@@ -714,7 +714,7 @@ if (mysqli_num_rows($os_sql) > 0) {
             <?php require_once "modals/asset_bulk_edit_status_modal.php"; ?>
             <?php require_once "modals/asset_bulk_add_ticket_modal.php"; ?>
         </form>
-        <?php require_once "includes/filter_footer.php"; ?>
+        <?php require_once "../includes/filter_footer.php"; ?>
     </div>
 </div>
 
@@ -742,4 +742,4 @@ require_once "modals/asset_export_modal.php";
 if ($client_url) {
     require_once "modals/asset_import_modal.php";
 }
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/blank.php b/user/blank.php
similarity index 98%
rename from blank.php
rename to user/blank.php
index 2a313940..30e47834 100644
--- a/blank.php
+++ b/user/blank.php
@@ -69,4 +69,4 @@ echo "Current Date and Time: <strong>$date_time</strong>";
 
 <script>toastr.success('Have Fun Wozz!!')</script>
 
-<?php require_once "includes/footer.php";
+<?php require_once "../includes/footer.php";
diff --git a/budget.php b/user/budget.php
similarity index 98%
rename from budget.php
rename to user/budget.php
index 0fa846a6..ffd7510c 100644
--- a/budget.php
+++ b/user/budget.php
@@ -109,5 +109,5 @@ function getBudgetAmount($budgets, $categoryId, $month) {
     return 0;
 }
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 ?>
diff --git a/budget_edit.php b/user/budget_edit.php
similarity index 99%
rename from budget_edit.php
rename to user/budget_edit.php
index c4b09abc..26af60ce 100644
--- a/budget_edit.php
+++ b/user/budget_edit.php
@@ -110,5 +110,5 @@ function getBudgetAmount($budgets, $categoryId, $month) {
     return 0;
 }
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 ?>
diff --git a/calendar.php b/user/calendar.php
similarity index 99%
rename from calendar.php
rename to user/calendar.php
index 64f1ac95..1f0fd9d4 100644
--- a/calendar.php
+++ b/user/calendar.php
@@ -106,7 +106,7 @@ while ($row = mysqli_fetch_array($sql)) {
 
 ?>
 
-<?php require_once "includes/footer.php";
+<?php require_once "../includes/footer.php";
 ?>
 
 <script src='plugins/fullcalendar/dist/index.global.js'></script>
diff --git a/certificates.php b/user/certificates.php
similarity index 99%
rename from certificates.php
rename to user/certificates.php
index b72c1768..d765d3c7 100644
--- a/certificates.php
+++ b/user/certificates.php
@@ -303,7 +303,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
             </form>
         </div>
-        <?php require_once "includes/filter_footer.php";
+        <?php require_once "../includes/filter_footer.php";
  ?>
     </div>
 </div>
@@ -316,4 +316,4 @@ require_once "modals/certificate_export_modal.php";
 <script src="js/bulk_actions.js"></script>
 <script src="js/certificate_fetch_ssl.js"></script>
 
-<?php require_once "includes/footer.php";
\ No newline at end of file
+<?php require_once "../includes/footer.php";
\ No newline at end of file
diff --git a/client_autopay.php b/user/client_autopay.php
similarity index 98%
rename from client_autopay.php
rename to user/client_autopay.php
index a4231baa..82ba4aff 100644
--- a/client_autopay.php
+++ b/user/client_autopay.php
@@ -24,7 +24,7 @@ if ($stripe_client_details) {
 // Stripe not enabled in settings
 if (!$config_stripe_enable || !$config_stripe_publishable || !$config_stripe_secret) {
     echo "Stripe payment error - Stripe is not enabled, please talk to your helpdesk for further information.";
-    include_once 'includes/footer.php';
+    include_once '../includes/footer.php';
     exit();
 }
 
@@ -127,4 +127,4 @@ if (!$config_stripe_enable || !$config_stripe_publishable || !$config_stripe_sec
 
 <?php
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/client_document_details.php b/user/client_document_details.php
similarity index 99%
rename from client_document_details.php
rename to user/client_document_details.php
index 6c672178..f23a4561 100644
--- a/client_document_details.php
+++ b/user/client_document_details.php
@@ -421,4 +421,4 @@ require_once "modals/client_document_link_software_modal.php";
 require_once "modals/client_document_link_vendor_modal.php";
 require_once "modals/document_edit_visibility_modal.php";
 require_once "modals/share_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/client_documents.php b/user/client_documents.php
similarity index 99%
rename from client_documents.php
rename to user/client_documents.php
index 7042a1db..c87f0b1f 100644
--- a/client_documents.php
+++ b/user/client_documents.php
@@ -481,7 +481,7 @@ while ($folder_id > 0) {
                     </div>
                     <?php require_once "modals/client_document_bulk_move_modal.php"; ?>
                 </form>
-                <?php require_once "includes/filter_footer.php";
+                <?php require_once "../includes/filter_footer.php";
 ?>
             </div>
         </div>
@@ -494,4 +494,4 @@ while ($folder_id > 0) {
 require_once "modals/share_modal.php";
 require_once "modals/client_document_add_modal.php";
 require_once "modals/client_document_add_from_template_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/client_files.php b/user/client_files.php
similarity index 99%
rename from client_files.php
rename to user/client_files.php
index 04a58e85..cc83e8ba 100644
--- a/client_files.php
+++ b/user/client_files.php
@@ -601,7 +601,7 @@ while ($folder_id > 0) {
 
                 <?php } ?>
 
-                <?php require_once "includes/filter_footer.php";
+                <?php require_once "../includes/filter_footer.php";
  ?>
 
             </div>
@@ -638,4 +638,4 @@ function prevFile() {
 require_once "modals/client_file_upload_modal.php";
 require_once "modals/share_modal.php";
 require_once "modals/client_file_delete_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/client_overview.php b/user/client_overview.php
similarity index 99%
rename from client_overview.php
rename to user/client_overview.php
index 4a1c02ba..aa41e9a9 100644
--- a/client_overview.php
+++ b/user/client_overview.php
@@ -699,5 +699,5 @@ $sql_asset_retired = mysqli_query(
 
 <?php
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
diff --git a/client_racks.php b/user/client_racks.php
similarity index 99%
rename from client_racks.php
rename to user/client_racks.php
index c2b8ebe3..e324af3b 100644
--- a/client_racks.php
+++ b/user/client_racks.php
@@ -350,4 +350,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <?php
 
 require_once "modals/client_rack_add_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/clients.php b/user/clients.php
similarity index 99%
rename from clients.php
rename to user/clients.php
index ab1ca9f7..fb44e6bd 100644
--- a/clients.php
+++ b/user/clients.php
@@ -621,7 +621,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             ?>
         </form>
      <!-- Ends Card Body -->
-    <?php require_once "includes/filter_footer.php"; ?>
+    <?php require_once "../includes/filter_footer.php"; ?>
     
 </div> <!-- End Card -->
 
@@ -631,4 +631,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 require_once "modals/clients/client_add.php";
 require_once "modals/clients/client_import.php";
 require_once "modals/clients/client_export.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/contact_details.php b/user/contact_details.php
similarity index 99%
rename from contact_details.php
rename to user/contact_details.php
index 0f7f06be..3dccc2b7 100644
--- a/contact_details.php
+++ b/user/contact_details.php
@@ -1217,4 +1217,4 @@ require_once "modals/credential_add_modal.php";
 require_once "modals/client_document_add_modal.php";
 require_once "modals/client_file_upload_modal.php";
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/contacts.php b/user/contacts.php
similarity index 99%
rename from contacts.php
rename to user/contacts.php
index e918d0c3..b77d779b 100644
--- a/contacts.php
+++ b/user/contacts.php
@@ -560,7 +560,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             <?php require_once "modals/contact_bulk_assign_tags_modal.php"; ?>
             <?php require_once "modals/contact_bulk_email_modal.php"; ?>
         </form>
-        <?php require_once "includes/filter_footer.php";
+        <?php require_once "../includes/filter_footer.php";
 ?>
     </div>
 </div>
@@ -612,4 +612,4 @@ if ($client_url) {
     require_once "modals/contact_invite_modal.php";
     require_once "modals/contact_import_modal.php";
 }
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/credentials.php b/user/credentials.php
similarity index 99%
rename from credentials.php
rename to user/credentials.php
index 818fe579..4c81bd96 100644
--- a/credentials.php
+++ b/user/credentials.php
@@ -528,7 +528,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             </div>
             <?php require_once "modals/credential_bulk_assign_tags_modal.php"; ?>
         </form>
-        <?php require_once "includes/filter_footer.php";
+        <?php require_once "../includes/filter_footer.php";
         ?>
     </div>
 </div>
@@ -547,4 +547,4 @@ require_once "modals/credential_export_modal.php";
 if ($client_url) {
     require_once "modals/credential_import_modal.php";
 }
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/dashboard.php b/user/dashboard.php
similarity index 99%
rename from dashboard.php
rename to user/dashboard.php
index d3575f17..2b9ceaad 100644
--- a/dashboard.php
+++ b/user/dashboard.php
@@ -734,7 +734,7 @@ if ($user_config_dashboard_technical_enable == 1) {
 
 <?php } ?>
 
-<?php require_once "includes/footer.php"; ?>
+<?php require_once "../../includes/footer.php"; ?>
 
 <?php if ($user_config_dashboard_financial_enable == 1) { ?>
 
diff --git a/database_updates.php b/user/database_updates.php
similarity index 100%
rename from database_updates.php
rename to user/database_updates.php
diff --git a/domains.php b/user/domains.php
similarity index 99%
rename from domains.php
rename to user/domains.php
index fd39c9b3..68b0f9ad 100644
--- a/domains.php
+++ b/user/domains.php
@@ -365,7 +365,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                 </form>
             </div>
-            <?php require_once "includes/filter_footer.php";
+            <?php require_once "../includes/filter_footer.php";
             ?>
         </div>
     </div>
@@ -377,5 +377,5 @@ require_once "modals/domain_export_modal.php";
 
 <script src="js/bulk_actions.js"></script>
 
-<?php require_once "includes/footer.php";
+<?php require_once "../includes/footer.php";
 
diff --git a/expenses.php b/user/expenses.php
similarity index 99%
rename from expenses.php
rename to user/expenses.php
index d9641f9c..b19dfdfc 100644
--- a/expenses.php
+++ b/user/expenses.php
@@ -375,7 +375,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 <?php require_once "modals/expense_bulk_edit_account_modal.php"; ?>
                 <?php require_once "modals/expense_bulk_edit_client_modal.php"; ?>
             </form>
-            <?php require_once "includes/filter_footer.php";
+            <?php require_once "../includes/filter_footer.php";
  ?>
         </div>
     </div>
@@ -386,4 +386,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 require_once "modals/expense_add_modal.php";
 require_once "modals/expense_export_modal.php";
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/global_search.php b/user/global_search.php
similarity index 99%
rename from global_search.php
rename to user/global_search.php
index f5f8e765..ca21e3b3 100644
--- a/global_search.php
+++ b/user/global_search.php
@@ -853,7 +853,7 @@ if (isset($_GET['query'])) {
 
 }
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
 ?>
 
diff --git a/reports/includes/inc_all_reports.php b/user/includes/inc_all.php
similarity index 64%
rename from reports/includes/inc_all_reports.php
rename to user/includes/inc_all.php
index d04ede47..6d3af058 100644
--- a/reports/includes/inc_all_reports.php
+++ b/user/includes/inc_all.php
@@ -4,16 +4,10 @@ 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/header.php";
 require_once "../includes/top_nav.php";
+require_once "../includes/get_side_nav_counts.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/user/includes/inc_all_client.php b/user/includes/inc_all_client.php
new file mode 100644
index 00000000..40cccea6
--- /dev/null
+++ b/user/includes/inc_all_client.php
@@ -0,0 +1,316 @@
+<?php
+
+require_once "config.php";
+require_once "functions.php";
+require_once "check_login.php";
+require_once "page_title.php";
+
+// Perms
+enforceUserPermission('module_client');
+
+if (isset($_GET['client_id'])) {
+    $client_id = intval($_GET['client_id']);
+
+    // Client Access Check
+    //  Ensure the user has permission to access this client (admins ignored)
+    if (!in_array($client_id, $client_access_array) AND !empty($client_access_string) AND !$session_is_admin) {
+        // Logging
+        mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Client', log_action = 'Access', log_description = '$session_name was denied permission from accessing client', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $client_id");
+
+        $_SESSION['alert_type'] = "error";
+        $_SESSION['alert_message'] = "Access Denied - You do not have permission to access that client!";
+
+        echo "<script>window.history.back();</script>";
+        exit();
+    }
+
+    $sql = mysqli_query($mysqli, "UPDATE clients SET client_accessed_at = NOW() WHERE client_id = $client_id");
+
+    $sql = mysqli_query(
+        $mysqli,
+        "SELECT * FROM clients
+        LEFT JOIN locations ON clients.client_id = locations.location_client_id AND location_primary = 1
+        LEFT JOIN contacts ON clients.client_id = contacts.contact_client_id AND contact_primary = 1
+        WHERE client_id = $client_id"
+    );
+
+    if (mysqli_num_rows($sql) == 0) {
+        require_once "header.php";
+
+        echo "<center><h1 class='text-secondary mt-5'>Nothing to see here</h1></center>";
+    } else {
+
+        $row = mysqli_fetch_array($sql);
+        $client_name = nullable_htmlentities($row['client_name']);
+        $client_is_lead = intval($row['client_lead']);
+        $client_type = nullable_htmlentities($row['client_type']);
+        $client_website = nullable_htmlentities($row['client_website']);
+        $client_referral = nullable_htmlentities($row['client_referral']);
+        $client_currency_code = nullable_htmlentities($row['client_currency_code']);
+        $client_net_terms = intval($row['client_net_terms']);
+        if ($client_net_terms == 0) {
+            $client_net_terms = $config_default_net_terms;
+        }
+        $client_tax_id_number = nullable_htmlentities($row['client_tax_id_number']);
+        $client_abbreviation = nullable_htmlentities($row['client_abbreviation']);
+        $client_rate = floatval($row['client_rate']);
+        $client_notes = nullable_htmlentities($row['client_notes']);
+        $client_created_at = nullable_htmlentities($row['client_created_at']);
+        $client_archived_at = nullable_htmlentities($row['client_archived_at']);
+        $contact_id = intval($row['contact_id']);
+        $contact_name = nullable_htmlentities($row['contact_name']);
+        $contact_title = nullable_htmlentities($row['contact_title']);
+        $contact_email = nullable_htmlentities($row['contact_email']);
+        $contact_phone_country_code = nullable_htmlentities($row['contact_phone_country_code']);
+        $contact_phone = nullable_htmlentities(formatPhoneNumber($row['contact_phone'], $contact_phone_country_code));
+        $contact_extension = nullable_htmlentities($row['contact_extension']);
+        $contact_mobile_country_code = nullable_htmlentities($row['contact_mobile_country_code']);
+        $contact_mobile = nullable_htmlentities(formatPhoneNumber($row['contact_mobile'], $contact_mobile_country_code));
+        $contact_primary = intval($row['contact_primary']);
+        $location_id = intval($row['location_id']);
+        $location_name = nullable_htmlentities($row['location_name']);
+        $location_address = nullable_htmlentities($row['location_address']);
+        $location_city = nullable_htmlentities($row['location_city']);
+        $location_state = nullable_htmlentities($row['location_state']);
+        $location_zip = nullable_htmlentities($row['location_zip']);
+        $location_country = nullable_htmlentities($row['location_country']);
+        $location_phone_country_code = nullable_htmlentities($row['location_phone_country_code']);
+        $location_phone = nullable_htmlentities(formatPhoneNumber($row['location_phone'], $location_phone_country_code));
+        $location_primary = intval($row['location_primary']);
+
+        // Tab Title // No Sanitizing needed
+        $tab_title = $row['client_name'];
+
+        // Client Tags
+
+        $client_tag_name_display_array = array();
+        $client_tag_id_array = array();
+        $sql_client_tags = mysqli_query($mysqli, "SELECT * FROM client_tags LEFT JOIN tags ON client_tags.tag_id = tags.tag_id WHERE client_id = $client_id ORDER BY tag_name ASC");
+        while ($row = mysqli_fetch_array($sql_client_tags)) {
+
+            $client_tag_id = intval($row['tag_id']);
+            $client_tag_name = nullable_htmlentities($row['tag_name']);
+            $client_tag_color = nullable_htmlentities($row['tag_color']);
+            if (empty($client_tag_color)) {
+                $client_tag_color = "dark";
+            }
+            $client_tag_icon = nullable_htmlentities($row['tag_icon']);
+            if (empty($client_tag_icon)) {
+                $client_tag_icon = "tag";
+            }
+
+            $client_tag_id_array[] = $client_tag_id;
+            $client_tag_name_display_array[] = "<span class='badge text-light p-1 mr-1' style='background-color: $client_tag_color;'><i class='fa fa-fw fa-$client_tag_icon mr-2'></i>$client_tag_name</span>";
+        }
+        $client_tags_display = implode('', $client_tag_name_display_array);
+
+        //Add up all the payments for the invoice and get the total amount paid to the invoice
+        $sql_invoice_amounts = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $client_id AND invoice_status != 'Draft' AND invoice_status != 'Cancelled' AND invoice_status != 'Non-Billable'");
+        $row = mysqli_fetch_array($sql_invoice_amounts);
+
+        $invoice_amounts = floatval($row['invoice_amounts']);
+
+        $sql_amount_paid = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS amount_paid FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $client_id");
+        $row = mysqli_fetch_array($sql_amount_paid);
+
+        $amount_paid = floatval($row['amount_paid']);
+
+        $balance = $invoice_amounts - $amount_paid;
+
+        //Get Monthly Recurring Total
+        $sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_monthly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'month' AND recurring_invoice_client_id = $client_id");
+        $row = mysqli_fetch_array($sql_recurring_monthly_total);
+
+        $recurring_monthly_total = floatval($row['recurring_monthly_total']);
+
+        //Get Yearly Recurring Total
+        $sql_recurring_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_yearly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'year' AND recurring_invoice_client_id = $client_id");
+        $row = mysqli_fetch_array($sql_recurring_yearly_total);
+
+        $recurring_yearly_total = floatval($row['recurring_yearly_total']) / 12;
+
+        $recurring_monthly = $recurring_monthly_total + $recurring_yearly_total;
+
+        // Get Credit Balance
+        $sql_credit_balance = mysqli_query($mysqli, "SELECT SUM(credit_amount) AS credit_balance FROM credits WHERE credit_client_id = $client_id");
+        $row = mysqli_fetch_array($sql_credit_balance);
+
+        $credit_balance = floatval($row['credit_balance']);
+
+        // Badge Counts
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('contact_id') AS num FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id"));
+        $num_contacts = $row['num'];
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('location_id') AS num FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id"));
+        $num_locations = $row['num'];
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('asset_id') AS num FROM assets WHERE asset_archived_at IS NULL AND asset_client_id = $client_id"));
+        $num_assets = $row['num'];
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_archived_at IS NULL AND ticket_closed_at IS NULL AND ticket_status != 4 AND ticket_client_id = $client_id"));
+        $num_active_tickets = $row['num'];
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_archived_at IS NULL AND ticket_closed_at IS NOT NULL AND ticket_client_id = $client_id"));
+        $num_closed_tickets = $row['num'];
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_ticket_id') AS num FROM recurring_tickets WHERE recurring_ticket_client_id = $client_id"));
+        $num_recurring_tickets = $row['num'];
+
+        // Active Project Count
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('project_id') AS num FROM projects WHERE project_archived_at IS NULL AND project_completed_at IS NULL AND project_client_id = $client_id"));
+        $num_active_projects = $row['num'];
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('service_id') AS num FROM services WHERE service_client_id = $client_id"));
+        $num_services = $row['num'];
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id"));
+        $num_vendors = $row['num'];
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('credential_id') AS num FROM credentials WHERE credential_archived_at IS NULL AND credential_client_id = $client_id"));
+        $num_credentials = $row['num'];
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('network_id') AS num FROM networks WHERE network_archived_at IS NULL AND network_client_id = $client_id"));
+        $num_networks = $row['num'];
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('rack_id') AS num FROM racks WHERE rack_archived_at IS NULL AND rack_client_id = $client_id"));
+        $num_racks = $row['num'];
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('domain_id') AS num FROM domains WHERE domain_archived_at IS NULL AND domain_client_id = $client_id"));
+        $num_domains = $row['num'];
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('certificate_id') AS num FROM certificates WHERE certificate_archived_at IS NULL AND certificate_client_id = $client_id"));
+        $num_certificates = $row['num'];
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('software_id') AS num FROM software WHERE software_archived_at IS NULL AND software_client_id = $client_id"));
+        $num_software = $row['num'];
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE (invoice_status = 'Sent' OR invoice_status = 'Viewed' OR invoice_status = 'Partial') AND invoice_archived_at IS NULL AND invoice_client_id = $client_id"));
+        $num_invoices_open = $row['num'];
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Draft' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id"));
+        $num_invoices_draft = $row['num'];
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Sent' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id"));
+        $num_invoices_sent = $row['num'];
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Viewed' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id"));
+        $num_invoices_viewed = $row['num'];
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Partial' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id"));
+        $num_invoices_partial = $row['num'];
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Paid' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id"));
+        $num_invoices_paid = $row['num'];
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_archived_at IS NULL AND invoice_client_id = $client_id"));
+        $num_invoices = $row['num'];
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('quote_id') AS num FROM quotes WHERE quote_archived_at IS NULL AND quote_client_id = $client_id"));
+        $num_quotes = $row['num'];
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_invoice_id') AS num FROM recurring_invoices WHERE recurring_invoice_archived_at IS NULL AND recurring_invoice_client_id = $client_id"));
+        $num_recurring_invoices = $row['num'];
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('payment_id') AS num FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $client_id"));
+        $num_payments = $row['num'];
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('file_id') AS num FROM files WHERE file_archived_at IS NULL AND file_client_id = $client_id"));
+        $num_files = $row['num'];
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('document_id') AS num FROM documents WHERE document_archived_at IS NULL AND document_client_id = $client_id"));
+        $num_documents = $row['num'];
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('event_id') AS num FROM calendar_events WHERE event_client_id = $client_id"));
+        $num_calendar_events = $row['num'];
+
+        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('trip_id') AS num FROM trips WHERE trip_archived_at IS NULL AND trip_client_id = $client_id"));
+        $num_trips = $row['num'];
+
+        // Expiring Items
+
+        // Count Domains Expiring within 45 Days
+        $row = mysqli_fetch_assoc(mysqli_query(
+            $mysqli,
+            "SELECT COUNT('domain_id') AS num FROM domains
+            WHERE domain_client_id = $client_id
+            AND domain_expire IS NOT NULL
+            AND domain_expire < CURRENT_DATE + INTERVAL 45 DAY
+            AND domain_archived_at IS NULL"
+        ));
+        $num_domains_expiring_warning= intval($row['num']);
+
+        // Count Domains Expired or within 7 days
+        $row = mysqli_fetch_assoc(mysqli_query(
+            $mysqli,
+            "SELECT COUNT('domain_id') AS num FROM domains
+            WHERE domain_client_id = $client_id
+            AND domain_expire IS NOT NULL
+            AND (
+                    domain_expire < CURRENT_DATE
+                    OR domain_expire < CURRENT_DATE + INTERVAL 7 DAY
+                )
+            AND domain_archived_at IS NULL"
+        ));
+        $num_domains_urgent = intval($row['num']);
+
+        // Count Certificates Expiring within 7 Days
+        $row = mysqli_fetch_assoc(mysqli_query(
+            $mysqli,
+            "SELECT COUNT('certificate_id') AS num FROM certificates
+            WHERE certificate_client_id = $client_id
+            AND certificate_expire IS NOT NULL
+            AND certificate_expire < CURRENT_DATE + INTERVAL 7 DAY
+            AND certificate_archived_at IS NULL"
+        ));
+        $num_certificates_expiring = intval($row['num']);
+
+        // Count Certificates Expired or within 7 days
+        $row = mysqli_fetch_assoc(mysqli_query(
+            $mysqli,
+            "SELECT COUNT('certificate_id') AS num FROM certificates
+            WHERE certificate_client_id = $client_id
+            AND certificate_expire IS NOT NULL
+            AND (
+                    certificate_expire < CURRENT_DATE
+                    OR certificate_expire < CURRENT_DATE + INTERVAL 1 DAY
+                )
+            AND certificate_archived_at IS NULL"
+        ));
+        $num_certificates_expired = intval($row['num']);
+
+        // Count Software Expiring within 90 Days
+        $row = mysqli_fetch_assoc(mysqli_query(
+            $mysqli,
+            "SELECT COUNT('software_id') AS num FROM software
+            WHERE software_client_id = $client_id
+            AND software_expire IS NOT NULL
+            AND software_expire < CURRENT_DATE + INTERVAL 45 DAY
+            AND software_archived_at IS NULL"
+        ));
+        $num_software_expiring = intval($row['num']);
+
+        // Count Software Expired or within 14 days
+        $row = mysqli_fetch_assoc(mysqli_query(
+            $mysqli,
+            "SELECT COUNT('software_id') AS num FROM software
+            WHERE software_client_id = $client_id
+            AND software_expire IS NOT NULL
+            AND (
+                    software_expire < CURRENT_DATE
+                    OR software_expire < CURRENT_DATE + INTERVAL 7 DAY
+                )
+            AND software_archived_at IS NULL"
+        ));
+        $num_software_expired = intval($row['num']);
+
+    }
+}
+
+require_once "header.php";
+require_once "top_nav.php";
+require_once "client_side_nav.php";
+require_once "inc_wrapper.php";
+require_once "inc_alert_feedback.php";
+require_once "inc_client_top_head.php";
+require_once "filter_header.php";
diff --git a/user/includes/inc_all_user.php b/user/includes/inc_all_user.php
new file mode 100644
index 00000000..bafda7b6
--- /dev/null
+++ b/user/includes/inc_all_user.php
@@ -0,0 +1,12 @@
+<?php
+
+require_once "config.php";
+require_once "functions.php";
+require_once "check_login.php";
+require_once "page_title.php";
+require_once "header.php";
+require_once "top_nav.php";
+require_once "user_side_nav.php";
+require_once "inc_wrapper.php";
+require_once "inc_alert_feedback.php";
+require_once "filter_header.php";
diff --git a/includes/side_nav.php b/user/includes/side_nav.php
similarity index 100%
rename from includes/side_nav.php
rename to user/includes/side_nav.php
diff --git a/user/index.php b/user/index.php
new file mode 100644
index 00000000..4b475c56
--- /dev/null
+++ b/user/index.php
@@ -0,0 +1,30 @@
+<?php 
+
+if (file_exists("../config.php")) {
+    require_once "includes/inc_all.php";
+ ?>
+	<!-- Breadcrumbs-->
+	<ol class="breadcrumb">
+	  <li class="breadcrumb-item">
+	    <a href="index.php">Dashboard</a>
+	  </li>
+	  <li class="breadcrumb-item active">Blank Page</li>
+	</ol>
+
+	<!-- Page Content -->
+	<h1>Blank Page</h1>
+	<hr>
+	<?php
+
+    if (isset($config_start_page)) { ?>
+        <meta http-equiv="refresh" content="0;url=<?php echo $config_start_page; ?>">
+    <?php }
+
+	require_once "../../includes/footer.php";
+
+
+} else {
+	header("Location: ../setup/index.php");
+}
+
+?>
\ No newline at end of file
diff --git a/invoice.php b/user/invoice.php
similarity index 99%
rename from invoice.php
rename to user/invoice.php
index df211cd6..705a65bc 100644
--- a/invoice.php
+++ b/user/invoice.php
@@ -32,7 +32,7 @@ if (isset($_GET['invoice_id'])) {
             $backlink_append = '';
         }
         echo "<h1 class='text-secondary pt-5' style='text-align: center'>There is no Invoice here<br><small><a href='invoices.php$backlink_append'><i class='fas fa-arrow-left mr-2'></i>Back to Invoices</a></small></h1>";
-        require_once "includes/footer.php";
+        require_once "../includes/footer.php";
 
         exit();
     }
@@ -759,7 +759,7 @@ if (isset($_GET['invoice_id'])) {
 
 }
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
 ?>
 
diff --git a/invoices.php b/user/invoices.php
similarity index 99%
rename from invoices.php
rename to user/invoices.php
index 3f9c0584..c292b078 100644
--- a/invoices.php
+++ b/user/invoices.php
@@ -454,7 +454,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             </div>
             <?php require_once "modals/invoice_bulk_edit_category_modal.php"; ?>
         </form>
-        <?php require_once "includes/filter_footer.php";
+        <?php require_once "../includes/filter_footer.php";
 ?>
     </div>
 </div>
@@ -465,4 +465,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 require_once "modals/invoice_add_modal.php";
 if ($client_url) { require_once "modals/invoice_payment_add_bulk_modal.php"; }
 require_once "modals/invoice_export_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/locations.php b/user/locations.php
similarity index 99%
rename from locations.php
rename to user/locations.php
index abd4e6e0..0fbc1f55 100644
--- a/locations.php
+++ b/user/locations.php
@@ -403,7 +403,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             </div>
             <?php require_once "modals/location_bulk_assign_tags_modal.php"; ?>
         </form>
-        <?php require_once "includes/filter_footer.php";
+        <?php require_once "../includes/filter_footer.php";
  ?>
     </div>
 </div>
@@ -415,4 +415,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 require_once "modals/location_add_modal.php";
 require_once "modals/location_import_modal.php";
 require_once "modals/location_export_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/mfa_enforcement.php b/user/mfa_enforcement.php
similarity index 100%
rename from mfa_enforcement.php
rename to user/mfa_enforcement.php
diff --git a/modals/account_add_modal.php b/user/modals/account_add_modal.php
similarity index 100%
rename from modals/account_add_modal.php
rename to user/modals/account_add_modal.php
diff --git a/modals/asset_add_modal.php b/user/modals/asset_add_modal.php
similarity index 100%
rename from modals/asset_add_modal.php
rename to user/modals/asset_add_modal.php
diff --git a/modals/asset_bulk_add_ticket_modal.php b/user/modals/asset_bulk_add_ticket_modal.php
similarity index 100%
rename from modals/asset_bulk_add_ticket_modal.php
rename to user/modals/asset_bulk_add_ticket_modal.php
diff --git a/modals/asset_bulk_assign_contact_modal.php b/user/modals/asset_bulk_assign_contact_modal.php
similarity index 100%
rename from modals/asset_bulk_assign_contact_modal.php
rename to user/modals/asset_bulk_assign_contact_modal.php
diff --git a/modals/asset_bulk_assign_location_modal.php b/user/modals/asset_bulk_assign_location_modal.php
similarity index 100%
rename from modals/asset_bulk_assign_location_modal.php
rename to user/modals/asset_bulk_assign_location_modal.php
diff --git a/modals/asset_bulk_assign_physical_location_modal.php b/user/modals/asset_bulk_assign_physical_location_modal.php
similarity index 100%
rename from modals/asset_bulk_assign_physical_location_modal.php
rename to user/modals/asset_bulk_assign_physical_location_modal.php
diff --git a/modals/asset_bulk_edit_status_modal.php b/user/modals/asset_bulk_edit_status_modal.php
similarity index 100%
rename from modals/asset_bulk_edit_status_modal.php
rename to user/modals/asset_bulk_edit_status_modal.php
diff --git a/modals/asset_bulk_transfer_client_modal.php b/user/modals/asset_bulk_transfer_client_modal.php
similarity index 100%
rename from modals/asset_bulk_transfer_client_modal.php
rename to user/modals/asset_bulk_transfer_client_modal.php
diff --git a/modals/asset_export_modal.php b/user/modals/asset_export_modal.php
similarity index 100%
rename from modals/asset_export_modal.php
rename to user/modals/asset_export_modal.php
diff --git a/modals/asset_import_modal.php b/user/modals/asset_import_modal.php
similarity index 100%
rename from modals/asset_import_modal.php
rename to user/modals/asset_import_modal.php
diff --git a/modals/asset_interface_add_modal.php b/user/modals/asset_interface_add_modal.php
similarity index 100%
rename from modals/asset_interface_add_modal.php
rename to user/modals/asset_interface_add_modal.php
diff --git a/modals/asset_interface_bulk_edit_network_modal.php b/user/modals/asset_interface_bulk_edit_network_modal.php
similarity index 100%
rename from modals/asset_interface_bulk_edit_network_modal.php
rename to user/modals/asset_interface_bulk_edit_network_modal.php
diff --git a/modals/asset_interface_bulk_edit_type_modal.php b/user/modals/asset_interface_bulk_edit_type_modal.php
similarity index 100%
rename from modals/asset_interface_bulk_edit_type_modal.php
rename to user/modals/asset_interface_bulk_edit_type_modal.php
diff --git a/modals/asset_interface_export_modal.php b/user/modals/asset_interface_export_modal.php
similarity index 100%
rename from modals/asset_interface_export_modal.php
rename to user/modals/asset_interface_export_modal.php
diff --git a/modals/asset_interface_import_modal.php b/user/modals/asset_interface_import_modal.php
similarity index 100%
rename from modals/asset_interface_import_modal.php
rename to user/modals/asset_interface_import_modal.php
diff --git a/modals/asset_interface_multiple_add_modal.php b/user/modals/asset_interface_multiple_add_modal.php
similarity index 100%
rename from modals/asset_interface_multiple_add_modal.php
rename to user/modals/asset_interface_multiple_add_modal.php
diff --git a/modals/budget_create_modal.php b/user/modals/budget_create_modal.php
similarity index 100%
rename from modals/budget_create_modal.php
rename to user/modals/budget_create_modal.php
diff --git a/modals/budget_edit_modal.php b/user/modals/budget_edit_modal.php
similarity index 100%
rename from modals/budget_edit_modal.php
rename to user/modals/budget_edit_modal.php
diff --git a/modals/calendar_add_modal.php b/user/modals/calendar_add_modal.php
similarity index 100%
rename from modals/calendar_add_modal.php
rename to user/modals/calendar_add_modal.php
diff --git a/modals/calendar_event_add_modal.php b/user/modals/calendar_event_add_modal.php
similarity index 100%
rename from modals/calendar_event_add_modal.php
rename to user/modals/calendar_event_add_modal.php
diff --git a/modals/certificate_add_modal.php b/user/modals/certificate_add_modal.php
similarity index 100%
rename from modals/certificate_add_modal.php
rename to user/modals/certificate_add_modal.php
diff --git a/modals/certificate_export_modal.php b/user/modals/certificate_export_modal.php
similarity index 100%
rename from modals/certificate_export_modal.php
rename to user/modals/certificate_export_modal.php
diff --git a/modals/client_asset_documents_modal.php b/user/modals/client_asset_documents_modal.php
similarity index 100%
rename from modals/client_asset_documents_modal.php
rename to user/modals/client_asset_documents_modal.php
diff --git a/modals/client_document_add_file_relation_modal.php b/user/modals/client_document_add_file_relation_modal.php
similarity index 100%
rename from modals/client_document_add_file_relation_modal.php
rename to user/modals/client_document_add_file_relation_modal.php
diff --git a/modals/client_document_add_from_template_modal.php b/user/modals/client_document_add_from_template_modal.php
similarity index 100%
rename from modals/client_document_add_from_template_modal.php
rename to user/modals/client_document_add_from_template_modal.php
diff --git a/modals/client_document_add_modal.php b/user/modals/client_document_add_modal.php
similarity index 100%
rename from modals/client_document_add_modal.php
rename to user/modals/client_document_add_modal.php
diff --git a/modals/client_document_bulk_move_modal.php b/user/modals/client_document_bulk_move_modal.php
similarity index 100%
rename from modals/client_document_bulk_move_modal.php
rename to user/modals/client_document_bulk_move_modal.php
diff --git a/modals/client_document_link_asset_modal.php b/user/modals/client_document_link_asset_modal.php
similarity index 100%
rename from modals/client_document_link_asset_modal.php
rename to user/modals/client_document_link_asset_modal.php
diff --git a/modals/client_document_link_contact_modal.php b/user/modals/client_document_link_contact_modal.php
similarity index 100%
rename from modals/client_document_link_contact_modal.php
rename to user/modals/client_document_link_contact_modal.php
diff --git a/modals/client_document_link_file_modal.php b/user/modals/client_document_link_file_modal.php
similarity index 100%
rename from modals/client_document_link_file_modal.php
rename to user/modals/client_document_link_file_modal.php
diff --git a/modals/client_document_link_software_modal.php b/user/modals/client_document_link_software_modal.php
similarity index 100%
rename from modals/client_document_link_software_modal.php
rename to user/modals/client_document_link_software_modal.php
diff --git a/modals/client_document_link_vendor_modal.php b/user/modals/client_document_link_vendor_modal.php
similarity index 100%
rename from modals/client_document_link_vendor_modal.php
rename to user/modals/client_document_link_vendor_modal.php
diff --git a/modals/client_file_bulk_move_modal.php b/user/modals/client_file_bulk_move_modal.php
similarity index 100%
rename from modals/client_file_bulk_move_modal.php
rename to user/modals/client_file_bulk_move_modal.php
diff --git a/modals/client_file_delete_modal.php b/user/modals/client_file_delete_modal.php
similarity index 100%
rename from modals/client_file_delete_modal.php
rename to user/modals/client_file_delete_modal.php
diff --git a/modals/client_file_link_asset_modal.php b/user/modals/client_file_link_asset_modal.php
similarity index 100%
rename from modals/client_file_link_asset_modal.php
rename to user/modals/client_file_link_asset_modal.php
diff --git a/modals/client_file_upload_modal.php b/user/modals/client_file_upload_modal.php
similarity index 100%
rename from modals/client_file_upload_modal.php
rename to user/modals/client_file_upload_modal.php
diff --git a/modals/client_file_view_modal.php b/user/modals/client_file_view_modal.php
similarity index 100%
rename from modals/client_file_view_modal.php
rename to user/modals/client_file_view_modal.php
diff --git a/modals/client_rack_add_modal.php b/user/modals/client_rack_add_modal.php
similarity index 100%
rename from modals/client_rack_add_modal.php
rename to user/modals/client_rack_add_modal.php
diff --git a/modals/client_recurring_export_modal.php b/user/modals/client_recurring_export_modal.php
similarity index 100%
rename from modals/client_recurring_export_modal.php
rename to user/modals/client_recurring_export_modal.php
diff --git a/modals/clients/client_add.php b/user/modals/clients/client_add.php
similarity index 100%
rename from modals/clients/client_add.php
rename to user/modals/clients/client_add.php
diff --git a/modals/clients/client_bulk_assign_tags.php b/user/modals/clients/client_bulk_assign_tags.php
similarity index 100%
rename from modals/clients/client_bulk_assign_tags.php
rename to user/modals/clients/client_bulk_assign_tags.php
diff --git a/modals/clients/client_bulk_edit_hourly_rate.php b/user/modals/clients/client_bulk_edit_hourly_rate.php
similarity index 100%
rename from modals/clients/client_bulk_edit_hourly_rate.php
rename to user/modals/clients/client_bulk_edit_hourly_rate.php
diff --git a/modals/clients/client_bulk_edit_industry.php b/user/modals/clients/client_bulk_edit_industry.php
similarity index 100%
rename from modals/clients/client_bulk_edit_industry.php
rename to user/modals/clients/client_bulk_edit_industry.php
diff --git a/modals/clients/client_bulk_edit_referral.php b/user/modals/clients/client_bulk_edit_referral.php
similarity index 100%
rename from modals/clients/client_bulk_edit_referral.php
rename to user/modals/clients/client_bulk_edit_referral.php
diff --git a/modals/clients/client_bulk_email.php b/user/modals/clients/client_bulk_email.php
similarity index 100%
rename from modals/clients/client_bulk_email.php
rename to user/modals/clients/client_bulk_email.php
diff --git a/modals/clients/client_credit_add.php b/user/modals/clients/client_credit_add.php
similarity index 100%
rename from modals/clients/client_credit_add.php
rename to user/modals/clients/client_credit_add.php
diff --git a/modals/clients/client_delete.php b/user/modals/clients/client_delete.php
similarity index 100%
rename from modals/clients/client_delete.php
rename to user/modals/clients/client_delete.php
diff --git a/modals/clients/client_download_pdf.php b/user/modals/clients/client_download_pdf.php
similarity index 100%
rename from modals/clients/client_download_pdf.php
rename to user/modals/clients/client_download_pdf.php
diff --git a/modals/clients/client_edit.php b/user/modals/clients/client_edit.php
similarity index 100%
rename from modals/clients/client_edit.php
rename to user/modals/clients/client_edit.php
diff --git a/modals/clients/client_export.php b/user/modals/clients/client_export.php
similarity index 100%
rename from modals/clients/client_export.php
rename to user/modals/clients/client_export.php
diff --git a/modals/clients/client_import.php b/user/modals/clients/client_import.php
similarity index 100%
rename from modals/clients/client_import.php
rename to user/modals/clients/client_import.php
diff --git a/modals/contact_add_modal.php b/user/modals/contact_add_modal.php
similarity index 100%
rename from modals/contact_add_modal.php
rename to user/modals/contact_add_modal.php
diff --git a/modals/contact_archive_modal.php b/user/modals/contact_archive_modal.php
similarity index 100%
rename from modals/contact_archive_modal.php
rename to user/modals/contact_archive_modal.php
diff --git a/modals/contact_bulk_assign_location_modal.php b/user/modals/contact_bulk_assign_location_modal.php
similarity index 100%
rename from modals/contact_bulk_assign_location_modal.php
rename to user/modals/contact_bulk_assign_location_modal.php
diff --git a/modals/contact_bulk_assign_tags_modal.php b/user/modals/contact_bulk_assign_tags_modal.php
similarity index 100%
rename from modals/contact_bulk_assign_tags_modal.php
rename to user/modals/contact_bulk_assign_tags_modal.php
diff --git a/modals/contact_bulk_edit_department_modal.php b/user/modals/contact_bulk_edit_department_modal.php
similarity index 100%
rename from modals/contact_bulk_edit_department_modal.php
rename to user/modals/contact_bulk_edit_department_modal.php
diff --git a/modals/contact_bulk_edit_phone_modal.php b/user/modals/contact_bulk_edit_phone_modal.php
similarity index 100%
rename from modals/contact_bulk_edit_phone_modal.php
rename to user/modals/contact_bulk_edit_phone_modal.php
diff --git a/modals/contact_bulk_edit_role_modal.php b/user/modals/contact_bulk_edit_role_modal.php
similarity index 100%
rename from modals/contact_bulk_edit_role_modal.php
rename to user/modals/contact_bulk_edit_role_modal.php
diff --git a/modals/contact_bulk_email_modal.php b/user/modals/contact_bulk_email_modal.php
similarity index 100%
rename from modals/contact_bulk_email_modal.php
rename to user/modals/contact_bulk_email_modal.php
diff --git a/modals/contact_create_note_modal.php b/user/modals/contact_create_note_modal.php
similarity index 100%
rename from modals/contact_create_note_modal.php
rename to user/modals/contact_create_note_modal.php
diff --git a/modals/contact_export_modal.php b/user/modals/contact_export_modal.php
similarity index 100%
rename from modals/contact_export_modal.php
rename to user/modals/contact_export_modal.php
diff --git a/modals/contact_import_modal.php b/user/modals/contact_import_modal.php
similarity index 100%
rename from modals/contact_import_modal.php
rename to user/modals/contact_import_modal.php
diff --git a/modals/contact_invite_modal.php b/user/modals/contact_invite_modal.php
similarity index 100%
rename from modals/contact_invite_modal.php
rename to user/modals/contact_invite_modal.php
diff --git a/modals/credential_add_modal.php b/user/modals/credential_add_modal.php
similarity index 100%
rename from modals/credential_add_modal.php
rename to user/modals/credential_add_modal.php
diff --git a/modals/credential_bulk_assign_tags_modal.php b/user/modals/credential_bulk_assign_tags_modal.php
similarity index 100%
rename from modals/credential_bulk_assign_tags_modal.php
rename to user/modals/credential_bulk_assign_tags_modal.php
diff --git a/modals/credential_export_modal.php b/user/modals/credential_export_modal.php
similarity index 100%
rename from modals/credential_export_modal.php
rename to user/modals/credential_export_modal.php
diff --git a/modals/credential_import_modal.php b/user/modals/credential_import_modal.php
similarity index 100%
rename from modals/credential_import_modal.php
rename to user/modals/credential_import_modal.php
diff --git a/modals/custom_field_create_modal.php b/user/modals/custom_field_create_modal.php
similarity index 100%
rename from modals/custom_field_create_modal.php
rename to user/modals/custom_field_create_modal.php
diff --git a/modals/custom_field_edit_modal.php b/user/modals/custom_field_edit_modal.php
similarity index 100%
rename from modals/custom_field_edit_modal.php
rename to user/modals/custom_field_edit_modal.php
diff --git a/modals/document_edit_visibility_modal.php b/user/modals/document_edit_visibility_modal.php
similarity index 100%
rename from modals/document_edit_visibility_modal.php
rename to user/modals/document_edit_visibility_modal.php
diff --git a/modals/domain_add_modal.php b/user/modals/domain_add_modal.php
similarity index 100%
rename from modals/domain_add_modal.php
rename to user/modals/domain_add_modal.php
diff --git a/modals/domain_export_modal.php b/user/modals/domain_export_modal.php
similarity index 100%
rename from modals/domain_export_modal.php
rename to user/modals/domain_export_modal.php
diff --git a/modals/expense_add_modal.php b/user/modals/expense_add_modal.php
similarity index 100%
rename from modals/expense_add_modal.php
rename to user/modals/expense_add_modal.php
diff --git a/modals/expense_bulk_edit_account_modal.php b/user/modals/expense_bulk_edit_account_modal.php
similarity index 100%
rename from modals/expense_bulk_edit_account_modal.php
rename to user/modals/expense_bulk_edit_account_modal.php
diff --git a/modals/expense_bulk_edit_category_modal.php b/user/modals/expense_bulk_edit_category_modal.php
similarity index 100%
rename from modals/expense_bulk_edit_category_modal.php
rename to user/modals/expense_bulk_edit_category_modal.php
diff --git a/modals/expense_bulk_edit_client_modal.php b/user/modals/expense_bulk_edit_client_modal.php
similarity index 100%
rename from modals/expense_bulk_edit_client_modal.php
rename to user/modals/expense_bulk_edit_client_modal.php
diff --git a/modals/expense_export_modal.php b/user/modals/expense_export_modal.php
similarity index 100%
rename from modals/expense_export_modal.php
rename to user/modals/expense_export_modal.php
diff --git a/modals/folder_create_modal.php b/user/modals/folder_create_modal.php
similarity index 100%
rename from modals/folder_create_modal.php
rename to user/modals/folder_create_modal.php
diff --git a/modals/invoice_add_modal.php b/user/modals/invoice_add_modal.php
similarity index 100%
rename from modals/invoice_add_modal.php
rename to user/modals/invoice_add_modal.php
diff --git a/modals/invoice_add_ticket_modal.php b/user/modals/invoice_add_ticket_modal.php
similarity index 100%
rename from modals/invoice_add_ticket_modal.php
rename to user/modals/invoice_add_ticket_modal.php
diff --git a/modals/invoice_bulk_edit_category_modal.php b/user/modals/invoice_bulk_edit_category_modal.php
similarity index 100%
rename from modals/invoice_bulk_edit_category_modal.php
rename to user/modals/invoice_bulk_edit_category_modal.php
diff --git a/modals/invoice_export_modal.php b/user/modals/invoice_export_modal.php
similarity index 100%
rename from modals/invoice_export_modal.php
rename to user/modals/invoice_export_modal.php
diff --git a/modals/invoice_note_modal.php b/user/modals/invoice_note_modal.php
similarity index 100%
rename from modals/invoice_note_modal.php
rename to user/modals/invoice_note_modal.php
diff --git a/modals/invoice_payment_add_bulk_modal.php b/user/modals/invoice_payment_add_bulk_modal.php
similarity index 100%
rename from modals/invoice_payment_add_bulk_modal.php
rename to user/modals/invoice_payment_add_bulk_modal.php
diff --git a/modals/invoice_recurring_add_modal.php b/user/modals/invoice_recurring_add_modal.php
similarity index 100%
rename from modals/invoice_recurring_add_modal.php
rename to user/modals/invoice_recurring_add_modal.php
diff --git a/modals/item_edit_modal.php b/user/modals/item_edit_modal.php
similarity index 100%
rename from modals/item_edit_modal.php
rename to user/modals/item_edit_modal.php
diff --git a/modals/location_add_modal.php b/user/modals/location_add_modal.php
similarity index 100%
rename from modals/location_add_modal.php
rename to user/modals/location_add_modal.php
diff --git a/modals/location_bulk_assign_tags_modal.php b/user/modals/location_bulk_assign_tags_modal.php
similarity index 100%
rename from modals/location_bulk_assign_tags_modal.php
rename to user/modals/location_bulk_assign_tags_modal.php
diff --git a/modals/location_export_modal.php b/user/modals/location_export_modal.php
similarity index 100%
rename from modals/location_export_modal.php
rename to user/modals/location_export_modal.php
diff --git a/modals/location_import_modal.php b/user/modals/location_import_modal.php
similarity index 100%
rename from modals/location_import_modal.php
rename to user/modals/location_import_modal.php
diff --git a/modals/network_add_modal.php b/user/modals/network_add_modal.php
similarity index 100%
rename from modals/network_add_modal.php
rename to user/modals/network_add_modal.php
diff --git a/modals/network_export_modal.php b/user/modals/network_export_modal.php
similarity index 100%
rename from modals/network_export_modal.php
rename to user/modals/network_export_modal.php
diff --git a/modals/payment_export_modal.php b/user/modals/payment_export_modal.php
similarity index 100%
rename from modals/payment_export_modal.php
rename to user/modals/payment_export_modal.php
diff --git a/modals/product_add_modal.php b/user/modals/product_add_modal.php
similarity index 100%
rename from modals/product_add_modal.php
rename to user/modals/product_add_modal.php
diff --git a/modals/product_bulk_edit_category_modal.php b/user/modals/product_bulk_edit_category_modal.php
similarity index 100%
rename from modals/product_bulk_edit_category_modal.php
rename to user/modals/product_bulk_edit_category_modal.php
diff --git a/modals/product_export_modal.php b/user/modals/product_export_modal.php
similarity index 100%
rename from modals/product_export_modal.php
rename to user/modals/product_export_modal.php
diff --git a/modals/project_add_modal.php b/user/modals/project_add_modal.php
similarity index 100%
rename from modals/project_add_modal.php
rename to user/modals/project_add_modal.php
diff --git a/modals/project_link_closed_ticket_modal.php b/user/modals/project_link_closed_ticket_modal.php
similarity index 100%
rename from modals/project_link_closed_ticket_modal.php
rename to user/modals/project_link_closed_ticket_modal.php
diff --git a/modals/project_link_ticket_modal.php b/user/modals/project_link_ticket_modal.php
similarity index 100%
rename from modals/project_link_ticket_modal.php
rename to user/modals/project_link_ticket_modal.php
diff --git a/modals/quote_add_modal.php b/user/modals/quote_add_modal.php
similarity index 100%
rename from modals/quote_add_modal.php
rename to user/modals/quote_add_modal.php
diff --git a/modals/quote_export_modal.php b/user/modals/quote_export_modal.php
similarity index 100%
rename from modals/quote_export_modal.php
rename to user/modals/quote_export_modal.php
diff --git a/modals/quote_note_modal.php b/user/modals/quote_note_modal.php
similarity index 100%
rename from modals/quote_note_modal.php
rename to user/modals/quote_note_modal.php
diff --git a/modals/quote_to_invoice_modal.php b/user/modals/quote_to_invoice_modal.php
similarity index 100%
rename from modals/quote_to_invoice_modal.php
rename to user/modals/quote_to_invoice_modal.php
diff --git a/modals/recurring_expense_create_modal.php b/user/modals/recurring_expense_create_modal.php
similarity index 100%
rename from modals/recurring_expense_create_modal.php
rename to user/modals/recurring_expense_create_modal.php
diff --git a/modals/recurring_invoice_add_modal.php b/user/modals/recurring_invoice_add_modal.php
similarity index 100%
rename from modals/recurring_invoice_add_modal.php
rename to user/modals/recurring_invoice_add_modal.php
diff --git a/modals/recurring_invoice_note_modal.php b/user/modals/recurring_invoice_note_modal.php
similarity index 100%
rename from modals/recurring_invoice_note_modal.php
rename to user/modals/recurring_invoice_note_modal.php
diff --git a/modals/recurring_payment_add_modal.php b/user/modals/recurring_payment_add_modal.php
similarity index 100%
rename from modals/recurring_payment_add_modal.php
rename to user/modals/recurring_payment_add_modal.php
diff --git a/modals/recurring_ticket_add_modal.php b/user/modals/recurring_ticket_add_modal.php
similarity index 100%
rename from modals/recurring_ticket_add_modal.php
rename to user/modals/recurring_ticket_add_modal.php
diff --git a/modals/revenue_add_modal.php b/user/modals/revenue_add_modal.php
similarity index 100%
rename from modals/revenue_add_modal.php
rename to user/modals/revenue_add_modal.php
diff --git a/modals/service_add_modal.php b/user/modals/service_add_modal.php
similarity index 100%
rename from modals/service_add_modal.php
rename to user/modals/service_add_modal.php
diff --git a/modals/share_modal.php b/user/modals/share_modal.php
similarity index 100%
rename from modals/share_modal.php
rename to user/modals/share_modal.php
diff --git a/modals/software_add_from_template_modal.php b/user/modals/software_add_from_template_modal.php
similarity index 100%
rename from modals/software_add_from_template_modal.php
rename to user/modals/software_add_from_template_modal.php
diff --git a/modals/software_add_modal.php b/user/modals/software_add_modal.php
similarity index 100%
rename from modals/software_add_modal.php
rename to user/modals/software_add_modal.php
diff --git a/modals/software_export_modal.php b/user/modals/software_export_modal.php
similarity index 100%
rename from modals/software_export_modal.php
rename to user/modals/software_export_modal.php
diff --git a/modals/ticket_add_modal.php b/user/modals/ticket_add_modal.php
similarity index 100%
rename from modals/ticket_add_modal.php
rename to user/modals/ticket_add_modal.php
diff --git a/modals/ticket_add_modal_v2.php b/user/modals/ticket_add_modal_v2.php
similarity index 100%
rename from modals/ticket_add_modal_v2.php
rename to user/modals/ticket_add_modal_v2.php
diff --git a/modals/ticket_add_watcher_modal.php b/user/modals/ticket_add_watcher_modal.php
similarity index 100%
rename from modals/ticket_add_watcher_modal.php
rename to user/modals/ticket_add_watcher_modal.php
diff --git a/modals/ticket_bulk_add_project_modal.php b/user/modals/ticket_bulk_add_project_modal.php
similarity index 100%
rename from modals/ticket_bulk_add_project_modal.php
rename to user/modals/ticket_bulk_add_project_modal.php
diff --git a/modals/ticket_bulk_assign_modal.php b/user/modals/ticket_bulk_assign_modal.php
similarity index 100%
rename from modals/ticket_bulk_assign_modal.php
rename to user/modals/ticket_bulk_assign_modal.php
diff --git a/modals/ticket_bulk_edit_category_modal.php b/user/modals/ticket_bulk_edit_category_modal.php
similarity index 100%
rename from modals/ticket_bulk_edit_category_modal.php
rename to user/modals/ticket_bulk_edit_category_modal.php
diff --git a/modals/ticket_bulk_edit_priority_modal.php b/user/modals/ticket_bulk_edit_priority_modal.php
similarity index 100%
rename from modals/ticket_bulk_edit_priority_modal.php
rename to user/modals/ticket_bulk_edit_priority_modal.php
diff --git a/modals/ticket_bulk_merge_modal.php b/user/modals/ticket_bulk_merge_modal.php
similarity index 100%
rename from modals/ticket_bulk_merge_modal.php
rename to user/modals/ticket_bulk_merge_modal.php
diff --git a/modals/ticket_bulk_reply_modal.php b/user/modals/ticket_bulk_reply_modal.php
similarity index 100%
rename from modals/ticket_bulk_reply_modal.php
rename to user/modals/ticket_bulk_reply_modal.php
diff --git a/modals/ticket_bulk_resolve_modal.php b/user/modals/ticket_bulk_resolve_modal.php
similarity index 100%
rename from modals/ticket_bulk_resolve_modal.php
rename to user/modals/ticket_bulk_resolve_modal.php
diff --git a/modals/ticket_change_client_modal.php b/user/modals/ticket_change_client_modal.php
similarity index 100%
rename from modals/ticket_change_client_modal.php
rename to user/modals/ticket_change_client_modal.php
diff --git a/modals/ticket_edit_asset_modal.php b/user/modals/ticket_edit_asset_modal.php
similarity index 100%
rename from modals/ticket_edit_asset_modal.php
rename to user/modals/ticket_edit_asset_modal.php
diff --git a/modals/ticket_edit_schedule_modal.php b/user/modals/ticket_edit_schedule_modal.php
similarity index 100%
rename from modals/ticket_edit_schedule_modal.php
rename to user/modals/ticket_edit_schedule_modal.php
diff --git a/modals/ticket_edit_vendor_modal.php b/user/modals/ticket_edit_vendor_modal.php
similarity index 100%
rename from modals/ticket_edit_vendor_modal.php
rename to user/modals/ticket_edit_vendor_modal.php
diff --git a/modals/ticket_export_modal.php b/user/modals/ticket_export_modal.php
similarity index 100%
rename from modals/ticket_export_modal.php
rename to user/modals/ticket_export_modal.php
diff --git a/modals/ticket_invoice_add_modal.php b/user/modals/ticket_invoice_add_modal.php
similarity index 100%
rename from modals/ticket_invoice_add_modal.php
rename to user/modals/ticket_invoice_add_modal.php
diff --git a/modals/ticket_merge_modal.php b/user/modals/ticket_merge_modal.php
similarity index 100%
rename from modals/ticket_merge_modal.php
rename to user/modals/ticket_merge_modal.php
diff --git a/modals/top_nav_tickets_modal.php b/user/modals/top_nav_tickets_modal.php
similarity index 100%
rename from modals/top_nav_tickets_modal.php
rename to user/modals/top_nav_tickets_modal.php
diff --git a/modals/transfer_add_modal.php b/user/modals/transfer_add_modal.php
similarity index 100%
rename from modals/transfer_add_modal.php
rename to user/modals/transfer_add_modal.php
diff --git a/modals/trip_add_modal.php b/user/modals/trip_add_modal.php
similarity index 100%
rename from modals/trip_add_modal.php
rename to user/modals/trip_add_modal.php
diff --git a/modals/trip_export_modal.php b/user/modals/trip_export_modal.php
similarity index 100%
rename from modals/trip_export_modal.php
rename to user/modals/trip_export_modal.php
diff --git a/modals/user_mfa_modal.php b/user/modals/user_mfa_modal.php
similarity index 100%
rename from modals/user_mfa_modal.php
rename to user/modals/user_mfa_modal.php
diff --git a/modals/vendor_add_from_template_modal.php b/user/modals/vendor_add_from_template_modal.php
similarity index 100%
rename from modals/vendor_add_from_template_modal.php
rename to user/modals/vendor_add_from_template_modal.php
diff --git a/modals/vendor_add_modal.php b/user/modals/vendor_add_modal.php
similarity index 100%
rename from modals/vendor_add_modal.php
rename to user/modals/vendor_add_modal.php
diff --git a/modals/vendor_contact_add_modal.php b/user/modals/vendor_contact_add_modal.php
similarity index 100%
rename from modals/vendor_contact_add_modal.php
rename to user/modals/vendor_contact_add_modal.php
diff --git a/modals/vendor_contact_edit_modal.php b/user/modals/vendor_contact_edit_modal.php
similarity index 100%
rename from modals/vendor_contact_edit_modal.php
rename to user/modals/vendor_contact_edit_modal.php
diff --git a/modals/vendor_export_modal.php b/user/modals/vendor_export_modal.php
similarity index 100%
rename from modals/vendor_export_modal.php
rename to user/modals/vendor_export_modal.php
diff --git a/networks.php b/user/networks.php
similarity index 99%
rename from networks.php
rename to user/networks.php
index 083dfae0..1e8d052c 100644
--- a/networks.php
+++ b/user/networks.php
@@ -362,7 +362,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
             </form>
         </div>
-        <?php require_once "includes/filter_footer.php";
+        <?php require_once "../includes/filter_footer.php";
         ?>
     </div>
 </div>
@@ -376,4 +376,4 @@ require_once "modals/network_export_modal.php";
 <script src="js/bulk_actions.js"></script>
 
 <?php
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/notifications.php b/user/notifications.php
similarity index 98%
rename from notifications.php
rename to user/notifications.php
index 8f5661a9..e6552dec 100644
--- a/notifications.php
+++ b/user/notifications.php
@@ -150,10 +150,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 </tbody>
             </table>
         </div>
-        <?php require_once "includes/filter_footer.php"; ?>
+        <?php require_once "../includes/filter_footer.php"; ?>
     </div>
 </div>
 
 <?php
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/payments.php b/user/payments.php
similarity index 99%
rename from payments.php
rename to user/payments.php
index e90c3a91..fac9fdf0 100644
--- a/payments.php
+++ b/user/payments.php
@@ -284,10 +284,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php require_once "includes/filter_footer.php"; ?>
+            <?php require_once "../includes/filter_footer.php"; ?>
         </div>
     </div>
 
 <?php
 require_once "modals/payment_export_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/user/post.php b/user/post.php
new file mode 100644
index 00000000..b478c9c1
--- /dev/null
+++ b/user/post.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * ITFlow - User 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
+
+// Load all module POST logic
+//  Loads everything in post/user/
+//  Eventually, it would be nice to only specifically load what we need like we do for admins
+
+foreach (glob("post/*.php") as $user_module) {
+    if (!preg_match('/_model\.php$/', basename($user_module))) {
+        require_once $user_module;
+    }
+}
+
+
+// Logout is the same for user and admin
+require_once "../post/logout.php";
+
+// TODO: Find a home for these
+
+require_once "../post/ai.php";
+require_once "../post/misc.php";
diff --git a/post/account.php b/user/post/account.php
similarity index 100%
rename from post/account.php
rename to user/post/account.php
diff --git a/post/asset.php b/user/post/asset.php
similarity index 100%
rename from post/asset.php
rename to user/post/asset.php
diff --git a/post/asset_interface_model.php b/user/post/asset_interface_model.php
similarity index 100%
rename from post/asset_interface_model.php
rename to user/post/asset_interface_model.php
diff --git a/post/asset_model.php b/user/post/asset_model.php
similarity index 100%
rename from post/asset_model.php
rename to user/post/asset_model.php
diff --git a/post/budget.php b/user/post/budget.php
similarity index 100%
rename from post/budget.php
rename to user/post/budget.php
diff --git a/post/category.php b/user/post/category.php
similarity index 100%
rename from post/category.php
rename to user/post/category.php
diff --git a/post/category_model.php b/user/post/category_model.php
similarity index 100%
rename from post/category_model.php
rename to user/post/category_model.php
diff --git a/post/certificate.php b/user/post/certificate.php
similarity index 100%
rename from post/certificate.php
rename to user/post/certificate.php
diff --git a/post/certificate_model.php b/user/post/certificate_model.php
similarity index 100%
rename from post/certificate_model.php
rename to user/post/certificate_model.php
diff --git a/post/client.php b/user/post/client.php
similarity index 100%
rename from post/client.php
rename to user/post/client.php
diff --git a/post/client_model.php b/user/post/client_model.php
similarity index 100%
rename from post/client_model.php
rename to user/post/client_model.php
diff --git a/post/contact.php b/user/post/contact.php
similarity index 100%
rename from post/contact.php
rename to user/post/contact.php
diff --git a/post/contact_model.php b/user/post/contact_model.php
similarity index 100%
rename from post/contact_model.php
rename to user/post/contact_model.php
diff --git a/post/credential.php b/user/post/credential.php
similarity index 100%
rename from post/credential.php
rename to user/post/credential.php
diff --git a/post/credential_model.php b/user/post/credential_model.php
similarity index 100%
rename from post/credential_model.php
rename to user/post/credential_model.php
diff --git a/post/credit.php b/user/post/credit.php
similarity index 100%
rename from post/credit.php
rename to user/post/credit.php
diff --git a/post/document.php b/user/post/document.php
similarity index 100%
rename from post/document.php
rename to user/post/document.php
diff --git a/post/document_model.php b/user/post/document_model.php
similarity index 100%
rename from post/document_model.php
rename to user/post/document_model.php
diff --git a/post/domain.php b/user/post/domain.php
similarity index 100%
rename from post/domain.php
rename to user/post/domain.php
diff --git a/post/domain_model.php b/user/post/domain_model.php
similarity index 100%
rename from post/domain_model.php
rename to user/post/domain_model.php
diff --git a/post/event.php b/user/post/event.php
similarity index 100%
rename from post/event.php
rename to user/post/event.php
diff --git a/post/event_model.php b/user/post/event_model.php
similarity index 100%
rename from post/event_model.php
rename to user/post/event_model.php
diff --git a/post/expense.php b/user/post/expense.php
similarity index 100%
rename from post/expense.php
rename to user/post/expense.php
diff --git a/post/expense_model.php b/user/post/expense_model.php
similarity index 100%
rename from post/expense_model.php
rename to user/post/expense_model.php
diff --git a/post/file.php b/user/post/file.php
similarity index 100%
rename from post/file.php
rename to user/post/file.php
diff --git a/post/folder.php b/user/post/folder.php
similarity index 100%
rename from post/folder.php
rename to user/post/folder.php
diff --git a/post/invoice.php b/user/post/invoice.php
similarity index 100%
rename from post/invoice.php
rename to user/post/invoice.php
diff --git a/post/invoice_model.php b/user/post/invoice_model.php
similarity index 100%
rename from post/invoice_model.php
rename to user/post/invoice_model.php
diff --git a/post/location.php b/user/post/location.php
similarity index 100%
rename from post/location.php
rename to user/post/location.php
diff --git a/post/location_model.php b/user/post/location_model.php
similarity index 100%
rename from post/location_model.php
rename to user/post/location_model.php
diff --git a/post/network.php b/user/post/network.php
similarity index 100%
rename from post/network.php
rename to user/post/network.php
diff --git a/post/network_model.php b/user/post/network_model.php
similarity index 100%
rename from post/network_model.php
rename to user/post/network_model.php
diff --git a/post/product.php b/user/post/product.php
similarity index 100%
rename from post/product.php
rename to user/post/product.php
diff --git a/post/product_model.php b/user/post/product_model.php
similarity index 100%
rename from post/product_model.php
rename to user/post/product_model.php
diff --git a/post/profile.php b/user/post/profile.php
similarity index 100%
rename from post/profile.php
rename to user/post/profile.php
diff --git a/post/project.php b/user/post/project.php
similarity index 100%
rename from post/project.php
rename to user/post/project.php
diff --git a/post/quote.php b/user/post/quote.php
similarity index 100%
rename from post/quote.php
rename to user/post/quote.php
diff --git a/post/quote_model.php b/user/post/quote_model.php
similarity index 100%
rename from post/quote_model.php
rename to user/post/quote_model.php
diff --git a/post/rack.php b/user/post/rack.php
similarity index 100%
rename from post/rack.php
rename to user/post/rack.php
diff --git a/post/revenue.php b/user/post/revenue.php
similarity index 100%
rename from post/revenue.php
rename to user/post/revenue.php
diff --git a/post/service.php b/user/post/service.php
similarity index 100%
rename from post/service.php
rename to user/post/service.php
diff --git a/post/software.php b/user/post/software.php
similarity index 100%
rename from post/software.php
rename to user/post/software.php
diff --git a/post/tag.php b/user/post/tag.php
similarity index 100%
rename from post/tag.php
rename to user/post/tag.php
diff --git a/post/tag_model.php b/user/post/tag_model.php
similarity index 100%
rename from post/tag_model.php
rename to user/post/tag_model.php
diff --git a/post/task.php b/user/post/task.php
similarity index 100%
rename from post/task.php
rename to user/post/task.php
diff --git a/post/ticket.php b/user/post/ticket.php
similarity index 100%
rename from post/ticket.php
rename to user/post/ticket.php
diff --git a/post/ticket_recurring_model.php b/user/post/ticket_recurring_model.php
similarity index 100%
rename from post/ticket_recurring_model.php
rename to user/post/ticket_recurring_model.php
diff --git a/post/transfer.php b/user/post/transfer.php
similarity index 100%
rename from post/transfer.php
rename to user/post/transfer.php
diff --git a/post/transfer_model.php b/user/post/transfer_model.php
similarity index 100%
rename from post/transfer_model.php
rename to user/post/transfer_model.php
diff --git a/post/trip.php b/user/post/trip.php
similarity index 100%
rename from post/trip.php
rename to user/post/trip.php
diff --git a/post/trip_model.php b/user/post/trip_model.php
similarity index 100%
rename from post/trip_model.php
rename to user/post/trip_model.php
diff --git a/post/vendor.php b/user/post/vendor.php
similarity index 100%
rename from post/vendor.php
rename to user/post/vendor.php
diff --git a/post/vendor_contact.php b/user/post/vendor_contact.php
similarity index 100%
rename from post/vendor_contact.php
rename to user/post/vendor_contact.php
diff --git a/post/vendor_contact_model.php b/user/post/vendor_contact_model.php
similarity index 100%
rename from post/vendor_contact_model.php
rename to user/post/vendor_contact_model.php
diff --git a/post/vendor_model.php b/user/post/vendor_model.php
similarity index 100%
rename from post/vendor_model.php
rename to user/post/vendor_model.php
diff --git a/products.php b/user/products.php
similarity index 99%
rename from products.php
rename to user/products.php
index 6befd94d..ef7422ff 100644
--- a/products.php
+++ b/user/products.php
@@ -273,7 +273,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 </div>
                 <?php require_once "modals/product_bulk_edit_category_modal.php"; ?>
             </form>
-            <?php require_once "includes/filter_footer.php";
+            <?php require_once "../includes/filter_footer.php";
  ?>
         </div>
     </div>
@@ -285,4 +285,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 require_once "modals/product_add_modal.php";
 require_once "modals/product_export_modal.php";
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/project_details.php b/user/project_details.php
similarity index 99%
rename from project_details.php
rename to user/project_details.php
index ba893ef7..4b6e63b5 100644
--- a/project_details.php
+++ b/user/project_details.php
@@ -561,7 +561,7 @@ if (isset($_GET['project_id'])) {
 
 }
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
 ?>
 
diff --git a/projects.php b/user/projects.php
similarity index 99%
rename from projects.php
rename to user/projects.php
index 7e44cac9..8b57539b 100644
--- a/projects.php
+++ b/user/projects.php
@@ -336,10 +336,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 </tbody>
             </table>
         </div>
-        <?php require_once "includes/filter_footer.php"; ?>
+        <?php require_once "../includes/filter_footer.php"; ?>
     </div>
 </div>
 
 <?php
 require_once "modals/project_add_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/quote.php b/user/quote.php
similarity index 99%
rename from quote.php
rename to user/quote.php
index 72fe8ff8..401089d1 100644
--- a/quote.php
+++ b/user/quote.php
@@ -32,7 +32,7 @@ if (isset($_GET['quote_id'])) {
             $backlink_append = '';
         }
         echo "<h1 class='text-secondary pt-5' style='text-align: center'>There is no Quote here<br><small><a href='quotes.php$backlink_append'><i class='fas fa-arrow-left mr-2'></i>Back to Quotes</a></small></h1>";
-        require_once "includes/footer.php";
+        require_once "../includes/footer.php";
 
         exit();
     }
@@ -593,7 +593,7 @@ if (isset($_GET['quote_id'])) {
     require_once "modals/quote_note_modal.php";
 }
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
 ?>
 
diff --git a/quotes.php b/user/quotes.php
similarity index 99%
rename from quotes.php
rename to user/quotes.php
index 3e5f5764..742812f1 100644
--- a/quotes.php
+++ b/user/quotes.php
@@ -273,7 +273,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 </tbody>
             </table>
         </div>
-        <?php require_once "includes/filter_footer.php";
+        <?php require_once "../includes/filter_footer.php";
 ?>
     </div>
 </div>
@@ -282,4 +282,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 require_once "modals/quote_add_modal.php";
 require_once "modals/quote_export_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/recurring_expenses.php b/user/recurring_expenses.php
similarity index 99%
rename from recurring_expenses.php
rename to user/recurring_expenses.php
index 6743df79..db221aaa 100644
--- a/recurring_expenses.php
+++ b/user/recurring_expenses.php
@@ -233,7 +233,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php require_once "includes/filter_footer.php";
+            <?php require_once "../includes/filter_footer.php";
  ?>
         </div>
     </div>
@@ -241,5 +241,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <?php
 require_once "modals/recurring_expense_create_modal.php";
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
diff --git a/recurring_invoice.php b/user/recurring_invoice.php
similarity index 99%
rename from recurring_invoice.php
rename to user/recurring_invoice.php
index 4084e0d7..316d89db 100644
--- a/recurring_invoice.php
+++ b/user/recurring_invoice.php
@@ -28,7 +28,7 @@ if (isset($_GET['recurring_invoice_id'])) {
             $backlink_append = '';
         }
         echo "<h1 class='text-secondary pt-5' style='text-align: center'>There is no Recurring Invoice here<br><small><a href='recurring_invoices.php$backlink_append'><i class='fas fa-arrow-left mr-2'></i>Back to Recurring Invoices</a></small></h1>";
-        require_once "includes/footer.php";
+        require_once "../includes/footer.php";
 
         exit();
     }
@@ -495,7 +495,7 @@ if (isset($_GET['recurring_invoice_id'])) {
 
 }
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
 ?>
 
diff --git a/recurring_invoices.php b/user/recurring_invoices.php
similarity index 99%
rename from recurring_invoices.php
rename to user/recurring_invoices.php
index dda221a6..9bc82260 100644
--- a/recurring_invoices.php
+++ b/user/recurring_invoices.php
@@ -295,7 +295,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 </tbody>
             </table>
         </div>
-        <?php require_once "includes/filter_footer.php";
+        <?php require_once "../includes/filter_footer.php";
  ?>
     </div>
 </div>
@@ -303,4 +303,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <?php
 
 require_once "modals/recurring_invoice_add_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/recurring_tickets.php b/user/recurring_tickets.php
similarity index 99%
rename from recurring_tickets.php
rename to user/recurring_tickets.php
index 56c50705..f4448148 100644
--- a/recurring_tickets.php
+++ b/user/recurring_tickets.php
@@ -238,7 +238,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
         </div>
 
-        <?php require_once 'includes/filter_footer.php';
+        <?php require_once '../includes/filter_footer.php';
         ?>
 
     </div>
@@ -248,4 +248,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <?php
 require_once "modals/recurring_ticket_add_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/reports/budget.php b/user/reports/budget.php
similarity index 100%
rename from reports/budget.php
rename to user/reports/budget.php
diff --git a/reports/clients_with_balance.php b/user/reports/clients_with_balance.php
similarity index 100%
rename from reports/clients_with_balance.php
rename to user/reports/clients_with_balance.php
diff --git a/reports/credential_rotation.php b/user/reports/credential_rotation.php
similarity index 100%
rename from reports/credential_rotation.php
rename to user/reports/credential_rotation.php
diff --git a/reports/expense_by_vendor.php b/user/reports/expense_by_vendor.php
similarity index 100%
rename from reports/expense_by_vendor.php
rename to user/reports/expense_by_vendor.php
diff --git a/reports/expense_summary.php b/user/reports/expense_summary.php
similarity index 100%
rename from reports/expense_summary.php
rename to user/reports/expense_summary.php
diff --git a/user/reports/includes/footer.php b/user/reports/includes/footer.php
new file mode 100644
index 00000000..a5449dfa
--- /dev/null
+++ b/user/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/user/reports/includes/header.php
similarity index 51%
rename from reports/includes/header.php
rename to user/reports/includes/header.php
index 8a22fd82..76e42de5 100644
--- a/reports/includes/header.php
+++ b/user/reports/includes/header.php
@@ -22,28 +22,28 @@ header("X-Frame-Options: DENY");
     Favicon
     If Fav Icon exists else use the default one 
     -->
-    <?php if(file_exists('../uploads/favicon.ico')) { ?>
+    <?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">
+    <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">
+    <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">
+    <link href="../../css/itflow_custom.css" rel="stylesheet">
     <!-- Theme style -->
-    <link rel="stylesheet" href="../plugins/adminlte/css/adminlte.min.css">
+    <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>
+    <script src="../../plugins/jquery/jquery.min.js"></script>
+    <script src="../../plugins/toastr/toastr.min.js"></script>
 
 </head>
 <body class="
diff --git a/user/reports/includes/inc_all_reports.php b/user/reports/includes/inc_all_reports.php
new file mode 100644
index 00000000..1d9b14dc
--- /dev/null
+++ b/user/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/user/reports/includes/modal_footer.php
similarity index 100%
rename from reports/includes/modal_footer.php
rename to user/reports/includes/modal_footer.php
diff --git a/reports/includes/modal_header.php b/user/reports/includes/modal_header.php
similarity index 100%
rename from reports/includes/modal_header.php
rename to user/reports/includes/modal_header.php
diff --git a/reports/includes/side_nav.php b/user/reports/includes/side_nav.php
similarity index 100%
rename from reports/includes/side_nav.php
rename to user/reports/includes/side_nav.php
diff --git a/reports/income_by_client.php b/user/reports/income_by_client.php
similarity index 100%
rename from reports/income_by_client.php
rename to user/reports/income_by_client.php
diff --git a/reports/income_summary.php b/user/reports/income_summary.php
similarity index 100%
rename from reports/income_summary.php
rename to user/reports/income_summary.php
diff --git a/reports/index.php b/user/reports/index.php
similarity index 100%
rename from reports/index.php
rename to user/reports/index.php
diff --git a/reports/profit_loss.php b/user/reports/profit_loss.php
similarity index 100%
rename from reports/profit_loss.php
rename to user/reports/profit_loss.php
diff --git a/reports/recurring_by_client.php b/user/reports/recurring_by_client.php
similarity index 100%
rename from reports/recurring_by_client.php
rename to user/reports/recurring_by_client.php
diff --git a/reports/tax_summary.php b/user/reports/tax_summary.php
similarity index 100%
rename from reports/tax_summary.php
rename to user/reports/tax_summary.php
diff --git a/reports/ticket_by_client.php b/user/reports/ticket_by_client.php
similarity index 100%
rename from reports/ticket_by_client.php
rename to user/reports/ticket_by_client.php
diff --git a/reports/ticket_summary.php b/user/reports/ticket_summary.php
similarity index 100%
rename from reports/ticket_summary.php
rename to user/reports/ticket_summary.php
diff --git a/reports/tickets_unbilled.php b/user/reports/tickets_unbilled.php
similarity index 100%
rename from reports/tickets_unbilled.php
rename to user/reports/tickets_unbilled.php
diff --git a/reports/time_by_tech.php b/user/reports/time_by_tech.php
similarity index 100%
rename from reports/time_by_tech.php
rename to user/reports/time_by_tech.php
diff --git a/revenues.php b/user/revenues.php
similarity index 99%
rename from revenues.php
rename to user/revenues.php
index fca0d1ce..4fbe945b 100644
--- a/revenues.php
+++ b/user/revenues.php
@@ -185,7 +185,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 </tbody>
             </table>
         </div>
-        <?php require_once "includes/filter_footer.php";
+        <?php require_once "../includes/filter_footer.php";
  ?>
     </div>
 </div>
@@ -193,4 +193,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <?php
 
 require_once "modals/revenue_add_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/services.php b/user/services.php
similarity index 99%
rename from services.php
rename to user/services.php
index 3aeb59a3..abadbd9e 100644
--- a/services.php
+++ b/user/services.php
@@ -220,11 +220,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php require_once "includes/filter_footer.php";
+            <?php require_once "../includes/filter_footer.php";
  ?>
         </div>
     </div>
 
 <?php
 require_once "modals/service_add_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/software.php b/user/software.php
similarity index 99%
rename from software.php
rename to user/software.php
index 1370e58f..cdcbcb95 100644
--- a/software.php
+++ b/user/software.php
@@ -322,7 +322,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php require_once "includes/filter_footer.php";
+            <?php require_once "../includes/filter_footer.php";
  ?>
         </div>
     </div>
@@ -332,4 +332,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 require_once "modals/software_add_modal.php";
 require_once "modals/software_add_from_template_modal.php";
 require_once "modals/software_export_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/ticket.php b/user/ticket.php
similarity index 99%
rename from ticket.php
rename to user/ticket.php
index d638c733..6f5e20fb 100644
--- a/ticket.php
+++ b/user/ticket.php
@@ -46,7 +46,7 @@ if (isset($_GET['ticket_id'])) {
     if (mysqli_num_rows($sql) == 0) {
         echo "<center><h1 class='text-secondary mt-5'>Nothing to see here</h1><a class='btn btn-lg btn-secondary mt-3' href='tickets.php'><i class='fa fa-fw fa-arrow-left'></i> Go Back</a></center>";
 
-        include_once "includes/footer.php";
+        include_once "../includes/footer.php";
     } else {
 
         $row = mysqli_fetch_array($sql);
@@ -1299,7 +1299,7 @@ if (isset($_GET['ticket_id'])) {
     }
 }
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
 ?>
 
diff --git a/tickets.php b/user/tickets.php
similarity index 99%
rename from tickets.php
rename to user/tickets.php
index 8e4b394d..1388d416 100644
--- a/tickets.php
+++ b/user/tickets.php
@@ -441,4 +441,4 @@ if (isset($_GET["view"])) {
 <?php
 require_once "modals/ticket_add_modal_v2.php";
 require_once "modals/ticket_export_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/tickets_kanban.php b/user/tickets_kanban.php
similarity index 100%
rename from tickets_kanban.php
rename to user/tickets_kanban.php
diff --git a/tickets_list.php b/user/tickets_list.php
similarity index 99%
rename from tickets_list.php
rename to user/tickets_list.php
index 756b5d18..0e275329 100644
--- a/tickets_list.php
+++ b/user/tickets_list.php
@@ -316,7 +316,7 @@
                 <?php require_once "modals/ticket_bulk_merge_modal.php"; ?>
                 <?php require_once "modals/ticket_bulk_resolve_modal.php"; ?>
             </form>
-            <?php require_once "includes/filter_footer.php"; ?>
+            <?php require_once "../includes/filter_footer.php"; ?>
         </div>
     </div>
 
diff --git a/transfers.php b/user/transfers.php
similarity index 99%
rename from transfers.php
rename to user/transfers.php
index 6924939f..8ff79ed8 100644
--- a/transfers.php
+++ b/user/transfers.php
@@ -272,7 +272,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php require_once "includes/filter_footer.php";
+            <?php require_once "../includes/filter_footer.php";
  ?>
         </div>
     </div>
@@ -280,5 +280,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <?php
 require_once "modals/transfer_add_modal.php";
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
diff --git a/trips.php b/user/trips.php
similarity index 99%
rename from trips.php
rename to user/trips.php
index 84412bb4..dc4d81db 100644
--- a/trips.php
+++ b/user/trips.php
@@ -240,7 +240,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php require_once "includes/filter_footer.php";
+            <?php require_once "../includes/filter_footer.php";
  ?>
         </div>
     </div>
@@ -248,4 +248,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <?php
 require_once "modals/trip_add_modal.php";
 require_once "modals/trip_export_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/user/user_activity.php b/user/user_activity.php
index 287706a7..3b414c65 100644
--- a/user/user_activity.php
+++ b/user/user_activity.php
@@ -96,4 +96,4 @@ $sql_recent_logs = mysqli_query($mysqli, "SELECT * FROM logs
 </div>
 
 <?php
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/user/user_details.php b/user/user_details.php
index 2108d1c1..9aa37ae9 100644
--- a/user/user_details.php
+++ b/user/user_details.php
@@ -78,4 +78,4 @@ require_once "includes/inc_all_user.php";
 </div>
 
 <?php
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/user/user_preferences.php b/user/user_preferences.php
index a4d81213..4fa53423 100644
--- a/user/user_preferences.php
+++ b/user/user_preferences.php
@@ -48,4 +48,4 @@ $user_config_calendar_first_day = intval($row['user_config_calendar_first_day'])
 </div>
 
 <?php
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/user/user_security.php b/user/user_security.php
index 3334f82e..81b91d9f 100644
--- a/user/user_security.php
+++ b/user/user_security.php
@@ -97,4 +97,4 @@ if (!empty($_SESSION['show_mfa_modal'])) {
     unset($_SESSION['show_mfa_modal']);
 }
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/vendor_details.php b/user/vendor_details.php
similarity index 99%
rename from vendor_details.php
rename to user/vendor_details.php
index 43969736..644eb2fb 100644
--- a/vendor_details.php
+++ b/user/vendor_details.php
@@ -260,4 +260,4 @@ if (isset($_GET['vendor_id'])) {
 
 <?php
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/vendors.php b/user/vendors.php
similarity index 99%
rename from vendors.php
rename to user/vendors.php
index 9278357b..df2290fb 100644
--- a/vendors.php
+++ b/user/vendors.php
@@ -283,7 +283,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 </table>
             </div>
         </form>
-        <?php require_once "includes/filter_footer.php";
+        <?php require_once "../../includes/filter_footer.php";
 ?>
     </div>
 </div>
@@ -294,4 +294,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 require_once "modals/vendor_add_modal.php";
 require_once "modals/vendor_add_from_template_modal.php";
 require_once "modals/vendor_export_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";