diff --git a/app/Cycle.php b/app/Cycle.php
deleted file mode 100644
index fe7d7071..00000000
--- a/app/Cycle.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App;
-
-use Illuminate\Database\Eloquent\Model;
-
-class Cycle extends Model
-{
-    public $fillable = ['date', 'user_id', 'cycle_number', 'sterilizer_id', 'note', 'verified', 'unique_id'];
-    public function user()
-    {
-        return $this->belongsTo('App\User');
-    }
-    public function labels()
-    {
-        return $this->belongsToMany('App\Label', 'cycle_label')->withPivot('count');
-    }
-
-}
diff --git a/app/Http/Controllers/Api/Auth/RegisterController.php b/app/Http/Controllers/Api/Auth/RegisterController.php
index d653f8a6..c2f24899 100644
--- a/app/Http/Controllers/Api/Auth/RegisterController.php
+++ b/app/Http/Controllers/Api/Auth/RegisterController.php
@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Api\Auth;
 
 use App\Http\Controllers\Controller;
-use App\User;
+use App\Models\User;
 use Illuminate\Http\Request;
 use Packages\Messaging\src\Facades\MessageResponse;
 
diff --git a/app/Http/Controllers/BarCodeController.php b/app/Http/Controllers/BarCodeController.php
index 7128f46b..ef89aeff 100644
--- a/app/Http/Controllers/BarCodeController.php
+++ b/app/Http/Controllers/BarCodeController.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use App\Package;
-use App\TestResult;
+use App\Models\Package;
+use App\Models\TestResult;
 use Milon\Barcode\Facades\DNS1DFacade;
 use Milon\Barcode\Facades\DNS2DFacade;
 use Packages\Messaging\src\Facades\MessageResponse;
diff --git a/app/Http/Controllers/CycleController.php b/app/Http/Controllers/CycleController.php
index 54491200..b7807977 100644
--- a/app/Http/Controllers/CycleController.php
+++ b/app/Http/Controllers/CycleController.php
@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers;
 
+use App\Http\Requests\StoreCycleRequest;
 use App\Http\Resources\CycleResource;
 use App\Interfaces\CycleRepositoryInterface;
+use App\Models\Cycle;
 use Illuminate\Http\Request;
-use App\Http\Requests\StoreCycleRequest;
-use App\Cycle;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
 use Packages\Messaging\src\Facades\MessageResponse;
 
diff --git a/app/Http/Controllers/ExportController.php b/app/Http/Controllers/ExportController.php
index baa119c6..daa2ba3c 100644
--- a/app/Http/Controllers/ExportController.php
+++ b/app/Http/Controllers/ExportController.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use App\Item;
-use App\Package;
+use App\Models\Item;
+use App\Models\Package;
 use App\Services\ExportCollection;
 use Maatwebsite\Excel\Facades\Excel;
 
diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php
index d1de06af..6f33472e 100644
--- a/app/Http/Controllers/ItemController.php
+++ b/app/Http/Controllers/ItemController.php
@@ -6,9 +6,9 @@ use App\Constants\StatusTypeEnum;
 use App\Http\Requests\ChangeStatusRequest;
 use App\Http\Requests\StoreItemRequest;
 use App\Http\Resources\ItemResource;
-use App\Item;
+use App\Models\Item;
+use App\Models\User;
 use App\Services\Media\MediaHelper;
-use App\User;
 use Illuminate\Http\Request;
 use Packages\Messaging\src\Facades\MessageResponse;
 
diff --git a/app/Http/Controllers/LabelController.php b/app/Http/Controllers/LabelController.php
index 29c8733e..001488de 100644
--- a/app/Http/Controllers/LabelController.php
+++ b/app/Http/Controllers/LabelController.php
@@ -5,7 +5,7 @@ namespace App\Http\Controllers;
 use App\Http\Requests\StoreLabelRequest;
 use App\Http\Resources\LabelResource;
 use App\Interfaces\LabelRepositoryInterface;
-use App\Label;
+use App\Models\Label;
 use Illuminate\Http\Request;
 use Packages\Messaging\src\Facades\MessageResponse;
 
diff --git a/app/Http/Controllers/Media/StoreMedia.php b/app/Http/Controllers/Media/StoreMedia.php
index 2c108cf9..32cf6251 100644
--- a/app/Http/Controllers/Media/StoreMedia.php
+++ b/app/Http/Controllers/Media/StoreMedia.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Media;
 
-use App\FakeModel;
 use App\Http\Controllers\Controller;
+use App\Models\FakeModel;
 use App\Services\Responser;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/MedicalCenterController.php b/app/Http/Controllers/MedicalCenterController.php
index 07a3b64c..ef1c4bd9 100644
--- a/app/Http/Controllers/MedicalCenterController.php
+++ b/app/Http/Controllers/MedicalCenterController.php
@@ -2,12 +2,11 @@
 
 namespace App\Http\Controllers;
 
-use App\InputValue;
-use Illuminate\Http\Request;
-use App\MedicalCenter;
-use App\User;
-use App\City;
 use App\Http\Requests\StoreMedicalCenterRequest;
+use App\Models\City;
+use App\Models\InputValue;
+use App\Models\MedicalCenter;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Packages\Messaging\src\Facades\MessageResponse;
 
diff --git a/app/Http/Controllers/MessageController.php b/app/Http/Controllers/MessageController.php
index 88719d8a..063b3e13 100644
--- a/app/Http/Controllers/MessageController.php
+++ b/app/Http/Controllers/MessageController.php
@@ -3,8 +3,8 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\StoreMessageRequest;
-use App\Message;
-use App\User;
+use App\Models\Message;
+use App\Models\User;
 use Illuminate\Http\Request;
 use Packages\Messaging\src\Facades\MessageResponse;
 
diff --git a/app/Http/Controllers/PackageController.php b/app/Http/Controllers/PackageController.php
index 9eb17d2e..679c8f9c 100644
--- a/app/Http/Controllers/PackageController.php
+++ b/app/Http/Controllers/PackageController.php
@@ -7,8 +7,8 @@ use App\Http\Requests\ChangeStatusRequest;
 use App\Http\Requests\StorePackageRequest;
 use App\Http\Resources\PackageResource;
 use App\Interfaces\PackageRepositoryInterface;
-use App\Item;
-use App\Package;
+use App\Models\Item;
+use App\Models\Package;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
 use Packages\Messaging\src\Facades\MessageResponse;
diff --git a/app/Http/Controllers/TestResultController.php b/app/Http/Controllers/TestResultController.php
index 696a7978..f6ef6f5e 100644
--- a/app/Http/Controllers/TestResultController.php
+++ b/app/Http/Controllers/TestResultController.php
@@ -4,12 +4,12 @@ namespace App\Http\Controllers;
 
 use App\Http\Requests\StoreTestResultRequest;
 use App\Http\Resources\TestResultResource;
-use App\Input;
-use App\InputValue;
-use App\MedicalCenter;
+use App\Models\Input;
+use App\Models\InputValue;
+use App\Models\MedicalCenter;
+use App\Models\TestResult;
+use App\Models\TestType;
 use App\Services\Media\MediaHelper;
-use App\TestResult;
-use App\TestType;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
diff --git a/app/Http/Controllers/TestTypeController.php b/app/Http/Controllers/TestTypeController.php
index 8323af28..416e6593 100644
--- a/app/Http/Controllers/TestTypeController.php
+++ b/app/Http/Controllers/TestTypeController.php
@@ -3,10 +3,10 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\StoreTestTypeRequest;
-use App\Input;
-use App\Option;
-use App\TestResult;
-use App\TestType;
+use App\Models\Input;
+use App\Models\Option;
+use App\Models\TestResult;
+use App\Models\TestType;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Milon\Barcode\Facades\DNS1DFacade;
diff --git a/app/Http/Controllers/TransferItemController.php b/app/Http/Controllers/TransferItemController.php
index 427045ae..dcd3b7aa 100644
--- a/app/Http/Controllers/TransferItemController.php
+++ b/app/Http/Controllers/TransferItemController.php
@@ -6,8 +6,8 @@ use App\Constants\StatusTypeEnum;
 use App\Http\Requests\ChangeStatusRequest;
 use App\Http\Requests\StoreTransferRequest;
 use App\Http\Resources\TransferResource;
