diff --git a/composer.json b/composer.json
index 2a52ca3..6b3a471 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,8 @@
         "spatie/macroable": "^1.0",
         "mindplay/middleman": "^3.0.3",
         "psr/log": "^1.1",
-        "laminas/laminas-zendframework-bridge": "^1.4"
+        "laminas/laminas-zendframework-bridge": "^1.4",
+        "phpstan/phpstan": "^1.10"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.0",
@@ -44,5 +45,10 @@
         "psr-4": {
             "Rareloop\\Lumberjack\\Test\\": "tests"
         }
+    },
+    "config": {
+        "allow-plugins": {
+            "composer/installers": true
+        }
     }
 }
diff --git a/tests/Unit/ApplicationTest.php b/tests/ApplicationTest.php
similarity index 99%
rename from tests/Unit/ApplicationTest.php
rename to tests/ApplicationTest.php
index a042218..1f1ae64 100644
--- a/tests/Unit/ApplicationTest.php
+++ b/tests/ApplicationTest.php
@@ -7,7 +7,6 @@
 use PHPUnit\Framework\TestCase;
 use Rareloop\Lumberjack\Application;
 use Rareloop\Lumberjack\Providers\ServiceProvider;
-use Rareloop\Lumberjack\Test\Unit\BrainMonkeyPHPUnitIntegration;
 use phpmock\Mock;
 use phpmock\MockBuilder;
 use Brain\Monkey;
diff --git a/tests/Unit/Bootstrappers/BootProvidersTest.php b/tests/Bootstrappers/BootProvidersTest.php
similarity index 100%
rename from tests/Unit/Bootstrappers/BootProvidersTest.php
rename to tests/Bootstrappers/BootProvidersTest.php
diff --git a/tests/Unit/Bootstrappers/LoadConfigurationTest.php b/tests/Bootstrappers/LoadConfigurationTest.php
similarity index 100%
rename from tests/Unit/Bootstrappers/LoadConfigurationTest.php
rename to tests/Bootstrappers/LoadConfigurationTest.php
diff --git a/tests/Unit/Bootstrappers/RegisterAliasesTest.php b/tests/Bootstrappers/RegisterAliasesTest.php
similarity index 100%
rename from tests/Unit/Bootstrappers/RegisterAliasesTest.php
rename to tests/Bootstrappers/RegisterAliasesTest.php
diff --git a/tests/Unit/Bootstrappers/RegisterExceptionHandlerTest.php b/tests/Bootstrappers/RegisterExceptionHandlerTest.php
similarity index 98%
rename from tests/Unit/Bootstrappers/RegisterExceptionHandlerTest.php
rename to tests/Bootstrappers/RegisterExceptionHandlerTest.php
index 26396b9..e5387cf 100644
--- a/tests/Unit/Bootstrappers/RegisterExceptionHandlerTest.php
+++ b/tests/Bootstrappers/RegisterExceptionHandlerTest.php
@@ -12,7 +12,7 @@
 use Rareloop\Lumberjack\Config;
 use Rareloop\Lumberjack\Exceptions\Handler;
 use Rareloop\Lumberjack\Exceptions\HandlerInterface;
-use Rareloop\Lumberjack\Test\Unit\BrainMonkeyPHPUnitIntegration;
+use Rareloop\Lumberjack\Test\BrainMonkeyPHPUnitIntegration;
 use Rareloop\Router\Responsable;
 use Symfony\Component\Debug\Exception\FatalErrorException;
 use Zend\Diactoros\Response;
