Index: app/Http/Controllers/Dashboard/DepartmentsController.php
===================================================================
--- app/Http/Controllers/Dashboard/DepartmentsController.php	(revision 1451c6ffa2e43a06d5042dcf8f124894350d0cae)
+++ app/Http/Controllers/Dashboard/DepartmentsController.php	(revision 190db9fe6bfbe6d2a9654709c4e868aac7e176a3)
@@ -11,4 +11,5 @@
 use App\Models\User;
 use App\Notifications\NewDepartmentCreated;
+use App\Notifications\NewFolderCreated;
 use Carbon\Carbon;
 use App\Http\Controllers\Controller;
Index: app/Http/Controllers/Dashboard/FoldersController.php
===================================================================
--- app/Http/Controllers/Dashboard/FoldersController.php	(revision 1451c6ffa2e43a06d5042dcf8f124894350d0cae)
+++ app/Http/Controllers/Dashboard/FoldersController.php	(revision 190db9fe6bfbe6d2a9654709c4e868aac7e176a3)
@@ -151,5 +151,4 @@
 
         $users = User::all();
-        Notification::send($users, new NewFolderCreated("New folder created"));
 
         $folder->location = $location;
@@ -246,5 +245,5 @@
         }
 
-        if (auth()->user()->hasPermission("delete_all_folders")) {
+        if (auth()->user()->hasPermission("delete_data")) {
 
             foreach ($files as $file) {
Index: app/Http/Requests/Dashboard/FolderRequest.php
===================================================================
--- app/Http/Requests/Dashboard/FolderRequest.php	(revision 1451c6ffa2e43a06d5042dcf8f124894350d0cae)
+++ app/Http/Requests/Dashboard/FolderRequest.php	(revision 190db9fe6bfbe6d2a9654709c4e868aac7e176a3)
@@ -19,5 +19,5 @@
         if ($this->isMethod("patch")) {
             $folder = Folder::find($this->route("id"));
-            return auth()->user()->hasPermission("edit_all_folders") || ($folder->user->id == auth()->user()->id);
+            return auth()->user()->hasPermission("manage_all_folders") || ($folder->user->id == auth()->user()->id);
         }
 
Index: p/Notifications/NewDepartmentCreated.php
===================================================================
--- app/Notifications/NewDepartmentCreated.php	(revision 1451c6ffa2e43a06d5042dcf8f124894350d0cae)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?php
-
-namespace App\Notifications;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Notification;
-use Illuminate\Notifications\Messages\MailMessage;
-
-class NewDepartmentCreated extends Notification
-{
-    use Queueable;
-
-    protected $text;
-
-    /**
-     * Create a new notification instance.
-     *
-     * @return void
-     */
-    public function __construct($text)
-    {
-        $this->text = $text;
-    }
-
-    /**
-     * Get the notification's delivery channels.
-     *
-     * @param  mixed  $notifiable
-     * @return array
-     */
-    public function via($notifiable)
-    {
-        return ['database'];
-    }
-
-    /**
-     * Get the mail representation of the notification.
-     *
-     * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
-     */
-    public function toMail($notifiable)
-    {
-        return (new MailMessage)
-            ->line('The introduction to the notification.')
-            ->action('Notification Action', url('/'))
-            ->line('Thank you for using our application!');
-    }
-
-    /**
-     * Get the array representation of the notification.
-     *
-     * @param  mixed  $notifiable
-     * @return array
-     */
-    public function toArray($notifiable)
-    {
-        return [
-            "url" => "/dashboard/departments",
-            "message" => $this->text
-        ];
-    }
-}
Index: p/Notifications/NewFileCreated.php
===================================================================
--- app/Notifications/NewFileCreated.php	(revision 1451c6ffa2e43a06d5042dcf8f124894350d0cae)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?php
-
-namespace App\Notifications;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Notification;
-use Illuminate\Notifications\Messages\MailMessage;
-
-class NewFileCreated extends Notification
-{
-    use Queueable;
-
-    protected $text;
-
-    /**
-     * Create a new notification instance.
-     *
-     * @return void
-     */
-    public function __construct($text)
-    {
-        $this->text = $text;
-    }
-
-    /**
-     * Get the notification's delivery channels.
-     *
-     * @param  mixed  $notifiable
-     * @return array
-     */
-    public function via($notifiable)
-    {
-        return ['database'];
-    }
-
-    /**
-     * Get the mail representation of the notification.
-     *
-     * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
-     */
-    public function toMail($notifiable)
-    {
-        return (new MailMessage)
-            ->line('The introduction to the notification.')
-            ->action('Notification Action', url('/'))
-            ->line('Thank you for using our application!');
-    }
-
-    /**
-     * Get the array representation of the notification.
-     *
-     * @param  mixed  $notifiable
-     * @return array
-     */
-    public function toArray($notifiable)
-    {
-        return [
-            "url" => "/dashboard/files",
-            "message" => $this->text
-        ];
-    }
-}
Index: p/Notifications/NewFolderCreated.php
===================================================================
--- app/Notifications/NewFolderCreated.php	(revision 1451c6ffa2e43a06d5042dcf8f124894350d0cae)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?php
-
-namespace App\Notifications;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Notification;
-use Illuminate\Notifications\Messages\MailMessage;
-
-class NewFolderCreated extends Notification
-{
-    use Queueable;
-
-    protected $text;
-
-    /**
-     * Create a new notification instance.
-     *
-     * @return void
-     */
-    public function __construct($text)
-    {
-        $this->text = $text;
-    }
-
-    /**
-     * Get the notification's delivery channels.
-     *
-     * @param  mixed  $notifiable
-     * @return array
-     */
-    public function via($notifiable)
-    {
-        return ['database'];
-    }
-
-    /**
-     * Get the mail representation of the notification.
-     *
-     * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
-     */
-    public function toMail($notifiable)
-    {
-        return (new MailMessage)
-            ->line('The introduction to the notification.')
-            ->action('Notification Action', url('/'))
-            ->line('Thank you for using our application!');
-    }
-
-    /**
-     * Get the array representation of the notification.
-     *
-     * @param  mixed  $notifiable
-     * @return array
-     */
-    public function toArray($notifiable)
-    {
-        return [
-            "url" => "/dashboard/folders",
-            "message" => $this->text
-        ];
-    }
-}
Index: database/seeders/PermissionsTableSeeder.php
===================================================================
--- database/seeders/PermissionsTableSeeder.php	(revision 1451c6ffa2e43a06d5042dcf8f124894350d0cae)
+++ database/seeders/PermissionsTableSeeder.php	(revision 190db9fe6bfbe6d2a9654709c4e868aac7e176a3)
@@ -23,14 +23,10 @@
             ["id" => "5", "name" => "view_all_departments"], 	    // Access all departments to view
             ["id" => "6", "name" => "view_all_folders"], 	        // Access all folders to view
-            ["id" => "7", "name" => "edit_all_folders"], 		    // Edit all folders
-            ["id" => "8", "name" => "edit_folder"], 		        // Edit your folder/s
-            ["id" => "9", "name" => "delete_all_folders"], 	        // Delete all folder/s
-            ["id" => "10", "name" => "delete_folder"], 	            // Delete your folder/s
-            ["id" => "11", "name" => "view_all_files"], 	        // View all files
-            ["id" => "12", "name" => "manage_all_files"], 	        // Manage all files
-            ["id" => "13", "name" => "manage_file_types"], 	        // Access file types
-            ["id" => "14", "name" => "edit_user_data"], 	        // Access file types
-            ["id" => "15", "name" => "export_data"], 	            // Export data
-            ["id" => "16", "name" => "download_data"],	            // Download data
+            ["id" => "7", "name" => "view_all_files"], 	            // View all files
+            ["id" => "8", "name" => "manage_all_files"], 	        // Manage all files
+            ["id" => "9", "name" => "manage_file_types"], 	        // Access file types
+            ["id" => "10", "name" => "export_data"], 	            // Export data
+            ["id" => "11", "name" => "download_data"],	            // Download data
+            ["id" => "12", "name" => "delete_data"],	            // Delete data
         ]);
     }