-use App\Item;
-use App\Transfer;
+use App\Models\Item;
+use App\Models\Transfer;
 use Carbon\Carbon;
 use Packages\Messaging\src\Facades\MessageResponse;
 
diff --git a/app/Http/Controllers/TransferPackageController.php b/app/Http/Controllers/TransferPackageController.php
index 5afa103a..a1ee724f 100644
--- a/app/Http/Controllers/TransferPackageController.php
+++ b/app/Http/Controllers/TransferPackageController.php
@@ -6,8 +6,8 @@ use App\Constants\StatusTypeEnum;
 use App\Http\Requests\ChangeStatusRequest;
 use App\Http\Requests\StoreTransferRequest;
 use App\Http\Resources\TransferResource;
-use App\Package;
-use App\Transfer;
+use App\Models\Package;
+use App\Models\Transfer;
 use Carbon\Carbon;
 use Packages\Messaging\src\Facades\MessageResponse;
 
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 31549e40..90c1ad8a 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -2,13 +2,13 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Requests\UpdateInfoUserRequest;
-use App\InputValue;
-use Illuminate\Http\Request;
 use App\Http\Requests\StoreUserRequest;
-use App\MedicalCenter;
-use App\User;
-use App\Message;
+use App\Http\Requests\UpdateInfoUserRequest;
+use App\Models\InputValue;
+use App\Models\MedicalCenter;
+use App\Models\Message;
+use App\Models\User;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Packages\Messaging\src\Facades\MessageResponse;
 
diff --git a/app/Http/Requests/StoreCycleRequest.php b/app/Http/Requests/StoreCycleRequest.php
index e5e83082..9275e0e0 100644
--- a/app/Http/Requests/StoreCycleRequest.php
+++ b/app/Http/Requests/StoreCycleRequest.php
@@ -2,10 +2,8 @@
 
 namespace App\Http\Requests;
 
-use App\Cycle;
-use Illuminate\Validation\Rule;
+use App\Models\Cycle;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Contracts\Validation\Validator;
 
 
 class StoreCycleRequest extends FormRequest
diff --git a/app/Http/Requests/StoreLabelRequest.php b/app/Http/Requests/StoreLabelRequest.php
index a5669e3a..7232be13 100644
--- a/app/Http/Requests/StoreLabelRequest.php
+++ b/app/Http/Requests/StoreLabelRequest.php
@@ -2,10 +2,8 @@
 
 namespace App\Http\Requests;
 
-use App\Label;
-use Illuminate\Validation\Rule;
+use App\Models\Label;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Contracts\Validation\Validator;
 
 
 class StoreLabelRequest extends FormRequest
diff --git a/app/Http/Requests/StoreMedicalCenterRequest.php b/app/Http/Requests/StoreMedicalCenterRequest.php
index 31bf7c88..90b74565 100644
--- a/app/Http/Requests/StoreMedicalCenterRequest.php
+++ b/app/Http/Requests/StoreMedicalCenterRequest.php
@@ -2,10 +2,8 @@
 
 namespace App\Http\Requests;
 
-use App\MedicalCenter;
-use Illuminate\Validation\Rule;
+use App\Models\MedicalCenter;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Contracts\Validation\Validator;
 
 
 class StoreMedicalCenterRequest extends FormRequest
diff --git a/app/Http/Requests/StoreMessageRequest.php b/app/Http/Requests/StoreMessageRequest.php
index ec3ada7d..1766a83f 100644
--- a/app/Http/Requests/StoreMessageRequest.php
+++ b/app/Http/Requests/StoreMessageRequest.php
@@ -2,10 +2,8 @@
 
 namespace App\Http\Requests;
 
-use App\Message;
-use Illuminate\Validation\Rule;
+use App\Models\Message;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Contracts\Validation\Validator;
 
 
 class StoreMessageRequest extends FormRequest
diff --git a/app/Http/Requests/StoreTestResultRequest.php b/app/Http/Requests/StoreTestResultRequest.php
index 488e59f9..538dde0e 100644
--- a/app/Http/Requests/StoreTestResultRequest.php
+++ b/app/Http/Requests/StoreTestResultRequest.php
@@ -2,10 +2,8 @@
 
 namespace App\Http\Requests;
 
-use App\TestResult;
-use Illuminate\Validation\Rule;
+use App\Models\TestResult;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Contracts\Validation\Validator;
 
 
 class StoreTestResultRequest extends FormRequest
diff --git a/app/Http/Requests/StoreTestTypeRequest.php b/app/Http/Requests/StoreTestTypeRequest.php
index ba4d4d7c..77412b2b 100644
--- a/app/Http/Requests/StoreTestTypeRequest.php
+++ b/app/Http/Requests/StoreTestTypeRequest.php
@@ -2,11 +2,10 @@
 
 namespace App\Http\Requests;
 
-use App\TestType;
-use Illuminate\Validation\Rule;
+use App\Models\TestType;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Contracts\Validation\Validator;
 use Illuminate\Http\Request;
