diff --git a/config/application.php b/config/application.php
index c487c23b..79e1446e 100644
--- a/config/application.php
+++ b/config/application.php
@@ -11,7 +11,7 @@
 	|
 	*/
 
-	'url' => 'http://beta.laravel.com',
+	'url' => 'http://localhost/laravel/public',
 
 	/*
 	|--------------------------------------------------------------------------
diff --git a/laravel/module.php b/laravel/module.php
index 1f945f5b..6de2ea89 100644
--- a/laravel/module.php
+++ b/laravel/module.php
@@ -43,10 +43,7 @@ public static function path($module)
 	{
 		if (array_key_exists($module, static::$paths)) return static::$paths[$module];
 
-		if (array_key_exists($module, static::$modules))
-		{
-			$path = (strpos(static::$modules[$module], BASE_PATH) === 0) ? static::$modules[$module].'/' : MODULE_PATH.static::$modules[$module].'/';
-		}
+		if (array_key_exists($module, static::$modules)) $path = MODULE_PATH.static::$modules[$module].'/';
 
 		return static::$paths[$module] = $path;
 	}
diff --git a/application/composers.php b/modules/application/composers.php
similarity index 100%
rename from application/composers.php
rename to modules/application/composers.php
diff --git a/application/filters.php b/modules/application/filters.php
similarity index 100%
rename from application/filters.php
rename to modules/application/filters.php
diff --git a/application/lang/en/pagination.php b/modules/application/lang/en/pagination.php
similarity index 100%
rename from application/lang/en/pagination.php
rename to modules/application/lang/en/pagination.php
diff --git a/application/lang/en/validation.php b/modules/application/lang/en/validation.php
similarity index 100%
rename from application/lang/en/validation.php
rename to modules/application/lang/en/validation.php
diff --git a/application/libraries/.gitignore b/modules/application/libraries/.gitignore
similarity index 100%
rename from application/libraries/.gitignore
rename to modules/application/libraries/.gitignore
diff --git a/application/models/.gitignore b/modules/application/models/.gitignore
similarity index 100%
rename from application/models/.gitignore
rename to modules/application/models/.gitignore
diff --git a/application/routes.php b/modules/application/routes.php
similarity index 100%
rename from application/routes.php
rename to modules/application/routes.php
diff --git a/application/views/error/404.php b/modules/application/views/error/404.php
similarity index 100%
rename from application/views/error/404.php
rename to modules/application/views/error/404.php
diff --git a/application/views/error/500.php b/modules/application/views/error/500.php
similarity index 100%
rename from application/views/error/500.php
rename to modules/application/views/error/500.php
diff --git a/application/views/error/exception.php b/modules/application/views/error/exception.php
similarity index 100%
rename from application/views/error/exception.php
rename to modules/application/views/error/exception.php
diff --git a/application/views/home/index.php b/modules/application/views/home/index.php
similarity index 100%
rename from application/views/home/index.php
rename to modules/application/views/home/index.php
diff --git a/public/index.php b/public/index.php
index 0931ce0a..6c6a6e4c 100644
--- a/public/index.php
+++ b/public/index.php
@@ -12,7 +12,7 @@
 // The active modules for this Laravel installation.
 // --------------------------------------------------------------
 $active = array(
-	'application' => realpath('../application'),
+	'application' => 'application',
 );
 
 // --------------------------------------------------------------