diff --git a/app/tests/TestCase.php b/app/tests/TestCase.php
index 1af7071e..8b1ef7da 100644
--- a/app/tests/TestCase.php
+++ b/app/tests/TestCase.php
@@ -13,7 +13,7 @@ public function createApplication()
 
         $testEnvironment = 'testing';
 
-    	return require __DIR__.'/../../start.php';
+    	return require __DIR__.'/../../bootstrap/start.php';
     }
 
-}
\ No newline at end of file
+}
diff --git a/artisan b/artisan
index f47ca23d..ce2189de 100644
--- a/artisan
+++ b/artisan
@@ -27,7 +27,7 @@ require __DIR__.'/bootstrap/autoload.php';
 |
 */
 
-$app = require_once __DIR__.'/start.php';
+$app = require_once __DIR__.'/bootstrap/start.php';
 
 $app->boot();
 
@@ -56,4 +56,4 @@ $artisan = Illuminate\Console\Application::start($app);
 |
 */
 
-$artisan->run();
\ No newline at end of file
+$artisan->run();
diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php
index 5030dae4..461a1a80 100644
--- a/bootstrap/autoload.php
+++ b/bootstrap/autoload.php
@@ -41,4 +41,4 @@
 if (is_dir($workbench = __DIR__.'/../workbench'))
 {
 	Illuminate\Workbench\Starter::start($workbench);
-}
\ No newline at end of file
+}
diff --git a/start.php b/bootstrap/start.php
similarity index 95%
rename from start.php
rename to bootstrap/start.php
index 1320a86c..25e90653 100644
--- a/start.php
+++ b/bootstrap/start.php
@@ -24,9 +24,9 @@
 |
 */
 
-$app->instance('path', $appPath = __DIR__.'/app');
+$app->instance('path', $appPath = __DIR__.'/../app');
 
-$app->instance('path.base', __DIR__);
+$app->instance('path.base', __DIR__.'/..');
 
 /*
 |--------------------------------------------------------------------------
@@ -69,4 +69,4 @@
 |
 */
 
-return $app;
\ No newline at end of file
+return $app;
diff --git a/public/index.php b/public/index.php
index d11628e3..030db7d1 100644
--- a/public/index.php
+++ b/public/index.php
@@ -34,7 +34,7 @@
 |
 */
 
-$app = require_once __DIR__.'/../start.php';
+$app = require_once __DIR__.'/../bootstrap/start.php';
 
 /*
 |--------------------------------------------------------------------------