diff --git a/README.md b/README.md
index 03eb754..a2bca70 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # File Manager
 
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/6e342eff10f24db5b89be5fe203e424d)](https://www.codacy.com/app/laravel-enso/files?utm_source=github.com&utm_medium=referral&utm_content=laravel-enso/files&utm_campaign=Badge_Grade)
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/0ad3f6e21d9e42279dedd5432602891b)](https://www.codacy.com/gh/laravel-enso/files?utm_source=github.com&utm_medium=referral&utm_content=laravel-enso/files&utm_campaign=Badge_Grade)
 [![StyleCI](https://github.styleci.io/repos/85492361/shield?branch=master)](https://github.styleci.io/repos/85492361)
 [![License](https://poser.pugx.org/laravel-enso/datatable/license)](https://packagist.org/packages/laravel-enso/datatable)
 [![Total Downloads](https://poser.pugx.org/laravel-enso/files/downloads)](https://packagist.org/packages/laravel-enso/files)
diff --git a/composer.json b/composer.json
index 625006a..1bd57d1 100644
--- a/composer.json
+++ b/composer.json
@@ -10,21 +10,19 @@
     "homepage": "https://github.com/laravel-enso/files",
     "type": "library",
     "license": "MIT",
-    "authors": [
-        {
-            "name": "Adrian Ocneanu",
-            "email": "aocneanu@gmail.com",
-            "homepage": "https://laravel-enso.com",
-            "role": "Developer"
-        }
-    ],
+    "authors": [{
+        "name": "Adrian Ocneanu",
+        "email": "aocneanu@gmail.com",
+        "homepage": "https://laravel-enso.com",
+        "role": "Developer"
+    }],
     "require": {
         "php": ">=7.4.0",
-        "laravel-enso/core": "4.8.*",
-        "laravel-enso/helpers": "1.15.*",
-        "laravel-enso/image-transformer": "1.6.*",
-        "laravel-enso/migrator": "1.1.*",
-        "laravel-enso/track-who": "1.9.*"
+        "laravel-enso/core": "^5.0",
+        "laravel-enso/helpers": "^2.0",
+        "laravel-enso/image-transformer": "^2.0",
+        "laravel-enso/migrator": "^2.0",
+        "laravel-enso/track-who": "^2.0"
     },
     "autoload": {
         "psr-4": {
@@ -40,8 +38,8 @@
                 "LaravelEnso\\Files\\UploadServiceProvider"
             ],
             "aliases": {
-                "FileBrowser": "LaravelEnso\\Files\\App\\Facades\\FileBrowser"
+                "FileBrowser": "LaravelEnso\\Files\\Facades\\FileBrowser"
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/config/files.php b/config/files.php
similarity index 100%
rename from src/config/files.php
rename to config/files.php
diff --git a/src/database/migrations/2018_08_25_100000_create_files_table.php b/database/migrations/2018_08_25_100000_create_files_table.php
similarity index 100%
rename from src/database/migrations/2018_08_25_100000_create_files_table.php
rename to database/migrations/2018_08_25_100000_create_files_table.php
diff --git a/src/database/migrations/2018_08_25_101000_create_structure_for_files.php b/database/migrations/2018_08_25_101000_create_structure_for_files.php
similarity index 86%
rename from src/database/migrations/2018_08_25_101000_create_structure_for_files.php
rename to database/migrations/2018_08_25_101000_create_structure_for_files.php
index b32e014..3e38ea1 100644
--- a/src/database/migrations/2018_08_25_101000_create_structure_for_files.php
+++ b/database/migrations/2018_08_25_101000_create_structure_for_files.php
@@ -1,10 +1,10 @@
 <?php
 
-use LaravelEnso\Migrator\App\Database\Migration;
+use LaravelEnso\Migrator\Database\Migration;
 
 class CreateStructureForFiles extends Migration
 {
-    protected $permissions = [
+    protected array $permissions = [
         ['name' => 'core.files.index', 'description' => 'List files', 'is_default' => true],
         ['name' => 'core.files.link', 'description' => 'Get file download temporary link', 'is_default' => true],
         ['name' => 'core.files.show', 'description' => 'Open file in browser', 'is_default' => true],
@@ -12,7 +12,7 @@ class CreateStructureForFiles extends Migration
         ['name' => 'core.files.destroy', 'description' => 'Delete file', 'is_default' => true],
     ];
 
-    protected $menu = [
+    protected array $menu = [
         'name' => 'Files', 'icon' => 'folder-open', 'route' => 'core.files.index', 'order_index' => 255, 'has_children' => false,
     ];
 }
diff --git a/src/database/migrations/2018_08_25_102000_create_uploads_table.php b/database/migrations/2018_08_25_102000_create_uploads_table.php
similarity index 100%
rename from src/database/migrations/2018_08_25_102000_create_uploads_table.php
rename to database/migrations/2018_08_25_102000_create_uploads_table.php
diff --git a/src/database/migrations/2018_08_25_103000_create_structure_for_uploads.php b/database/migrations/2018_08_25_103000_create_structure_for_uploads.php
similarity index 76%
rename from src/database/migrations/2018_08_25_103000_create_structure_for_uploads.php
rename to database/migrations/2018_08_25_103000_create_structure_for_uploads.php
index 04610c2..d8e5ec2 100644
--- a/src/database/migrations/2018_08_25_103000_create_structure_for_uploads.php
+++ b/database/migrations/2018_08_25_103000_create_structure_for_uploads.php
@@ -1,10 +1,10 @@
 <?php
 
-use LaravelEnso\Migrator\App\Database\Migration;
+use LaravelEnso\Migrator\Database\Migration;
 
 class CreateStructureForUploads extends Migration
 {
-    protected $permissions = [
+    protected array $permissions = [
         ['name' => 'core.uploads.store', 'description' => 'Upload file', 'is_default' => true],
         ['name' => 'core.uploads.destroy', 'description' => 'Delete upload', 'is_default' => true],
     ];
diff --git a/src/routes/api.php b/routes/api.php
similarity index 70%
rename from src/routes/api.php
rename to routes/api.php
index ec8fd46..476d8dd 100644
--- a/src/routes/api.php
+++ b/routes/api.php
@@ -2,8 +2,8 @@
 
 use Illuminate\Support\Facades\Route;
 
-Route::middleware(['web', 'auth', 'core'])
-    ->namespace('LaravelEnso\Files\App\Http\Controllers')
+Route::middleware(['api', 'auth', 'core'])
+    ->namespace('LaravelEnso\Files\Http\Controllers')
     ->prefix('api/core')
     ->as('core.')
     ->group(function () {
@@ -12,7 +12,7 @@
     });
 
 Route::middleware(['signed', 'bindings'])
-    ->namespace('LaravelEnso\Files\App\Http\Controllers\File')
+    ->namespace('LaravelEnso\Files\Http\Controllers\File')
     ->prefix('api/core/files')
     ->as('core.files.')
     ->group(function () {
diff --git a/src/routes/app/files.php b/routes/app/files.php
similarity index 100%
rename from src/routes/app/files.php
rename to routes/app/files.php
diff --git a/src/routes/app/uploads.php b/routes/app/uploads.php
similarity index 100%
rename from src/routes/app/uploads.php
rename to routes/app/uploads.php
diff --git a/src/AppServiceProvider.php b/src/AppServiceProvider.php
index 0260f52..a346fc1 100644
--- a/src/AppServiceProvider.php
+++ b/src/AppServiceProvider.php
@@ -2,10 +2,12 @@
 
 namespace LaravelEnso\Files;
 
-use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Support\ServiceProvider;
-use LaravelEnso\Files\App\Models\Upload;
-use LaravelEnso\Files\App\Services\FileBrowser;
+use LaravelEnso\Core\Models\User;
+use LaravelEnso\DynamicMethods\Services\Methods;
+use LaravelEnso\Files\DynamicsRelations\Uploads;
+use LaravelEnso\Files\Models\Upload;
+use LaravelEnso\Files\Services\FileBrowser;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -22,20 +24,19 @@ public function boot()
 
     private function load()
     {
-        $this->loadRoutesFrom(__DIR__.'/routes/api.php');
+        $this->loadRoutesFrom(__DIR__.'/../routes/api.php');
 
-        $this->mergeConfigFrom(__DIR__.'/config/files.php', 'enso.files');
+        $this->mergeConfigFrom(__DIR__.'/../config/files.php', 'enso.files');
 
-        $this->loadMigrationsFrom(__DIR__.'/database/migrations');
+        $this->loadMigrationsFrom(__DIR__.'/../database/migrations');
 
         return $this;
     }
 
     private function mapMorphs()
     {
-        Relation::morphMap([
-            Upload::morphMapKey() => Upload::class,
-        ]);
+        Upload::morphMap();
+        Methods::bind(User::class, [Uploads::class]);
 
         return $this;
     }
@@ -43,7 +44,7 @@ private function mapMorphs()
     private function publish()
     {
         $this->publishes([
-            __DIR__.'/config' => config_path('enso'),
+            __DIR__.'/../config' => config_path('enso'),
         ], ['files-config', 'enso-config']);
 
         $this->publishes([
diff --git a/src/AuthServiceProvider.php b/src/AuthServiceProvider.php
index 5b43d27..86895aa 100644
--- a/src/AuthServiceProvider.php
+++ b/src/AuthServiceProvider.php
@@ -3,10 +3,10 @@
 namespace LaravelEnso\Files;
 
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
-use LaravelEnso\Files\App\Models\File;
-use LaravelEnso\Files\App\Models\Upload;
-use LaravelEnso\Files\App\Policies\File as FilePolicy;
-use LaravelEnso\Files\App\Policies\Upload as UploadPolicy;
+use LaravelEnso\Files\Models\File;
+use LaravelEnso\Files\Models\Upload;
+use LaravelEnso\Files\Policies\File as FilePolicy;
+use LaravelEnso\Files\Policies\Upload as UploadPolicy;
 
 class AuthServiceProvider extends ServiceProvider
 {
diff --git a/src/App/Contracts/Attachable.php b/src/Contracts/Attachable.php
similarity index 90%
rename from src/App/Contracts/Attachable.php
rename to src/Contracts/Attachable.php
index 606d5f1..e1879fe 100644
--- a/src/App/Contracts/Attachable.php
+++ b/src/Contracts/Attachable.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace LaravelEnso\Files\App\Contracts;
+namespace LaravelEnso\Files\Contracts;
 
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Http\File;
 use Illuminate\Http\UploadedFile;
-use LaravelEnso\Core\App\Models\User;
+use LaravelEnso\Core\Models\User;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 interface Attachable
diff --git a/src/App/Contracts/AuthorizesFileAccess.php b/src/Contracts/AuthorizesFileAccess.php
similarity index 71%
rename from src/App/Contracts/AuthorizesFileAccess.php
rename to src/Contracts/AuthorizesFileAccess.php
index f33cd16..621f8b1 100644
--- a/src/App/Contracts/AuthorizesFileAccess.php
+++ b/src/Contracts/AuthorizesFileAccess.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace LaravelEnso\Files\App\Contracts;
+namespace LaravelEnso\Files\Contracts;
 
-use LaravelEnso\Core\App\Models\User;
+use LaravelEnso\Core\Models\User;
 
 interface AuthorizesFileAccess
 {
diff --git a/src/DynamicRelations/Uploads.php b/src/DynamicRelations/Uploads.php
new file mode 100644
index 0000000..903c5fa
--- /dev/null
+++ b/src/DynamicRelations/Uploads.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace LaravelEnso\Files\DynamicsRelations;
+
+use Closure;
+use LaravelEnso\DynamicMethods\Contracts\Method;
+use LaravelEnso\Files\Models\Upload;
+
+class Uploads implements Method
+{
+    public function name(): string
+    {
+        return 'uploads';
+    }
+
+    public function closure(): Closure
+    {
+        return fn () => $this->hasMany(Upload::class, 'created_by');
+    }
+}
diff --git a/src/App/Exceptions/File.php b/src/Exceptions/File.php
similarity index 90%
rename from src/App/Exceptions/File.php
rename to src/Exceptions/File.php
index d3a7ebf..d77c535 100644
--- a/src/App/Exceptions/File.php
+++ b/src/Exceptions/File.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace LaravelEnso\Files\App\Exceptions;
+namespace LaravelEnso\Files\Exceptions;
 
-use LaravelEnso\Helpers\App\Exceptions\EnsoException;
+use LaravelEnso\Helpers\Exceptions\EnsoException;
 
 class File extends EnsoException
 {
diff --git a/src/App/Facades/FileBrowser.php b/src/Facades/FileBrowser.php
similarity index 81%
rename from src/App/Facades/FileBrowser.php
rename to src/Facades/FileBrowser.php
index deb4f05..9fd9b8a 100644
--- a/src/App/Facades/FileBrowser.php
+++ b/src/Facades/FileBrowser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace LaravelEnso\Files\App\Facades;
+namespace LaravelEnso\Files\Facades;
 
 use Illuminate\Support\Facades\Facade;
 
diff --git a/src/FileServiceProvider.php b/src/FileServiceProvider.php
index 5b9efde..81e866c 100644
--- a/src/FileServiceProvider.php
+++ b/src/FileServiceProvider.php
@@ -3,7 +3,7 @@
 namespace LaravelEnso\Files;
 
 use Illuminate\Support\ServiceProvider;
-use LaravelEnso\Files\App\Facades\FileBrowser;
+use LaravelEnso\Files\Facades\FileBrowser;
 
 class FileServiceProvider extends ServiceProvider
 {
diff --git a/src/App/Http/Controllers/File/Destroy.php b/src/Http/Controllers/File/Destroy.php
similarity index 76%
rename from src/App/Http/Controllers/File/Destroy.php
rename to src/Http/Controllers/File/Destroy.php
index 3b3b9e3..b78a0b7 100644
--- a/src/App/Http/Controllers/File/Destroy.php
+++ b/src/Http/Controllers/File/Destroy.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace LaravelEnso\Files\App\Http\Controllers\File;
+namespace LaravelEnso\Files\Http\Controllers\File;
 
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Routing\Controller;
-use LaravelEnso\Files\App\Models\File;
+use LaravelEnso\Files\Models\File;
 
 class Destroy extends Controller
 {
diff --git a/src/App/Http/Controllers/File/Download.php b/src/Http/Controllers/File/Download.php
similarity index 76%
rename from src/App/Http/Controllers/File/Download.php
rename to src/Http/Controllers/File/Download.php
index a27fec4..d4bb6dd 100644
--- a/src/App/Http/Controllers/File/Download.php
+++ b/src/Http/Controllers/File/Download.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace LaravelEnso\Files\App\Http\Controllers\File;
+namespace LaravelEnso\Files\Http\Controllers\File;
 
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Routing\Controller;
-use LaravelEnso\Files\App\Models\File;
+use LaravelEnso\Files\Models\File;
 
 class Download extends Controller
 {
diff --git a/src/App/Http/Controllers/File/Index.php b/src/Http/Controllers/File/Index.php
similarity index 59%
rename from src/App/Http/Controllers/File/Index.php
rename to src/Http/Controllers/File/Index.php
index a2286e1..175ce67 100644
--- a/src/App/Http/Controllers/File/Index.php
+++ b/src/Http/Controllers/File/Index.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace LaravelEnso\Files\App\Http\Controllers\File;
+namespace LaravelEnso\Files\Http\Controllers\File;
 
 use Illuminate\Routing\Controller;
-use LaravelEnso\Files\App\Http\Responses\Files;
+use LaravelEnso\Files\Http\Responses\Files;
 
 class Index extends Controller
 {
diff --git a/src/App/Http/Controllers/File/Link.php b/src/Http/Controllers/File/Link.php
similarity index 77%
rename from src/App/Http/Controllers/File/Link.php
rename to src/Http/Controllers/File/Link.php
index 51e6f00..e6f5037 100644
--- a/src/App/Http/Controllers/File/Link.php
+++ b/src/Http/Controllers/File/Link.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace LaravelEnso\Files\App\Http\Controllers\File;
+namespace LaravelEnso\Files\Http\Controllers\File;
 
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Routing\Controller;
-use LaravelEnso\Files\App\Models\File;
+use LaravelEnso\Files\Models\File;
 
 class Link extends Controller
 {
diff --git a/src/App/Http/Controllers/File/Share.php b/src/Http/Controllers/File/Share.php
similarity index 65%
rename from src/App/Http/Controllers/File/Share.php
rename to src/Http/Controllers/File/Share.php
index 5d6d8a9..b34b14d 100644
--- a/src/App/Http/Controllers/File/Share.php
+++ b/src/Http/Controllers/File/Share.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace LaravelEnso\Files\App\Http\Controllers\File;
+namespace LaravelEnso\Files\Http\Controllers\File;
 
 use Illuminate\Routing\Controller;
-use LaravelEnso\Files\App\Models\File;
+use LaravelEnso\Files\Models\File;
 
 class Share extends Controller
 {
diff --git a/src/App/Http/Controllers/File/Show.php b/src/Http/Controllers/File/Show.php
similarity index 76%
rename from src/App/Http/Controllers/File/Show.php
rename to src/Http/Controllers/File/Show.php
index fd8b36a..4a077fd 100644
--- a/src/App/Http/Controllers/File/Show.php
+++ b/src/Http/Controllers/File/Show.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace LaravelEnso\Files\App\Http\Controllers\File;
+namespace LaravelEnso\Files\Http\Controllers\File;
 
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Routing\Controller;
-use LaravelEnso\Files\App\Models\File;
+use LaravelEnso\Files\Models\File;
 
 class Show extends Controller
 {
diff --git a/src/App/Http/Controllers/Upload/Destroy.php b/src/Http/Controllers/Upload/Destroy.php
similarity index 75%
rename from src/App/Http/Controllers/Upload/Destroy.php
rename to src/Http/Controllers/Upload/Destroy.php
index ed61ccd..9014d95 100644
--- a/src/App/Http/Controllers/Upload/Destroy.php
+++ b/src/Http/Controllers/Upload/Destroy.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace LaravelEnso\Files\App\Http\Controllers\Upload;
+namespace LaravelEnso\Files\Http\Controllers\Upload;
 
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Routing\Controller;
-use LaravelEnso\Files\App\Models\Upload;
+use LaravelEnso\Files\Models\Upload;
 
 class Destroy extends Controller
 {
diff --git a/src/App/Http/Controllers/Upload/Store.php b/src/Http/Controllers/Upload/Store.php
similarity index 70%
rename from src/App/Http/Controllers/Upload/Store.php
rename to src/Http/Controllers/Upload/Store.php
index 5d5c048..a422fcb 100644
--- a/src/App/Http/Controllers/Upload/Store.php
+++ b/src/Http/Controllers/Upload/Store.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace LaravelEnso\Files\App\Http\Controllers\Upload;
+namespace LaravelEnso\Files\Http\Controllers\Upload;
 
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
-use LaravelEnso\Files\App\Models\Upload;
+use LaravelEnso\Files\Models\Upload;
 
 class Store extends Controller
 {
diff --git a/src/App/Http/Resources/Collection.php b/src/Http/Resources/Collection.php
similarity index 90%
rename from src/App/Http/Resources/Collection.php
rename to src/Http/Resources/Collection.php
index 0db0c66..ba2425d 100644
--- a/src/App/Http/Resources/Collection.php
+++ b/src/Http/Resources/Collection.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace LaravelEnso\Files\App\Http\Resources;
+namespace LaravelEnso\Files\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
-use LaravelEnso\Files\App\Facades\FileBrowser;
+use LaravelEnso\Files\Facades\FileBrowser;
 
 class Collection extends ResourceCollection
 {
diff --git a/src/App/Http/Resources/File.php b/src/Http/Resources/File.php
similarity index 88%
rename from src/App/Http/Resources/File.php
rename to src/Http/Resources/File.php
index 3f12378..f0acf44 100644
--- a/src/App/Http/Resources/File.php
+++ b/src/Http/Resources/File.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace LaravelEnso\Files\App\Http\Resources;
+namespace LaravelEnso\Files\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
-use LaravelEnso\Core\App\Http\Resources\User;
+use LaravelEnso\Core\Http\Resources\User;
 
 class File extends JsonResource
 {
diff --git a/src/App/Http/Responses/Files.php b/src/Http/Responses/Files.php
similarity index 77%
rename from src/App/Http/Responses/Files.php
rename to src/Http/Responses/Files.php
index 5a5cf94..417df57 100644
--- a/src/App/Http/Responses/Files.php
+++ b/src/Http/Responses/Files.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace LaravelEnso\Files\App\Http\Responses;
+namespace LaravelEnso\Files\Http\Responses;
 
 use Illuminate\Contracts\Support\Responsable;
-use LaravelEnso\Files\App\Http\Resources\Collection;
-use LaravelEnso\Files\App\Http\Resources\File as Resource;
-use LaravelEnso\Files\App\Models\File;
+use LaravelEnso\Files\Http\Resources\Collection;
+use LaravelEnso\Files\Http\Resources\File as Resource;
+use LaravelEnso\Files\Models\File;
 
 class Files implements Responsable
 {
diff --git a/src/App/Models/File.php b/src/Models/File.php
similarity index 86%
rename from src/App/Models/File.php
rename to src/Models/File.php
index 1fe5d35..5d99f95 100644
--- a/src/App/Models/File.php
+++ b/src/Models/File.php
@@ -1,19 +1,19 @@
 <?php
 
-namespace LaravelEnso\Files\App\Models;
+namespace LaravelEnso\Files\Models;
 
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Storage;
-use LaravelEnso\Files\App\Facades\FileBrowser;
-use LaravelEnso\Files\App\Traits\FilePolicies;
-use LaravelEnso\TrackWho\App\Traits\CreatedBy;
+use LaravelEnso\Files\Facades\FileBrowser;
+use LaravelEnso\Files\Traits\FilePolicies;
+use LaravelEnso\TrackWho\Traits\CreatedBy;
 
 class File extends Model
 {
     use CreatedBy, FilePolicies;
 
-    protected $fillable = ['original_name', 'saved_name', 'size', 'mime_type', 'created_by'];
+    protected $guarded = ['id'];
 
     public function attachable()
     {
diff --git a/src/App/Models/Upload.php b/src/Models/Upload.php
similarity index 51%
rename from src/App/Models/Upload.php
rename to src/Models/Upload.php
index 2e7f25f..59f8683 100644
--- a/src/App/Models/Upload.php
+++ b/src/Models/Upload.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace LaravelEnso\Files\App\Models;
+namespace LaravelEnso\Files\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use LaravelEnso\Files\App\Contracts\Attachable;
-use LaravelEnso\Files\App\Contracts\AuthorizesFileAccess;
-use LaravelEnso\Files\App\Services\UploadManager;
-use LaravelEnso\Files\App\Traits\FilePolicies;
-use LaravelEnso\Files\App\Traits\HasFile;
-use LaravelEnso\Helpers\App\Traits\CascadesMorphMap;
+use LaravelEnso\Files\Contracts\Attachable;
+use LaravelEnso\Files\Contracts\AuthorizesFileAccess;
+use LaravelEnso\Files\Services\UploadManager;
+use LaravelEnso\Files\Traits\FilePolicies;
+use LaravelEnso\Files\Traits\HasFile;
+use LaravelEnso\Helpers\Traits\CascadesMorphMap;
 
 class Upload extends Model implements Attachable, AuthorizesFileAccess
 {
diff --git a/src/App/Policies/File.php b/src/Policies/File.php
similarity index 84%
rename from src/App/Policies/File.php
rename to src/Policies/File.php
index 3887e13..238909f 100644
--- a/src/App/Policies/File.php
+++ b/src/Policies/File.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace LaravelEnso\Files\App\Policies;
+namespace LaravelEnso\Files\Policies;
 
 use Illuminate\Auth\Access\HandlesAuthorization;
-use LaravelEnso\Core\App\Models\User;
-use LaravelEnso\Files\App\Contracts\AuthorizesFileAccess;
-use LaravelEnso\Files\App\Models\File as Model;
+use LaravelEnso\Core\Models\User;
+use LaravelEnso\Files\Contracts\AuthorizesFileAccess;
+use LaravelEnso\Files\Models\File as Model;
 
 class File
 {
diff --git a/src/App/Policies/Upload.php b/src/Policies/Upload.php
similarity index 84%
rename from src/App/Policies/Upload.php
rename to src/Policies/Upload.php
index 1f91d4e..ab858a7 100644
--- a/src/App/Policies/Upload.php
+++ b/src/Policies/Upload.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace LaravelEnso\Files\App\Policies;
+namespace LaravelEnso\Files\Policies;
 
 use Illuminate\Auth\Access\HandlesAuthorization;
-use LaravelEnso\Core\App\Models\User;
-use LaravelEnso\Files\App\Models\Upload as Model;
+use LaravelEnso\Core\Models\User;
+use LaravelEnso\Files\Models\Upload as Model;
 
 class Upload
 {
diff --git a/src/App/Services/FileBrowser.php b/src/Services/FileBrowser.php
similarity index 94%
rename from src/App/Services/FileBrowser.php
rename to src/Services/FileBrowser.php
index 66fdaa3..5fea6a0 100644
--- a/src/App/Services/FileBrowser.php
+++ b/src/Services/FileBrowser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace LaravelEnso\Files\App\Services;
+namespace LaravelEnso\Files\Services;
 
 use Illuminate\Support\Collection;
 
@@ -33,7 +33,7 @@ public function folder($model): string
         return $this->models->search(fn ($source) => $source['model'] === $model);
     }
 
-    public function model($folder): string
+    public function model($folder): ?string
     {
         return $this->models->has($folder)
             ? $this->models->get($folder)['model']
diff --git a/src/App/Services/FileValidator.php b/src/Services/FileValidator.php
similarity index 93%
rename from src/App/Services/FileValidator.php
rename to src/Services/FileValidator.php
index 5cdbfb1..d66c053 100644
--- a/src/App/Services/FileValidator.php
+++ b/src/Services/FileValidator.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace LaravelEnso\Files\App\Services;
+namespace LaravelEnso\Files\Services;
 
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Collection;
-use LaravelEnso\Files\App\Exceptions\File as FileException;
+use LaravelEnso\Files\Exceptions\File as FileException;
 
 class FileValidator
 {
diff --git a/src/App/Services/Files.php b/src/Services/Files.php
similarity index 97%
rename from src/App/Services/Files.php
rename to src/Services/Files.php
index 7d34a0e..cb8a132 100644
--- a/src/App/Services/Files.php
+++ b/src/Services/Files.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace LaravelEnso\Files\App\Services;
+namespace LaravelEnso\Files\Services;
 
 use Illuminate\Http\File;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
-use LaravelEnso\Core\App\Models\User;
-use LaravelEnso\Files\App\Contracts\Attachable;
+use LaravelEnso\Core\Models\User;
+use LaravelEnso\Files\Contracts\Attachable;
 use Symfony\Component\HttpFoundation\File\File as BaseFile;
 
 class Files
diff --git a/src/App/Services/ImageProcessor.php b/src/Services/ImageProcessor.php
similarity index 91%
rename from src/App/Services/ImageProcessor.php
rename to src/Services/ImageProcessor.php
index 2cd0f78..da1877e 100644
--- a/src/App/Services/ImageProcessor.php
+++ b/src/Services/ImageProcessor.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace LaravelEnso\Files\App\Services;
+namespace LaravelEnso\Files\Services;
 
 use Illuminate\Support\Facades\Validator;
-use LaravelEnso\ImageTransformer\App\Services\ImageTransformer;
+use LaravelEnso\ImageTransformer\Services\ImageTransformer;
 use Symfony\Component\HttpFoundation\File\File;
 
 class ImageProcessor
diff --git a/src/App/Services/UploadManager.php b/src/Services/UploadManager.php
similarity index 86%
rename from src/App/Services/UploadManager.php
rename to src/Services/UploadManager.php
index c27f276..c1af33f 100644
--- a/src/App/Services/UploadManager.php
+++ b/src/Services/UploadManager.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace LaravelEnso\Files\App\Services;
+namespace LaravelEnso\Files\Services;
 
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
-use LaravelEnso\Files\App\Exceptions\File as FileException;
-use LaravelEnso\Files\App\Http\Resources\File as Resource;
-use LaravelEnso\Files\App\Models\File;
-use LaravelEnso\Files\App\Models\Upload;
+use LaravelEnso\Files\Exceptions\File as FileException;
+use LaravelEnso\Files\Http\Resources\File as Resource;
+use LaravelEnso\Files\Models\File;
+use LaravelEnso\Files\Models\Upload;
 
 class UploadManager
 {
diff --git a/src/App/Services/UploadedFileValidator.php b/src/Services/UploadedFileValidator.php
similarity index 81%
rename from src/App/Services/UploadedFileValidator.php
rename to src/Services/UploadedFileValidator.php
index 88fc8ed..4346113 100644
--- a/src/App/Services/UploadedFileValidator.php
+++ b/src/Services/UploadedFileValidator.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace LaravelEnso\Files\App\Services;
+namespace LaravelEnso\Files\Services;
 
-use LaravelEnso\Files\App\Exceptions\File;
+use LaravelEnso\Files\Exceptions\File;
 
 class UploadedFileValidator extends FileValidator
 {
diff --git a/src/App/Traits/FilePolicies.php b/src/Traits/FilePolicies.php
similarity index 81%
rename from src/App/Traits/FilePolicies.php
rename to src/Traits/FilePolicies.php
index 3f58824..174c3b7 100644
--- a/src/App/Traits/FilePolicies.php
+++ b/src/Traits/FilePolicies.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace LaravelEnso\Files\App\Traits;
+namespace LaravelEnso\Files\Traits;
 
-use LaravelEnso\Core\App\Models\User;
+use LaravelEnso\Core\Models\User;
 
 trait FilePolicies
 {
diff --git a/src/App/Traits/HasFile.php b/src/Traits/HasFile.php
similarity index 94%
rename from src/App/Traits/HasFile.php
rename to src/Traits/HasFile.php
index 3993f09..aa41c2f 100644
--- a/src/App/Traits/HasFile.php
+++ b/src/Traits/HasFile.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace LaravelEnso\Files\App\Traits;
+namespace LaravelEnso\Files\Traits;
 
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Http\File as IlluminateFile;
@@ -8,9 +8,9 @@
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Storage;
-use LaravelEnso\Core\App\Models\User;
-use LaravelEnso\Files\App\Models\File;
-use LaravelEnso\Files\App\Services\Files;
+use LaravelEnso\Core\Models\User;
+use LaravelEnso\Files\Models\File;
+use LaravelEnso\Files\Services\Files;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 trait HasFile
diff --git a/src/App/Traits/Uploads.php b/src/Traits/Uploads.php
similarity index 61%
rename from src/App/Traits/Uploads.php
rename to src/Traits/Uploads.php
index 58738f9..6bfb17a 100644
--- a/src/App/Traits/Uploads.php
+++ b/src/Traits/Uploads.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace LaravelEnso\Files\App\Traits;
+namespace LaravelEnso\Files\Traits;
 
-use LaravelEnso\Files\App\Models\Upload;
+use LaravelEnso\Files\Models\Upload;
 
 trait Uploads
 {
diff --git a/tests/features/FileManagerTest.php b/tests/features/FileManagerTest.php
index 64def5a..62bcf41 100644
--- a/tests/features/FileManagerTest.php
+++ b/tests/features/FileManagerTest.php
@@ -3,14 +3,14 @@
 use Illuminate\Support\Facades\Config;
 use Tests\TestCase;
 use Illuminate\Http\UploadedFile;
-use LaravelEnso\Core\App\Models\User;
+use LaravelEnso\Core\Models\User;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Storage;
-use LaravelEnso\Files\App\Services\Files;
-use LaravelEnso\Files\App\Traits\HasFile;
-use LaravelEnso\Files\App\Contracts\Attachable;
+use LaravelEnso\Files\Services\Files;
+use LaravelEnso\Files\Traits\HasFile;
+use LaravelEnso\Files\Contracts\Attachable;
 use Illuminate\Foundation\Testing\RefreshDatabase;
-use LaravelEnso\Files\App\Exceptions\File;
+use LaravelEnso\Files\Exceptions\File;
 
 class FileManagerTest extends TestCase
 {