Index: database/seeders/RolesPermissionsTableSeeder.php
===================================================================
--- database/seeders/RolesPermissionsTableSeeder.php	(revision 1451c6ffa2e43a06d5042dcf8f124894350d0cae)
+++ database/seeders/RolesPermissionsTableSeeder.php	(revision 190db9fe6bfbe6d2a9654709c4e868aac7e176a3)
@@ -28,11 +28,8 @@
             ["role_id" => 1, "permission_id" => 11],
             ["role_id" => 1, "permission_id" => 12],
-            ["role_id" => 1, "permission_id" => 13],
-            ["role_id" => 1, "permission_id" => 14],
-            ["role_id" => 1, "permission_id" => 15],
-            ["role_id" => 1, "permission_id" => 16],
 
             // Referent
             ["role_id" => 2, "permission_id" => 1],
+            ["role_id" => 2, "permission_id" => 3],
             ["role_id" => 2, "permission_id" => 4],
             ["role_id" => 2, "permission_id" => 5],
@@ -40,16 +37,11 @@
             ["role_id" => 2, "permission_id" => 7],
             ["role_id" => 2, "permission_id" => 8],
-            ["role_id" => 2, "permission_id" => 9],
-            ["role_id" => 2, "permission_id" => 10],
             ["role_id" => 2, "permission_id" => 11],
