diff --git a/accounts.php b/accounts.php
index 0488c624..f5f972da 100644
--- a/accounts.php
+++ b/accounts.php
@@ -109,7 +109,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </tr>
 
                         <?php
-                        include "account_edit_modal.php";
+                        require "modals/account_edit_modal.php";
                     }
                     ?>
 
@@ -122,5 +122,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <?php
 
-require_once "account_add_modal.php";
+require_once "modals/account_add_modal.php";
 require_once "includes/footer.php";
diff --git a/admin_api.php b/admin_api.php
index 28aa83e4..b018f48a 100644
--- a/admin_api.php
+++ b/admin_api.php
@@ -174,7 +174,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     <script src="js/bulk_actions.js"></script>
 
 <?php
-require_once "admin_api_key_add_modal.php";
+require_once "modals/admin_api_key_add_modal.php";
 
 require_once "includes/footer.php";
 
diff --git a/admin_category.php b/admin_category.php
index 59f74f32..d5de8015 100644
--- a/admin_category.php
+++ b/admin_category.php
@@ -177,7 +177,7 @@ if (isset($_GET['archived'])) {
 
                         <?php
 
-                        include "admin_category_edit_modal.php";
+                        require "modals/admin_category_edit_modal.php";
 
                     }
 
@@ -192,6 +192,6 @@ if (isset($_GET['archived'])) {
 </div>
 
 <?php
-require_once "admin_category_add_modal.php";
+require_once "modals/admin_category_add_modal.php";
 
 require_once "includes/footer.php";
diff --git a/admin_custom_link.php b/admin_custom_link.php
index 0a511a5b..13d705ee 100644
--- a/admin_custom_link.php
+++ b/admin_custom_link.php
@@ -131,7 +131,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                         <?php
 
-                        require "admin_custom_link_edit_modal.php";
+                        require "modals/admin_custom_link_edit_modal.php";
 
 
                     }
@@ -147,7 +147,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-require_once "admin_custom_link_add_modal.php";
+require_once "modals/admin_custom_link_add_modal.php";
 
 require_once "includes/footer.php";
 
diff --git a/admin_document_template.php b/admin_document_template.php
index 2c9996ed..d2f3f48e 100644
--- a/admin_document_template.php
+++ b/admin_document_template.php
@@ -119,7 +119,7 @@
 
                     <?php
 
-                            include "admin_document_template_edit_modal.php";
+                            require "modals/admin_document_template_edit_modal.php";
 
                         }
 
@@ -129,12 +129,12 @@
             </table>
             <br>
         </div>
-        <?php include "pagination.php"; ?>
+        <?php require_once "includes/filter_footer.php"; ?>
     </div>
 </div>
 
-<?php include "admin_document_template_add_modal.php"; ?>
-<?php include "footer.php"; ?>
+<?php require_once "modals/admin_document_template_add_modal.php"; ?>
+<?php require_once "includes/footer.php"; ?>
 
 <script>
 $(document).ready(function(){
diff --git a/admin_document_template_details.php b/admin_document_template_details.php
index 352c8edf..48911b3e 100644
--- a/admin_document_template_details.php
+++ b/admin_document_template_details.php
@@ -59,7 +59,7 @@ $document_updated_at = nullable_htmlentities($row['document_updated_at']);
 
 <?php
 
-require_once "admin_document_template_edit_modal.php";
+require_once "modals/admin_document_template_edit_modal.php";
 
 require_once "includes/footer.php";
 
diff --git a/admin_project_template.php b/admin_project_template.php
index fcd66350..1871cff6 100644
--- a/admin_project_template.php
+++ b/admin_project_template.php
@@ -129,7 +129,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                     <?php
 
-                    require "admin_project_template_edit_modal.php";
+                    require "modals/admin_project_template_edit_modal.php";
 
                 }
 
@@ -144,6 +144,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 </div>
 
 <?php
-require_once "admin_project_template_add_modal.php";
+require_once "modals/admin_project_template_add_modal.php";
 
 require_once "includes/footer.php";
diff --git a/admin_project_template_details.php b/admin_project_template_details.php
index 54799673..a0ef83bb 100644
--- a/admin_project_template_details.php
+++ b/admin_project_template_details.php
@@ -222,8 +222,8 @@ if (isset($_GET['project_template_id'])) {
 
 <?php
 
-require_once "admin_project_template_edit_modal.php";
-require_once "admin_project_template_ticket_template_add_modal.php";
+require_once "modals/admin_project_template_edit_modal.php";
+require_once "modals/admin_project_template_ticket_template_add_modal.php";
 
 }
 
diff --git a/admin_role.php b/admin_role.php
index 62086cc2..db315d07 100644
--- a/admin_role.php
+++ b/admin_role.php
@@ -124,7 +124,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                         <?php
 
-                        require "admin_role_edit_modal.php";
+                        require "modals/admin_role_edit_modal.php";
 
 
                     }
@@ -141,7 +141,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <?php
 
-require_once "admin_role_add_modal.php";
+require_once "modals/admin_role_add_modal.php";
 
 require_once "includes/footer.php";
 
diff --git a/admin_software_template.php b/admin_software_template.php
index c661c9c9..0f354bbe 100644
--- a/admin_software_template.php
+++ b/admin_software_template.php
@@ -119,7 +119,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                     <?php
 
-                    require "admin_software_template_edit_modal.php";
+                    require "modals/admin_software_template_edit_modal.php";
 
                 }
 
@@ -134,7 +134,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 </div>
 
 <?php
-require_once "admin_software_template_add_modal.php";
+require_once "modals/admin_software_template_add_modal.php";
 
 require_once "includes/footer.php";
 
diff --git a/admin_tag.php b/admin_tag.php
index 8be03822..e2382ae4 100644
--- a/admin_tag.php
+++ b/admin_tag.php
@@ -112,7 +112,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                         <?php
 
-                        require "admin_tag_edit_modal.php";
+                        require "modals/admin_tag_edit_modal.php";
 
 
                     }
@@ -128,7 +128,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-require_once "admin_tag_add_modal.php";
+require_once "modals/admin_tag_add_modal.php";
 
 require_once "includes/footer.php";
 
diff --git a/admin_tax.php b/admin_tax.php
index e8c3948e..e7cc1788 100644
--- a/admin_tax.php
+++ b/admin_tax.php
@@ -78,7 +78,7 @@ $num_rows = mysqli_num_rows($sql);
 
                         <?php
 
-                        require "admin_tax_edit_modal.php";
+                        require "modals/admin_tax_edit_modal.php";
 
                     }
 
@@ -96,7 +96,7 @@ $num_rows = mysqli_num_rows($sql);
     </div>
 
 <?php
-require_once "admin_tax_add_modal.php";
+require_once "modals/admin_tax_add_modal.php";
 
 require_once "includes/footer.php";
 
diff --git a/admin_ticket_status.php b/admin_ticket_status.php
index 55d02739..434e2359 100644
--- a/admin_ticket_status.php
+++ b/admin_ticket_status.php
@@ -114,7 +114,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                         <?php
                         if ( $ticket_status_id > 5 ) {
-                            require "admin_ticket_status_edit_modal.php";
+                            require "modals/admin_ticket_status_edit_modal.php";
                         }
                     }
 
@@ -129,7 +129,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-require_once "admin_ticket_status_add_modal.php";
+require_once "modals/admin_ticket_status_add_modal.php";
 
 require_once "includes/footer.php";
 
diff --git a/admin_ticket_template.php b/admin_ticket_template.php
index 54f037df..25f213be 100644
--- a/admin_ticket_template.php
+++ b/admin_ticket_template.php
@@ -114,6 +114,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 </div>
 
 <?php
-require_once "admin_ticket_template_add_modal.php";
+require_once "modals/admin_ticket_template_add_modal.php";
 require_once "includes/footer.php";
 
diff --git a/admin_ticket_template_details.php b/admin_ticket_template_details.php
index 16853577..dfb7e246 100644
--- a/admin_ticket_template_details.php
+++ b/admin_ticket_template_details.php
@@ -124,7 +124,7 @@ $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE
                                 </td>
                             </tr>
                             <?php
-                            require "task_edit_modal.php";
+                            require "modals/task_edit_modal.php";
                         }
                         ?>
                     </table>
@@ -139,5 +139,5 @@ $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE
 
 <?php
 
-require_once "admin_ticket_template_edit_modal.php";
+require_once "modals/admin_ticket_template_edit_modal.php";
 require_once "includes/footer.php";
diff --git a/admin_user.php b/admin_user.php
index ac192357..e950bcd6 100644
--- a/admin_user.php
+++ b/admin_user.php
@@ -207,9 +207,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                     <?php
 
-                    require "admin_user_edit_modal.php";
+                    require "modals/admin_user_edit_modal.php";
 
-                    require "admin_user_archive_modal.php";
+                    require "modals/admin_user_archive_modal.php";
 
 
                 }
@@ -231,13 +231,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <?php
 
-require_once "admin_user_add_modal.php";
+require_once "modals/admin_user_add_modal.php";
 
-require_once "admin_user_invite_modal.php";
+require_once "modals/admin_user_invite_modal.php";
 
-require_once "admin_user_export_modal.php";
+require_once "modals/admin_user_export_modal.php";
 
-require_once "admin_user_all_reset_password_modal.php";
+require_once "modals/admin_user_all_reset_password_modal.php";
 
 require_once "includes/footer.php";
 
diff --git a/admin_vendor_template.php b/admin_vendor_template.php
index f75cd9fb..dc6ef2d1 100644
--- a/admin_vendor_template.php
+++ b/admin_vendor_template.php
@@ -155,7 +155,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                         <?php
 
-                        require "admin_vendor_template_edit_modal.php";
+                        require "modals/admin_vendor_template_edit_modal.php";
 
                     }
 
@@ -170,7 +170,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-require_once "admin_vendor_template_add_modal.php";
+require_once "modals/admin_vendor_template_add_modal.php";
 
 require_once "includes/footer.php";
 
diff --git a/calendar_events.php b/calendar_events.php
index 1904f37a..48f6e019 100644
--- a/calendar_events.php
+++ b/calendar_events.php
@@ -41,7 +41,7 @@ if (isset($_GET['calendar_id'])) {
                         <button type="button" class="btn btn-link btn-sm float-right" data-toggle="modal" data-target="#editCalendarModal<?php echo $calendar_id; ?>"><i class="fas fa-fw fa-pencil-alt text-secondary"></i></button>
                     </div>
                     <?php
-                        require "calendar_edit_modal.php";
+                        require "modals/calendar_edit_modal.php";
                     }
                     ?>
                 </form>