diff --git a/tests/Unit/Bootstrappers/RegisterFacadesTest.php b/tests/Bootstrappers/RegisterFacadesTest.php
similarity index 100%
rename from tests/Unit/Bootstrappers/RegisterFacadesTest.php
rename to tests/Bootstrappers/RegisterFacadesTest.php
diff --git a/tests/Unit/Bootstrappers/RegisterProvidersTest.php b/tests/Bootstrappers/RegisterProvidersTest.php
similarity index 100%
rename from tests/Unit/Bootstrappers/RegisterProvidersTest.php
rename to tests/Bootstrappers/RegisterProvidersTest.php
diff --git a/tests/Unit/Bootstrappers/RegisterRequestHandlerTest.php b/tests/Bootstrappers/RegisterRequestHandlerTest.php
similarity index 100%
rename from tests/Unit/Bootstrappers/RegisterRequestHandlerTest.php
rename to tests/Bootstrappers/RegisterRequestHandlerTest.php
diff --git a/tests/Unit/BrainMonkeyPHPUnitIntegration.php b/tests/BrainMonkeyPHPUnitIntegration.php
similarity index 88%
rename from tests/Unit/BrainMonkeyPHPUnitIntegration.php
rename to tests/BrainMonkeyPHPUnitIntegration.php
index d008cc2..0dccdfe 100644
--- a/tests/Unit/BrainMonkeyPHPUnitIntegration.php
+++ b/tests/BrainMonkeyPHPUnitIntegration.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rareloop\Lumberjack\Test\Unit;
+namespace Rareloop\Lumberjack\Test;
 
 use Brain\Monkey;
 
diff --git a/tests/Unit/ConfigTest.php b/tests/ConfigTest.php
similarity index 100%
rename from tests/Unit/ConfigTest.php
rename to tests/ConfigTest.php
diff --git a/tests/Unit/EncrypterTest.php b/tests/EncrypterTest.php
similarity index 100%
rename from tests/Unit/EncrypterTest.php
rename to tests/EncrypterTest.php
diff --git a/tests/Unit/Exceptions/HandlerTest.php b/tests/Exceptions/HandlerTest.php
similarity index 100%
rename from tests/Unit/Exceptions/HandlerTest.php
rename to tests/Exceptions/HandlerTest.php
diff --git a/tests/Unit/Facades/ConfigTest.php b/tests/Facades/ConfigTest.php
similarity index 100%
rename from tests/Unit/Facades/ConfigTest.php
rename to tests/Facades/ConfigTest.php
diff --git a/tests/Unit/Facades/LogTest.php b/tests/Facades/LogTest.php
similarity index 100%
rename from tests/Unit/Facades/LogTest.php
rename to tests/Facades/LogTest.php
diff --git a/tests/Unit/Facades/MiddlewareAliasesTest.php b/tests/Facades/MiddlewareAliasesTest.php
similarity index 100%
rename from tests/Unit/Facades/MiddlewareAliasesTest.php
rename to tests/Facades/MiddlewareAliasesTest.php
diff --git a/tests/Unit/Facades/RouterTest.php b/tests/Facades/RouterTest.php
similarity index 100%
rename from tests/Unit/Facades/RouterTest.php
rename to tests/Facades/RouterTest.php
diff --git a/tests/Unit/Facades/SessionTest.php b/tests/Facades/SessionTest.php
similarity index 90%
rename from tests/Unit/Facades/SessionTest.php
rename to tests/Facades/SessionTest.php
index af7103e..9891972 100644
--- a/tests/Unit/Facades/SessionTest.php
+++ b/tests/Facades/SessionTest.php
@@ -7,7 +7,7 @@
 use Rareloop\Lumberjack\Application;
 use Rareloop\Lumberjack\Facades\Session;
 use Rareloop\Lumberjack\Session\SessionManager;
