diff --git a/includes/modal_footer.php b/includes/modal_footer.php
index 4bbe5766..a39ff63f 100644
--- a/includes/modal_footer.php
+++ b/includes/modal_footer.php
@@ -1,5 +1,5 @@
-<script src="js/app.js"></script>
-<script src="plugins/Show-Hide-Passwords-Bootstrap-4/bootstrap-show-password.min.js"></script>
+<script src="../../../js/app.js"></script>
+<script src="../../../plugins/Show-Hide-Passwords-Bootstrap-4/bootstrap-show-password.min.js"></script>
 
 <?php
     $content = ob_get_clean();
diff --git a/includes/modal_header.php b/includes/modal_header.php
index 74f3848c..695f098a 100644
--- a/includes/modal_header.php
+++ b/includes/modal_header.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once "../../config.php";
-require_once "../../functions.php";
-require_once "../../includes/check_login.php";
+require_once "../../../config.php";
+require_once "../../../functions.php";
+require_once "../../../includes/check_login.php";
 
 header('Content-Type: application/json');
 
diff --git a/user/clients.php b/user/clients.php
index fb44e6bd..ad480fdc 100644
--- a/user/clients.php
+++ b/user/clients.php
@@ -584,7 +584,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                         <div class="dropdown-menu">
                                             <a class="dropdown-item" href="#"
                                                 data-toggle="ajax-modal"
-                                                data-ajax-url="modals/clients/client_edit.php"
+                                                data-ajax-url="modals/client/client_edit.php"
                                                 data-ajax-id="<?php echo $client_id; ?>">
                                                 <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                             </a>
@@ -613,11 +613,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 </table>
             </div>
             <?php 
-                require_once "modals/clients/client_bulk_edit_industry.php";
-                require_once "modals/clients/client_bulk_edit_referral.php";
-                require_once "modals/clients/client_bulk_edit_hourly_rate.php";
-                require_once "modals/clients/client_bulk_assign_tags.php"; 
-                require_once "modals/clients/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 -->
@@ -625,10 +625,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     
 </div> <!-- End Card -->
 
-<script src="js/bulk_actions.js"></script>
+<script src="../js/bulk_actions.js"></script>
 
 <?php
-require_once "modals/clients/client_add.php";
-require_once "modals/clients/client_import.php";
-require_once "modals/clients/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/modals/client/client_edit.php b/user/modals/client/client_edit.php
index fa4df170..0481a385 100644
--- a/user/modals/client/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.php';
 
 $client_id = intval($_GET['id']);
 
@@ -34,7 +34,7 @@ ob_start();
 ?>
 <div class="modal-header bg-dark">
     <h5 class="modal-title"><i class='fa fa-fw fa-user-edit mr-2'></i>Editing Client: <strong><?php echo $client_name; ?></strong></h5>
-    <button type="button" class="close" data-dismiss="modal">
+    <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
     </button>
 </div>
@@ -263,4 +263,4 @@ ob_start();
 </form>
 
 <?php
-require_once '../../includes/modal_footer.php';
+require_once '../../../includes/modal_footer.php';
diff --git a/user/post/client.php b/user/post/client.php
index cb6ad3dc..681c11d7 100644
--- a/user/post/client.php
+++ b/user/post/client.php
@@ -11,7 +11,7 @@ if (isset($_POST['add_client'])) {
     validateCSRFToken($_POST['csrf_token']);
     enforceUserPermission('module_client', 2);
 
-    require_once 'post/user/client_model.php';
+    require_once 'client_model.php';
 
     $location_phone_country_code = preg_replace("/[^0-9]/", '', $_POST['location_phone_country_code']);
     $location_phone = preg_replace("/[^0-9]/", '', $_POST['location_phone']);
@@ -126,7 +126,7 @@ if (isset($_POST['edit_client'])) {
 
     enforceUserPermission('module_client', 2);
 
-    require_once 'post/user/client_model.php';
+    require_once 'client_model.php';
 
     $client_id = intval($_POST['client_id']);
 
diff --git a/user/post/profile.php b/user/post/profile.php
index 0d15b64d..d3ef2474 100644
--- a/user/post/profile.php
+++ b/user/post/profile.php
@@ -58,12 +58,12 @@ if (isset($_POST['edit_your_user_details'])) {
             $file_tmp_path = $_FILES['avatar']['tmp_name'];
 
             // directory in which the uploaded file will be moved
-            $upload_file_dir = "uploads/users/$session_user_id/";
+            $upload_file_dir = "../uploads/users/$session_user_id/";
             $dest_path = $upload_file_dir . $new_file_name;
             move_uploaded_file($file_tmp_path, $dest_path);
 
             // Delete old file
-            unlink("uploads/users/$session_user_id/$existing_file_name");
+            unlink("../uploads/users/$session_user_id/$existing_file_name");
 
             // Set Avatar
             mysqli_query($mysqli,"UPDATE users SET user_avatar = '$new_file_name' WHERE user_id = $session_user_id");
diff --git a/user/user_details.php b/user/user_details.php
index 9aa37ae9..5b5e7a97 100644
--- a/user/user_details.php
+++ b/user/user_details.php
@@ -15,7 +15,7 @@ require_once "includes/inc_all_user.php";
             <div class="row">
                 <div class="col-md-3 text-center">
                     <?php if($session_avatar) { ?>
-                    <img class="img-thumbnail" src="<?php echo "uploads/users/$session_user_id/" . nullable_htmlentities($session_avatar); ?>">
+                    <img class="img-thumbnail" src="<?php echo "../uploads/users/$session_user_id/" . nullable_htmlentities($session_avatar); ?>">
                     <a href="post.php?clear_your_user_avatar&csrf_token=<?= $_SESSION['csrf_token'] ?>" class="btn btn-outline-danger btn-block">Remove Avatar</a>
                     <hr>
                     <?php } ?>