diff --git a/user/ajax/ajax_service_details.php b/user/ajax/ajax_service_details.php
index fed781e6..028bbc7f 100644
--- a/user/ajax/ajax_service_details.php
+++ b/user/ajax/ajax_service_details.php
@@ -220,7 +220,7 @@ ob_start();
                     while ($row = mysqli_fetch_array($sql_vendors)) {
                         $vendor_id = intval($row['vendor_id']);
                         $vendor_name = nullable_htmlentities($row['vendor_name']);
-                        echo "<li><a href='#' data-toggle='ajax-modal' data-modal-size='lg' data-ajax-url='ajax/ajax_vendor_details.php' data-ajax-id='$vendor_id'>$vendor_name</a></li>";
+                        echo "<li><a class='ajax-modal' href='#' data-modal-size='lg' data-modal-url='modals/vendor/vendor_details.php?id=$vendor_id'>$vendor_name</a></li>";
                     }
                     echo "</ul>";
                 }
diff --git a/user/client_document_details.php b/user/client_document_details.php
index 355eb416..5a6d3b14 100644
--- a/user/client_document_details.php
+++ b/user/client_document_details.php
@@ -339,10 +339,7 @@ $page_title = $row['document_name'];
 
                 ?>
                 <div class="ml-2">
-                    <a href="#"
-                        data-toggle="ajax-modal"
-                        data-ajax-url="ajax/ajax_vendor_details.php"
-                        data-ajax-id="<?php echo $vendor_id; ?>">
+                    <a class="ajax-modal" href="#" data-modal-url="modals/vendor/vendor_details.php?id=<?= $vendor_id ?>">
                         <?php echo $vendor_name; ?>        
                     </a>
                     <a class="confirm-link float-right" href="post.php?unlink_vendor_from_document&vendor_id=<?php echo $vendor_id; ?>&document_id=<?php echo $document_id; ?>">
diff --git a/user/domains.php b/user/domains.php
index 59f82b9a..7c5c6897 100644
--- a/user/domains.php
+++ b/user/domains.php
@@ -266,23 +266,19 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             $client_name = nullable_htmlentities($row['client_name']);
                             // Add - if empty on the table
                             $domain_registrar_name_display = $domain_registrar_name ? "
-                                <a href='#' data-toggle='ajax-modal'
-                                    data-ajax-url='ajax/ajax_vendor_details.php' data-ajax-id='$domain_registrar_id'>
+                                <a class='ajax-modal' href='#' data-modal-url='modals/vendor/vendor_details.php?id=$domain_registrar_id'>
                                     $domain_registrar_name
                                 </a>" : "-";
                             $domain_webhost_name_display = $domain_webhost_name ? "
-                                <a href='#' data-toggle='ajax-modal'
-                                    data-ajax-url='ajax/ajax_vendor_details.php' data-ajax-id='$domain_webhost_id'>
+                                <a class='ajax-modal' href='#' data-modal-url='modals/vendor/vendor_details.php?id=$domain_webhost_id'>
                                     $domain_webhost_name
                                 </a>" : "-";
                             $domain_dnshost_name_display = $domain_dnshost_name ? "
-                                <a href='#' data-toggle='ajax-modal'
-                                    data-ajax-url='ajax/ajax_vendor_details.php' data-ajax-id='$domain_dnshost_id'>
+                                <a class='ajax-modal' href='#' data-modal-url='modals/vendor/vendor_details.php?id=$domain_dnshost_id'>
                                     $domain_dnshost_name
                                 </a>" : "-";
                             $domain_mailhost_name_display = $domain_mailhost_name ? "
-                                <a href='#' data-toggle='ajax-modal'
-                                    data-ajax-url='ajax/ajax_vendor_details.php' data-ajax-id='$domain_mailhost_id'>
+                                <a class='ajax-modal' href='#' data-modal-url='modals/vendor/vendor_details.php?id=$domain_mailhost_id'>
                                     $domain_mailhost_name
                                 </a>" : "-";
 
