diff --git a/tests/API/APIRequestBuilderTest.php b/tests/AnimeClient/API/APIRequestBuilderTest.php
similarity index 100%
rename from tests/API/APIRequestBuilderTest.php
rename to tests/AnimeClient/API/APIRequestBuilderTest.php
diff --git a/tests/API/CacheTraitTest.php b/tests/AnimeClient/API/CacheTraitTest.php
similarity index 100%
rename from tests/API/CacheTraitTest.php
rename to tests/AnimeClient/API/CacheTraitTest.php
diff --git a/tests/API/JsonAPITest.php b/tests/AnimeClient/API/JsonAPITest.php
similarity index 100%
rename from tests/API/JsonAPITest.php
rename to tests/AnimeClient/API/JsonAPITest.php
diff --git a/tests/API/Kitsu/Transformer/AnimeListTransformerTest.php b/tests/AnimeClient/API/Kitsu/Transformer/AnimeListTransformerTest.php
similarity index 100%
rename from tests/API/Kitsu/Transformer/AnimeListTransformerTest.php
rename to tests/AnimeClient/API/Kitsu/Transformer/AnimeListTransformerTest.php
diff --git a/tests/API/Kitsu/Transformer/AnimeTransformerTest.php b/tests/AnimeClient/API/Kitsu/Transformer/AnimeTransformerTest.php
similarity index 100%
rename from tests/API/Kitsu/Transformer/AnimeTransformerTest.php
rename to tests/AnimeClient/API/Kitsu/Transformer/AnimeTransformerTest.php
diff --git a/tests/API/Kitsu/Transformer/MangaListTransformerTest.php b/tests/AnimeClient/API/Kitsu/Transformer/MangaListTransformerTest.php
similarity index 100%
rename from tests/API/Kitsu/Transformer/MangaListTransformerTest.php
rename to tests/AnimeClient/API/Kitsu/Transformer/MangaListTransformerTest.php
diff --git a/tests/API/Kitsu/Transformer/MangaTransformerTest.php b/tests/AnimeClient/API/Kitsu/Transformer/MangaTransformerTest.php
similarity index 100%
rename from tests/API/Kitsu/Transformer/MangaTransformerTest.php
rename to tests/AnimeClient/API/Kitsu/Transformer/MangaTransformerTest.php
diff --git a/tests/API/Kitsu/Transformer/__snapshots__/AnimeListTransformerTest__testTransform__1.php b/tests/AnimeClient/API/Kitsu/Transformer/__snapshots__/AnimeListTransformerTest__testTransform__1.php
similarity index 100%
rename from tests/API/Kitsu/Transformer/__snapshots__/AnimeListTransformerTest__testTransform__1.php
rename to tests/AnimeClient/API/Kitsu/Transformer/__snapshots__/AnimeListTransformerTest__testTransform__1.php
diff --git a/tests/API/Kitsu/Transformer/__snapshots__/AnimeListTransformerTest__testUntransform with data set 0__1.php b/tests/AnimeClient/API/Kitsu/Transformer/__snapshots__/AnimeListTransformerTest__testUntransform with data set 0__1.php
similarity index 100%
rename from tests/API/Kitsu/Transformer/__snapshots__/AnimeListTransformerTest__testUntransform with data set 0__1.php
rename to tests/AnimeClient/API/Kitsu/Transformer/__snapshots__/AnimeListTransformerTest__testUntransform with data set 0__1.php
diff --git a/tests/API/Kitsu/Transformer/__snapshots__/AnimeListTransformerTest__testUntransform with data set 1__1.php b/tests/AnimeClient/API/Kitsu/Transformer/__snapshots__/AnimeListTransformerTest__testUntransform with data set 1__1.php
similarity index 100%
rename from tests/API/Kitsu/Transformer/__snapshots__/AnimeListTransformerTest__testUntransform with data set 1__1.php
rename to tests/AnimeClient/API/Kitsu/Transformer/__snapshots__/AnimeListTransformerTest__testUntransform with data set 1__1.php
diff --git a/tests/API/Kitsu/Transformer/__snapshots__/AnimeListTransformerTest__testUntransform with data set 2__1.php b/tests/AnimeClient/API/Kitsu/Transformer/__snapshots__/AnimeListTransformerTest__testUntransform with data set 2__1.php
similarity index 100%
rename from tests/API/Kitsu/Transformer/__snapshots__/AnimeListTransformerTest__testUntransform with data set 2__1.php
rename to tests/AnimeClient/API/Kitsu/Transformer/__snapshots__/AnimeListTransformerTest__testUntransform with data set 2__1.php
diff --git a/tests/API/Kitsu/Transformer/__snapshots__/AnimeTransformerTest__testTransform__1.php b/tests/AnimeClient/API/Kitsu/Transformer/__snapshots__/AnimeTransformerTest__testTransform__1.php
similarity index 100%
rename from tests/API/Kitsu/Transformer/__snapshots__/AnimeTransformerTest__testTransform__1.php
rename to tests/AnimeClient/API/Kitsu/Transformer/__snapshots__/AnimeTransformerTest__testTransform__1.php
diff --git a/tests/API/Kitsu/Transformer/__snapshots__/MangaListTransformerTest__testTransform__1.yml b/tests/AnimeClient/API/Kitsu/Transformer/__snapshots__/MangaListTransformerTest__testTransform__1.yml
similarity index 100%
rename from tests/API/Kitsu/Transformer/__snapshots__/MangaListTransformerTest__testTransform__1.yml
rename to tests/AnimeClient/API/Kitsu/Transformer/__snapshots__/MangaListTransformerTest__testTransform__1.yml
diff --git a/tests/API/Kitsu/Transformer/__snapshots__/MangaTransformerTest__testTransform__1.php b/tests/AnimeClient/API/Kitsu/Transformer/__snapshots__/MangaTransformerTest__testTransform__1.php
similarity index 100%
rename from tests/API/Kitsu/Transformer/__snapshots__/MangaTransformerTest__testTransform__1.php
rename to tests/AnimeClient/API/Kitsu/Transformer/__snapshots__/MangaTransformerTest__testTransform__1.php
diff --git a/tests/API/KitsuTest.php b/tests/AnimeClient/API/KitsuTest.php
similarity index 100%
rename from tests/API/KitsuTest.php
rename to tests/AnimeClient/API/KitsuTest.php
diff --git a/tests/API/ParallelAPIRequestTest.php b/tests/AnimeClient/API/ParallelAPIRequestTest.php
similarity index 100%
rename from tests/API/ParallelAPIRequestTest.php
rename to tests/AnimeClient/API/ParallelAPIRequestTest.php
diff --git a/tests/AnimeClientTest.php b/tests/AnimeClient/AnimeClientTest.php
similarity index 100%
rename from tests/AnimeClientTest.php
rename to tests/AnimeClient/AnimeClientTest.php
diff --git a/tests/AnimeClientTestCase.php b/tests/AnimeClient/AnimeClientTestCase.php
similarity index 100%
rename from tests/AnimeClientTestCase.php
rename to tests/AnimeClient/AnimeClientTestCase.php
diff --git a/tests/Command/BaseCommandTest.php b/tests/AnimeClient/Command/BaseCommandTest.php
similarity index 100%
rename from tests/Command/BaseCommandTest.php
rename to tests/AnimeClient/Command/BaseCommandTest.php
diff --git a/tests/ControllerTest.php b/tests/AnimeClient/ControllerTest.php
similarity index 100%
rename from tests/ControllerTest.php
rename to tests/AnimeClient/ControllerTest.php
diff --git a/tests/DispatcherTest.php b/tests/AnimeClient/DispatcherTest.php
similarity index 100%
rename from tests/DispatcherTest.php
rename to tests/AnimeClient/DispatcherTest.php
diff --git a/tests/Helper/MenuHelperTest.php b/tests/AnimeClient/Helper/MenuHelperTest.php
similarity index 100%
rename from tests/Helper/MenuHelperTest.php
rename to tests/AnimeClient/Helper/MenuHelperTest.php
diff --git a/tests/Helper/PictureHelperTest.php b/tests/AnimeClient/Helper/PictureHelperTest.php
similarity index 100%
rename from tests/Helper/PictureHelperTest.php
rename to tests/AnimeClient/Helper/PictureHelperTest.php
diff --git a/tests/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set Full webp URL__1.php b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set Full webp URL__1.php
similarity index 100%
rename from tests/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set Full webp URL__1.php
rename to tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set Full webp URL__1.php
diff --git a/tests/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set Partial webp URL__1.php b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set Partial webp URL__1.php
similarity index 100%
rename from tests/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set Partial webp URL__1.php
rename to tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set Partial webp URL__1.php
diff --git a/tests/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set bmp with gif fallback__1.php b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set bmp with gif fallback__1.php
similarity index 100%
rename from tests/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set bmp with gif fallback__1.php
rename to tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set bmp with gif fallback__1.php
diff --git a/tests/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set jpeg2000__1.php b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set jpeg2000__1.php
similarity index 100%
rename from tests/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set jpeg2000__1.php
rename to tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set jpeg2000__1.php
diff --git a/tests/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set png placeholder image__1.php b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set png placeholder image__1.php
similarity index 100%
rename from tests/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set png placeholder image__1.php
rename to tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set png placeholder image__1.php
diff --git a/tests/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set simple image with attributes__1.php b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set simple image with attributes__1.php
similarity index 100%
rename from tests/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set simple image with attributes__1.php
rename to tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set simple image with attributes__1.php
diff --git a/tests/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set svg with png fallback and lots of attributes__1.php b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set svg with png fallback and lots of attributes__1.php
similarity index 100%
rename from tests/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set svg with png fallback and lots of attributes__1.php
rename to tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set svg with png fallback and lots of attributes__1.php
diff --git a/tests/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set webp placeholder image__1.php b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set webp placeholder image__1.php
similarity index 100%
rename from tests/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set webp placeholder image__1.php
rename to tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set webp placeholder image__1.php
diff --git a/tests/MenuGeneratorTest.php b/tests/AnimeClient/MenuGeneratorTest.php
similarity index 100%
rename from tests/MenuGeneratorTest.php
rename to tests/AnimeClient/MenuGeneratorTest.php
diff --git a/tests/RequirementsTest.php b/tests/AnimeClient/RequirementsTest.php
similarity index 100%
rename from tests/RequirementsTest.php
rename to tests/AnimeClient/RequirementsTest.php
diff --git a/tests/RoutingBaseTest.php b/tests/AnimeClient/RoutingBaseTest.php
similarity index 100%
rename from tests/RoutingBaseTest.php
rename to tests/AnimeClient/RoutingBaseTest.php
diff --git a/tests/TestSessionHandler.php b/tests/AnimeClient/TestSessionHandler.php
similarity index 100%
rename from tests/TestSessionHandler.php
rename to tests/AnimeClient/TestSessionHandler.php
diff --git a/tests/UrlGeneratorTest.php b/tests/AnimeClient/UrlGeneratorTest.php
similarity index 100%
rename from tests/UrlGeneratorTest.php
rename to tests/AnimeClient/UrlGeneratorTest.php
diff --git a/tests/UtilTest.php b/tests/AnimeClient/UtilTest.php
similarity index 100%
rename from tests/UtilTest.php
rename to tests/AnimeClient/UtilTest.php
diff --git a/tests/bootstrap.php b/tests/AnimeClient/bootstrap.php
similarity index 100%
rename from tests/bootstrap.php
rename to tests/AnimeClient/bootstrap.php
diff --git a/tests/mocks.php b/tests/AnimeClient/mocks.php
similarity index 100%
rename from tests/mocks.php
rename to tests/AnimeClient/mocks.php
diff --git a/tests/test_data/JsonAPI/inlineIncluded.json b/tests/AnimeClient/test_data/JsonAPI/inlineIncluded.json
similarity index 100%
rename from tests/test_data/JsonAPI/inlineIncluded.json
rename to tests/AnimeClient/test_data/JsonAPI/inlineIncluded.json
diff --git a/tests/test_data/JsonAPI/jsonApiExample.json b/tests/AnimeClient/test_data/JsonAPI/jsonApiExample.json
similarity index 100%
rename from tests/test_data/JsonAPI/jsonApiExample.json
rename to tests/AnimeClient/test_data/JsonAPI/jsonApiExample.json
diff --git a/tests/test_data/JsonAPI/organizedIncludes.json b/tests/AnimeClient/test_data/JsonAPI/organizedIncludes.json
similarity index 100%
rename from tests/test_data/JsonAPI/organizedIncludes.json
rename to tests/AnimeClient/test_data/JsonAPI/organizedIncludes.json
diff --git a/tests/test_data/Kitsu/animeAfterTransform.json b/tests/AnimeClient/test_data/Kitsu/animeAfterTransform.json
similarity index 100%
rename from tests/test_data/Kitsu/animeAfterTransform.json
rename to tests/AnimeClient/test_data/Kitsu/animeAfterTransform.json
diff --git a/tests/test_data/Kitsu/animeBeforeTransform.json b/tests/AnimeClient/test_data/Kitsu/animeBeforeTransform.json
similarity index 100%
rename from tests/test_data/Kitsu/animeBeforeTransform.json
rename to tests/AnimeClient/test_data/Kitsu/animeBeforeTransform.json
diff --git a/tests/test_data/Kitsu/animeListItemAfterTransform.json b/tests/AnimeClient/test_data/Kitsu/animeListItemAfterTransform.json
similarity index 100%
rename from tests/test_data/Kitsu/animeListItemAfterTransform.json
rename to tests/AnimeClient/test_data/Kitsu/animeListItemAfterTransform.json
diff --git a/tests/test_data/Kitsu/animeListItemBeforeTransform.json b/tests/AnimeClient/test_data/Kitsu/animeListItemBeforeTransform.json
similarity index 100%
rename from tests/test_data/Kitsu/animeListItemBeforeTransform.json
rename to tests/AnimeClient/test_data/Kitsu/animeListItemBeforeTransform.json
diff --git a/tests/test_data/Kitsu/mangaAfterTransform.json b/tests/AnimeClient/test_data/Kitsu/mangaAfterTransform.json
similarity index 100%
rename from tests/test_data/Kitsu/mangaAfterTransform.json
rename to tests/AnimeClient/test_data/Kitsu/mangaAfterTransform.json
diff --git a/tests/test_data/Kitsu/mangaBeforeTransform.json b/tests/AnimeClient/test_data/Kitsu/mangaBeforeTransform.json
similarity index 100%
rename from tests/test_data/Kitsu/mangaBeforeTransform.json
rename to tests/AnimeClient/test_data/Kitsu/mangaBeforeTransform.json
diff --git a/tests/test_data/Kitsu/mangaListAfterTransform.json b/tests/AnimeClient/test_data/Kitsu/mangaListAfterTransform.json
similarity index 100%
rename from tests/test_data/Kitsu/mangaListAfterTransform.json
rename to tests/AnimeClient/test_data/Kitsu/mangaListAfterTransform.json
diff --git a/tests/test_data/Kitsu/mangaListBeforeTransform.json b/tests/AnimeClient/test_data/Kitsu/mangaListBeforeTransform.json
similarity index 100%
rename from tests/test_data/Kitsu/mangaListBeforeTransform.json
rename to tests/AnimeClient/test_data/Kitsu/mangaListBeforeTransform.json
diff --git a/tests/test_data/invalid_json.json b/tests/AnimeClient/test_data/invalid_json.json
similarity index 100%
rename from tests/test_data/invalid_json.json
rename to tests/AnimeClient/test_data/invalid_json.json
diff --git a/tests/test_data/valid_json.json b/tests/AnimeClient/test_data/valid_json.json
similarity index 100%
rename from tests/test_data/valid_json.json
rename to tests/AnimeClient/test_data/valid_json.json
diff --git a/tests/test_views/test_view.php b/tests/AnimeClient/test_views/test_view.php
similarity index 100%
rename from tests/test_views/test_view.php
rename to tests/AnimeClient/test_views/test_view.php