@@ -69,9 +69,9 @@ if (isset($_GET['calendar_id'])) {
 
 <?php
 
-require_once "calendar_event_add_modal.php";
+require_once "modals/calendar_event_add_modal.php";
 
-require_once "calendar_add_modal.php";
+require_once "modals/calendar_add_modal.php";
 
 
 //loop through IDs and create a modal for each
@@ -89,7 +89,7 @@ while ($row = mysqli_fetch_array($sql)) {
     $calendar_color = nullable_htmlentities($row['calendar_color']);
     $client_id = intval($row['event_client_id']);
 
-    require "calendar_event_edit_modal.php";
+    require "modals/calendar_event_edit_modal.php";
 }
 
 ?>
diff --git a/client_asset_details.php b/client_asset_details.php
index 6c7fc4ec..e84fef9f 100644
--- a/client_asset_details.php
+++ b/client_asset_details.php
@@ -246,7 +246,7 @@ if (isset($_GET['asset_id'])) {
                 <textarea class="form-control" rows=6 id="assetNotes" placeholder="Enter quick notes here" onblur="updateAssetNotes(<?php echo $asset_id ?>)"><?php echo $asset_notes ?></textarea>    
             </div>
 
-            <?php require_once "client_asset_edit_modal.php"; ?>
+            <?php require_once "modals/client_asset_edit_modal.php"; ?>
 
         </div>
 
@@ -405,7 +405,7 @@ if (isset($_GET['asset_id'])) {
 
                                 <?php
 
-                                require "client_asset_interface_edit_modal.php";
+                                require "modals/client_asset_interface_edit_modal.php";
 
                             }
 
@@ -532,7 +532,7 @@ if (isset($_GET['asset_id'])) {
 
                                 <?php
 
-                                require "client_login_edit_modal.php";
+                                require "modals/client_login_edit_modal.php";
 
                             }
 
@@ -860,7 +860,7 @@ if (isset($_GET['asset_id'])) {
 
     <?php
 
-    require_once "share_modal.php";
+    require_once "modals/share_modal.php";
 
 
     ?>
@@ -902,13 +902,13 @@ if (isset($_GET['asset_id'])) {
 
 <?php
 
-require_once "client_asset_interface_add_modal.php";
+require_once "modals/client_asset_interface_add_modal.php";
 
-require_once "ticket_add_modal.php";
+require_once "modals/ticket_add_modal.php";
 
-require_once "recurring_ticket_add_modal.php";
+require_once "modals/recurring_ticket_add_modal.php";
 
-require_once "recurring_ticket_edit_modal.php";
+require_once "modals/recurring_ticket_edit_modal.php";
 
 require_once "includes/footer.php";
 
diff --git a/client_assets.php b/client_assets.php
index fd462276..bb67bf17 100644
--- a/client_assets.php
+++ b/client_assets.php
@@ -596,11 +596,11 @@ if (mysqli_num_rows($os_sql) > 0) {
 
                             <?php
 
-                            require "client_asset_edit_modal.php";
+                            require "modals/client_asset_edit_modal.php";
 
-                            require "client_asset_copy_modal.php";
+                            require "modals/client_asset_copy_modal.php";
 
-                            require "client_asset_transfer_modal.php";
+                            require "modals/client_asset_transfer_modal.php";
 
                         }
 
@@ -609,10 +609,10 @@ if (mysqli_num_rows($os_sql) > 0) {
                         </tbody>
                     </table>
                 </div>
-                <?php require_once "client_asset_bulk_assign_location_modal.php"; ?>
-                <?php require_once "client_asset_bulk_assign_contact_modal.php"; ?>
-                <?php require_once "client_asset_bulk_edit_status_modal.php"; ?>
-                <?php require_once "client_asset_bulk_add_ticket_modal.php"; ?>
+                <?php require_once "modals/client_asset_bulk_assign_location_modal.php"; ?>
+                <?php require_once "modals/client_asset_bulk_assign_contact_modal.php"; ?>
+                <?php require_once "modals/client_asset_bulk_edit_status_modal.php"; ?>
+                <?php require_once "modals/client_asset_bulk_add_ticket_modal.php"; ?>
             </form>
             <?php require_once "includes/filter_footer.php"; ?>
         </div>
@@ -621,11 +621,11 @@ if (mysqli_num_rows($os_sql) > 0) {
 <script src="js/bulk_actions.js"></script>
 
 <?php
-require_once "client_asset_add_modal.php";
+require_once "modals/client_asset_add_modal.php";
 
-require_once "client_asset_import_modal.php";
+require_once "modals/client_asset_import_modal.php";
 
-require_once "client_asset_export_modal.php";
+require_once "modals/client_asset_export_modal.php";
 
 require_once "includes/footer.php";
 
diff --git a/client_certificates.php b/client_certificates.php
index 0696b532..f91d97d0 100644
--- a/client_certificates.php
+++ b/client_certificates.php
@@ -206,11 +206,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 </div>
 
 <?php
-require_once "client_certificate_edit_modal.php";
-
-require_once "client_certificate_add_modal.php";
-
-require_once "client_certificate_export_modal.php";
+require_once "modals/client_certificate_edit_modal.php";
+require_once "modals/client_certificate_add_modal.php";
+require_once "modals/client_certificate_export_modal.php";
 
 ?>
 
diff --git a/client_contact_details.php b/client_contact_details.php
index 36e97042..7efbbb8d 100644
--- a/client_contact_details.php
+++ b/client_contact_details.php
@@ -414,9 +414,9 @@ if (isset($_GET['contact_id'])) {
 
                                 <?php
 
-                                require "client_asset_edit_modal.php";
+                                require "modals/client_asset_edit_modal.php";
 
-                                require "client_asset_copy_modal.php";
+                                require "modals/client_asset_copy_modal.php";
 
 
                             }
@@ -551,7 +551,7 @@ if (isset($_GET['contact_id'])) {
 
                                 <?php
 
-                                require "client_login_edit_modal.php";
+                                require "modals/client_login_edit_modal.php";
 
                             }
 
@@ -1063,7 +1063,7 @@ if (isset($_GET['contact_id'])) {
 
     <?php
 
-    require_once "share_modal.php";
+    require_once "modals/share_modal.php";
 
     ?>
 
@@ -1126,7 +1126,7 @@ if (isset($_GET['contact_id'])) {
 <?php
 
 require_once "modals/client_contact_create_note_modal.php";
-require_once "ticket_add_modal.php";
+require_once "modals/ticket_add_modal.php";
 require_once "modals/client_contact_link_asset_modal.php";
 require_once "modals/client_contact_link_software_modal.php";
 require_once "modals/client_contact_link_credential_modal.php";
@@ -1134,7 +1134,7 @@ require_once "modals/client_contact_link_service_modal.php";
 require_once "modals/client_contact_link_document_modal.php";
 require_once "modals/client_contact_link_file_modal.php";
 
-require_once "recurring_ticket_add_modal.php";
-require_once "recurring_ticket_edit_modal.php";
+require_once "modals/recurring_ticket_add_modal.php";
+require_once "modals/recurring_ticket_edit_modal.php";
 
 require_once "includes/footer.php";
diff --git a/client_document_details.php b/client_document_details.php
index e827241d..a6839a81 100644
--- a/client_document_details.php
+++ b/client_document_details.php
@@ -390,22 +390,14 @@ $document_client_visible = intval($row['document_client_visible']);
 
 <?php
 
-require_once "client_document_edit_modal.php";
-
-require_once "client_document_link_file_modal.php";
-
-require_once "client_document_link_contact_modal.php";
-
-require_once "client_document_link_asset_modal.php";
-
-require_once "client_document_link_software_modal.php";
-
-require_once "client_document_link_vendor_modal.php";
-
-require_once "document_edit_visibility_modal.php";
-
-require_once "share_modal.php";
-
+require_once "modals/client_document_edit_modal.php";
+require_once "modals/client_document_link_file_modal.php";
+require_once "modals/client_document_link_contact_modal.php";
+require_once "modals/client_document_link_asset_modal.php";
+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";
 
 ?>
diff --git a/client_documents.php b/client_documents.php
index 12becd84..d5e30d26 100644
--- a/client_documents.php
+++ b/client_documents.php
@@ -268,7 +268,7 @@ while ($folder_id > 0) {
                                 echo '</div>';
 
                                 // Include the rename and create subfolder modals
-                                require "folder_rename_modal.php";
+                                require "modals/folder_rename_modal.php";
 
                                 if ($subfolder_count > 0) {
                                     // Display subfolders
@@ -285,7 +285,7 @@ while ($folder_id > 0) {
                         display_folders(0, $client_id);
                         ?>
                     </ul>
-                    <?php require_once "folder_create_modal.php"; ?>
+                    <?php require_once "modals/folder_create_modal.php"; ?>
                 </div>
 
                 <div class="col-md-9">
@@ -447,9 +447,9 @@ while ($folder_id > 0) {
 
                                 <?php
 
-                                require "client_document_move_modal.php";
+                                require "modals/client_document_move_modal.php";
 
-                                require "client_document_rename_modal.php";
+                                require "modals/client_document_rename_modal.php";
 
 
                                 }
@@ -460,7 +460,7 @@ while ($folder_id > 0) {
                             </table>
                             <br>
                         </div>
-                        <?php require_once "client_document_bulk_move_modal.php"; ?>
+                        <?php require_once "modals/client_document_bulk_move_modal.php"; ?>
                     </form>
                     <?php require_once "includes/filter_footer.php";
  ?>
@@ -472,10 +472,10 @@ while ($folder_id > 0) {
 <script src="js/bulk_actions.js"></script>
 
 <?php
-require_once "share_modal.php";
+require_once "modals/share_modal.php";
 
-require_once "client_document_add_modal.php";
+require_once "modals/client_document_add_modal.php";
 
-require_once "client_document_add_from_template_modal.php";
+require_once "modals/client_document_add_from_template_modal.php";
 
 require_once "includes/footer.php";
diff --git a/client_domains.php b/client_domains.php
index bf6bbde9..04b47b74 100644
--- a/client_domains.php
+++ b/client_domains.php
@@ -261,11 +261,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-require_once "client_domain_edit_modal.php";
-
-require_once "client_domain_add_modal.php";
-
-require_once "client_domain_export_modal.php";
+require_once "modals/client_domain_edit_modal.php";
+require_once "modals/client_domain_add_modal.php";
+require_once "modals/client_domain_export_modal.php";
 ?>
 
 <script src="js/domain_edit_modal.js"></script>
diff --git a/client_events.php b/client_events.php
index afbd4be9..a68c0558 100644
--- a/client_events.php
+++ b/client_events.php
@@ -21,9 +21,9 @@ if (isset($_GET['calendar_id'])) {
 </div>
 
 <?php
-include "calendar_event_add_modal.php";
+require_once "modals/calendar_event_add_modal.php";
 
-include "calendar_add_modal.php";
+require_once "modals/calendar_add_modal.php";
 
 
 //loop through IDs and create a modal for each
@@ -40,7 +40,7 @@ while ($row = mysqli_fetch_array($sql)) {
     $calendar_name = nullable_htmlentities($row['calendar_name']);
     $calendar_color = nullable_htmlentities($row['calendar_color']);
 
-    require "calendar_event_edit_modal.php";
+    require "modals/calendar_event_edit_modal.php";
 
 
 }
@@ -278,5 +278,5 @@ while ($row = mysqli_fetch_array($sql)) {
 </script>
 
 <?php
-require "footer.php";
+require_once "includes/footer.php";
 
diff --git a/client_files.php b/client_files.php
index 2ab08ec6..058ba642 100644
--- a/client_files.php
+++ b/client_files.php
@@ -213,7 +213,7 @@ while ($folder_id > 0) {
                             echo '</div>';
 
                             // Include the rename and create subfolder modals
-                            require "folder_rename_modal.php";
+                            require "modals/folder_rename_modal.php";
 
                             if ($subfolder_count > 0) {
                                 // Display subfolders
@@ -230,7 +230,7 @@ while ($folder_id > 0) {
                     display_folders(0, $client_id);
                     ?>
                 </ul>
-                <?php require_once "folder_create_modal.php"; ?>
+                <?php require_once "modals/folder_create_modal.php"; ?>
             </div>
 
 
@@ -386,7 +386,7 @@ while ($folder_id > 0) {
                         </div>
 
                         <?php
-                        require "client_file_view_modal.php";
+                        require "modals/client_file_view_modal.php";
 
                     }
                     ?>
@@ -583,11 +583,9 @@ while ($folder_id > 0) {
                                     </td>
                                 </tr>
                                 <?php
-                                require "client_file_rename_modal.php";
-
-                                require "client_file_move_modal.php";
-
-                                require "client_file_link_asset_modal.php";
+                                require "modals/client_file_rename_modal.php";
+                                require "modals/client_file_move_modal.php";
+                                require "modals/client_file_link_asset_modal.php";
 
                             }
                             ?>
@@ -595,7 +593,7 @@ while ($folder_id > 0) {
 
                         </table>
                     </div>
-                    <?php require_once "client_file_bulk_move_modal.php"; ?>
+                    <?php require_once "modals/client_file_bulk_move_modal.php"; ?>
                 </form>
 
                 <?php } ?>
@@ -634,10 +632,7 @@ function prevFile() {
 <script src="js/bulk_actions.js"></script>
 
 <?php
-require_once "client_file_upload_modal.php";
-
-require_once "share_modal.php";
-
-require_once "client_file_delete_modal.php";
-
+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";
diff --git a/client_invoices.php b/client_invoices.php
index 11624313..03647111 100644
--- a/client_invoices.php
+++ b/client_invoices.php
@@ -203,9 +203,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                     <?php
 
-                        require "invoice_copy_modal.php";
-
-                        require "invoice_edit_modal.php";
+                        require "modals/invoice_copy_modal.php";
+                        require "modals/invoice_edit_modal.php";
                     }
 
                     ?>
@@ -219,10 +218,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 </div>
 
 <?php
-require_once "invoice_add_modal.php";
-
-require_once "invoice_payment_add_bulk_modal.php";
-
-require_once "client_invoice_export_modal.php";
-
+require_once "modals/invoice_add_modal.php";
+require_once "modals/invoice_payment_add_bulk_modal.php";
+require_once "modals/client_invoice_export_modal.php";
 require_once "includes/footer.php";
diff --git a/client_logins.php b/client_logins.php
index 606e5431..db25c4a7 100644
--- a/client_logins.php
+++ b/client_logins.php
@@ -396,7 +396,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                         <?php
 
-                            require "client_login_edit_modal.php";
+                            require "modals/client_login_edit_modal.php";
                         }
 
                         ?>
@@ -404,7 +404,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php require_once "client_login_bulk_assign_tags_modal.php"; ?>
+            <?php require_once "modals/client_login_bulk_assign_tags_modal.php"; ?>
         </form>
         <?php require_once "includes/filter_footer.php";
         ?>
@@ -421,12 +421,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <?php
 
-require_once "client_login_add_modal.php";
+require_once "modals/client_login_add_modal.php";
 
-require_once "share_modal.php";
+require_once "modals/share_modal.php";
 
-require_once "client_login_import_modal.php";
+require_once "modals/client_login_import_modal.php";
 
-require_once "client_login_export_modal.php";
+require_once "modals/client_login_export_modal.php";
 
 require_once "includes/footer.php";
diff --git a/client_networks.php b/client_networks.php
index b410ba40..6a19181c 100644
--- a/client_networks.php
+++ b/client_networks.php
@@ -231,11 +231,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <?php
 
-require_once "client_network_edit_modal.php";
+require_once "modals/client_network_edit_modal.php";
 
-require_once "client_network_add_modal.php";
+require_once "modals/client_network_add_modal.php";
 
-require_once "client_network_export_modal.php";
+require_once "modals/client_network_export_modal.php";
 
 
 ?>
diff --git a/client_payments.php b/client_payments.php
index 5bd569b9..305c1224 100644
--- a/client_payments.php
+++ b/client_payments.php
@@ -150,7 +150,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 </div>
 
 <?php
-require_once "client_payment_export_modal.php";
-
+require_once "modals/client_payment_export_modal.php";
 require_once "includes/footer.php";
-
diff --git a/client_quotes.php b/client_quotes.php
index 7782fc13..2108348c 100644
--- a/client_quotes.php
+++ b/client_quotes.php
@@ -187,7 +187,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                         <?php
 
-                        require "quote_copy_modal.php";
+                        require "modals/quote_copy_modal.php";
 
                     }
 
@@ -202,11 +202,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-require_once "quote_add_modal.php";
-
-require_once "quote_edit_modal.php";
-
-require_once "client_quote_export_modal.php";
-
+require_once "modals/quote_add_modal.php";
+require_once "modals/quote_edit_modal.php";
+require_once "modals/client_quote_export_modal.php";
 require_once "includes/footer.php";
-
diff --git a/client_racks.php b/client_racks.php
index 41827f48..d070d771 100644
--- a/client_racks.php
+++ b/client_racks.php
@@ -229,8 +229,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </div>
                 
                 </div>
-                <?php require "client_rack_edit_modal.php"; ?>
-                <?php require "client_rack_unit_add_modal.php"; ?>
+                <?php require "modals/client_rack_edit_modal.php"; ?>
+                <?php require "modals/client_rack_unit_add_modal.php"; ?>
             <?php } ?>
 
         </div>
@@ -241,6 +241,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <?php
 
-require_once "client_rack_add_modal.php";
+require_once "modals/client_rack_add_modal.php";
 require_once "includes/footer.php";
 ?>
diff --git a/client_recurring_invoices.php b/client_recurring_invoices.php
index 281158ee..8b8da97f 100644
--- a/client_recurring_invoices.php
+++ b/client_recurring_invoices.php
@@ -161,7 +161,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 Create
                             </a>
                         ";
-                        require "recurring_payment_add_modal.php";
+                        require "modals/recurring_payment_add_modal.php";
                     }
 
                     ?>
@@ -217,9 +217,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 </div>
 
 <?php
-require_once "recurring_invoice_add_modal.php";
-
-require_once "client_recurring_export_modal.php";
-
+require_once "modals/recurring_invoice_add_modal.php";
+require_once "modals/client_recurring_export_modal.php";
 require_once "includes/footer.php";
-
diff --git a/client_recurring_tickets.php b/client_recurring_tickets.php
index 88d60899..f7186d43 100644
--- a/client_recurring_tickets.php
+++ b/client_recurring_tickets.php
@@ -166,7 +166,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
         </div>
 
-        <?php require_once 'pagination.php';
+        <?php require_once 'includes/filter_footer.php';
  ?>
 
     </div>
@@ -176,9 +176,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <?php
 
-require_once "recurring_ticket_add_modal.php";
+require_once "modals/recurring_ticket_add_modal.php";
 
-require_once "recurring_ticket_edit_modal.php";
+require_once "modals/recurring_ticket_edit_modal.php";
 
 require_once "includes/footer.php";
 
diff --git a/client_services.php b/client_services.php
index 2ea4018c..c718716e 100644
--- a/client_services.php
+++ b/client_services.php
@@ -199,9 +199,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             WHERE service_id = $service_id"
                         );
 
-                        require "client_service_edit_modal.php";
+                        require "modals/client_service_edit_modal.php";
 
-                        require "client_service_view_modal.php";
+                        require "modals/client_service_view_modal.php";
 
 
                     }
@@ -210,13 +210,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php require_once 'pagination.php';
+            <?php require_once "includes/filter_footer.php";
  ?>
         </div>
     </div>
 
 <?php
-require_once "client_service_add_modal.php";
+require_once "modals/client_service_add_modal.php";
 
 require_once "includes/footer.php";
 
diff --git a/client_software.php b/client_software.php
index 02af0d2a..fb48224a 100644
--- a/client_software.php
+++ b/client_software.php
@@ -214,7 +214,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                         <?php
 
-                        require "client_software_edit_modal.php";
+                        require "modals/client_software_edit_modal.php";
 
                     }
 
@@ -230,10 +230,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <?php
 
-require_once "client_software_add_modal.php";
+require_once "modals/client_software_add_modal.php";
 
-require_once "client_software_add_from_template_modal.php";
+require_once "modals/client_software_add_from_template_modal.php";
 
-require_once "client_software_export_modal.php";
+require_once "modals/client_software_export_modal.php";
 
 require_once "includes/footer.php";
diff --git a/client_tickets.php b/client_tickets.php
index d6f779ba..0571161c 100644
--- a/client_tickets.php
+++ b/client_tickets.php
@@ -316,14 +316,14 @@ $total_tickets_closed = intval($row['total_tickets_closed']);
                     // Edit actions, for open tickets
                     if (empty($ticket_closed_at)) {
 
-                        require "ticket_assign_modal.php";
+                        require "modals/ticket_assign_modal.php";
 
-                        require "ticket_edit_priority_modal.php";
+                        require "modals/ticket_edit_priority_modal.php";
 
-                        require "ticket_edit_contact_modal.php";
+                        require "modals/ticket_edit_contact_modal.php";
 
                         if ($config_module_enable_accounting) {
-                            require "ticket_edit_billable_modal.php";
+                            require "modals/ticket_edit_billable_modal.php";
                         }
 
                     }
@@ -340,9 +340,9 @@ $total_tickets_closed = intval($row['total_tickets_closed']);
 </div>
 
 <?php
-require_once "ticket_add_modal.php";
+require_once "modals/ticket_add_modal.php";
 
-require_once "client_ticket_export_modal.php";
+require_once "modals/client_ticket_export_modal.php";
 
 require_once "includes/footer.php";
 
diff --git a/client_trips.php b/client_trips.php
index f45177d3..1827605b 100644
--- a/client_trips.php
+++ b/client_trips.php
@@ -161,9 +161,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                         <?php
 
-                        require "trip_copy_modal.php";
-
-                        require "trip_edit_modal.php";
+                        require "modals/trip_copy_modal.php";
+                        require "modals/trip_edit_modal.php";
 
                     }
 
@@ -178,9 +177,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-require_once "trip_add_modal.php";
-
-require_once "client_trip_export_modal.php";
-
+require_once "modals/trip_add_modal.php";
+require_once "modals/client_trip_export_modal.php";
 require_once "includes/footer.php";
-
diff --git a/client_vendors.php b/client_vendors.php
index 2b286282..36abb3c5 100644
--- a/client_vendors.php
+++ b/client_vendors.php
@@ -251,7 +251,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                             <?php
 
-                            require "vendor_edit_modal.php";
+                            require "modals/vendor_edit_modal.php";
 
                         } ?>
 
@@ -267,11 +267,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <script src="js/bulk_actions.js"></script>
 
 <?php
-require_once "vendor_add_modal.php";
+require_once "modals/vendor_add_modal.php";
 
-require_once "vendor_add_from_template_modal.php";
+require_once "modals/vendor_add_from_template_modal.php";
 
-require_once "client_vendor_export_modal.php";
+require_once "modals/client_vendor_export_modal.php";
 
 require_once "includes/footer.php";
 
diff --git a/clients.php b/clients.php
index 6ccfe558..c2783340 100644
--- a/clients.php
+++ b/clients.php
@@ -470,7 +470,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                         <?php
 
-                        require "client_edit_modal.php";
+                        require "modals/client_edit_modal.php";
 
 
                     } ?>
@@ -484,11 +484,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-require_once "client_add_modal.php";
+require_once "modals/client_add_modal.php";
 
-require_once "client_import_modal.php";
+require_once "modals/client_import_modal.php";
 
-require_once "client_export_modal.php";
+require_once "modals/client_export_modal.php";
 
 require_once "includes/footer.php";
 
diff --git a/expenses.php b/expenses.php
index 0db8b257..d0585b66 100644
--- a/expenses.php
+++ b/expenses.php
@@ -347,11 +347,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                             <?php
 
-                            require "expense_edit_modal.php";
+                            require "modals/expense_edit_modal.php";
 
-                            require "expense_copy_modal.php";
+                            require "modals/expense_copy_modal.php";
 
-                            require "expense_refund_modal.php";
+                            require "modals/expense_refund_modal.php";
 
 
                         }
@@ -361,9 +361,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </tbody>
                     </table>
                 </div>
-                <?php require_once "expense_bulk_edit_category_modal.php"; ?>
-                <?php require_once "expense_bulk_edit_account_modal.php"; ?>
-                <?php require_once "expense_bulk_edit_client_modal.php"; ?>
+                <?php require_once "modals/expense_bulk_edit_category_modal.php"; ?>
+                <?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";
  ?>
@@ -373,7 +373,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <script src="js/bulk_actions.js"></script>
 
 <?php
-require_once "expense_add_modal.php";
-require_once "expense_export_modal.php";
+require_once "modals/expense_add_modal.php";
+require_once "modals/expense_export_modal.php";
 
 require_once "includes/footer.php";
diff --git a/includes/inc_client_top_head.php b/includes/inc_client_top_head.php
index 82bc9cf1..4cf836f3 100644
--- a/includes/inc_client_top_head.php
+++ b/includes/inc_client_top_head.php
@@ -167,8 +167,8 @@
 
 <?php
 
-require_once "client_edit_modal.php";
+require_once "modals/client_edit_modal.php";
 
-require_once "client_delete_modal.php";
+require_once "modals/client_delete_modal.php";
 
-require_once "client_download_pdf_modal.php";
+require_once "modals/client_download_pdf_modal.php";
diff --git a/invoice.php b/invoice.php
index 3736f6fd..cbaa6e0b 100644
--- a/invoice.php
+++ b/invoice.php
@@ -387,7 +387,7 @@ if (isset($_GET['invoice_id'])) {
                                     </tr>
                                     <?php
                                     if ($invoice_status !== "Paid" && $invoice_status !== "Cancelled") {
-                                        require "item_edit_modal.php";
+                                        require "modals/item_edit_modal.php";
                                     }
                                 }
                                 ?>
@@ -660,17 +660,17 @@ if (isset($_GET['invoice_id'])) {
                 </div>
             </div>
     <?php
-    include_once "invoice_add_ticket_modal.php";
+    include_once "modals/invoice_add_ticket_modal.php";
 
-    include_once "invoice_payment_add_modal.php";
+    include_once "modals/invoice_payment_add_modal.php";
 
-    include_once "invoice_copy_modal.php";
+    include_once "modals/invoice_copy_modal.php";
 
-    include_once "invoice_recurring_add_modal.php";
+    include_once "modals/invoice_recurring_add_modal.php";
 
-    include_once "invoice_edit_modal.php";
+    include_once "modals/invoice_edit_modal.php";
 
-    include_once "invoice_note_modal.php";
+    include_once "modals/invoice_note_modal.php";
 
 }
 
diff --git a/invoices.php b/invoices.php
index 35881ab5..b93a7d09 100644
--- a/invoices.php
+++ b/invoices.php
@@ -337,9 +337,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         <?php
 
 
-                        require "invoice_edit_modal.php";
+                        require "modals/invoice_edit_modal.php";
 
-                        require "invoice_copy_modal.php";
+                        require "modals/invoice_copy_modal.php";
 
 
                     }
@@ -355,8 +355,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-require_once "invoice_add_modal.php";
-require_once "invoice_export_modal.php";
+require_once "modals/invoice_add_modal.php";
+require_once "modals/invoice_export_modal.php";
 
 require_once "includes/footer.php";
 
diff --git a/account_add_modal.php b/modals/account_add_modal.php
similarity index 100%
rename from account_add_modal.php
rename to modals/account_add_modal.php
diff --git a/account_edit_modal.php b/modals/account_edit_modal.php
similarity index 100%
rename from account_edit_modal.php
rename to modals/account_edit_modal.php
diff --git a/admin_api_key_add_modal.php b/modals/admin_api_key_add_modal.php
similarity index 100%
rename from admin_api_key_add_modal.php
rename to modals/admin_api_key_add_modal.php
diff --git a/admin_category_add_modal.php b/modals/admin_category_add_modal.php
similarity index 100%
rename from admin_category_add_modal.php
rename to modals/admin_category_add_modal.php
diff --git a/admin_category_edit_modal.php b/modals/admin_category_edit_modal.php
similarity index 100%
rename from admin_category_edit_modal.php
rename to modals/admin_category_edit_modal.php
diff --git a/admin_custom_link_add_modal.php b/modals/admin_custom_link_add_modal.php
similarity index 100%
rename from admin_custom_link_add_modal.php
rename to modals/admin_custom_link_add_modal.php
diff --git a/admin_custom_link_edit_modal.php b/modals/admin_custom_link_edit_modal.php
similarity index 100%
rename from admin_custom_link_edit_modal.php
rename to modals/admin_custom_link_edit_modal.php
diff --git a/admin_document_template_add_modal.php b/modals/admin_document_template_add_modal.php
similarity index 100%
rename from admin_document_template_add_modal.php
rename to modals/admin_document_template_add_modal.php
diff --git a/admin_document_template_edit_modal.php b/modals/admin_document_template_edit_modal.php
similarity index 100%
rename from admin_document_template_edit_modal.php
rename to modals/admin_document_template_edit_modal.php
diff --git a/admin_project_template_add_modal.php b/modals/admin_project_template_add_modal.php
similarity index 100%
rename from admin_project_template_add_modal.php
rename to modals/admin_project_template_add_modal.php
diff --git a/admin_project_template_edit_modal.php b/modals/admin_project_template_edit_modal.php
similarity index 100%
rename from admin_project_template_edit_modal.php
rename to modals/admin_project_template_edit_modal.php
diff --git a/admin_project_template_ticket_template_add_modal.php b/modals/admin_project_template_ticket_template_add_modal.php
similarity index 100%
rename from admin_project_template_ticket_template_add_modal.php
rename to modals/admin_project_template_ticket_template_add_modal.php
diff --git a/admin_role_add_modal.php b/modals/admin_role_add_modal.php
similarity index 100%
rename from admin_role_add_modal.php
rename to modals/admin_role_add_modal.php
diff --git a/admin_role_edit_modal.php b/modals/admin_role_edit_modal.php
similarity index 100%
rename from admin_role_edit_modal.php
rename to modals/admin_role_edit_modal.php
diff --git a/admin_software_template_add_modal.php b/modals/admin_software_template_add_modal.php
similarity index 100%
rename from admin_software_template_add_modal.php
rename to modals/admin_software_template_add_modal.php
diff --git a/admin_software_template_edit_modal.php b/modals/admin_software_template_edit_modal.php
similarity index 100%
rename from admin_software_template_edit_modal.php
rename to modals/admin_software_template_edit_modal.php
diff --git a/admin_tag_add_modal.php b/modals/admin_tag_add_modal.php
similarity index 100%
rename from admin_tag_add_modal.php
rename to modals/admin_tag_add_modal.php
diff --git a/admin_tag_edit_modal.php b/modals/admin_tag_edit_modal.php
similarity index 100%
rename from admin_tag_edit_modal.php
rename to modals/admin_tag_edit_modal.php
diff --git a/admin_tax_add_modal.php b/modals/admin_tax_add_modal.php
similarity index 100%
rename from admin_tax_add_modal.php
rename to modals/admin_tax_add_modal.php
diff --git a/admin_tax_edit_modal.php b/modals/admin_tax_edit_modal.php
similarity index 100%
rename from admin_tax_edit_modal.php
rename to modals/admin_tax_edit_modal.php
diff --git a/admin_ticket_status_add_modal.php b/modals/admin_ticket_status_add_modal.php
similarity index 100%
rename from admin_ticket_status_add_modal.php
rename to modals/admin_ticket_status_add_modal.php
diff --git a/admin_ticket_status_edit_modal.php b/modals/admin_ticket_status_edit_modal.php
similarity index 100%
rename from admin_ticket_status_edit_modal.php
rename to modals/admin_ticket_status_edit_modal.php
diff --git a/admin_ticket_template_add_modal.php b/modals/admin_ticket_template_add_modal.php
similarity index 100%
rename from admin_ticket_template_add_modal.php
rename to modals/admin_ticket_template_add_modal.php
diff --git a/admin_ticket_template_edit_modal.php b/modals/admin_ticket_template_edit_modal.php
similarity index 100%
rename from admin_ticket_template_edit_modal.php
rename to modals/admin_ticket_template_edit_modal.php
diff --git a/admin_user_add_modal.php b/modals/admin_user_add_modal.php
similarity index 100%
rename from admin_user_add_modal.php
rename to modals/admin_user_add_modal.php
diff --git a/admin_user_all_reset_password_modal.php b/modals/admin_user_all_reset_password_modal.php
similarity index 100%
rename from admin_user_all_reset_password_modal.php
rename to modals/admin_user_all_reset_password_modal.php
diff --git a/admin_user_archive_modal.php b/modals/admin_user_archive_modal.php
similarity index 100%
rename from admin_user_archive_modal.php
rename to modals/admin_user_archive_modal.php
diff --git a/admin_user_edit_modal.php b/modals/admin_user_edit_modal.php
similarity index 100%
rename from admin_user_edit_modal.php
rename to modals/admin_user_edit_modal.php
diff --git a/admin_user_export_modal.php b/modals/admin_user_export_modal.php
similarity index 100%
rename from admin_user_export_modal.php
rename to modals/admin_user_export_modal.php
diff --git a/admin_user_invite_modal.php b/modals/admin_user_invite_modal.php
similarity index 100%
rename from admin_user_invite_modal.php
rename to modals/admin_user_invite_modal.php
diff --git a/admin_vendor_template_add_modal.php b/modals/admin_vendor_template_add_modal.php
similarity index 100%
rename from admin_vendor_template_add_modal.php
rename to modals/admin_vendor_template_add_modal.php
diff --git a/admin_vendor_template_edit_modal.php b/modals/admin_vendor_template_edit_modal.php
similarity index 100%
rename from admin_vendor_template_edit_modal.php
rename to modals/admin_vendor_template_edit_modal.php
diff --git a/budget_create_modal.php b/modals/budget_create_modal.php
similarity index 100%
rename from budget_create_modal.php
rename to modals/budget_create_modal.php
diff --git a/budget_edit_modal.php b/modals/budget_edit_modal.php
similarity index 100%
rename from budget_edit_modal.php
rename to modals/budget_edit_modal.php
diff --git a/calendar_add_modal.php b/modals/calendar_add_modal.php
similarity index 100%
rename from calendar_add_modal.php
rename to modals/calendar_add_modal.php
diff --git a/calendar_edit_modal.php b/modals/calendar_edit_modal.php
similarity index 100%
rename from calendar_edit_modal.php
rename to modals/calendar_edit_modal.php
diff --git a/calendar_event_add_modal.php b/modals/calendar_event_add_modal.php
similarity index 100%
rename from calendar_event_add_modal.php
rename to modals/calendar_event_add_modal.php
diff --git a/calendar_event_edit_modal.php b/modals/calendar_event_edit_modal.php
similarity index 100%
rename from calendar_event_edit_modal.php
rename to modals/calendar_event_edit_modal.php
diff --git a/client_add_modal.php b/modals/client_add_modal.php
similarity index 100%
rename from client_add_modal.php
rename to modals/client_add_modal.php
diff --git a/client_asset_add_modal.php b/modals/client_asset_add_modal.php
similarity index 100%
rename from client_asset_add_modal.php
rename to modals/client_asset_add_modal.php
diff --git a/client_asset_bulk_add_ticket_modal.php b/modals/client_asset_bulk_add_ticket_modal.php
similarity index 100%
rename from client_asset_bulk_add_ticket_modal.php
rename to modals/client_asset_bulk_add_ticket_modal.php
diff --git a/client_asset_bulk_assign_contact_modal.php b/modals/client_asset_bulk_assign_contact_modal.php
similarity index 100%
rename from client_asset_bulk_assign_contact_modal.php
rename to modals/client_asset_bulk_assign_contact_modal.php
diff --git a/client_asset_bulk_assign_location_modal.php b/modals/client_asset_bulk_assign_location_modal.php
similarity index 100%
rename from client_asset_bulk_assign_location_modal.php
rename to modals/client_asset_bulk_assign_location_modal.php
diff --git a/client_asset_bulk_edit_status_modal.php b/modals/client_asset_bulk_edit_status_modal.php
similarity index 100%
rename from client_asset_bulk_edit_status_modal.php
rename to modals/client_asset_bulk_edit_status_modal.php
diff --git a/client_asset_copy_modal.php b/modals/client_asset_copy_modal.php
similarity index 100%
rename from client_asset_copy_modal.php
rename to modals/client_asset_copy_modal.php
diff --git a/client_asset_documents_modal.php b/modals/client_asset_documents_modal.php
similarity index 100%
rename from client_asset_documents_modal.php
rename to modals/client_asset_documents_modal.php
diff --git a/client_asset_edit_modal.php b/modals/client_asset_edit_modal.php
similarity index 100%
rename from client_asset_edit_modal.php
rename to modals/client_asset_edit_modal.php
diff --git a/client_asset_export_modal.php b/modals/client_asset_export_modal.php
similarity index 100%
rename from client_asset_export_modal.php
rename to modals/client_asset_export_modal.php
diff --git a/client_asset_import_modal.php b/modals/client_asset_import_modal.php
similarity index 100%
rename from client_asset_import_modal.php
rename to modals/client_asset_import_modal.php
diff --git a/client_asset_interface_add_modal.php b/modals/client_asset_interface_add_modal.php
similarity index 100%
rename from client_asset_interface_add_modal.php
rename to modals/client_asset_interface_add_modal.php
diff --git a/client_asset_interface_edit_modal.php b/modals/client_asset_interface_edit_modal.php
similarity index 100%
rename from client_asset_interface_edit_modal.php
rename to modals/client_asset_interface_edit_modal.php
diff --git a/client_asset_transfer_modal.php b/modals/client_asset_transfer_modal.php
similarity index 100%
rename from client_asset_transfer_modal.php
rename to modals/client_asset_transfer_modal.php
diff --git a/client_certificate_add_modal.php b/modals/client_certificate_add_modal.php
similarity index 100%
rename from client_certificate_add_modal.php
rename to modals/client_certificate_add_modal.php
diff --git a/client_certificate_edit_modal.php b/modals/client_certificate_edit_modal.php
similarity index 100%
rename from client_certificate_edit_modal.php
rename to modals/client_certificate_edit_modal.php
diff --git a/client_certificate_export_modal.php b/modals/client_certificate_export_modal.php
similarity index 100%
rename from client_certificate_export_modal.php
rename to modals/client_certificate_export_modal.php
diff --git a/client_delete_modal.php b/modals/client_delete_modal.php
similarity index 100%
rename from client_delete_modal.php
rename to modals/client_delete_modal.php
diff --git a/client_document_add_file_relation_modal.php b/modals/client_document_add_file_relation_modal.php
similarity index 100%
rename from client_document_add_file_relation_modal.php
rename to modals/client_document_add_file_relation_modal.php
diff --git a/client_document_add_from_template_modal.php b/modals/client_document_add_from_template_modal.php
similarity index 100%
rename from client_document_add_from_template_modal.php
rename to modals/client_document_add_from_template_modal.php
diff --git a/client_document_add_modal.php b/modals/client_document_add_modal.php
similarity index 100%
rename from client_document_add_modal.php
rename to modals/client_document_add_modal.php
diff --git a/client_document_bulk_move_modal.php b/modals/client_document_bulk_move_modal.php
similarity index 100%
rename from client_document_bulk_move_modal.php
rename to modals/client_document_bulk_move_modal.php
diff --git a/client_document_edit_modal.php b/modals/client_document_edit_modal.php
similarity index 100%
rename from client_document_edit_modal.php
rename to modals/client_document_edit_modal.php
diff --git a/client_document_link_asset_modal.php b/modals/client_document_link_asset_modal.php
similarity index 100%
rename from client_document_link_asset_modal.php
rename to modals/client_document_link_asset_modal.php
diff --git a/client_document_link_contact_modal.php b/modals/client_document_link_contact_modal.php
similarity index 100%
rename from client_document_link_contact_modal.php
rename to modals/client_document_link_contact_modal.php
diff --git a/client_document_link_file_modal.php b/modals/client_document_link_file_modal.php
similarity index 100%
rename from client_document_link_file_modal.php
rename to modals/client_document_link_file_modal.php
diff --git a/client_document_link_software_modal.php b/modals/client_document_link_software_modal.php
similarity index 100%
rename from client_document_link_software_modal.php
rename to modals/client_document_link_software_modal.php
diff --git a/client_document_link_vendor_modal.php b/modals/client_document_link_vendor_modal.php
similarity index 100%
rename from client_document_link_vendor_modal.php
rename to modals/client_document_link_vendor_modal.php
diff --git a/client_document_move_modal.php b/modals/client_document_move_modal.php
similarity index 100%
rename from client_document_move_modal.php
rename to modals/client_document_move_modal.php
diff --git a/client_document_rename_modal.php b/modals/client_document_rename_modal.php
similarity index 100%
rename from client_document_rename_modal.php
rename to modals/client_document_rename_modal.php
diff --git a/client_document_view_modal.php b/modals/client_document_view_modal.php
similarity index 100%
rename from client_document_view_modal.php
rename to modals/client_document_view_modal.php
diff --git a/client_domain_add_modal.php b/modals/client_domain_add_modal.php
similarity index 100%
rename from client_domain_add_modal.php
rename to modals/client_domain_add_modal.php
diff --git a/client_domain_edit_modal.php b/modals/client_domain_edit_modal.php
similarity index 100%
rename from client_domain_edit_modal.php
rename to modals/client_domain_edit_modal.php
diff --git a/client_domain_export_modal.php b/modals/client_domain_export_modal.php
similarity index 100%
rename from client_domain_export_modal.php
rename to modals/client_domain_export_modal.php
diff --git a/client_download_pdf_modal.php b/modals/client_download_pdf_modal.php
similarity index 100%
rename from client_download_pdf_modal.php
rename to modals/client_download_pdf_modal.php
diff --git a/client_edit_modal.php b/modals/client_edit_modal.php
similarity index 100%
rename from client_edit_modal.php
rename to modals/client_edit_modal.php
diff --git a/client_export_modal.php b/modals/client_export_modal.php
similarity index 100%
rename from client_export_modal.php
rename to modals/client_export_modal.php
diff --git a/client_file_bulk_move_modal.php b/modals/client_file_bulk_move_modal.php
similarity index 100%
rename from client_file_bulk_move_modal.php
rename to modals/client_file_bulk_move_modal.php
diff --git a/client_file_delete_modal.php b/modals/client_file_delete_modal.php
similarity index 100%
rename from client_file_delete_modal.php
rename to modals/client_file_delete_modal.php
diff --git a/client_file_link_asset_modal.php b/modals/client_file_link_asset_modal.php
similarity index 100%
rename from client_file_link_asset_modal.php
rename to modals/client_file_link_asset_modal.php
diff --git a/client_file_move_modal.php b/modals/client_file_move_modal.php
similarity index 100%
rename from client_file_move_modal.php
rename to modals/client_file_move_modal.php
diff --git a/client_file_rename_modal.php b/modals/client_file_rename_modal.php
similarity index 100%
rename from client_file_rename_modal.php
rename to modals/client_file_rename_modal.php
diff --git a/client_file_upload_modal.php b/modals/client_file_upload_modal.php
similarity index 100%
rename from client_file_upload_modal.php
rename to modals/client_file_upload_modal.php
diff --git a/client_file_view_modal.php b/modals/client_file_view_modal.php
similarity index 100%
rename from client_file_view_modal.php
rename to modals/client_file_view_modal.php
diff --git a/client_import_modal.php b/modals/client_import_modal.php
similarity index 100%
rename from client_import_modal.php
rename to modals/client_import_modal.php
diff --git a/client_invoice_export_modal.php b/modals/client_invoice_export_modal.php
similarity index 100%
rename from client_invoice_export_modal.php
rename to modals/client_invoice_export_modal.php
diff --git a/client_login_add_modal.php b/modals/client_login_add_modal.php
similarity index 100%
rename from client_login_add_modal.php
rename to modals/client_login_add_modal.php
diff --git a/client_login_bulk_assign_tags_modal.php b/modals/client_login_bulk_assign_tags_modal.php
similarity index 100%
rename from client_login_bulk_assign_tags_modal.php
rename to modals/client_login_bulk_assign_tags_modal.php
diff --git a/client_login_edit_modal.php b/modals/client_login_edit_modal.php
similarity index 100%
rename from client_login_edit_modal.php
rename to modals/client_login_edit_modal.php
diff --git a/client_login_export_modal.php b/modals/client_login_export_modal.php
similarity index 100%
rename from client_login_export_modal.php
rename to modals/client_login_export_modal.php
diff --git a/client_login_import_modal.php b/modals/client_login_import_modal.php
similarity index 100%
rename from client_login_import_modal.php
rename to modals/client_login_import_modal.php
diff --git a/client_network_add_modal.php b/modals/client_network_add_modal.php
similarity index 100%
rename from client_network_add_modal.php
rename to modals/client_network_add_modal.php
diff --git a/client_network_edit_modal.php b/modals/client_network_edit_modal.php
similarity index 100%
rename from client_network_edit_modal.php
rename to modals/client_network_edit_modal.php
diff --git a/client_network_export_modal.php b/modals/client_network_export_modal.php
similarity index 100%
rename from client_network_export_modal.php
rename to modals/client_network_export_modal.php
diff --git a/client_payment_export_modal.php b/modals/client_payment_export_modal.php
similarity index 100%
rename from client_payment_export_modal.php
rename to modals/client_payment_export_modal.php
diff --git a/client_quote_export_modal.php b/modals/client_quote_export_modal.php
similarity index 100%
rename from client_quote_export_modal.php
rename to modals/client_quote_export_modal.php
diff --git a/client_rack_add_modal.php b/modals/client_rack_add_modal.php
similarity index 100%
rename from client_rack_add_modal.php
rename to modals/client_rack_add_modal.php
diff --git a/client_rack_edit_modal.php b/modals/client_rack_edit_modal.php
similarity index 100%
rename from client_rack_edit_modal.php
rename to modals/client_rack_edit_modal.php
diff --git a/client_rack_unit_add_modal.php b/modals/client_rack_unit_add_modal.php
similarity index 100%
rename from client_rack_unit_add_modal.php
rename to modals/client_rack_unit_add_modal.php
diff --git a/client_recurring_export_modal.php b/modals/client_recurring_export_modal.php
similarity index 100%
rename from client_recurring_export_modal.php
rename to modals/client_recurring_export_modal.php
diff --git a/client_service_add_modal.php b/modals/client_service_add_modal.php
similarity index 100%
rename from client_service_add_modal.php
rename to modals/client_service_add_modal.php
diff --git a/client_service_edit_modal.php b/modals/client_service_edit_modal.php
similarity index 100%
rename from client_service_edit_modal.php
rename to modals/client_service_edit_modal.php
diff --git a/client_service_view_modal.php b/modals/client_service_view_modal.php
similarity index 100%
rename from client_service_view_modal.php
rename to modals/client_service_view_modal.php
diff --git a/client_software_add_from_template_modal.php b/modals/client_software_add_from_template_modal.php
similarity index 100%
rename from client_software_add_from_template_modal.php
rename to modals/client_software_add_from_template_modal.php
diff --git a/client_software_add_modal.php b/modals/client_software_add_modal.php
similarity index 100%
rename from client_software_add_modal.php
rename to modals/client_software_add_modal.php
diff --git a/client_software_edit_modal.php b/modals/client_software_edit_modal.php
similarity index 100%
rename from client_software_edit_modal.php
rename to modals/client_software_edit_modal.php
diff --git a/client_software_export_modal.php b/modals/client_software_export_modal.php
similarity index 100%
rename from client_software_export_modal.php
rename to modals/client_software_export_modal.php
diff --git a/client_ticket_export_modal.php b/modals/client_ticket_export_modal.php
similarity index 100%
rename from client_ticket_export_modal.php
rename to modals/client_ticket_export_modal.php
diff --git a/client_trip_export_modal.php b/modals/client_trip_export_modal.php
similarity index 100%
rename from client_trip_export_modal.php
rename to modals/client_trip_export_modal.php
diff --git a/client_vendor_export_modal.php b/modals/client_vendor_export_modal.php
similarity index 100%
rename from client_vendor_export_modal.php
rename to modals/client_vendor_export_modal.php
diff --git a/custom_field_create_modal.php b/modals/custom_field_create_modal.php
similarity index 100%
rename from custom_field_create_modal.php
rename to modals/custom_field_create_modal.php
diff --git a/custom_field_edit_modal.php b/modals/custom_field_edit_modal.php
similarity index 100%
rename from custom_field_edit_modal.php
rename to modals/custom_field_edit_modal.php
diff --git a/document_edit_visibility_modal.php b/modals/document_edit_visibility_modal.php
similarity index 100%
rename from document_edit_visibility_modal.php
rename to modals/document_edit_visibility_modal.php
diff --git a/expense_add_modal.php b/modals/expense_add_modal.php
similarity index 100%
rename from expense_add_modal.php
rename to modals/expense_add_modal.php
diff --git a/expense_bulk_edit_account_modal.php b/modals/expense_bulk_edit_account_modal.php
similarity index 100%
rename from expense_bulk_edit_account_modal.php
rename to modals/expense_bulk_edit_account_modal.php
diff --git a/expense_bulk_edit_category_modal.php b/modals/expense_bulk_edit_category_modal.php
similarity index 100%
rename from expense_bulk_edit_category_modal.php
rename to modals/expense_bulk_edit_category_modal.php
diff --git a/expense_bulk_edit_client_modal.php b/modals/expense_bulk_edit_client_modal.php
similarity index 100%
rename from expense_bulk_edit_client_modal.php
rename to modals/expense_bulk_edit_client_modal.php
diff --git a/expense_copy_modal.php b/modals/expense_copy_modal.php
similarity index 100%
rename from expense_copy_modal.php
rename to modals/expense_copy_modal.php
diff --git a/expense_edit_modal.php b/modals/expense_edit_modal.php
similarity index 100%
rename from expense_edit_modal.php
rename to modals/expense_edit_modal.php
diff --git a/expense_export_modal.php b/modals/expense_export_modal.php
similarity index 100%
rename from expense_export_modal.php
rename to modals/expense_export_modal.php
diff --git a/expense_refund_modal.php b/modals/expense_refund_modal.php
similarity index 100%
rename from expense_refund_modal.php
rename to modals/expense_refund_modal.php
diff --git a/folder_create_modal.php b/modals/folder_create_modal.php
similarity index 100%
rename from folder_create_modal.php
rename to modals/folder_create_modal.php
diff --git a/folder_rename_modal.php b/modals/folder_rename_modal.php
similarity index 100%
rename from folder_rename_modal.php
rename to modals/folder_rename_modal.php
diff --git a/invoice_add_modal.php b/modals/invoice_add_modal.php
similarity index 100%
rename from invoice_add_modal.php
rename to modals/invoice_add_modal.php
diff --git a/invoice_add_ticket_modal.php b/modals/invoice_add_ticket_modal.php
similarity index 100%
rename from invoice_add_ticket_modal.php
rename to modals/invoice_add_ticket_modal.php
diff --git a/invoice_copy_modal.php b/modals/invoice_copy_modal.php
similarity index 100%
rename from invoice_copy_modal.php
rename to modals/invoice_copy_modal.php
diff --git a/invoice_edit_modal.php b/modals/invoice_edit_modal.php
similarity index 100%
rename from invoice_edit_modal.php
rename to modals/invoice_edit_modal.php
diff --git a/invoice_export_modal.php b/modals/invoice_export_modal.php
similarity index 100%
rename from invoice_export_modal.php
rename to modals/invoice_export_modal.php
diff --git a/invoice_note_modal.php b/modals/invoice_note_modal.php
similarity index 100%
rename from invoice_note_modal.php
rename to modals/invoice_note_modal.php
diff --git a/invoice_payment_add_bulk_modal.php b/modals/invoice_payment_add_bulk_modal.php
similarity index 100%
rename from invoice_payment_add_bulk_modal.php
rename to modals/invoice_payment_add_bulk_modal.php
diff --git a/invoice_payment_add_modal.php b/modals/invoice_payment_add_modal.php
similarity index 100%
rename from invoice_payment_add_modal.php
rename to modals/invoice_payment_add_modal.php
diff --git a/invoice_recurring_add_modal.php b/modals/invoice_recurring_add_modal.php
similarity index 100%
rename from invoice_recurring_add_modal.php
rename to modals/invoice_recurring_add_modal.php
diff --git a/item_edit_modal.php b/modals/item_edit_modal.php
similarity index 100%
rename from item_edit_modal.php
rename to modals/item_edit_modal.php
diff --git a/product_add_modal.php b/modals/product_add_modal.php
similarity index 100%
rename from product_add_modal.php
rename to modals/product_add_modal.php
diff --git a/product_bulk_edit_category_modal.php b/modals/product_bulk_edit_category_modal.php
similarity index 100%
rename from product_bulk_edit_category_modal.php
rename to modals/product_bulk_edit_category_modal.php
diff --git a/product_edit_modal.php b/modals/product_edit_modal.php
similarity index 100%
rename from product_edit_modal.php
rename to modals/product_edit_modal.php
diff --git a/product_export_modal.php b/modals/product_export_modal.php
similarity index 100%
rename from product_export_modal.php
rename to modals/product_export_modal.php
diff --git a/project_add_modal.php b/modals/project_add_modal.php
similarity index 100%
rename from project_add_modal.php
rename to modals/project_add_modal.php
diff --git a/project_edit_modal.php b/modals/project_edit_modal.php
similarity index 100%
rename from project_edit_modal.php
rename to modals/project_edit_modal.php
diff --git a/project_ticket_add_modal.php b/modals/project_ticket_add_modal.php
similarity index 100%
rename from project_ticket_add_modal.php
rename to modals/project_ticket_add_modal.php
diff --git a/quote_add_modal.php b/modals/quote_add_modal.php
similarity index 100%
rename from quote_add_modal.php
rename to modals/quote_add_modal.php
diff --git a/quote_copy_modal.php b/modals/quote_copy_modal.php
similarity index 100%
rename from quote_copy_modal.php
rename to modals/quote_copy_modal.php
diff --git a/quote_edit_modal.php b/modals/quote_edit_modal.php
similarity index 100%
rename from quote_edit_modal.php
rename to modals/quote_edit_modal.php
diff --git a/quote_note_modal.php b/modals/quote_note_modal.php
similarity index 100%
rename from quote_note_modal.php
rename to modals/quote_note_modal.php
diff --git a/quote_to_invoice_modal.php b/modals/quote_to_invoice_modal.php
similarity index 100%
rename from quote_to_invoice_modal.php
rename to modals/quote_to_invoice_modal.php
diff --git a/recurring_expense_create_modal.php b/modals/recurring_expense_create_modal.php
similarity index 100%
rename from recurring_expense_create_modal.php
rename to modals/recurring_expense_create_modal.php
diff --git a/recurring_expense_edit_modal.php b/modals/recurring_expense_edit_modal.php
similarity index 100%
rename from recurring_expense_edit_modal.php
rename to modals/recurring_expense_edit_modal.php
diff --git a/recurring_invoice_add_modal.php b/modals/recurring_invoice_add_modal.php
similarity index 100%
rename from recurring_invoice_add_modal.php
rename to modals/recurring_invoice_add_modal.php
diff --git a/recurring_invoice_edit_modal.php b/modals/recurring_invoice_edit_modal.php
similarity index 100%
rename from recurring_invoice_edit_modal.php
rename to modals/recurring_invoice_edit_modal.php
diff --git a/recurring_invoice_note_modal.php b/modals/recurring_invoice_note_modal.php
similarity index 100%
rename from recurring_invoice_note_modal.php
rename to modals/recurring_invoice_note_modal.php
diff --git a/recurring_payment_add_modal.php b/modals/recurring_payment_add_modal.php
similarity index 100%
rename from recurring_payment_add_modal.php
rename to modals/recurring_payment_add_modal.php
diff --git a/recurring_ticket_add_modal.php b/modals/recurring_ticket_add_modal.php
similarity index 100%
rename from recurring_ticket_add_modal.php
rename to modals/recurring_ticket_add_modal.php
diff --git a/recurring_ticket_edit_modal.php b/modals/recurring_ticket_edit_modal.php
similarity index 100%
rename from recurring_ticket_edit_modal.php
rename to modals/recurring_ticket_edit_modal.php
diff --git a/revenue_add_modal.php b/modals/revenue_add_modal.php
similarity index 100%
rename from revenue_add_modal.php
rename to modals/revenue_add_modal.php
diff --git a/revenue_edit_modal.php b/modals/revenue_edit_modal.php
similarity index 100%
rename from revenue_edit_modal.php
rename to modals/revenue_edit_modal.php
diff --git a/share_modal.php b/modals/share_modal.php
similarity index 100%
rename from share_modal.php
rename to modals/share_modal.php
diff --git a/task_edit_modal.php b/modals/task_edit_modal.php
similarity index 100%
rename from task_edit_modal.php
rename to modals/task_edit_modal.php
diff --git a/ticket_add_modal.php b/modals/ticket_add_modal.php
similarity index 100%
rename from ticket_add_modal.php
rename to modals/ticket_add_modal.php
diff --git a/ticket_add_watcher_modal.php b/modals/ticket_add_watcher_modal.php
similarity index 100%
rename from ticket_add_watcher_modal.php
rename to modals/ticket_add_watcher_modal.php
diff --git a/ticket_assign_modal.php b/modals/ticket_assign_modal.php
similarity index 100%
rename from ticket_assign_modal.php
rename to modals/ticket_assign_modal.php
diff --git a/ticket_bulk_add_project_modal.php b/modals/ticket_bulk_add_project_modal.php
similarity index 100%
rename from ticket_bulk_add_project_modal.php
rename to modals/ticket_bulk_add_project_modal.php
diff --git a/ticket_bulk_assign_modal.php b/modals/ticket_bulk_assign_modal.php
similarity index 100%
rename from ticket_bulk_assign_modal.php
rename to modals/ticket_bulk_assign_modal.php
diff --git a/ticket_bulk_edit_priority_modal.php b/modals/ticket_bulk_edit_priority_modal.php
similarity index 100%
rename from ticket_bulk_edit_priority_modal.php
rename to modals/ticket_bulk_edit_priority_modal.php
diff --git a/ticket_bulk_merge_modal.php b/modals/ticket_bulk_merge_modal.php
similarity index 100%
rename from ticket_bulk_merge_modal.php
rename to modals/ticket_bulk_merge_modal.php
diff --git a/ticket_bulk_reply_modal.php b/modals/ticket_bulk_reply_modal.php
similarity index 100%
rename from ticket_bulk_reply_modal.php
rename to modals/ticket_bulk_reply_modal.php
diff --git a/ticket_bulk_resolve_modal.php b/modals/ticket_bulk_resolve_modal.php
similarity index 100%
rename from ticket_bulk_resolve_modal.php
rename to modals/ticket_bulk_resolve_modal.php
diff --git a/ticket_change_client_modal.php b/modals/ticket_change_client_modal.php
similarity index 100%
rename from ticket_change_client_modal.php
rename to modals/ticket_change_client_modal.php
diff --git a/ticket_edit_asset_modal.php b/modals/ticket_edit_asset_modal.php
similarity index 100%
rename from ticket_edit_asset_modal.php
rename to modals/ticket_edit_asset_modal.php
diff --git a/ticket_edit_billable_modal.php b/modals/ticket_edit_billable_modal.php
similarity index 100%
rename from ticket_edit_billable_modal.php
rename to modals/ticket_edit_billable_modal.php
diff --git a/ticket_edit_contact_modal.php b/modals/ticket_edit_contact_modal.php
similarity index 100%
rename from ticket_edit_contact_modal.php
rename to modals/ticket_edit_contact_modal.php
diff --git a/ticket_edit_modal.php b/modals/ticket_edit_modal.php
similarity index 100%
rename from ticket_edit_modal.php
rename to modals/ticket_edit_modal.php
diff --git a/ticket_edit_priority_modal.php b/modals/ticket_edit_priority_modal.php
similarity index 100%
rename from ticket_edit_priority_modal.php
rename to modals/ticket_edit_priority_modal.php
diff --git a/ticket_edit_schedule_modal.php b/modals/ticket_edit_schedule_modal.php
similarity index 100%
rename from ticket_edit_schedule_modal.php
rename to modals/ticket_edit_schedule_modal.php
diff --git a/ticket_edit_vendor_modal.php b/modals/ticket_edit_vendor_modal.php
similarity index 100%
rename from ticket_edit_vendor_modal.php
rename to modals/ticket_edit_vendor_modal.php
diff --git a/ticket_invoice_add_modal.php b/modals/ticket_invoice_add_modal.php
similarity index 100%
rename from ticket_invoice_add_modal.php
rename to modals/ticket_invoice_add_modal.php
diff --git a/ticket_merge_modal.php b/modals/ticket_merge_modal.php
similarity index 100%
rename from ticket_merge_modal.php
rename to modals/ticket_merge_modal.php
diff --git a/ticket_reply_edit_modal.php b/modals/ticket_reply_edit_modal.php
similarity index 100%
rename from ticket_reply_edit_modal.php
rename to modals/ticket_reply_edit_modal.php
diff --git a/top_nav_tickets_modal.php b/modals/top_nav_tickets_modal.php
similarity index 100%
rename from top_nav_tickets_modal.php
rename to modals/top_nav_tickets_modal.php
diff --git a/transfer_add_modal.php b/modals/transfer_add_modal.php
similarity index 100%
rename from transfer_add_modal.php
rename to modals/transfer_add_modal.php
diff --git a/transfer_edit_modal.php b/modals/transfer_edit_modal.php
similarity index 100%
rename from transfer_edit_modal.php
rename to modals/transfer_edit_modal.php
diff --git a/trip_add_modal.php b/modals/trip_add_modal.php
similarity index 100%
rename from trip_add_modal.php
rename to modals/trip_add_modal.php
diff --git a/trip_copy_modal.php b/modals/trip_copy_modal.php
similarity index 100%
rename from trip_copy_modal.php
rename to modals/trip_copy_modal.php
diff --git a/trip_edit_modal.php b/modals/trip_edit_modal.php
similarity index 100%
rename from trip_edit_modal.php
rename to modals/trip_edit_modal.php
diff --git a/trip_export_modal.php b/modals/trip_export_modal.php
similarity index 100%
rename from trip_export_modal.php
rename to modals/trip_export_modal.php
diff --git a/vendor_add_from_template_modal.php b/modals/vendor_add_from_template_modal.php
similarity index 100%
rename from vendor_add_from_template_modal.php
rename to modals/vendor_add_from_template_modal.php
diff --git a/vendor_add_modal.php b/modals/vendor_add_modal.php
similarity index 100%
rename from vendor_add_modal.php
rename to modals/vendor_add_modal.php
diff --git a/vendor_contact_add_modal.php b/modals/vendor_contact_add_modal.php
similarity index 100%
rename from vendor_contact_add_modal.php
rename to modals/vendor_contact_add_modal.php
diff --git a/vendor_contact_edit_modal.php b/modals/vendor_contact_edit_modal.php
similarity index 100%
rename from vendor_contact_edit_modal.php
rename to modals/vendor_contact_edit_modal.php
diff --git a/vendor_edit_modal.php b/modals/vendor_edit_modal.php
similarity index 100%
rename from vendor_edit_modal.php
rename to modals/vendor_edit_modal.php
diff --git a/products.php b/products.php
index 00e1aba6..e3546189 100644
--- a/products.php
+++ b/products.php
@@ -247,7 +247,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                             <?php
 
-                            require "product_edit_modal.php";
+                            require "modals/product_edit_modal.php";
 
 
                         }
@@ -257,7 +257,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </tbody>
                     </table>
                 </div>
-                <?php require_once "product_bulk_edit_category_modal.php"; ?>
+                <?php require_once "modals/product_bulk_edit_category_modal.php"; ?>
             </form>
             <?php require_once "includes/filter_footer.php";
  ?>
@@ -268,7 +268,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <?php
 
-require_once "product_add_modal.php";
-require_once "product_export_modal.php";
+require_once "modals/product_add_modal.php";
+require_once "modals/product_export_modal.php";
 
 require_once "includes/footer.php";
diff --git a/project_details.php b/project_details.php
index 7208c65e..b65a0cef 100644
--- a/project_details.php
+++ b/project_details.php
@@ -404,8 +404,8 @@ if (isset($_GET['project_id'])) {
 
     <?php
 
-    require_once "project_edit_modal.php";
-    require_once "project_ticket_add_modal.php";
+    require_once "modals/project_edit_modal.php";
+    require_once "modals/project_ticket_add_modal.php";
 
 }
 
diff --git a/projects.php b/projects.php
index 98fee866..7d5846a2 100644
--- a/projects.php
+++ b/projects.php
@@ -295,7 +295,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                         <?php
 
-                        require "project_edit_modal.php";
+                        require "modals/project_edit_modal.php";
 
                     }
 
@@ -310,7 +310,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-require_once "project_add_modal.php";
+require_once "modals/project_add_modal.php";
 
 require_once "includes/footer.php";
 
diff --git a/quote.php b/quote.php
index edb096c6..ce91a11c 100644
--- a/quote.php
+++ b/quote.php
@@ -363,7 +363,7 @@ if (isset($_GET['quote_id'])) {
                                     <?php
 
                                         if ($quote_status !== "Invoiced" && $quote_status !== "Accepted" && $quote_status !== "Declined") {
-                                            require "item_edit_modal.php";
+                                            require "modals/item_edit_modal.php";
                                         }
                                     }
 
@@ -528,13 +528,13 @@ if (isset($_GET['quote_id'])) {
     </div>
 
 <?php
-    require_once "quote_edit_modal.php";
+    require_once "modals/quote_edit_modal.php";
 
-    require_once "quote_to_invoice_modal.php";
+    require_once "modals/quote_to_invoice_modal.php";
 
-    require_once "quote_copy_modal.php";
+    require_once "modals/quote_copy_modal.php";
 
-    require_once "quote_note_modal.php";
+    require_once "modals/quote_note_modal.php";
 }
 
 require_once "includes/footer.php";
diff --git a/quotes.php b/quotes.php
index b1eb8ec5..de43f380 100644
--- a/quotes.php
+++ b/quotes.php
@@ -226,7 +226,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                         <?php
 
-                        require "quote_copy_modal.php";
+                        require "modals/quote_copy_modal.php";
 
 
                     }
@@ -243,9 +243,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <?php
 
-require_once "quote_add_modal.php";
+require_once "modals/quote_add_modal.php";
 
-require_once "quote_edit_modal.php";
+require_once "modals/quote_edit_modal.php";
 
 require_once "includes/footer.php";
 
diff --git a/recurring_expenses.php b/recurring_expenses.php
index 8b9049f8..485515ed 100644
--- a/recurring_expenses.php
+++ b/recurring_expenses.php
@@ -211,7 +211,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                         <?php
 
-                        require "recurring_expense_edit_modal.php";
+                        require "modals/recurring_expense_edit_modal.php";
 
 
                     }
@@ -227,7 +227,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-require_once "recurring_expense_create_modal.php";
+require_once "modals/recurring_expense_create_modal.php";
 
 require_once "includes/footer.php";
 
diff --git a/recurring_invoice.php b/recurring_invoice.php
index a69d222b..8a40d107 100644
--- a/recurring_invoice.php
+++ b/recurring_invoice.php
@@ -133,7 +133,7 @@ if (isset($_GET['recurring_id'])) {
                         <a class="btn btn-secondary" href='#' data-toggle="modal" data-target="#addRecurringPaymentModal<?php echo $recurring_id; ?>">
                             <i class="fas fa-fw fa-redo-alt mr-2"></i>Create AutoPay
                         </a>
-                        <?php require_once "recurring_payment_add_modal.php"; ?>
+                        <?php require_once "modals/recurring_payment_add_modal.php"; ?>
 
                     <?php } ?>
                 </div>
@@ -314,7 +314,7 @@ if (isset($_GET['recurring_id'])) {
 
                                     <?php
 
-                                    require "item_edit_modal.php";
+                                    require "modals/item_edit_modal.php";
 
 
                                     }
@@ -470,9 +470,9 @@ if (isset($_GET['recurring_id'])) {
 
     <?php
 
-    require_once "recurring_invoice_edit_modal.php";
+    require_once "modals/recurring_invoice_edit_modal.php";
 
-    require_once "recurring_invoice_note_modal.php";
+    require_once "modals/recurring_invoice_note_modal.php";
 
 }
 
diff --git a/recurring_invoices.php b/recurring_invoices.php
index cf84d56e..9a25d5e5 100644
--- a/recurring_invoices.php
+++ b/recurring_invoices.php
@@ -188,7 +188,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 Create
                             </a>
                         ";
-                        require "recurring_payment_add_modal.php";
+                        require "modals/recurring_payment_add_modal.php";
                     }
 
                     ?>
@@ -232,7 +232,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tr>
 
                     <?php
-                    require "recurring_invoice_edit_modal.php";
+                    require "modals/recurring_invoice_edit_modal.php";
 
 
                     }
