diff --git a/composer.json b/composer.json
index 4e9b473..2838111 100644
--- a/composer.json
+++ b/composer.json
@@ -33,10 +33,9 @@
         }
     },
     "autoload-dev": {
-        "classmap": [
-            "tests/Traits",
-            "tests/TestCase.php"
-        ]
+        "psr-4": {
+            "Tests\\": "tests/"
+        }
     },
     "scripts": {
         "post-root-package-install": [
diff --git a/tests/api/ApiEventsTest.php b/tests/Feature/Api/ApiEventsTest.php
similarity index 98%
rename from tests/api/ApiEventsTest.php
rename to tests/Feature/Api/ApiEventsTest.php
index ec885a5..8a80160 100644
--- a/tests/api/ApiEventsTest.php
+++ b/tests/Feature/Api/ApiEventsTest.php
@@ -1,7 +1,10 @@
 <?php
 
+namespace Tests\Feature\Api;
+
 use App\Entities\Users\Event;
 use App\Entities\Users\User;
+use Tests\TestCase;
 
 class ApiEventsTest extends TestCase
 {
diff --git a/tests/api/ApiManageProjectsTest.php b/tests/Feature/Api/ApiManageProjectsTest.php
similarity index 90%
rename from tests/api/ApiManageProjectsTest.php
rename to tests/Feature/Api/ApiManageProjectsTest.php
index bf78657..836022a 100644
--- a/tests/api/ApiManageProjectsTest.php
+++ b/tests/Feature/Api/ApiManageProjectsTest.php
@@ -1,7 +1,10 @@
 <?php
 
+namespace Tests\Feature\Api;
+
 use App\Entities\Projects\Project;
 use App\Entities\Users\User;
+use Tests\TestCase;
 
 class ApiManageProjectsTest extends TestCase
 {
diff --git a/tests/auth/ManageUsersTest.php b/tests/Feature/Auth/ManageUsersTest.php
similarity index 98%
rename from tests/auth/ManageUsersTest.php
rename to tests/Feature/Auth/ManageUsersTest.php
index bd7b149..80fde6e 100644
--- a/tests/auth/ManageUsersTest.php
+++ b/tests/Feature/Auth/ManageUsersTest.php
@@ -1,6 +1,9 @@
 <?php
 
+namespace Tests\Feature\Auth;
+
 use App\Entities\Users\User;
+use Tests\TestCase;
 
 class ManageUsersTest extends TestCase
 {
diff --git a/tests/auth/MemberChangePasswordTest.php b/tests/Feature/Auth/MemberChangePasswordTest.php
similarity index 95%
rename from tests/auth/MemberChangePasswordTest.php
rename to tests/Feature/Auth/MemberChangePasswordTest.php
index b970df1..4be6adc 100644
--- a/tests/auth/MemberChangePasswordTest.php
+++ b/tests/Feature/Auth/MemberChangePasswordTest.php
@@ -1,6 +1,9 @@
 <?php
 
+namespace Tests\Feature\Auth;
+
 use App\Entities\Users\User;
+use Tests\TestCase;
 
 class MemberChangePasswordTest extends TestCase
 {
diff --git a/tests/auth/MemberRegistrationAndLoginTest.php b/tests/Feature/Auth/MemberRegistrationAndLoginTest.php
similarity index 98%
rename from tests/auth/MemberRegistrationAndLoginTest.php
rename to tests/Feature/Auth/MemberRegistrationAndLoginTest.php
index c56cc15..8ea68ba 100644
--- a/tests/auth/MemberRegistrationAndLoginTest.php
+++ b/tests/Feature/Auth/MemberRegistrationAndLoginTest.php
@@ -1,6 +1,9 @@
 <?php
 
+namespace Tests\Feature\Auth;
+
 use App\Entities\Users\User;
+use Tests\TestCase;
 
 class MemberRegistrationAndLoginTest extends TestCase
 {
diff --git a/tests/auth/ResetPasswordTest.php b/tests/Feature/Auth/ResetPasswordTest.php
similarity index 94%
rename from tests/auth/ResetPasswordTest.php
rename to tests/Feature/Auth/ResetPasswordTest.php
index d44e214..a16d1f0 100644
--- a/tests/auth/ResetPasswordTest.php
+++ b/tests/Feature/Auth/ResetPasswordTest.php
@@ -1,6 +1,9 @@
 <?php
 
+namespace Tests\Feature\Auth;
+
 use App\Entities\Users\User;
+use Tests\TestCase;
 
 class ResetPasswordTest extends TestCase
 {
diff --git a/tests/functional/ManageFeaturesTest.php b/tests/Feature/ManageFeaturesTest.php
similarity index 99%
rename from tests/functional/ManageFeaturesTest.php
rename to tests/Feature/ManageFeaturesTest.php
index e7b41db..377f363 100644
--- a/tests/functional/ManageFeaturesTest.php
+++ b/tests/Feature/ManageFeaturesTest.php
@@ -1,9 +1,12 @@
 <?php
 
+namespace Tests\Feature;
+
 use App\Entities\Projects\Feature;
 use App\Entities\Projects\Project;
 use App\Entities\Projects\Task;
 use App\Entities\Users\User;
+use Tests\TestCase;
 
 class ManageFeaturesTest extends TestCase
 {
diff --git a/tests/functional/ManagePaymentsTest.php b/tests/Feature/ManagePaymentsTest.php
similarity index 99%
rename from tests/functional/ManagePaymentsTest.php
rename to tests/Feature/ManagePaymentsTest.php
index f0cf5e2..9341884 100644
--- a/tests/functional/ManagePaymentsTest.php
+++ b/tests/Feature/ManagePaymentsTest.php
@@ -1,8 +1,11 @@
 <?php
 
+namespace Tests\Feature;
+
 use App\Entities\Payments\Payment;
 use App\Entities\Projects\Project;
 use App\Entities\Users\User;
+use Tests\TestCase;
 
 class ManagePaymentsTest extends TestCase
 {
diff --git a/tests/functional/ManageProjectsTest.php b/tests/Feature/ManageProjectsTest.php
similarity index 99%
rename from tests/functional/ManageProjectsTest.php
rename to tests/Feature/ManageProjectsTest.php
index 8c42375..ee419e9 100644
--- a/tests/functional/ManageProjectsTest.php
+++ b/tests/Feature/ManageProjectsTest.php
@@ -1,11 +1,14 @@
 <?php
 
+namespace Tests\Feature;
+
 use App\Entities\Payments\Payment;
 use App\Entities\Projects\Feature;
 use App\Entities\Projects\Project;
 use App\Entities\Projects\Task;
 use App\Entities\Users\Role;
 use App\Entities\Users\User;
+use Tests\TestCase;
 
 class ManageProjectsTest extends TestCase
 {
diff --git a/tests/functional/ManageSubscriptionsTest.php b/tests/Feature/ManageSubscriptionsTest.php
similarity index 99%
rename from tests/functional/ManageSubscriptionsTest.php
rename to tests/Feature/ManageSubscriptionsTest.php
index 8c87b2c..246999e 100644
--- a/tests/functional/ManageSubscriptionsTest.php
+++ b/tests/Feature/ManageSubscriptionsTest.php
@@ -1,8 +1,11 @@
 <?php
 
+namespace Tests\Feature;
+
 use App\Entities\Projects\Project;
 use App\Entities\Subscriptions\Subscription;
 use App\Entities\Users\User;
+use Tests\TestCase;
 
 class ManageSubscriptionsTest extends TestCase
 {
diff --git a/tests/functional/ManageTasksTest.php b/tests/Feature/ManageTasksTest.php
similarity index 98%
rename from tests/functional/ManageTasksTest.php
rename to tests/Feature/ManageTasksTest.php
index 5396a34..228be24 100644
--- a/tests/functional/ManageTasksTest.php
+++ b/tests/Feature/ManageTasksTest.php
@@ -1,9 +1,12 @@
 <?php
 
+namespace Tests\Feature;
+
 use App\Entities\Projects\Feature;
 use App\Entities\Projects\Project;
 use App\Entities\Projects\Task;
 use App\Entities\Users\User;
+use Tests\TestCase;
 
 class ManageTasksTest extends TestCase
 {
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 6c5276a..b7b20ce 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,9 +1,12 @@
 <?php
 
+namespace Tests;
+
 use App\Entities\Users\Role;
 use App\Entities\Users\User;
+use Tests\Traits\DatabaseMigrateSeeds;
 
-class TestCase extends Laravel\BrowserKitTesting\TestCase
+class TestCase extends \Laravel\BrowserKitTesting\TestCase
 {
     use DatabaseMigrateSeeds;
 
@@ -23,7 +26,7 @@ class TestCase extends Laravel\BrowserKitTesting\TestCase
     {
         $app = require __DIR__.'/../bootstrap/app.php';
 
-        $app->make(Illuminate\Contracts\Console\Kernel::class)->bootstrap();
+        $app->make(\Illuminate\Contracts\Console\Kernel::class)->bootstrap();
         \Hash::setRounds(5);
 
         return $app;
diff --git a/tests/Traits/DatabaseMigrateSeeds.php b/tests/Traits/DatabaseMigrateSeeds.php
index 41a1f2b..55134e8 100644
--- a/tests/Traits/DatabaseMigrateSeeds.php
+++ b/tests/Traits/DatabaseMigrateSeeds.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Tests\Traits;
+
 use Illuminate\Contracts\Console\Kernel;
 
 trait DatabaseMigrateSeeds