diff --git a/core/Controller.php b/core/Controller.php
index 67d799257d970032f49d284d66e6709aea52f188..2eb7d20d17e0b48c47465cc16aacd7baf8e67467 100644
--- a/core/Controller.php
+++ b/core/Controller.php
@@ -728,29 +728,3 @@ abstract class Piwik_Controller
 		}
 	}
 }
-
-/**
- * Parent class of all plugins Controllers with admin functions
- * 
- * @package Piwik
- */
-abstract class Piwik_Controller_Admin extends Piwik_Controller
-{
-	/**
-	 * Used by Admin screens
-	 * 
-	 * @param Piwik_View $view
-	 */
-	protected function setBasicVariablesView($view)
-	{
-		parent::setBasicVariablesView($view);
-
-		$view->currentAdminMenuName = Piwik_GetCurrentAdminMenuName();
-
-		$view->enableFrames = Zend_Registry::get('config')->General->enable_framed_settings;
-		if(!$view->enableFrames)
-		{
-			$view->setXFrameOptions('sameorigin');
-		}
-	}
-}
diff --git a/core/Controller/Admin.php b/core/Controller/Admin.php
new file mode 100644
index 0000000000000000000000000000000000000000..1aafd2a9a755f258ce5925c9dfc93e07ed701879
--- /dev/null
+++ b/core/Controller/Admin.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Piwik - Open source web analytics
+ * 
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ * @version $Id$
+ * 
+ * @category Piwik
+ * @package Piwik
+ */
+
+/**
+ * Parent class of all plugins Controllers with admin functions
+ * 
+ * @package Piwik
+ */
+abstract class Piwik_Controller_Admin extends Piwik_Controller
+{
+	/**
+	 * Used by Admin screens
+	 * 
+	 * @param Piwik_View $view
+	 */
+	protected function setBasicVariablesView($view)
+	{
+		parent::setBasicVariablesView($view);
+
+		$view->currentAdminMenuName = Piwik_GetCurrentAdminMenuName();
+
+		$view->enableFrames = Zend_Registry::get('config')->General->enable_framed_settings;
+		if(!$view->enableFrames)
+		{
+			$view->setXFrameOptions('sameorigin');
+		}
+	}
+}