@@ -248,6 +248,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <?php
 
-require_once "recurring_invoice_add_modal.php";
+require_once "modals/recurring_invoice_add_modal.php";
 
 require_once "includes/footer.php";
diff --git a/recurring_tickets.php b/recurring_tickets.php
index c4670994..655ef06e 100644
--- a/recurring_tickets.php
+++ b/recurring_tickets.php
@@ -195,7 +195,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
         </div>
 
-        <?php require_once 'pagination.php';
+        <?php require_once 'includes/filter_footer.php';
         ?>
 
     </div>
@@ -205,8 +205,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <script src="js/bulk_actions.js"></script>
 
 <?php
-require_once "recurring_ticket_add_modal.php";
+require_once "modals/recurring_ticket_add_modal.php";
 
-require_once "recurring_ticket_edit_modal.php";
+require_once "modals/recurring_ticket_edit_modal.php";
 
 require_once "includes/footer.php";
diff --git a/report_assets.php b/report_assets.php
index e7fc9fae..5d73a6b3 100644
--- a/report_assets.php
+++ b/report_assets.php
@@ -597,9 +597,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                             <?php
 
-                            require "client_asset_edit_modal.php";
+                            require "modals/client_asset_edit_modal.php";
 
-                            require "client_asset_transfer_modal.php";
+                            require "modals/client_asset_transfer_modal.php";
 
                         }
 