+use Illuminate\Validation\Rule;
 
 class StoreTestTypeRequest extends FormRequest
 {
diff --git a/app/Http/Requests/StoreTransferRequest.php b/app/Http/Requests/StoreTransferRequest.php
index fbcfce84..7b3d2467 100644
--- a/app/Http/Requests/StoreTransferRequest.php
+++ b/app/Http/Requests/StoreTransferRequest.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\Requests;
 
-use App\Item;
 use Illuminate\Foundation\Http\FormRequest;
 
 class StoreTransferRequest extends FormRequest
diff --git a/app/Http/Requests/StoreUserRequest.php b/app/Http/Requests/StoreUserRequest.php
index b458077e..17dfd1a7 100644
--- a/app/Http/Requests/StoreUserRequest.php
+++ b/app/Http/Requests/StoreUserRequest.php
@@ -2,10 +2,8 @@
 
 namespace App\Http\Requests;
 
-use App\User;
-use Illuminate\Validation\Rule;
+use App\Models\User;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Contracts\Validation\Validator;
 
 
 class StoreUserRequest extends FormRequest
diff --git a/app/Input.php b/app/Input.php
deleted file mode 100644
index 15dd2941..00000000
--- a/app/Input.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace App;
-
-use Illuminate\Database\Eloquent\Model;
-
-class Input extends Model
-{
-    public $fillable = ['name','type','size','test_type_id','parent_id','require_scanner'];
-
-    public function test_type()
-    {
-        return $this->belongsTo('App\TestType');
-    }
-
-    public function parent()
-    {
-        return $this->belongsTo('App\Input', 'parent_id');
-    }
-
-    public function children()
-    {
-        return $this->hasMany('App\Input', 'parent_id');
-    }
-
-    public function options()
-    {
-        return $this->hasMany('App\Option');
-    }
-}
diff --git a/app/InputValue.php b/app/InputValue.php
deleted file mode 100644
index 50265bd5..00000000
--- a/app/InputValue.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace App;
-
-use Illuminate\Database\Eloquent\Model;
-
-class InputValue extends Model
-{
-    public $fillable = ['value','test_result_id','input_id','option_id'];
-    public function input()
-    {
-        return $this->belongsTo('App\Input');
-    }
-    public function test_result()
-    {
-        return $this->belongsTo('App\TestResult');
-    }
-    public function option()
-    {
-        return $this->belongsTo('App\Option');
-    }
-}
diff --git a/app/Item.php b/app/Item.php
deleted file mode 100644
index 0cef94fc..00000000
--- a/app/Item.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-namespace App;
-
-use App\Constants\StatusTypeEnum;
-use App\Services\Media\HasMediaTrait;
-use Illuminate\Database\Eloquent\Model;
-use Spatie\Image\Exceptions\InvalidManipulation;
-use Spatie\MediaLibrary\HasMedia;
-use Spatie\MediaLibrary\MediaCollections\Models\Media;
-
-class Item extends Model implements HasMedia
-{
-    use HasMediaTrait;
-
-    public $fillable = ['name', 'size', 'unique_id', 'specific', 'note', 'user_id', 'udi', 'status', 'repair', 'package_id', 'creator_id'];
-
-    public function scopeIsNotRepaired($query)
-    {
-        return $query->where('repair', 0);
-    }
-
-    public function package()
-    {
-        return $this->belongsTo('App\Package');
-    }
-
-    public function user()
-    {
-        return $this->belongsTo('App\User');
-    }
-
-    public function creator()
-    {
-        return $this->belongsTo('App\User', "creator_id");
-    }
-
-    public function transfersAll()
-    {
-        return $this->morphMany('App\Transfer', "transferable")->orderBy("id", "desc");
-    }
-
-    public function transfers()
-    {
-        return $this->morphMany('App\Transfer', "transferable")->where("status", StatusTypeEnum::APPROVED)->orderBy("id", "desc");
-    }
-
-    public function latestTransfer()
-    {
-        return $this->morphOne('App\Transfer', "transferable")->where("status", StatusTypeEnum::APPROVED)->orderBy("id", "desc")->latest();
-    }
-
-    public function transferActive()
-    {
-        return $this->morphMany('App\Transfer', "transferable")->where("status", StatusTypeEnum::APPROVED)->whereNull("to_date")->orderBy("id", "desc");
-    }
-
-    public function registerMediaCollections(): void
-    {
-        $this->addMediaCollection('files')
-            ->useFallbackUrl('/files/default_pastry.jpg')
-            ->useFallbackPath(public_path('/files/default_pastry.jpg'));
-    }
-
-    /**
-     * @throws InvalidManipulation
-     */
-    public function registerMediaConversions(Media $media = null): void
-    {
-        $this->addMediaConversion('thumbnail')
-            ->width(480)
-            ->height(640)
-            ->nonQueued()
-            ->performOnCollections('files');
-    }
-
-    protected static function getValidCollections(): array
-    {
-        return [
-            'files'
-        ];
-    }
-}
diff --git a/app/Label.php b/app/Label.php
deleted file mode 100644
index d5679de1..00000000
--- a/app/Label.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace App;
-
-use Illuminate\Database\Eloquent\Model;
-
-class Label extends Model
-{
-    public $fillable = [ 'sterile_date' , 'expire_date' , 'sterilizer_id' , 'cycle_number' , 'lot_number' , 'user_id' , 'package_id' ];
-
-    public function user()
-    {
-        return $this->belongsTo( 'App\User' );
-    }
-
-    public function package()
-    {
-        return $this->belongsTo( 'App\Package' );
-    }
-
-    public function cycles()
-    {
-        return $this->belongsToMany( 'App\Cycle' , 'cycle_label' )->withPivot( 'count' );
-    }
-
-}
diff --git a/app/MedicalCenter.php b/app/MedicalCenter.php
deleted file mode 100644
index cce31edf..00000000
--- a/app/MedicalCenter.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App;
-
-use Illuminate\Database\Eloquent\Model;
-
-class MedicalCenter extends Model
-{
-    public $fillable = ['name', 'city_id', 'address', 'phone_number'];
-
-    public function users()
-    {
-        return $this->hasMany('App\User');
-    }
-
-    public function city()
-    {
-        return $this->belongsTo('App\City');
-    }
-}
diff --git a/app/Message.php b/app/Message.php
deleted file mode 100644
index 21bb37a8..00000000
--- a/app/Message.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\SoftDeletes;
-
-class Message extends Model
-{
-    use SoftDeletes;
-    public $fillable = ['title', 'text', 'status', 'recipient_user_id', 'sender_user_id'];
-    public function sender_user()
-    {
-      return $this->belongsTo('App\User', 'sender_user_id');
-    }
-    public function recipient_user()
-    {
-      return $this->belongsTo('App\User', 'recipient_user_id');
-    }
-}
diff --git a/app/City.php b/app/Models/City.php
similarity index 85%
rename from app/City.php
rename to app/Models/City.php
index cd0212eb..295c47a1 100644
--- a/app/City.php
+++ b/app/Models/City.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Kalnoy\Nestedset\NodeTrait;
diff --git a/app/Models/Cycle.php b/app/Models/Cycle.php
new file mode 100644
index 00000000..183513fb
--- /dev/null
+++ b/app/Models/Cycle.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+
+class Cycle extends Model
+{
+    public $fillable = [
+        'date', 'user_id', 'cycle_number', 'sterilizer_id', 'note', 'verified', 'unique_id'
+    ];
+
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    public function labels(): BelongsToMany
+    {
+        return $this->belongsToMany(Label::class, 'cycle_label')
+            ->withPivot('count');
+    }
+
+}
diff --git a/app/FakeModel.php b/app/Models/FakeModel.php
similarity index 92%
rename from app/FakeModel.php
rename to app/Models/FakeModel.php
index b5eacb35..33a40dfe 100644
--- a/app/FakeModel.php
+++ b/app/Models/FakeModel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use App\Services\Media\HasMediaTrait;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Gallery.php b/app/Models/Gallery.php
similarity index 51%
rename from app/Gallery.php
rename to app/Models/Gallery.php
index 7024fa12..3c457715 100644
--- a/app/Gallery.php
+++ b/app/Models/Gallery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -10,12 +10,4 @@ class Gallery extends Model
     protected $fillable = ['user_id', 'path'];
     public $timestamps = false;
 
-
-    // public function business_item()
-    // {
-    //     return $this->morphedByMany('App\BusinessItem', 'uploadable');
-    // }
-
-
-
 }
