diff --git a/composer.json b/composer.json
index ba3d2b4c..8e955fe1 100644
--- a/composer.json
+++ b/composer.json
@@ -4,11 +4,11 @@
   "license": "MIT",
   "autoload": {
 	"files": [
-	  "src/constants.php",
-	  "src/AnimeClient.php"
+	  "src/AnimeClient/constants.php",
+	  "src/AnimeClient/AnimeClient.php"
 	],
 	"psr-4": {
-	  "Aviat\\AnimeClient\\": "src/"
+	  "Aviat\\": "src/"
 	}
   },
   "autoload-dev": {
diff --git a/src/API/APIRequestBuilder.php b/src/AnimeClient/API/APIRequestBuilder.php
similarity index 100%
rename from src/API/APIRequestBuilder.php
rename to src/AnimeClient/API/APIRequestBuilder.php
diff --git a/src/API/AbstractListItem.php b/src/AnimeClient/API/AbstractListItem.php
similarity index 100%
rename from src/API/AbstractListItem.php
rename to src/AnimeClient/API/AbstractListItem.php
diff --git a/src/API/Anilist.php b/src/AnimeClient/API/Anilist.php
similarity index 100%
rename from src/API/Anilist.php
rename to src/AnimeClient/API/Anilist.php
diff --git a/src/API/Anilist/AnilistRequestBuilder.php b/src/AnimeClient/API/Anilist/AnilistRequestBuilder.php
similarity index 100%
rename from src/API/Anilist/AnilistRequestBuilder.php
rename to src/AnimeClient/API/Anilist/AnilistRequestBuilder.php
diff --git a/src/API/Anilist/AnilistTrait.php b/src/AnimeClient/API/Anilist/AnilistTrait.php
similarity index 100%
rename from src/API/Anilist/AnilistTrait.php
rename to src/AnimeClient/API/Anilist/AnilistTrait.php
diff --git a/src/API/Anilist/GraphQL/Mutations/CreateFullMediaListEntry.graphql b/src/AnimeClient/API/Anilist/GraphQL/Mutations/CreateFullMediaListEntry.graphql
similarity index 100%
rename from src/API/Anilist/GraphQL/Mutations/CreateFullMediaListEntry.graphql
rename to src/AnimeClient/API/Anilist/GraphQL/Mutations/CreateFullMediaListEntry.graphql
diff --git a/src/API/Anilist/GraphQL/Mutations/CreateMediaListEntry.graphql b/src/AnimeClient/API/Anilist/GraphQL/Mutations/CreateMediaListEntry.graphql
similarity index 100%
rename from src/API/Anilist/GraphQL/Mutations/CreateMediaListEntry.graphql
rename to src/AnimeClient/API/Anilist/GraphQL/Mutations/CreateMediaListEntry.graphql
diff --git a/src/API/Anilist/GraphQL/Mutations/DeleteMediaListEntry.graphql b/src/AnimeClient/API/Anilist/GraphQL/Mutations/DeleteMediaListEntry.graphql
similarity index 100%
rename from src/API/Anilist/GraphQL/Mutations/DeleteMediaListEntry.graphql
rename to src/AnimeClient/API/Anilist/GraphQL/Mutations/DeleteMediaListEntry.graphql
diff --git a/src/API/Anilist/GraphQL/Mutations/IncrementMediaListEntry.graphql b/src/AnimeClient/API/Anilist/GraphQL/Mutations/IncrementMediaListEntry.graphql
similarity index 100%
rename from src/API/Anilist/GraphQL/Mutations/IncrementMediaListEntry.graphql
rename to src/AnimeClient/API/Anilist/GraphQL/Mutations/IncrementMediaListEntry.graphql
diff --git a/src/API/Anilist/GraphQL/Mutations/UpdateMediaListEntry.graphql b/src/AnimeClient/API/Anilist/GraphQL/Mutations/UpdateMediaListEntry.graphql
similarity index 100%
rename from src/API/Anilist/GraphQL/Mutations/UpdateMediaListEntry.graphql
rename to src/AnimeClient/API/Anilist/GraphQL/Mutations/UpdateMediaListEntry.graphql
diff --git a/src/API/Anilist/GraphQL/Queries/AnimeDetails.graphql b/src/AnimeClient/API/Anilist/GraphQL/Queries/AnimeDetails.graphql
similarity index 100%
rename from src/API/Anilist/GraphQL/Queries/AnimeDetails.graphql
rename to src/AnimeClient/API/Anilist/GraphQL/Queries/AnimeDetails.graphql
diff --git a/src/API/Anilist/GraphQL/Queries/CheckLogin.graphql b/src/AnimeClient/API/Anilist/GraphQL/Queries/CheckLogin.graphql
similarity index 100%
rename from src/API/Anilist/GraphQL/Queries/CheckLogin.graphql
rename to src/AnimeClient/API/Anilist/GraphQL/Queries/CheckLogin.graphql
diff --git a/src/API/Anilist/GraphQL/Queries/ListItemIdByMalId.graphql b/src/AnimeClient/API/Anilist/GraphQL/Queries/ListItemIdByMalId.graphql
similarity index 100%
rename from src/API/Anilist/GraphQL/Queries/ListItemIdByMalId.graphql
rename to src/AnimeClient/API/Anilist/GraphQL/Queries/ListItemIdByMalId.graphql
diff --git a/src/API/Anilist/GraphQL/Queries/ListItemIdByMediaId.graphql b/src/AnimeClient/API/Anilist/GraphQL/Queries/ListItemIdByMediaId.graphql
similarity index 100%
rename from src/API/Anilist/GraphQL/Queries/ListItemIdByMediaId.graphql
rename to src/AnimeClient/API/Anilist/GraphQL/Queries/ListItemIdByMediaId.graphql
diff --git a/src/API/Anilist/GraphQL/Queries/MangaDetails.graphql b/src/AnimeClient/API/Anilist/GraphQL/Queries/MangaDetails.graphql
similarity index 100%
rename from src/API/Anilist/GraphQL/Queries/MangaDetails.graphql
rename to src/AnimeClient/API/Anilist/GraphQL/Queries/MangaDetails.graphql
diff --git a/src/API/Anilist/GraphQL/Queries/MangaIdByMalId.graphql b/src/AnimeClient/API/Anilist/GraphQL/Queries/MangaIdByMalId.graphql
similarity index 100%
rename from src/API/Anilist/GraphQL/Queries/MangaIdByMalId.graphql
rename to src/AnimeClient/API/Anilist/GraphQL/Queries/MangaIdByMalId.graphql
diff --git a/src/API/Anilist/GraphQL/Queries/MediaIdByMalId.graphql b/src/AnimeClient/API/Anilist/GraphQL/Queries/MediaIdByMalId.graphql
similarity index 100%
rename from src/API/Anilist/GraphQL/Queries/MediaIdByMalId.graphql
rename to src/AnimeClient/API/Anilist/GraphQL/Queries/MediaIdByMalId.graphql
diff --git a/src/API/Anilist/GraphQL/Queries/MediaListItem.graphql b/src/AnimeClient/API/Anilist/GraphQL/Queries/MediaListItem.graphql
similarity index 100%
rename from src/API/Anilist/GraphQL/Queries/MediaListItem.graphql
rename to src/AnimeClient/API/Anilist/GraphQL/Queries/MediaListItem.graphql
diff --git a/src/API/Anilist/GraphQL/Queries/SyncUserList.graphql b/src/AnimeClient/API/Anilist/GraphQL/Queries/SyncUserList.graphql
similarity index 100%
rename from src/API/Anilist/GraphQL/Queries/SyncUserList.graphql
rename to src/AnimeClient/API/Anilist/GraphQL/Queries/SyncUserList.graphql
diff --git a/src/API/Anilist/GraphQL/Queries/UserAnimeList.graphql b/src/AnimeClient/API/Anilist/GraphQL/Queries/UserAnimeList.graphql
similarity index 100%
rename from src/API/Anilist/GraphQL/Queries/UserAnimeList.graphql
rename to src/AnimeClient/API/Anilist/GraphQL/Queries/UserAnimeList.graphql
diff --git a/src/API/Anilist/GraphQL/Queries/UserMangaList.graphql b/src/AnimeClient/API/Anilist/GraphQL/Queries/UserMangaList.graphql
similarity index 100%
rename from src/API/Anilist/GraphQL/Queries/UserMangaList.graphql
rename to src/AnimeClient/API/Anilist/GraphQL/Queries/UserMangaList.graphql
diff --git a/src/API/Anilist/ListItem.php b/src/AnimeClient/API/Anilist/ListItem.php
similarity index 100%
rename from src/API/Anilist/ListItem.php
rename to src/AnimeClient/API/Anilist/ListItem.php
diff --git a/src/API/Anilist/MissingIdException.php b/src/AnimeClient/API/Anilist/MissingIdException.php
similarity index 100%
rename from src/API/Anilist/MissingIdException.php
rename to src/AnimeClient/API/Anilist/MissingIdException.php
diff --git a/src/API/Anilist/Model.php b/src/AnimeClient/API/Anilist/Model.php
similarity index 100%
rename from src/API/Anilist/Model.php
rename to src/AnimeClient/API/Anilist/Model.php
diff --git a/src/API/Anilist/Transformer/AnimeListTransformer.php b/src/AnimeClient/API/Anilist/Transformer/AnimeListTransformer.php
similarity index 100%
rename from src/API/Anilist/Transformer/AnimeListTransformer.php
rename to src/AnimeClient/API/Anilist/Transformer/AnimeListTransformer.php
diff --git a/src/API/Anilist/Transformer/MangaListTransformer.php b/src/AnimeClient/API/Anilist/Transformer/MangaListTransformer.php
similarity index 100%
rename from src/API/Anilist/Transformer/MangaListTransformer.php
rename to src/AnimeClient/API/Anilist/Transformer/MangaListTransformer.php
diff --git a/src/API/Anilist/Types/MediaListEntry.php b/src/AnimeClient/API/Anilist/Types/MediaListEntry.php
similarity index 100%
rename from src/API/Anilist/Types/MediaListEntry.php
rename to src/AnimeClient/API/Anilist/Types/MediaListEntry.php
diff --git a/src/API/CacheTrait.php b/src/AnimeClient/API/CacheTrait.php
similarity index 100%
rename from src/API/CacheTrait.php
rename to src/AnimeClient/API/CacheTrait.php
diff --git a/src/API/Enum/AnimeWatchingStatus/Anilist.php b/src/AnimeClient/API/Enum/AnimeWatchingStatus/Anilist.php
similarity index 100%
rename from src/API/Enum/AnimeWatchingStatus/Anilist.php
rename to src/AnimeClient/API/Enum/AnimeWatchingStatus/Anilist.php
diff --git a/src/API/Enum/AnimeWatchingStatus/Kitsu.php b/src/AnimeClient/API/Enum/AnimeWatchingStatus/Kitsu.php
similarity index 100%
rename from src/API/Enum/AnimeWatchingStatus/Kitsu.php
rename to src/AnimeClient/API/Enum/AnimeWatchingStatus/Kitsu.php
diff --git a/src/API/Enum/AnimeWatchingStatus/Route.php b/src/AnimeClient/API/Enum/AnimeWatchingStatus/Route.php
similarity index 100%
rename from src/API/Enum/AnimeWatchingStatus/Route.php
rename to src/AnimeClient/API/Enum/AnimeWatchingStatus/Route.php
diff --git a/src/API/Enum/AnimeWatchingStatus/Title.php b/src/AnimeClient/API/Enum/AnimeWatchingStatus/Title.php
similarity index 100%
rename from src/API/Enum/AnimeWatchingStatus/Title.php
rename to src/AnimeClient/API/Enum/AnimeWatchingStatus/Title.php
diff --git a/src/API/Enum/MangaReadingStatus/Anilist.php b/src/AnimeClient/API/Enum/MangaReadingStatus/Anilist.php
similarity index 100%
rename from src/API/Enum/MangaReadingStatus/Anilist.php
rename to src/AnimeClient/API/Enum/MangaReadingStatus/Anilist.php
diff --git a/src/API/Enum/MangaReadingStatus/Kitsu.php b/src/AnimeClient/API/Enum/MangaReadingStatus/Kitsu.php
similarity index 100%
rename from src/API/Enum/MangaReadingStatus/Kitsu.php
rename to src/AnimeClient/API/Enum/MangaReadingStatus/Kitsu.php
diff --git a/src/API/Enum/MangaReadingStatus/Route.php b/src/AnimeClient/API/Enum/MangaReadingStatus/Route.php
similarity index 100%
rename from src/API/Enum/MangaReadingStatus/Route.php
rename to src/AnimeClient/API/Enum/MangaReadingStatus/Route.php
diff --git a/src/API/Enum/MangaReadingStatus/Title.php b/src/AnimeClient/API/Enum/MangaReadingStatus/Title.php
similarity index 100%
rename from src/API/Enum/MangaReadingStatus/Title.php
rename to src/AnimeClient/API/Enum/MangaReadingStatus/Title.php
diff --git a/src/API/FailedResponseException.php b/src/AnimeClient/API/FailedResponseException.php
similarity index 100%
rename from src/API/FailedResponseException.php
rename to src/AnimeClient/API/FailedResponseException.php
diff --git a/src/API/JsonAPI.php b/src/AnimeClient/API/JsonAPI.php
similarity index 100%
rename from src/API/JsonAPI.php
rename to src/AnimeClient/API/JsonAPI.php
diff --git a/src/API/Kitsu.php b/src/AnimeClient/API/Kitsu.php
similarity index 100%
rename from src/API/Kitsu.php
rename to src/AnimeClient/API/Kitsu.php
diff --git a/src/API/Kitsu/Auth.php b/src/AnimeClient/API/Kitsu/Auth.php
similarity index 100%
rename from src/API/Kitsu/Auth.php
rename to src/AnimeClient/API/Kitsu/Auth.php
diff --git a/src/API/Kitsu/Enum/AnimeAiringStatus.php b/src/AnimeClient/API/Kitsu/Enum/AnimeAiringStatus.php
similarity index 100%
rename from src/API/Kitsu/Enum/AnimeAiringStatus.php
rename to src/AnimeClient/API/Kitsu/Enum/AnimeAiringStatus.php
diff --git a/src/API/Kitsu/GraphQL/Mutations/.gitkeep b/src/AnimeClient/API/Kitsu/GraphQL/Mutations/.gitkeep
similarity index 100%
rename from src/API/Kitsu/GraphQL/Mutations/.gitkeep
rename to src/AnimeClient/API/Kitsu/GraphQL/Mutations/.gitkeep
diff --git a/src/API/Kitsu/GraphQL/Queries/.gitkeep b/src/AnimeClient/API/Kitsu/GraphQL/Queries/.gitkeep
similarity index 100%
rename from src/API/Kitsu/GraphQL/Queries/.gitkeep
rename to src/AnimeClient/API/Kitsu/GraphQL/Queries/.gitkeep
diff --git a/src/API/Kitsu/GraphQL/Queries/AnimeDetails.graphql b/src/AnimeClient/API/Kitsu/GraphQL/Queries/AnimeDetails.graphql
similarity index 100%
rename from src/API/Kitsu/GraphQL/Queries/AnimeDetails.graphql
rename to src/AnimeClient/API/Kitsu/GraphQL/Queries/AnimeDetails.graphql
diff --git a/src/API/Kitsu/GraphQL/Queries/UserDetails.graphql b/src/AnimeClient/API/Kitsu/GraphQL/Queries/UserDetails.graphql
similarity index 100%
rename from src/API/Kitsu/GraphQL/Queries/UserDetails.graphql
rename to src/AnimeClient/API/Kitsu/GraphQL/Queries/UserDetails.graphql
diff --git a/src/API/Kitsu/KitsuRequestBuilder.php b/src/AnimeClient/API/Kitsu/KitsuRequestBuilder.php
similarity index 100%
rename from src/API/Kitsu/KitsuRequestBuilder.php
rename to src/AnimeClient/API/Kitsu/KitsuRequestBuilder.php
diff --git a/src/API/Kitsu/KitsuTrait.php b/src/AnimeClient/API/Kitsu/KitsuTrait.php
similarity index 100%
rename from src/API/Kitsu/KitsuTrait.php
rename to src/AnimeClient/API/Kitsu/KitsuTrait.php
diff --git a/src/API/Kitsu/ListItem.php b/src/AnimeClient/API/Kitsu/ListItem.php
similarity index 100%
rename from src/API/Kitsu/ListItem.php
rename to src/AnimeClient/API/Kitsu/ListItem.php
diff --git a/src/API/Kitsu/Model.php b/src/AnimeClient/API/Kitsu/Model.php
similarity index 100%
rename from src/API/Kitsu/Model.php
rename to src/AnimeClient/API/Kitsu/Model.php
diff --git a/src/API/Kitsu/Transformer/AnimeListTransformer.php b/src/AnimeClient/API/Kitsu/Transformer/AnimeListTransformer.php
similarity index 100%
rename from src/API/Kitsu/Transformer/AnimeListTransformer.php
rename to src/AnimeClient/API/Kitsu/Transformer/AnimeListTransformer.php
diff --git a/src/API/Kitsu/Transformer/AnimeTransformer.php b/src/AnimeClient/API/Kitsu/Transformer/AnimeTransformer.php
similarity index 100%
rename from src/API/Kitsu/Transformer/AnimeTransformer.php
rename to src/AnimeClient/API/Kitsu/Transformer/AnimeTransformer.php
diff --git a/src/API/Kitsu/Transformer/CharacterTransformer.php b/src/AnimeClient/API/Kitsu/Transformer/CharacterTransformer.php
similarity index 100%
rename from src/API/Kitsu/Transformer/CharacterTransformer.php
rename to src/AnimeClient/API/Kitsu/Transformer/CharacterTransformer.php
diff --git a/src/API/Kitsu/Transformer/MangaListTransformer.php b/src/AnimeClient/API/Kitsu/Transformer/MangaListTransformer.php
similarity index 100%
rename from src/API/Kitsu/Transformer/MangaListTransformer.php
rename to src/AnimeClient/API/Kitsu/Transformer/MangaListTransformer.php
diff --git a/src/API/Kitsu/Transformer/MangaTransformer.php b/src/AnimeClient/API/Kitsu/Transformer/MangaTransformer.php
similarity index 100%
rename from src/API/Kitsu/Transformer/MangaTransformer.php
rename to src/AnimeClient/API/Kitsu/Transformer/MangaTransformer.php
diff --git a/src/API/Kitsu/Transformer/PersonTransformer.php b/src/AnimeClient/API/Kitsu/Transformer/PersonTransformer.php
similarity index 100%
rename from src/API/Kitsu/Transformer/PersonTransformer.php
rename to src/AnimeClient/API/Kitsu/Transformer/PersonTransformer.php
diff --git a/src/API/Kitsu/Transformer/UserTransformer.php b/src/AnimeClient/API/Kitsu/Transformer/UserTransformer.php
similarity index 100%
rename from src/API/Kitsu/Transformer/UserTransformer.php
rename to src/AnimeClient/API/Kitsu/Transformer/UserTransformer.php
diff --git a/src/API/Mapping/AnimeWatchingStatus.php b/src/AnimeClient/API/Mapping/AnimeWatchingStatus.php
similarity index 100%
rename from src/API/Mapping/AnimeWatchingStatus.php
rename to src/AnimeClient/API/Mapping/AnimeWatchingStatus.php
diff --git a/src/API/Mapping/MangaReadingStatus.php b/src/AnimeClient/API/Mapping/MangaReadingStatus.php
similarity index 100%
rename from src/API/Mapping/MangaReadingStatus.php
rename to src/AnimeClient/API/Mapping/MangaReadingStatus.php
diff --git a/src/API/ParallelAPIRequest.php b/src/AnimeClient/API/ParallelAPIRequest.php
similarity index 100%
rename from src/API/ParallelAPIRequest.php
rename to src/AnimeClient/API/ParallelAPIRequest.php
diff --git a/src/AnimeClient.php b/src/AnimeClient/AnimeClient.php
similarity index 96%
rename from src/AnimeClient.php
rename to src/AnimeClient/AnimeClient.php
index 27b47993..1242a74d 100644
--- a/src/AnimeClient.php
+++ b/src/AnimeClient/AnimeClient.php
@@ -18,6 +18,7 @@ namespace Aviat\AnimeClient;
 
 use function Amp\Promise\wait;
 
+use Amp\Http\Client\Request;
 use Amp\Http\Client\Response;
 use Amp\Http\Client\HttpClient;
 use Amp\Http\Client\HttpClientBuilder;
@@ -180,8 +181,8 @@ function checkFolderPermissions(ConfigInterface $config): array
 	$publicDir = $config->get('asset_dir');
 
 	$pathMap = [
-		'app/config' => realpath(__DIR__ . '/../app/config'),
-		'app/logs' => realpath(__DIR__ . '/../app/logs'),
+		'app/config' => realpath(__DIR__ . '/../../app/config'),
+		'app/logs' => realpath(__DIR__ . '/../../app/logs'),
 		'public/images/avatars' => "{$publicDir}/images/avatars",
 		'public/images/anime' => "{$publicDir}/images/anime",
 		'public/images/characters' => "{$publicDir}/images/characters",
@@ -229,13 +230,20 @@ function getApiClient ()
 /**
  * Simplify making a request with Http\Client
  *
- * @param $request
+ * @param string|Request $request
  * @return Response
  * @throws \Throwable
  */
 function getResponse ($request): Response
 {
 	$client = getApiClient();
+
+	if (is_string($request))
+	{
+		$request = new Request($request);
+	}
+
+
 	return wait($client->request($request));
 }
 
diff --git a/src/Command/BaseCommand.php b/src/AnimeClient/Command/BaseCommand.php
similarity index 99%
rename from src/Command/BaseCommand.php
rename to src/AnimeClient/Command/BaseCommand.php
index 508206b1..02205d88 100644
--- a/src/Command/BaseCommand.php
+++ b/src/AnimeClient/Command/BaseCommand.php
@@ -68,7 +68,7 @@ abstract class BaseCommand extends Command {
 	 */
 	protected function setupContainer(): Container
 	{
-		$APP_DIR = realpath(__DIR__ . '/../../app');
+		$APP_DIR = realpath(__DIR__ . '/../../../app');
 		$APPCONF_DIR = realpath("{$APP_DIR}/appConf/");
 		$CONF_DIR = realpath("{$APP_DIR}/config/");
 		$baseConfig = require $APPCONF_DIR . '/base_config.php';
diff --git a/src/Command/CacheClear.php b/src/AnimeClient/Command/CacheClear.php
similarity index 100%
rename from src/Command/CacheClear.php
rename to src/AnimeClient/Command/CacheClear.php
diff --git a/src/Command/CachePrime.php b/src/AnimeClient/Command/CachePrime.php
similarity index 100%
rename from src/Command/CachePrime.php
rename to src/AnimeClient/Command/CachePrime.php
diff --git a/src/Command/ClearThumbnails.php b/src/AnimeClient/Command/ClearThumbnails.php
similarity index 100%
rename from src/Command/ClearThumbnails.php
rename to src/AnimeClient/Command/ClearThumbnails.php
diff --git a/src/Command/SyncLists.php b/src/AnimeClient/Command/SyncLists.php
similarity index 100%
rename from src/Command/SyncLists.php
rename to src/AnimeClient/Command/SyncLists.php
diff --git a/src/Command/UpdateThumbnails.php b/src/AnimeClient/Command/UpdateThumbnails.php
similarity index 100%
rename from src/Command/UpdateThumbnails.php
rename to src/AnimeClient/Command/UpdateThumbnails.php
diff --git a/src/Controller.php b/src/AnimeClient/Controller.php
similarity index 100%
rename from src/Controller.php
rename to src/AnimeClient/Controller.php
diff --git a/src/Controller/Anime.php b/src/AnimeClient/Controller/Anime.php
similarity index 100%
rename from src/Controller/Anime.php
rename to src/AnimeClient/Controller/Anime.php
diff --git a/src/Controller/AnimeCollection.php b/src/AnimeClient/Controller/AnimeCollection.php
similarity index 100%
rename from src/Controller/AnimeCollection.php
rename to src/AnimeClient/Controller/AnimeCollection.php
diff --git a/src/Controller/Character.php b/src/AnimeClient/Controller/Character.php
similarity index 100%
rename from src/Controller/Character.php
rename to src/AnimeClient/Controller/Character.php
diff --git a/src/Controller/Images.php b/src/AnimeClient/Controller/Images.php
similarity index 100%
rename from src/Controller/Images.php
rename to src/AnimeClient/Controller/Images.php
diff --git a/src/Controller/Manga.php b/src/AnimeClient/Controller/Manga.php
similarity index 100%
rename from src/Controller/Manga.php
rename to src/AnimeClient/Controller/Manga.php
diff --git a/src/Controller/MangaCollection.php b/src/AnimeClient/Controller/MangaCollection.php
similarity index 100%
rename from src/Controller/MangaCollection.php
rename to src/AnimeClient/Controller/MangaCollection.php
diff --git a/src/Controller/Misc.php b/src/AnimeClient/Controller/Misc.php
similarity index 100%
rename from src/Controller/Misc.php
rename to src/AnimeClient/Controller/Misc.php
diff --git a/src/Controller/People.php b/src/AnimeClient/Controller/People.php
similarity index 100%
rename from src/Controller/People.php
rename to src/AnimeClient/Controller/People.php
diff --git a/src/Controller/Settings.php b/src/AnimeClient/Controller/Settings.php
similarity index 100%
rename from src/Controller/Settings.php
rename to src/AnimeClient/Controller/Settings.php
diff --git a/src/Controller/User.php b/src/AnimeClient/Controller/User.php
similarity index 100%
rename from src/Controller/User.php
rename to src/AnimeClient/Controller/User.php
diff --git a/src/Dispatcher.php b/src/AnimeClient/Dispatcher.php
similarity index 100%
rename from src/Dispatcher.php
rename to src/AnimeClient/Dispatcher.php
diff --git a/src/FormGenerator.php b/src/AnimeClient/FormGenerator.php
similarity index 100%
rename from src/FormGenerator.php
rename to src/AnimeClient/FormGenerator.php
diff --git a/src/Helper/Form.php b/src/AnimeClient/Helper/Form.php
similarity index 100%
rename from src/Helper/Form.php
rename to src/AnimeClient/Helper/Form.php
diff --git a/src/Helper/Menu.php b/src/AnimeClient/Helper/Menu.php
similarity index 100%
rename from src/Helper/Menu.php
rename to src/AnimeClient/Helper/Menu.php
diff --git a/src/Helper/Picture.php b/src/AnimeClient/Helper/Picture.php
similarity index 100%
rename from src/Helper/Picture.php
rename to src/AnimeClient/Helper/Picture.php
diff --git a/src/MenuGenerator.php b/src/AnimeClient/MenuGenerator.php
similarity index 100%
rename from src/MenuGenerator.php
rename to src/AnimeClient/MenuGenerator.php
diff --git a/src/Model/API.php b/src/AnimeClient/Model/API.php
similarity index 100%
rename from src/Model/API.php
rename to src/AnimeClient/Model/API.php
diff --git a/src/Model/Anime.php b/src/AnimeClient/Model/Anime.php
similarity index 100%
rename from src/Model/Anime.php
rename to src/AnimeClient/Model/Anime.php
diff --git a/src/Model/AnimeCollection.php b/src/AnimeClient/Model/AnimeCollection.php
similarity index 100%
rename from src/Model/AnimeCollection.php
rename to src/AnimeClient/Model/AnimeCollection.php
diff --git a/src/Model/Collection.php b/src/AnimeClient/Model/Collection.php
similarity index 100%
rename from src/Model/Collection.php
rename to src/AnimeClient/Model/Collection.php
diff --git a/src/Model/DB.php b/src/AnimeClient/Model/DB.php
similarity index 100%
rename from src/Model/DB.php
rename to src/AnimeClient/Model/DB.php
diff --git a/src/Model/Manga.php b/src/AnimeClient/Model/Manga.php
similarity index 100%
rename from src/Model/Manga.php
rename to src/AnimeClient/Model/Manga.php
diff --git a/src/Model/MangaCollection.php b/src/AnimeClient/Model/MangaCollection.php
similarity index 100%
rename from src/Model/MangaCollection.php
rename to src/AnimeClient/Model/MangaCollection.php
diff --git a/src/Model/Settings.php b/src/AnimeClient/Model/Settings.php
similarity index 98%
rename from src/Model/Settings.php
rename to src/AnimeClient/Model/Settings.php
index 0a68e7a1..92dc1e91 100644
--- a/src/Model/Settings.php
+++ b/src/AnimeClient/Model/Settings.php
@@ -207,7 +207,7 @@ final class Settings {
 			return FALSE;
 		}
 
-		$savePath = realpath(_dir(__DIR__, '..', '..', 'app', 'config'));
+		$savePath = realpath(_dir(__DIR__, '..', '..', '..', 'app', 'config'));
 		$saveFile = _dir($savePath, 'admin-override.toml');
 
 		$saved = file_put_contents($saveFile, arrayToToml($settings));
diff --git a/src/RoutingBase.php b/src/AnimeClient/RoutingBase.php
similarity index 100%
rename from src/RoutingBase.php
rename to src/AnimeClient/RoutingBase.php
diff --git a/src/Types/AbstractType.php b/src/AnimeClient/Types/AbstractType.php
similarity index 100%
rename from src/Types/AbstractType.php
rename to src/AnimeClient/Types/AbstractType.php
diff --git a/src/Types/Anime.php b/src/AnimeClient/Types/Anime.php
similarity index 100%
rename from src/Types/Anime.php
rename to src/AnimeClient/Types/Anime.php
diff --git a/src/Types/AnimeListItem.php b/src/AnimeClient/Types/AnimeListItem.php
similarity index 100%
rename from src/Types/AnimeListItem.php
rename to src/AnimeClient/Types/AnimeListItem.php
diff --git a/src/Types/AnimePage.php b/src/AnimeClient/Types/AnimePage.php
similarity index 100%
rename from src/Types/AnimePage.php
rename to src/AnimeClient/Types/AnimePage.php
diff --git a/src/Types/Character.php b/src/AnimeClient/Types/Character.php
similarity index 100%
rename from src/Types/Character.php
rename to src/AnimeClient/Types/Character.php
diff --git a/src/Types/Characters.php b/src/AnimeClient/Types/Characters.php
similarity index 100%
rename from src/Types/Characters.php
rename to src/AnimeClient/Types/Characters.php
diff --git a/src/Types/Config.php b/src/AnimeClient/Types/Config.php
similarity index 100%
rename from src/Types/Config.php
rename to src/AnimeClient/Types/Config.php
diff --git a/src/Types/Config/Anilist.php b/src/AnimeClient/Types/Config/Anilist.php
similarity index 100%
rename from src/Types/Config/Anilist.php
rename to src/AnimeClient/Types/Config/Anilist.php
diff --git a/src/Types/Config/Cache.php b/src/AnimeClient/Types/Config/Cache.php
similarity index 100%
rename from src/Types/Config/Cache.php
rename to src/AnimeClient/Types/Config/Cache.php
diff --git a/src/Types/Config/Database.php b/src/AnimeClient/Types/Config/Database.php
similarity index 100%
rename from src/Types/Config/Database.php
rename to src/AnimeClient/Types/Config/Database.php
diff --git a/src/Types/FormItem.php b/src/AnimeClient/Types/FormItem.php
similarity index 100%
rename from src/Types/FormItem.php
rename to src/AnimeClient/Types/FormItem.php
diff --git a/src/Types/FormItemData.php b/src/AnimeClient/Types/FormItemData.php
similarity index 100%
rename from src/Types/FormItemData.php
rename to src/AnimeClient/Types/FormItemData.php
diff --git a/src/Types/MangaListItem.php b/src/AnimeClient/Types/MangaListItem.php
similarity index 100%
rename from src/Types/MangaListItem.php
rename to src/AnimeClient/Types/MangaListItem.php
diff --git a/src/Types/MangaListItemDetail.php b/src/AnimeClient/Types/MangaListItemDetail.php
similarity index 100%
rename from src/Types/MangaListItemDetail.php
rename to src/AnimeClient/Types/MangaListItemDetail.php
diff --git a/src/Types/MangaPage.php b/src/AnimeClient/Types/MangaPage.php
similarity index 100%
rename from src/Types/MangaPage.php
rename to src/AnimeClient/Types/MangaPage.php
diff --git a/src/Types/Media.php b/src/AnimeClient/Types/Media.php
similarity index 100%
rename from src/Types/Media.php
rename to src/AnimeClient/Types/Media.php
diff --git a/src/Types/Person.php b/src/AnimeClient/Types/Person.php
similarity index 100%
rename from src/Types/Person.php
rename to src/AnimeClient/Types/Person.php
diff --git a/src/Types/UndefinedPropertyException.php b/src/AnimeClient/Types/UndefinedPropertyException.php
similarity index 100%
rename from src/Types/UndefinedPropertyException.php
rename to src/AnimeClient/Types/UndefinedPropertyException.php
diff --git a/src/Types/User.php b/src/AnimeClient/Types/User.php
similarity index 100%
rename from src/Types/User.php
rename to src/AnimeClient/Types/User.php
diff --git a/src/UrlGenerator.php b/src/AnimeClient/UrlGenerator.php
similarity index 100%
rename from src/UrlGenerator.php
rename to src/AnimeClient/UrlGenerator.php
diff --git a/src/Util.php b/src/AnimeClient/Util.php
similarity index 100%
rename from src/Util.php
rename to src/AnimeClient/Util.php
diff --git a/src/constants.php b/src/AnimeClient/constants.php
similarity index 100%
rename from src/constants.php
rename to src/AnimeClient/constants.php
diff --git a/tests/API/APIRequestBuilderTest.php b/tests/API/APIRequestBuilderTest.php
index 1cb94752..dea2e212 100644
--- a/tests/API/APIRequestBuilderTest.php
+++ b/tests/API/APIRequestBuilderTest.php
@@ -4,7 +4,7 @@
  *
  * An API client for Kitsu to manage anime and manga watch lists
  *
- * PHP version 7.3
+ * PHP version 7.2
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
@@ -43,7 +43,7 @@ class APIRequestBuilderTest extends TestCase {
 		$request = $this->builder->newRequest('GET', 'gzip')
 			->getFullRequest();
 		$response = getResponse($request);
-		$body = Json::decode(wait($response->getBody()));
+		$body = Json::decode(wait($response->getBody()->buffer()));
 		$this->assertEquals(1, $body['gzipped']);
 	}
 
@@ -61,7 +61,7 @@ class APIRequestBuilderTest extends TestCase {
 			->getFullRequest();
 
 		$response = getResponse($request);
-		$body = Json::decode(wait($response->getBody()));
+		$body = Json::decode(wait($response->getBody()->buffer()));
 
 		$this->assertEquals('Basic dXNlcm5hbWU6cGFzc3dvcmQ=', $body['headers']['Authorization']);
 	}
@@ -89,7 +89,7 @@ class APIRequestBuilderTest extends TestCase {
 			->getFullRequest();
 
 		$response = getResponse($request);
-		$body = Json::decode(wait($response->getBody()));
+		$body = Json::decode(wait($response->getBody()->buffer()));
 
 		$this->assertEquals($expected, $body['args']);
 	}
@@ -106,7 +106,7 @@ class APIRequestBuilderTest extends TestCase {
 			->getFullRequest();
 
 		$response = getResponse($request);
-		$body = Json::decode(wait($response->getBody()));
+		$body = Json::decode(wait($response->getBody()->buffer()));
 
 		$this->assertEquals($formValues, $body['form']);
 	}
@@ -130,7 +130,7 @@ class APIRequestBuilderTest extends TestCase {
 			->getFullRequest();
 
 		$response = getResponse($request);
-		$body = Json::decode(wait($response->getBody()));
+		$body = Json::decode(wait($response->getBody()->buffer()));
 
 		$this->assertEquals($data, $body['json']);
 	}
diff --git a/tests/API/Kitsu/Transformer/__snapshots__/MangaListTransformerTest__testTransform__1.yml b/tests/API/Kitsu/Transformer/__snapshots__/MangaListTransformerTest__testTransform__1.yml
new file mode 100644
index 00000000..87effff0
--- /dev/null
+++ b/tests/API/Kitsu/Transformer/__snapshots__/MangaListTransformerTest__testTransform__1.yml
@@ -0,0 +1,5 @@
+- null
+- null
+- null
+- null
+- null