-            ["role_id" => 2, "permission_id" => 12],
-            ["role_id" => 2, "permission_id" => 14],
-            ["role_id" => 2, "permission_id" => 15],
-            ["role_id" => 2, "permission_id" => 16],
 
             // Viewer
             ["role_id" => 3, "permission_id" => 5],
             ["role_id" => 3, "permission_id" => 6],
-            ["role_id" => 3, "permission_id" => 11]
+            ["role_id" => 3, "permission_id" => 7],
+            ["role_id" => 3, "permission_id" => 11],
         ]);
     }
Index: resources/views/dashboard/departments/index.blade.php
===================================================================
--- resources/views/dashboard/departments/index.blade.php	(revision 1451c6ffa2e43a06d5042dcf8f124894350d0cae)
+++ resources/views/dashboard/departments/index.blade.php	(revision 190db9fe6bfbe6d2a9654709c4e868aac7e176a3)
@@ -89,7 +89,9 @@
                                         </a>
                                         @endif
+                                        @if(auth()->user()->hasPermission('delete_data'))
                                         <a href="javascript:void(0)" class="text-danger ml-2" data-toggle="modal" data-target="#deleteModal_{{$department->id}}" title="Delete">
                                             <i class="ti-trash"></i>
                                         </a>
+                                            @endif
                                     </td>
                                     @else
Index: resources/views/dashboard/files/index.blade.php
===================================================================
--- resources/views/dashboard/files/index.blade.php	(revision 1451c6ffa2e43a06d5042dcf8f124894350d0cae)
+++ resources/views/dashboard/files/index.blade.php	(revision 190db9fe6bfbe6d2a9654709c4e868aac7e176a3)
@@ -109,7 +109,9 @@
                                             <i class="ti-download"></i>
                                         </a>
+                                        @if(auth()->user()->hasPermission('delete_data'))
                                         <a href="javascript:void(0)" class="text-danger ml-2" data-toggle="modal" data-target="#deleteModal_{{$file->id}}" title="Delete">
                                             <i class="ti-trash"></i>
                                         </a>
+                                            @endif
                                     </td>
                                     @else
