diff --git a/app/Actions/GetFailedSpeedtestData.php b/app/Actions/GetFailedSpeedtestData.php
index 7ffd586a..652f85c7 100644
--- a/app/Actions/GetFailedSpeedtestData.php
+++ b/app/Actions/GetFailedSpeedtestData.php
@@ -2,7 +2,7 @@
 
 namespace App\Actions;
 
-use App\Speedtest;
+use App\Models\Speedtest;
 use Cache;
 use Carbon\Carbon;
 use DB;
diff --git a/app/Actions/GetLatestSpeedtestData.php b/app/Actions/GetLatestSpeedtestData.php
index ec6b8044..bc456ded 100644
--- a/app/Actions/GetLatestSpeedtestData.php
+++ b/app/Actions/GetLatestSpeedtestData.php
@@ -4,7 +4,7 @@ namespace App\Actions;
 
 use App\Helpers\SettingsHelper;
 use App\Helpers\SpeedtestHelper;
-use App\Speedtest;
+use App\Models\Speedtest;
 use DB;
 use Henrywhitaker3\LaravelActions\Interfaces\ActionInterface;
 
diff --git a/app/Actions/GetSpeedtestTimeData.php b/app/Actions/GetSpeedtestTimeData.php
index 105baa00..d2b15988 100644
--- a/app/Actions/GetSpeedtestTimeData.php
+++ b/app/Actions/GetSpeedtestTimeData.php
@@ -3,7 +3,7 @@
 namespace App\Actions;
 
 use App\Helpers\SettingsHelper;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Cache;
 use Carbon\Carbon;
 use Henrywhitaker3\LaravelActions\Interfaces\ActionInterface;
diff --git a/app/Helpers/BackupHelper.php b/app/Helpers/BackupHelper.php
index 48c332d9..1ec966a0 100644
--- a/app/Helpers/BackupHelper.php
+++ b/app/Helpers/BackupHelper.php
@@ -2,7 +2,7 @@
 
 namespace App\Helpers;
 
-use App\Speedtest;
+use App\Models\Speedtest;
 use Cache;
 use DateTime;
 use Exception;
diff --git a/app/Helpers/EmailVerificationHelper.php b/app/Helpers/EmailVerificationHelper.php
index d12fc5ca..a6a3bedd 100644
--- a/app/Helpers/EmailVerificationHelper.php
+++ b/app/Helpers/EmailVerificationHelper.php
@@ -3,7 +3,7 @@
 namespace App\Helpers;
 
 use App\Auth\EmailVerification;
