diff --git a/guest/guest_post.php b/guest/guest_post.php
index db202764..cfc8af51 100644
--- a/guest/guest_post.php
+++ b/guest/guest_post.php
@@ -215,8 +215,7 @@ if (isset($_POST['guest_quote_upload_file'])) {
         $client_id = intval($row['client_id']);
 
         // Define & create directories, as required
-        mkdirMissing('../uploads/quotes/');
-        $upload_file_dir = "../uploads/quotes/" . $quote_id . "/";
+        $upload_file_dir = "../uploads/clients/$client_id/";
         mkdirMissing($upload_file_dir);
 
         // Store attached any file
@@ -240,22 +239,46 @@ if (isset($_POST['guest_quote_upload_file'])) {
                     $extarr = explode('.', $_FILES['file']['name'][$i]);
                     $file_extension = sanitizeInput(strtolower(end($extarr)));
 
+                    // Extract the file mime type and size
+                    $file_mime_type = sanitizeInput($single_file['type']);
+                    $file_size = intval($single_file['size']);
+
                     // Define destination file path
                     $dest_path = $upload_file_dir . $file_reference_name;
 
-                    // Do upload
+                    // Get/Create a top-level folder called Client Uploads
+                    $folder_sql = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_name = 'Client Uploads' AND parent_folder = 0 AND folder_client_id = $client_id LIMIT 1");
+                    if (mysqli_num_rows($folder_sql) == 1) {
+                        // Get
+                        $row = mysqli_fetch_array($folder_sql);
+                        $folder_id = $row['folder_id'];
+                    } else {
+                        // Create
+                        mysqli_query($mysqli,"INSERT INTO folders SET folder_name = 'Client Uploads', parent_folder = 0, folder_location = 1, folder_client_id = $client_id");
+                        $folder_id = mysqli_insert_id($mysqli);
+                        logAction("Folder", "Create", "Automatically created folder Client Uploads", $client_id, $folder_id);
+                    }
+
+                    // Do move/upload
                     move_uploaded_file($file_tmp_path, $dest_path);
-                    mysqli_query($mysqli, "INSERT INTO quote_attachments SET quote_attachment_name = '$file_name', quote_attachment_reference_name = '$file_reference_name', quote_attachment_quote_id = $quote_id");
+
+                    // Create reference in files
+                    mysqli_query($mysqli,"INSERT INTO files SET file_reference_name = '$file_reference_name', file_name = '$file_name', file_description = 'Uploaded via $quote_prefix$quote_number', file_ext = '$file_extension', file_mime_type = '$file_mime_type', file_size = $file_size, file_folder_id = $folder_id, file_client_id = $client_id");
+                    $file_id = mysqli_insert_id($mysqli);
+
+                    // Associate file with quote
+                    mysqli_query($mysqli, "INSERT INTO quote_files SET quote_id = $quote_id, file_id = $file_id");
 
                     // Logging & feedback
                     $_SESSION['alert_message'] = 'File uploaded!';
+                    appNotify("Quote File", "$file_name was uploaded to quote $quote_prefix$quote_number", "quote.php?quote_id=$quote_id", $client_id);
                     mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Upload', history_description = 'Client uploaded file $file_name', history_quote_id = $quote_id");
                     logAction("File", "Upload", "Guest uploaded file $file_name to quote $quote_prefix$quote_number", $client_id);
 
                 } else {
                     $_SESSION['alert_type'] = 'error';
                     $_SESSION['alert_message'] = 'Something went wrong uploading the file - please let the support team know.';
-
+                    logApp("Guest", "error", "Error uploading file to invoice");
                 }
 
             }
diff --git a/post/user/file.php b/post/user/file.php
index 3864e836..f7b1d678 100644
--- a/post/user/file.php
+++ b/post/user/file.php
@@ -284,6 +284,8 @@ if (isset($_POST['delete_file'])) {
 
     mysqli_query($mysqli,"DELETE FROM files WHERE file_id = $file_id");
 
+    mysqli_query($mysqli,"DELETE FROM quote_files WHERE file_id = $file_id");
+
     //Logging
     logAction("File", "Delete", "$session_name deleted file $file_name", $client_id);
 
diff --git a/quote.php b/quote.php
index 7b34f0db..dde50ef5 100644
--- a/quote.php
+++ b/quote.php
@@ -108,11 +108,10 @@ if (isset($_GET['quote_id'])) {
         $json_products = json_encode($products);
     }
 
-    // Attachments
-    // Get Ticket Attachments
-    $sql_quote_attachments = mysqli_query(
+    // Quote File Attachments
+    $sql_quote_files = mysqli_query(
         $mysqli,
-        "SELECT * FROM quote_attachments WHERE quote_attachments.quote_attachment_quote_id = $quote_id"
+        "SELECT file_reference_name, file_name, file_created_at FROM quote_files LEFT JOIN files ON quote_files.file_id = files.file_id WHERE quote_id = $quote_id"
     );
 
 ?>
@@ -490,7 +489,7 @@ if (isset($_GET['quote_id'])) {
         </div>
     </div>
 
-    <?php if (mysqli_num_rows($sql_quote_attachments) > 0) { ?>
+    <?php if (mysqli_num_rows($sql_quote_files) > 0) { ?>
         <div class="row mb-3">
         <div class="col-sm d-print-none">
             <div class="card">
@@ -516,14 +515,14 @@ if (isset($_GET['quote_id'])) {
                         <tbody>
                         <?php
 
-                        while ($quote_attachment = mysqli_fetch_array($sql_quote_attachments)) {
-                            $name = nullable_htmlentities($quote_attachment['quote_attachment_name']);
-                            $ref_name = nullable_htmlentities($quote_attachment['quote_attachment_reference_name']);
-                            $created = nullable_htmlentities($quote_attachment['quote_attachment_created_at']);
+                        while ($quote_file = mysqli_fetch_array($sql_quote_files)) {
+                            $name = nullable_htmlentities($quote_file['file_name']);
+                            $ref_name = nullable_htmlentities($quote_file['file_reference_name']);
+                            $created = nullable_htmlentities($quote_file['file_created_at']);
 
                             ?>
                             <tr>
-                                <td><a href="/uploads/quotes/<?php echo $quote_id ?>/<?php echo $ref_name ?>"><?php echo $name; ?></a></td>
+                                <td><a target="_blank" href="/uploads/clients/<?php echo $client_id ?>/<?php echo $ref_name ?>"><?php echo $name; ?></a></td>
                                 <td><?php echo $created; ?></td>
                             </tr>
                             <?php