diff --git a/app/Models/Input.php b/app/Models/Input.php
new file mode 100644
index 00000000..94301e99
--- /dev/null
+++ b/app/Models/Input.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+class Input extends Model
+{
+    public $fillable = [
+        'name', 'type', 'size', 'test_type_id', 'parent_id', 'require_scanner'
+    ];
+
+    public function test_type(): BelongsTo
+    {
+        return $this->belongsTo(TestType::class);
+    }
+
+    public function parent(): BelongsTo
+    {
+        return $this->belongsTo(Input::class, 'parent_id');
+    }
+
+    public function children(): HasMany
+    {
+        return $this->hasMany(Input::class, 'parent_id');
+    }
+
+    public function options(): HasMany
+    {
+        return $this->hasMany(Option::class);
+    }
+}
diff --git a/app/Models/InputValue.php b/app/Models/InputValue.php
new file mode 100644
index 00000000..94555a15
--- /dev/null
+++ b/app/Models/InputValue.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class InputValue extends Model
+{
+    public $fillable = [
+        'value', 'test_result_id', 'input_id', 'option_id'
+    ];
+
+    public function input(): BelongsTo
+    {
+        return $this->belongsTo(Input::class);
+    }
+
+    public function test_result(): BelongsTo
+    {
+        return $this->belongsTo(TestResult::class);
+    }
+
+    public function option(): BelongsTo
+    {
+        return $this->belongsTo(Option::class);
+    }
+}
diff --git a/app/Models/Item.php b/app/Models/Item.php
new file mode 100644
index 00000000..16089006
--- /dev/null
+++ b/app/Models/Item.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace App\Models;
+
+use App\Constants\StatusTypeEnum;
+use App\Services\Media\HasMediaTrait;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Illuminate\Database\Eloquent\Relations\MorphOne;
+use Spatie\Image\Exceptions\InvalidManipulation;
+use Spatie\MediaLibrary\HasMedia;
+use Spatie\MediaLibrary\MediaCollections\Models\Media;
+
+class Item extends Model implements HasMedia
+{
+    use HasMediaTrait;
+
+    public $fillable = [
+        'name', 'size', 'unique_id', 'specific', 'note', 'user_id', 'udi', 'status', 'repair',
+        'package_id', 'creator_id'
+    ];
+
+    public function scopeIsNotRepaired($query)
+    {
+        return $query->where('repair', 0);
+    }
+
+    public function package(): BelongsTo
+    {
+        return $this->belongsTo(Package::class);
+    }
+
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    public function creator(): BelongsTo
+    {
+        return $this->belongsTo(User::class, "creator_id");
+    }
+
+    public function transfersAll(): MorphMany
+    {
+        return $this->morphMany(Transfer::class, "transferable")->orderBy("id", "desc");
+    }
+
+    public function transfers(): MorphMany
+    {
+        return $this->morphMany(Transfer::class, "transferable")
+            ->where("status", StatusTypeEnum::APPROVED)
+            ->orderBy("id", "desc");
+    }
+
+    public function latestTransfer(): MorphOne
+    {
+        return $this->morphOne(Transfer::class, "transferable")
+            ->where("status", StatusTypeEnum::APPROVED)
+            ->orderBy("id", "desc")->latest();
+    }
+
+    public function transferActive(): MorphMany
+    {
+        return $this->morphMany(Transfer::class, "transferable")
+            ->where("status", StatusTypeEnum::APPROVED)
+            ->whereNull("to_date")
+            ->orderBy("id", "desc");
+    }
+
+    public function registerMediaCollections(): void
+    {
+        $this->addMediaCollection('files')
+            ->useFallbackUrl('/files/default_pastry.jpg')
+            ->useFallbackPath(public_path('/files/default_pastry.jpg'));
+    }
+
+    /**
+     * @throws InvalidManipulation
+     */
+    public function registerMediaConversions(Media $media = null): void
+    {
+        $this->addMediaConversion('thumbnail')
+            ->width(480)
+            ->height(640)
+            ->nonQueued()
+            ->performOnCollections('files');
+    }
+
+    protected static function getValidCollections(): array
+    {
+        return [
+            'files'
+        ];
+    }
+}
diff --git a/app/Models/Label.php b/app/Models/Label.php
new file mode 100644
index 00000000..4816af28
--- /dev/null
+++ b/app/Models/Label.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+
+class Label extends Model
+{
+    public $fillable = [
+        'sterile_date', 'expire_date', 'sterilizer_id', 'cycle_number', 'lot_number', 'user_id',
+        'package_id'
+    ];
+
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    public function package(): BelongsTo
+    {
+        return $this->belongsTo(Package::class);
+    }
+
+    public function cycles(): BelongsToMany
+    {
+        return $this->belongsToMany(Cycle::class, 'cycle_label')
+            ->withPivot('count');
+    }
+}
diff --git a/app/Models/MedicalCenter.php b/app/Models/MedicalCenter.php
new file mode 100644
index 00000000..0d5e8a0f
--- /dev/null
+++ b/app/Models/MedicalCenter.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+class MedicalCenter extends Model
+{
+    public $fillable = ['name', 'city_id', 'address', 'phone_number'];
+
+    public function users(): HasMany
+    {
+        return $this->hasMany(User::class);
+    }
+
+    public function city(): BelongsTo
+    {
+        return $this->belongsTo(City::class);
+    }
+}
diff --git a/app/Models/Message.php b/app/Models/Message.php
new file mode 100644
index 00000000..cdb23b82
--- /dev/null
+++ b/app/Models/Message.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class Message extends Model
+{
+    use SoftDeletes;
+
+    public $fillable = ['title', 'text', 'status', 'recipient_user_id', 'sender_user_id'];
+
+    public function sender_user(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'sender_user_id');
+    }
+
+    public function recipient_user(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'recipient_user_id');
+    }
+}
diff --git a/app/Models/Option.php b/app/Models/Option.php
new file mode 100644
index 00000000..4b9f5500
--- /dev/null
+++ b/app/Models/Option.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasOne;
+
+class Option extends Model
+{
+    public $fillable = ['title', 'input_id'];
+
+    public function input(): BelongsTo
+    {
+        return $this->belongsTo(Input::class);
+    }
+
+    public function input_value(): HasOne
+    {
+        return $this->hasOne(InputValue::class);
+    }
+}
diff --git a/app/Models/Package.php b/app/Models/Package.php
new file mode 100644
index 00000000..b7b0a54e
--- /dev/null
+++ b/app/Models/Package.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Models;
+
+use App\Constants\StatusTypeEnum;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Illuminate\Database\Eloquent\Relations\MorphOne;
+
+class Package extends Model
+{
+    public $fillable = ['name', 'user_id', 'note', 'status', 'creator_id'];
+
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    public function creator(): BelongsTo
+    {
+        return $this->belongsTo(User::class, "creator_id");
+    }
+
+    public function items(): HasMany
+    {
+        return $this->hasMany(Item::class);
+    }
+
+    public function labels(): HasMany
+    {
+        return $this->hasMany(Label::class);
+    }
+
+    public function transfersAll(): MorphMany
+    {
+        return $this->morphMany(Transfer::class, "transferable")
+            ->orderBy("id", "desc");
+    }
+
+    public function transfers(): MorphMany
+    {
+        return $this->morphMany(Transfer::class, "transferable")
+            ->where("status", StatusTypeEnum::APPROVED)
+            ->orderBy("id", "desc");
+    }
+
+    public function latestTransfer(): MorphOne
+    {
+        return $this->morphOne(Transfer::class, "transferable")
+            ->where("status", StatusTypeEnum::APPROVED)
+            ->orderBy("id", "desc")
+            ->latest();
+    }
+
+    public function transferActive(): MorphMany
+    {
+        return $this->morphMany(Transfer::class, "transferable")
+            ->where("status", StatusTypeEnum::APPROVED)
+            ->whereNull("to_date")
+            ->orderBy("id", "desc");
+    }
+}
diff --git a/app/TestResult.php b/app/Models/TestResult.php
similarity index 71%
rename from app/TestResult.php
rename to app/Models/TestResult.php
index 882afceb..71eb0737 100644
--- a/app/TestResult.php
+++ b/app/Models/TestResult.php
@@ -1,9 +1,11 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use App\Services\Media\HasMediaTrait;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Spatie\Image\Exceptions\InvalidManipulation;
 use Spatie\MediaLibrary\HasMedia;
 use Spatie\MediaLibrary\MediaCollections\Models\Media;
@@ -14,19 +16,19 @@ class TestResult extends Model implements HasMedia
 
     public $fillable = ['result', 'verified', 'test_type_id', 'user_id', 'device_id', 'cycle_number', 'date'];
 
-    public function test_type()
+    public function test_type(): BelongsTo
     {
-        return $this->belongsTo('App\TestType');
+        return $this->belongsTo(TestType::class);
     }
 
-    public function user()
+    public function user(): BelongsTo
     {
-        return $this->belongsTo('App\User');
+        return $this->belongsTo(User::class);
     }
 
-    public function input_values()
+    public function input_values(): HasMany
     {
-        return $this->hasMany('App\InputValue');
+        return $this->hasMany(InputValue::class);
     }
 
     public function registerMediaCollections(): void