-use App\User;
+use App\Models\User;
 
 class EmailVerificationHelper {
     public static function checkVerificationAttempt($userID, $token)
diff --git a/app/Helpers/SettingsHelper.php b/app/Helpers/SettingsHelper.php
index 767f70e3..3a9fb7bd 100644
--- a/app/Helpers/SettingsHelper.php
+++ b/app/Helpers/SettingsHelper.php
@@ -3,7 +3,7 @@
 namespace App\Helpers;
 
 use App\Events\TestNotificationEvent;
-use App\Setting;
+use App\Models\Setting;
 use Cache;
 use Carbon\Carbon;
 
diff --git a/app/Helpers/SpeedtestHelper.php b/app/Helpers/SpeedtestHelper.php
index b4bf3e10..a5b9c1d6 100644
--- a/app/Helpers/SpeedtestHelper.php
+++ b/app/Helpers/SpeedtestHelper.php
@@ -2,7 +2,7 @@
 
 namespace App\Helpers;
 
-use App\Speedtest;
+use App\Models\Speedtest;
 use App\Utils\OoklaTester;
 use Carbon\Carbon;
 use Exception;
diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index 2a610fe9..c712ac59 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -9,7 +9,7 @@ use Illuminate\Support\Facades\Auth;
 use App\Http\Controllers\Controller;
 use App\LoginSession;
 use App\Rules\CurrentPasswordMatches;
-use App\User;
+use App\Models\User;
 use DateTime;
 use Hash;
 use Illuminate\Support\Facades\Request as RequestFacade;
diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 4d7202d6..b8359c37 100644
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -4,7 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Helpers\SettingsHelper;
 use App\Rules\Cron;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Validator;
diff --git a/app/Http/Controllers/SpeedtestController.php b/app/Http/Controllers/SpeedtestController.php
index f4204ff0..20169675 100644
--- a/app/Http/Controllers/SpeedtestController.php
+++ b/app/Http/Controllers/SpeedtestController.php
@@ -9,7 +9,7 @@ use App\Actions\QueueSpeedtest;
 use App\Helpers\SettingsHelper;
 use App\Helpers\SpeedtestHelper;
 use App\Jobs\SpeedtestJob;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Carbon\Carbon;
 use Exception;
 use Illuminate\Http\Request;
diff --git a/app/Interfaces/SpeedtestProvider.php b/app/Interfaces/SpeedtestProvider.php
index f0124d7f..6a9ad0fe 100644
--- a/app/Interfaces/SpeedtestProvider.php
+++ b/app/Interfaces/SpeedtestProvider.php
@@ -2,7 +2,7 @@
 
 namespace App\Interfaces;
 
-use App\Speedtest;
+use App\Models\Speedtest;
 
 interface SpeedtestProvider
 {
diff --git a/app/Setting.php b/app/Models/Setting.php
similarity index 95%
rename from app/Setting.php
rename to app/Models/Setting.php
index 075fa304..3f208599 100644
--- a/app/Setting.php
+++ b/app/Models/Setting.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use App\Casts\CommaSeparatedArrayCast;
 use App\Helpers\SettingsHelper;
diff --git a/app/Speedtest.php b/app/Models/Speedtest.php
similarity index 97%
rename from app/Speedtest.php
rename to app/Models/Speedtest.php
index 80cb2644..063ebd98 100644
--- a/app/Speedtest.php
+++ b/app/Models/Speedtest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/User.php b/app/Models/User.php
similarity index 97%
rename from app/User.php
rename to app/Models/User.php
index 2f5cf899..35333805 100644
--- a/app/User.php
+++ b/app/Models/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Foundation\Auth\User as Authenticatable;
@@ -107,7 +107,7 @@ class User extends Authenticatable implements JWTSubject
 
     public function setPasswordAttribute($password)
     {
-        if ( !empty($password) ) {
+        if (!empty($password)) {
             $this->attributes['password'] = Hash::make($password);
         }
     }
diff --git a/app/Observers/SpeedtestObserver.php b/app/Observers/SpeedtestObserver.php
index 2ba992e1..1ad26d27 100644
--- a/app/Observers/SpeedtestObserver.php
+++ b/app/Observers/SpeedtestObserver.php
@@ -3,7 +3,7 @@
 namespace App\Observers;
 
 use App\Exceptions\InfluxDBNotEnabledException;
-use App\Speedtest;
+use App\Models\Speedtest;
 use App\Utils\InfluxDB\InfluxDB;
 use Exception;
 use Log;
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 25c07449..e343a8b6 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -11,7 +11,7 @@ use App\Listeners\SpeedtestFailedListener;
 use App\Listeners\SpeedtestOverviewListener;
 use App\Listeners\TestNotificationListener;
 use App\Observers\SpeedtestObserver;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
diff --git a/app/Utils/InfluxDB/InfluxDB.php b/app/Utils/InfluxDB/InfluxDB.php
index ebe9a00b..e283790c 100644
--- a/app/Utils/InfluxDB/InfluxDB.php
+++ b/app/Utils/InfluxDB/InfluxDB.php
@@ -5,7 +5,7 @@ namespace App\Utils\InfluxDB;
 use App\Exceptions\InfluxDBConnectionErrorException;
 use App\Exceptions\InfluxDBNotEnabledException;
 use App\Helpers\SettingsHelper;
-use App\Speedtest;
+use App\Models\Speedtest;
 use InfluxDB\Client as Version1;
 use InfluxDB2\Client as Version2;
 use App\Utils\InfluxDB\InfluxDBWrapperInterface as Client;
diff --git a/app/Utils/InfluxDB/InfluxDBVersion1Wrapper.php b/app/Utils/InfluxDB/InfluxDBVersion1Wrapper.php
index d3fec128..d8192a5d 100644
--- a/app/Utils/InfluxDB/InfluxDBVersion1Wrapper.php
+++ b/app/Utils/InfluxDB/InfluxDBVersion1Wrapper.php
@@ -2,7 +2,7 @@
 
 namespace App\Utils\InfluxDB;
 
-use App\Speedtest;
+use App\Models\Speedtest;
 use Exception;
 use InfluxDB\Client;
 use InfluxDB\Database;
diff --git a/app/Utils/InfluxDB/InfluxDBWrapperInterface.php b/app/Utils/InfluxDB/InfluxDBWrapperInterface.php
index 3c72c7ea..e91df405 100644
--- a/app/Utils/InfluxDB/InfluxDBWrapperInterface.php
+++ b/app/Utils/InfluxDB/InfluxDBWrapperInterface.php
@@ -2,7 +2,7 @@
 
 namespace App\Utils\InfluxDB;
 
-use App\Speedtest;
+use App\Models\Speedtest;
 
 interface InfluxDBWrapperInterface
 {
diff --git a/app/Utils/OoklaTester.php b/app/Utils/OoklaTester.php
index 74e617da..f127b08f 100644
--- a/app/Utils/OoklaTester.php
+++ b/app/Utils/OoklaTester.php
@@ -6,7 +6,7 @@ use App\Exceptions\SpeedtestFailureException;
 use App\Helpers\SettingsHelper;
 use App\Helpers\SpeedtestHelper;
 use App\Interfaces\SpeedtestProvider;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Cache;
 use Exception;
 use JsonException;
diff --git a/database/factories/SpeedtestFactory.php b/database/factories/SpeedtestFactory.php
index f2a59d93..4cc2efc3 100644
--- a/database/factories/SpeedtestFactory.php
+++ b/database/factories/SpeedtestFactory.php
@@ -2,7 +2,7 @@
 
 namespace Database\Factories;
 
-use App\Speedtest;
+use App\Models\Speedtest;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class SpeedtestFactory extends Factory
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index 741edead..fa9360e7 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -2,7 +2,7 @@
 
 /** @var \Illuminate\Database\Eloquent\Factory $factory */
 
-use App\User;
+use App\Models\User;
 use Faker\Generator as Faker;
 use Illuminate\Support\Str;
 
diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
index 4bfd7b91..5d0ad5dc 100644
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\User;
+use App\Models\User;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2020_05_18_211812_create_settings_table.php b/database/migrations/2020_05_18_211812_create_settings_table.php
index 3212bc6a..e5bde293 100644
--- a/database/migrations/2020_05_18_211812_create_settings_table.php
+++ b/database/migrations/2020_05_18_211812_create_settings_table.php
@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2020_06_21_171849_add_notifications_settings.php b/database/migrations/2020_06_21_171849_add_notifications_settings.php
index abaebd8f..320b0e87 100644
--- a/database/migrations/2020_06_21_171849_add_notifications_settings.php
+++ b/database/migrations/2020_06_21_171849_add_notifications_settings.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2020_07_06_105930_add_graph_settings.php b/database/migrations/2020_07_06_105930_add_graph_settings.php
index 92adb16b..bd3304cd 100644
--- a/database/migrations/2020_07_06_105930_add_graph_settings.php
+++ b/database/migrations/2020_07_06_105930_add_graph_settings.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2020_07_07_215412_add_notification_agent_settings.php b/database/migrations/2020_07_07_215412_add_notification_agent_settings.php
index 739d1204..00784c06 100644
--- a/database/migrations/2020_07_07_215412_add_notification_agent_settings.php
+++ b/database/migrations/2020_07_07_215412_add_notification_agent_settings.php
@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2020_08_12_123941_add_healthchecks_settings.php b/database/migrations/2020_08_12_123941_add_healthchecks_settings.php
index 343d08d4..34562729 100644
--- a/database/migrations/2020_08_12_123941_add_healthchecks_settings.php
+++ b/database/migrations/2020_08_12_123941_add_healthchecks_settings.php
@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2020_08_21_133343_add_authentication_settings.php b/database/migrations/2020_08_21_133343_add_authentication_settings.php
index 732a8b5b..6282d532 100644
--- a/database/migrations/2020_08_21_133343_add_authentication_settings.php
+++ b/database/migrations/2020_08_21_133343_add_authentication_settings.php
@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2020_08_21_204656_add_conditional_notifications_settings.php b/database/migrations/2020_08_21_204656_add_conditional_notifications_settings.php
index 8c36d2c2..b0ce97b1 100644
--- a/database/migrations/2020_08_21_204656_add_conditional_notifications_settings.php
+++ b/database/migrations/2020_08_21_204656_add_conditional_notifications_settings.php
@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2020_08_28_192136_add_show_failed_tests_setting.php b/database/migrations/2020_08_28_192136_add_show_failed_tests_setting.php
index 874f92fb..2f9d2af7 100644
--- a/database/migrations/2020_08_28_192136_add_show_failed_tests_setting.php
+++ b/database/migrations/2020_08_28_192136_add_show_failed_tests_setting.php
@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2020_09_10_231121_add_widget_card_settings.php b/database/migrations/2020_09_10_231121_add_widget_card_settings.php
index cc95f30e..1d5b0975 100644
--- a/database/migrations/2020_09_10_231121_add_widget_card_settings.php
+++ b/database/migrations/2020_09_10_231121_add_widget_card_settings.php
@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2020_12_19_211232_add_schedule_enabled_setting.php b/database/migrations/2020_12_19_211232_add_schedule_enabled_setting.php
index db78f3b7..5955fbdb 100644
--- a/database/migrations/2020_12_19_211232_add_schedule_enabled_setting.php
+++ b/database/migrations/2020_12_19_211232_add_schedule_enabled_setting.php
@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2020_12_19_234248_add_app_name_setting.php b/database/migrations/2020_12_19_234248_add_app_name_setting.php
index e640c617..0af86021 100644
--- a/database/migrations/2020_12_19_234248_add_app_name_setting.php
+++ b/database/migrations/2020_12_19_234248_add_app_name_setting.php
@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2020_12_20_001345_add_custom_healthchecks_setting.php b/database/migrations/2020_12_20_001345_add_custom_healthchecks_setting.php
index bd552992..9077e063 100644
--- a/database/migrations/2020_12_20_001345_add_custom_healthchecks_setting.php
+++ b/database/migrations/2020_12_20_001345_add_custom_healthchecks_setting.php
@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2021_03_07_101259_add_speedtest_provider_setting.php b/database/migrations/2021_03_07_101259_add_speedtest_provider_setting.php
index 4510dc09..4182ab5f 100644
--- a/database/migrations/2021_03_07_101259_add_speedtest_provider_setting.php
+++ b/database/migrations/2021_03_07_101259_add_speedtest_provider_setting.php
@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2021_03_07_121716_update_speedtest_server_settings_text.php b/database/migrations/2021_03_07_121716_update_speedtest_server_settings_text.php
index 217023d3..6f6af2e5 100644
--- a/database/migrations/2021_03_07_121716_update_speedtest_server_settings_text.php
+++ b/database/migrations/2021_03_07_121716_update_speedtest_server_settings_text.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2021_04_10_082758_add_visible_columns_setting.php b/database/migrations/2021_04_10_082758_add_visible_columns_setting.php
index e4e3663c..24165f60 100644
--- a/database/migrations/2021_04_10_082758_add_visible_columns_setting.php
+++ b/database/migrations/2021_04_10_082758_add_visible_columns_setting.php
@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2021_04_10_102320_add_hidden_columns_setting.php b/database/migrations/2021_04_10_102320_add_hidden_columns_setting.php
index 5ddb6680..67493867 100644
--- a/database/migrations/2021_04_10_102320_add_hidden_columns_setting.php
+++ b/database/migrations/2021_04_10_102320_add_hidden_columns_setting.php
@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2021_04_10_182503_add_influx_db_settings.php b/database/migrations/2021_04_10_182503_add_influx_db_settings.php
index 2a1e66eb..7ff7e8a5 100644
--- a/database/migrations/2021_04_10_182503_add_influx_db_settings.php
+++ b/database/migrations/2021_04_10_182503_add_influx_db_settings.php
@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/seeders/SpeedtestSeeder.php b/database/seeders/SpeedtestSeeder.php
index 1b8ed32f..5e628dbe 100644
--- a/database/seeders/SpeedtestSeeder.php
+++ b/database/seeders/SpeedtestSeeder.php
@@ -2,7 +2,7 @@
 
 namespace Database\Seeders;
 
-use App\Speedtest;
+use App\Models\Speedtest;
 use Illuminate\Database\Seeder;
 
 class SpeedtestSeeder extends Seeder
diff --git a/database/speed.db b/database/speed.db
index 14f8cce3..a9becdbb 100644
Binary files a/database/speed.db and b/database/speed.db differ
diff --git a/routes/api.php b/routes/api.php
index 939628e3..8970db36 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -7,7 +7,7 @@ use App\Http\Controllers\HomepageDataController;
 use App\Http\Controllers\SettingsController;
 use App\Http\Controllers\SpeedtestController;
 use App\Http\Controllers\UpdateController;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Route;
 
diff --git a/tests/Feature/APISpeedtestTest.php b/tests/Feature/APISpeedtestTest.php
index fa13e7d0..4c40ca10 100644
--- a/tests/Feature/APISpeedtestTest.php
+++ b/tests/Feature/APISpeedtestTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Speedtest;
+use App\Models\Speedtest;
 use Faker\Factory;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Foundation\Testing\WithFaker;
diff --git a/tests/Unit/Controllers/SpeedtestController/DeleteTest.php b/tests/Unit/Controllers/SpeedtestController/DeleteTest.php
index 00e1ed95..4265c184 100644
--- a/tests/Unit/Controllers/SpeedtestController/DeleteTest.php
+++ b/tests/Unit/Controllers/SpeedtestController/DeleteTest.php
@@ -3,7 +3,7 @@
 namespace Tests\Unit\Controllers\SpeedtestController;
 
 use App\Http\Controllers\SpeedtestController;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
diff --git a/tests/Unit/Controllers/SpeedtestController/LatestTest.php b/tests/Unit/Controllers/SpeedtestController/LatestTest.php
index af7209cd..f1e18b53 100644
--- a/tests/Unit/Controllers/SpeedtestController/LatestTest.php
+++ b/tests/Unit/Controllers/SpeedtestController/LatestTest.php
@@ -3,7 +3,7 @@
 namespace Tests\Unit\Controllers\SpeedtestController;
 
 use App\Http\Controllers\SpeedtestController;
-use App\Speedtest;
+use App\Models\Speedtest;
 use DB;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
diff --git a/tests/Unit/Helpers/SpeedtestHelper/AbsoluteThresholdTest.php b/tests/Unit/Helpers/SpeedtestHelper/AbsoluteThresholdTest.php
index f257f6ff..b372dc50 100644
--- a/tests/Unit/Helpers/SpeedtestHelper/AbsoluteThresholdTest.php
+++ b/tests/Unit/Helpers/SpeedtestHelper/AbsoluteThresholdTest.php
@@ -4,7 +4,7 @@ namespace Tests\Unit\Helpers\SpeedtestHelper;
 
 use App\Helpers\SettingsHelper;
 use App\Helpers\SpeedtestHelper;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use InvalidArgumentException;
 use Tests\TestCase;
diff --git a/tests/Unit/Helpers/SpeedtestHelper/FailureRateTest.php b/tests/Unit/Helpers/SpeedtestHelper/FailureRateTest.php
index fe32692e..50ab4332 100644
--- a/tests/Unit/Helpers/SpeedtestHelper/FailureRateTest.php
+++ b/tests/Unit/Helpers/SpeedtestHelper/FailureRateTest.php
@@ -3,7 +3,7 @@
 namespace Tests\Unit\Helpers\SpeedtestHelper;
 
 use App\Helpers\SpeedtestHelper;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
diff --git a/tests/Unit/Helpers/SpeedtestHelper/PercentageThresholdTest.php b/tests/Unit/Helpers/SpeedtestHelper/PercentageThresholdTest.php
index 2ac63c27..d3ab232a 100644
--- a/tests/Unit/Helpers/SpeedtestHelper/PercentageThresholdTest.php
+++ b/tests/Unit/Helpers/SpeedtestHelper/PercentageThresholdTest.php
@@ -4,7 +4,7 @@ namespace Tests\Unit\Helpers\SpeedtestHelper;
 
 use App\Helpers\SettingsHelper;
 use App\Helpers\SpeedtestHelper;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
diff --git a/tests/Unit/Listeners/SpeedtestCompleteListener/SlackTest.php b/tests/Unit/Listeners/SpeedtestCompleteListener/SlackTest.php
index 65708a8e..72b94ffb 100644
--- a/tests/Unit/Listeners/SpeedtestCompleteListener/SlackTest.php
+++ b/tests/Unit/Listeners/SpeedtestCompleteListener/SlackTest.php
@@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestCompleteListener;
 
 use App\Helpers\SettingsHelper;
 use App\Listeners\SpeedtestCompleteListener;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Exception;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use stdClass;
diff --git a/tests/Unit/Listeners/SpeedtestCompleteListener/TelegramTest.php b/tests/Unit/Listeners/SpeedtestCompleteListener/TelegramTest.php
index 8c37051b..17fd28a2 100644
--- a/tests/Unit/Listeners/SpeedtestCompleteListener/TelegramTest.php
+++ b/tests/Unit/Listeners/SpeedtestCompleteListener/TelegramTest.php
@@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestCompleteListener;
 
 use App\Helpers\SettingsHelper;
 use App\Listeners\SpeedtestCompleteListener;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Exception;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use stdClass;
diff --git a/tests/Unit/Listeners/SpeedtestFailedListener/SlackTest.php b/tests/Unit/Listeners/SpeedtestFailedListener/SlackTest.php
index fea50dc1..1ab96fda 100644
--- a/tests/Unit/Listeners/SpeedtestFailedListener/SlackTest.php
+++ b/tests/Unit/Listeners/SpeedtestFailedListener/SlackTest.php
@@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestFailedListener;
 
 use App\Helpers\SettingsHelper;
 use App\Listeners\SpeedtestFailedListener;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Exception;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use stdClass;
diff --git a/tests/Unit/Listeners/SpeedtestFailedListener/TelegramTest.php b/tests/Unit/Listeners/SpeedtestFailedListener/TelegramTest.php
index 2e273738..f437abe5 100644
--- a/tests/Unit/Listeners/SpeedtestFailedListener/TelegramTest.php
+++ b/tests/Unit/Listeners/SpeedtestFailedListener/TelegramTest.php
@@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestFailedListener;
 
 use App\Helpers\SettingsHelper;
 use App\Listeners\SpeedtestFailedListener;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Exception;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use stdClass;
diff --git a/tests/Unit/Listeners/SpeedtestOverviewListener/SlackTest.php b/tests/Unit/Listeners/SpeedtestOverviewListener/SlackTest.php
index 8e471aa0..aa88395c 100644
--- a/tests/Unit/Listeners/SpeedtestOverviewListener/SlackTest.php
+++ b/tests/Unit/Listeners/SpeedtestOverviewListener/SlackTest.php
@@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestOverviewListener;
 
 use App\Helpers\SettingsHelper;
 use App\Listeners\SpeedtestOverviewListener;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Exception;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use stdClass;
diff --git a/tests/Unit/Listeners/SpeedtestOverviewListener/TelegramTest.php b/tests/Unit/Listeners/SpeedtestOverviewListener/TelegramTest.php
index fb841e03..001e0189 100644
--- a/tests/Unit/Listeners/SpeedtestOverviewListener/TelegramTest.php
+++ b/tests/Unit/Listeners/SpeedtestOverviewListener/TelegramTest.php
@@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestOverviewListener;
 
 use App\Helpers\SettingsHelper;
 use App\Listeners\SpeedtestOverviewListener;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Exception;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use stdClass;