diff --git a/.travis.yml b/.travis.yml
index f4656c93..40862a98 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ script:
  - vendor/bin/phpmd src text codesize,unusedcode
  - vendor/bin/phploc src
  - vendor/bin/phpcpd src
- - php churn run
+ - php bin/churn run
 
 after_success:
  - bash <(curl -s https://codecov.io/bash)
\ No newline at end of file
diff --git a/CyclomaticComplexityAssessorRunner b/bin/CyclomaticComplexityAssessorRunner
similarity index 100%
rename from CyclomaticComplexityAssessorRunner
rename to bin/CyclomaticComplexityAssessorRunner
diff --git a/bootstrap.php b/bin/bootstrap.php
similarity index 64%
rename from bootstrap.php
rename to bin/bootstrap.php
index a94f3c2f..c18bbf1b 100644
--- a/bootstrap.php
+++ b/bin/bootstrap.php
@@ -1,8 +1,8 @@
 <?php
 
-if (is_file($autoload = __DIR__.'/vendor/autoload.php')) {
+if (is_file($autoload = __DIR__ . '/../vendor/autoload.php')) {
     require_once($autoload);
-} elseif (is_file($autoload = __DIR__ . '/../../autoload.php')) {
+} elseif (is_file($autoload = __DIR__ . '/../../../autoload.php')) {
     require_once($autoload);
 } else {
     fwrite(STDERR,
diff --git a/churn b/bin/churn
similarity index 100%
rename from churn
rename to bin/churn
diff --git a/composer.json b/composer.json
index a60394a8..507e5d0e 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "bin": [
-        "churn"
+        "bin/churn"
     ],
     "require": {
         "php": "^7.0",
@@ -57,7 +57,7 @@
             "vendor/bin/phploc src",
             "vendor/bin/phpcpd src",
             "vendor/bin/phpunit --debug --coverage-clover=coverage.xml",
-            "php churn run src"
+            "php bin/churn run src"
         ],
         "fix": [
             "vendor/bin/phpcbf -n --standard=phpcs.xml src/",
diff --git a/src/Factories/ProcessFactory.php b/src/Factories/ProcessFactory.php
index 264a6652..679e910c 100644
--- a/src/Factories/ProcessFactory.php
+++ b/src/Factories/ProcessFactory.php
@@ -45,7 +45,7 @@ public function createGitCommitProcess(File $file): ChurnProcess
      */
     public function createCyclomaticComplexityProcess(File $file): ChurnProcess
     {
-        $rootFolder = __DIR__ . '/../../';
+        $rootFolder = __DIR__ . '/../../bin/';
 
         $process = new Process(
             "php {$rootFolder}CyclomaticComplexityAssessorRunner {$file->getFullPath()}"