diff --git a/user/modals/trip_add_modal.php b/user/modals/trip/trip_add.php
similarity index 100%
rename from user/modals/trip_add_modal.php
rename to user/modals/trip/trip_add.php
diff --git a/user/ajax/ajax_trip_copy.php b/user/modals/trip/trip_copy.php
similarity index 98%
rename from user/ajax/ajax_trip_copy.php
rename to user/modals/trip/trip_copy.php
index 67304735..c9b4e47c 100644
--- a/user/ajax/ajax_trip_copy.php
+++ b/user/modals/trip/trip_copy.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../../includes/modal_header.php';
+require_once '../../../includes/modal_header_new.php';
 
 $trip_id = intval($_GET['id']);
 
@@ -165,4 +165,4 @@ ob_start();
 
 <?php
 
-require_once '../../includes/modal_footer.php';
+require_once '../../../includes/modal_footer_new.php';
diff --git a/user/ajax/ajax_trip_edit.php b/user/modals/trip/trip_edit.php
similarity index 98%
rename from user/ajax/ajax_trip_edit.php
rename to user/modals/trip/trip_edit.php
index 917c4ef4..08a4e837 100644
--- a/user/ajax/ajax_trip_edit.php
+++ b/user/modals/trip/trip_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../../includes/modal_header.php';
+require_once '../../../includes/modal_header_new.php';
 
 $trip_id = intval($_GET['id']);
 
@@ -176,4 +176,4 @@ ob_start();
 
 <?php
 
-require_once '../../includes/modal_footer.php';
+require_once '../../../includes/modal_footer_new.php';
diff --git a/user/modals/trip_export_modal.php b/user/modals/trip/trip_export.php
similarity index 100%
rename from user/modals/trip_export_modal.php
rename to user/modals/trip/trip_export.php
diff --git a/user/trips.php b/user/trips.php
index dc4d81db..9414342b 100644
--- a/user/trips.php
+++ b/user/trips.php
@@ -184,11 +184,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         ?>
                         <tr>
                             <td>
-                                <a class="text-dark" href="#"
-                                    data-toggle="ajax-modal"
-                                    data-ajax-url="ajax/ajax_trip_edit.php?<?php echo $client_url; ?>"
-                                    data-ajax-id="<?php echo $trip_id; ?>"
-                                    >
+                                <a class="text-dark ajax-modal" href="#"
+                                    data-modal-url="modals/trip/trip_edit.php?<?= $client_url ?>&id=<?= $trip_id ?>">
                                     <?php echo $trip_date; ?>
                                 </a>
                             </td>
@@ -210,18 +207,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                             <i class="fa fa-fw fa-map-marker-alt mr-2"></i>Map it<i class="fa fa-fw fa-external-link-alt ml-2"></i>
                                         </a>
                                         <div class="dropdown-divider"></div>
-                                        <a class="dropdown-item" href="#"
-                                            data-toggle="ajax-modal"
-                                            data-ajax-url="ajax/ajax_trip_edit.php?<?php echo $client_url; ?>"
-                                            data-ajax-id="<?php echo $trip_id; ?>"
-                                            >
+                                        <a class="dropdown-item ajax-modal" href="#" 
+                                            data-modal-url="modals/trip/trip_edit.php?<?= $client_url ?>&id=<?= $trip_id ?>">
                                             <i class="fa fa-fw fa-edit mr-2"></i>Edit
                                         </a>
-                                        <a class="dropdown-item" href="#"
-                                            data-toggle="ajax-modal"
-                                            data-ajax-url="ajax/ajax_trip_copy.php?<?php echo $client_url; ?>"
-                                            data-ajax-id="<?php echo $trip_id; ?>"
-                                            >
+                                        <a class="dropdown-item ajax-modal" href="#"
+                                            data-modal-url="modals/trip/trip_copy.php?<?= $client_url ?>&id=<?= $trip_id ?>">
                                             <i class="fa fa-fw fa-copy mr-2"></i>Copy
                                         </a>
                                         <div class="dropdown-divider"></div>
@@ -246,6 +237,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-require_once "modals/trip_add_modal.php";
-require_once "modals/trip_export_modal.php";
+require_once "modals/trip/trip_add.php";
+require_once "modals/trip/trip_export.php";
 require_once "../includes/footer.php";