diff --git a/composer.json b/composer.json
index 62836dfc..ed63751b 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
             "app/filters"
         ],
         "psr-4": {
-            "CachetHQ\\": "app/CachetHQ/"
+            "CachetHQ\\Cachet\\": "src/"
         }
     },
     "extra": {
diff --git a/app/CachetHQ/Cachet/Controllers/Api/ComponentController.php b/src/Controllers/Api/ComponentController.php
similarity index 100%
rename from app/CachetHQ/Cachet/Controllers/Api/ComponentController.php
rename to src/Controllers/Api/ComponentController.php
diff --git a/app/CachetHQ/Cachet/Controllers/Api/IncidentController.php b/src/Controllers/Api/IncidentController.php
similarity index 100%
rename from app/CachetHQ/Cachet/Controllers/Api/IncidentController.php
rename to src/Controllers/Api/IncidentController.php
diff --git a/app/CachetHQ/Cachet/Controllers/Api/MetricController.php b/src/Controllers/Api/MetricController.php
similarity index 100%
rename from app/CachetHQ/Cachet/Controllers/Api/MetricController.php
rename to src/Controllers/Api/MetricController.php
diff --git a/app/CachetHQ/Cachet/Controllers/Api/MetricPointController.php b/src/Controllers/Api/MetricPointController.php
similarity index 100%
rename from app/CachetHQ/Cachet/Controllers/Api/MetricPointController.php
rename to src/Controllers/Api/MetricPointController.php
diff --git a/app/CachetHQ/Cachet/Repositories/Component/ComponentRepository.php b/src/Repositories/Component/ComponentRepository.php
similarity index 100%
rename from app/CachetHQ/Cachet/Repositories/Component/ComponentRepository.php
rename to src/Repositories/Component/ComponentRepository.php
diff --git a/app/CachetHQ/Cachet/Repositories/Component/EloquentComponentRepository.php b/src/Repositories/Component/EloquentComponentRepository.php
similarity index 100%
rename from app/CachetHQ/Cachet/Repositories/Component/EloquentComponentRepository.php
rename to src/Repositories/Component/EloquentComponentRepository.php
diff --git a/app/CachetHQ/Cachet/Repositories/EloquentRepository.php b/src/Repositories/EloquentRepository.php
similarity index 100%
rename from app/CachetHQ/Cachet/Repositories/EloquentRepository.php
rename to src/Repositories/EloquentRepository.php
diff --git a/app/CachetHQ/Cachet/Repositories/Incident/EloquentIncidentRepository.php b/src/Repositories/Incident/EloquentIncidentRepository.php
similarity index 100%
rename from app/CachetHQ/Cachet/Repositories/Incident/EloquentIncidentRepository.php
rename to src/Repositories/Incident/EloquentIncidentRepository.php
diff --git a/app/CachetHQ/Cachet/Repositories/Incident/IncidentRepository.php b/src/Repositories/Incident/IncidentRepository.php
similarity index 100%
rename from app/CachetHQ/Cachet/Repositories/Incident/IncidentRepository.php
rename to src/Repositories/Incident/IncidentRepository.php
diff --git a/app/CachetHQ/Cachet/Repositories/Metric/EloquentMetricRepository.php b/src/Repositories/Metric/EloquentMetricRepository.php
similarity index 100%
rename from app/CachetHQ/Cachet/Repositories/Metric/EloquentMetricRepository.php
rename to src/Repositories/Metric/EloquentMetricRepository.php
diff --git a/app/CachetHQ/Cachet/Repositories/Metric/MetricRepository.php b/src/Repositories/Metric/MetricRepository.php
similarity index 100%
rename from app/CachetHQ/Cachet/Repositories/Metric/MetricRepository.php
rename to src/Repositories/Metric/MetricRepository.php
diff --git a/app/CachetHQ/Cachet/Repositories/MetricPoint/EloquentMetricPointRepository.php b/src/Repositories/MetricPoint/EloquentMetricPointRepository.php
similarity index 100%
rename from app/CachetHQ/Cachet/Repositories/MetricPoint/EloquentMetricPointRepository.php
rename to src/Repositories/MetricPoint/EloquentMetricPointRepository.php
diff --git a/app/CachetHQ/Cachet/Repositories/MetricPoint/MetricPointRepository.php b/src/Repositories/MetricPoint/MetricPointRepository.php
similarity index 100%
rename from app/CachetHQ/Cachet/Repositories/MetricPoint/MetricPointRepository.php
rename to src/Repositories/MetricPoint/MetricPointRepository.php
diff --git a/app/CachetHQ/Cachet/Service/EmailService.php b/src/Service/EmailService.php
similarity index 100%
rename from app/CachetHQ/Cachet/Service/EmailService.php
rename to src/Service/EmailService.php
diff --git a/app/CachetHQ/Cachet/Service/ServiceInterface.php b/src/Service/ServiceInterface.php
similarity index 100%
rename from app/CachetHQ/Cachet/Service/ServiceInterface.php
rename to src/Service/ServiceInterface.php
diff --git a/app/CachetHQ/Cachet/Support/ServiceProviders/RepositoryServiceProvider.php b/src/Support/ServiceProviders/RepositoryServiceProvider.php
similarity index 100%
rename from app/CachetHQ/Cachet/Support/ServiceProviders/RepositoryServiceProvider.php
rename to src/Support/ServiceProviders/RepositoryServiceProvider.php
diff --git a/app/CachetHQ/Cachet/Support/ServiceProviders/RoutingServiceProvider.php b/src/Support/ServiceProviders/RoutingServiceProvider.php
similarity index 100%
rename from app/CachetHQ/Cachet/Support/ServiceProviders/RoutingServiceProvider.php
rename to src/Support/ServiceProviders/RoutingServiceProvider.php
diff --git a/app/CachetHQ/Cachet/Transformers/ComponentTransformer.php b/src/Transformers/ComponentTransformer.php
similarity index 100%
rename from app/CachetHQ/Cachet/Transformers/ComponentTransformer.php
rename to src/Transformers/ComponentTransformer.php
diff --git a/app/CachetHQ/Cachet/Transformers/IncidentTransformer.php b/src/Transformers/IncidentTransformer.php
similarity index 100%
rename from app/CachetHQ/Cachet/Transformers/IncidentTransformer.php
rename to src/Transformers/IncidentTransformer.php
diff --git a/app/CachetHQ/Cachet/Transformers/MetricPointTransformer.php b/src/Transformers/MetricPointTransformer.php
similarity index 100%
rename from app/CachetHQ/Cachet/Transformers/MetricPointTransformer.php
rename to src/Transformers/MetricPointTransformer.php
diff --git a/app/CachetHQ/Cachet/Transformers/MetricTransformer.php b/src/Transformers/MetricTransformer.php
similarity index 100%
rename from app/CachetHQ/Cachet/Transformers/MetricTransformer.php
rename to src/Transformers/MetricTransformer.php