diff --git a/app/Models/TestType.php b/app/Models/TestType.php
new file mode 100644
index 00000000..f9566d7c
--- /dev/null
+++ b/app/Models/TestType.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class TestType extends Model
+{
+    use SoftDeletes;
+
+    public $fillable = ['name', 'unique_code', 'user_id', 'bar_code', 'device_label'];
+
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    public function test_results(): HasMany
+    {
+        return $this->hasMany(TestResult::class);
+    }
+
+    public function inputs(): HasMany
+    {
+        return $this->hasMany(Input::class);
+    }
+}
diff --git a/app/Models/Transfer.php b/app/Models/Transfer.php
new file mode 100644
index 00000000..1fa90a96
--- /dev/null
+++ b/app/Models/Transfer.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class Transfer extends Model
+{
+    use SoftDeletes;
+
+    public $fillable = ['user_id', 'to_date', 'from_date', 'status', 'user_transfer_id'];
+
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    public function userTransfer(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'user_transfer_id');
+    }
+
+    public function transferable(): MorphTo
+    {
+        return $this->morphTo();
+    }
+}
diff --git a/app/Models/Uploadable.php b/app/Models/Uploadable.php
new file mode 100644
index 00000000..8b12854c
--- /dev/null
+++ b/app/Models/Uploadable.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class Uploadable extends Model
+{
+
+    protected $fillable = [
+        'uploadable_id', 'uploadable_type', 'gallery_id', 'image_role', 'batch_id'
+    ];
+    public $timestamps = false;
+
+    public function gallery(): BelongsTo
+    {
+        return $this->belongsTo(Gallery::class);
+    }
+
+}
diff --git a/app/Models/User.php b/app/Models/User.php
new file mode 100644
index 00000000..172c52c0
--- /dev/null
+++ b/app/Models/User.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Foundation\Auth\User as Authenticatable;
+use Illuminate\Notifications\Notifiable;
+use Laravel\Passport\HasApiTokens;
+use Spatie\Permission\Traits\HasRoles;
+
+class User extends Authenticatable
+{
+    use Notifiable, HasApiTokens, HasRoles;
+
+    protected $fillable = [
+        'name', 'email', 'cell_number', 'password', 'status', 'medical_center_id', 'address',
+        'gender'
+    ];
+
+    protected $hidden = [
+        'password', 'remember_token',
+    ];
+
+    protected $casts = [
+        'email_verified_at' => 'datetime',
+    ];
+
+    public function medical_center(): BelongsTo
+    {
+        return $this->belongsTo(MedicalCenter::class);
+    }
+
+    public function test_results(): HasMany
+    {
+        return $this->hasMany(TestResult::class);
+    }
+
+    public function test_types(): HasMany
+    {
+        return $this->hasMany(TestType::class);
+    }
+
+    public function findForPassport($username)
+    {
+        return $this->where('cell_number', $username)->where('status', 'Active')->first();
+    }
+
+    public function messagesSent(): HasMany
+    {
+        return $this->hasMany(Message::class, 'sender_user_id');
+    }
+
+    public function messagesReceived(): HasMany
+    {
+        return $this->hasMany(Message::class, 'recipient_user_id');
+    }
+
+    public function packages(): HasMany
+    {
+        return $this->hasMany(Package::class);
+    }
+
+    public function items(): HasMany
+    {
+        return $this->hasMany(Item::class);
+    }
+
+    public function labels(): HasMany
+    {
+        return $this->hasMany(Label::class);
+    }
+
+    public function cycles(): HasMany
+    {
+        return $this->hasMany(Cycle::class);
+    }
+}
diff --git a/app/Option.php b/app/Option.php
deleted file mode 100644
index 1f387c86..00000000
--- a/app/Option.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App;
-
-use Illuminate\Database\Eloquent\Model;
-
-class Option extends Model
-{
-    public $fillable = ['title','input_id'];
-    public function input()
-    {
-        return $this->belongsTo('App\Input');
-    }
-    public function input_value()
-    {
-        return $this->hasOne('App\InputValue');
-    }
-
-}
diff --git a/app/Package.php b/app/Package.php
deleted file mode 100644
index 2ff2af95..00000000
--- a/app/Package.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace App;
-
-use App\Constants\StatusTypeEnum;
-use Illuminate\Database\Eloquent\Model;
-
-class Package extends Model
-{
-    public $fillable = ['name', 'user_id', 'note', 'status', 'creator_id'];
-
-    public function user()
-    {
-        return $this->belongsTo('App\User');
-    }
-
-    public function creator()
-    {
-        return $this->belongsTo('App\User', "creator_id");
-    }
-
-    public function items()
-    {
-        return $this->hasMany('App\Item');
-    }
-
-    public function labels()
-    {
-        return $this->hasMany('App\Label');
-    }
-
-    public function transfersAll()
-    {
-        return $this->morphMany('App\Transfer', "transferable")->orderBy("id", "desc");
-    }
-
-    public function transfers()
-    {
-        return $this->morphMany('App\Transfer', "transferable")->where("status", StatusTypeEnum::APPROVED)->orderBy("id", "desc");
-    }
-
-    public function latestTransfer()
-    {
-        return $this->morphOne('App\Transfer', "transferable")->where("status", StatusTypeEnum::APPROVED)->orderBy("id", "desc")->latest();
-    }
-
-    public function transferActive()
-    {
-        return $this->morphMany('App\Transfer', "transferable")->where("status", StatusTypeEnum::APPROVED)->whereNull("to_date")->orderBy("id", "desc");
-    }
-}
diff --git a/app/Policies/CyclePolicy.php b/app/Policies/CyclePolicy.php
index 0fed515e..964ef397 100644
--- a/app/Policies/CyclePolicy.php
+++ b/app/Policies/CyclePolicy.php
@@ -2,37 +2,39 @@
 
 namespace App\Policies;
 
-use App\User;
-use App\Cycle;
+use App\Models\Cycle;
+use App\Models\User;
 use Doctrine\Tests\Common\Inflector\InflectorTest;
 
 class CyclePolicy
 {
-    public function showAll(User $User)
+    public function showAll(User $user)
     {
-        if($User->hasRole('Admin'))
-            return true;
-    }
-    public function delete(User $User, Cycle $Cycle)
-    {
-        if($User->hasRole('Admin') || ($User->hasRole('Supervisor') && $Cycle->user->medical_center_id == $User->medical_center_id) || $Cycle->user_id == $User->id)
+        if ($user->hasRole('Admin'))
             return true;
     }
 
-    public function update(User $User, Cycle $Cycle)
+    public function delete(User $user, Cycle $Cycle)
     {
-        if($User->hasRole('Admin') || ($User->hasRole('Supervisor') && $Cycle->user->medical_center_id == $User->medical_center_id) || $Cycle->user_id == $User->id)
+        if ($user->hasRole('Admin') || ($user->hasRole('Supervisor') && $Cycle->user->medical_center_id == $user->medical_center_id) || $Cycle->user_id == $user->id)
             return true;
     }
 
-    public function store(User $User)
+    public function update(User $user, Cycle $Cycle)
+    {
+        if ($user->hasRole('Admin') || ($user->hasRole('Supervisor') && $Cycle->user->medical_center_id == $user->medical_center_id) || $Cycle->user_id == $user->id)
+            return true;
+    }
+
+    public function store(User $user)
     {
         return true;
     }
-    public function verifyCycle(User $User, Cycle $Cycle)
+
+    public function verifyCycle(User $user, Cycle $Cycle)
     {
-        // if($User->hasRole('Admin'))
-            return true;
+        // if($user->hasRole('Admin'))
+        return true;
     }
 
 }
diff --git a/app/Policies/ItemPolicy.php b/app/Policies/ItemPolicy.php
index 2f7a191f..d0f1eabb 100644
--- a/app/Policies/ItemPolicy.php
+++ b/app/Policies/ItemPolicy.php
@@ -2,47 +2,47 @@
 
 namespace App\Policies;
 