@@ -608,7 +608,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </tbody>
                     </table>
                 </div>
-                <?php require_once "client_asset_bulk_edit_status_modal.php"; ?>
+                <?php require_once "modals/client_asset_bulk_edit_status_modal.php"; ?>
             </form>
             <?php require_once "includes/filter_footer.php"; ?>
         </div>
diff --git a/revenues.php b/revenues.php
index 2d966c00..367a6709 100644
--- a/revenues.php
+++ b/revenues.php
@@ -165,7 +165,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             </div>
                             <?php
 
-                            require "revenue_edit_modal.php";
+                            require "modals/revenue_edit_modal.php";
 
 
                             ?>
@@ -185,6 +185,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <?php
 
-require_once "revenue_add_modal.php";
+require_once "modals/revenue_add_modal.php";
 
 require_once "includes/footer.php";
diff --git a/ticket.php b/ticket.php
index c185938a..47fc67f5 100644
--- a/ticket.php
+++ b/ticket.php
@@ -810,7 +810,7 @@ if (isset($_GET['ticket_id'])) {
 
                     <?php
 
-                    require "ticket_reply_edit_modal.php";
+                    require "modals/ticket_reply_edit_modal.php";
                 }
 
                 ?>
@@ -961,7 +961,7 @@ if (isset($_GET['ticket_id'])) {
 
                             <?php
 
-                            require "task_edit_modal.php";
+                            require "modals/task_edit_modal.php";
                         } ?>
                     </table>
                 </div>