diff --git a/user/modals/vendor_add_modal.php b/user/modals/vendor/vendor_add.php
similarity index 100%
rename from user/modals/vendor_add_modal.php
rename to user/modals/vendor/vendor_add.php
diff --git a/user/modals/vendor_add_from_template_modal.php b/user/modals/vendor/vendor_add_from_template.php
similarity index 100%
rename from user/modals/vendor_add_from_template_modal.php
rename to user/modals/vendor/vendor_add_from_template.php
diff --git a/user/modals/vendor_contact_add_modal.php b/user/modals/vendor/vendor_contact_add.php
similarity index 100%
rename from user/modals/vendor_contact_add_modal.php
rename to user/modals/vendor/vendor_contact_add.php
diff --git a/user/modals/vendor_contact_edit_modal.php b/user/modals/vendor/vendor_contact_edit.php
similarity index 100%
rename from user/modals/vendor_contact_edit_modal.php
rename to user/modals/vendor/vendor_contact_edit.php
diff --git a/user/ajax/ajax_vendor_details.php b/user/modals/vendor/vendor_details.php
similarity index 96%
rename from user/ajax/ajax_vendor_details.php
rename to user/modals/vendor/vendor_details.php
index cd143531..b33d7fe5 100644
--- a/user/ajax/ajax_vendor_details.php
+++ b/user/modals/vendor/vendor_details.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../../includes/modal_header.php';
+require_once '../../../includes/modal_header_new.php';
 
 $vendor_id = intval($_GET['id']);
 
@@ -86,4 +86,4 @@ ob_start();
 </div>
 
 <?php
-require_once '../../includes/modal_footer.php';
+require_once '../../../includes/modal_footer_new.php';
diff --git a/user/ajax/ajax_vendor_edit.php b/user/modals/vendor/vendor_edit.php
similarity index 98%
rename from user/ajax/ajax_vendor_edit.php
rename to user/modals/vendor/vendor_edit.php
index f1c4b4ac..7633516e 100644
--- a/user/ajax/ajax_vendor_edit.php
+++ b/user/modals/vendor/vendor_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../../includes/modal_header.php';
+require_once '../../../includes/modal_header_new.php';
 
 $vendor_id = intval($_GET['id']);
 
@@ -212,4 +212,4 @@ ob_start();
 
 <?php
 
-require_once '../../includes/modal_footer.php';
+require_once '../../../includes/modal_footer_new.php';
diff --git a/user/modals/vendor_export_modal.php b/user/modals/vendor/vendor_export.php
similarity index 100%
rename from user/modals/vendor_export_modal.php
rename to user/modals/vendor/vendor_export.php
diff --git a/user/software.php b/user/software.php
index 81efb828..6e69148b 100644
--- a/user/software.php
+++ b/user/software.php
@@ -205,7 +205,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         $vendor_name = nullable_htmlentities($row['vendor_name']);
                         $vendor_id = intval($row['vendor_id']);
                         if ($vendor_name) {
-                            $vendor_display = "<a href='#' data-toggle='ajax-modal' data-ajax-url='ajax/ajax_vendor_details.php' data-ajax-id='$vendor_id'>$vendor_name</a>";
+                            $vendor_display = "<a class='ajax-modal' href='#' data-modal-url='modals/vendor/vendor_details.php?id=$vendor_id'>$vendor_name</a>";
                         } else {
                             $vendor_display = "<span class='text-muted'>N/A</span>";
                         }
diff --git a/user/vendors.php b/user/vendors.php
index 0a5e6e67..8d6ab838 100644
--- a/user/vendors.php
+++ b/user/vendors.php
@@ -200,11 +200,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 </div>
                             </td>
                             <td>
-                                <a class="text-dark" href="#"
-                                    data-toggle="ajax-modal"
-                                    data-ajax-url="ajax/ajax_vendor_edit.php"
-                                    data-ajax-id="<?php echo $vendor_id; ?>"
-                                    >
+                                <a class="text-dark ajax-modal" href="#" data-modal-url="modals/vendor/vendor_edit.php?id=<?= $vendor_id ?>">
                                     <div class="media">
                                         <i class="fa fa-fw fa-2x fa-building mr-3"></i>
                                         <div class="media-body">
@@ -243,11 +239,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" href="#"
-                                            data-toggle="ajax-modal"
-                                            data-ajax-url="ajax/ajax_vendor_edit.php"
-                                            data-ajax-id="<?php echo $vendor_id; ?>"
-                                            >
+                                        <a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/vendor/vendor_edit.php?id=<?= $vendor_id ?>">
                                             <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                         </a>
                                         <?php if ($session_user_role == 3) { ?>
@@ -291,7 +283,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <script src="../js/bulk_actions.js"></script>
 
 <?php
-require_once "modals/vendor_add_modal.php";
-require_once "modals/vendor_add_from_template_modal.php";
-require_once "modals/vendor_export_modal.php";
+require_once "modals/vendor/vendor_add.php";
+require_once "modals/vendor/vendor_add_from_template.php";
+require_once "modals/vendor/vendor_export.php";
 require_once "../includes/footer.php";