diff --git a/app/Cachet/Repositories/Component/EloquentComponentRepository.php b/app/Cachet/Repositories/Component/EloquentComponentRepository.php
deleted file mode 100644
index 91c6cd6f..00000000
--- a/app/Cachet/Repositories/Component/EloquentComponentRepository.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php namespace Cachet\Repositories\Component;
-
-use Cachet\Repositories\EloquentRepository;
-
-class EloquentComponentRepository extends EloquentRepository implements ComponentRepository {
-
-	
-	
-}
diff --git a/app/Cachet/Support/ServiceProviders/RepositoryServiceProvider.php b/app/Cachet/Support/ServiceProviders/RepositoryServiceProvider.php
deleted file mode 100644
index adc6a0a9..00000000
--- a/app/Cachet/Support/ServiceProviders/RepositoryServiceProvider.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php namespace Cachet\Support\ServiceProviders;
-
-use Illuminate\Support\ServiceProvider;
-
-class RepositoryServiceProvider extends ServiceProvider {
-
-	public function register()
-	{
-		$this->app->bind('Cachet\Repositories\Component\ComponentRepository', 'Cachet\Repositories\Component\EloquentComponentRepository');
-	}
-
-}
\ No newline at end of file
diff --git a/app/CachetHq/Cachet/Controllers/Api/ComponentController.php b/app/CachetHq/Cachet/Controllers/Api/ComponentController.php
new file mode 100644
index 00000000..3e9ef024
--- /dev/null
+++ b/app/CachetHq/Cachet/Controllers/Api/ComponentController.php
@@ -0,0 +1,61 @@
+<?php namespace CachetHq\Cachet\Controllers\Api;
+
+use Dingo\Api\Routing\Controller as DingoController;
+use Dingo\Api\Auth\Shield;
+use CachetHq\Cachet\Repositories\Component\ComponentRepository;
+
+class ComponentController extends DingoController {
+
+	protected $auth;
+
+	protected $component;
+
+	public function __construct(Shield $auth, ComponentRepository $component) {
+		$this->auth = $auth;
+		$this->component = $component;
+	}
+
+	/**
+	 * Get all components
+	 *
+	 * @return \Illuminate\Database\Eloquent\Collection
+	 */
+	public function getComponents() {
+		return $this->component->all();
+	}
+
+	/**
+	 * Get a single component
+	 *
+	 * @param int $id
+	 *
+	 * @return Component
+	 */
+	public function getComponent($id) {
+		return $this->component->findOrFail($id);
+	}
+
+	public function getComponentIncidents($id) {
+		return $this->component->incidents($id);
+	}
+
+	/**
+	 * Create a new component
+	 *
+	 * @return Component
+	 */
+	public function postComponents() {
+		$component = new Component(Input::all());
+		$component->user_id = $this->auth->user()->id;
+		if ($component->isValid()) {
+			try {
+				$component->saveOrFail();
+				return $component;
+			} catch (Exception $e) {
+				App::abort(500, $e->getMessage());
+			}
+		} else {
+			App::abort(404, $component->getErrors()->first());
+		}
+	}
+}
diff --git a/app/Cachet/Repositories/Component/ComponentRepository.php b/app/CachetHq/Cachet/Repositories/Component/ComponentRepository.php
similarity index 69%
rename from app/Cachet/Repositories/Component/ComponentRepository.php
rename to app/CachetHq/Cachet/Repositories/Component/ComponentRepository.php
index 1a239c67..ce8f15fe 100644
--- a/app/Cachet/Repositories/Component/ComponentRepository.php
+++ b/app/CachetHq/Cachet/Repositories/Component/ComponentRepository.php
@@ -1,4 +1,4 @@
-<?php namespace Cachet\Repositories\Component;
+<?php namespace CachetHq\Cachet\Repositories\Component;
 
 interface ComponentRepository {
 
diff --git a/app/CachetHq/Cachet/Repositories/Component/EloquentComponentRepository.php b/app/CachetHq/Cachet/Repositories/Component/EloquentComponentRepository.php
new file mode 100644
index 00000000..36586cbc
--- /dev/null
+++ b/app/CachetHq/Cachet/Repositories/Component/EloquentComponentRepository.php
@@ -0,0 +1,9 @@
+<?php namespace CachetHq\Cachet\Repositories\Component;
+
+use CachetHq\Cachet\Repositories\EloquentRepository;
+
+class EloquentComponentRepository extends EloquentRepository implements ComponentRepository {
+
+	
+	
+}
diff --git a/app/Cachet/Repositories/EloquentRepository.php b/app/CachetHq/Cachet/Repositories/EloquentRepository.php
similarity index 97%
rename from app/Cachet/Repositories/EloquentRepository.php
rename to app/CachetHq/Cachet/Repositories/EloquentRepository.php
index 97c56e52..8f844c09 100644
--- a/app/Cachet/Repositories/EloquentRepository.php
+++ b/app/CachetHq/Cachet/Repositories/EloquentRepository.php
@@ -1,4 +1,4 @@
-<?php namespace Cachet\Repositories;
+<?php namespace CachetHq\Cachet\Repositories;
 
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 
diff --git a/app/CachetHq/Cachet/Support/ServiceProviders/RepositoryServiceProvider.php b/app/CachetHq/Cachet/Support/ServiceProviders/RepositoryServiceProvider.php
new file mode 100644
index 00000000..3f772fdf
--- /dev/null
+++ b/app/CachetHq/Cachet/Support/ServiceProviders/RepositoryServiceProvider.php
@@ -0,0 +1,12 @@
+<?php namespace CachetHq\Cachet\Support\ServiceProviders;
+
+use Illuminate\Support\ServiceProvider;
+
+class RepositoryServiceProvider extends ServiceProvider {
+
+	public function register()
+	{
+		$this->app->bind('CachetHq\Cachet\Repositories\Component\ComponentRepository', 'CachetHq\Cachet\Repositories\Component\EloquentComponentRepository');
+	}
+
+}
\ No newline at end of file
diff --git a/app/config/app.php b/app/config/app.php
index 36d5d287..4e16e1e0 100644
--- a/app/config/app.php
+++ b/app/config/app.php
@@ -124,7 +124,7 @@ return array(
 
 		'Dingo\Api\ApiServiceProvider',
 
-		'Cachet\Support\ServiceProviders\RepositoryServiceProvider',
+		'CachetHq\Cachet\Support\ServiceProviders\RepositoryServiceProvider',
 
 	),
 
diff --git a/app/controllers/api/ComponentController.php b/app/controllers/api/ComponentController.php
index 5a1ad843..3ec64ae6 100644
--- a/app/controllers/api/ComponentController.php
+++ b/app/controllers/api/ComponentController.php
@@ -1,6 +1,6 @@
-<?php Cachet\Controllers\Api;
+<?php Controllers\Api;
 
-use \Dingo\Api\Routing\Controller as DingoController;
+use Dingo\Api\Routing\Controller as DingoController;
 use Dingo\Api\Auth\Shield;
 use Cachet\Repositories\Component\ComponentRepository;
 
diff --git a/app/routes/api.php b/app/routes/api.php
index d7b3cd17..81485d68 100644
--- a/app/routes/api.php
+++ b/app/routes/api.php
@@ -1,23 +1,23 @@
 <?php
 
-	Route::api(['version' => 'v1', 'prefix' => 'api'], function() {
+	Route::api(['version' => 'v1', 'prefix' => 'api', 'namespace' => 'Cachet\Controllers\Api'], function() {
 
-		Route::get('components', 'ApiController@getComponents');
-		Route::get('components/{id}', 'ApiController@getComponent');
-		Route::get('components/{id}/incidents', 'ApiController@getComponentIncidents');
-		Route::get('incidents', 'ApiController@getIncidents');
-		Route::get('incidents/{id}', 'ApiController@getIncident');
-		Route::get('metrics', 'ApiController@getMetrics');
-		Route::get('metrics/{id}', 'ApiController@getMetric');
+		Route::get('components', 'ComponentController@getComponents');
+		Route::get('components/{id}', 'ComponentController@getComponent');
+		Route::get('components/{id}/incidents', 'ComponentController@getComponentIncidents');
+		Route::get('incidents', 'IncidentController@getIncidents');
+		Route::get('incidents/{id}', 'IncidentController@getIncident');
+		Route::get('metrics', 'IncidentController@getMetrics');
+		Route::get('metrics/{id}', 'IncidentController@getMetric');
 
 		Route::group(['protected' => true], function() {
-			Route::post('components', 'ApiController@postComponents');
-			Route::post('incidents', 'ApiController@postIncidents');
-			Route::post('metrics', 'ApiController@postMetrics');
+			Route::post('components', 'ComponentController@postComponents');
+			Route::post('incidents', 'IncidentController@postIncidents');
+			Route::post('metrics', 'IncidentController@postMetrics');
 
-			Route::put('components/{id}', 'ApiController@putComponent');
-			Route::put('incidents/{id}', 'ApiController@putIncident');
-			Route::put('metrics/{id}', 'ApiController@putMetric');
+			Route::put('components/{id}', 'ComponentController@putComponent');
+			Route::put('incidents/{id}', 'IncidentController@putIncident');
+			Route::put('metrics/{id}', 'IncidentController@putMetric');
 		});
 
 	});
diff --git a/composer.json b/composer.json
index d33b3b98..99e44f29 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
 			"app/filters"
 		],
 		"psr-4": {
-			"Cachet\\": "app/Cachet"
+			"CachetHq\\": "app/CachetHq"
 		}
 	},
 	"extra": {