diff --git a/app/bootstrap.php b/app/bootstrap.php
index 82f615bc..38ea40fe 100644
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -3,7 +3,7 @@
  * Bootstrap / Dependency Injection
  */
 
-namespace AnimeClient;
+namespace Aviat\AnimeClient;
 
 use \Whoops\Handler\PrettyPageHandler;
 use \Whoops\Handler\JsonResponseHandler;
diff --git a/app/config/routes.php b/app/config/routes.php
index 1060ddf2..92e46c47 100644
--- a/app/config/routes.php
+++ b/app/config/routes.php
@@ -70,25 +70,6 @@ return [
 				'code' => '301'
 			]
 		],
-		'login_form' => [
-			'path' => '/anime/login',
-			'action' => ['login'],
-			'verb' => 'get'
-		],
-		'login_action' => [
-			'path' => '/anime/login',
-			'action' => ['login_action'],
-			'verb' => 'post'
-		],
-		'logout' => [
-			'path' => '/anime/logout',
-			'action' => ['logout']
-		],
-		'update' => [
-			'path' => '/anime/update',
-			'action' => ['update'],
-			'verb' => 'post'
-		],
 		'search' => [
 			'path' => '/anime/search',
 			'action' => ['search'],
diff --git a/src/views/404.php b/app/views/404.php
similarity index 100%
rename from src/views/404.php
rename to app/views/404.php
diff --git a/src/views/anime/cover.php b/app/views/anime/cover.php
similarity index 100%
rename from src/views/anime/cover.php
rename to app/views/anime/cover.php
diff --git a/src/views/anime/edit.php b/app/views/anime/edit.php
similarity index 100%
rename from src/views/anime/edit.php
rename to app/views/anime/edit.php
diff --git a/src/views/anime/list.php b/app/views/anime/list.php
similarity index 100%
rename from src/views/anime/list.php
rename to app/views/anime/list.php
diff --git a/src/views/collection/add.php b/app/views/collection/add.php
similarity index 100%
rename from src/views/collection/add.php
rename to app/views/collection/add.php
diff --git a/src/views/collection/cover.php b/app/views/collection/cover.php
similarity index 100%
rename from src/views/collection/cover.php
rename to app/views/collection/cover.php
diff --git a/src/views/collection/edit.php b/app/views/collection/edit.php
similarity index 100%
rename from src/views/collection/edit.php
rename to app/views/collection/edit.php
diff --git a/src/views/collection/list.php b/app/views/collection/list.php
similarity index 100%
rename from src/views/collection/list.php
rename to app/views/collection/list.php
diff --git a/src/views/footer.php b/app/views/footer.php
similarity index 100%
rename from src/views/footer.php
rename to app/views/footer.php
diff --git a/src/views/header.php b/app/views/header.php
similarity index 100%
rename from src/views/header.php
rename to app/views/header.php
diff --git a/src/views/login.php b/app/views/login.php
similarity index 100%
rename from src/views/login.php
rename to app/views/login.php
diff --git a/src/views/manga/cover.php b/app/views/manga/cover.php
similarity index 100%
rename from src/views/manga/cover.php
rename to app/views/manga/cover.php
diff --git a/src/views/manga/list.php b/app/views/manga/list.php
similarity index 100%
rename from src/views/manga/list.php
rename to app/views/manga/list.php
diff --git a/src/views/message.php b/app/views/message.php
similarity index 100%
rename from src/views/message.php
rename to app/views/message.php
diff --git a/index.php b/index.php
index 87e8c089..243a05e1 100644
--- a/index.php
+++ b/index.php
@@ -54,7 +54,6 @@ function _setup_autoloaders()
 	require _dir(ROOT_DIR, '/vendor/autoload.php');
 	spl_autoload_register(function ($class) {
 		$class_parts = explode('\\', $class);
-		array_shift($class_parts);
 		$ns_path = SRC_DIR . '/' . implode('/', $class_parts) . ".php";
 
 		if (file_exists($ns_path))
diff --git a/src/Base/Config.php b/src/Aviat/AnimeClient/Base/Config.php
similarity index 96%
rename from src/Base/Config.php
rename to src/Aviat/AnimeClient/Base/Config.php
index 5f9a0bc6..3f1cd40a 100644
--- a/src/Base/Config.php
+++ b/src/Aviat/AnimeClient/Base/Config.php
@@ -3,7 +3,7 @@
  * Base Configuration class
  */
 
-namespace AnimeClient\Base;
+namespace Aviat\AnimeClient\Base;
 
 /**
  * Wrapper for configuration values
diff --git a/src/Aviat/AnimeClient/Base/Container.php b/src/Aviat/AnimeClient/Base/Container.php
new file mode 100644
index 00000000..8c6bdcd2
--- /dev/null
+++ b/src/Aviat/AnimeClient/Base/Container.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Aviat\AnimeClient\Base;
+
+/**
+ * Dependency container
+ */
+class Container extends \Aviat\Ion\Base\Container {
+
+}
+// End of Container.php
\ No newline at end of file
diff --git a/src/Base/Controller.php b/src/Aviat/AnimeClient/Base/Controller.php
similarity index 96%
rename from src/Base/Controller.php
rename to src/Aviat/AnimeClient/Base/Controller.php
index db0281a5..f670a82d 100644
--- a/src/Base/Controller.php
+++ b/src/Aviat/AnimeClient/Base/Controller.php
@@ -2,7 +2,7 @@
 /**
  * Base Controller
  */
-namespace AnimeClient\Base;
+namespace Aviat\AnimeClient\Base;
 
 /**
  * Base class for controllers, defines output methods
@@ -116,7 +116,7 @@ class Controller {
 
 		$defaultHandler->addDataTable('Template Data', $data);
 
-		$template_path = _dir(SRC_DIR, 'views', "{$template}.php");
+		$template_path = _dir(APP_DIR, 'views', "{$template}.php");
 
 		if ( ! is_file($template_path))
 		{
@@ -125,9 +125,9 @@ class Controller {
 
 		ob_start();
 		extract($data);
-		include _dir(SRC_DIR, 'views', 'header.php');
+		include _dir(APP_DIR, 'views', 'header.php');
 		include $template_path;
-		include _dir(SRC_DIR, 'views', 'footer.php');
+		include _dir(APP_DIR, 'views', 'footer.php');
 		$buffer = ob_get_contents();
 		ob_end_clean();
 
diff --git a/src/Base/Model.php b/src/Aviat/AnimeClient/Base/Model.php
similarity index 98%
rename from src/Base/Model.php
rename to src/Aviat/AnimeClient/Base/Model.php
index 76896170..8b320608 100644
--- a/src/Base/Model.php
+++ b/src/Aviat/AnimeClient/Base/Model.php
@@ -2,7 +2,7 @@
 /**
  * Base for base models
  */
-namespace AnimeClient\Base;
+namespace Aviat\AnimeClient\Base;
 
 use abeautifulsite\SimpleImage;
 
diff --git a/src/Base/Model/API.php b/src/Aviat/AnimeClient/Base/Model/API.php
similarity index 91%
rename from src/Base/Model/API.php
rename to src/Aviat/AnimeClient/Base/Model/API.php
index b8a2f748..4ab4fd17 100644
--- a/src/Base/Model/API.php
+++ b/src/Aviat/AnimeClient/Base/Model/API.php
@@ -2,16 +2,16 @@
 /**
  * Base API Model
  */
-namespace AnimeClient\Base\Model;
+namespace Aviat\AnimeClient\Base\Model;
 
 use \GuzzleHttp\Client;
 use \GuzzleHttp\Cookie\CookieJar;
-use \AnimeClient\Base\Container;
+use \Aviat\AnimeClient\Base\Container;
 
 /**
  * Base model for api interaction
  */
-class API extends \AnimeClient\Base\Model {
+class API extends \Aviat\AnimeClient\Base\Model {
 
 	/**
 	 * Base url for making api requests
diff --git a/src/Base/Model/DB.php b/src/Aviat/AnimeClient/Base/Model/DB.php
similarity index 78%
rename from src/Base/Model/DB.php
rename to src/Aviat/AnimeClient/Base/Model/DB.php
index 7992e91b..be7b506d 100644
--- a/src/Base/Model/DB.php
+++ b/src/Aviat/AnimeClient/Base/Model/DB.php
@@ -2,14 +2,14 @@
 /**
  * Base DB model
  */
-namespace AnimeClient\Base\Model;
+namespace Aviat\AnimeClient\Base\Model;
 
-use AnimeClient\Base\Container;
+use Aviat\AnimeClient\Base\Container;
 
 /**
  * Base model for database interaction
  */
-class DB extends \AnimeClient\Base\Model {
+class DB extends \Aviat\AnimeClient\Base\Model {
 	/**
 	 * The query builder object
 	 * @var object $db
diff --git a/src/Base/Router.php b/src/Aviat/AnimeClient/Base/Router.php
similarity index 94%
rename from src/Base/Router.php
rename to src/Aviat/AnimeClient/Base/Router.php
index c33413f2..b448109c 100644
--- a/src/Base/Router.php
+++ b/src/Aviat/AnimeClient/Base/Router.php
@@ -2,10 +2,10 @@
 /**
  * Routing logic
  */
-namespace AnimeClient\Base;
+namespace Aviat\AnimeClient\Base;
 
-use \Aura\Web\Request;
-use \Aura\Web\Response;
+use Aura\Web\Request;
+use Aura\Web\Response;
 
 /**
  * Basic routing/ dispatch
@@ -39,10 +39,7 @@ class Router extends RoutingBase {
 	/**
 	 * Constructor
 	 *
-	 * @param Config $config
-	 * @param Router $router
-	 * @param Request $request
-	 * @param Response $response
+	 * @param Container $container
 	 */
 	public function __construct(Container $container)
 	{
@@ -179,7 +176,7 @@ class Router extends RoutingBase {
 			$path = $route['path'];
 			unset($route['path']);
 
-			$controller_class = '\\AnimeClient\\Controller\\' . ucfirst($route_type);
+			$controller_class = '\\Aviat\\AnimeClient\\Controller\\' . ucfirst($route_type);
 
 			// Prepend the controller to the route parameters
 			array_unshift($route['action'], $controller_class);
diff --git a/src/Base/RoutingBase.php b/src/Aviat/AnimeClient/Base/RoutingBase.php
similarity index 82%
rename from src/Base/RoutingBase.php
rename to src/Aviat/AnimeClient/Base/RoutingBase.php
index 1887ae30..e19e82d5 100644
--- a/src/Base/RoutingBase.php
+++ b/src/Aviat/AnimeClient/Base/RoutingBase.php
@@ -1,7 +1,13 @@
 <?php
+/**
+ * Base class for routing to make namespaced config settings
+ * easier to work with
+ */
+namespace Aviat\AnimeClient\Base;
 
-namespace AnimeClient\Base;
-
+/**
+ * Base for routing/url classes
+ */
 class RoutingBase {
 	/**
 	 * Injection Container
diff --git a/src/Base/UrlGenerator.php b/src/Aviat/AnimeClient/Base/UrlGenerator.php
similarity index 96%
rename from src/Base/UrlGenerator.php
rename to src/Aviat/AnimeClient/Base/UrlGenerator.php
index 0d7aac9d..aeb22797 100644
--- a/src/Base/UrlGenerator.php
+++ b/src/Aviat/AnimeClient/Base/UrlGenerator.php
@@ -1,6 +1,8 @@
 <?php
-
-namespace AnimeClient\Base;
+/**
+ * Generate full urls from fragments
+ */
+namespace Aviat\AnimeClient\Base;
 
 /**
  * UrlGenerator class.
diff --git a/src/Controller/Anime.php b/src/Aviat/AnimeClient/Controller/Anime.php
similarity index 88%
rename from src/Controller/Anime.php
rename to src/Aviat/AnimeClient/Controller/Anime.php
index 8cdef827..53cc4b4f 100644
--- a/src/Controller/Anime.php
+++ b/src/Aviat/AnimeClient/Controller/Anime.php
@@ -3,13 +3,13 @@
  * Anime Controller
  */
 
-namespace AnimeClient\Controller;
+namespace Aviat\AnimeClient\Controller;
 
-use AnimeClient\Base\Container;
-use AnimeClient\Base\Controller as BaseController;
-use AnimeClient\Base\Config;
-use AnimeClient\Model\Anime as AnimeModel;
-use AnimeClient\Model\AnimeCollection as AnimeCollectionModel;
+use Aviat\AnimeClient\Base\Container;
+use Aviat\AnimeClient\Base\Controller as BaseController;
+use Aviat\AnimeClient\Base\Config;
+use Aviat\AnimeClient\Model\Anime as AnimeModel;
+use Aviat\AnimeClient\Model\AnimeCollection as AnimeCollectionModel;
 
 /**
  * Controller for Anime-related pages
diff --git a/src/Controller/Collection.php b/src/Aviat/AnimeClient/Controller/Collection.php
similarity index 89%
rename from src/Controller/Collection.php
rename to src/Aviat/AnimeClient/Controller/Collection.php
index 03fdfd97..de33f32f 100644
--- a/src/Controller/Collection.php
+++ b/src/Aviat/AnimeClient/Controller/Collection.php
@@ -3,13 +3,13 @@
  * Anime Collection Controller
  */
 
-namespace AnimeClient\Controller;
+namespace Aviat\AnimeClient\Controller;
 
-use AnimeClient\Base\Container;
-use AnimeClient\Base\Controller as BaseController;
-use AnimeClient\Base\Config;
-use AnimeClient\Model\Anime as AnimeModel;
-use AnimeClient\Model\AnimeCollection as AnimeCollectionModel;
+use Aviat\AnimeClient\Base\Container;
+use Aviat\AnimeClient\Base\Controller as BaseController;
+use Aviat\AnimeClient\Base\Config;
+use Aviat\AnimeClient\Model\Anime as AnimeModel;
+use Aviat\AnimeClient\Model\AnimeCollection as AnimeCollectionModel;
 
 /**
  * Controller for Anime collection pages
@@ -44,6 +44,8 @@ class Collection extends BaseController {
 
 	/**
 	 * Constructor
+	 *
+	 * @param Container $container
 	 */
 	public function __construct(Container $container)
 	{
@@ -78,6 +80,7 @@ class Collection extends BaseController {
 	/**
 	 * Show the anime collection page
 	 *
+	 * @param string $view
 	 * @return void
 	 */
 	public function index($view)
diff --git a/src/Controller/Manga.php b/src/Aviat/AnimeClient/Controller/Manga.php
similarity index 87%
rename from src/Controller/Manga.php
rename to src/Aviat/AnimeClient/Controller/Manga.php
index 8f3709e6..61a27190 100644
--- a/src/Controller/Manga.php
+++ b/src/Aviat/AnimeClient/Controller/Manga.php
@@ -2,12 +2,12 @@
 /**
  * Manga Controller
  */
-namespace AnimeClient\Controller;
+namespace Aviat\AnimeClient\Controller;
 
-use AnimeClient\Base\Container;
-use AnimeClient\Base\Controller;
-use AnimeClient\Base\Config;
-use AnimeClient\Model\Manga as MangaModel;
+use Aviat\AnimeClient\Base\Container;
+use Aviat\AnimeClient\Base\Controller;
+use Aviat\AnimeClient\Base\Config;
+use Aviat\AnimeClient\Model\Manga as MangaModel;
 
 /**
  * Controller for manga list
@@ -42,6 +42,8 @@ class Manga extends Controller {
 
 	/**
 	 * Constructor
+	 *
+	 * @param Container $container
 	 */
 	public function __construct(Container $container)
 	{
diff --git a/src/Aviat/AnimeClient/Controller/Stats.php b/src/Aviat/AnimeClient/Controller/Stats.php
new file mode 100644
index 00000000..39c7dec2
--- /dev/null
+++ b/src/Aviat/AnimeClient/Controller/Stats.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Aviat\AnimeClient\Controller;
+
+use Aviat\AnimeClient\Base\Container;
+use Aviat\AnimeClient\Base\Controller;
+
+class Stats extends Controller {
+
+}
+// End of Stats.php
\ No newline at end of file
diff --git a/src/Model/Anime.php b/src/Aviat/AnimeClient/Model/Anime.php
similarity index 98%
rename from src/Model/Anime.php
rename to src/Aviat/AnimeClient/Model/Anime.php
index 3340d5cb..8b3446aa 100644
--- a/src/Model/Anime.php
+++ b/src/Aviat/AnimeClient/Model/Anime.php
@@ -3,9 +3,9 @@
  * Anime API Model
  */
 
-namespace AnimeClient\Model;
+namespace Aviat\AnimeClient\Model;
 
-use AnimeClient\Base\Model\API;
+use Aviat\AnimeClient\Base\Model\API;
 
 /**
  * Model for handling requests dealing with the anime list
diff --git a/src/Model/AnimeCollection.php b/src/Aviat/AnimeClient/Model/AnimeCollection.php
similarity index 97%
rename from src/Model/AnimeCollection.php
rename to src/Aviat/AnimeClient/Model/AnimeCollection.php
index a550f420..757f5c40 100644
--- a/src/Model/AnimeCollection.php
+++ b/src/Aviat/AnimeClient/Model/AnimeCollection.php
@@ -3,11 +3,11 @@
  * Anime Collection DB Model
  */
 
-namespace AnimeClient\Model;
+namespace Aviat\AnimeClient\Model;
 
-use AnimeClient\Base\Model\DB;
-use \AnimeClient\Base\Container;
-use AnimeClient\Model\Anime as AnimeModel;
+use Aviat\AnimeClient\Base\Model\DB;
+use \Aviat\AnimeClient\Base\Container;
+use Aviat\AnimeClient\Model\Anime as AnimeModel;
 
 /**
  * Model for getting anime collection data
diff --git a/src/Model/Manga.php b/src/Aviat/AnimeClient/Model/Manga.php
similarity index 98%
rename from src/Model/Manga.php
rename to src/Aviat/AnimeClient/Model/Manga.php
index 7e6104ee..e9d7bd3c 100644
--- a/src/Model/Manga.php
+++ b/src/Aviat/AnimeClient/Model/Manga.php
@@ -2,9 +2,9 @@
 /**
  * Manga API Model
  */
-namespace AnimeClient\Model;
+namespace Aviat\AnimeClient\Model;
 
-use AnimeClient\Base\Model\API;
+use Aviat\AnimeClient\Base\Model\API;
 
 /**
  * Model for handling requests dealing with the manga list
diff --git a/src/Model/Stats.php b/src/Aviat/AnimeClient/Model/Stats.php
similarity index 71%
rename from src/Model/Stats.php
rename to src/Aviat/AnimeClient/Model/Stats.php
index 6cf73b42..d77a6bc7 100644
--- a/src/Model/Stats.php
+++ b/src/Aviat/AnimeClient/Model/Stats.php
@@ -3,10 +3,10 @@
  * Anime API Model
  */
 
-namespace AnimeClient\Model;
+namespace Aviat\AnimeClient\Model;
 
-use AnimeClient\Base\Model\DB;
-use AnimeClient\Base\Container;
+use Aviat\AnimeClient\Base\Model\DB;
+use Aviat\AnimeClient\Base\Container;
 
 use StatsChartsTrait;
 
diff --git a/src/Model/StatsChartsTrait.php b/src/Aviat/AnimeClient/Model/StatsChartsTrait.php
similarity index 90%
rename from src/Model/StatsChartsTrait.php
rename to src/Aviat/AnimeClient/Model/StatsChartsTrait.php
index 59babbae..5f52404e 100644
--- a/src/Model/StatsChartsTrait.php
+++ b/src/Aviat/AnimeClient/Model/StatsChartsTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace AnimeClient\Model;
+namespace Aviat\AnimeClient\Model;
 
 use CpChart\Services\pChartFactory;
 
diff --git a/src/Base/Container.php b/src/Aviat/Ion/Base/Container.php
similarity index 87%
rename from src/Base/Container.php
rename to src/Aviat/Ion/Base/Container.php
index 4ce404f9..dd9af5d5 100644
--- a/src/Base/Container.php
+++ b/src/Aviat/Ion/Base/Container.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace AnimeClient\Base;
+namespace Aviat\Ion\Base;
 
 /**
- * Wrapper of Aura container to be in the anime client namespace
+ * Dependency container
  */
 class Container {
 
diff --git a/src/Aviat/Ion/Base/Page.php b/src/Aviat/Ion/Base/Page.php
new file mode 100644
index 00000000..dd2e9bbf
--- /dev/null
+++ b/src/Aviat/Ion/Base/Page.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace Aviat\Ion\Base;
+
+use Aura\Web\Request;
+use Aura\Web\Response;
+
+class Page {
+
+	/**
+	 * @var Request
+	 */
+	protected $request;
+
+	/**
+	 * @var Response
+	 */
+	protected $response;
+
+	/**
+	 * __construct function.
+	 *
+	 * @param Request $request
+	 * @param Response $response
+	 */
+	public function __construct(Request $request, Response $response)
+	{
+		$this->request = $request;
+		$this->response = $response;
+	}
+
+	/**
+	 * __destruct function.
+	 */
+	public function __destruct()
+	{
+		$this->output();
+	}
+
+	/**
+	 * Output the response to the client
+	 */
+	protected function output()
+	{
+		// send status
+		@header($this->response->status->get(), true, $this->response->status->getCode());
+
+		// headers
+		foreach($this->response->headers->get() as $label => $value)
+		{
+			@header("{$label}: {$value}");
+		}
+
+		// cookies
+		foreach($this->response->cookies->get() as $name => $cookie)
+		{
+			@setcookie(
+				$name,
+				$cookie['value'],
+				$cookie['expire'],
+				$cookie['path'],
+				$cookie['domain'],
+				$cookie['secure'],
+				$cookie['httponly']
+			);
+		}
+
+		// send the actual response
+		echo $this->response->content->get();
+	}
+}
+// End of Page.php
diff --git a/src/Controller/Stats.php b/src/Controller/Stats.php
deleted file mode 100644
index 5bf95e06..00000000
--- a/src/Controller/Stats.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace AnimeClient\Controller;
-
-use AnimeClient\Base\Container;
-use AnimeClient\Base\Controller;
-
-class Stats extends Controller {
-
-}
-// End of Stats.php
\ No newline at end of file
diff --git a/tests/Base/BaseControllerTest.php b/tests/Base/BaseControllerTest.php
index 261d3c73..6f035f4b 100644
--- a/tests/Base/BaseControllerTest.php
+++ b/tests/Base/BaseControllerTest.php
@@ -1,5 +1,5 @@
 <?php
-use \AnimeClient\Base\Controller;
+use \Aviat\AnimeClient\Base\Controller;
 use \Aura\Web\WebFactory;
 use \Aura\Router\RouterFactory;
 
diff --git a/tests/Base/BaseModelTest.php b/tests/Base/BaseModelTest.php
index 07388f2d..8ceb8aee 100644
--- a/tests/Base/BaseModelTest.php
+++ b/tests/Base/BaseModelTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use AnimeClient\Base\Model as BaseModel;
-use AnimeClient\Base\Container;
+use Aviat\AnimeClient\Base\Model as BaseModel;
+use Aviat\AnimeClient\Base\Container;
 
 class BaseModelTest extends AnimeClient_TestCase {
 
diff --git a/tests/Base/ConfigTest.php b/tests/Base/ConfigTest.php
index c71a81ea..d670b42a 100644
--- a/tests/Base/ConfigTest.php
+++ b/tests/Base/ConfigTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use \AnimeClient\Base\Config;
+use \Aviat\AnimeClient\Base\Config;
 
 class ConfigTest extends AnimeClient_TestCase {
 
diff --git a/tests/Base/Model/BaseApiModelTest.php b/tests/Base/Model/BaseApiModelTest.php
index 8785f6ca..7e88e3fe 100644
--- a/tests/Base/Model/BaseApiModelTest.php
+++ b/tests/Base/Model/BaseApiModelTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use AnimeClient\Base\Container;
-use AnimeClient\Base\Model\API as BaseApiModel;
+use Aviat\AnimeClient\Base\Container;
+use Aviat\AnimeClient\Base\Model\API as BaseApiModel;
 
 class MockBaseApiModel extends BaseApiModel {
 
@@ -23,8 +23,8 @@ class BaseApiModelTest extends AnimeClient_TestCase {
 		$baseApiModel = new MockBaseApiModel($this->container);
 
 		// Some basic type checks for class memebers
-		$this->assertInstanceOf('\AnimeClient\Base\Model', $baseApiModel);
-		$this->assertInstanceOf('\AnimeClient\Base\Model\API', $baseApiModel);
+		$this->assertInstanceOf('\Aviat\AnimeClient\Base\Model', $baseApiModel);
+		$this->assertInstanceOf('\Aviat\AnimeClient\Base\Model\API', $baseApiModel);
 
 		$this->assertInstanceOf('\GuzzleHttp\Client', $baseApiModel->client);
 		$this->assertInstanceOf('\GuzzleHttp\Cookie\CookieJar', $baseApiModel->cookieJar);
diff --git a/tests/Base/Model/BaseDBModelTest.php b/tests/Base/Model/BaseDBModelTest.php
index 1b1f37ef..6a600aeb 100644
--- a/tests/Base/Model/BaseDBModelTest.php
+++ b/tests/Base/Model/BaseDBModelTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use AnimeClient\Base\Model\DB as BaseDBModel;
+use Aviat\AnimeClient\Base\Model\DB as BaseDBModel;
 
 class BaseDBModelTest extends AnimeClient_TestCase {
 
diff --git a/tests/Base/RouterTest.php b/tests/Base/RouterTest.php
index 5b77b217..f73241d5 100644
--- a/tests/Base/RouterTest.php
+++ b/tests/Base/RouterTest.php
@@ -1,9 +1,9 @@
 <?php
 
-use AnimeClient\Base\Router;
-use AnimeClient\Base\Config;
-use AnimeClient\Base\Container;
-use AnimeClient\Base\UrlGenerator;
+use Aviat\AnimeClient\Base\Router;
+use Aviat\AnimeClient\Base\Config;
+use Aviat\AnimeClient\Base\Container;
+use Aviat\AnimeClient\Base\UrlGenerator;
 use Aura\Web\WebFactory;
 use Aura\Router\RouterFactory;
 
diff --git a/tests/Base/UrlGeneratorTest.php b/tests/Base/UrlGeneratorTest.php
index 1a1a7bf3..6fd70d50 100644
--- a/tests/Base/UrlGeneratorTest.php
+++ b/tests/Base/UrlGeneratorTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use AnimeClient\Base\Config;
-use AnimeClient\Base\Container;
-use AnimeClient\Base\UrlGenerator;
+use Aviat\AnimeClient\Base\Config;
+use Aviat\AnimeClient\Base\Container;
+use Aviat\AnimeClient\Base\UrlGenerator;
 
 class UrlGeneratorTest extends AnimeClient_TestCase {
 
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index e9e459d9..0a16d954 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -3,8 +3,8 @@
  * Global setup for unit tests
  */
 
-use AnimeClient\Base\Config;
-use AnimeClient\Base\Container;
+use Aviat\AnimeClient\Base\Config;
+use Aviat\AnimeClient\Base\Container;
 
 // -----------------------------------------------------------------------------
 // Mock the default error handler
@@ -85,7 +85,6 @@ function _setup_autoloaders()
 	require _dir(ROOT_DIR, '/vendor/autoload.php');
 	spl_autoload_register(function ($class) {
 		$class_parts = explode('\\', $class);
-		array_shift($class_parts);
 		$ns_path = SRC_DIR . '/' . implode('/', $class_parts) . ".php";
 
 		if (file_exists($ns_path))