diff --git a/bin/drupal.php b/bin/drupal.php
index 5d916630b..20bd36cda 100644
--- a/bin/drupal.php
+++ b/bin/drupal.php
@@ -1,18 +1,15 @@
 <?php
 
 use Drupal\Console\Application;
-use Drupal\Console\Bootstrap\Drupal;
+use Drupal\Console\Bootstrap\Drupal as DrupalConsole;
+use Drupal\Console\ConsoleApplication;
+use Drupal\Console\ConsolePaths;
 
 set_time_limit(0);
-$consoleRoot = realpath(__DIR__.'/../') . '/';
-$appRoot = getcwd() . '/';
-$siteRoot = realpath(__DIR__.'/../../../../') . '/';
-$root = $appRoot;
-
-$autoLoadFile = $appRoot.'/autoload.php';
+$autoLoadFile = __DIR__ . '/../../../autoload.php';
 
 if (file_exists($autoLoadFile)) {
-    $autoload = include_once $autoLoadFile;
+    $autoload = require_once $autoLoadFile;
 } else {
     echo PHP_EOL .
         ' Something goes wrong with your package.'.PHP_EOL.
@@ -23,20 +20,11 @@
     exit(1);
 }
 
-if (!file_exists($appRoot.'composer.json')) {
-    $root = realpath($appRoot . '../') . '/';
-}
-
-if (!file_exists($root.'composer.json')) {
-    echo 'No composer.json file found at:' . PHP_EOL .
-        $root . PHP_EOL .
-        'you should try run this command,' . PHP_EOL .
-        'from project root directory.' . PHP_EOL;
-
-    exit(1);
-}
+$reflector = new ReflectionClass(Drupal::class);
+$drupalRoot = dirname(dirname(dirname($reflector->getFileName())));
+chdir($drupalRoot);
 
-$drupal = new Drupal($autoload, $root, $appRoot);
+$drupal = new DrupalConsole($autoload, $drupalRoot, ConsolePaths::consoleCore());
 $container = $drupal->boot();
 
 if (!$container) {
diff --git a/src/Bootstrap/AddServicesCompilerPass.php b/src/Bootstrap/AddServicesCompilerPass.php
index e0708bdfa..d9ac58ec1 100644
--- a/src/Bootstrap/AddServicesCompilerPass.php
+++ b/src/Bootstrap/AddServicesCompilerPass.php
@@ -38,8 +38,8 @@ public function process(ContainerBuilder $container)
             new FileLocator($this->root)
         );
 
-        $loader->load($this->root.  DRUPAL_CONSOLE_CORE . 'services.yml');
-        $loader->load($this->root.  DRUPAL_CONSOLE . 'services.yml');
+        $loader->load(DRUPAL_CONSOLE_CORE . '/services.yml');
+        $loader->load(DRUPAL_CONSOLE . '/services.yml');
 
         $finder = new Finder();
         $finder->files()
@@ -47,7 +47,7 @@ public function process(ContainerBuilder $container)
             ->in(
                 sprintf(
                     '%s/config/services/drupal-console',
-                    $this->root.DRUPAL_CONSOLE
+                    DRUPAL_CONSOLE
                 )
             );
 
@@ -71,7 +71,7 @@ public function process(ContainerBuilder $container)
             ->in(
                 sprintf(
                     '%s/config/services/drupal-core',
-                    $this->root.DRUPAL_CONSOLE
+                    DRUPAL_CONSOLE
                 )
             );
 
diff --git a/src/Bootstrap/Drupal.php b/src/Bootstrap/Drupal.php
index cd93150dc..6f1326807 100644
--- a/src/Bootstrap/Drupal.php
+++ b/src/Bootstrap/Drupal.php
@@ -70,8 +70,8 @@ public function boot()
         $container->get('console.renderer')
             ->setSkeletonDirs(
                 [
-                    $this->root.DRUPAL_CONSOLE.'/templates/',
-                    $this->root.DRUPAL_CONSOLE_CORE.'/templates/'
+                    DRUPAL_CONSOLE.'/templates/',
+                    DRUPAL_CONSOLE_CORE.'/templates/'
                 ]
             );