diff --git a/user/clients.php b/user/clients.php
index a65fb66e..22d599af 100644
--- a/user/clients.php
+++ b/user/clients.php
@@ -589,7 +589,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                         <i class="fas fa-ellipsis-h"></i>
                                     </button>
                                     <div class="dropdown-menu">
-                                        <a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/client_edit.php?id=<?= $client_id ?>">
+                                        <a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/client/client_edit.php?id=<?= $client_id ?>">
                                             <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                         </a>
 
@@ -617,11 +617,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             </table>
         </div>
         <?php 
-            require_once "modals/client_bulk_edit_industry.php";
-            require_once "modals/client_bulk_edit_referral.php";
-            require_once "modals/client_bulk_edit_hourly_rate.php";
-            require_once "modals/client_bulk_assign_tags.php"; 
-            require_once "modals/client_bulk_email.php";
+            require_once "modals/client/client_bulk_edit_industry.php";
+            require_once "modals/client/client_bulk_edit_referral.php";
+            require_once "modals/client/client_bulk_edit_hourly_rate.php";
+            require_once "modals/client/client_bulk_assign_tags.php"; 
+            require_once "modals/client/client_bulk_email.php";
         ?>
     </form>
      <!-- Ends Card Body -->
@@ -632,7 +632,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <script src="../js/bulk_actions.js"></script>
 
 <?php
-require_once "modals/client_add.php";
-require_once "modals/client_import.php";
-require_once "modals/client_export.php";
+require_once "modals/client/client_add.php";
+require_once "modals/client/client_import.php";
+require_once "modals/client/client_export.php";
 require_once "../includes/footer.php";
diff --git a/user/includes/inc_client_top_head.php b/user/includes/inc_client_top_head.php
index db9460a0..9fb886b3 100644
--- a/user/includes/inc_client_top_head.php
+++ b/user/includes/inc_client_top_head.php
@@ -11,10 +11,8 @@
                     <i class="fas fa-fw fa-ellipsis-v"></i>
                 </button>
                 <div class="dropdown-menu">
-                    <a class="dropdown-item" href="#" 
-                        data-toggle="ajax-modal"
-                        data-ajax-url="modals/client_edit.php"
-                        data-ajax-id="<?php echo $client_id; ?>">
+                    <a class="dropdown-item ajax-modal" href="#"
+                        data-modal-url="modals/client/client_edit.php?id=<?= $client_id ?>">
                         <i class="fas fa-fw fa-edit mr-2"></i>Edit Client
                     </a>
                     <?php if (lookupUserPermission("module_billing") >= 2) { ?>
@@ -180,6 +178,6 @@
 </div>
 
 <?php
-require_once "modals/client_credit_add.php";
-require_once "modals/client_delete.php";
-require_once "modals/client_download_pdf.php";
+require_once "modals/client/client_credit_add.php";
+require_once "modals/client/client_delete.php";
+require_once "modals/client/client_download_pdf.php";
diff --git a/user/modals/client_add.php b/user/modals/client/client_add.php
similarity index 100%
rename from user/modals/client_add.php
rename to user/modals/client/client_add.php
diff --git a/user/modals/client_bulk_assign_tags.php b/user/modals/client/client_bulk_assign_tags.php
similarity index 100%
rename from user/modals/client_bulk_assign_tags.php
rename to user/modals/client/client_bulk_assign_tags.php
diff --git a/user/modals/client_bulk_edit_hourly_rate.php b/user/modals/client/client_bulk_edit_hourly_rate.php
similarity index 100%
rename from user/modals/client_bulk_edit_hourly_rate.php
rename to user/modals/client/client_bulk_edit_hourly_rate.php
diff --git a/user/modals/client_bulk_edit_industry.php b/user/modals/client/client_bulk_edit_industry.php
similarity index 100%
rename from user/modals/client_bulk_edit_industry.php
rename to user/modals/client/client_bulk_edit_industry.php
diff --git a/user/modals/client_bulk_edit_referral.php b/user/modals/client/client_bulk_edit_referral.php
similarity index 100%
rename from user/modals/client_bulk_edit_referral.php
rename to user/modals/client/client_bulk_edit_referral.php
diff --git a/user/modals/client_bulk_email.php b/user/modals/client/client_bulk_email.php
similarity index 100%
rename from user/modals/client_bulk_email.php
rename to user/modals/client/client_bulk_email.php
diff --git a/user/modals/client_credit_add.php b/user/modals/client/client_credit_add.php
similarity index 100%
rename from user/modals/client_credit_add.php
rename to user/modals/client/client_credit_add.php
diff --git a/user/modals/client_delete.php b/user/modals/client/client_delete.php
similarity index 100%
rename from user/modals/client_delete.php
rename to user/modals/client/client_delete.php
diff --git a/user/modals/client_download_pdf.php b/user/modals/client/client_download_pdf.php
similarity index 100%
rename from user/modals/client_download_pdf.php
rename to user/modals/client/client_download_pdf.php
diff --git a/user/modals/client_edit.php b/user/modals/client/client_edit.php
similarity index 99%
rename from user/modals/client_edit.php
rename to user/modals/client/client_edit.php
index 013fd8f8..1ff5da97 100644
--- a/user/modals/client_edit.php
+++ b/user/modals/client/client_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../../includes/modal_header.php';
+require_once '../../../includes/modal_header_new.php';
 
 $client_id = intval($_GET['id']);
 
@@ -263,4 +263,4 @@ ob_start();
 </form>
 
 <?php
-require_once '../../includes/modal_footer.php';
+require_once '../../../includes/modal_footer_new.php';
diff --git a/user/modals/client_export.php b/user/modals/client/client_export.php
similarity index 100%
rename from user/modals/client_export.php
rename to user/modals/client/client_export.php
diff --git a/user/modals/client_import.php b/user/modals/client/client_import.php
similarity index 100%
rename from user/modals/client_import.php
rename to user/modals/client/client_import.php