@@ -1154,30 +1154,30 @@ if (isset($_GET['ticket_id'])) {
 
         <?php
         if (lookupUserPermission("module_support") >= 2 && empty($ticket_closed_at)) {
-            require_once "ticket_edit_modal.php";
+            require_once "modals/ticket_edit_modal.php";
 
-            require_once "ticket_assign_modal.php";
+            require_once "modals/ticket_assign_modal.php";
 
-            require_once "ticket_edit_contact_modal.php";
+            require_once "modals/ticket_edit_contact_modal.php";
 
-            require_once "ticket_edit_asset_modal.php";
+            require_once "modals/ticket_edit_asset_modal.php";
 
-            require_once "ticket_edit_vendor_modal.php";
+            require_once "modals/ticket_edit_vendor_modal.php";
 
-            require_once "ticket_add_watcher_modal.php";
+            require_once "modals/ticket_add_watcher_modal.php";
 
-            require_once "ticket_edit_priority_modal.php";
+            require_once "modals/ticket_edit_priority_modal.php";
 
-            require_once "ticket_change_client_modal.php";
+            require_once "modals/ticket_change_client_modal.php";
 
-            require_once "ticket_edit_schedule_modal.php";
+            require_once "modals/ticket_edit_schedule_modal.php";
 
-            require_once "ticket_merge_modal.php";
+            require_once "modals/ticket_merge_modal.php";
         }
 
         if (lookupUserPermission("module_support") >= 2 && lookupUserPermission("module_sales") >= 2 && $config_module_enable_accounting) {
-            require_once "ticket_edit_billable_modal.php";
-            require_once "ticket_invoice_add_modal.php";
+            require_once "modals/ticket_edit_billable_modal.php";
+            require_once "modals/ticket_invoice_add_modal.php";
         }
     }
 }
