diff --git a/application/classes/controller/default.php b/application/classes/controller/default.php
index 478f8eeb..e59300d9 100644
--- a/application/classes/controller/default.php
+++ b/application/classes/controller/default.php
@@ -1,4 +1,4 @@
 <?php defined('SYSPATH') or die('No direct access allowed.');
 
-class Controller_Default extends Controller_lnApp_Default {}
+class Controller_Default extends lnApp_Controller_Default {}
 ?>
diff --git a/application/classes/controller/login.php b/application/classes/controller/login.php
index 59a728d0..74a18836 100644
--- a/application/classes/controller/login.php
+++ b/application/classes/controller/login.php
@@ -1,4 +1,4 @@
 <?php defined('SYSPATH') or die('No direct access allowed.');
 
-class Controller_Login extends Controller_lnApp_Login {}
+class Controller_Login extends lnApp_Controller_Login {}
 ?>
diff --git a/application/classes/controller/logout.php b/application/classes/controller/logout.php
index 671e24d0..090c4a95 100644
--- a/application/classes/controller/logout.php
+++ b/application/classes/controller/logout.php
@@ -1,4 +1,4 @@
 <?php defined('SYSPATH') or die('No direct access allowed.');
 
-class Controller_Logout extends Controller_lnApp_Logout {}
+class Controller_Logout extends lnApp_Controller_Logout {}
 ?>
diff --git a/application/classes/controller/media.php b/application/classes/controller/media.php
index df4412a1..b478c758 100644
--- a/application/classes/controller/media.php
+++ b/application/classes/controller/media.php
@@ -1,4 +1,4 @@
 <?php defined('SYSPATH') or die('No direct access allowed.');
 
-class Controller_Media extends Controller_lnApp_Media {}
+class Controller_Media extends lnApp_Controller_Media {}
 ?>
diff --git a/application/classes/controller/task.php b/application/classes/controller/task.php
index 0ca5210f..35383c9c 100644
--- a/application/classes/controller/task.php
+++ b/application/classes/controller/task.php
@@ -1,4 +1,4 @@
 <?php defined('SYSPATH') or die('No direct access allowed.');
 
-class Controller_Task extends Controller_lnApp_Task {}
+class Controller_Task extends lnApp_Controller_Task {}
 ?>
diff --git a/application/classes/controller/templatedefault.php b/application/classes/controller/templatedefault.php
index e8d1de1b..0e148280 100644
--- a/application/classes/controller/templatedefault.php
+++ b/application/classes/controller/templatedefault.php
@@ -10,7 +10,7 @@
  * @copyright  (c) 2010 Deon George
  * @license    http://dev.leenooks.net/license.html
  */
