diff --git a/client_document_add_from_template_modal.php b/client_document_add_from_template_modal.php
index a5084a1a..be3b78e1 100644
--- a/client_document_add_from_template_modal.php
+++ b/client_document_add_from_template_modal.php
@@ -54,7 +54,7 @@
               <select class="form-control" name="folder">
                 <option value="0">/</option>
                 <?php
-                $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_client_id = $client_id ORDER BY folder_name ASC");
+                $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_location = $folder_location AND folder_client_id = $client_id ORDER BY folder_name ASC");
                 while ($row = mysqli_fetch_array($sql_folders)) {
                   $folder_id = intval($row['folder_id']);
                   $folder_name = nullable_htmlentities($row['folder_name']);
diff --git a/client_document_add_modal.php b/client_document_add_modal.php
index b634055e..af94381c 100644
--- a/client_document_add_modal.php
+++ b/client_document_add_modal.php
@@ -27,7 +27,7 @@
                             <select class="form-control" name="folder">
                                 <option value="0">/</option>
                                 <?php
-                                $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_client_id = $client_id ORDER BY folder_name ASC");
+                                $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_location = $folder_location AND folder_client_id = $client_id ORDER BY folder_name ASC");
                                 while ($row = mysqli_fetch_array($sql_folders)) {
                                     $folder_id = intval($row['folder_id']);
                                     $folder_name = nullable_htmlentities($row['folder_name']);
diff --git a/client_document_details.php b/client_document_details.php
index d5824393..0623b990 100644
--- a/client_document_details.php
+++ b/client_document_details.php
@@ -12,6 +12,7 @@ if (isset($_GET['document_id'])) {
 	$document_id = intval($_GET['document_id']);
 }
 
+$folder_location = 0;
 
 $sql_document = mysqli_query($mysqli, "SELECT * FROM documents LEFT JOIN folders ON document_folder_id = folder_id WHERE document_client_id = $client_id AND document_id = $document_id");
 
@@ -53,9 +54,6 @@ $document_folder_id = intval($row['document_folder_id']);
         <button type="button" class="btn btn-primary btn-block" data-toggle="modal" data-target="#editDocumentModal<?php echo $document_id; ?>">
           <i class="fas fa-fw fa-edit mr-2"></i>Edit
         </button>
-        <button type="button" class="btn btn-secondary btn-block" data-toggle="modal" data-target="#editDocumentModal">
-          <i class="fas fa-fw fa-copy mr-2"></i>Copy
-        </button>
         <button type="button" class="btn btn-secondary btn-block" data-toggle="modal" data-target="#shareModal"
           onclick="populateShareModal(<?php echo "$client_id, 'Document', $document_id"; ?>)">
           <i class="fas fa-fw fa-share mr-2"></i>Share
diff --git a/client_document_edit_modal.php b/client_document_edit_modal.php
index 43f5e29d..effe00f3 100644
--- a/client_document_edit_modal.php
+++ b/client_document_edit_modal.php
@@ -28,7 +28,7 @@
                             <select class="form-control" name="folder">
                                 <option value="0">/</option>
                                 <?php
-                                $sql_folders_select = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_client_id = $client_id ORDER BY folder_name ASC");
+                                $sql_folders_select = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_location = $folder_location AND folder_client_id = $client_id ORDER BY folder_name ASC");
                                 while ($row = mysqli_fetch_array($sql_folders_select)) {
                                     $folder_id_select = intval($row['folder_id']);
                                     $folder_name_select = nullable_htmlentities($row['folder_name']);
diff --git a/client_document_move_modal.php b/client_document_move_modal.php
index 98fbedad..18529f4d 100644
--- a/client_document_move_modal.php
+++ b/client_document_move_modal.php
@@ -21,7 +21,7 @@
                             <select class="form-control" name="folder">
                                 <option value="0">/</option>
                                 <?php
-                                $sql_folders_select = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_client_id = $client_id ORDER BY folder_name ASC");
+                                $sql_folders_select = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_location = $folder_location AND folder_client_id = $client_id ORDER BY folder_name ASC");
                                 while ($row = mysqli_fetch_array($sql_folders_select)) {
                                     $folder_id_select = intval($row['folder_id']);
                                     $folder_name_select = nullable_htmlentities($row['folder_name']);
diff --git a/client_documents.php b/client_documents.php
index 6b9960ef..7bf0849f 100644
--- a/client_documents.php
+++ b/client_documents.php
@@ -29,6 +29,9 @@ if (!empty($_GET['folder_id'])) {
     $get_folder_id = intval($_GET['folder_id']);
 }
 
+// Set Folder Location Var used when creating folders
+$folder_location = 0;
+
 $sql = mysqli_query(
     $mysqli,
     "SELECT SQL_CALC_FOUND_ROWS * FROM documents
@@ -61,7 +64,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </button>
                     <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                     <div class="dropdown-menu">
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addFolderModal">
+                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#createFolderModal">
                             <i class="fa fa-fw fa-folder-plus mr-2"></i>Folder
                         </a>
                         <div class="dropdown-divider"></div>
@@ -82,11 +85,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             <a class="nav-link <?php if ($get_folder_id == 0) { echo "active"; } ?>" href="?client_id=<?php echo $client_id; ?>&folder_id=0">/</a>
                         </li>
                         <?php
-                        $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_client_id = $client_id ORDER BY folder_name ASC");
+                        $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_location = $folder_location AND folder_client_id = $client_id ORDER BY folder_name ASC");
                         while ($row = mysqli_fetch_array($sql_folders)) {
                             $folder_id = intval($row['folder_id']);
                             $folder_name = nullable_htmlentities($row['folder_name']);
 
+
                             $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('document_id') AS num FROM documents WHERE document_folder_id = $folder_id"));
                             $num_documents = intval($row['num']);
 
@@ -128,12 +132,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             </li>
 
                             <?php
-                            require("client_document_folder_rename_modal.php");
+                            require("folder_rename_modal.php");
 
                         }
                         ?>
                     </ul>
-                    <?php require_once("client_document_folder_add_modal.php"); ?>
+                    <?php require_once("folder_create_modal.php"); ?>
                 </div>
 
                 <div class="col-md-9">
diff --git a/client_file_move_modal.php b/client_file_move_modal.php
new file mode 100644
index 00000000..15684cfc
--- /dev/null
+++ b/client_file_move_modal.php
@@ -0,0 +1,45 @@
+<div class="modal" id="moveFileModal<?php echo $file_id; ?>" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-<?php echo $file_icon; ?> mr-2"></i>Moving File: <strong><?php echo $file_name; ?></strong></h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="file_id" value="<?php echo $file_id; ?>">
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <div class="modal-body bg-white">
+
+                    <div class="form-group">
+                        <label>Move File to</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
+                            </div>
+                            <select class="form-control" name="folder_id">
+                                <option value="0">/</option>
+                                <?php
+                                $sql_folders_select = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_location = $folder_location AND folder_client_id = $client_id ORDER BY folder_name ASC");
+                                while ($row = mysqli_fetch_array($sql_folders_select)) {
+                                    $folder_id_select = intval($row['folder_id']);
+                                    $folder_name_select = nullable_htmlentities($row['folder_name']);
+                                    ?>
+                                    <option <?php if ($folder_id_select == $document_folder_id) echo "selected"; ?> value="<?php echo $folder_id_select ?>"><?php echo $folder_name_select; ?></option>
+                                    <?php
+                                }
+                                ?>
+                            </select>
+                        </div>
+                    </div>
+
+                </div>
+                <div class="modal-footer bg-white">
+                    <button type="submit" name="move_file" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Move</button>
+                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
diff --git a/client_files_add_modal.php b/client_file_upload_modal.php
similarity index 63%
rename from client_files_add_modal.php
rename to client_file_upload_modal.php
index 9582ef3d..61e49b9a 100644
--- a/client_files_add_modal.php
+++ b/client_file_upload_modal.php
@@ -1,4 +1,4 @@
-<div class="modal" id="addFilesModal" tabindex="-1">
+<div class="modal" id="uploadFilesModal" tabindex="-1">
     <div class="modal-dialog">
         <div class="modal-content bg-dark">
             <div class="modal-header">
@@ -11,6 +11,29 @@
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <div class="modal-body bg-white">
 
+                    <div class="form-group mb-4">
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
+                            </div>
+                            <select class="form-control" name="folder_id">
+                                <option value="0">/</option>
+                                <?php
+                                $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_location = $folder_location AND folder_client_id = $client_id ORDER BY folder_name ASC");
+                                while ($row = mysqli_fetch_array($sql_folders)) {
+                                    $folder_id = intval($row['folder_id']);
+                                    $folder_name = nullable_htmlentities($row['folder_name']);
+
+                                    ?>
+                                    <option <?php if (isset($_GET['folder_id']) && $_GET['folder_id'] == $folder_id) echo "selected"; ?> value="<?php echo $folder_id ?>"><?php echo $folder_name; ?></option>
+                                    <?php
+                                }
+                                ?>
+
+                            </select>
+                        </div>
+                    </div>
+
                     <div class="form-group">
                         <input type="file" class="form-control-file" name="file[]" multiple id="fileInput" accept=".jpg, .jpeg, .gif, .png, .webp, .pdf, .txt, .md, .doc, .docx, .odt, .csv, .xls, .xlsx, .ods, .pptx, .odp, .zip, .tar, .gz, .xml, .msg, .json, .wav, .mp3, .ogg, .mov, .mp4, .av1">
                     </div>
@@ -18,7 +41,7 @@
 
                 </div>
                 <div class="modal-footer bg-white">
-                    <button type="submit" name="add_files" class="btn btn-primary text-bold"><i class="fa fa-upload mr-2"></i>Upload</button>
+                    <button type="submit" name="upload_files" class="btn btn-primary text-bold"><i class="fa fa-upload mr-2"></i>Upload</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
             </form>
diff --git a/client_files.php b/client_files.php
index ffbca6cd..ae3fd036 100644
--- a/client_files.php
+++ b/client_files.php
@@ -35,6 +35,9 @@ if ($view == 1) {
     $query_images = '';
 }
 
+// Set Folder Location Var used when creating folders
+$folder_location = 1;
+
 $sql = mysqli_query(
     $mysqli,
     "SELECT SQL_CALC_FOUND_ROWS * FROM files
@@ -61,171 +64,254 @@ $num_of_files = mysqli_num_rows($sql);
     
     <div class="card-header py-2">
         <h3 class="card-title mt-2"><i class="fa fa-fw fa-paperclip mr-2"></i>Files</h3>
+        
         <div class="card-tools">
-            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addFilesModal"><i class="fas fa-fw fa-cloud-upload-alt mr-2"></i>Upload</button>
+            <div class="btn-group">
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#uploadFilesModal">
+                    <i class="fas fa-fw fa-cloud-upload-alt mr-2"></i>Upload
+                </button>
+                <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
+                <div class="dropdown-menu">
+                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#createFolderModal">
+                        <i class="fa fa-fw fa-folder-plus mr-2"></i>Create Folder
+                    </a>
+                </div>
+            </div>
         </div>
     </div>
     
     <div class="card-body">
-        
-        <form autocomplete="off">
-            <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-            <input type="hidden" name="view" value="<?php echo $view; ?>">
-            <div class="row">
-                <div class="col-md-4">
-                    <div class="input-group mb-3 mb-md-0">
-                        <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search Files">
-                        <div class="input-group-append">
-                            <button class="btn btn-dark"><i class="fa fa-search"></i></button>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-md-8">
-                    <div class="float-right">
-                        <a href="?<?php echo $url_query_strings_sort; ?>&view=0" class="btn <?php if($view == 0){ echo "btn-primary"; } else { echo "btn-outline-secondary"; } ?>"><i class="fas fa-list-ul"></i></a>
-                        <a href="?<?php echo $url_query_strings_sort; ?>&view=1" class="btn <?php if($view == 1){ echo "btn-primary"; } else { echo "btn-outline-secondary"; } ?>"><i class="fas fa-th-large"></i></a>
-                    </div>
-                </div>
-            </div>
-        </form>
-        
-        <hr>
-
-        <?php
-        if ($num_of_files == 0) {
-            echo "<div style='text-align: center;'><h3 class='text-secondary'>No Records Here</h3></div>";
-        }
-
-        if($view == 1){
-
-        ?>
-
         <div class="row">
+            <div class="col-md-3 border-right">
+                <h4>Folders</h4>
+                <hr>
+                <ul class="nav nav-pills flex-column bg-light">
+                    <li class="nav-item">
+                        <a class="nav-link <?php if ($get_folder_id == 0) { echo "active"; } ?>" href="?client_id=<?php echo $client_id; ?>&folder_id=0">/</a>
+                    </li>
+                    <?php
+                    $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_location = $folder_location AND folder_client_id = $client_id ORDER BY folder_name ASC");
+                    while ($row = mysqli_fetch_array($sql_folders)) {
+                        $folder_id = intval($row['folder_id']);
+                        $folder_name = nullable_htmlentities($row['folder_name']);
 
-            <?php
+                        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('file_id') AS num FROM files WHERE file_folder_id = $folder_id"));
+                        $num_files = intval($row['num']);
 
-            while ($row = mysqli_fetch_array($sql)) {
-                $file_id = intval($row['file_id']);
-                $file_name = nullable_htmlentities($row['file_name']);
-                $file_reference_name = nullable_htmlentities($row['file_reference_name']);
-                $file_ext = nullable_htmlentities($row['file_ext']);
+                        ?>
 
-                ?>
+                        <li class="nav-item">
+                            <div class="row">
+                                <div class="col-10">
+                                    <a class="nav-link <?php if ($get_folder_id == $folder_id) { echo "active"; } ?> " href="?client_id=<?php echo $client_id; ?>&folder_id=<?php echo $folder_id; ?>">
+                                        <?php
+                                        if ($get_folder_id == $folder_id) { ?>
+                                            <i class="fas fa-fw fa-folder-open"></i>
+                                        <?php } else { ?>
+                                            <i class="fas fa-fw fa-folder"></i>
+                                        <?php } ?>
 
-                <div class="col-xl-3 col-lg-3 col-md-6 col-sm-6 mb-3">
-                    <div class="card">
-                        <a href="#" data-toggle="modal" data-target="#viewFileModal<?php echo $file_id; ?>">
-                            <img class="img-fluid" src="<?php echo "uploads/clients/$client_id/$file_reference_name"; ?>" alt="<?php echo $file_reference_name ?>">
-                        </a>
-                        <div class="card-footer bg-dark text-white p-1" style="text-align: center;">
-                            <a href="<?php echo "uploads/clients/$client_id/$file_reference_name"; ?>" download="<?php echo $file_name; ?>" class="text-white float-left ml-1"><i class="fa fa-cloud-download-alt"></i></a>
-                            <a href="#" data-toggle="modal" data-target="#shareModal" onclick="populateShareModal(<?php echo "$client_id, 'File', $file_id"; ?>)" class="text-white float-left ml-1"><i class="fa fa-share"></i></a>
-
-                            <small><?php echo $file_name; ?></small>
-
-                            <a href="#" data-toggle="modal" data-target="#deleteFileModal" onclick="populateFileDeleteModal(<?php echo "$file_id , '$file_name'" ?>)" class="text-white float-right mr-1"><i class="fa fa-times"></i></a>
-                        </div>
-                    </div>
-                </div>
-
-                <?php
-                require("client_file_view_modal.php");
-            }
-            ?>
-        </div>
-
-        <?php } else { ?>
-
-        <div class="table-responsive-sm">
-            <table class="table border">
-                
-                <thead class="thead-light <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-                <tr>
-                    <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=file_name&order=<?php echo $disp; ?>">Name</a></th>
-                    <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=file_created_at&order=<?php echo $disp; ?>">Uploaded</a></th>
-                    <th class="text-center">Action</th>
-                </tr>
-                </thead>
-                
-                <tbody>
-
-                <?php
-                while ($row = mysqli_fetch_array($sql)) {
-                    $file_id = intval($row['file_id']);
-                    $file_name = nullable_htmlentities($row['file_name']);
-                    $file_reference_name = nullable_htmlentities($row['file_reference_name']);
-                    $file_ext = nullable_htmlentities($row['file_ext']);
-                    if ($file_ext == 'pdf') {
-                        $file_icon = "file-pdf";
-                    } elseif ($file_ext == 'gz' || $file_ext == 'tar' || $file_ext == 'zip' || $file_ext == '7z' || $file_ext == 'rar') {
-                        $file_icon = "file-archive";
-                    } elseif ($file_ext == 'txt' || $file_ext == 'md') {
-                        $file_icon = "file-alt";
-                    } elseif ($file_ext == 'msg') {
-                        $file_icon = "envelope";
-                    } elseif ($file_ext == 'doc' || $file_ext == 'docx' || $file_ext == 'odt') {
-                        $file_icon = "file-word";
-                    } elseif ($file_ext == 'xls' || $file_ext == 'xlsx' || $file_ext == 'ods') {
-                        $file_icon = "file-excel";
-                    } elseif ($file_ext == 'pptx' || $file_ext == 'odp') {
-                        $file_icon = "file-powerpoint";
-                    } elseif ($file_ext == 'mp3' || $file_ext == 'wav' || $file_ext == 'ogg') {
-                        $file_icon = "file-audio";
-                    } elseif ($file_ext == 'mov' || $file_ext == 'mp4' || $file_ext == 'av1') {
-                        $file_icon = "file-video";
-                    } elseif ($file_ext == 'jpg' || $file_ext == 'jpeg' || $file_ext == 'png' || $file_ext == 'gif' || $file_ext == 'webp' || $file_ext == 'bmp' || $file_ext == 'tif') {
-                        $file_icon = "file-image";
-                    } else {
-                        $file_icon = "file";
-                    }
-                    $file_created_at = nullable_htmlentities($row['file_created_at']);
-                    ?>
-
-                    <tr>
-                        <td><a href="<?php echo "uploads/clients/$client_id/$file_reference_name"; ?>" target="_blank" class="text-secondary"><i class="fa fa-fw fa-2x fa-<?php echo $file_icon; ?> mr-3"></i> <?php echo basename($file_name); ?></a></td>
-                        <td><?php echo $file_created_at; ?></td>
-                        <td>
-                            <div class="dropdown dropleft text-center">
-                                <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
-                                    <i class="fas fa-ellipsis-h"></i>
-                                </button>
-                                <div class="dropdown-menu">
-                                    <a class="dropdown-item" href="<?php echo "uploads/clients/$client_id/$file_reference_name"; ?>" download="<?php echo $file_name; ?>">
-                                        <i class="fas fa-fw fa-cloud-download-alt mr-2"></i>Download
-                                    </a>
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#shareModal" onclick="populateShareModal(<?php echo "$client_id, 'File', $file_id"; ?>)">
-                                        <i class="fas fa-fw fa-share mr-2"></i>Share
-                                    </a>
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#renameFileModal<?php echo $file_id; ?>">
-                                        <i class="fas fa-fw fa-edit mr-2"></i>Rename
-                                    </a>
-                                    <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item text-danger" href="post.php?archive_file=<?php echo $file_id; ?>">
-                                        <i class="fas fa-fw fa-archive mr-2"></i>Archive
-                                    </a>
-                                    <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item text-danger text-bold" href="#" data-toggle="modal" data-target="#deleteFileModal" onclick="populateFileDeleteModal(<?php echo "$file_id , '$file_name'" ?>)">
-                                        <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                        <?php echo $folder_name; ?> <?php if ($num_files > 0) { echo "<span class='badge badge-pill badge-dark float-right mt-1'>$num_files</span>"; } ?>
                                     </a>
                                 </div>
+                                <div class="col-2">
+                                    <div class="dropdown">
+                                        <button class="btn btn-sm" type="button" data-toggle="dropdown">
+                                            <i class="fas fa-ellipsis-v"></i>
+                                        </button>
+                                        <div class="dropdown-menu">
+                                            <a class="dropdown-item" href="#" data-toggle="modal" data-target="#renameFolderModal<?php echo $folder_id; ?>">
+                                                <i class="fas fa-fw fa-edit mr-2"></i>Rename
+                                            </a>
+                                            <?php if ($session_user_role == 3) { ?>
+                                                <div class="dropdown-divider"></div>
+                                                <a class="dropdown-item text-danger text-bold" href="post.php?delete_folder=<?php echo $folder_id; ?>">
+                                                    <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                                </a>
+                                            <?php } ?>
+                                        </div>
+                                    </div>
+                                </div>
                             </div>
-                        </td>
-                    </tr>
-                    <?php
-                    require("client_file_rename_modal.php");
+                        </li>
+
+                        <?php
+                        require("folder_rename_modal.php");
+
+                    }
+                    ?>
+                </ul>
+                <?php require_once("folder_create_modal.php"); ?>
+            </div>
+
+            <div class="col-md-9">
+        
+                <form autocomplete="off">
+                    <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                    <input type="hidden" name="view" value="<?php echo $view; ?>">
+                    <div class="row">
+                        <div class="col-md-4">
+                            <div class="input-group mb-3 mb-md-0">
+                                <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search Files">
+                                <div class="input-group-append">
+                                    <button class="btn btn-dark"><i class="fa fa-search"></i></button>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-md-8">
+                            <div class="float-right">
+                                <a href="?<?php echo $url_query_strings_sort; ?>&view=0" class="btn <?php if($view == 0){ echo "btn-primary"; } else { echo "btn-outline-secondary"; } ?>"><i class="fas fa-list-ul"></i></a>
+                                <a href="?<?php echo $url_query_strings_sort; ?>&view=1" class="btn <?php if($view == 1){ echo "btn-primary"; } else { echo "btn-outline-secondary"; } ?>"><i class="fas fa-th-large"></i></a>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+                
+                <hr>
+
+                <?php
+                if ($num_of_files == 0) {
+                    echo "<div style='text-align: center;'><h3 class='text-secondary'>No Records Here</h3></div>";
                 }
+
+                if($view == 1){
+
                 ?>
-            </table>
+
+                <div class="row">
+
+                    <?php
+
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $file_id = intval($row['file_id']);
+                        $file_name = nullable_htmlentities($row['file_name']);
+                        $file_reference_name = nullable_htmlentities($row['file_reference_name']);
+                        $file_ext = nullable_htmlentities($row['file_ext']);
+
+                        ?>
+
+                        <div class="col-xl-3 col-lg-3 col-md-6 col-sm-6 mb-3">
+                            <div class="card">
+                                <a href="#" data-toggle="modal" data-target="#viewFileModal<?php echo $file_id; ?>">
+                                    <img class="img-fluid" src="<?php echo "uploads/clients/$client_id/$file_reference_name"; ?>" alt="<?php echo $file_reference_name ?>">
+                                </a>
+                                <div class="card-footer bg-dark text-white p-1" style="text-align: center;">
+                                    <a href="<?php echo "uploads/clients/$client_id/$file_reference_name"; ?>" download="<?php echo $file_name; ?>" class="text-white float-left ml-1"><i class="fa fa-cloud-download-alt"></i></a>
+                                    <a href="#" data-toggle="modal" data-target="#shareModal" onclick="populateShareModal(<?php echo "$client_id, 'File', $file_id"; ?>)" class="text-white float-left ml-1"><i class="fa fa-share"></i></a>
+
+                                    <small><?php echo $file_name; ?></small>
+
+                                    <a href="#" data-toggle="modal" data-target="#deleteFileModal" onclick="populateFileDeleteModal(<?php echo "$file_id , '$file_name'" ?>)" class="text-white float-right mr-1"><i class="fa fa-times"></i></a>
+                                </div>
+                            </div>
+                        </div>
+
+                        <?php
+                        require("client_file_view_modal.php");
+                    }
+                    ?>
+                </div>
+
+                <?php } else { ?>
+
+                <div class="table-responsive-sm">
+                    <table class="table border">
+                        
+                        <thead class="thead-light <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
+                        <tr>
+                            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=file_name&order=<?php echo $disp; ?>">Name</a></th>
+                            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=file_created_at&order=<?php echo $disp; ?>">Uploaded</a></th>
+                            <th class="text-center">Action</th>
+                        </tr>
+                        </thead>
+                        
+                        <tbody>
+
+                        <?php
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $file_id = intval($row['file_id']);
+                            $file_name = nullable_htmlentities($row['file_name']);
+                            $file_reference_name = nullable_htmlentities($row['file_reference_name']);
+                            $file_ext = nullable_htmlentities($row['file_ext']);
+                            if ($file_ext == 'pdf') {
+                                $file_icon = "file-pdf";
+                            } elseif ($file_ext == 'gz' || $file_ext == 'tar' || $file_ext == 'zip' || $file_ext == '7z' || $file_ext == 'rar') {
+                                $file_icon = "file-archive";
+                            } elseif ($file_ext == 'txt' || $file_ext == 'md') {
+                                $file_icon = "file-alt";
+                            } elseif ($file_ext == 'msg') {
+                                $file_icon = "envelope";
+                            } elseif ($file_ext == 'doc' || $file_ext == 'docx' || $file_ext == 'odt') {
+                                $file_icon = "file-word";
+                            } elseif ($file_ext == 'xls' || $file_ext == 'xlsx' || $file_ext == 'ods') {
+                                $file_icon = "file-excel";
+                            } elseif ($file_ext == 'pptx' || $file_ext == 'odp') {
+                                $file_icon = "file-powerpoint";
+                            } elseif ($file_ext == 'mp3' || $file_ext == 'wav' || $file_ext == 'ogg') {
+                                $file_icon = "file-audio";
+                            } elseif ($file_ext == 'mov' || $file_ext == 'mp4' || $file_ext == 'av1') {
+                                $file_icon = "file-video";
+                            } elseif ($file_ext == 'jpg' || $file_ext == 'jpeg' || $file_ext == 'png' || $file_ext == 'gif' || $file_ext == 'webp' || $file_ext == 'bmp' || $file_ext == 'tif') {
+                                $file_icon = "file-image";
+                            } else {
+                                $file_icon = "file";
+                            }
+                            $file_created_at = nullable_htmlentities($row['file_created_at']);
+                            ?>
+
+                            <tr>
+                                <td><a href="<?php echo "uploads/clients/$client_id/$file_reference_name"; ?>" target="_blank" class="text-secondary"><i class="fa fa-fw fa-2x fa-<?php echo $file_icon; ?> mr-3"></i> <?php echo basename($file_name); ?></a></td>
+                                <td><?php echo $file_created_at; ?></td>
+                                <td>
+                                    <div class="dropdown dropleft text-center">
+                                        <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
+                                            <i class="fas fa-ellipsis-h"></i>
+                                        </button>
+                                        <div class="dropdown-menu">
+                                            <a class="dropdown-item" href="<?php echo "uploads/clients/$client_id/$file_reference_name"; ?>" download="<?php echo $file_name; ?>">
+                                                <i class="fas fa-fw fa-cloud-download-alt mr-2"></i>Download
+                                            </a>
+                                            <a class="dropdown-item" href="#" data-toggle="modal" data-target="#shareModal" onclick="populateShareModal(<?php echo "$client_id, 'File', $file_id"; ?>)">
+                                                <i class="fas fa-fw fa-share mr-2"></i>Share
+                                            </a>
+                                            <a class="dropdown-item" href="#" data-toggle="modal" data-target="#renameFileModal<?php echo $file_id; ?>">
+                                                <i class="fas fa-fw fa-edit mr-2"></i>Rename
+                                            </a>
+                                            <a class="dropdown-item" href="#" data-toggle="modal" data-target="#moveFileModal<?php echo $file_id; ?>">
+                                                <i class="fas fa-fw fa-exchange-alt mr-2"></i>Move
+                                            </a>
+                                            <div class="dropdown-divider"></div>
+                                            <a class="dropdown-item text-danger" href="post.php?archive_file=<?php echo $file_id; ?>">
+                                                <i class="fas fa-fw fa-archive mr-2"></i>Archive
+                                            </a>
+                                            <div class="dropdown-divider"></div>
+                                            <a class="dropdown-item text-danger text-bold" href="#" data-toggle="modal" data-target="#deleteFileModal" onclick="populateFileDeleteModal(<?php echo "$file_id , '$file_name'" ?>)">
+                                                <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                            </a>
+                                        </div>
+                                    </div>
+                                </td>
+                            </tr>
+                            <?php
+                            require("client_file_rename_modal.php");
+                            require("client_file_move_modal.php");
+                        }
+                        ?>
+                        </tbody>
+
+                    </table>
+                </div>
+                <?php require_once("pagination.php"); ?>
+
+                <?php } ?>
+
+            </div>
         </div>
-        <?php require_once("pagination.php"); ?>
-
-        <?php } ?>
-
     </div>
 </div>
 
 <?php
-require_once("client_files_add_modal.php");
+require_once("client_file_upload_modal.php");
 require_once("share_modal.php");
 require_once("client_file_delete_modal.php");
 require_once("footer.php");
diff --git a/database_updates.php b/database_updates.php
index a15fd72c..9658ce0e 100644
--- a/database_updates.php
+++ b/database_updates.php
@@ -1276,11 +1276,18 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) {
 		mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.7.5'");
 	}
 
-	//if (CURRENT_DATABASE_VERSION == '0.7.5') {
+	if (CURRENT_DATABASE_VERSION == '0.7.5') {
 		//Insert queries here required to update to DB version 0.7.6
+		mysqli_query($mysqli, "ALTER TABLE `folders` ADD `folder_location` INT DEFAULT 0 AFTER `parent_folder`");
+		// Then, update the database to the next sequential version
+		mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.7.6'");
+	}
+
+	//if (CURRENT_DATABASE_VERSION == '0.7.6') {
+		//Insert queries here required to update to DB version 0.7.7
 
 		// Then, update the database to the next sequential version
-		//mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.7.6'");
+		//mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.7.7'");
 	//}
 
 } else {
diff --git a/database_version.php b/database_version.php
index 3b08ecbf..e00109f2 100644
--- a/database_version.php
+++ b/database_version.php
@@ -5,4 +5,4 @@
  * It is used in conjunction with database_updates.php
  */
 
-DEFINE("LATEST_DATABASE_VERSION", "0.7.5");
+DEFINE("LATEST_DATABASE_VERSION", "0.7.6");
diff --git a/db.sql b/db.sql
index 7a738498..15445d73 100644
--- a/db.sql
+++ b/db.sql
@@ -583,6 +583,7 @@ CREATE TABLE `folders` (
   `folder_id` int(11) NOT NULL AUTO_INCREMENT,
   `folder_name` varchar(200) NOT NULL,
   `parent_folder` int(11) NOT NULL DEFAULT 0,
+  `folder_location` int(11) DEFAULT 0,
   `folder_client_id` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`folder_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
@@ -1693,4 +1694,4 @@ CREATE TABLE `vendors` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2023-08-23 16:27:20
+-- Dump completed on 2023-08-23 18:02:23
diff --git a/client_document_folder_add_modal.php b/folder_create_modal.php
similarity index 82%
rename from client_document_folder_add_modal.php
rename to folder_create_modal.php
index 4ffaaef5..8d924f23 100644
--- a/client_document_folder_add_modal.php
+++ b/folder_create_modal.php
@@ -1,4 +1,4 @@
-<div class="modal" id="addFolderModal" tabindex="-1">
+<div class="modal" id="createFolderModal" tabindex="-1">
     <div class="modal-dialog">
         <div class="modal-content bg-dark">
             <div class="modal-header">
@@ -9,6 +9,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <input type="hidden" name="folder_location" value="<?php echo $folder_location; ?>">
                 <div class="modal-body bg-white">
 
                     <div class="form-group">
@@ -23,7 +24,7 @@
 
                 </div>
                 <div class="modal-footer bg-white">
-                    <button type="submit" name="add_folder" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+                    <button type="submit" name="create_folder" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
             </form>
diff --git a/client_document_folder_rename_modal.php b/folder_rename_modal.php
similarity index 100%
rename from client_document_folder_rename_modal.php
rename to folder_rename_modal.php
diff --git a/post.php b/post.php
index 8b524709..021a925b 100644
--- a/post.php
+++ b/post.php
@@ -18,6 +18,7 @@ require_once("post/client.php");
 require_once("post/contact.php");
 require_once("post/custom_field.php");
 require_once("post/document.php");
+require_once("post/folder.php");
 require_once("post/domain.php");
 require_once("post/event.php");
 require_once("post/expense.php");
diff --git a/post/document.php b/post/document.php
index 6156ace3..8186fd42 100644
--- a/post/document.php
+++ b/post/document.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ITFlow - GET/POST request handler for client documents (and document folders)
+ * ITFlow - GET/POST request handler for client documents
  */
 
 if (isset($_POST['add_document'])) {
@@ -171,68 +171,3 @@ if (isset($_GET['delete_document'])) {
     header("Location: " . $_SERVER["HTTP_REFERER"]);
 
 }
-
-if (isset($_POST['add_folder'])) {
-
-    validateTechRole();
-
-    $client_id = intval($_POST['client_id']);
-    $folder_name = sanitizeInput($_POST['folder_name']);
-
-    // Document folder add query
-    $add_folder = mysqli_query($mysqli,"INSERT INTO folders SET folder_name = '$folder_name', folder_client_id = $client_id");
-    $folder_id = mysqli_insert_id($mysqli);
-
-    // Logging
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Folder', log_action = 'Create', log_description = '$session_name created folder $folder_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $folder_id");
-
-    $_SESSION['alert_message'] = "Folder <strong>$folder_name</strong> created";
-
-    header("Location: " . $_SERVER["HTTP_REFERER"]);
-
-}
-
-if (isset($_POST['rename_folder'])) {
-
-    validateTechRole();
-
-    $folder_id = intval($_POST['folder_id']);
-    $client_id = intval($_POST['client_id']);
-    $folder_name = sanitizeInput($_POST['folder_name']);
-
-    // Folder edit query
-    mysqli_query($mysqli,"UPDATE folders SET folder_name = '$folder_name' WHERE folder_id = $folder_id");
-
-    //Logging
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Folder', log_action = 'Modify', log_description = '$session_name renamed folder to $folder_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $folder_id");
-
-    $_SESSION['alert_message'] = "Folder <strong>$folder_name</strong> renamed";
-
-    header("Location: " . $_SERVER["HTTP_REFERER"]);
-
-}
-
-if (isset($_GET['delete_folder'])) {
-
-    validateAdminRole();
-
-    $folder_id = intval($_GET['delete_folder']);
-
-    mysqli_query($mysqli,"DELETE FROM folders WHERE folder_id = $folder_id");
-
-    // Move files in deleted folder back to the root folder /
-    $sql_documents = mysqli_query($mysqli,"SELECT * FROM documents WHERE document_folder_id = $folder_id");
-    while($row = mysqli_fetch_array($sql_documents)) {
-        $document_id = intval($row['document_id']);
-
-        mysqli_query($mysqli,"UPDATE documents SET document_folder_id = 0 WHERE document_id = $document_id");
-    }
-
-    //Logging
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Folder', log_action = 'Delete', log_description = '$folder_id', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id");
-
-    $_SESSION['alert_message'] = "Folder deleted";
-
-    header("Location: " . $_SERVER["HTTP_REFERER"]);
-
-}
diff --git a/post/file.php b/post/file.php
index 18dc9b82..f2595e81 100644
--- a/post/file.php
+++ b/post/file.php
@@ -4,8 +4,9 @@
  * ITFlow - GET/POST request handler for client files/uploads
  */
 
-if (isset($_POST['add_files'])) {
+if (isset($_POST['upload_files'])) {
     $client_id = intval($_POST['client_id']);
+    $folder_id = intval($_POST['folder_id']);
     
     if (!file_exists("uploads/clients/$client_id")) {
         mkdir("uploads/clients/$client_id");
@@ -38,7 +39,7 @@ if (isset($_POST['add_files'])) {
             // Extract .ext from reference file name to be used to store SHA256 hash
             $file_hash = strstr($file_reference_name, '.', true) ?: $file_reference_name;
 
-            mysqli_query($mysqli,"INSERT INTO files SET file_reference_name = '$file_reference_name', file_name = '$file_name', file_ext = '$file_extension', file_hash = '$file_hash', file_client_id = $client_id");
+            mysqli_query($mysqli,"INSERT INTO files SET file_reference_name = '$file_reference_name', file_name = '$file_name', file_ext = '$file_extension', file_hash = '$file_hash', file_folder_id = $folder_id, file_client_id = $client_id");
 
             //Logging
             $file_id = intval(mysqli_insert_id($mysqli));
@@ -71,6 +72,27 @@ if (isset($_POST['rename_file'])) {
 
 }
 
+if (isset($_POST['move_file'])) {
+
+    validateTechRole();
+
+    $file_id = intval($_POST['file_id']);
+    $client_id = intval($_POST['client_id']);
+    $folder_id = intval($_POST['folder_id']);
+
+    // Document edit query
+    mysqli_query($mysqli,"UPDATE files SET file_folder_id = $folder_id WHERE file_id = $file_id");
+
+    //Logging
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'File', log_action = 'Move', log_description = '$session_name moved file', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $file_id");
+
+
+    $_SESSION['alert_message'] = "File moved";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
 if (isset($_POST['delete_file'])) {
 
     validateAdminRole();
diff --git a/post/folder.php b/post/folder.php
new file mode 100644
index 00000000..d1ac8e05
--- /dev/null
+++ b/post/folder.php
@@ -0,0 +1,71 @@
+<?php
+
+/*
+ * ITFlow - GET/POST request handler for folders
+ */
+
+if (isset($_POST['create_folder'])) {
+
+    validateTechRole();
+
+    $client_id = intval($_POST['client_id']);
+    $folder_location = intval($_POST['folder_location']);
+    $folder_name = sanitizeInput($_POST['folder_name']);
+
+    // Document folder add query
+    $add_folder = mysqli_query($mysqli,"INSERT INTO folders SET folder_name = '$folder_name', folder_location = $folder_location, folder_client_id = $client_id");
+    $folder_id = mysqli_insert_id($mysqli);
+
+    // Logging
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Folder', log_action = 'Create', log_description = '$session_name created folder $folder_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $folder_id");
+
+    $_SESSION['alert_message'] = "Folder <strong>$folder_name</strong> created";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
+if (isset($_POST['rename_folder'])) {
+
+    validateTechRole();
+
+    $folder_id = intval($_POST['folder_id']);
+    $client_id = intval($_POST['client_id']);
+    $folder_name = sanitizeInput($_POST['folder_name']);
+
+    // Folder edit query
+    mysqli_query($mysqli,"UPDATE folders SET folder_name = '$folder_name' WHERE folder_id = $folder_id");
+
+    //Logging
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Folder', log_action = 'Modify', log_description = '$session_name renamed folder to $folder_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $folder_id");
+
+    $_SESSION['alert_message'] = "Folder <strong>$folder_name</strong> renamed";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
+if (isset($_GET['delete_folder'])) {
+
+    validateAdminRole();
+
+    $folder_id = intval($_GET['delete_folder']);
+
+    mysqli_query($mysqli,"DELETE FROM folders WHERE folder_id = $folder_id");
+
+    // Move files in deleted folder back to the root folder /
+    $sql_documents = mysqli_query($mysqli,"SELECT * FROM documents WHERE document_folder_id = $folder_id");
+    while($row = mysqli_fetch_array($sql_documents)) {
+        $document_id = intval($row['document_id']);
+
+        mysqli_query($mysqli,"UPDATE documents SET document_folder_id = 0 WHERE document_id = $document_id");
+    }
+
+    //Logging
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Folder', log_action = 'Delete', log_description = '$folder_id', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id");
+
+    $_SESSION['alert_message'] = "Folder deleted";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
\ No newline at end of file