diff --git a/app/bootstrap.php b/app/bootstrap.php
index 38ea40fe..4dd04b36 100644
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -17,7 +17,7 @@ require _dir(SRC_DIR, '/functions.php');
 // -----------------------------------------------------------------------------
 // Setup DI container
 // -----------------------------------------------------------------------------
-$container = new Base\Container();
+$container = new Container();
 
 // -----------------------------------------------------------------------------
 // Setup error handling
@@ -42,7 +42,7 @@ $container->set('error-handler', $defaultHandler);
 // -----------------------------------------------------------------------------
 
 // Create Config Object
-$config = new Base\Config();
+$config = new Config();
 $container->set('config', $config);
 
 // Create Aura Router Object
@@ -64,9 +64,9 @@ $container->set('response', $web_factory->newResponse());
 // -----------------------------------------------------------------------------
 // Router
 // -----------------------------------------------------------------------------
-$container->set('url-generator', new Base\UrlGenerator($container));
+$container->set('url-generator', new UrlGenerator($container));
 
-$router = new Base\Router($container);
+$router = new Router($container);
 $router->dispatch();
 
 // End of bootstrap.php
\ No newline at end of file
diff --git a/phpdoc.dist.xml b/phpdoc.dist.xml
index 49c474b6..5c237746 100644
--- a/phpdoc.dist.xml
+++ b/phpdoc.dist.xml
@@ -12,6 +12,5 @@
     </transformations>
 	<files>
 		<directory>src</directory>
-		<ignore>src/views/*</ignore>
 	</files>
 </phpdoc>
\ No newline at end of file
diff --git a/phpunit.xml b/phpunit.xml
index 3892c6ae..ea5f2d2a 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -5,18 +5,16 @@
 	bootstrap="tests/bootstrap.php">
 	<filter>
 		<whitelist>
-			<directory suffix=".php">src/Base</directory>
-			<directory suffix=".php">src/Controller</directory>
-			<directory suffix=".php">src/Model</directory>
+			<directory suffix=".php">src/Aviat</directory>
 		</whitelist>
 	</filter>
 	<testsuites>
-		<testsuite name="BaseTests">
-			<directory>tests</directory>
-			<directory>tests/Base</directory>
+		<testsuite name="Ion">
+			<directory>tests/Ion</directory>
+		</testsuite>
+		<testsuite name="AnimeClient">
+			<directory>tests/AnimeClient</directory>
 		</testsuite>
-		<testsuite name="ModelTests"><directory>tests/Model</directory></testsuite>
-		<testsuite name="ControllerTests"><directory>tests/Controller</directory></testsuite>
 	</testsuites>
 	<php>
 		<server name="HTTP_USER_AGENT" value="Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:38.0) Gecko/20100101 Firefox/38.0" />
diff --git a/src/Aviat/AnimeClient/Base/Config.php b/src/Aviat/AnimeClient/Config.php
similarity index 96%
rename from src/Aviat/AnimeClient/Base/Config.php
rename to src/Aviat/AnimeClient/Config.php
index 3f1cd40a..d50ac388 100644
--- a/src/Aviat/AnimeClient/Base/Config.php
+++ b/src/Aviat/AnimeClient/Config.php
@@ -3,7 +3,7 @@
  * Base Configuration class
  */
 
-namespace Aviat\AnimeClient\Base;
+namespace Aviat\AnimeClient;
 
 /**
  * Wrapper for configuration values
diff --git a/src/Aviat/AnimeClient/Base/Container.php b/src/Aviat/AnimeClient/Container.php
similarity index 77%
rename from src/Aviat/AnimeClient/Base/Container.php
rename to src/Aviat/AnimeClient/Container.php
index 8c6bdcd2..3fc3a9b1 100644
--- a/src/Aviat/AnimeClient/Base/Container.php
+++ b/src/Aviat/AnimeClient/Container.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Aviat\AnimeClient\Base;
+namespace Aviat\AnimeClient;
 
 /**
  * Dependency container
diff --git a/src/Aviat/AnimeClient/Base/Controller.php b/src/Aviat/AnimeClient/Controller.php
similarity index 98%
rename from src/Aviat/AnimeClient/Base/Controller.php
rename to src/Aviat/AnimeClient/Controller.php
index f670a82d..59a35319 100644
--- a/src/Aviat/AnimeClient/Base/Controller.php
+++ b/src/Aviat/AnimeClient/Controller.php
@@ -2,7 +2,7 @@
 /**
  * Base Controller
  */