Index: resources/views/dashboard/folders/files.blade.php
===================================================================
--- resources/views/dashboard/folders/files.blade.php	(revision 1451c6ffa2e43a06d5042dcf8f124894350d0cae)
+++ resources/views/dashboard/folders/files.blade.php	(revision 190db9fe6bfbe6d2a9654709c4e868aac7e176a3)
@@ -107,5 +107,5 @@
                                         </a>
                                             @endif
-                                            @if(auth()->user()->hasPermission('manage_all_files'))
+                                            @if(auth()->user()->hasPermission('delete_data'))
                                         <a href="javascript:void(0)" class="dropdown-item" data-toggle="modal" data-target="#deleteModal_{{$file->id}}">
                                             Delete
Index: resources/views/dashboard/folders/index.blade.php
===================================================================
--- resources/views/dashboard/folders/index.blade.php	(revision 1451c6ffa2e43a06d5042dcf8f124894350d0cae)
+++ resources/views/dashboard/folders/index.blade.php	(revision 190db9fe6bfbe6d2a9654709c4e868aac7e176a3)
@@ -152,5 +152,5 @@
                                             <a href="{{ route("dashboard.folders.downloadFolder", ['id' => $folder->id]) }}" class="dropdown-item">Download</a>
                                             @endif
-                                            @if(auth()->user()->hasPermission('manage_all_folders'))
+                                            @if(auth()->user()->hasPermission('delete_data'))
                                             <a href="javascript:void(0)" class="dropdown-item" data-toggle="modal" data-target="#deleteModal_{{$folder->id}}">Delete</a>
                                             @endif
Index: routes/web.php
===================================================================
--- routes/web.php	(revision 1451c6ffa2e43a06d5042dcf8f124894350d0cae)
+++ routes/web.php	(revision 190db9fe6bfbe6d2a9654709c4e868aac7e176a3)
@@ -88,5 +88,4 @@
         Route::get("/departments/{id}/edit", "Dashboard\DepartmentsController@editShow")->name("dashboard.departments.editShow");
         Route::patch("/departments/{id}/edit", "Dashboard\DepartmentsController@edit")->name("dashboard.departments.edit");
-        Route::delete("/departments/{id}/destroy", "Dashboard\DepartmentsController@destroy")->name("dashboard.departments.destroy");
      });
 
@@ -102,7 +101,5 @@
         Route::post("/folders/store", "Dashboard\FoldersController@store")->name("dashboard.folders.store");
         Route::get("/folders/{id}/edit", "Dashboard\FoldersController@editShow")->name("dashboard.folders.editShow");
-        Route::delete("/folders/{id}/destroy", "Dashboard\FoldersController@destroy")->name("dashboard.folders.destroy");
         Route::post("/folders/{id}/upload", "Dashboard\FoldersController@uploadFiles")->name("dashboard.folders.uploadFiles");
-
     });
 
@@ -114,7 +111,5 @@
     //Files manage
 Route::group(['middleware' => 'permission:manage_all_files'], function () {
-    Route::patch("files/{id}/rename-file", "Dashboard\FilesController@renameFile")->name("dashboard.files.renameFile");
     Route::post("/files/store", "Dashboard\FilesController@store")->name("dashboard.files.store");
-    Route::delete("files/{id}/delete-file", "Dashboard\FilesController@deleteFile")->name("dashboard.files.deleteFile");
     });
 
@@ -134,3 +129,10 @@
         Route::get('/departments/{id}/download-department', 'Dashboard\DepartmentsController@downloadDepartment')->name('dashboard.departments.downloadDepartment');
     });
+
+    //Delete data
+    Route::group(['middleware' => 'permission:delete_data'], function() {
+        Route::delete("files/{id}/delete-file", "Dashboard\FilesController@deleteFile")->name("dashboard.files.deleteFile");
+        Route::delete("/folders/{id}/destroy", "Dashboard\FoldersController@destroy")->name("dashboard.folders.destroy");
+        Route::delete("/departments/{id}/destroy", "Dashboard\DepartmentsController@destroy")->name("dashboard.departments.destroy");
+    });
 });