diff --git a/core/application.php b/core/application.php
index bfe79f8993..30376ee4f2 100644
--- a/core/application.php
+++ b/core/application.php
@@ -29,9 +29,9 @@ namespace OC\Core;
 use OC\AppFramework\Utility\SimpleContainer;
 use OC\AppFramework\Utility\TimeFactory;
 use \OCP\AppFramework\App;
-use OC\Core\LostPassword\Controller\LostController;
-use OC\Core\User\UserController;
-use OC\Core\Avatar\AvatarController;
+use OC\Core\Controller\LostController;
+use OC\Core\Controller\UserController;
+use OC\Core\Controller\AvatarController;
 use \OCP\Util;
 
 /**
diff --git a/core/avatar/avatarcontroller.php b/core/controller/avatarcontroller.php
similarity index 99%
rename from core/avatar/avatarcontroller.php
rename to core/controller/avatarcontroller.php
index 8a9219964a..adfe38ab2d 100644
--- a/core/avatar/avatarcontroller.php
+++ b/core/controller/avatarcontroller.php
@@ -24,7 +24,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-namespace OC\Core\Avatar;
+namespace OC\Core\Controller;
 
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
@@ -42,7 +42,7 @@ use OCP\Files\Folder;
 /**
  * Class AvatarController
  *
- * @package OC\Core\Avatar
+ * @package OC\Core\Controller
  */
 class AvatarController extends Controller {
 
diff --git a/core/lostpassword/controller/lostcontroller.php b/core/controller/lostcontroller.php
similarity index 97%
rename from core/lostpassword/controller/lostcontroller.php
rename to core/controller/lostcontroller.php
index c9ee8ed2ff..0e0932b288 100644
--- a/core/lostpassword/controller/lostcontroller.php
+++ b/core/controller/lostcontroller.php
@@ -25,7 +25,7 @@
  *
  */
 
-namespace OC\Core\LostPassword\Controller;
+namespace OC\Core\Controller;
 
 use \OCP\AppFramework\Controller;
 use \OCP\AppFramework\Http\TemplateResponse;
@@ -45,7 +45,7 @@ use OCP\Security\StringUtils;
  *
  * Successfully changing a password will emit the post_passwordReset hook.
  *
- * @package OC\Core\LostPassword\Controller
+ * @package OC\Core\Controller
  */
 class LostController extends Controller {
 
@@ -122,8 +122,8 @@ class LostController extends Controller {
 	 */
 	public function resetform($token, $userId) {
 		return new TemplateResponse(
-			'core/lostpassword',
-			'resetpassword',
+			'core',
+			'lostpassword/resetpassword',
 			array(
 				'link' => $this->urlGenerator->linkToRouteAbsolute('core.lost.setPassword', array('userId' => $userId, 'token' => $token)),
 			),
@@ -236,7 +236,7 @@ class LostController extends Controller {
 
 		$link = $this->urlGenerator->linkToRouteAbsolute('core.lost.resetform', array('userId' => $user, 'token' => $token));
 
-		$tmpl = new \OC_Template('core/lostpassword', 'email');
+		$tmpl = new \OC_Template('core', 'lostpassword/email');
 		$tmpl->assign('link', $link);
 		$msg = $tmpl->fetchPage();
 
diff --git a/core/setup/controller.php b/core/controller/setupcontroller.php
similarity index 98%
rename from core/setup/controller.php
rename to core/controller/setupcontroller.php
index a64e6f08a3..16646b97ae 100644
--- a/core/setup/controller.php
+++ b/core/controller/setupcontroller.php
@@ -25,11 +25,11 @@
  *
  */
 
-namespace OC\Core\Setup;
+namespace OC\Core\Controller;
 
 use OC\Setup;
 
-class Controller {
+class SetupController {
 	/** @var Setup */
 	protected $setupHelper;
 	/** @var string */
diff --git a/core/user/usercontroller.php b/core/controller/usercontroller.php
similarity index 98%
rename from core/user/usercontroller.php
rename to core/controller/usercontroller.php
index 38ecd86b45..7219376102 100644
--- a/core/user/usercontroller.php
+++ b/core/controller/usercontroller.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace OC\Core\User;
+namespace OC\Core\Controller;
 
 use \OCP\AppFramework\Controller;
 use \OCP\AppFramework\Http\JSONResponse;
diff --git a/core/lostpassword/css/resetpassword.css b/core/css/lostpassword/resetpassword.css
similarity index 100%
rename from core/lostpassword/css/resetpassword.css
rename to core/css/lostpassword/resetpassword.css
diff --git a/core/lostpassword/css/lostpassword.css b/core/lostpassword/css/lostpassword.css
deleted file mode 100644
index b7f7023648..0000000000
--- a/core/lostpassword/css/lostpassword.css
+++ /dev/null
@@ -1,31 +0,0 @@
-#body-login
-input[type="text"]#user{
-	padding-right: 20px;
-	padding-left: 41px;
-}
-
-#body-login
-input[type="submit"] {
-	text-align: center;
-	width: 170px;
-	height: 45px;
-	padding-top: 7px;
-	padding-bottom: 7px;
-}
-
-#body-login input[type="submit"]#submit {
-	width: 280px;
-}
-
-#body-login .update {
-	text-align: left;
-}
-
-#body-login .update,
-#body-login .error {
-	margin: 10px 0 5px 0;
-}
-
-#user {
-	width: 226px !important;
-}
diff --git a/core/lostpassword/templates/email.php b/core/templates/lostpassword/email.php
similarity index 100%
rename from core/lostpassword/templates/email.php
rename to core/templates/lostpassword/email.php
diff --git a/core/lostpassword/templates/resetpassword.php b/core/templates/lostpassword/resetpassword.php
similarity index 97%
rename from core/lostpassword/templates/resetpassword.php
rename to core/templates/lostpassword/resetpassword.php
index 22dd2fc13b..49ced42464 100644
--- a/core/lostpassword/templates/resetpassword.php
+++ b/core/templates/lostpassword/resetpassword.php
@@ -22,7 +22,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-style('lostpassword', 'resetpassword');
+style('core', 'lostpassword/resetpassword');
 script('core', 'lostpassword');
 ?>
 
diff --git a/lib/base.php b/lib/base.php
index b7118e0245..970eabce6a 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -826,7 +826,7 @@ class OC {
 			$setupHelper = new OC\Setup(\OC::$server->getConfig(), \OC::$server->getIniWrapper(),
 				\OC::$server->getL10N('lib'), new \OC_Defaults(), \OC::$server->getLogger(),
 				\OC::$server->getSecureRandom());
-			$controller = new OC\Core\Setup\Controller($setupHelper);
+			$controller = new OC\Core\Controller\SetupController($setupHelper);
 			$controller->run($_POST);
 			exit();
 		}
diff --git a/tests/core/avatar/avatarcontrollertest.php b/tests/core/controller/avatarcontrollertest.php
similarity index 99%
rename from tests/core/avatar/avatarcontrollertest.php
rename to tests/core/controller/avatarcontrollertest.php
index 9e46e1782a..8e5e58904a 100644
--- a/tests/core/avatar/avatarcontrollertest.php
+++ b/tests/core/controller/avatarcontrollertest.php
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-namespace OC\Core\Avatar;
+namespace OC\Core\Controller;
 
 use OC;
 use OC\Core\Application;
@@ -45,7 +45,7 @@ function is_uploaded_file($filename) {
  *
  * @group DB
  *
- * @package OC\Core\Avatar
+ * @package OC\Core\Controller
  */
 class AvatarControllerTest extends \Test\TestCase {
 	use UserTrait;
diff --git a/tests/core/lostpassword/controller/lostcontrollertest.php b/tests/core/controller/lostcontrollertest.php
similarity index 98%
rename from tests/core/lostpassword/controller/lostcontrollertest.php
rename to tests/core/controller/lostcontrollertest.php
index 0843d82da3..44bc539247 100644
--- a/tests/core/lostpassword/controller/lostcontrollertest.php
+++ b/tests/core/controller/lostcontrollertest.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace OC\Core\LostPassword\Controller;
+namespace OC\Core\Controller;
 
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Utility\ITimeFactory;
@@ -36,7 +36,7 @@ use PHPUnit_Framework_MockObject_MockObject;
 /**
  * Class LostControllerTest
  *
- * @package OC\Core\LostPassword\Controller
+ * @package OC\Core\Controller
  */
 class LostControllerTest extends \PHPUnit_Framework_TestCase {
 
@@ -124,8 +124,8 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
 			->will($this->returnValue('https://ownCloud.com/index.php/lostpassword/'));
 
 		$response = $this->lostController->resetform($token, $userId);
-		$expectedResponse = new TemplateResponse('core/lostpassword',
-			'resetpassword',
+		$expectedResponse = new TemplateResponse('core',
+			'lostpassword/resetpassword',
 			array(
 				'link' => 'https://ownCloud.com/index.php/lostpassword/',
 			),