-namespace Aviat\AnimeClient\Base;
+namespace Aviat\AnimeClient;
 
 /**
  * Base class for controllers, defines output methods
@@ -289,4 +289,4 @@ class Controller {
 		echo $this->response->content->get();
 	}
 }
-// End of BaseController.php
+// End of BaseController.php
\ No newline at end of file
diff --git a/src/Aviat/AnimeClient/Controller/Anime.php b/src/Aviat/AnimeClient/Controller/Anime.php
index 53cc4b4f..2f81cdf1 100644
--- a/src/Aviat/AnimeClient/Controller/Anime.php
+++ b/src/Aviat/AnimeClient/Controller/Anime.php
@@ -5,9 +5,9 @@
 
 namespace Aviat\AnimeClient\Controller;
 
-use Aviat\AnimeClient\Base\Container;
-use Aviat\AnimeClient\Base\Controller as BaseController;
-use Aviat\AnimeClient\Base\Config;
+use Aviat\AnimeClient\Container;
+use Aviat\AnimeClient\Controller as BaseController;
+use Aviat\AnimeClient\Config;
 use Aviat\AnimeClient\Model\Anime as AnimeModel;
 use Aviat\AnimeClient\Model\AnimeCollection as AnimeCollectionModel;
 
diff --git a/src/Aviat/AnimeClient/Controller/Collection.php b/src/Aviat/AnimeClient/Controller/Collection.php
index de33f32f..d280ea5d 100644
--- a/src/Aviat/AnimeClient/Controller/Collection.php
+++ b/src/Aviat/AnimeClient/Controller/Collection.php
@@ -5,9 +5,9 @@
 
 namespace Aviat\AnimeClient\Controller;
 
-use Aviat\AnimeClient\Base\Container;
-use Aviat\AnimeClient\Base\Controller as BaseController;
-use Aviat\AnimeClient\Base\Config;
+use Aviat\AnimeClient\Container;
+use Aviat\AnimeClient\Controller as BaseController;
+use Aviat\AnimeClient\Config;
 use Aviat\AnimeClient\Model\Anime as AnimeModel;
 use Aviat\AnimeClient\Model\AnimeCollection as AnimeCollectionModel;
 
diff --git a/src/Aviat/AnimeClient/Controller/Manga.php b/src/Aviat/AnimeClient/Controller/Manga.php
index 61a27190..9b58d705 100644
--- a/src/Aviat/AnimeClient/Controller/Manga.php
+++ b/src/Aviat/AnimeClient/Controller/Manga.php
@@ -4,9 +4,9 @@
  */
 namespace Aviat\AnimeClient\Controller;
 
-use Aviat\AnimeClient\Base\Container;
-use Aviat\AnimeClient\Base\Controller;
-use Aviat\AnimeClient\Base\Config;
+use Aviat\AnimeClient\Container;
+use Aviat\AnimeClient\Controller;
+use Aviat\AnimeClient\Config;
 use Aviat\AnimeClient\Model\Manga as MangaModel;
 
 /**
diff --git a/src/Aviat/AnimeClient/Controller/Stats.php b/src/Aviat/AnimeClient/Controller/Stats.php
index 39c7dec2..1b5b78aa 100644
--- a/src/Aviat/AnimeClient/Controller/Stats.php
+++ b/src/Aviat/AnimeClient/Controller/Stats.php
@@ -2,8 +2,8 @@
 
 namespace Aviat\AnimeClient\Controller;
 
-use Aviat\AnimeClient\Base\Container;
-use Aviat\AnimeClient\Base\Controller;
+use Aviat\AnimeClient\Container;
+use Aviat\AnimeClient\Controller;
 
 class Stats extends Controller {
 
diff --git a/src/Aviat/AnimeClient/Base/Model.php b/src/Aviat/AnimeClient/Model.php
similarity index 98%
rename from src/Aviat/AnimeClient/Base/Model.php
rename to src/Aviat/AnimeClient/Model.php
index 8b320608..8e70f8bf 100644
--- a/src/Aviat/AnimeClient/Base/Model.php
+++ b/src/Aviat/AnimeClient/Model.php
@@ -2,7 +2,7 @@
 /**
  * Base for base models
  */
-namespace Aviat\AnimeClient\Base;
+namespace Aviat\AnimeClient;
 
 use abeautifulsite\SimpleImage;
 
