diff --git a/core/application.php b/core/application.php
index bfe79f89938..996a612105d 100644
--- a/core/application.php
+++ b/core/application.php
@@ -31,7 +31,7 @@ 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\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 8a9219964a5..adfe38ab2db 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/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 9e46e1782af..8e5e58904a7 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;