diff --git a/tests/ArgumentTest.php b/tests/Argument/ArgumentTest.php
similarity index 99%
rename from tests/ArgumentTest.php
rename to tests/Argument/ArgumentTest.php
index 59a25fea..89d9d22c 100644
--- a/tests/ArgumentTest.php
+++ b/tests/Argument/ArgumentTest.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\Argument;
 
 use League\CLImate\Argument\Argument;
 use League\CLImate\Exceptions\InvalidArgumentException;
 use League\CLImate\Exceptions\UnexpectedValueException;
+use League\CLImate\Tests\TestBase;
 
 class ArgumentTest extends TestBase
 {
@@ -128,7 +129,6 @@ public function it_casts_to_bool_when_defined_only()
 
     /**
      * @test
-     * @doesNotPerformAssertions
      */
     public function it_casts_to_bool_when_defined_only_true()
     {
diff --git a/tests/CommandTest.php b/tests/Decorator/Component/CommandTest.php
similarity index 93%
rename from tests/CommandTest.php
rename to tests/Decorator/Component/CommandTest.php
index 83ab9c38..3bb8e582 100644
--- a/tests/CommandTest.php
+++ b/tests/Decorator/Component/CommandTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\Decorator\Component;
 
 use League\CLImate\Decorator\Component\Command;
+use League\CLImate\Tests\TestBase;
 
 class CommandTest extends TestBase
 {
diff --git a/tests/AnsiTest.php b/tests/Decorator/Parser/AnsiTest.php
similarity index 97%
rename from tests/AnsiTest.php
rename to tests/Decorator/Parser/AnsiTest.php
index 3717c587..b4350e22 100644
--- a/tests/AnsiTest.php
+++ b/tests/Decorator/Parser/AnsiTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\Decorator\Parser;
 
 use League\CLImate\Decorator\Parser\Ansi;
 use League\CLImate\Decorator\Parser\NonAnsi;
@@ -9,6 +9,7 @@
 use League\CLImate\Decorator\Tags;
 use League\CLImate\TerminalObject;
 use League\CLImate\TerminalObject\Router\BasicRouter;
+use League\CLImate\Tests\TestBase;
 use League\CLImate\Util\System\Linux;
 use League\CLImate\Util\System\Windows;
 use League\CLImate\Util\UtilFactory;
diff --git a/tests/StyleTest.php b/tests/Decorator/StyleTest.php
similarity index 99%
rename from tests/StyleTest.php
rename to tests/Decorator/StyleTest.php
index beaf65a9..671c370f 100644
--- a/tests/StyleTest.php
+++ b/tests/Decorator/StyleTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\Decorator;
+
+use League\CLImate\Tests\TestBase;
 
 class StyleTest extends TestBase
 {
diff --git a/tests/BorderTest.php b/tests/TerminalObject/Basic/BorderTest.php
similarity index 93%
rename from tests/BorderTest.php
rename to tests/TerminalObject/Basic/BorderTest.php
index 7d6b5ca7..83ead7a3 100644
--- a/tests/BorderTest.php
+++ b/tests/TerminalObject/Basic/BorderTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\TerminalObject\Basic;
+
+use League\CLImate\Tests\TestBase;
 
 class BorderTest extends TestBase
 {
diff --git a/tests/BrTest.php b/tests/TerminalObject/Basic/BrTest.php
similarity index 94%
rename from tests/BrTest.php
rename to tests/TerminalObject/Basic/BrTest.php
index cf21fb13..5630d2d6 100644
--- a/tests/BrTest.php
+++ b/tests/TerminalObject/Basic/BrTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\TerminalObject\Basic;
+
+use League\CLImate\Tests\TestBase;
 
 class BrTest extends TestBase
 {
diff --git a/tests/ClearTest.php b/tests/TerminalObject/Basic/ClearTest.php
similarity index 79%
rename from tests/ClearTest.php
rename to tests/TerminalObject/Basic/ClearTest.php
index cb5a443d..08615ddd 100644
--- a/tests/ClearTest.php
+++ b/tests/TerminalObject/Basic/ClearTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\TerminalObject\Basic;
+
+use League\CLImate\Tests\TestBase;
 
 class ClearTest extends TestBase
 {
diff --git a/tests/ColumnTest.php b/tests/TerminalObject/Basic/ColumnsTest.php
similarity index 97%
rename from tests/ColumnTest.php
rename to tests/TerminalObject/Basic/ColumnsTest.php
index dcce4d8f..8fcbf5f1 100644
--- a/tests/ColumnTest.php
+++ b/tests/TerminalObject/Basic/ColumnsTest.php
@@ -1,8 +1,10 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\TerminalObject\Basic;
 
-class ColumnTest extends TestBase
+use League\CLImate\Tests\TestBase;
+
+class ColumnsTest extends TestBase
 {
     protected function getSingleColumn()
     {
diff --git a/tests/DrawTest.php b/tests/TerminalObject/Basic/DrawTest.php
similarity index 86%
rename from tests/DrawTest.php
rename to tests/TerminalObject/Basic/DrawTest.php
index e1efe1ea..e2abbff0 100644
--- a/tests/DrawTest.php
+++ b/tests/TerminalObject/Basic/DrawTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\TerminalObject\Basic;
+
+use League\CLImate\Tests\TestBase;
 
 class DrawTest extends TestBase
 {
@@ -73,7 +75,7 @@ public function it_404s_when_it_gets_invalid_art()
     public function it_can_take_a_custom_art_directory()
     {
         $this->drawWorks();
-        $this->cli->addArt(__DIR__ . \DIRECTORY_SEPARATOR . 'art');
+        $this->cli->addArt(__DIR__ . \DIRECTORY_SEPARATOR . '..' . \DIRECTORY_SEPARATOR . '..' . \DIRECTORY_SEPARATOR . 'art');
         $this->cli->draw('works');
     }
 
@@ -84,7 +86,7 @@ public function it_can_take_a_custom_art_directory()
     public function it_can_take_a_custom_art_directory_with_a_trailing_slash()
     {
         $this->drawWorks();
-        $this->cli->addArt(__DIR__ . \DIRECTORY_SEPARATOR . 'art' . \DIRECTORY_SEPARATOR);
+        $this->cli->addArt(__DIR__ . \DIRECTORY_SEPARATOR . '..' . \DIRECTORY_SEPARATOR . '..' . \DIRECTORY_SEPARATOR . 'art' . \DIRECTORY_SEPARATOR);
         $this->cli->draw('works');
     }
 
@@ -95,7 +97,7 @@ public function it_can_take_a_custom_art_directory_with_a_trailing_slash()
     public function it_can_chain_the_art_setting()
     {
         $this->drawWorks();
-        $this->cli->addArt(__DIR__ . \DIRECTORY_SEPARATOR . 'art')->draw('works');
+        $this->cli->addArt(__DIR__ . \DIRECTORY_SEPARATOR . '..' . \DIRECTORY_SEPARATOR . '..' . \DIRECTORY_SEPARATOR . 'art')->draw('works');
     }
 
 
@@ -110,7 +112,7 @@ public function testAddArt1()
         $this->shouldWrite("\e[m\e[0m");
         $this->shouldHavePersisted();
 
-        $this->cli->addArt(__DIR__ . "/art/");
+        $this->cli->addArt(__DIR__ . \DIRECTORY_SEPARATOR . '..' . \DIRECTORY_SEPARATOR . '..' . \DIRECTORY_SEPARATOR . "art/");
         $this->cli->draw("art");
     }
 
diff --git a/tests/DumpTest.php b/tests/TerminalObject/Basic/DumpTest.php
similarity index 78%
rename from tests/DumpTest.php
rename to tests/TerminalObject/Basic/DumpTest.php
index ed9a7865..d386c2a3 100644
--- a/tests/DumpTest.php
+++ b/tests/TerminalObject/Basic/DumpTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\TerminalObject\Basic;
+
+use League\CLImate\Tests\TestBase;
 
 require_once 'VarDumpMock.php';
 
diff --git a/tests/FlankTest.php b/tests/TerminalObject/Basic/FlankTest.php
similarity index 93%
rename from tests/FlankTest.php
rename to tests/TerminalObject/Basic/FlankTest.php
index c5263d2a..a51f33d6 100644
--- a/tests/FlankTest.php
+++ b/tests/TerminalObject/Basic/FlankTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\TerminalObject\Basic;
+
+use League\CLImate\Tests\TestBase;
 
 class FlankTest extends TestBase
 {
diff --git a/tests/InlineTest.php b/tests/TerminalObject/Basic/InlineTest.php
similarity index 86%
rename from tests/InlineTest.php
rename to tests/TerminalObject/Basic/InlineTest.php
index f943c76b..32d0f555 100644
--- a/tests/InlineTest.php
+++ b/tests/TerminalObject/Basic/InlineTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\TerminalObject\Basic;
+
+use League\CLImate\Tests\TestBase;
 
 class InlineTest extends TestBase
 {
diff --git a/tests/TerminalObject/Basic/JsonTest.php b/tests/TerminalObject/Basic/JsonTest.php
index 1ef49b9f..cd4afe03 100644
--- a/tests/TerminalObject/Basic/JsonTest.php
+++ b/tests/TerminalObject/Basic/JsonTest.php
@@ -15,43 +15,43 @@ class JsonTest extends TestBase
      */
     public function it_can_output_an_object_as_json()
     {
-        $json = json_encode((object) [
-            "cell1" => "Cell 1",
-            "cell2" => "Cell 2",
-            "cell3" => "Cell 3",
-            "cell4" => "Cell 4",
-        ], \JSON_PRETTY_PRINT);
+        $should_be = json_encode((object) [
+                    'cell1' => 'Cell 1',
+                    'cell2' => 'Cell 2',
+                    'cell3' => 'Cell 3',
+                    'cell4' => 'Cell 4',
+                ], JSON_PRETTY_PRINT);
 
-        $this->shouldWrite("\e[m{$json}\e[0m");
+        $this->shouldWrite("\e[m" . $should_be . "\e[0m");
         $this->shouldHavePersisted();
 
         $this->cli->json((object) [
-            "cell1" => "Cell 1",
-            "cell2" => "Cell 2",
-            "cell3" => "Cell 3",
-            "cell4" => "Cell 4",
-        ]);
+                    'cell1' => 'Cell 1',
+                    'cell2' => 'Cell 2',
+                    'cell3' => 'Cell 3',
+                    'cell4' => 'Cell 4',
+                ]);
     }
 
     /**
      * We do this test specifically because json escapes the tags,
-     * we want to make sure we"re taking care of that
+     * we want to make sure we're taking care of that
      *
      * @test
      * @doesNotPerformAssertions
      */
     public function it_can_output_json_with_tags()
     {
-        $json = json_encode((object) [
-            "cell1" => "Cell 1",
-            "cell2" => "Cell 2",
-            "cell3" => "Cell 3",
-            "cell4" => "Cell 4",
+        $should_be = json_encode((object) [
+            "cell1" => 'Cell 1',
+            "cell2" => 'Cell 2',
+            "cell3" => 'Cell 3',
+            "cell4" => 'Cell 4',
         ], \JSON_PRETTY_PRINT);
 
-        $json = str_replace("Cell 4", "\e[5mCell 4\e[0m", $json);
+        $should_be = str_replace('Cell 4', "\e[5mCell 4\e[0m", $should_be);
 
-        $this->shouldWrite("\e[m{$json}\e[0m");
+        $this->shouldWrite("\e[m" . $should_be . "\e[0m");
         $this->shouldHavePersisted();
 
         $this->cli->json((object) [
diff --git a/tests/TabTest.php b/tests/TerminalObject/Basic/TabTest.php
similarity index 94%
rename from tests/TabTest.php
rename to tests/TerminalObject/Basic/TabTest.php
index f72f68d5..0d229575 100644
--- a/tests/TabTest.php
+++ b/tests/TerminalObject/Basic/TabTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\TerminalObject\Basic;
+
+use League\CLImate\Tests\TestBase;
 
 class TabTest extends TestBase
 {
diff --git a/tests/TableTest.php b/tests/TerminalObject/Basic/TableTest.php
similarity index 99%
rename from tests/TableTest.php
rename to tests/TerminalObject/Basic/TableTest.php
index 31d65ca0..702aa776 100644
--- a/tests/TableTest.php
+++ b/tests/TerminalObject/Basic/TableTest.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\TerminalObject\Basic;
 
+use League\CLImate\Tests\TestBase;
 use League\CLImate\Exceptions\InvalidArgumentException;
 
 class TableTest extends TestBase
diff --git a/tests/VarDumpMock.php b/tests/TerminalObject/Basic/VarDumpMock.php
similarity index 100%
rename from tests/VarDumpMock.php
rename to tests/TerminalObject/Basic/VarDumpMock.php
diff --git a/tests/Animation/AnimationTest.php b/tests/TerminalObject/Dynamic/Animation/AnimationTest.php
similarity index 95%
rename from tests/Animation/AnimationTest.php
rename to tests/TerminalObject/Dynamic/Animation/AnimationTest.php
index a739c1e7..2806cb6b 100644
--- a/tests/Animation/AnimationTest.php
+++ b/tests/TerminalObject/Dynamic/Animation/AnimationTest.php
@@ -1,25 +1,23 @@
 <?php
 
-namespace League\CLImate\Tests\Animation;
+namespace League\CLImate\Tests\TerminalObject\Dynamic;
 
 use League\CLImate\Tests\TestBase;
 use Mockery;
 
 class AnimationTest extends TestBase
 {
-    use ExitToTopFrames;
-    use ExitToBottomFrames;
-    use ExitToLeftFrames;
-    use ExitToRightFrames;
-    use RunFrames;
-
+    use Animation\ExitToBottomFrames;
+    use Animation\ExitToLeftFrames;
+    use Animation\ExitToRightFrames;
+    use Animation\ExitToTopFrames;
+    use Animation\RunFrames;
 
     private function addArt(): void
     {
-        $this->cli->addArt(__DIR__ . \DIRECTORY_SEPARATOR . '..' . \DIRECTORY_SEPARATOR . 'art');
+        $this->cli->addArt(__DIR__ . \DIRECTORY_SEPARATOR . '..' . \DIRECTORY_SEPARATOR . '..' . \DIRECTORY_SEPARATOR . '..' . \DIRECTORY_SEPARATOR . 'art');
     }
 
-
     protected function emptyFrame()
     {
         $this->shouldWrite("\e[m\e[0m")->ordered();
diff --git a/tests/Animation/ExitToBottomFrames.php b/tests/TerminalObject/Dynamic/Animation/ExitToBottomFrames.php
similarity index 98%
rename from tests/Animation/ExitToBottomFrames.php
rename to tests/TerminalObject/Dynamic/Animation/ExitToBottomFrames.php
index 88f3bd7c..a5dbe6b2 100644
--- a/tests/Animation/ExitToBottomFrames.php
+++ b/tests/TerminalObject/Dynamic/Animation/ExitToBottomFrames.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace League\CLImate\Tests\Animation;
+namespace League\CLImate\Tests\TerminalObject\Dynamic\Animation;
 
 trait ExitToBottomFrames
 {
diff --git a/tests/Animation/ExitToLeftFrames.php b/tests/TerminalObject/Dynamic/Animation/ExitToLeftFrames.php
similarity index 98%
rename from tests/Animation/ExitToLeftFrames.php
rename to tests/TerminalObject/Dynamic/Animation/ExitToLeftFrames.php
index 76c37ebd..2fb000ba 100644
--- a/tests/Animation/ExitToLeftFrames.php
+++ b/tests/TerminalObject/Dynamic/Animation/ExitToLeftFrames.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace League\CLImate\Tests\Animation;
+namespace League\CLImate\Tests\TerminalObject\Dynamic\Animation;
 
 trait ExitToLeftFrames
 {
diff --git a/tests/Animation/ExitToRightFrames.php b/tests/TerminalObject/Dynamic/Animation/ExitToRightFrames.php
similarity index 99%
rename from tests/Animation/ExitToRightFrames.php
rename to tests/TerminalObject/Dynamic/Animation/ExitToRightFrames.php
index 86c29e35..11b6b245 100644
--- a/tests/Animation/ExitToRightFrames.php
+++ b/tests/TerminalObject/Dynamic/Animation/ExitToRightFrames.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace League\CLImate\Tests\Animation;
+namespace League\CLImate\Tests\TerminalObject\Dynamic\Animation;
 
 trait ExitToRightFrames
 {
diff --git a/tests/Animation/ExitToTopFrames.php b/tests/TerminalObject/Dynamic/Animation/ExitToTopFrames.php
similarity index 97%
rename from tests/Animation/ExitToTopFrames.php
rename to tests/TerminalObject/Dynamic/Animation/ExitToTopFrames.php
index 3cdd04a0..37e92868 100644
--- a/tests/Animation/ExitToTopFrames.php
+++ b/tests/TerminalObject/Dynamic/Animation/ExitToTopFrames.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace League\CLImate\Tests\Animation;
+namespace League\CLImate\Tests\TerminalObject\Dynamic\Animation;
 
 trait ExitToTopFrames
 {
diff --git a/tests/Animation/RunFrames.php b/tests/TerminalObject/Dynamic/Animation/RunFrames.php
similarity index 97%
rename from tests/Animation/RunFrames.php
rename to tests/TerminalObject/Dynamic/Animation/RunFrames.php
index 2d57e364..7ba148e7 100644
--- a/tests/Animation/RunFrames.php
+++ b/tests/TerminalObject/Dynamic/Animation/RunFrames.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace League\CLImate\Tests\Animation;
+namespace League\CLImate\Tests\TerminalObject\Dynamic\Animation;
 
 trait RunFrames
 {
diff --git a/tests/CheckboxesTest.php b/tests/TerminalObject/Dynamic/CheckboxesTest.php
similarity index 98%
rename from tests/CheckboxesTest.php
rename to tests/TerminalObject/Dynamic/CheckboxesTest.php
index 573cc9ce..f13202bf 100644
--- a/tests/CheckboxesTest.php
+++ b/tests/TerminalObject/Dynamic/CheckboxesTest.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\TerminalObject\Dynamic;
 
+use League\CLImate\Tests\TestBase;
 use League\CLImate\Util\System\Linux;
 use League\CLImate\Util\UtilFactory;
 use Mockery;
diff --git a/tests/ConfirmTest.php b/tests/TerminalObject/Dynamic/ConfirmTest.php
similarity index 94%
rename from tests/ConfirmTest.php
rename to tests/TerminalObject/Dynamic/ConfirmTest.php
index bda2c7d5..f4d7cb23 100644
--- a/tests/ConfirmTest.php
+++ b/tests/TerminalObject/Dynamic/ConfirmTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\TerminalObject\Dynamic;
+
+use League\CLImate\Tests\TestBase;
 
 class ConfirmTest extends TestBase
 {
diff --git a/tests/InputTest.php b/tests/TerminalObject/Dynamic/InputTest.php
similarity index 98%
rename from tests/InputTest.php
rename to tests/TerminalObject/Dynamic/InputTest.php
index 64ba8490..af5f743b 100644
--- a/tests/InputTest.php
+++ b/tests/TerminalObject/Dynamic/InputTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\TerminalObject\Dynamic;
+
+use League\CLImate\Tests\TestBase;
 
 class InputTest extends TestBase
 {
diff --git a/tests/PaddingTest.php b/tests/TerminalObject/Dynamic/PaddingTest.php
similarity index 96%
rename from tests/PaddingTest.php
rename to tests/TerminalObject/Dynamic/PaddingTest.php
index 5a65daf8..1e2c3f11 100644
--- a/tests/PaddingTest.php
+++ b/tests/TerminalObject/Dynamic/PaddingTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\TerminalObject\Dynamic;
+
+use League\CLImate\Tests\TestBase;
 
 class PaddingTest extends TestBase
 {
diff --git a/tests/PasswordTest.php b/tests/TerminalObject/Dynamic/PasswordTest.php
similarity index 83%
rename from tests/PasswordTest.php
rename to tests/TerminalObject/Dynamic/PasswordTest.php
index 3c16d41e..edcb4acd 100644
--- a/tests/PasswordTest.php
+++ b/tests/TerminalObject/Dynamic/PasswordTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\TerminalObject\Dynamic;
+
+use League\CLImate\Tests\TestBase;
 
 class PasswordTest extends TestBase
 {
diff --git a/tests/ProgressTest.php b/tests/TerminalObject/Dynamic/ProgressTest.php
similarity index 99%
rename from tests/ProgressTest.php
rename to tests/TerminalObject/Dynamic/ProgressTest.php
index 157787d3..a6e257e5 100644
--- a/tests/ProgressTest.php
+++ b/tests/TerminalObject/Dynamic/ProgressTest.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\TerminalObject\Dynamic;
 
+use League\CLImate\Tests\TestBase;
 use League\CLImate\Exceptions\UnexpectedValueException;
 
 class ProgressTest extends TestBase
diff --git a/tests/RadioTest.php b/tests/TerminalObject/Dynamic/RadioTest.php
similarity index 95%
rename from tests/RadioTest.php
rename to tests/TerminalObject/Dynamic/RadioTest.php
index 3faeffd5..40b8265d 100644
--- a/tests/RadioTest.php
+++ b/tests/TerminalObject/Dynamic/RadioTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\TerminalObject\Dynamic;
+
+use League\CLImate\Tests\TestBase;
 
 class RadioTest extends TestBase
 {
diff --git a/tests/SleeperGlobalMock.php b/tests/TerminalObject/Helper/SleeperGlobalMock.php
similarity index 100%
rename from tests/SleeperGlobalMock.php
rename to tests/TerminalObject/Helper/SleeperGlobalMock.php
diff --git a/tests/SleeperTest.php b/tests/TerminalObject/Helper/SleeperTest.php
similarity index 93%
rename from tests/SleeperTest.php
rename to tests/TerminalObject/Helper/SleeperTest.php
index 8b2525e5..9265b027 100644
--- a/tests/SleeperTest.php
+++ b/tests/TerminalObject/Helper/SleeperTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\TerminalObject\Helper;
 
 use League\CLImate\TerminalObject\Helper\Sleeper;
+use League\CLImate\Tests\TestBase;
 
 require_once 'SleeperGlobalMock.php';
 
diff --git a/tests/RouterTest.php b/tests/TerminalObject/Router/RouterTest.php
similarity index 87%
rename from tests/RouterTest.php
rename to tests/TerminalObject/Router/RouterTest.php
index 5b3b23b0..37feb844 100644
--- a/tests/RouterTest.php
+++ b/tests/TerminalObject/Router/RouterTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\TerminalObject\Router;
 
 use League\CLImate\TerminalObject\Router\Router;
+use League\CLImate\Tests\TestBase;
 
 class RouterTest extends TestBase
 {
diff --git a/tests/TestBase.php b/tests/TestBase.php
index 1629ccf7..d67b9f84 100644
--- a/tests/TestBase.php
+++ b/tests/TestBase.php
@@ -3,8 +3,8 @@
 namespace League\CLImate\Tests;
 
 use League\CLImate\CLImate;
-use PHPUnit\Framework\TestCase;
 use Mockery;
+use PHPUnit\Framework\TestCase;
 
 class TestBase extends TestCase
 {
diff --git a/tests/HelperTest.php b/tests/Util/HelperTest.php
similarity index 93%
rename from tests/HelperTest.php
rename to tests/Util/HelperTest.php
index a090f04f..b6fc835f 100644
--- a/tests/HelperTest.php
+++ b/tests/Util/HelperTest.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\Util;
 
+use League\CLImate\Tests\TestBase;
 use League\CLImate\Util\Helper;
 
 class HelperTest extends TestBase
diff --git a/tests/OutputTest.php b/tests/Util/OutputTest.php
similarity index 99%
rename from tests/OutputTest.php
rename to tests/Util/OutputTest.php
index aaeb4eec..e3da9cf2 100644
--- a/tests/OutputTest.php
+++ b/tests/Util/OutputTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\Util;
 
 use League\CLImate\Exceptions\InvalidArgumentException;
+use League\CLImate\Tests\TestBase;
 use League\CLImate\Util\Output;
 use Mockery;
 
diff --git a/tests/StdinGlobalMock.php b/tests/Util/Reader/StdinGlobalMock.php
similarity index 100%
rename from tests/StdinGlobalMock.php
rename to tests/Util/Reader/StdinGlobalMock.php
diff --git a/tests/StdinTest.php b/tests/Util/Reader/StdinTest.php
similarity index 96%
rename from tests/StdinTest.php
rename to tests/Util/Reader/StdinTest.php
index 74f21394..f4b1d1d1 100644
--- a/tests/StdinTest.php
+++ b/tests/Util/Reader/StdinTest.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\Util\Reader;
 
+use League\CLImate\Tests\TestBase;
 use League\CLImate\Util\Reader\Stdin;
 
 require_once 'StdinGlobalMock.php';
diff --git a/tests/LinuxTest.php b/tests/Util/System/LinuxTest.php
similarity index 95%
rename from tests/LinuxTest.php
rename to tests/Util/System/LinuxTest.php
index 3a6c95c3..44d1b0a7 100644
--- a/tests/LinuxTest.php
+++ b/tests/Util/System/LinuxTest.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\Util\System;
 
+use League\CLImate\Tests\TestBase;
 use Mockery;
 
 class LinuxTest extends TestBase
diff --git a/tests/WindowsTest.php b/tests/Util/System/WindowsTest.php
similarity index 95%
rename from tests/WindowsTest.php
rename to tests/Util/System/WindowsTest.php
index 01c0c5c8..19cd7fc0 100644
--- a/tests/WindowsTest.php
+++ b/tests/Util/System/WindowsTest.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\Util\System;
 
+use League\CLImate\Tests\TestBase;
 use Mockery;
 
 class WindowsTest extends TestBase
diff --git a/tests/BufferTest.php b/tests/Util/Writer/BufferTest.php
similarity index 95%
rename from tests/BufferTest.php
rename to tests/Util/Writer/BufferTest.php
index 6c46680a..06c3b37b 100644
--- a/tests/BufferTest.php
+++ b/tests/Util/Writer/BufferTest.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\Util\Writer;
 
+use League\CLImate\Tests\TestBase;
 use League\CLImate\Util\Output;
 use League\CLImate\Util\Writer\Buffer;
 
diff --git a/tests/FileGlobalMock.php b/tests/Util/Writer/FileGlobalMock.php
similarity index 100%
rename from tests/FileGlobalMock.php
rename to tests/Util/Writer/FileGlobalMock.php
diff --git a/tests/FileTest.php b/tests/Util/Writer/FileTest.php
similarity index 96%
rename from tests/FileTest.php
rename to tests/Util/Writer/FileTest.php
index 68a23b4b..0bcb54ca 100644
--- a/tests/FileTest.php
+++ b/tests/Util/Writer/FileTest.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace League\CLImate\Tests;
+namespace League\CLImate\Tests\Util\Writer;
 
-require_once __DIR__ . '/../vendor/mikey179/vfsstream/src/main/php/org/bovigo/vfs/vfsStream.php';
+require_once __DIR__ . '/../../../vendor/mikey179/vfsstream/src/main/php/org/bovigo/vfs/vfsStream.php';
 require_once 'FileGlobalMock.php';
 
 use League\CLImate\Exceptions\RuntimeException;
+use League\CLImate\Tests\TestBase;
 use League\CLImate\Util\Output;
 use org\bovigo\vfs\vfsStream;