move avatar controller to core/controller

core/application.php

 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;
 
 /**

core/avatar/avatarcontroller.php → core/controller/avatarcontroller.php

  * 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;
 /**
  * Class AvatarController
  *
- * @package OC\Core\Avatar
+ * @package OC\Core\Controller
  */
 class AvatarController extends Controller {
 

tests/core/avatar/avatarcontrollertest.php → tests/core/controller/avatarcontrollertest.php

  * 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;
  *
  * @group DB
  *
- * @package OC\Core\Avatar
+ * @package OC\Core\Controller
  */
 class AvatarControllerTest extends \Test\TestCase {
 	use UserTrait;