-class Controller_TemplateDefault extends Controller_lnApp_TemplateDefault {
+class Controller_TemplateDefault extends lnApp_Controller_TemplateDefault {
 	public function __construct(Request $request, Response $response) {
 		if (Config::theme())
 			$this->template = Config::theme().'/page';
diff --git a/application/classes/controller/tree.php b/application/classes/controller/tree.php
index 17707e94..81a4ec47 100644
--- a/application/classes/controller/tree.php
+++ b/application/classes/controller/tree.php
@@ -10,7 +10,7 @@
  * @copyright  (c) 2010 Open Source Billing
  * @license    http://dev.osbill.net/license.html
  */
-class Controller_Tree extends Controller_lnApp_Tree {
+class Controller_Tree extends lnApp_Controller_Tree {
 	protected $auth_required = TRUE;
 
 	/**
diff --git a/application/classes/controller/lnapp/default.php b/application/classes/lnapp/controller/default.php
similarity index 97%
rename from application/classes/controller/lnapp/default.php
rename to application/classes/lnapp/controller/default.php
index b0040785..c90af833 100644
--- a/application/classes/controller/lnapp/default.php
+++ b/application/classes/lnapp/controller/default.php
@@ -10,7 +10,7 @@
  * @copyright  (c) 2010 Deon George
  * @license    http://dev.leenooks.net/license.html
  */
-abstract class Controller_lnApp_Default extends Controller {
+abstract class lnApp_Controller_Default extends Controller {
 	/**
 	 * The variable that our output is stored in
 	 */
diff --git a/application/classes/controller/lnapp/login.php b/application/classes/lnapp/controller/login.php
similarity index 98%
rename from application/classes/controller/lnapp/login.php
rename to application/classes/lnapp/controller/login.php
index a2d95c76..dc95d958 100644
--- a/application/classes/controller/lnapp/login.php
+++ b/application/classes/lnapp/controller/login.php
@@ -11,7 +11,7 @@
  * @license    http://dev.leenooks.net/license.html
  * @also       [logout]
  */
-class Controller_lnApp_Login extends Controller_TemplateDefault {
+class lnApp_Controller_Login extends Controller_TemplateDefault {
 	protected $auth_required = FALSE;
 
 	public function action_index() {
diff --git a/application/classes/controller/lnapp/logout.php b/application/classes/lnapp/controller/logout.php
similarity index 92%
rename from application/classes/controller/lnapp/logout.php
rename to application/classes/lnapp/controller/logout.php
index 26b6b82c..8295e06b 100644
--- a/application/classes/controller/lnapp/logout.php
+++ b/application/classes/lnapp/controller/logout.php
@@ -11,7 +11,7 @@
  * @license    http://dev.leenooks.net/license.html
  * @also       [login]
  */
-class Controller_lnApp_Logout extends Controller {
+class lnApp_Controller_Logout extends Controller {
 	public function action_index() {
 		# If user already signed-in
 		if (Auth::instance()->logged_in()!= 0) {
diff --git a/application/classes/controller/lnapp/media.php b/application/classes/lnapp/controller/media.php
similarity index 97%
rename from application/classes/controller/lnapp/media.php
rename to application/classes/lnapp/controller/media.php
index a6b4b07b..2b231392 100644
--- a/application/classes/controller/lnapp/media.php
+++ b/application/classes/lnapp/controller/media.php
@@ -10,7 +10,7 @@
  * @copyright  (c) 2010 Deon George
  * @license    http://dev.leenooks.net/license.html
  */
-abstract class Controller_lnApp_Media extends Controller {
+abstract class lnApp_Controller_Media extends Controller {
 	/**
 	 * This action will render all the media related files for a page
 	 *
diff --git a/application/classes/controller/lnapp/task.php b/application/classes/lnapp/controller/task.php
similarity index 90%
rename from application/classes/controller/lnapp/task.php
rename to application/classes/lnapp/controller/task.php
index 75dec4d0..e644b6bd 100644
--- a/application/classes/controller/lnapp/task.php
+++ b/application/classes/lnapp/controller/task.php
@@ -10,7 +10,7 @@
  * @copyright  (c) 2010 Deon George
  * @license    http://dev.leenooks.net/license.html
  */
-abstract class Controller_lnApp_Task extends Controller {
+abstract class lnApp_Controller_Task extends Controller {
 	public function before() {
 		if (! Kohana::$is_cli)
 			throw new Kohana_Exception('Cant run :method, it must be run by the CLI',array(':method'=>$this->request->action()));
diff --git a/application/classes/controller/lnapp/templatedefault.php b/application/classes/lnapp/controller/templatedefault.php
similarity index 99%
rename from application/classes/controller/lnapp/templatedefault.php
rename to application/classes/lnapp/controller/templatedefault.php
index 51aa69eb..dbd8aa5c 100644
--- a/application/classes/controller/lnapp/templatedefault.php
+++ b/application/classes/lnapp/controller/templatedefault.php
@@ -10,7 +10,7 @@
  * @copyright  (c) 2010 Deon George
  * @license    http://dev.leenooks.net/license.html
  */
-abstract class Controller_lnApp_TemplateDefault extends Controller_Template {
+abstract class lnApp_Controller_TemplateDefault extends Controller_Template {
 	/**
 	 * @var string page template
 	 */
diff --git a/application/classes/controller/lnapp/tree.php b/application/classes/lnapp/controller/tree.php
similarity index 98%
rename from application/classes/controller/lnapp/tree.php
rename to application/classes/lnapp/controller/tree.php
index baca8803..c7b33a73 100644
--- a/application/classes/controller/lnapp/tree.php
+++ b/application/classes/lnapp/controller/tree.php
@@ -10,7 +10,7 @@
  * @copyright  (c) 2010 Open Source Billing
  * @license    http://dev.osbill.net/license.html
  */
-class Controller_lnApp_Tree extends Controller_Default {
+class lnApp_Controller_Tree extends Controller_Default {
 	/**
 	 * @var string page media route as per [Route]
 	 */