diff --git a/tickets.php b/tickets.php
index 11be89c3..43e93ebc 100644
--- a/tickets.php
+++ b/tickets.php
@@ -559,12 +559,12 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
                             // Edit actions, for open tickets
                             if (empty($ticket_closed_at)) {
 
-                                require "ticket_assign_modal.php";
+                                require "modals/ticket_assign_modal.php";
 
-                                require "ticket_edit_priority_modal.php";
+                                require "modals/ticket_edit_priority_modal.php";
 
                                 if ($config_module_enable_accounting) {
-                                    require "ticket_edit_billable_modal.php";
+                                    require "modals/ticket_edit_billable_modal.php";
                                 }
                             }
                         }
@@ -574,12 +574,12 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
                         </tbody>
                     </table>
                 </div>
-                <?php require_once "ticket_bulk_assign_modal.php"; ?>
-                <?php require_once "ticket_bulk_edit_priority_modal.php"; ?>
-                <?php require_once "ticket_bulk_add_project_modal.php"; ?>
-                <?php require_once "ticket_bulk_reply_modal.php"; ?>
-                <?php require_once "ticket_bulk_merge_modal.php"; ?>
-                <?php require_once "ticket_bulk_resolve_modal.php"; ?>
+                <?php require_once "modals/ticket_bulk_assign_modal.php"; ?>
+                <?php require_once "modals/ticket_bulk_edit_priority_modal.php"; ?>
+                <?php require_once "modals/ticket_bulk_add_project_modal.php"; ?>
+                <?php require_once "modals/ticket_bulk_reply_modal.php"; ?>
+                <?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"; ?>
         </div>