-use App\User;
-use App\Item;
+use App\Models\Item;
+use App\Models\User;
 
 class ItemPolicy
 {
-    public function showAll( User $User )
+    public function showAll(User $user)
     {
-        if ( $User->hasRole( 'Admin' ) )
+        if ($user->hasRole('Admin'))
             return true;
     }
 
-    public function delete( User $User , Item $Item )
+    public function delete(User $user, Item $Item)
     {
-        if ( $User->hasRole( 'Admin' ) ) {
+        if ($user->hasRole('Admin')) {
             return true;
-        } elseif ( $User->hasRole( 'Supervisor' ) ) {
-            if ($Item->status == 0){
+        } elseif ($user->hasRole('Supervisor')) {
+            if ($Item->status == 0) {
                 return true;
             }
         }
     }
 
-    public function update( User $User , Item $Item )
+    public function update(User $user, Item $Item)
     {
         if (
-            $User->hasRole( 'Admin' ) ||
-            ( $User->hasRole( 'Supervisor' ) && $Item->user->medical_center_id == $User->medical_center_id ) ||
-            $Item->user_id == $User->id
+            $user->hasRole('Admin') ||
+            ($user->hasRole('Supervisor') && $Item->user->medical_center_id == $user->medical_center_id) ||
+            $Item->user_id == $user->id
         )
             return true;
     }
 
-    public function changeStatus( User $User )
+    public function changeStatus(User $user)
     {
-        if ( $User->hasRole( 'Admin|Supervisor' ) )
+        if ($user->hasRole('Admin|Supervisor'))
             return true;
     }
 
-    public function changeRepair( User $User )
+    public function changeRepair(User $user)
     {
-        if ( $User->hasRole( 'Admin|Supervisor' ) )
+        if ($user->hasRole('Admin|Supervisor'))
             return true;
     }
 }
diff --git a/app/Policies/LabelPolicy.php b/app/Policies/LabelPolicy.php
index 7dcb47ba..cb70fd86 100644
--- a/app/Policies/LabelPolicy.php
+++ b/app/Policies/LabelPolicy.php
@@ -2,30 +2,36 @@
 
 namespace App\Policies;
 
-use App\User;
-use App\Label;
+use App\Models\Label;
+use App\Models\User;
 use Doctrine\Tests\Common\Inflector\InflectorTest;
 
 class LabelPolicy
 {
-    public function showAll(User $User)
+    public function showAll(User $user)
     {
-        if($User->hasRole('Admin'))
-            return true;
-    }
-    public function delete(User $User, Label $Label)
-    {
-        if($User->hasRole('Admin') || ($User->hasRole('Supervisor') && $Label->user->medical_center_id == $User->medical_center_id) || $Label->user_id == $User->id)
+        if ($user->hasRole('Admin'))
             return true;
     }
 
-    public function update(User $User, Label $Label)
+    public function delete(User $user, Label $Label)
     {
-        if($User->hasRole('Admin') || ($User->hasRole('Supervisor') && $Label->user->medical_center_id == $User->medical_center_id) || $Label->user_id == $User->id)
+        if ($user->hasRole('Admin') || ($user->hasRole('Supervisor') && $Label->user->medical_center_id == $user->medical_center_id) || $Label->user_id == $user->id)
             return true;
     }
 
-    public function store(User $User)
+    public function update(User $user, Label $Label)
+    {
+        if (
+            $user->hasRole('Admin')
+            || ($user->hasRole('Supervisor')
+                && $Label->user->medical_center_id == $user->medical_center_id)
+            || $Label->user_id == $user->id) {
+            return true;
+        }
+    }
+
+    public function store(User $user)
     {
         return true;
     }
diff --git a/app/Policies/MedicalCenterPolicy.php b/app/Policies/MedicalCenterPolicy.php
index 1cce54de..a4ef757d 100644
--- a/app/Policies/MedicalCenterPolicy.php
+++ b/app/Policies/MedicalCenterPolicy.php
@@ -2,38 +2,38 @@
 
 namespace App\Policies;
 
-use App\User;
-use App\MedicalCenter;
+use App\Models\MedicalCenter;
+use App\Models\User;
 
 class MedicalCenterPolicy
 {
-    public function list(User $User)
+    public function list(User $user)
     {
-        if($User->hasRole('Admin'))
+        if ($user->hasRole('Admin'))
             return true;
     }
 
-    public function delete(User $User, MedicalCenter $MedicalCenter)
+    public function delete(User $user, MedicalCenter $MedicalCenter)
     {
-        if($User->hasRole('Admin'))
+        if ($user->hasRole('Admin'))
             return true;
     }
 
-    public function update(User $User, MedicalCenter $MedicalCenter)
+    public function update(User $user, MedicalCenter $MedicalCenter)
     {
-        if($User->hasRole('Admin'))
+        if ($user->hasRole('Admin'))
             return true;
     }
 
-    public function store(User $User)
+    public function store(User $user)
     {
-        if($User->hasRole('Admin'))
+        if ($user->hasRole('Admin'))
             return true;
     }
 
-    public function getByMedicalCenter(User $User, MedicalCenter $MedicalCenter)
+    public function getByMedicalCenter(User $user, MedicalCenter $MedicalCenter)
     {
-        if($User->hasRole('Admin') || $MedicalCenter->id == $User->medical_center_id) {
+        if ($user->hasRole('Admin') || $MedicalCenter->id == $user->medical_center_id) {
             return true;
         }
         return false;
diff --git a/app/Policies/MessagePolicy.php b/app/Policies/MessagePolicy.php
index 3aa4f181..b7165c38 100644
--- a/app/Policies/MessagePolicy.php
+++ b/app/Policies/MessagePolicy.php
@@ -2,26 +2,27 @@
 
 namespace App\Policies;
 
-use App\User;
-use App\Message;
+use App\Models\Message;
+use App\Models\User;
 use Doctrine\Tests\Common\Inflector\InflectorTest;
 
 class MessagePolicy
 {
-    public function delete(User $User, Message $Message)
+    public function delete(User $user, Message $Message)
     {
-        // if($Message->sender_user_id == $User->id || $Message->recipient_user_id == $User->id)
-            return true;
+        // if($Message->sender_user_id == $user->id || $Message->recipient_user_id == $user->id)
+        return true;
     }
 
-    public function update(User $User, Message $Message)
+    public function update(User $user, Message $Message)
     {
-        // if($User->hasRole('Admin'))
-            return true;
+        // if($user->hasRole('Admin'))
+        return true;
     }
-    public function store(User $User)
+
+    public function store(User $user)
     {
-        // if($User->hasRole('Admin'))
-            return true;
+        // if($user->hasRole('Admin'))
+        return true;
     }
 }
diff --git a/app/Policies/PackagePolicy.php b/app/Policies/PackagePolicy.php
index 16fbe0ba..602b8d62 100644
--- a/app/Policies/PackagePolicy.php
+++ b/app/Policies/PackagePolicy.php
@@ -2,40 +2,40 @@
 
 namespace App\Policies;
 
-use App\User;
-use App\Package;
+use App\Models\Package;
+use App\Models\User;
 
 class PackagePolicy
 {
-    public function showAll(User $User)
+    public function showAll(User $user)
     {
-        if($User->hasRole('Admin'))
+        if ($user->hasRole('Admin'))
             return true;
     }
 
-    public function delete(User $User, Package $Package)
+    public function delete(User $user, Package $Package)
     {
-        if(
-            $User->hasRole('Admin') ||
-            ($User->hasRole('Supervisor') && $Package->user->medical_center_id == $User->medical_center_id) ||
-            ($User->hasRole('User') && $Package->user_id == $User->id)
+        if (
+            $user->hasRole('Admin') ||
+            ($user->hasRole('Supervisor') && $Package->user->medical_center_id == $user->medical_center_id) ||
+            ($user->hasRole('User') && $Package->user_id == $user->id)
         )
             return true;
     }
 
-    public function update(User $User, Package $Package)
+    public function update(User $user, Package $Package)
     {
-        if(
-            $User->hasRole('Admin') ||
-            ($User->hasRole('Supervisor') && $Package->user->medical_center_id == $User->medical_center_id ) ||
-            $Package->user_id == $User->id
+        if (
+            $user->hasRole('Admin') ||
+            ($user->hasRole('Supervisor') && $Package->user->medical_center_id == $user->medical_center_id) ||
+            $Package->user_id == $user->id
         )
             return true;
     }
 
-    public function changeStatus( User $User )
+    public function changeStatus(User $user)
     {
-        if ( $User->hasRole( 'Admin|Supervisor' ) )
+        if ($user->hasRole('Admin|Supervisor'))
             return true;
     }
 
diff --git a/app/Policies/TestResultPolicy.php b/app/Policies/TestResultPolicy.php
index 5e08bcb6..71200316 100644
--- a/app/Policies/TestResultPolicy.php
+++ b/app/Policies/TestResultPolicy.php
@@ -2,37 +2,37 @@
 
 namespace App\Policies;
 
-use App\User;
-use App\TestResult;
-use Illuminate\Support\Facades\DB;
+use App\Models\TestResult;
+use App\Models\User;
 
 class TestResultPolicy
 {
-    public function delete(User $User, TestResult $TestResult)
+    public function delete(User $user, TestResult $TestResult)
     {
-        if( $User->hasRole('Admin') ||
-            ($User->hasRole('Supervisor') && $TestResult->verified == 'NotVerified') ||
-            ($User->hasRole('User') && $TestResult->verified == 'NotVerified' && $TestResult->user_id == $User->id)
+        if ($user->hasRole('Admin') ||
+            ($user->hasRole('Supervisor') && $TestResult->verified == 'NotVerified') ||
+            ($user->hasRole('User') && $TestResult->verified == 'NotVerified' && $TestResult->user_id == $user->id)
         )
             return true;
     }
 
-    public function update(User $User, TestResult $TestResult)
+    public function update(User $user, TestResult $TestResult)
     {
-        if($User->hasRole('Admin') || $TestResult->user_id == $User->id)
+        if ($user->hasRole('Admin') || $TestResult->user_id == $user->id)
             return true;
     }
 
-    public function store(User $User)
+    public function store(User $user)
     {
-            return true;
+        return true;
     }
-    public function verifyTestResult(User $User, TestResult $TestResult)
+
+    public function verifyTestResult(User $user, TestResult $TestResult)
     {
         $TR_MID = $TestResult->user->medical_center_id;
-        $User_MID = $User->medical_center_id;
+        $user_MID = $user->medical_center_id;
 
-        if($User->hasRole('Admin') || ( $User->hasRole('Supervisor') && $TR_MID == $User_MID && $TestResult->verified == 'None'))
+        if ($user->hasRole('Admin') || ($user->hasRole('Supervisor') && $TR_MID == $user_MID && $TestResult->verified == 'None'))
             return true;
     }
 }
diff --git a/app/Policies/TestTypePolicy.php b/app/Policies/TestTypePolicy.php
index 7e631a74..fe75b483 100644
--- a/app/Policies/TestTypePolicy.php
+++ b/app/Policies/TestTypePolicy.php
@@ -2,42 +2,45 @@
 
 namespace App\Policies;
 
-use App\User;
-use App\TestType;
+use App\Models\TestType;
+use App\Models\User;
 use Doctrine\Tests\Common\Inflector\InflectorTest;
 
 class TestTypePolicy
 {
-    public function list(User $User)
+    public function list(User $user)
     {
-        if($User->hasRole('Admin'))
-            return true;
-    }
-    public function delete(User $User, TestType $TestType)
-    {
-        if($User->hasRole('Admin') )
+        if ($user->hasRole('Admin'))
             return true;
     }
 
-    public function update(User $User, TestType $TestType)
+    public function delete(User $user, TestType $TestType)
     {
-        if($User->hasRole('Admin') && $TestType->test_results->count() == 0)
+        if ($user->hasRole('Admin'))
             return true;
     }
 
-    public function store(User $User)
+    public function update(User $user, TestType $TestType)
     {
-        if($User->hasRole('Admin'))
+        if ($user->hasRole('Admin') && $TestType->test_results->count() == 0)
             return true;
     }
-    public function getInputs(User $User)
+
+    public function store(User $user)
     {
-        // if($User->hasRole('Admin'))
+        if ($user->hasRole('Admin'))
             return true;
     }
-    public function generateBarcode(User $User, TestType $TestType)
+
+    public function getInputs(User $user)
     {
-        if($User->hasRole('Admin'))
+        // if($user->hasRole('Admin'))
+        return true;
+    }
+
+    public function generateBarcode(User $user, TestType $TestType)
+    {
+        if ($user->hasRole('Admin'))
             return true;
     }
 }
diff --git a/app/Policies/TransferPolicy.php b/app/Policies/TransferPolicy.php
index 90680297..bc21dd3c 100644
--- a/app/Policies/TransferPolicy.php
+++ b/app/Policies/TransferPolicy.php
@@ -2,47 +2,47 @@
 
 namespace App\Policies;
 
-use App\Package;
-use App\Transfer;
-use App\User;
-use App\Item;
+use App\Models\Item;
+use App\Models\Package;
+use App\Models\Transfer;
+use App\Models\User;
 
 class TransferPolicy
 {
-    public function changeStatus( User $User , Transfer $transfer )
+    public function changeStatus(User $user, Transfer $transfer)
     {
-        if ( $User->hasRole( 'Admin|Supervisor' ) || $transfer->user_id == $User->id )
+        if ($user->hasRole('Admin|Supervisor') || $transfer->user_id == $user->id)
             return true;
     }
 
-    public function transferItem( User $User , Item $Item )
+    public function transferItem(User $user, Item $Item)
     {
-        if ( $User->hasRole( 'Admin' ) ) {
+        if ($user->hasRole('Admin')) {
             return true;
         } else {
-            if ( $User->hasRole( 'Supervisor' ) ) {
-                if ( $Item->user->medical_center_id == $User->medical_center_id ) {
+            if ($user->hasRole('Supervisor')) {
+                if ($Item->user->medical_center_id == $user->medical_center_id) {
                     return true;
                 }
             } else {
-                if ( $Item->user_id == $User->id ) {
+                if ($Item->user_id == $user->id) {
                     return true;
                 }
             }
         }
     }
 
-    public function transferPackage( User $User , Package $Package )
+    public function transferPackage(User $user, Package $Package)
     {
-        if ( $User->hasRole( 'Admin' ) ) {
+        if ($user->hasRole('Admin')) {
             return true;
         } else {
-            if ( $User->hasRole( 'Supervisor' ) ) {
-                if ( $Package->user->medical_center_id == $User->medical_center_id) {
+            if ($user->hasRole('Supervisor')) {
+                if ($Package->user->medical_center_id == $user->medical_center_id) {
                     return true;
                 }
             } else {
-                if ( $Package->user_id == $User->id) {
+                if ($Package->user_id == $user->id) {
                     return true;
                 }
             }
diff --git a/app/Policies/UserPolicy.php b/app/Policies/UserPolicy.php
index 3aba6457..dba82c07 100644
--- a/app/Policies/UserPolicy.php
+++ b/app/Policies/UserPolicy.php
@@ -2,43 +2,43 @@
 
 namespace App\Policies;
 
-use App\User;
+use App\Models\User;
 
 class UserPolicy
 {
-    public function list(User $User)
+    public function list(User $user)
     {
-        if($User->hasRole('Admin|Supervisor'))
+        if ($user->hasRole('Admin|Supervisor'))
             return true;
     }
 
-    public function delete(User $User, User $Operator)
+    public function delete(User $user, User $Operator)
     {
-        if($User->hasRole('Admin'))
+        if ($user->hasRole('Admin'))
             return true;
     }
 
-    public function update(User $User, User $Operator)
+    public function update(User $user, User $Operator)
     {
-        if($User->hasRole('Admin') || $User->id == $Operator->id)
+        if ($user->hasRole('Admin') || $user->id == $Operator->id)
             return true;
     }
 
-    public function store(User $User)
+    public function store(User $user)
     {
-        if($User->hasRole('Admin'))
+        if ($user->hasRole('Admin'))
             return true;
     }
 
-    public function changeRole(User $User)
+    public function changeRole(User $user)
     {
-        if($User->hasRole('Admin'))
+        if ($user->hasRole('Admin'))
             return true;
     }
 
-    public function changeStatus(User $User)
+    public function changeStatus(User $user)
     {
-        if($User->hasRole('Admin|Supervisor'))
+        if ($user->hasRole('Admin|Supervisor'))
             return true;
     }
 }
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index ed1029c1..513053fc 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -2,7 +2,6 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 use Laravel\Passport\Passport;
 
@@ -14,11 +13,11 @@ class AuthServiceProvider extends ServiceProvider
      * @var array
      */
     protected $policies = [
-        'App\MedicalCenter' => 'App\Policies\MedicalCenterPolicy',
-        'App\User' => 'App\Policies\UserPolicy',
-        'App\TestType' => 'App\Policies\TestTypePolicy',
-        'App\Item' => 'App\Policies\ItemPolicy',
-        'App\Transfer' => 'App\Policies\TransferPolicy',
+        'App\Models\MedicalCenter' => 'App\Policies\MedicalCenterPolicy',
+        'App\Models\User' => 'App\Policies\UserPolicy',
+        'App\Models\TestType' => 'App\Policies\TestTypePolicy',
+        'App\Models\Item' => 'App\Policies\ItemPolicy',
+        'App\Models\Transfer' => 'App\Policies\TransferPolicy',
     ];
 
     /**
diff --git a/app/Repositories/CycleRepository.php b/app/Repositories/CycleRepository.php
index b2dd4788..01628c61 100644
--- a/app/Repositories/CycleRepository.php
+++ b/app/Repositories/CycleRepository.php
@@ -2,8 +2,8 @@
 
 namespace App\Repositories;
 
-use App\Cycle;
 use App\Interfaces\CycleRepositoryInterface;
+use App\Models\Cycle;
 
 class CycleRepository implements CycleRepositoryInterface
 {
diff --git a/app/Repositories/LabelRepository.php b/app/Repositories/LabelRepository.php
index 57cab3a9..cce2b680 100644
--- a/app/Repositories/LabelRepository.php
+++ b/app/Repositories/LabelRepository.php
@@ -3,7 +3,7 @@
 namespace App\Repositories;
 
 use App\Interfaces\LabelRepositoryInterface;
-use App\Label;
+use App\Models\Label;
 
 class LabelRepository implements LabelRepositoryInterface
 {
diff --git a/app/Repositories/PackageRepository.php b/app/Repositories/PackageRepository.php
index 8549b8ee..ce074fac 100644
--- a/app/Repositories/PackageRepository.php
+++ b/app/Repositories/PackageRepository.php
@@ -4,7 +4,7 @@ namespace App\Repositories;
 
 use App\Constants\StatusTypeEnum;
 use App\Interfaces\PackageRepositoryInterface;
-use App\Package;
+use App\Models\Package;
 
 class PackageRepository implements PackageRepositoryInterface
 {
diff --git a/app/Services/Media/MediaHelper.php b/app/Services/Media/MediaHelper.php
index 58042624..d8b69c20 100644
--- a/app/Services/Media/MediaHelper.php
+++ b/app/Services/Media/MediaHelper.php
@@ -2,8 +2,7 @@
 
 namespace App\Services\Media;
 
-use App\FakeModel;
-use Illuminate\Database\Eloquent\Model;
+use App\Models\FakeModel;
 
 class MediaHelper
 {
diff --git a/app/TestType.php b/app/TestType.php
deleted file mode 100644
index daa50ad8..00000000
--- a/app/TestType.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace App;
-
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\SoftDeletes;
-
-class TestType extends Model
-{
-    use SoftDeletes;
-
-    public $fillable = ['name', 'unique_code', 'user_id', 'bar_code', 'device_label'];
-    // protected $softDelete = true;
-
-    public function user()
-    {
-        return $this->belongsTo('App\User');
-    }
-    public function test_results()
-    {
-        return $this->hasMany('App\TestResult');
-    }
-    public function inputs()
-    {
-        return $this->hasMany('App\Input');
-    }
-}
diff --git a/app/Transfer.php b/app/Transfer.php
deleted file mode 100644
index d648c3d5..00000000
--- a/app/Transfer.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace App;
-
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\SoftDeletes;
-
-class Transfer extends Model
-{
-    use SoftDeletes;
-
-    public $fillable = [ 'user_id' , 'to_date' , 'from_date' , 'status' , 'user_transfer_id' ];
-
-    public function user()
-    {
-        return $this->belongsTo( 'App\User' );
-    }
-
-    public function userTransfer()
-    {
-        return $this->belongsTo( 'App\User', 'user_transfer_id' );
-    }
-
-    public function transferable()
-    {
-        return $this->morphTo();
-    }
-}
diff --git a/app/Uploadable.php b/app/Uploadable.php
deleted file mode 100644
index 6918b2a9..00000000
--- a/app/Uploadable.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace App;
-
-use Illuminate\Database\Eloquent\Model;
-
-class Uploadable extends Model
-{
-
-    protected $fillable = ['uploadable_id', 'uploadable_type', 'gallery_id', 'image_role', 'batch_id'];
-    public $timestamps = false;
-
-    public function gallery()
-    {
-        return $this->belongsTo('App\Gallery');
-    }
-
-}
diff --git a/app/User.php b/app/User.php
deleted file mode 100644
index 10d29254..00000000
--- a/app/User.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-namespace App;
-
-use Illuminate\Foundation\Auth\User as Authenticatable;
-use Illuminate\Notifications\Notifiable;
-use Laravel\Passport\HasApiTokens;
-use Spatie\Permission\Traits\HasRoles;
-
-class User extends Authenticatable
-{
-    use Notifiable, HasApiTokens, HasRoles;
-
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array
-     */
-    protected $fillable = [
-        'name', 'email', 'cell_number', 'password', 'status', 'medical_center_id', 'address', 'gender'
-    ];
-    /**
-     * The attributes that should be hidden for arrays.
-     *
-     * @var array
-     */
-    protected $hidden = [
-        'password', 'remember_token',
-    ];
-
-    /**
-     * The attributes that should be cast to native types.
-     *
-     * @var array
-     */
-    protected $casts = [
-        'email_verified_at' => 'datetime',
-    ];
-
-    public function medical_center()
-    {
-        return $this->belongsTo('App\MedicalCenter');
-    }
-
-    public function test_results()
-    {
-        return $this->hasMany('App\TestResult');
-    }
-
-    public function test_types()
-    {
-        return $this->hasMany('App\TestType');
-    }
-
-    public function findForPassport($username)
-    {
-        return $this->where('cell_number', $username)->where('status', 'Active')->first();
-    }
-
-    public function messagesSent()
-    {
-        return $this->hasMany('App\Message', 'sender_user_id');
-    }
-
-    public function messagesReceived()
-    {
-        return $this->hasMany('App\Message', 'recipient_user_id');
-    }
-
-    public function packages()
-    {
-        return $this->hasMany('App\Package');
-    }
-
-    public function items()
-    {
-        return $this->hasMany('App\Item');
-    }
-
-    public function labels()
-    {
-        return $this->hasMany('App\Label');
-    }
-
-    public function cycles()
-    {
-        return $this->hasMany('App\Cycle');
-    }
-}
diff --git a/config/auth.php b/config/auth.php
index f8a1194b..d1d47a10 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -67,7 +67,7 @@ return [
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model' => App\User::class,
+            'model' => \App\Models\User::class,
         ],
 
         // 'users' => [
diff --git a/config/services.php b/config/services.php
index 2a64d2d6..55d0a2a4 100644
--- a/config/services.php
+++ b/config/services.php
@@ -35,7 +35,7 @@ return [
     ],
 
     'stripe' => [
-        'model' => App\User::class,
+        'model' => \App\Models\User::class,
         'key' => env('STRIPE_KEY'),
         'secret' => env('STRIPE_SECRET'),
         'webhook' => [
diff --git a/packages/Auth/SendsPasswordResetEmails.php b/packages/Auth/SendsPasswordResetEmails.php
index 7a518156..6fe2662b 100644
--- a/packages/Auth/SendsPasswordResetEmails.php
+++ b/packages/Auth/SendsPasswordResetEmails.php
@@ -2,10 +2,10 @@
 
 namespace Packages\Auth;
 
-use Illuminate\Http\Request;
-use App\User;
-use Carbon\Carbon;
 use App\Http\Controllers\Api\Auth\LoginController;
+use App\Models\User;
+use Carbon\Carbon;
+use Illuminate\Http\Request;
 use Packages\Messaging\src\Facades\MessageResponse;
 use Packages\SMSSender\SMSSender;