diff --git a/client_contact_details.php b/client_contact_details.php
index 1599b941..595892ce 100644
--- a/client_contact_details.php
+++ b/client_contact_details.php
@@ -210,7 +210,7 @@ if (isset($_GET['contact_id'])) {
                     <?php } ?>
                     <div class="mt-2"><i class="fa fa-fw fa-clock text-secondary mr-2"></i><?php echo date('Y-m-d', strtotime($contact_created_at)); ?></div>
 
-                    <?php require_once "client_contact_edit_modal.php";
+                    <?php require_once "modals/client_contact_edit_modal.php";
  ?>
 
                 </div>
@@ -1125,14 +1125,14 @@ if (isset($_GET['contact_id'])) {
 
 <?php
 
-require_once "client_contact_create_note_modal.php";
+require_once "modals/client_contact_create_note_modal.php";
 require_once "ticket_add_modal.php";
-require_once "client_contact_link_asset_modal.php";
-require_once "client_contact_link_software_modal.php";
-require_once "client_contact_link_credential_modal.php";
-require_once "client_contact_link_service_modal.php";
-require_once "client_contact_link_document_modal.php";
-require_once "client_contact_link_file_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";
+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";
diff --git a/client_contacts.php b/client_contacts.php
index 078995ce..48665a0f 100644
--- a/client_contacts.php
+++ b/client_contacts.php
@@ -419,8 +419,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                             <?php
 
-                            require "client_contact_create_note_modal.php";
-                            require "client_contact_edit_modal.php";
+                            require "modals/client_contact_create_note_modal.php";
+                            require "modals/client_contact_edit_modal.php";
 
                         }
 
@@ -429,12 +429,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </tbody>
                     </table>
                 </div>
-                <?php require_once "client_contact_bulk_assign_location_modal.php"; ?>
-                <?php require_once "client_contact_bulk_edit_phone_modal.php"; ?>
-                <?php require_once "client_contact_bulk_edit_department_modal.php"; ?>
-                <?php require_once "client_contact_bulk_edit_role_modal.php"; ?>
-                <?php require_once "client_contact_bulk_assign_tags_modal.php"; ?>
-                <?php require_once "client_contact_bulk_email_modal.php"; ?>
+                <?php require_once "modals/client_contact_bulk_assign_location_modal.php"; ?>
+                <?php require_once "modals/client_contact_bulk_edit_phone_modal.php"; ?>
+                <?php require_once "modals/client_contact_bulk_edit_department_modal.php"; ?>
+                <?php require_once "modals/client_contact_bulk_edit_role_modal.php"; ?>
+                <?php require_once "modals/client_contact_bulk_assign_tags_modal.php"; ?>
+                <?php require_once "modals/client_contact_bulk_email_modal.php"; ?>
             </form>
             <?php require_once "pagination.php";
 ?>
@@ -482,12 +482,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <?php
 
-require_once "client_contact_add_modal.php";
+require_once "modals/client_contact_add_modal.php";
 
-require_once "client_contact_invite_modal.php";
+require_once "modals/client_contact_invite_modal.php";
 
-require_once "client_contact_import_modal.php";
+require_once "modals/client_contact_import_modal.php";
 
-require_once "client_contact_export_modal.php";
+require_once "modals/client_contact_export_modal.php";
 
 require_once "footer.php";
diff --git a/client_contact_add_modal.php b/modals/client_contact_add_modal.php
similarity index 100%
rename from client_contact_add_modal.php
rename to modals/client_contact_add_modal.php
diff --git a/client_contact_archive_modal.php b/modals/client_contact_archive_modal.php
similarity index 100%
rename from client_contact_archive_modal.php
rename to modals/client_contact_archive_modal.php
diff --git a/client_contact_bulk_assign_location_modal.php b/modals/client_contact_bulk_assign_location_modal.php
similarity index 100%
rename from client_contact_bulk_assign_location_modal.php
rename to modals/client_contact_bulk_assign_location_modal.php
diff --git a/client_contact_bulk_assign_tags_modal.php b/modals/client_contact_bulk_assign_tags_modal.php
similarity index 100%
rename from client_contact_bulk_assign_tags_modal.php
rename to modals/client_contact_bulk_assign_tags_modal.php
diff --git a/client_contact_bulk_edit_department_modal.php b/modals/client_contact_bulk_edit_department_modal.php
similarity index 100%
rename from client_contact_bulk_edit_department_modal.php
rename to modals/client_contact_bulk_edit_department_modal.php
diff --git a/client_contact_bulk_edit_phone_modal.php b/modals/client_contact_bulk_edit_phone_modal.php
similarity index 100%
rename from client_contact_bulk_edit_phone_modal.php
rename to modals/client_contact_bulk_edit_phone_modal.php
diff --git a/client_contact_bulk_edit_role_modal.php b/modals/client_contact_bulk_edit_role_modal.php
similarity index 100%
rename from client_contact_bulk_edit_role_modal.php
rename to modals/client_contact_bulk_edit_role_modal.php
diff --git a/client_contact_bulk_email_modal.php b/modals/client_contact_bulk_email_modal.php
similarity index 100%
rename from client_contact_bulk_email_modal.php
rename to modals/client_contact_bulk_email_modal.php
diff --git a/client_contact_create_note_modal.php b/modals/client_contact_create_note_modal.php
similarity index 100%
rename from client_contact_create_note_modal.php
rename to modals/client_contact_create_note_modal.php
diff --git a/client_contact_edit_modal.php b/modals/client_contact_edit_modal.php
similarity index 100%
rename from client_contact_edit_modal.php
rename to modals/client_contact_edit_modal.php
diff --git a/client_contact_export_modal.php b/modals/client_contact_export_modal.php
similarity index 100%
rename from client_contact_export_modal.php
rename to modals/client_contact_export_modal.php
diff --git a/client_contact_import_modal.php b/modals/client_contact_import_modal.php
similarity index 100%
rename from client_contact_import_modal.php
rename to modals/client_contact_import_modal.php
diff --git a/client_contact_invite_modal.php b/modals/client_contact_invite_modal.php
similarity index 99%
rename from client_contact_invite_modal.php
rename to modals/client_contact_invite_modal.php
index baa87a27..6e3cf3d5 100644
--- a/client_contact_invite_modal.php
+++ b/modals/client_contact_invite_modal.php
@@ -81,4 +81,4 @@
 
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/client_contact_link_asset_modal.php b/modals/client_contact_link_asset_modal.php
similarity index 100%
rename from client_contact_link_asset_modal.php
rename to modals/client_contact_link_asset_modal.php
diff --git a/client_contact_link_credential_modal.php b/modals/client_contact_link_credential_modal.php
similarity index 100%
rename from client_contact_link_credential_modal.php
rename to modals/client_contact_link_credential_modal.php
diff --git a/client_contact_link_document_modal.php b/modals/client_contact_link_document_modal.php
similarity index 100%
rename from client_contact_link_document_modal.php
rename to modals/client_contact_link_document_modal.php
diff --git a/client_contact_link_file_modal.php b/modals/client_contact_link_file_modal.php
similarity index 100%
rename from client_contact_link_file_modal.php
rename to modals/client_contact_link_file_modal.php
diff --git a/client_contact_link_service_modal.php b/modals/client_contact_link_service_modal.php
similarity index 100%
rename from client_contact_link_service_modal.php
rename to modals/client_contact_link_service_modal.php
diff --git a/client_contact_link_software_modal.php b/modals/client_contact_link_software_modal.php
similarity index 100%
rename from client_contact_link_software_modal.php
rename to modals/client_contact_link_software_modal.php