move user controller to core/controller

core/application.php

@@ -30,7 +30,7 @@ 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\Controller\UserController;
 use OC\Core\Controller\AvatarController;
 use \OCP\Util;
 

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;