@@ -588,6 +588,6 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
     <script src="js/bulk_actions.js"></script>
 
 <?php
-require_once "ticket_add_modal.php";
+require_once "modals/ticket_add_modal.php";
 
 require_once "includes/footer.php";
diff --git a/transfers.php b/transfers.php
index a0cffcd8..26a024ba 100644
--- a/transfers.php
+++ b/transfers.php
@@ -253,7 +253,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                         <?php
 
-                        require "transfer_edit_modal.php";
+                        require "modals/transfer_edit_modal.php";
 
 
                     }
@@ -269,7 +269,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-require_once "transfer_add_modal.php";
+require_once "modals/transfer_add_modal.php";
 
 require_once "includes/footer.php";
 
diff --git a/trips.php b/trips.php
index f544fde4..edb5e097 100644
--- a/trips.php
+++ b/trips.php
@@ -203,11 +203,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                         <?php
 
-                        require "trip_copy_modal.php";
+                        require "modals/trip_copy_modal.php";
 
-                        require "trip_edit_modal.php";
+                        require "modals/trip_edit_modal.php";
 
-                        require "trip_export_modal.php";
+                        require "modals/trip_export_modal.php";
 
 
                     }
@@ -222,7 +222,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-require_once "trip_add_modal.php";
+require_once "modals/trip_add_modal.php";
 
 require_once "includes/footer.php";
 
diff --git a/vendors.php b/vendors.php
index d92b91e1..71fb246b 100644
--- a/vendors.php
+++ b/vendors.php
@@ -193,7 +193,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                         <?php
 
-                        require "vendor_edit_modal.php";
+                        require "modals/vendor_edit_modal.php";
 
 
                     }
@@ -209,7 +209,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-require_once "vendor_add_modal.php";
+require_once "modals/vendor_add_modal.php";
 
 require_once "includes/footer.php";