-use Rareloop\Lumberjack\Test\Unit\Session\NullSessionHandler;
+use Rareloop\Lumberjack\Test\Session\NullSessionHandler;
 
 class SessionTest extends TestCase
 {
diff --git a/tests/Unit/GlobalFunctionsTest.php b/tests/GlobalFunctionsTest.php
similarity index 95%
rename from tests/Unit/GlobalFunctionsTest.php
rename to tests/GlobalFunctionsTest.php
index bc0d1d6..ab298ef 100644
--- a/tests/Unit/GlobalFunctionsTest.php
+++ b/tests/GlobalFunctionsTest.php
@@ -16,7 +16,7 @@ class GlobalFunctionsTest extends TestCase
 
     public function setUp(): void
     {
-        include_once(__DIR__ . '/../../src/functions.php');
+        include_once(__DIR__ . '/../src/functions.php');
 
         parent::setUp();
     }
diff --git a/tests/Unit/HelpersTest.php b/tests/HelpersTest.php
similarity index 100%
rename from tests/Unit/HelpersTest.php
rename to tests/HelpersTest.php
diff --git a/tests/Unit/Http/MiddlewareAliasStoreTest.php b/tests/Http/MiddlewareAliasStoreTest.php
similarity index 100%
rename from tests/Unit/Http/MiddlewareAliasStoreTest.php
rename to tests/Http/MiddlewareAliasStoreTest.php
diff --git a/tests/Unit/Http/MiddlewareResolverTest.php b/tests/Http/MiddlewareResolverTest.php
similarity index 100%
rename from tests/Unit/Http/MiddlewareResolverTest.php
rename to tests/Http/MiddlewareResolverTest.php
diff --git a/tests/Unit/Http/Responses/RedirectResponseTest.php b/tests/Http/Responses/RedirectResponseTest.php
similarity index 100%
rename from tests/Unit/Http/Responses/RedirectResponseTest.php
rename to tests/Http/Responses/RedirectResponseTest.php
diff --git a/tests/Unit/Http/Responses/TimberResponseTest.php b/tests/Http/Responses/TimberResponseTest.php
similarity index 100%
rename from tests/Unit/Http/Responses/TimberResponseTest.php
rename to tests/Http/Responses/TimberResponseTest.php
diff --git a/tests/Unit/Http/RouterTest.php b/tests/Http/RouterTest.php
similarity index 100%
rename from tests/Unit/Http/RouterTest.php
rename to tests/Http/RouterTest.php
diff --git a/tests/Unit/Http/ServerRequestTest.php b/tests/Http/ServerRequestTest.php
similarity index 100%
rename from tests/Unit/Http/ServerRequestTest.php
rename to tests/Http/ServerRequestTest.php
diff --git a/tests/Unit/LumberjackTest.php b/tests/LumberjackTest.php
similarity index 95%
rename from tests/Unit/LumberjackTest.php
rename to tests/LumberjackTest.php
index a93e718..7c0b19c 100644
--- a/tests/Unit/LumberjackTest.php
+++ b/tests/LumberjackTest.php
@@ -15,7 +15,6 @@
 use Rareloop\Lumberjack\Bootstrappers\RegisterProviders;
 use Rareloop\Lumberjack\Bootstrappers\RegisterRequestHandler;
 use Rareloop\Lumberjack\Http\Lumberjack;
-use Rareloop\Lumberjack\Test\Unit\BrainMonkeyPHPUnitIntegration;
 
 class LumberjackTest extends TestCase
 {
diff --git a/tests/Unit/PageTest.php b/tests/PageTest.php
similarity index 81%
rename from tests/Unit/PageTest.php
rename to tests/PageTest.php
index cbf32c0..622cc83 100644
--- a/tests/Unit/PageTest.php
+++ b/tests/PageTest.php
@@ -4,7 +4,6 @@
 
 use PHPUnit\Framework\TestCase;
 use Rareloop\Lumberjack\Page;
-use Rareloop\Lumberjack\Test\Unit\BrainMonkeyPHPUnitIntegration;
 
 class PageTest extends TestCase
 {
diff --git a/tests/Unit/PostQueryBuilderTest.php b/tests/PostQueryBuilderTest.php
similarity index 100%
rename from tests/Unit/PostQueryBuilderTest.php
rename to tests/PostQueryBuilderTest.php
diff --git a/tests/Unit/PostTest.php b/tests/PostTest.php
similarity index 99%
rename from tests/Unit/PostTest.php
rename to tests/PostTest.php
index 2dbe99f..2811ce5 100644
--- a/tests/Unit/PostTest.php
+++ b/tests/PostTest.php
@@ -7,7 +7,6 @@
 use Mockery;
 use PHPUnit\Framework\TestCase;
 use Rareloop\Lumberjack\Post;
-use Rareloop\Lumberjack\Test\Unit\BrainMonkeyPHPUnitIntegration;
 use Timber\Timber;
 
 /**
diff --git a/tests/Unit/Providers/CustomPostTypesServiceProviderTest.php b/tests/Providers/CustomPostTypesServiceProviderTest.php
similarity index 92%
rename from tests/Unit/Providers/CustomPostTypesServiceProviderTest.php
rename to tests/Providers/CustomPostTypesServiceProviderTest.php
index ae58e05..43e4917 100644
--- a/tests/Unit/Providers/CustomPostTypesServiceProviderTest.php
+++ b/tests/Providers/CustomPostTypesServiceProviderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rareloop\Lumberjack\Test;
+namespace Rareloop\Lumberjack\Test\Providers;
 
 use Brain\Monkey\Functions;
 use Mockery;
@@ -9,7 +9,7 @@
 use Rareloop\Lumberjack\Config;
 use Rareloop\Lumberjack\Post;
 use Rareloop\Lumberjack\Providers\CustomPostTypesServiceProvider;
-use Rareloop\Lumberjack\Test\Unit\BrainMonkeyPHPUnitIntegration;
+use Rareloop\Lumberjack\Test\BrainMonkeyPHPUnitIntegration;
 
 class CustomPostTypesServiceProviderTest extends TestCase
 {
diff --git a/tests/Unit/Providers/EncryptionServiceProviderTest.php b/tests/Providers/EncryptionServiceProviderTest.php
similarity index 93%
rename from tests/Unit/Providers/EncryptionServiceProviderTest.php
rename to tests/Providers/EncryptionServiceProviderTest.php
index 89ccfdb..7f5db33 100644
--- a/tests/Unit/Providers/EncryptionServiceProviderTest.php
+++ b/tests/Providers/EncryptionServiceProviderTest.php
@@ -8,7 +8,7 @@
 use Rareloop\Lumberjack\Contracts\Encrypter as EncrypterContract;
 use Rareloop\Lumberjack\Encrypter;
 use Rareloop\Lumberjack\Providers\EncryptionServiceProvider;
-use Rareloop\Lumberjack\Test\Unit\BrainMonkeyPHPUnitIntegration;
+use Rareloop\Lumberjack\Test\BrainMonkeyPHPUnitIntegration;
 
 class EncryptionServiceProviderTest extends TestCase
 {
diff --git a/tests/Unit/Providers/ImageSizesServiceProviderTest.php b/tests/Providers/ImageSizesServiceProviderTest.php
similarity index 96%
rename from tests/Unit/Providers/ImageSizesServiceProviderTest.php
rename to tests/Providers/ImageSizesServiceProviderTest.php
index 7ea5ced..3762065 100644
--- a/tests/Unit/Providers/ImageSizesServiceProviderTest.php
+++ b/tests/Providers/ImageSizesServiceProviderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rareloop\Lumberjack\Test;
+namespace Rareloop\Lumberjack\Test\Providers;
 
 use Brain\Monkey\Functions;
 use Mockery;
@@ -8,7 +8,7 @@
 use Rareloop\Lumberjack\Application;
 use Rareloop\Lumberjack\Config;
 use Rareloop\Lumberjack\Providers\ImageSizesServiceProvider;
-use Rareloop\Lumberjack\Test\Unit\BrainMonkeyPHPUnitIntegration;
+use Rareloop\Lumberjack\Test\BrainMonkeyPHPUnitIntegration;
 
 class ImageSizesServiceProviderTest extends TestCase
 {
diff --git a/tests/Unit/Providers/LogServiceProviderTest.php b/tests/Providers/LogServiceProviderTest.php
similarity index 98%
rename from tests/Unit/Providers/LogServiceProviderTest.php
rename to tests/Providers/LogServiceProviderTest.php
index 1b16036..f1d2d59 100644
--- a/tests/Unit/Providers/LogServiceProviderTest.php
+++ b/tests/Providers/LogServiceProviderTest.php
@@ -11,7 +11,7 @@
 use Rareloop\Lumberjack\Bootstrappers\RegisterProviders;
 use Rareloop\Lumberjack\Config;
 use Rareloop\Lumberjack\Http\Lumberjack;
-use Rareloop\Lumberjack\Test\Unit\BrainMonkeyPHPUnitIntegration;
+use Rareloop\Lumberjack\Test\BrainMonkeyPHPUnitIntegration;
 
 class LogServiceProviderTest extends TestCase
 {
diff --git a/tests/Unit/Providers/MenusServiceProviderTest.php b/tests/Providers/MenusServiceProviderTest.php
similarity index 94%
rename from tests/Unit/Providers/MenusServiceProviderTest.php
rename to tests/Providers/MenusServiceProviderTest.php
index 26504f9..d2309e0 100644
--- a/tests/Unit/Providers/MenusServiceProviderTest.php
+++ b/tests/Providers/MenusServiceProviderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rareloop\Lumberjack\Test;
+namespace Rareloop\Lumberjack\Test\Providers;
 
 use Brain\Monkey\Functions;
 use Mockery;
@@ -8,7 +8,7 @@
 use Rareloop\Lumberjack\Application;
 use Rareloop\Lumberjack\Config;
 use Rareloop\Lumberjack\Providers\MenusServiceProvider;
-use Rareloop\Lumberjack\Test\Unit\BrainMonkeyPHPUnitIntegration;
+use Rareloop\Lumberjack\Test\BrainMonkeyPHPUnitIntegration;
 
 class MenusServiceProviderTest extends TestCase
 {
diff --git a/tests/Unit/Providers/QueryBuilderServiceProviderTest.php b/tests/Providers/QueryBuilderServiceProviderTest.php
similarity index 100%
rename from tests/Unit/Providers/QueryBuilderServiceProviderTest.php
rename to tests/Providers/QueryBuilderServiceProviderTest.php
diff --git a/tests/Unit/Providers/RouterServiceProviderTest.php b/tests/Providers/RouterServiceProviderTest.php
similarity index 99%
rename from tests/Unit/Providers/RouterServiceProviderTest.php
rename to tests/Providers/RouterServiceProviderTest.php
index 41fb1bc..e6975db 100644
--- a/tests/Unit/Providers/RouterServiceProviderTest.php
+++ b/tests/Providers/RouterServiceProviderTest.php
@@ -16,7 +16,7 @@
 use Rareloop\Lumberjack\Http\Lumberjack;
 use Rareloop\Lumberjack\Http\Router;
 use Rareloop\Lumberjack\Providers\RouterServiceProvider;
-use Rareloop\Lumberjack\Test\Unit\BrainMonkeyPHPUnitIntegration;
+use Rareloop\Lumberjack\Test\BrainMonkeyPHPUnitIntegration;
 use Rareloop\Router\MiddlewareResolver;
 use Zend\Diactoros\Request;
 use Zend\Diactoros\Response\HtmlResponse;
diff --git a/tests/Unit/Providers/ServiceProviderTest.php b/tests/Providers/ServiceProviderTest.php
similarity index 94%
rename from tests/Unit/Providers/ServiceProviderTest.php
rename to tests/Providers/ServiceProviderTest.php
index 84f933b..f950985 100644
--- a/tests/Unit/Providers/ServiceProviderTest.php
+++ b/tests/Providers/ServiceProviderTest.php
@@ -7,7 +7,7 @@
 use Rareloop\Lumberjack\Application;
 use Rareloop\Lumberjack\Config;
 use Rareloop\Lumberjack\Providers\ServiceProvider;
-use Rareloop\Lumberjack\Test\Unit\BrainMonkeyPHPUnitIntegration;
+use Rareloop\Lumberjack\Test\BrainMonkeyPHPUnitIntegration;
 
 class ServiceProviderTest extends TestCase
 {
diff --git a/tests/Unit/Providers/SessionServiceProviderTest.php b/tests/Providers/SessionServiceProviderTest.php
similarity index 90%
rename from tests/Unit/Providers/SessionServiceProviderTest.php
rename to tests/Providers/SessionServiceProviderTest.php
index de6adf1..ee9ab79 100644
--- a/tests/Unit/Providers/SessionServiceProviderTest.php
+++ b/tests/Providers/SessionServiceProviderTest.php
@@ -6,7 +6,7 @@
 use Rareloop\Lumberjack\Application;
 use Rareloop\Lumberjack\Providers\SessionServiceProvider;
 use Rareloop\Lumberjack\Session\SessionManager;
-use Rareloop\Lumberjack\Test\Unit\BrainMonkeyPHPUnitIntegration;
+use Rareloop\Lumberjack\Test\BrainMonkeyPHPUnitIntegration;
 
 class SessionServiceProviderTest extends TestCase
 {
diff --git a/tests/Unit/Providers/ThemeSupportServiceProviderTest.php b/tests/Providers/ThemeSupportServiceProviderTest.php
similarity index 92%
rename from tests/Unit/Providers/ThemeSupportServiceProviderTest.php
rename to tests/Providers/ThemeSupportServiceProviderTest.php
index bc3dd6c..e4f59ff 100644
--- a/tests/Unit/Providers/ThemeSupportServiceProviderTest.php
+++ b/tests/Providers/ThemeSupportServiceProviderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rareloop\Lumberjack\Test;
+namespace Rareloop\Lumberjack\Test\Providers;
 
 use Brain\Monkey\Functions;
 use Mockery;
@@ -8,7 +8,7 @@
 use Rareloop\Lumberjack\Application;
 use Rareloop\Lumberjack\Config;
 use Rareloop\Lumberjack\Providers\ThemeSupportServiceProvider;
-use Rareloop\Lumberjack\Test\Unit\BrainMonkeyPHPUnitIntegration;
+use Rareloop\Lumberjack\Test\BrainMonkeyPHPUnitIntegration;
 
 class ThemeSupportServiceProviderTest extends TestCase
 {
diff --git a/tests/Unit/Providers/TimberServiceProviderTest.php b/tests/Providers/TimberServiceProviderTest.php
similarity index 96%
rename from tests/Unit/Providers/TimberServiceProviderTest.php
rename to tests/Providers/TimberServiceProviderTest.php
index 960576a..a0eca0e 100644
--- a/tests/Unit/Providers/TimberServiceProviderTest.php
+++ b/tests/Providers/TimberServiceProviderTest.php
@@ -11,7 +11,7 @@
 use Rareloop\Lumberjack\Config;
 use Rareloop\Lumberjack\Http\Lumberjack;
 use Rareloop\Lumberjack\Providers\TimberServiceProvider;
-use Rareloop\Lumberjack\Test\Unit\BrainMonkeyPHPUnitIntegration;
+use Rareloop\Lumberjack\Test\BrainMonkeyPHPUnitIntegration;
 use Timber\Timber;
 
 class TimberServiceProviderTest extends TestCase
diff --git a/tests/Unit/Providers/WordPressControllersServiceProviderTest.php b/tests/Providers/WordPressControllersServiceProviderTest.php
similarity index 99%
rename from tests/Unit/Providers/WordPressControllersServiceProviderTest.php
rename to tests/Providers/WordPressControllersServiceProviderTest.php
index ed18213..e1cc080 100644
--- a/tests/Unit/Providers/WordPressControllersServiceProviderTest.php
+++ b/tests/Providers/WordPressControllersServiceProviderTest.php
@@ -19,11 +19,11 @@
 use Rareloop\Lumberjack\Http\MiddlewareResolver;
 use Rareloop\Lumberjack\Providers\RouterServiceProvider;
 use Rareloop\Lumberjack\Providers\WordPressControllersServiceProvider;
-use Rareloop\Lumberjack\Test\Unit\BrainMonkeyPHPUnitIntegration;
+use Rareloop\Lumberjack\Test\BrainMonkeyPHPUnitIntegration;
 use Rareloop\Router\Responsable;
 use Zend\Diactoros\Response\TextResponse;
 use Zend\Diactoros\ServerRequest;
-use \Mockery;
+use Mockery;
 
 class WordPressControllersServiceProviderTest extends TestCase
 {
diff --git a/tests/Unit/Providers/includes/single.php b/tests/Providers/includes/single.php
similarity index 100%
rename from tests/Unit/Providers/includes/single.php
rename to tests/Providers/includes/single.php
diff --git a/tests/Unit/QueryBuilderTest.php b/tests/QueryBuilderTest.php
similarity index 100%
rename from tests/Unit/QueryBuilderTest.php
rename to tests/QueryBuilderTest.php
diff --git a/tests/Unit/ScopedQueryBuilderTest.php b/tests/ScopedQueryBuilderTest.php
similarity index 100%
rename from tests/Unit/ScopedQueryBuilderTest.php
rename to tests/ScopedQueryBuilderTest.php
diff --git a/tests/Unit/Session/EncryptedStoreTest.php b/tests/Session/EncryptedStoreTest.php
similarity index 94%
rename from tests/Unit/Session/EncryptedStoreTest.php
rename to tests/Session/EncryptedStoreTest.php
index 5d80a46..5918aae 100644
--- a/tests/Unit/Session/EncryptedStoreTest.php
+++ b/tests/Session/EncryptedStoreTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rareloop\Lumberjack\Test;
+namespace Rareloop\Lumberjack\Test\Session;
 
 use Dcrypt\AesCbc;
 use Mockery;
@@ -8,7 +8,6 @@
 use Rareloop\Lumberjack\Encrypter;
 use Rareloop\Lumberjack\Session\EncryptedStore;
 use Rareloop\Lumberjack\Session\Store;
-use Rareloop\Lumberjack\Test\Unit\Session\NullSessionHandler;
 
 class EncryptedStoreTest extends TestCase
 {
diff --git a/tests/Unit/Session/FileSessionHandlerTest.php b/tests/Session/FileSessionHandlerTest.php
similarity index 98%
rename from tests/Unit/Session/FileSessionHandlerTest.php
rename to tests/Session/FileSessionHandlerTest.php
index c2801e9..48da6cc 100644
--- a/tests/Unit/Session/FileSessionHandlerTest.php
+++ b/tests/Session/FileSessionHandlerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rareloop\Lumberjack\Test;
+namespace Rareloop\Lumberjack\Test\Session;
 
 use Mockery;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Unit/Session/NullSessionHandler.php b/tests/Session/NullSessionHandler.php
similarity index 91%
rename from tests/Unit/Session/NullSessionHandler.php
rename to tests/Session/NullSessionHandler.php
index 2391d49..c722d6c 100644
--- a/tests/Unit/Session/NullSessionHandler.php
+++ b/tests/Session/NullSessionHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rareloop\Lumberjack\Test\Unit\Session;
+namespace Rareloop\Lumberjack\Test\Session;
 
 use SessionHandlerInterface;
 
diff --git a/tests/Unit/Session/SessionManagerTest.php b/tests/Session/SessionManagerTest.php
similarity index 96%
rename from tests/Unit/Session/SessionManagerTest.php
rename to tests/Session/SessionManagerTest.php
index c46a2c9..bcfd1f8 100644
--- a/tests/Unit/Session/SessionManagerTest.php
+++ b/tests/Session/SessionManagerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rareloop\Lumberjack\Test;
+namespace Rareloop\Lumberjack\Test\Session;
 
 use Mockery;
 use PHPUnit\Framework\TestCase;
@@ -12,7 +12,6 @@
 use Rareloop\Lumberjack\Session\FileSessionHandler;
 use Rareloop\Lumberjack\Session\SessionManager;
 use Rareloop\Lumberjack\Session\Store;
-use Rareloop\Lumberjack\Test\Unit\Session\NullSessionHandler;
 use org\bovigo\vfs\vfsStream;
 
 class SessionManagerTest extends TestCase
diff --git a/tests/Unit/Session/StoreTest.php b/tests/Session/StoreTest.php
similarity index 99%
rename from tests/Unit/Session/StoreTest.php
rename to tests/Session/StoreTest.php
index b167f8a..5b93341 100644
--- a/tests/Unit/Session/StoreTest.php
+++ b/tests/Session/StoreTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Rareloop\Lumberjack\Test;
+namespace Rareloop\Lumberjack\Test\Session;
 
 use Mockery;
 use PHPUnit\Framework\TestCase;
 use Rareloop\Lumberjack\Session\Store;
-use Rareloop\Lumberjack\Test\Unit\Session\NullSessionHandler;
+use Rareloop\Lumberjack\Test\Session\NullSessionHandler;
 
 class StoreTest extends TestCase
 {
diff --git a/tests/Unit/ViewModelTest.php b/tests/ViewModelTest.php
similarity index 100%
rename from tests/Unit/ViewModelTest.php
rename to tests/ViewModelTest.php
diff --git a/tests/Unit/config/another.php b/tests/config/another.php
similarity index 100%
rename from tests/Unit/config/another.php
rename to tests/config/another.php
diff --git a/tests/Unit/config/app.php b/tests/config/app.php
similarity index 100%
rename from tests/Unit/config/app.php
rename to tests/config/app.php