diff --git a/src/Aviat/AnimeClient/Base/Model/API.php b/src/Aviat/AnimeClient/Model/API.php
similarity index 91%
rename from src/Aviat/AnimeClient/Base/Model/API.php
rename to src/Aviat/AnimeClient/Model/API.php
index 4ab4fd17..1a0501ff 100644
--- a/src/Aviat/AnimeClient/Base/Model/API.php
+++ b/src/Aviat/AnimeClient/Model/API.php
@@ -2,16 +2,16 @@
 /**
  * Base API Model
  */
-namespace Aviat\AnimeClient\Base\Model;
+namespace Aviat\AnimeClient\Model;
 
 use \GuzzleHttp\Client;
 use \GuzzleHttp\Cookie\CookieJar;
-use \Aviat\AnimeClient\Base\Container;
+use \Aviat\AnimeClient\Container;
 
 /**
  * Base model for api interaction
  */
-class API extends \Aviat\AnimeClient\Base\Model {
+class API extends \Aviat\AnimeClient\Model {
 
 	/**
 	 * Base url for making api requests
diff --git a/src/Aviat/AnimeClient/Model/Anime.php b/src/Aviat/AnimeClient/Model/Anime.php
index 8b3446aa..61e30533 100644
--- a/src/Aviat/AnimeClient/Model/Anime.php
+++ b/src/Aviat/AnimeClient/Model/Anime.php
@@ -5,7 +5,7 @@
 
 namespace Aviat\AnimeClient\Model;
 
-use Aviat\AnimeClient\Base\Model\API;
+use Aviat\AnimeClient\Model\API;
 
 /**
  * Model for handling requests dealing with the anime list
diff --git a/src/Aviat/AnimeClient/Model/AnimeCollection.php b/src/Aviat/AnimeClient/Model/AnimeCollection.php
index 757f5c40..20c2fc90 100644
--- a/src/Aviat/AnimeClient/Model/AnimeCollection.php
+++ b/src/Aviat/AnimeClient/Model/AnimeCollection.php
@@ -5,8 +5,8 @@
 
 namespace Aviat\AnimeClient\Model;
 
-use Aviat\AnimeClient\Base\Model\DB;
-use \Aviat\AnimeClient\Base\Container;
+use Aviat\AnimeClient\Model\DB;
+use Aviat\AnimeClient\Container;
 use Aviat\AnimeClient\Model\Anime as AnimeModel;
 
 /**
diff --git a/src/Aviat/AnimeClient/Base/Model/DB.php b/src/Aviat/AnimeClient/Model/DB.php
similarity index 78%
rename from src/Aviat/AnimeClient/Base/Model/DB.php
rename to src/Aviat/AnimeClient/Model/DB.php
index be7b506d..0cbda864 100644
--- a/src/Aviat/AnimeClient/Base/Model/DB.php
+++ b/src/Aviat/AnimeClient/Model/DB.php
@@ -2,14 +2,14 @@
 /**
  * Base DB model
  */
-namespace Aviat\AnimeClient\Base\Model;
+namespace Aviat\AnimeClient\Model;
 
-use Aviat\AnimeClient\Base\Container;
+use Aviat\AnimeClient\Container;
 
 /**
  * Base model for database interaction
  */
-class DB extends \Aviat\AnimeClient\Base\Model {
+class DB extends \Aviat\AnimeClient\Model {
 	/**
 	 * The query builder object
 	 * @var object $db
diff --git a/src/Aviat/AnimeClient/Model/Manga.php b/src/Aviat/AnimeClient/Model/Manga.php
index e9d7bd3c..03ed5768 100644
--- a/src/Aviat/AnimeClient/Model/Manga.php
+++ b/src/Aviat/AnimeClient/Model/Manga.php
@@ -4,7 +4,7 @@
  */
 namespace Aviat\AnimeClient\Model;
 
-use Aviat\AnimeClient\Base\Model\API;
+use Aviat\AnimeClient\Model\API;
 
 /**
  * Model for handling requests dealing with the manga list
diff --git a/src/Aviat/AnimeClient/Model/Stats.php b/src/Aviat/AnimeClient/Model/Stats.php
index d77a6bc7..32533fb1 100644
--- a/src/Aviat/AnimeClient/Model/Stats.php
+++ b/src/Aviat/AnimeClient/Model/Stats.php
@@ -5,8 +5,8 @@
 
 namespace Aviat\AnimeClient\Model;
 
-use Aviat\AnimeClient\Base\Model\DB;
-use Aviat\AnimeClient\Base\Container;
+use Aviat\AnimeClient\Model\DB;
+use Aviat\AnimeClient\Container;
 
 use StatsChartsTrait;
 
diff --git a/src/Aviat/AnimeClient/Base/Router.php b/src/Aviat/AnimeClient/Router.php
similarity index 99%
rename from src/Aviat/AnimeClient/Base/Router.php
rename to src/Aviat/AnimeClient/Router.php
index b448109c..8b0b6b7e 100644
--- a/src/Aviat/AnimeClient/Base/Router.php
+++ b/src/Aviat/AnimeClient/Router.php
@@ -2,7 +2,7 @@
 /**
  * Routing logic
  */
-namespace Aviat\AnimeClient\Base;
+namespace Aviat\AnimeClient;
 
 use Aura\Web\Request;
 use Aura\Web\Response;
diff --git a/src/Aviat/AnimeClient/Base/RoutingBase.php b/src/Aviat/AnimeClient/RoutingBase.php
similarity index 96%
rename from src/Aviat/AnimeClient/Base/RoutingBase.php
rename to src/Aviat/AnimeClient/RoutingBase.php
index e19e82d5..541d9ee8 100644
--- a/src/Aviat/AnimeClient/Base/RoutingBase.php
+++ b/src/Aviat/AnimeClient/RoutingBase.php
@@ -3,7 +3,7 @@
  * Base class for routing to make namespaced config settings
  * easier to work with
  */
-namespace Aviat\AnimeClient\Base;
+namespace Aviat\AnimeClient;
 
 /**
  * Base for routing/url classes
diff --git a/src/Aviat/AnimeClient/Base/UrlGenerator.php b/src/Aviat/AnimeClient/UrlGenerator.php
similarity index 98%
rename from src/Aviat/AnimeClient/Base/UrlGenerator.php
rename to src/Aviat/AnimeClient/UrlGenerator.php
index aeb22797..8b41f477 100644
--- a/src/Aviat/AnimeClient/Base/UrlGenerator.php
+++ b/src/Aviat/AnimeClient/UrlGenerator.php
@@ -2,7 +2,7 @@
 /**
  * Generate full urls from fragments
  */
-namespace Aviat\AnimeClient\Base;
+namespace Aviat\AnimeClient;
 
 /**
  * UrlGenerator class.
diff --git a/src/Aviat/Ion/Base/Page.php b/src/Aviat/Ion/Base/Page.php
index dd2e9bbf..e054be94 100644
--- a/src/Aviat/Ion/Base/Page.php
+++ b/src/Aviat/Ion/Base/Page.php
@@ -69,4 +69,4 @@ class Page {
 		echo $this->response->content->get();
 	}
 }
-// End of Page.php
+// End of Page.php
\ No newline at end of file
diff --git a/tests/Base/BaseModelTest.php b/tests/AnimeClient/BaseModelTest.php
similarity index 69%
rename from tests/Base/BaseModelTest.php
rename to tests/AnimeClient/BaseModelTest.php
index 8ceb8aee..40640507 100644
--- a/tests/Base/BaseModelTest.php
+++ b/tests/AnimeClient/BaseModelTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use Aviat\AnimeClient\Base\Model as BaseModel;
-use Aviat\AnimeClient\Base\Container;
+use Aviat\AnimeClient\Model as BaseModel;
+use Aviat\AnimeClient\Container;
 
 class BaseModelTest extends AnimeClient_TestCase {
 
diff --git a/tests/Base/ConfigTest.php b/tests/AnimeClient/ConfigTest.php
similarity index 93%
rename from tests/Base/ConfigTest.php
rename to tests/AnimeClient/ConfigTest.php
index d670b42a..6b3f9072 100644
--- a/tests/Base/ConfigTest.php
+++ b/tests/AnimeClient/ConfigTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use \Aviat\AnimeClient\Base\Config;
+use \Aviat\AnimeClient\Config;
 
 class ConfigTest extends AnimeClient_TestCase {
 
diff --git a/tests/Base/BaseControllerTest.php b/tests/AnimeClient/ControllerTest.php
similarity index 91%
rename from tests/Base/BaseControllerTest.php
rename to tests/AnimeClient/ControllerTest.php
index 6f035f4b..f6d2ec51 100644
--- a/tests/Base/BaseControllerTest.php
+++ b/tests/AnimeClient/ControllerTest.php
@@ -1,9 +1,9 @@
 <?php
-use \Aviat\AnimeClient\Base\Controller;
+use \Aviat\AnimeClient\Controller;
 use \Aura\Web\WebFactory;
 use \Aura\Router\RouterFactory;
 
-class BaseControllerTest extends AnimeClient_TestCase {
+class ControllerTest extends AnimeClient_TestCase {
 
 	public function setUp()
 	{
diff --git a/tests/Base/CoreTest.php b/tests/AnimeClient/CoreTest.php
similarity index 100%
rename from tests/Base/CoreTest.php
rename to tests/AnimeClient/CoreTest.php
diff --git a/tests/FunctionsTest.php b/tests/AnimeClient/FunctionsTest.php
similarity index 100%
rename from tests/FunctionsTest.php
rename to tests/AnimeClient/FunctionsTest.php
diff --git a/tests/Model/AnimeCollectionModelest.php b/tests/AnimeClient/Model/AnimeCollectionModelest.php
similarity index 100%
rename from tests/Model/AnimeCollectionModelest.php
rename to tests/AnimeClient/Model/AnimeCollectionModelest.php
diff --git a/tests/Base/Model/BaseApiModelTest.php b/tests/AnimeClient/Model/BaseApiModelTest.php
similarity index 73%
rename from tests/Base/Model/BaseApiModelTest.php
rename to tests/AnimeClient/Model/BaseApiModelTest.php
index 7e88e3fe..baede679 100644
--- a/tests/Base/Model/BaseApiModelTest.php
+++ b/tests/AnimeClient/Model/BaseApiModelTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use Aviat\AnimeClient\Base\Container;
-use Aviat\AnimeClient\Base\Model\API as BaseApiModel;
+use Aviat\AnimeClient\Container;
+use Aviat\AnimeClient\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('\Aviat\AnimeClient\Base\Model', $baseApiModel);
-		$this->assertInstanceOf('\Aviat\AnimeClient\Base\Model\API', $baseApiModel);
+		$this->assertInstanceOf('\Aviat\AnimeClient\Model', $baseApiModel);
+		$this->assertInstanceOf('\Aviat\AnimeClient\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/AnimeClient/Model/BaseDBModelTest.php
similarity index 80%
rename from tests/Base/Model/BaseDBModelTest.php
rename to tests/AnimeClient/Model/BaseDBModelTest.php
index 6a600aeb..dbf9a40c 100644
--- a/tests/Base/Model/BaseDBModelTest.php
+++ b/tests/AnimeClient/Model/BaseDBModelTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use Aviat\AnimeClient\Base\Model\DB as BaseDBModel;
+use Aviat\AnimeClient\Model\DB as BaseDBModel;
 
 class BaseDBModelTest extends AnimeClient_TestCase {
 
diff --git a/tests/Base/RouterTest.php b/tests/AnimeClient/RouterTest.php
similarity index 97%
rename from tests/Base/RouterTest.php
rename to tests/AnimeClient/RouterTest.php
index f73241d5..8d66198c 100644
--- a/tests/Base/RouterTest.php
+++ b/tests/AnimeClient/RouterTest.php
@@ -1,9 +1,9 @@
 <?php
 
-use Aviat\AnimeClient\Base\Router;
-use Aviat\AnimeClient\Base\Config;
-use Aviat\AnimeClient\Base\Container;
-use Aviat\AnimeClient\Base\UrlGenerator;
+use Aviat\AnimeClient\Router;
+use Aviat\AnimeClient\Config;
+use Aviat\AnimeClient\Container;
+use Aviat\AnimeClient\UrlGenerator;
 use Aura\Web\WebFactory;
 use Aura\Router\RouterFactory;
 
diff --git a/tests/Base/UrlGeneratorTest.php b/tests/AnimeClient/UrlGeneratorTest.php
similarity index 96%
rename from tests/Base/UrlGeneratorTest.php
rename to tests/AnimeClient/UrlGeneratorTest.php
index 6fd70d50..aadf3a68 100644
--- a/tests/Base/UrlGeneratorTest.php
+++ b/tests/AnimeClient/UrlGeneratorTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use Aviat\AnimeClient\Base\Config;
-use Aviat\AnimeClient\Base\Container;
-use Aviat\AnimeClient\Base\UrlGenerator;
+use Aviat\AnimeClient\Config;
+use Aviat\AnimeClient\Container;
+use Aviat\AnimeClient\UrlGenerator;
 
 class UrlGeneratorTest extends AnimeClient_TestCase {
 
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 0a16d954..3847c4eb 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -3,8 +3,8 @@
  * Global setup for unit tests
  */
 
-use Aviat\AnimeClient\Base\Config;
-use Aviat\AnimeClient\Base\Container;
+use Aviat\AnimeClient\Config;
+use Aviat\AnimeClient\Container;
 
 // -----------------------------------------------------------------------------
 // Mock the default error handler