diff --git a/composer.json b/composer.json
index f0e3399f4..ebeedc013 100644
--- a/composer.json
+++ b/composer.json
@@ -70,13 +70,13 @@
       "class": "GrumPHP\\Composer\\GrumPHPPlugin"
     },
     "autoload": {
-        "psr-0": {
-            "GrumPHP\\": "src/"
+        "psr-4": {
+            "GrumPHP\\": "src"
         }
     },
     "autoload-dev": {
-        "psr-0": {
-            "GrumPHPTest\\": "test/src/"
+        "psr-4": {
+            "GrumPHPTest\\": "test"
         }
     },
     "bin": ["bin/grumphp"]
diff --git a/phpspec.yml b/phpspec.yml
index c803b3542..9426bfd34 100644
--- a/phpspec.yml
+++ b/phpspec.yml
@@ -1 +1,6 @@
+suites:
+  default:
+    namespace: GrumPHP
+    psr4_prefix: GrumPHP
+
 formatter.name: pretty
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 8e1e22a96..e57efa06e 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,13 +1,10 @@
-<phpunit bootstrap="./test/src/Bootstrap.php" colors="true">
+<phpunit bootstrap="test/Bootstrap.php" colors="true">
     <testsuites>
         <testsuite name="Linters">
-            <directory>./test/src/GrumPHPTest/Linter</directory>
+            <directory>test/Linter</directory>
         </testsuite>
         <testsuite name="Parsers">
-            <directory>./test/src/GrumPHPTest/Parser</directory>
-        </testsuite>
-        <testsuite name="Util">
-            <directory>./test/src/GrumPHPTest/Util</directory>
+            <directory>test/Parser</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/spec/GrumPHP/Collection/FilesCollectionSpec.php b/spec/Collection/FilesCollectionSpec.php
similarity index 100%
rename from spec/GrumPHP/Collection/FilesCollectionSpec.php
rename to spec/Collection/FilesCollectionSpec.php
diff --git a/spec/GrumPHP/Collection/LintErrorsCollectionSpec.php b/spec/Collection/LintErrorsCollectionSpec.php
similarity index 100%
rename from spec/GrumPHP/Collection/LintErrorsCollectionSpec.php
rename to spec/Collection/LintErrorsCollectionSpec.php
diff --git a/spec/GrumPHP/Collection/ParseErrorsCollectionSpec.php b/spec/Collection/ParseErrorsCollectionSpec.php
similarity index 100%
rename from spec/GrumPHP/Collection/ParseErrorsCollectionSpec.php
rename to spec/Collection/ParseErrorsCollectionSpec.php
diff --git a/spec/GrumPHP/Collection/ProcessArgumentsCollectionSpec.php b/spec/Collection/ProcessArgumentsCollectionSpec.php
similarity index 100%
rename from spec/GrumPHP/Collection/ProcessArgumentsCollectionSpec.php
rename to spec/Collection/ProcessArgumentsCollectionSpec.php
diff --git a/spec/GrumPHP/Collection/TaskResultCollectionSpec.php b/spec/Collection/TaskResultCollectionSpec.php
similarity index 100%
rename from spec/GrumPHP/Collection/TaskResultCollectionSpec.php
rename to spec/Collection/TaskResultCollectionSpec.php
diff --git a/spec/GrumPHP/Collection/TasksCollectionSpec.php b/spec/Collection/TasksCollectionSpec.php
similarity index 100%
rename from spec/GrumPHP/Collection/TasksCollectionSpec.php
rename to spec/Collection/TasksCollectionSpec.php
diff --git a/spec/GrumPHP/Collection/TestSuiteCollectionSpec.php b/spec/Collection/TestSuiteCollectionSpec.php
similarity index 100%
rename from spec/GrumPHP/Collection/TestSuiteCollectionSpec.php
rename to spec/Collection/TestSuiteCollectionSpec.php
diff --git a/spec/GrumPHP/Composer/GrumPHPPluginSpec.php b/spec/Composer/GrumPHPPluginSpec.php
similarity index 100%
rename from spec/GrumPHP/Composer/GrumPHPPluginSpec.php
rename to spec/Composer/GrumPHPPluginSpec.php
diff --git a/spec/GrumPHP/Configuration/GrumPHPSpec.php b/spec/Configuration/GrumPHPSpec.php
similarity index 100%
rename from spec/GrumPHP/Configuration/GrumPHPSpec.php
rename to spec/Configuration/GrumPHPSpec.php
diff --git a/spec/GrumPHP/Console/Helper/ComposerHelperSpec.php b/spec/Console/Helper/ComposerHelperSpec.php
similarity index 100%
rename from spec/GrumPHP/Console/Helper/ComposerHelperSpec.php
rename to spec/Console/Helper/ComposerHelperSpec.php
diff --git a/spec/GrumPHP/Console/Helper/PathsHelperSpec.php b/spec/Console/Helper/PathsHelperSpec.php
similarity index 100%
rename from spec/GrumPHP/Console/Helper/PathsHelperSpec.php
rename to spec/Console/Helper/PathsHelperSpec.php
diff --git a/spec/GrumPHP/Console/Helper/TaskRunnerHelperSpec.php b/spec/Console/Helper/TaskRunnerHelperSpec.php
similarity index 100%
rename from spec/GrumPHP/Console/Helper/TaskRunnerHelperSpec.php
rename to spec/Console/Helper/TaskRunnerHelperSpec.php
diff --git a/spec/GrumPHP/Event/RunnerEventSpec.php b/spec/Event/RunnerEventSpec.php
similarity index 100%
rename from spec/GrumPHP/Event/RunnerEventSpec.php
rename to spec/Event/RunnerEventSpec.php
diff --git a/spec/GrumPHP/Event/RunnerFailedEventSpec.php b/spec/Event/RunnerFailedEventSpec.php
similarity index 100%
rename from spec/GrumPHP/Event/RunnerFailedEventSpec.php
rename to spec/Event/RunnerFailedEventSpec.php
diff --git a/spec/GrumPHP/Event/Subscriber/ProgressSubscriberSpec.php b/spec/Event/Subscriber/ProgressSubscriberSpec.php
similarity index 100%
rename from spec/GrumPHP/Event/Subscriber/ProgressSubscriberSpec.php
rename to spec/Event/Subscriber/ProgressSubscriberSpec.php
diff --git a/spec/GrumPHP/Event/Subscriber/StashUnstagedChangesSubscriberSpec.php b/spec/Event/Subscriber/StashUnstagedChangesSubscriberSpec.php
similarity index 100%
rename from spec/GrumPHP/Event/Subscriber/StashUnstagedChangesSubscriberSpec.php
rename to spec/Event/Subscriber/StashUnstagedChangesSubscriberSpec.php
diff --git a/spec/GrumPHP/Event/TaskEventSpec.php b/spec/Event/TaskEventSpec.php
similarity index 100%
rename from spec/GrumPHP/Event/TaskEventSpec.php
rename to spec/Event/TaskEventSpec.php
diff --git a/spec/GrumPHP/Event/TaskFailedEventSpec.php b/spec/Event/TaskFailedEventSpec.php
similarity index 100%
rename from spec/GrumPHP/Event/TaskFailedEventSpec.php
rename to spec/Event/TaskFailedEventSpec.php
diff --git a/spec/GrumPHP/Exception/InvalidArgumentExceptionSpec.php b/spec/Exception/InvalidArgumentExceptionSpec.php
similarity index 100%
rename from spec/GrumPHP/Exception/InvalidArgumentExceptionSpec.php
rename to spec/Exception/InvalidArgumentExceptionSpec.php
diff --git a/spec/GrumPHP/Formatter/GitBlacklistFormatterSpec.php b/spec/Formatter/GitBlacklistFormatterSpec.php
similarity index 100%
rename from spec/GrumPHP/Formatter/GitBlacklistFormatterSpec.php
rename to spec/Formatter/GitBlacklistFormatterSpec.php
diff --git a/spec/GrumPHP/Formatter/PhpCsFixerFormatterSpec.php b/spec/Formatter/PhpCsFixerFormatterSpec.php
similarity index 100%
rename from spec/GrumPHP/Formatter/PhpCsFixerFormatterSpec.php
rename to spec/Formatter/PhpCsFixerFormatterSpec.php
diff --git a/spec/GrumPHP/Formatter/PhpcsFormatterSpec.php b/spec/Formatter/PhpcsFormatterSpec.php
similarity index 100%
rename from spec/GrumPHP/Formatter/PhpcsFormatterSpec.php
rename to spec/Formatter/PhpcsFormatterSpec.php
diff --git a/spec/GrumPHP/Formatter/RawProcessFormatterSpec.php b/spec/Formatter/RawProcessFormatterSpec.php
similarity index 100%
rename from spec/GrumPHP/Formatter/RawProcessFormatterSpec.php
rename to spec/Formatter/RawProcessFormatterSpec.php
diff --git a/spec/GrumPHP/IO/ConsoleIOSpec.php b/spec/IO/ConsoleIOSpec.php
similarity index 100%
rename from spec/GrumPHP/IO/ConsoleIOSpec.php
rename to spec/IO/ConsoleIOSpec.php
diff --git a/spec/GrumPHP/IO/NullIOSpec.php b/spec/IO/NullIOSpec.php
similarity index 100%
rename from spec/GrumPHP/IO/NullIOSpec.php
rename to spec/IO/NullIOSpec.php
diff --git a/spec/GrumPHP/Linter/Json/JsonLintErrorSpec.php b/spec/Linter/Json/JsonLintErrorSpec.php
similarity index 100%
rename from spec/GrumPHP/Linter/Json/JsonLintErrorSpec.php
rename to spec/Linter/Json/JsonLintErrorSpec.php
diff --git a/spec/GrumPHP/Linter/Json/JsonLinterSpec.php b/spec/Linter/Json/JsonLinterSpec.php
similarity index 100%
rename from spec/GrumPHP/Linter/Json/JsonLinterSpec.php
rename to spec/Linter/Json/JsonLinterSpec.php
diff --git a/spec/GrumPHP/Linter/LintErrorSpec.php b/spec/Linter/LintErrorSpec.php
similarity index 100%
rename from spec/GrumPHP/Linter/LintErrorSpec.php
rename to spec/Linter/LintErrorSpec.php
diff --git a/spec/GrumPHP/Linter/Xml/XmlLintErrorSpec.php b/spec/Linter/Xml/XmlLintErrorSpec.php
similarity index 100%
rename from spec/GrumPHP/Linter/Xml/XmlLintErrorSpec.php
rename to spec/Linter/Xml/XmlLintErrorSpec.php
diff --git a/spec/GrumPHP/Linter/Xml/XmlLinterSpec.php b/spec/Linter/Xml/XmlLinterSpec.php
similarity index 100%
rename from spec/GrumPHP/Linter/Xml/XmlLinterSpec.php
rename to spec/Linter/Xml/XmlLinterSpec.php
diff --git a/spec/GrumPHP/Linter/Yaml/YamlLintErrorSpec.php b/spec/Linter/Yaml/YamlLintErrorSpec.php
similarity index 100%
rename from spec/GrumPHP/Linter/Yaml/YamlLintErrorSpec.php
rename to spec/Linter/Yaml/YamlLintErrorSpec.php
diff --git a/spec/GrumPHP/Linter/Yaml/YamlLinterSpec.php b/spec/Linter/Yaml/YamlLinterSpec.php
similarity index 100%
rename from spec/GrumPHP/Linter/Yaml/YamlLinterSpec.php
rename to spec/Linter/Yaml/YamlLinterSpec.php
diff --git a/spec/GrumPHP/Locator/ChangedFilesSpec.php b/spec/Locator/ChangedFilesSpec.php
similarity index 100%
rename from spec/GrumPHP/Locator/ChangedFilesSpec.php
rename to spec/Locator/ChangedFilesSpec.php
diff --git a/spec/GrumPHP/Locator/ConfigurationFileSpec.php b/spec/Locator/ConfigurationFileSpec.php
similarity index 100%
rename from spec/GrumPHP/Locator/ConfigurationFileSpec.php
rename to spec/Locator/ConfigurationFileSpec.php
diff --git a/spec/GrumPHP/Locator/ExternalCommandSpec.php b/spec/Locator/ExternalCommandSpec.php
similarity index 100%
rename from spec/GrumPHP/Locator/ExternalCommandSpec.php
rename to spec/Locator/ExternalCommandSpec.php
diff --git a/spec/GrumPHP/Locator/RegisteredFilesSpec.php b/spec/Locator/RegisteredFilesSpec.php
similarity index 100%
rename from spec/GrumPHP/Locator/RegisteredFilesSpec.php
rename to spec/Locator/RegisteredFilesSpec.php
diff --git a/spec/GrumPHP/Parser/ParseErrorSpec.php b/spec/Parser/ParseErrorSpec.php
similarity index 100%
rename from spec/GrumPHP/Parser/ParseErrorSpec.php
rename to spec/Parser/ParseErrorSpec.php
diff --git a/spec/GrumPHP/Parser/Php/Configurator/TraverserConfiguratorSpec.php b/spec/Parser/Php/Configurator/TraverserConfiguratorSpec.php
similarity index 100%
rename from spec/GrumPHP/Parser/Php/Configurator/TraverserConfiguratorSpec.php
rename to spec/Parser/Php/Configurator/TraverserConfiguratorSpec.php
diff --git a/spec/GrumPHP/Parser/Php/Context/ParserContextSpec.php b/spec/Parser/Php/Context/ParserContextSpec.php
similarity index 100%
rename from spec/GrumPHP/Parser/Php/Context/ParserContextSpec.php
rename to spec/Parser/Php/Context/ParserContextSpec.php
diff --git a/spec/GrumPHP/Parser/Php/Factory/ParserFactorySpec.php b/spec/Parser/Php/Factory/ParserFactorySpec.php
similarity index 100%
rename from spec/GrumPHP/Parser/Php/Factory/ParserFactorySpec.php
rename to spec/Parser/Php/Factory/ParserFactorySpec.php
diff --git a/spec/GrumPHP/Parser/Php/Factory/TraverserFactorySpec.php b/spec/Parser/Php/Factory/TraverserFactorySpec.php
similarity index 100%
rename from spec/GrumPHP/Parser/Php/Factory/TraverserFactorySpec.php
rename to spec/Parser/Php/Factory/TraverserFactorySpec.php
diff --git a/spec/GrumPHP/Parser/Php/PhpParserErrorSpec.php b/spec/Parser/Php/PhpParserErrorSpec.php
similarity index 100%
rename from spec/GrumPHP/Parser/Php/PhpParserErrorSpec.php
rename to spec/Parser/Php/PhpParserErrorSpec.php
diff --git a/spec/GrumPHP/Parser/Php/PhpParserSpec.php b/spec/Parser/Php/PhpParserSpec.php
similarity index 100%
rename from spec/GrumPHP/Parser/Php/PhpParserSpec.php
rename to spec/Parser/Php/PhpParserSpec.php
diff --git a/spec/GrumPHP/Process/AsyncProcessRunnerSpec.php b/spec/Process/AsyncProcessRunnerSpec.php
similarity index 100%
rename from spec/GrumPHP/Process/AsyncProcessRunnerSpec.php
rename to spec/Process/AsyncProcessRunnerSpec.php
diff --git a/spec/GrumPHP/Process/ProcessBuilderSpec.php b/spec/Process/ProcessBuilderSpec.php
similarity index 100%
rename from spec/GrumPHP/Process/ProcessBuilderSpec.php
rename to spec/Process/ProcessBuilderSpec.php
diff --git a/spec/GrumPHP/Runner/TaskResultSpec.php b/spec/Runner/TaskResultSpec.php
similarity index 100%
rename from spec/GrumPHP/Runner/TaskResultSpec.php
rename to spec/Runner/TaskResultSpec.php
diff --git a/spec/GrumPHP/Runner/TaskRunnerContextSpec.php b/spec/Runner/TaskRunnerContextSpec.php
similarity index 100%
rename from spec/GrumPHP/Runner/TaskRunnerContextSpec.php
rename to spec/Runner/TaskRunnerContextSpec.php
diff --git a/spec/GrumPHP/Runner/TaskRunnerSpec.php b/spec/Runner/TaskRunnerSpec.php
similarity index 100%
rename from spec/GrumPHP/Runner/TaskRunnerSpec.php
rename to spec/Runner/TaskRunnerSpec.php
diff --git a/spec/GrumPHP/Task/AbstractLinterTaskSpec.php b/spec/Task/AbstractLinterTaskSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/AbstractLinterTaskSpec.php
rename to spec/Task/AbstractLinterTaskSpec.php
diff --git a/spec/GrumPHP/Task/AbstractParserTaskSpec.php b/spec/Task/AbstractParserTaskSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/AbstractParserTaskSpec.php
rename to spec/Task/AbstractParserTaskSpec.php
diff --git a/spec/GrumPHP/Task/AntSpec.php b/spec/Task/AntSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/AntSpec.php
rename to spec/Task/AntSpec.php
diff --git a/spec/GrumPHP/Task/AtoumSpec.php b/spec/Task/AtoumSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/AtoumSpec.php
rename to spec/Task/AtoumSpec.php
diff --git a/spec/GrumPHP/Task/BehatSpec.php b/spec/Task/BehatSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/BehatSpec.php
rename to spec/Task/BehatSpec.php
diff --git a/spec/GrumPHP/Task/BrunchSpec.php b/spec/Task/BrunchSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/BrunchSpec.php
rename to spec/Task/BrunchSpec.php
diff --git a/spec/GrumPHP/Task/CloverCoverageSpec.php b/spec/Task/CloverCoverageSpec.php
similarity index 92%
rename from spec/GrumPHP/Task/CloverCoverageSpec.php
rename to spec/Task/CloverCoverageSpec.php
index 005137959..42e2b82dc 100644
--- a/spec/GrumPHP/Task/CloverCoverageSpec.php
+++ b/spec/Task/CloverCoverageSpec.php
@@ -66,7 +66,7 @@ function it_runs_the_suite_but_fails_when_file_doesnt_exists(GrumPHP $grumPHP, G
 
     function it_runs_the_suite(GrumPHP $grumPHP, GitCommitMsgContext $context)
     {
-        $filename = dirname(dirname(dirname(__DIR__))) . '/test/fixtures/clover_coverage/60-percent-coverage.xml';
+        $filename = dirname(dirname(__DIR__)) . '/test/fixtures/clover_coverage/60-percent-coverage.xml';
         $grumPHP->getTaskConfiguration('clover_coverage')->willReturn([
             'clover_file' => $filename,
             'level' => 50,
@@ -78,7 +78,7 @@ function it_runs_the_suite(GrumPHP $grumPHP, GitCommitMsgContext $context)
 
     function it_runs_the_suite_but_not_reaching_coverage(GrumPHP $grumPHP, GitCommitMsgContext $context)
     {
-        $filename = dirname(dirname(dirname(__DIR__))) . '/test/fixtures/clover_coverage/60-percent-coverage.xml';
+        $filename = dirname(dirname(__DIR__)) . '/test/fixtures/clover_coverage/60-percent-coverage.xml';
         $grumPHP->getTaskConfiguration('clover_coverage')->willReturn([
             'clover_file' => $filename,
             'level' => 100,
diff --git a/spec/GrumPHP/Task/CodeceptionSpec.php b/spec/Task/CodeceptionSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/CodeceptionSpec.php
rename to spec/Task/CodeceptionSpec.php
diff --git a/spec/GrumPHP/Task/ComposerScriptSpec.php b/spec/Task/ComposerScriptSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/ComposerScriptSpec.php
rename to spec/Task/ComposerScriptSpec.php
diff --git a/spec/GrumPHP/Task/ComposerSpec.php b/spec/Task/ComposerSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/ComposerSpec.php
rename to spec/Task/ComposerSpec.php
diff --git a/spec/GrumPHP/Task/Context/GitCommitMsgContextSpec.php b/spec/Task/Context/GitCommitMsgContextSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/Context/GitCommitMsgContextSpec.php
rename to spec/Task/Context/GitCommitMsgContextSpec.php
diff --git a/spec/GrumPHP/Task/Context/GitPreCommitContextSpec.php b/spec/Task/Context/GitPreCommitContextSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/Context/GitPreCommitContextSpec.php
rename to spec/Task/Context/GitPreCommitContextSpec.php
diff --git a/spec/GrumPHP/Task/Context/RunContextSpec.php b/spec/Task/Context/RunContextSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/Context/RunContextSpec.php
rename to spec/Task/Context/RunContextSpec.php
diff --git a/spec/GrumPHP/Task/DoctrineOrmSpec.php b/spec/Task/DoctrineOrmSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/DoctrineOrmSpec.php
rename to spec/Task/DoctrineOrmSpec.php
diff --git a/spec/GrumPHP/Task/GherkinSpec.php b/spec/Task/GherkinSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/GherkinSpec.php
rename to spec/Task/GherkinSpec.php
diff --git a/spec/GrumPHP/Task/Git/BlacklistSpec.php b/spec/Task/Git/BlacklistSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/Git/BlacklistSpec.php
rename to spec/Task/Git/BlacklistSpec.php
diff --git a/spec/GrumPHP/Task/Git/CommitMessageSpec.php b/spec/Task/Git/CommitMessageSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/Git/CommitMessageSpec.php
rename to spec/Task/Git/CommitMessageSpec.php
diff --git a/spec/GrumPHP/Task/Git/ConflictSpec.php b/spec/Task/Git/ConflictSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/Git/ConflictSpec.php
rename to spec/Task/Git/ConflictSpec.php
diff --git a/spec/GrumPHP/Task/GruntSpec.php b/spec/Task/GruntSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/GruntSpec.php
rename to spec/Task/GruntSpec.php
diff --git a/spec/GrumPHP/Task/GulpSpec.php b/spec/Task/GulpSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/GulpSpec.php
rename to spec/Task/GulpSpec.php
diff --git a/spec/GrumPHP/Task/JsonLintSpec.php b/spec/Task/JsonLintSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/JsonLintSpec.php
rename to spec/Task/JsonLintSpec.php
diff --git a/spec/GrumPHP/Task/KahlanSpec.php b/spec/Task/KahlanSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/KahlanSpec.php
rename to spec/Task/KahlanSpec.php
diff --git a/spec/GrumPHP/Task/MakeSpec.php b/spec/Task/MakeSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/MakeSpec.php
rename to spec/Task/MakeSpec.php
diff --git a/spec/GrumPHP/Task/NpmScriptSpec.php b/spec/Task/NpmScriptSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/NpmScriptSpec.php
rename to spec/Task/NpmScriptSpec.php
diff --git a/spec/GrumPHP/Task/PhingSpec.php b/spec/Task/PhingSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/PhingSpec.php
rename to spec/Task/PhingSpec.php
diff --git a/spec/GrumPHP/Task/Php7ccSpec.php b/spec/Task/Php7ccSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/Php7ccSpec.php
rename to spec/Task/Php7ccSpec.php
diff --git a/spec/GrumPHP/Task/PhpCpdSpec.php b/spec/Task/PhpCpdSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/PhpCpdSpec.php
rename to spec/Task/PhpCpdSpec.php
diff --git a/spec/GrumPHP/Task/PhpCsFixerSpec.php b/spec/Task/PhpCsFixerSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/PhpCsFixerSpec.php
rename to spec/Task/PhpCsFixerSpec.php
diff --git a/spec/GrumPHP/Task/PhpCsFixerV2Spec.php b/spec/Task/PhpCsFixerV2Spec.php
similarity index 100%
rename from spec/GrumPHP/Task/PhpCsFixerV2Spec.php
rename to spec/Task/PhpCsFixerV2Spec.php
diff --git a/spec/GrumPHP/Task/PhpLintSpec.php b/spec/Task/PhpLintSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/PhpLintSpec.php
rename to spec/Task/PhpLintSpec.php
diff --git a/spec/GrumPHP/Task/PhpMdSpec.php b/spec/Task/PhpMdSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/PhpMdSpec.php
rename to spec/Task/PhpMdSpec.php
diff --git a/spec/GrumPHP/Task/PhpParserSpec.php b/spec/Task/PhpParserSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/PhpParserSpec.php
rename to spec/Task/PhpParserSpec.php
diff --git a/spec/GrumPHP/Task/PhpVersionSpec.php b/spec/Task/PhpVersionSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/PhpVersionSpec.php
rename to spec/Task/PhpVersionSpec.php
diff --git a/spec/GrumPHP/Task/PhpcsSpec.php b/spec/Task/PhpcsSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/PhpcsSpec.php
rename to spec/Task/PhpcsSpec.php
diff --git a/spec/GrumPHP/Task/PhpspecSpec.php b/spec/Task/PhpspecSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/PhpspecSpec.php
rename to spec/Task/PhpspecSpec.php
diff --git a/spec/GrumPHP/Task/PhpunitSpec.php b/spec/Task/PhpunitSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/PhpunitSpec.php
rename to spec/Task/PhpunitSpec.php
diff --git a/spec/GrumPHP/Task/RoboSpec.php b/spec/Task/RoboSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/RoboSpec.php
rename to spec/Task/RoboSpec.php
diff --git a/spec/GrumPHP/Task/SecurityCheckerSpec.php b/spec/Task/SecurityCheckerSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/SecurityCheckerSpec.php
rename to spec/Task/SecurityCheckerSpec.php
diff --git a/spec/GrumPHP/Task/ShellSpec.php b/spec/Task/ShellSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/ShellSpec.php
rename to spec/Task/ShellSpec.php
diff --git a/spec/GrumPHP/Task/XmlLintSpec.php b/spec/Task/XmlLintSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/XmlLintSpec.php
rename to spec/Task/XmlLintSpec.php
diff --git a/spec/GrumPHP/Task/YamlLintSpec.php b/spec/Task/YamlLintSpec.php
similarity index 100%
rename from spec/GrumPHP/Task/YamlLintSpec.php
rename to spec/Task/YamlLintSpec.php
diff --git a/spec/GrumPHP/TestSuite/TestSuiteSpec.php b/spec/TestSuite/TestSuiteSpec.php
similarity index 100%
rename from spec/GrumPHP/TestSuite/TestSuiteSpec.php
rename to spec/TestSuite/TestSuiteSpec.php
diff --git a/spec/GrumPHP/Util/FilesystemSpec.php b/spec/Util/FilesystemSpec.php
similarity index 100%
rename from spec/GrumPHP/Util/FilesystemSpec.php
rename to spec/Util/FilesystemSpec.php
diff --git a/spec/GrumPHP/Util/PhpVersionSpec.php b/spec/Util/PhpVersionSpec.php
similarity index 100%
rename from spec/GrumPHP/Util/PhpVersionSpec.php
rename to spec/Util/PhpVersionSpec.php
diff --git a/spec/GrumPHP/Util/RegexSpec.php b/spec/Util/RegexSpec.php
similarity index 100%
rename from spec/GrumPHP/Util/RegexSpec.php
rename to spec/Util/RegexSpec.php
diff --git a/src/GrumPHP/Collection/FilesCollection.php b/src/Collection/FilesCollection.php
similarity index 100%
rename from src/GrumPHP/Collection/FilesCollection.php
rename to src/Collection/FilesCollection.php
diff --git a/src/GrumPHP/Collection/LintErrorsCollection.php b/src/Collection/LintErrorsCollection.php
similarity index 100%
rename from src/GrumPHP/Collection/LintErrorsCollection.php
rename to src/Collection/LintErrorsCollection.php
diff --git a/src/GrumPHP/Collection/ParseErrorsCollection.php b/src/Collection/ParseErrorsCollection.php
similarity index 100%
rename from src/GrumPHP/Collection/ParseErrorsCollection.php
rename to src/Collection/ParseErrorsCollection.php
diff --git a/src/GrumPHP/Collection/ProcessArgumentsCollection.php b/src/Collection/ProcessArgumentsCollection.php
similarity index 100%
rename from src/GrumPHP/Collection/ProcessArgumentsCollection.php
rename to src/Collection/ProcessArgumentsCollection.php
diff --git a/src/GrumPHP/Collection/TaskResultCollection.php b/src/Collection/TaskResultCollection.php
similarity index 100%
rename from src/GrumPHP/Collection/TaskResultCollection.php
rename to src/Collection/TaskResultCollection.php
diff --git a/src/GrumPHP/Collection/TasksCollection.php b/src/Collection/TasksCollection.php
similarity index 100%
rename from src/GrumPHP/Collection/TasksCollection.php
rename to src/Collection/TasksCollection.php
diff --git a/src/GrumPHP/Collection/TestSuiteCollection.php b/src/Collection/TestSuiteCollection.php
similarity index 100%
rename from src/GrumPHP/Collection/TestSuiteCollection.php
rename to src/Collection/TestSuiteCollection.php
diff --git a/src/GrumPHP/Composer/GrumPHPPlugin.php b/src/Composer/GrumPHPPlugin.php
similarity index 100%
rename from src/GrumPHP/Composer/GrumPHPPlugin.php
rename to src/Composer/GrumPHPPlugin.php
diff --git a/src/GrumPHP/Configuration/Compiler/ExtensionCompilerPass.php b/src/Configuration/Compiler/ExtensionCompilerPass.php
similarity index 100%
rename from src/GrumPHP/Configuration/Compiler/ExtensionCompilerPass.php
rename to src/Configuration/Compiler/ExtensionCompilerPass.php
diff --git a/src/GrumPHP/Configuration/Compiler/PhpParserCompilerPass.php b/src/Configuration/Compiler/PhpParserCompilerPass.php
similarity index 100%
rename from src/GrumPHP/Configuration/Compiler/PhpParserCompilerPass.php
rename to src/Configuration/Compiler/PhpParserCompilerPass.php
diff --git a/src/GrumPHP/Configuration/Compiler/TaskCompilerPass.php b/src/Configuration/Compiler/TaskCompilerPass.php
similarity index 100%
rename from src/GrumPHP/Configuration/Compiler/TaskCompilerPass.php
rename to src/Configuration/Compiler/TaskCompilerPass.php
diff --git a/src/GrumPHP/Configuration/Compiler/TestSuiteCompilerPass.php b/src/Configuration/Compiler/TestSuiteCompilerPass.php
similarity index 100%
rename from src/GrumPHP/Configuration/Compiler/TestSuiteCompilerPass.php
rename to src/Configuration/Compiler/TestSuiteCompilerPass.php
diff --git a/src/GrumPHP/Configuration/ContainerFactory.php b/src/Configuration/ContainerFactory.php
similarity index 97%
rename from src/GrumPHP/Configuration/ContainerFactory.php
rename to src/Configuration/ContainerFactory.php
index b4adfbaba..369c3ed5b 100644
--- a/src/GrumPHP/Configuration/ContainerFactory.php
+++ b/src/Configuration/ContainerFactory.php
@@ -32,7 +32,7 @@ public static function buildFromConfiguration($path)
         );
 
         // Load basic service file + custom user configuration
-        $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../../../resources/config'));
+        $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../../resources/config'));
         $loader->load('formatter.yml');
         $loader->load('linters.yml');
         $loader->load('parameters.yml');
diff --git a/src/GrumPHP/Configuration/GrumPHP.php b/src/Configuration/GrumPHP.php
similarity index 100%
rename from src/GrumPHP/Configuration/GrumPHP.php
rename to src/Configuration/GrumPHP.php
diff --git a/src/GrumPHP/Console/Application.php b/src/Console/Application.php
similarity index 100%
rename from src/GrumPHP/Console/Application.php
rename to src/Console/Application.php
diff --git a/src/GrumPHP/Console/Command/ConfigureCommand.php b/src/Console/Command/ConfigureCommand.php
similarity index 100%
rename from src/GrumPHP/Console/Command/ConfigureCommand.php
rename to src/Console/Command/ConfigureCommand.php
diff --git a/src/GrumPHP/Console/Command/Git/CommitMsgCommand.php b/src/Console/Command/Git/CommitMsgCommand.php
similarity index 100%
rename from src/GrumPHP/Console/Command/Git/CommitMsgCommand.php
rename to src/Console/Command/Git/CommitMsgCommand.php
diff --git a/src/GrumPHP/Console/Command/Git/DeInitCommand.php b/src/Console/Command/Git/DeInitCommand.php
similarity index 100%
rename from src/GrumPHP/Console/Command/Git/DeInitCommand.php
rename to src/Console/Command/Git/DeInitCommand.php
diff --git a/src/GrumPHP/Console/Command/Git/InitCommand.php b/src/Console/Command/Git/InitCommand.php
similarity index 100%
rename from src/GrumPHP/Console/Command/Git/InitCommand.php
rename to src/Console/Command/Git/InitCommand.php
diff --git a/src/GrumPHP/Console/Command/Git/PreCommitCommand.php b/src/Console/Command/Git/PreCommitCommand.php
similarity index 100%
rename from src/GrumPHP/Console/Command/Git/PreCommitCommand.php
rename to src/Console/Command/Git/PreCommitCommand.php
diff --git a/src/GrumPHP/Console/Command/RunCommand.php b/src/Console/Command/RunCommand.php
similarity index 100%
rename from src/GrumPHP/Console/Command/RunCommand.php
rename to src/Console/Command/RunCommand.php
diff --git a/src/GrumPHP/Console/Helper/ComposerHelper.php b/src/Console/Helper/ComposerHelper.php
similarity index 100%
rename from src/GrumPHP/Console/Helper/ComposerHelper.php
rename to src/Console/Helper/ComposerHelper.php
diff --git a/src/GrumPHP/Console/Helper/PathsHelper.php b/src/Console/Helper/PathsHelper.php
similarity index 99%
rename from src/GrumPHP/Console/Helper/PathsHelper.php
rename to src/Console/Helper/PathsHelper.php
index 7fc7fe2a1..568424a06 100644
--- a/src/GrumPHP/Console/Helper/PathsHelper.php
+++ b/src/Console/Helper/PathsHelper.php
@@ -64,7 +64,7 @@ public function __construct(
      */
     public function getGrumPHPPath()
     {
-        $path = __DIR__ . '/../../../../';
+        $path = __DIR__ . '/../../..';
 
         return $this->getRelativePath($path);
     }
diff --git a/src/GrumPHP/Console/Helper/TaskRunnerHelper.php b/src/Console/Helper/TaskRunnerHelper.php
similarity index 100%
rename from src/GrumPHP/Console/Helper/TaskRunnerHelper.php
rename to src/Console/Helper/TaskRunnerHelper.php
diff --git a/src/GrumPHP/Event/RunnerEvent.php b/src/Event/RunnerEvent.php
similarity index 100%
rename from src/GrumPHP/Event/RunnerEvent.php
rename to src/Event/RunnerEvent.php
diff --git a/src/GrumPHP/Event/RunnerEvents.php b/src/Event/RunnerEvents.php
similarity index 100%
rename from src/GrumPHP/Event/RunnerEvents.php
rename to src/Event/RunnerEvents.php
diff --git a/src/GrumPHP/Event/RunnerFailedEvent.php b/src/Event/RunnerFailedEvent.php
similarity index 100%
rename from src/GrumPHP/Event/RunnerFailedEvent.php
rename to src/Event/RunnerFailedEvent.php
diff --git a/src/GrumPHP/Event/Subscriber/ProgressSubscriber.php b/src/Event/Subscriber/ProgressSubscriber.php
similarity index 100%
rename from src/GrumPHP/Event/Subscriber/ProgressSubscriber.php
rename to src/Event/Subscriber/ProgressSubscriber.php
diff --git a/src/GrumPHP/Event/Subscriber/StashUnstagedChangesSubscriber.php b/src/Event/Subscriber/StashUnstagedChangesSubscriber.php
similarity index 100%
rename from src/GrumPHP/Event/Subscriber/StashUnstagedChangesSubscriber.php
rename to src/Event/Subscriber/StashUnstagedChangesSubscriber.php
diff --git a/src/GrumPHP/Event/TaskEvent.php b/src/Event/TaskEvent.php
similarity index 100%
rename from src/GrumPHP/Event/TaskEvent.php
rename to src/Event/TaskEvent.php
diff --git a/src/GrumPHP/Event/TaskEvents.php b/src/Event/TaskEvents.php
similarity index 100%
rename from src/GrumPHP/Event/TaskEvents.php
rename to src/Event/TaskEvents.php
diff --git a/src/GrumPHP/Event/TaskFailedEvent.php b/src/Event/TaskFailedEvent.php
similarity index 100%
rename from src/GrumPHP/Event/TaskFailedEvent.php
rename to src/Event/TaskFailedEvent.php
diff --git a/src/GrumPHP/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
similarity index 100%
rename from src/GrumPHP/Exception/ExceptionInterface.php
rename to src/Exception/ExceptionInterface.php
diff --git a/src/GrumPHP/Exception/FileNotFoundException.php b/src/Exception/FileNotFoundException.php
similarity index 100%
rename from src/GrumPHP/Exception/FileNotFoundException.php
rename to src/Exception/FileNotFoundException.php
diff --git a/src/GrumPHP/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
similarity index 100%
rename from src/GrumPHP/Exception/InvalidArgumentException.php
rename to src/Exception/InvalidArgumentException.php
diff --git a/src/GrumPHP/Exception/PlatformException.php b/src/Exception/PlatformException.php
similarity index 100%
rename from src/GrumPHP/Exception/PlatformException.php
rename to src/Exception/PlatformException.php
diff --git a/src/GrumPHP/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
similarity index 100%
rename from src/GrumPHP/Exception/RuntimeException.php
rename to src/Exception/RuntimeException.php
diff --git a/src/GrumPHP/Extension/ExtensionInterface.php b/src/Extension/ExtensionInterface.php
similarity index 100%
rename from src/GrumPHP/Extension/ExtensionInterface.php
rename to src/Extension/ExtensionInterface.php
diff --git a/src/GrumPHP/Formatter/GitBlacklistFormatter.php b/src/Formatter/GitBlacklistFormatter.php
similarity index 100%
rename from src/GrumPHP/Formatter/GitBlacklistFormatter.php
rename to src/Formatter/GitBlacklistFormatter.php
diff --git a/src/GrumPHP/Formatter/PhpCsFixerFormatter.php b/src/Formatter/PhpCsFixerFormatter.php
similarity index 100%
rename from src/GrumPHP/Formatter/PhpCsFixerFormatter.php
rename to src/Formatter/PhpCsFixerFormatter.php
diff --git a/src/GrumPHP/Formatter/PhpcsFormatter.php b/src/Formatter/PhpcsFormatter.php
similarity index 100%
rename from src/GrumPHP/Formatter/PhpcsFormatter.php
rename to src/Formatter/PhpcsFormatter.php
diff --git a/src/GrumPHP/Formatter/ProcessFormatterInterface.php b/src/Formatter/ProcessFormatterInterface.php
similarity index 100%
rename from src/GrumPHP/Formatter/ProcessFormatterInterface.php
rename to src/Formatter/ProcessFormatterInterface.php
diff --git a/src/GrumPHP/Formatter/RawProcessFormatter.php b/src/Formatter/RawProcessFormatter.php
similarity index 100%
rename from src/GrumPHP/Formatter/RawProcessFormatter.php
rename to src/Formatter/RawProcessFormatter.php
diff --git a/src/GrumPHP/IO/ConsoleIO.php b/src/IO/ConsoleIO.php
similarity index 100%
rename from src/GrumPHP/IO/ConsoleIO.php
rename to src/IO/ConsoleIO.php
diff --git a/src/GrumPHP/IO/IOInterface.php b/src/IO/IOInterface.php
similarity index 100%
rename from src/GrumPHP/IO/IOInterface.php
rename to src/IO/IOInterface.php
diff --git a/src/GrumPHP/IO/NullIO.php b/src/IO/NullIO.php
similarity index 100%
rename from src/GrumPHP/IO/NullIO.php
rename to src/IO/NullIO.php
diff --git a/src/GrumPHP/Linter/Json/JsonLintError.php b/src/Linter/Json/JsonLintError.php
similarity index 100%
rename from src/GrumPHP/Linter/Json/JsonLintError.php
rename to src/Linter/Json/JsonLintError.php
diff --git a/src/GrumPHP/Linter/Json/JsonLinter.php b/src/Linter/Json/JsonLinter.php
similarity index 100%
rename from src/GrumPHP/Linter/Json/JsonLinter.php
rename to src/Linter/Json/JsonLinter.php
diff --git a/src/GrumPHP/Linter/LintError.php b/src/Linter/LintError.php
similarity index 100%
rename from src/GrumPHP/Linter/LintError.php
rename to src/Linter/LintError.php
diff --git a/src/GrumPHP/Linter/LinterInterface.php b/src/Linter/LinterInterface.php
similarity index 100%
rename from src/GrumPHP/Linter/LinterInterface.php
rename to src/Linter/LinterInterface.php
diff --git a/src/GrumPHP/Linter/Xml/XmlLintError.php b/src/Linter/Xml/XmlLintError.php
similarity index 100%
rename from src/GrumPHP/Linter/Xml/XmlLintError.php
rename to src/Linter/Xml/XmlLintError.php
diff --git a/src/GrumPHP/Linter/Xml/XmlLinter.php b/src/Linter/Xml/XmlLinter.php
similarity index 100%
rename from src/GrumPHP/Linter/Xml/XmlLinter.php
rename to src/Linter/Xml/XmlLinter.php
diff --git a/src/GrumPHP/Linter/Yaml/YamlLintError.php b/src/Linter/Yaml/YamlLintError.php
similarity index 100%
rename from src/GrumPHP/Linter/Yaml/YamlLintError.php
rename to src/Linter/Yaml/YamlLintError.php
diff --git a/src/GrumPHP/Linter/Yaml/YamlLinter.php b/src/Linter/Yaml/YamlLinter.php
similarity index 100%
rename from src/GrumPHP/Linter/Yaml/YamlLinter.php
rename to src/Linter/Yaml/YamlLinter.php
diff --git a/src/GrumPHP/Locator/ChangedFiles.php b/src/Locator/ChangedFiles.php
similarity index 100%
rename from src/GrumPHP/Locator/ChangedFiles.php
rename to src/Locator/ChangedFiles.php
diff --git a/src/GrumPHP/Locator/ConfigurationFile.php b/src/Locator/ConfigurationFile.php
similarity index 100%
rename from src/GrumPHP/Locator/ConfigurationFile.php
rename to src/Locator/ConfigurationFile.php
diff --git a/src/GrumPHP/Locator/ExternalCommand.php b/src/Locator/ExternalCommand.php
similarity index 100%
rename from src/GrumPHP/Locator/ExternalCommand.php
rename to src/Locator/ExternalCommand.php
diff --git a/src/GrumPHP/Locator/RegisteredFiles.php b/src/Locator/RegisteredFiles.php
similarity index 100%
rename from src/GrumPHP/Locator/RegisteredFiles.php
rename to src/Locator/RegisteredFiles.php
diff --git a/src/GrumPHP/Parser/ParseError.php b/src/Parser/ParseError.php
similarity index 100%
rename from src/GrumPHP/Parser/ParseError.php
rename to src/Parser/ParseError.php
diff --git a/src/GrumPHP/Parser/ParserInterface.php b/src/Parser/ParserInterface.php
similarity index 100%
rename from src/GrumPHP/Parser/ParserInterface.php
rename to src/Parser/ParserInterface.php
diff --git a/src/GrumPHP/Parser/Php/Configurator/TraverserConfigurator.php b/src/Parser/Php/Configurator/TraverserConfigurator.php
similarity index 100%
rename from src/GrumPHP/Parser/Php/Configurator/TraverserConfigurator.php
rename to src/Parser/Php/Configurator/TraverserConfigurator.php
diff --git a/src/GrumPHP/Parser/Php/Context/ParserContext.php b/src/Parser/Php/Context/ParserContext.php
similarity index 100%
rename from src/GrumPHP/Parser/Php/Context/ParserContext.php
rename to src/Parser/Php/Context/ParserContext.php
diff --git a/src/GrumPHP/Parser/Php/Factory/ParserFactory.php b/src/Parser/Php/Factory/ParserFactory.php
similarity index 100%
rename from src/GrumPHP/Parser/Php/Factory/ParserFactory.php
rename to src/Parser/Php/Factory/ParserFactory.php
diff --git a/src/GrumPHP/Parser/Php/Factory/TraverserFactory.php b/src/Parser/Php/Factory/TraverserFactory.php
similarity index 100%
rename from src/GrumPHP/Parser/Php/Factory/TraverserFactory.php
rename to src/Parser/Php/Factory/TraverserFactory.php
diff --git a/src/GrumPHP/Parser/Php/PhpParser.php b/src/Parser/Php/PhpParser.php
similarity index 100%
rename from src/GrumPHP/Parser/Php/PhpParser.php
rename to src/Parser/Php/PhpParser.php
diff --git a/src/GrumPHP/Parser/Php/PhpParserError.php b/src/Parser/Php/PhpParserError.php
similarity index 100%
rename from src/GrumPHP/Parser/Php/PhpParserError.php
rename to src/Parser/Php/PhpParserError.php
diff --git a/src/GrumPHP/Parser/Php/Visitor/AbstractVisitor.php b/src/Parser/Php/Visitor/AbstractVisitor.php
similarity index 100%
rename from src/GrumPHP/Parser/Php/Visitor/AbstractVisitor.php
rename to src/Parser/Php/Visitor/AbstractVisitor.php
diff --git a/src/GrumPHP/Parser/Php/Visitor/ConfigurableVisitorInterface.php b/src/Parser/Php/Visitor/ConfigurableVisitorInterface.php
similarity index 100%
rename from src/GrumPHP/Parser/Php/Visitor/ConfigurableVisitorInterface.php
rename to src/Parser/Php/Visitor/ConfigurableVisitorInterface.php
diff --git a/src/GrumPHP/Parser/Php/Visitor/ContextAwareVisitorInterface.php b/src/Parser/Php/Visitor/ContextAwareVisitorInterface.php
similarity index 100%
rename from src/GrumPHP/Parser/Php/Visitor/ContextAwareVisitorInterface.php
rename to src/Parser/Php/Visitor/ContextAwareVisitorInterface.php
diff --git a/src/GrumPHP/Parser/Php/Visitor/DeclareStrictTypesVisitor.php b/src/Parser/Php/Visitor/DeclareStrictTypesVisitor.php
similarity index 100%
rename from src/GrumPHP/Parser/Php/Visitor/DeclareStrictTypesVisitor.php
rename to src/Parser/Php/Visitor/DeclareStrictTypesVisitor.php
diff --git a/src/GrumPHP/Parser/Php/Visitor/ForbiddenClassMethodCallsVisitor.php b/src/Parser/Php/Visitor/ForbiddenClassMethodCallsVisitor.php
similarity index 100%
rename from src/GrumPHP/Parser/Php/Visitor/ForbiddenClassMethodCallsVisitor.php
rename to src/Parser/Php/Visitor/ForbiddenClassMethodCallsVisitor.php
diff --git a/src/GrumPHP/Parser/Php/Visitor/ForbiddenFunctionCallsVisitor.php b/src/Parser/Php/Visitor/ForbiddenFunctionCallsVisitor.php
similarity index 100%
rename from src/GrumPHP/Parser/Php/Visitor/ForbiddenFunctionCallsVisitor.php
rename to src/Parser/Php/Visitor/ForbiddenFunctionCallsVisitor.php
diff --git a/src/GrumPHP/Parser/Php/Visitor/ForbiddenStaticMethodCallsVisitor.php b/src/Parser/Php/Visitor/ForbiddenStaticMethodCallsVisitor.php
similarity index 100%
rename from src/GrumPHP/Parser/Php/Visitor/ForbiddenStaticMethodCallsVisitor.php
rename to src/Parser/Php/Visitor/ForbiddenStaticMethodCallsVisitor.php
diff --git a/src/GrumPHP/Parser/Php/Visitor/NeverUseElseVisitor.php b/src/Parser/Php/Visitor/NeverUseElseVisitor.php
similarity index 100%
rename from src/GrumPHP/Parser/Php/Visitor/NeverUseElseVisitor.php
rename to src/Parser/Php/Visitor/NeverUseElseVisitor.php
diff --git a/src/GrumPHP/Parser/Php/Visitor/NoExitStatementsVisitor.php b/src/Parser/Php/Visitor/NoExitStatementsVisitor.php
similarity index 100%
rename from src/GrumPHP/Parser/Php/Visitor/NoExitStatementsVisitor.php
rename to src/Parser/Php/Visitor/NoExitStatementsVisitor.php
diff --git a/src/GrumPHP/Process/AsyncProcessRunner.php b/src/Process/AsyncProcessRunner.php
similarity index 100%
rename from src/GrumPHP/Process/AsyncProcessRunner.php
rename to src/Process/AsyncProcessRunner.php
diff --git a/src/GrumPHP/Process/ProcessBuilder.php b/src/Process/ProcessBuilder.php
similarity index 100%
rename from src/GrumPHP/Process/ProcessBuilder.php
rename to src/Process/ProcessBuilder.php
diff --git a/src/GrumPHP/Runner/TaskResult.php b/src/Runner/TaskResult.php
similarity index 100%
rename from src/GrumPHP/Runner/TaskResult.php
rename to src/Runner/TaskResult.php
diff --git a/src/GrumPHP/Runner/TaskResultInterface.php b/src/Runner/TaskResultInterface.php
similarity index 100%
rename from src/GrumPHP/Runner/TaskResultInterface.php
rename to src/Runner/TaskResultInterface.php
diff --git a/src/GrumPHP/Runner/TaskRunner.php b/src/Runner/TaskRunner.php
similarity index 100%
rename from src/GrumPHP/Runner/TaskRunner.php
rename to src/Runner/TaskRunner.php
diff --git a/src/GrumPHP/Runner/TaskRunnerContext.php b/src/Runner/TaskRunnerContext.php
similarity index 100%
rename from src/GrumPHP/Runner/TaskRunnerContext.php
rename to src/Runner/TaskRunnerContext.php
diff --git a/src/GrumPHP/Task/AbstractExternalTask.php b/src/Task/AbstractExternalTask.php
similarity index 100%
rename from src/GrumPHP/Task/AbstractExternalTask.php
rename to src/Task/AbstractExternalTask.php
diff --git a/src/GrumPHP/Task/AbstractLinterTask.php b/src/Task/AbstractLinterTask.php
similarity index 100%
rename from src/GrumPHP/Task/AbstractLinterTask.php
rename to src/Task/AbstractLinterTask.php
diff --git a/src/GrumPHP/Task/AbstractParserTask.php b/src/Task/AbstractParserTask.php
similarity index 100%
rename from src/GrumPHP/Task/AbstractParserTask.php
rename to src/Task/AbstractParserTask.php
diff --git a/src/GrumPHP/Task/AbstractPhpCsFixerTask.php b/src/Task/AbstractPhpCsFixerTask.php
similarity index 100%
rename from src/GrumPHP/Task/AbstractPhpCsFixerTask.php
rename to src/Task/AbstractPhpCsFixerTask.php
diff --git a/src/GrumPHP/Task/Ant.php b/src/Task/Ant.php
similarity index 100%
rename from src/GrumPHP/Task/Ant.php
rename to src/Task/Ant.php
diff --git a/src/GrumPHP/Task/Atoum.php b/src/Task/Atoum.php
similarity index 100%
rename from src/GrumPHP/Task/Atoum.php
rename to src/Task/Atoum.php
diff --git a/src/GrumPHP/Task/Behat.php b/src/Task/Behat.php
similarity index 100%
rename from src/GrumPHP/Task/Behat.php
rename to src/Task/Behat.php
diff --git a/src/GrumPHP/Task/Brunch.php b/src/Task/Brunch.php
similarity index 100%
rename from src/GrumPHP/Task/Brunch.php
rename to src/Task/Brunch.php
diff --git a/src/GrumPHP/Task/CloverCoverage.php b/src/Task/CloverCoverage.php
similarity index 100%
rename from src/GrumPHP/Task/CloverCoverage.php
rename to src/Task/CloverCoverage.php
diff --git a/src/GrumPHP/Task/Codeception.php b/src/Task/Codeception.php
similarity index 100%
rename from src/GrumPHP/Task/Codeception.php
rename to src/Task/Codeception.php
diff --git a/src/GrumPHP/Task/Composer.php b/src/Task/Composer.php
similarity index 100%
rename from src/GrumPHP/Task/Composer.php
rename to src/Task/Composer.php
diff --git a/src/GrumPHP/Task/ComposerScript.php b/src/Task/ComposerScript.php
similarity index 100%
rename from src/GrumPHP/Task/ComposerScript.php
rename to src/Task/ComposerScript.php
diff --git a/src/GrumPHP/Task/Context/ContextInterface.php b/src/Task/Context/ContextInterface.php
similarity index 100%
rename from src/GrumPHP/Task/Context/ContextInterface.php
rename to src/Task/Context/ContextInterface.php
diff --git a/src/GrumPHP/Task/Context/GitCommitMsgContext.php b/src/Task/Context/GitCommitMsgContext.php
similarity index 100%
rename from src/GrumPHP/Task/Context/GitCommitMsgContext.php
rename to src/Task/Context/GitCommitMsgContext.php
diff --git a/src/GrumPHP/Task/Context/GitPreCommitContext.php b/src/Task/Context/GitPreCommitContext.php
similarity index 100%
rename from src/GrumPHP/Task/Context/GitPreCommitContext.php
rename to src/Task/Context/GitPreCommitContext.php
diff --git a/src/GrumPHP/Task/Context/RunContext.php b/src/Task/Context/RunContext.php
similarity index 100%
rename from src/GrumPHP/Task/Context/RunContext.php
rename to src/Task/Context/RunContext.php
diff --git a/src/GrumPHP/Task/DoctrineOrm.php b/src/Task/DoctrineOrm.php
similarity index 100%
rename from src/GrumPHP/Task/DoctrineOrm.php
rename to src/Task/DoctrineOrm.php
diff --git a/src/GrumPHP/Task/Gherkin.php b/src/Task/Gherkin.php
similarity index 100%
rename from src/GrumPHP/Task/Gherkin.php
rename to src/Task/Gherkin.php
diff --git a/src/GrumPHP/Task/Git/Blacklist.php b/src/Task/Git/Blacklist.php
similarity index 100%
rename from src/GrumPHP/Task/Git/Blacklist.php
rename to src/Task/Git/Blacklist.php
diff --git a/src/GrumPHP/Task/Git/CommitMessage.php b/src/Task/Git/CommitMessage.php
similarity index 100%
rename from src/GrumPHP/Task/Git/CommitMessage.php
rename to src/Task/Git/CommitMessage.php
diff --git a/src/GrumPHP/Task/Git/Conflict.php b/src/Task/Git/Conflict.php
similarity index 100%
rename from src/GrumPHP/Task/Git/Conflict.php
rename to src/Task/Git/Conflict.php
diff --git a/src/GrumPHP/Task/Grunt.php b/src/Task/Grunt.php
similarity index 100%
rename from src/GrumPHP/Task/Grunt.php
rename to src/Task/Grunt.php
diff --git a/src/GrumPHP/Task/Gulp.php b/src/Task/Gulp.php
similarity index 100%
rename from src/GrumPHP/Task/Gulp.php
rename to src/Task/Gulp.php
diff --git a/src/GrumPHP/Task/JsonLint.php b/src/Task/JsonLint.php
similarity index 100%
rename from src/GrumPHP/Task/JsonLint.php
rename to src/Task/JsonLint.php
diff --git a/src/GrumPHP/Task/Kahlan.php b/src/Task/Kahlan.php
similarity index 100%
rename from src/GrumPHP/Task/Kahlan.php
rename to src/Task/Kahlan.php
diff --git a/src/GrumPHP/Task/Make.php b/src/Task/Make.php
similarity index 100%
rename from src/GrumPHP/Task/Make.php
rename to src/Task/Make.php
diff --git a/src/GrumPHP/Task/NpmScript.php b/src/Task/NpmScript.php
similarity index 100%
rename from src/GrumPHP/Task/NpmScript.php
rename to src/Task/NpmScript.php
diff --git a/src/GrumPHP/Task/Phing.php b/src/Task/Phing.php
similarity index 100%
rename from src/GrumPHP/Task/Phing.php
rename to src/Task/Phing.php
diff --git a/src/GrumPHP/Task/Php7cc.php b/src/Task/Php7cc.php
similarity index 100%
rename from src/GrumPHP/Task/Php7cc.php
rename to src/Task/Php7cc.php
diff --git a/src/GrumPHP/Task/PhpCpd.php b/src/Task/PhpCpd.php
similarity index 100%
rename from src/GrumPHP/Task/PhpCpd.php
rename to src/Task/PhpCpd.php
diff --git a/src/GrumPHP/Task/PhpCsFixer.php b/src/Task/PhpCsFixer.php
similarity index 100%
rename from src/GrumPHP/Task/PhpCsFixer.php
rename to src/Task/PhpCsFixer.php
diff --git a/src/GrumPHP/Task/PhpCsFixerV2.php b/src/Task/PhpCsFixerV2.php
similarity index 100%
rename from src/GrumPHP/Task/PhpCsFixerV2.php
rename to src/Task/PhpCsFixerV2.php
diff --git a/src/GrumPHP/Task/PhpLint.php b/src/Task/PhpLint.php
similarity index 100%
rename from src/GrumPHP/Task/PhpLint.php
rename to src/Task/PhpLint.php
diff --git a/src/GrumPHP/Task/PhpMd.php b/src/Task/PhpMd.php
similarity index 100%
rename from src/GrumPHP/Task/PhpMd.php
rename to src/Task/PhpMd.php
diff --git a/src/GrumPHP/Task/PhpParser.php b/src/Task/PhpParser.php
similarity index 100%
rename from src/GrumPHP/Task/PhpParser.php
rename to src/Task/PhpParser.php
diff --git a/src/GrumPHP/Task/PhpVersion.php b/src/Task/PhpVersion.php
similarity index 100%
rename from src/GrumPHP/Task/PhpVersion.php
rename to src/Task/PhpVersion.php
diff --git a/src/GrumPHP/Task/Phpcs.php b/src/Task/Phpcs.php
similarity index 100%
rename from src/GrumPHP/Task/Phpcs.php
rename to src/Task/Phpcs.php
diff --git a/src/GrumPHP/Task/Phpspec.php b/src/Task/Phpspec.php
similarity index 100%
rename from src/GrumPHP/Task/Phpspec.php
rename to src/Task/Phpspec.php
diff --git a/src/GrumPHP/Task/Phpunit.php b/src/Task/Phpunit.php
similarity index 100%
rename from src/GrumPHP/Task/Phpunit.php
rename to src/Task/Phpunit.php
diff --git a/src/GrumPHP/Task/Robo.php b/src/Task/Robo.php
similarity index 100%
rename from src/GrumPHP/Task/Robo.php
rename to src/Task/Robo.php
diff --git a/src/GrumPHP/Task/SecurityChecker.php b/src/Task/SecurityChecker.php
similarity index 100%
rename from src/GrumPHP/Task/SecurityChecker.php
rename to src/Task/SecurityChecker.php
diff --git a/src/GrumPHP/Task/Shell.php b/src/Task/Shell.php
similarity index 100%
rename from src/GrumPHP/Task/Shell.php
rename to src/Task/Shell.php
diff --git a/src/GrumPHP/Task/TaskInterface.php b/src/Task/TaskInterface.php
similarity index 100%
rename from src/GrumPHP/Task/TaskInterface.php
rename to src/Task/TaskInterface.php
diff --git a/src/GrumPHP/Task/XmlLint.php b/src/Task/XmlLint.php
similarity index 100%
rename from src/GrumPHP/Task/XmlLint.php
rename to src/Task/XmlLint.php
diff --git a/src/GrumPHP/Task/YamlLint.php b/src/Task/YamlLint.php
similarity index 100%
rename from src/GrumPHP/Task/YamlLint.php
rename to src/Task/YamlLint.php
diff --git a/src/GrumPHP/TestSuite/TestSuite.php b/src/TestSuite/TestSuite.php
similarity index 100%
rename from src/GrumPHP/TestSuite/TestSuite.php
rename to src/TestSuite/TestSuite.php
diff --git a/src/GrumPHP/TestSuite/TestSuiteInterface.php b/src/TestSuite/TestSuiteInterface.php
similarity index 100%
rename from src/GrumPHP/TestSuite/TestSuiteInterface.php
rename to src/TestSuite/TestSuiteInterface.php
diff --git a/src/GrumPHP/Util/Composer.php b/src/Util/Composer.php
similarity index 100%
rename from src/GrumPHP/Util/Composer.php
rename to src/Util/Composer.php
diff --git a/src/GrumPHP/Util/Filesystem.php b/src/Util/Filesystem.php
similarity index 100%
rename from src/GrumPHP/Util/Filesystem.php
rename to src/Util/Filesystem.php
diff --git a/src/GrumPHP/Util/PhpVersion.php b/src/Util/PhpVersion.php
similarity index 100%
rename from src/GrumPHP/Util/PhpVersion.php
rename to src/Util/PhpVersion.php
diff --git a/src/GrumPHP/Util/Platform.php b/src/Util/Platform.php
similarity index 100%
rename from src/GrumPHP/Util/Platform.php
rename to src/Util/Platform.php
diff --git a/src/GrumPHP/Util/Regex.php b/src/Util/Regex.php
similarity index 100%
rename from src/GrumPHP/Util/Regex.php
rename to src/Util/Regex.php
diff --git a/test/src/Bootstrap.php b/test/Bootstrap.php
similarity index 65%
rename from test/src/Bootstrap.php
rename to test/Bootstrap.php
index e6aebc664..dec3841b9 100644
--- a/test/src/Bootstrap.php
+++ b/test/Bootstrap.php
@@ -3,12 +3,12 @@
 namespace GrumPHPTest;
 
 error_reporting(E_ALL | E_STRICT);
-define('PROJECT_BASE_PATH', __DIR__ . '/../..');
-define('TEST_BASE_PATH', __DIR__ . '/..');
+define('PROJECT_BASE_PATH', __DIR__ . '/..');
+define('TEST_BASE_PATH', __DIR__);
 
 $autoloadFile = PROJECT_BASE_PATH . '/vendor/autoload.php';
 if (!file_exists($autoloadFile)) {
     throw new \RuntimeException('Install dependencies to run test suite.');
 }
 
-$autoLoader = require $autoloadFile;
+require_once $autoloadFile;
diff --git a/test/src/GrumPHPTest/Linter/Json/JsonLinterTest.php b/test/Linter/Json/JsonLinterTest.php
similarity index 100%
rename from test/src/GrumPHPTest/Linter/Json/JsonLinterTest.php
rename to test/Linter/Json/JsonLinterTest.php
diff --git a/test/src/GrumPHPTest/Linter/Xml/XmlLinterTest.php b/test/Linter/Xml/XmlLinterTest.php
similarity index 100%
rename from test/src/GrumPHPTest/Linter/Xml/XmlLinterTest.php
rename to test/Linter/Xml/XmlLinterTest.php
diff --git a/test/src/GrumPHPTest/Linter/Yaml/YamlLinterTest.php b/test/Linter/Yaml/YamlLinterTest.php
similarity index 100%
rename from test/src/GrumPHPTest/Linter/Yaml/YamlLinterTest.php
rename to test/Linter/Yaml/YamlLinterTest.php
diff --git a/test/src/GrumPHPTest/Parser/Php/Visitor/AbstractVisitorTest.php b/test/Parser/Php/Visitor/AbstractVisitorTest.php
similarity index 100%
rename from test/src/GrumPHPTest/Parser/Php/Visitor/AbstractVisitorTest.php
rename to test/Parser/Php/Visitor/AbstractVisitorTest.php
diff --git a/test/src/GrumPHPTest/Parser/Php/Visitor/DeclareStrictTypesVisitorTest.php b/test/Parser/Php/Visitor/DeclareStrictTypesVisitorTest.php
similarity index 100%
rename from test/src/GrumPHPTest/Parser/Php/Visitor/DeclareStrictTypesVisitorTest.php
rename to test/Parser/Php/Visitor/DeclareStrictTypesVisitorTest.php
diff --git a/test/src/GrumPHPTest/Parser/Php/Visitor/ForbiddenClassMethodCallsVisitorTest.php b/test/Parser/Php/Visitor/ForbiddenClassMethodCallsVisitorTest.php
similarity index 100%
rename from test/src/GrumPHPTest/Parser/Php/Visitor/ForbiddenClassMethodCallsVisitorTest.php
rename to test/Parser/Php/Visitor/ForbiddenClassMethodCallsVisitorTest.php
diff --git a/test/src/GrumPHPTest/Parser/Php/Visitor/ForbiddenFunctionCallsVisitorTest.php b/test/Parser/Php/Visitor/ForbiddenFunctionCallsVisitorTest.php
similarity index 100%
rename from test/src/GrumPHPTest/Parser/Php/Visitor/ForbiddenFunctionCallsVisitorTest.php
rename to test/Parser/Php/Visitor/ForbiddenFunctionCallsVisitorTest.php
diff --git a/test/src/GrumPHPTest/Parser/Php/Visitor/ForbiddenStaticMethodCallsVisitorTest.php b/test/Parser/Php/Visitor/ForbiddenStaticMethodCallsVisitorTest.php
similarity index 100%
rename from test/src/GrumPHPTest/Parser/Php/Visitor/ForbiddenStaticMethodCallsVisitorTest.php
rename to test/Parser/Php/Visitor/ForbiddenStaticMethodCallsVisitorTest.php
diff --git a/test/src/GrumPHPTest/Parser/Php/Visitor/NeverUseElseVisitorTest.php b/test/Parser/Php/Visitor/NeverUseElseVisitorTest.php
similarity index 100%
rename from test/src/GrumPHPTest/Parser/Php/Visitor/NeverUseElseVisitorTest.php
rename to test/Parser/Php/Visitor/NeverUseElseVisitorTest.php
diff --git a/test/src/GrumPHPTest/Parser/Php/Visitor/NoExitStatementsVisitorTest.php b/test/Parser/Php/Visitor/NoExitStatementsVisitorTest.php
similarity index 100%
rename from test/src/GrumPHPTest/Parser/Php/Visitor/NoExitStatementsVisitorTest.php
rename to test/Parser/Php/Visitor/NoExitStatementsVisitorTest.php