diff --git a/appinfo/app.php b/appinfo/app.php
index 9fb614d..bfc9dbe 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -9,8 +9,6 @@
  * @copyright Pellaeon Lin 2014
  */
 
-namespace OCA\Registration\AppInfo;
-
 \OC_App::registerLogIn([
 	'name' => \OC::$server->getL10N('registration')->t('Register'),
 	'href' => \OC::$server->getURLGenerator()->linkToRoute('registration.register.askEmail')
diff --git a/appinfo/routes.php b/appinfo/routes.php
index 146f00b..7db7778 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -10,8 +10,6 @@
  * @copyright Pellaeon Lin 2014
  */
 
-$app = new \OCA\Registration\AppInfo\Application();
-
 return [
 	'routes' => [
 		['name' => 'settings#admin', 'url' => '/settings', 'verb' => 'POST'],
diff --git a/appinfo/application.php b/lib/AppInfo/Application.php
similarity index 100%
rename from appinfo/application.php
rename to lib/AppInfo/Application.php
diff --git a/capabilities.php b/lib/Capabilities.php
similarity index 100%
rename from capabilities.php
rename to lib/Capabilities.php
diff --git a/controller/apicontroller.php b/lib/Controller/ApiController.php
similarity index 100%
rename from controller/apicontroller.php
rename to lib/Controller/ApiController.php
diff --git a/controller/registercontroller.php b/lib/Controller/RegisterController.php
similarity index 100%
rename from controller/registercontroller.php
rename to lib/Controller/RegisterController.php
diff --git a/controller/settingscontroller.php b/lib/Controller/SettingsController.php
similarity index 100%
rename from controller/settingscontroller.php
rename to lib/Controller/SettingsController.php
diff --git a/db/registration.php b/lib/Db/Registration.php
similarity index 100%
rename from db/registration.php
rename to lib/Db/Registration.php
diff --git a/db/registrationmapper.php b/lib/Db/RegistrationMapper.php
similarity index 100%
rename from db/registrationmapper.php
rename to lib/Db/RegistrationMapper.php
diff --git a/service/mailservice.php b/lib/Service/MailService.php
similarity index 100%
rename from service/mailservice.php
rename to lib/Service/MailService.php
diff --git a/service/registrationexception.php b/lib/Service/RegistrationException.php
similarity index 100%
rename from service/registrationexception.php
rename to lib/Service/RegistrationException.php
diff --git a/service/registrationservice.php b/lib/Service/RegistrationService.php
similarity index 100%
rename from service/registrationservice.php
rename to lib/Service/RegistrationService.php
diff --git a/util/corebridge.php b/lib/Util/CoreBridge.php
similarity index 100%
rename from util/corebridge.php
rename to lib/Util/CoreBridge.php
diff --git a/tests/integration/controller/RegisterControllerTest.php b/tests/Integration/Controller/RegisterControllerTest.php
similarity index 97%
rename from tests/integration/controller/RegisterControllerTest.php
rename to tests/Integration/Controller/RegisterControllerTest.php
index b7f69aa..3f68394 100644
--- a/tests/integration/controller/RegisterControllerTest.php
+++ b/tests/Integration/Controller/RegisterControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OCA\Registration\Controller;
+namespace OCA\Registration\Tests\Integration\Controller;
 
 use OCA\Registration\Db\Registration;
 use OCA\Registration\Db\RegistrationMapper;
@@ -33,7 +33,7 @@ use ChristophWurst\Nextcloud\Testing\TestCase;
  *
  * @group DB
  */
-class RegistrationControllerTest extends TestCase {
+class RegisterControllerTest extends TestCase {
 	use DatabaseTransaction;
 
 	/** @var MailService */
diff --git a/tests/integration/service/RegistrationServiceTest.php b/tests/Integration/Service/RegistrationServiceTest.php
similarity index 99%
rename from tests/integration/service/RegistrationServiceTest.php
rename to tests/Integration/Service/RegistrationServiceTest.php
index ff55785..d192dc4 100644
--- a/tests/integration/service/RegistrationServiceTest.php
+++ b/tests/Integration/Service/RegistrationServiceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OCA\Registration\Service;
+namespace OCA\Registration\Tests\Integration\Service;
 
 use OCA\Registration\Db\Registration;
 use OCA\Registration\Db\RegistrationMapper;
diff --git a/tests/unit/controller/ApiControllerTest.php b/tests/Unit/Controller/ApiControllerTest.php
similarity index 99%
rename from tests/unit/controller/ApiControllerTest.php
rename to tests/Unit/Controller/ApiControllerTest.php
index c007247..1229ddc 100644
--- a/tests/unit/controller/ApiControllerTest.php
+++ b/tests/Unit/Controller/ApiControllerTest.php
@@ -9,7 +9,7 @@
  * @copyright Pellaeon Lin 2014
  */
 
-namespace OCA\Registration\Controller;
+namespace OCA\Registration\Tests\Unit\Controller;
 
 use OCA\Registration\Db\Registration;
 use OCA\Registration\Service\MailService;