diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index fdc133ee..99c6b40d 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -3,9 +3,7 @@
 namespace App\Console;
 
 use App\Console\Commands\SetupDevEnvironment;
-use App\Share;
-use App\Zip;
-use Carbon\Carbon;
+use App\Services\SchedulerService;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
@@ -28,12 +26,14 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        $schedule->call(function () {
-            $this->delete_expired_shared_links();
+        $scheduler = app()->make(SchedulerService::class);
+
+        $schedule->call(function () use ($scheduler) {
+            $scheduler->delete_expired_shared_links();
         })->everyMinute();
 
-        $schedule->call(function () {
-            $this->delete_old_zips();
+        $schedule->call(function () use ($scheduler) {
+            $scheduler->delete_old_zips();
         })->everySixHours();
 
         // Run queue jobs every minute
@@ -53,42 +53,4 @@ class Kernel extends ConsoleKernel
 
         require base_path('routes/console.php');
     }
-
-    /**
-     * Delete old zips
-     */
-    protected function delete_old_zips(): void
-    {
-        // Get all zips
-        $zips = Zip::where('created_at', '<=', Carbon::now()->subDay()->toDateTimeString())->get();
-
-        $zips->each(function ($zip) {
-
-            // Delete zip file
-            \Storage::disk('local')->delete('zip/' . $zip->basename);
-
-            // Delete zip record
-            $zip->delete();
-        });
-    }
-
-    /**
-     * Get and delete expired shared links
-     */
-    protected function delete_expired_shared_links(): void
-    {
-        // Get all shares with expiration time
-        $shares = Share::whereNotNull('expire_in')->get();
-
-        $shares->each(function ($share) {
-
-            // Get dates
-            $created_at = Carbon::parse($share->created_at);
-
-            // If time was over, then delete share record
-            if ($created_at->diffInHours(Carbon::now()) >= $share->expire_in) {
-                $share->delete();
-            }
-        });
-    }
 }
diff --git a/app/Services/SchedulerService.php b/app/Services/SchedulerService.php
new file mode 100644
index 00000000..60586a22
--- /dev/null
+++ b/app/Services/SchedulerService.php
@@ -0,0 +1,48 @@
+<?php
+
+
+namespace App\Services;
+
+
+use App\Models\Share;
+use App\Models\Zip;
+use Carbon\Carbon;
+
+class SchedulerService
+{
+    /**
+     * Delete old zips
+     */
+    public function delete_old_zips(): void
+    {
+        Zip::where('created_at', '<=', Carbon::now()->subDay()->toDateTimeString())
+            ->get()
+            ->each(function ($zip) {
+
+                // Delete zip file
+                \Storage::disk('local')->delete("zip/$zip->basename");
+
+                // Delete zip record
+                $zip->delete();
+            });
+    }
+
+    /**
+     * Get and delete expired shared links
+     */
+    public function delete_expired_shared_links(): void
+    {
+        Share::whereNotNull('expire_in')
+            ->get()
+            ->each(function ($share) {
+
+                // Get dates
+                $created_at = Carbon::parse($share->created_at);
+
+                // If time was over, then delete share record
+                if ($created_at->diffInHours(Carbon::now()) >= $share->expire_in) {
+                    $share->delete();
+                }
+            });
+    }
+}
\ No newline at end of file
diff --git a/composer.json b/composer.json
index c9186775..5e1c121c 100644
--- a/composer.json
+++ b/composer.json
@@ -50,7 +50,9 @@
     },
     "autoload": {
         "psr-4": {
-            "App\\": "app/"
+            "App\\": "app/",
+            "Database\\Factories\\": "database/factories/",
+            "Database\\Seeders\\": "database/seeders/"
         },
         "classmap": [
             "database/seeds",