diff --git a/app/Models/Item.php b/app/Models/Item.php
index 16089006..9587b84c 100644
--- a/app/Models/Item.php
+++ b/app/Models/Item.php
@@ -75,9 +75,6 @@ class Item extends Model implements HasMedia
             ->useFallbackPath(public_path('/files/default_pastry.jpg'));
     }
 
-    /**
-     * @throws InvalidManipulation
-     */
     public function registerMediaConversions(Media $media = null): void
     {
         $this->addMediaConversion('thumbnail')
diff --git a/app/Models/TestResult.php b/app/Models/TestResult.php
index 71eb0737..ba6b2933 100644
--- a/app/Models/TestResult.php
+++ b/app/Models/TestResult.php
@@ -38,9 +38,6 @@ class TestResult extends Model implements HasMedia
             ->useFallbackPath(public_path('/files/default_pastry.jpg'));
     }
 
-    /**
-     * @throws InvalidManipulation
-     */
     public function registerMediaConversions(Media $media = null): void
     {
         $this->addMediaConversion('thumbnail')
diff --git a/routes/api.php b/routes/api.php
index 8995373b..13919c4d 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -1,102 +1,97 @@
 <?php
 
+use App\Http\Controllers\Api\Auth\ForgotPasswordController;
+use App\Http\Controllers\Api\Auth\LoginController;
+use App\Http\Controllers\Api\Auth\RegisterController;
+use App\Http\Controllers\Api\Auth\ResetPasswordController;
+use App\Http\Controllers\BarCodeController;
+use App\Http\Controllers\CycleController;
+use App\Http\Controllers\ExportController;
+use App\Http\Controllers\ItemController;
+use App\Http\Controllers\LabelController;
+use App\Http\Controllers\Media\DestroyMedia;
+use App\Http\Controllers\Media\StoreMedia;
+use App\Http\Controllers\MedicalCenterController;
+use App\Http\Controllers\MessageController;
+use App\Http\Controllers\PackageController;
+use App\Http\Controllers\TestResultController;
+use App\Http\Controllers\TestTypeController;
+use App\Http\Controllers\TransferItemController;
+use App\Http\Controllers\TransferPackageController;
+use App\Http\Controllers\UserController;
 use Illuminate\Support\Facades\Route;
-/*
-|--------------------------------------------------------------------------
-| API Routes
-|--------------------------------------------------------------------------
-|
-| Here is where you can register API routes for your application. These
-| routes are loaded by the RouteServiceProvider within a group which
-| is assigned the "api" middleware group. Enjoy building your API!
-|
-*/
-
-
-Route::group(['namespace' => 'Api'],function () {
-
-    Route::post('/login', 'Auth\LoginController@login')->name('login');
-    Route::post('/logout', 'Auth\LoginController@logout')->name('logout')->middleware('auth:api');
-    Route::post('/register', 'Auth\RegisterController@register')->name('register');
-    Route::post('/password/phone', 'Auth\ForgotPasswordController@sendDisposablePassword')->name('password.email');
-    Route::post('/password/verifyCode', 'Auth\ForgotPasswordController@checkDisposablePassword');
-    Route::post('/password/reset', 'Auth\ResetPasswordController@reset')->name('password.reset');
 
+Route::group(['namespace' => 'Api'], function () {
+    Route::post('/login', [LoginController::class, 'login'])->name('login');
+    Route::post('/logout', [LoginController::class, 'logout'])->name('logout')->middleware('auth:api');
+    Route::post('/register', [RegisterController::class, 'register'])->name('register');
+    Route::post('/password/phone', [ForgotPasswordController::class, 'sendDisposablePassword'])->name('password.email');
+    Route::post('/password/verifyCode', [ForgotPasswordController::class, 'checkDisposablePassword']);
+    Route::post('/password/reset', [ResetPasswordController::class, 'reset'])->name('password.reset');
 });
 
 Route::middleware('auth:api')->group(function () {
+    Route::get('TestTypes/ListNames', [TestTypeController::class, 'listNames']);
+    Route::post('/TestTypes/Barcode/{TestType}', [TestTypeController::class, 'generateBarcode']);
+    Route::resource('TestTypes', TestTypeController::class);
+    Route::resource('MedicalCenters', MedicalCenterController::class);
+    Route::post('/GetInputs', [TestTypeController::class, 'getInputs']);
 
-    Route::get('TestTypes/ListNames', 'TestTypeController@listNames');
-    Route::post('/TestTypes/Barcode/{TestType}', 'TestTypeController@generateBarcode');
-    Route::resource('TestTypes', 'TestTypeController');
-    Route::resource('MedicalCenters', 'MedicalCenterController');
-    Route::post('/GetInputs', 'TestTypeController@getInputs');
-    // Route::get('/TestTypes/All', 'TestTypeController@AllTestTypes');
-    // Route::get('/MedicalCenters/All', 'MedicalCenterController@listMedicalCenters');
+    Route::get('/GetInfo', [UserController::class, 'getInfo']);
+    Route::get('Users/MedicalCenter/{MedicalCenter}', [UserController::class, 'getByMedicalCenter']);
+    Route::post('Users/ChangeStatus/{User}', [UserController::class, 'changeStatus']);
+    Route::post('Users/ChangeRole/{User}', [UserController::class, 'changeRole']);
+    Route::post('UpdateInfo', [UserController::class, 'updateInfo']);
+    Route::get('users/search', [UserController::class, 'searchUser']);
+    Route::resource('Users', UserController::class);
 
-    Route::get('/GetInfo', 'UserController@getInfo');
-    Route::get('Users/MedicalCenter/{MedicalCenter}', 'UserController@getByMedicalCenter');
-    Route::post('Users/ChangeStatus/{User}', 'UserController@changeStatus');
-    Route::post('Users/ChangeRole/{User}', 'UserController@changeRole');
-    Route::post('UpdateInfo', 'UserController@updateInfo');
-    Route::get('users/search', 'UserController@searchUser');
-    Route::resource('Users', 'UserController');
+    Route::resource('Labels', LabelController::class);
 
-    Route::resource('Labels', 'LabelController');
+    Route::resource('Messages', MessageController::class);
+    Route::delete('Messages/User/{User}', [MessageController::class, 'destroyUserMessages']);
+    Route::get('/GetLabels', [LabelController::class, 'getLabels']);
+    Route::get('/GetCities', [MedicalCenterController::class, 'getCities']);
 
-    Route::resource('Messages', 'MessageController');
-    Route::delete('Messages/User/{User}', 'MessageController@destroyUserMessages');
-    Route::get('/GetLabels', 'LabelController@getLabels');
-    Route::get('/GetCities', 'MedicalCenterController@getCities');
+    Route::resource('Cycles', CycleController::class);
 
-    Route::resource('Cycles', 'CycleController');
+    Route::get('TestTypes/AllArchivedTestTypes', [TestTypeController::class, 'allArchivedTestTypes']);
 
-    Route::get('TestTypes/AllArchivedTestTypes', 'TestTypeController@allArchivedTestTypes');
+    Route::resource('TestResults', TestResultController::class, ['except' => 'show']);
+    Route::get('/TestResults/ListFilterItems', [TestResultController::class, 'listFilterItems']);
+    Route::post('/TestResults/Verify/{TestResult}/{Value}', [TestResultController::class, 'verifyTestResult']);
+    Route::post('/TestResults/chart', [TestResultController::class, 'chart']);
+    Route::post('/TestResult/QRCode/{TestResult}', [BarCodeController::class, 'generateQRcode']);
 
+    Route::resource('Items', ItemController::class);
+    Route::get('/MyItems', [ItemController::class, 'myItems']);
+    Route::get('/GetItems', [ItemController::class, 'getItems']);
+    Route::post('Items/ChangeStatus/{Item}', [ItemController::class, 'changeStatus']);
+    Route::post('Items/ChangeRepair/{Item}', [ItemController::class, 'changeRepair']);
 
-    //TestResults
-    Route::resource('TestResults', 'TestResultController' , ['except' => 'show']);
-    Route::get('/TestResults/ListFilterItems', 'TestResultController@listFilterItems');
-    Route::post('/TestResults/Verify/{TestResult}/{Value}', 'TestResultController@verifyTestResult');
-    Route::post('/TestResults/chart', 'TestResultController@chart');
-    Route::post('/TestResult/QRCode/{TestResult}', 'BarCodeController@generateQRcode');
+    Route::get('suspended-transfer-items', [TransferItemController::class, 'getSuspendedTransfer']);
+    Route::post('transfer-items/{Item}', [TransferItemController::class, 'transfer']);
+    Route::post('transfer-items/ChangeStatus/{Transfer}', [TransferItemController::class, 'changeStatus']);
 
-    //Item
-    Route::resource('Items', 'ItemController');
-    Route::get('/MyItems', 'ItemController@myItems');
-    Route::get('/GetItems', 'ItemController@getItems');
-    Route::post('Items/ChangeStatus/{Item}', 'ItemController@changeStatus');
-    Route::post('Items/ChangeRepair/{Item}', 'ItemController@changeRepair');
+    Route::resource('Packages', PackageController::class);
+    Route::get('/MyPackages', [PackageController::class, 'myPackages']);
+    Route::get('/GetPackages', [PackageController::class, 'getPackages']);
+    Route::post('Packages/ChangeStatus/{Package}', [PackageController::class, 'changeStatus']);
 
-    //Transfer Item
-    Route::get('suspended-transfer-items', 'TransferItemController@getSuspendedTransfer');
-    Route::post('transfer-items/{Item}', 'TransferItemController@transfer');
-    Route::post('transfer-items/ChangeStatus/{Transfer}', 'TransferItemController@changeStatus');
+    Route::get('suspended-transfer-packages', [TransferPackageController::class, 'getSuspendedTransfer']);
+    Route::post('transfer-packages/{Package}', [TransferPackageController::class, 'transfer']);
+    Route::post('transfer-packages/ChangeStatus/{Transfer}', [TransferPackageController::class, 'changeStatus']);
 
-    //Package
-    Route::resource('Packages', 'PackageController');
-    Route::get('/MyPackages', 'PackageController@myPackages');
-    Route::get('/GetPackages', 'PackageController@getPackages');
-    Route::post('Packages/ChangeStatus/{Package}', 'PackageController@changeStatus');
+    Route::get('export/items', [ExportController::class, 'items']);
+    Route::get('export/packages', [ExportController::class, 'packages']);
 
-    //transfer package
-    Route::get('suspended-transfer-packages', 'TransferPackageController@getSuspendedTransfer');
-    Route::post('transfer-packages/{Package}', 'TransferPackageController@transfer');
-    Route::post('transfer-packages/ChangeStatus/{Transfer}', 'TransferPackageController@changeStatus');
-
-    //export
-    Route::get('export/items', 'ExportController@items');
-    Route::get('export/packages', 'ExportController@packages');
-
-    //Media
     Route::namespace('Media')->group(function () {
-        Route::post('store_media', 'StoreMedia');
-        Route::delete('destroy_media/{media}', 'DestroyMedia');
+        Route::post('store_media', [StoreMedia::class, 'handle']);
+        Route::delete('destroy_media/{media}', [DestroyMedia::class, 'handle']);
     });
 });
 
-Route::post('/BarCode/{Code}/{Type?}', 'BarCodeController@generateBarcode');
-Route::post('Package/Barcode/{Code}', 'BarCodeController@generatePackageBarcode');
-Route::post('Package/QRCode/{Package}', 'BarCodeController@generatePackageQRCode');
+Route::post('/BarCode/{Code}/{Type?}', [BarCodeController::class, 'generateBarcode']);
+Route::post('Package/Barcode/{Code}', [BarCodeController::class, 'generatePackageBarcode']);
+Route::post('Package/QRCode/{Package}', [BarCodeController::class, 'generatePackageQRCode']);
 
-Route::get('TestResults/{id}', 'TestResultController@show');
+Route::get('TestResults/{id}', [TestResultController::class, 'show']);