diff --git a/edit_user_modal.php b/edit_user_modal.php
index 9f106114..61b31cd1 100644
--- a/edit_user_modal.php
+++ b/edit_user_modal.php
@@ -53,7 +53,7 @@
           </div>
           <div class="form-group">
             <label>Avatar</label>
-            <input type="file" class="form-control-file" accept="image/*;capture=camera" name="avatar">
+            <input type="file" class="form-control-file" accept="image/*;capture=camera" name="file">
           </div>         
         </div>
         <div class="modal-footer bg-white">
diff --git a/post.php b/post.php
index d54d95e4..7b2076b4 100644
--- a/post.php
+++ b/post.php
@@ -71,6 +71,24 @@ if(isset($_POST['edit_invoice_settings'])){
 
 }
 
+if(isset($_POST['edit_logo_settings'])){
+
+    if($_FILES['file']['tmp_name']!='') {
+        $path = "uploads/settings";
+        $path = $path . basename( $_FILES['file']['name']);
+        $file_name = basename($path);
+        move_uploaded_file($_FILES['file']['tmp_name'], $path);
+        $ext = pathinfo($path);
+        $ext = $ext['extension'];
+
+        mysqli_query($mysqli,"UPDATE settings SET config_invoice_logo = '$path'");
+
+    } 
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
 if(isset($_GET['download_database'])){
 
     // Get All Table Names From the Database
@@ -159,8 +177,9 @@ if(isset($_POST['add_user'])){
 
     $check = getimagesize($_FILES["avatar"]["tmp_name"]);
     if($check !== false) {
-        $avatar_path = "uploads/user_avatars/";
-        $avatar_path = $avatar_path . $user_id . '_' . time() . '_' . basename( $_FILES['avatar']['name']);
+        $avatar_path = "uploads/users/";
+        //$avatar_path = $avatar_path . $user_id . '_' . time() . '_' . basename( $_FILES['avatar']['name']);
+        $avatar_path = $avatar_path . basename( $_FILES['file']['name']);
         move_uploaded_file($_FILES['avatar']['tmp_name'], $avatar_path);
     }
 
@@ -190,7 +209,7 @@ if(isset($_POST['edit_user'])){
         //delete old avatar file
         unlink($path);
         //Update with new path
-        $path = "uploads/user_avatars/";
+        $path = "uploads/users/";
         $path = $path . basename( $_FILES['file']['name']);
         $file_name = basename($path);
         move_uploaded_file($_FILES['file']['tmp_name'], $path);   
@@ -230,7 +249,7 @@ if(isset($_POST['add_client'])){
         mysqli_query($mysqli,"INSERT INTO domains SET domain_name = '$website', domain_created_at = NOW(), client_id = $client_id");
     }
 
-    mkdir("uploads/client_files/$client_id");
+    mkdir("uploads/clients/$client_id");
 
     $_SESSION['alert_message'] = "Client added";
     
@@ -361,11 +380,6 @@ if(isset($_POST['add_vendor'])){
 
     $vendor_id = mysqli_insert_id($mysqli);
 
-    //Create Directory to store expense reciepts for that vendor
-    if($client_id == 0){
-        mkdir("uploads/expenses/$vendor_id");
-    }
-
     $_SESSION['alert_message'] = "Vendor added";
     
     header("Location: " . $_SERVER["HTTP_REFERER"]);
@@ -618,7 +632,7 @@ if(isset($_POST['add_expense'])){
     $reference = strip_tags(mysqli_real_escape_string($mysqli,$_POST['reference']));
 
     if($_FILES['file']['tmp_name']!='') {
-        $path = "uploads/expenses/$vendor/";
+        $path = "uploads/expenses/";
         $path = $path . basename( $_FILES['file']['name']);
         $file_name = basename($path);
         move_uploaded_file($_FILES['file']['tmp_name'], $path);
@@ -647,7 +661,7 @@ if(isset($_POST['edit_expense'])){
     if($_FILES['file']['tmp_name']!='') {
         //remove old receipt
         unlink($path);
-        $path = "uploads/expenses/$vendor/";
+        $path = "uploads/expenses/";
         $path = $path . basename( $_FILES['file']['name']);
         $file_name = basename($path);
         move_uploaded_file($_FILES['file']['tmp_name'], $path);
@@ -2401,7 +2415,7 @@ if(isset($_POST['add_contact'])){
     $email = strip_tags(mysqli_real_escape_string($mysqli,$_POST['email']));
 
     if($_FILES['file']['tmp_name']!='') {
-        $path = "uploads/contact_photos/";
+        $path = "uploads/clients/$client_id/";
         $path = $path . time() . basename( $_FILES['file']['name']);
         $file_name = basename($path);
         move_uploaded_file($_FILES['file']['tmp_name'], $path);
@@ -2630,7 +2644,7 @@ if(isset($_POST['add_file'])){
     $new_name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['new_name']));
 
     if($_FILES['file']['tmp_name']!='') {
-        $path = "uploads/client_files/$client_id/";
+        $path = "uploads/clients/$client_id/";
         $path = $path . basename( $_FILES['file']['name']);
         $file_name = basename($path);
         move_uploaded_file($_FILES['file']['tmp_name'], $path);
diff --git a/settings-logo.php b/settings-logo.php
index ab665722..87c25817 100644
--- a/settings-logo.php
+++ b/settings-logo.php
@@ -9,7 +9,7 @@
   <div class="card-body">
     <form class="p-3" action="post.php" method="post" enctype="multipart/form-data" autocomplete="off"> 
       
-      <img class="img-fluid" src="uploads/invoice_logo.png">
+      <img class="img-fluid" src="<?php echo $config_invoice_logo; ?>">
 
       <div class="form-group mb-5">
         <label>Logo</label>
@@ -17,7 +17,7 @@
       </div>
       
       <hr>
-      <button type="submit" name="edit_invoice_settings" class="btn btn-primary">Save</button>        
+      <button type="submit" name="edit_logo_settings" class="btn btn-primary">Save</button>        
     
     </form>
   </div>
diff --git a/uploads/earthbound-ness-avatar.jpg b/uploads/earthbound-ness-avatar.jpg
deleted file mode 100644
index 20de8180..00000000
Binary files a/uploads/earthbound-ness-avatar.jpg and /dev/null differ
diff --git a/uploads/invoice_logo.png b/uploads/invoice_logo.png
deleted file mode 100644
index 4a9f7768..00000000
Binary files a/uploads/invoice_logo.png and /dev/null differ
diff --git a/uploads/user_avatars/1_1553304348__Ninja-2-512.png b/uploads/user_avatars/1_1553304348__Ninja-2-512.png
deleted file mode 100644
index 2d4432b5..00000000
Binary files a/uploads/user_avatars/1_1553304348__Ninja-2-512.png and /dev/null differ
diff --git a/uploads/user_avatars/1_1553919956_810215_user_512x512.png b/uploads/user_avatars/1_1553919956_810215_user_512x512.png
deleted file mode 100644
index 81205cbf..00000000
Binary files a/uploads/user_avatars/1_1553919956_810215_user_512x512.png and /dev/null differ
diff --git a/uploads/user_avatars/1_1555191082_earthbound-ness-avatar.jpg b/uploads/user_avatars/1_1555191082_earthbound-ness-avatar.jpg
deleted file mode 100644
index 20de8180..00000000
Binary files a/uploads/user_avatars/1_1555191082_earthbound-ness-avatar.jpg and /dev/null differ
diff --git a/uploads/user_avatars/6_1553302297__Ninja-2-512.png b/uploads/user_avatars/6_1553302297__Ninja-2-512.png
deleted file mode 100644
index 2d4432b5..00000000
Binary files a/uploads/user_avatars/6_1553302297__Ninja-2-512.png and /dev/null differ
diff --git a/uploads/user_avatars/7_1553304090_810215_user_512x512.png b/uploads/user_avatars/7_1553304090_810215_user_512x512.png
deleted file mode 100644
index 81205cbf..00000000
Binary files a/uploads/user_avatars/7_1553304090_810215_user_512x512.png and /dev/null differ