diff --git a/.travis.yml b/.travis.yml
index f6114c0..3332e60 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,24 @@
 language: php
 
 php:
-    - 5.3
-    - 5.4
-    - 5.5
+  - 5.4
+  - 5.5
+  - 5.6
+
+env:
+  - COMPOSER_OPTIONS='install --prefer-source'
+
+matrix:
+   include:
+     - php: 5.4
+       env: COMPOSER_OPTIONS='update --prefer-lowest --prefer-source'
+
+before_install:
+  - composer self-update
 
 before_script:
-    - curl -s http://getcomposer.org/installer | php
-    - php composer.phar update
+  - COMPOSER_ROOT_VERSION=dev-master composer $COMPOSER_OPTIONS
 
 script:
-  - bin/phpspec r -v
-  - bin/behat -v
+  - ./bin/phpspec run --format=dot
+  - ./bin/behat
\ No newline at end of file
diff --git a/behat.yml b/behat.yml
index 60e6213..5f552eb 100644
--- a/behat.yml
+++ b/behat.yml
@@ -2,5 +2,4 @@ default:
     suites:
         default:
             contexts:
-                - FeatureContext
                 - PHPSpecContext
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 6fbb622..0b5f132 100644
--- a/composer.json
+++ b/composer.json
@@ -14,14 +14,15 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
-        "phpspec/phpspec": "2.0.*"
+        "php": ">=5.4.0",
+        "phpspec/phpspec": "^2"
     },
     "require-dev": {
-        "behat/behat": "3.0.*@stable",
+        "behat/behat": "3.0.15",
         "symfony/filesystem": "~2.3",
+        "symfony/console": "~2.3.2",
         "guzzle/http": "~3.0",
-        "bossa/phpspec2-expect": "dev-master"
+        "bossa/phpspec2-expect": "^1"
     },
     "autoload": {
         "psr-0": { "Coduo\\PhpSpec": "src/"}
diff --git a/features/bootstrap/FeatureContext.php b/features/bootstrap/FeatureContext.php
deleted file mode 100644
index 29f6e8b..0000000
--- a/features/bootstrap/FeatureContext.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-use Behat\Behat\Context\Context;
-
-/**
- * Features context.
- */
-class FeatureContext implements Context
-{
-    /**
-     * Initializes context.
-     * Every scenario gets it's own context object.
-     *
-     * @param array $parameters context parameters (set them up through behat.yml)
-     */
-    public function __construct(array $parameters = array())
-    {
-
-    }
-}
diff --git a/spec/Coduo/PhpSpec/Annotation/ParserSpec.php b/spec/Coduo/PhpSpec/PrepareExtension/Annotation/ParserSpec.php
similarity index 94%
rename from spec/Coduo/PhpSpec/Annotation/ParserSpec.php
rename to spec/Coduo/PhpSpec/PrepareExtension/Annotation/ParserSpec.php
index b8dfe86..711613d 100644
--- a/spec/Coduo/PhpSpec/Annotation/ParserSpec.php
+++ b/spec/Coduo/PhpSpec/PrepareExtension/Annotation/ParserSpec.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace spec\Coduo\PhpSpec\Annotation;
+namespace spec\Coduo\PhpSpec\PrepareExtension\Annotation;
 
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
diff --git a/spec/Coduo/PhpSpec/Runner/Maintainer/BeforeMaintainerSpec.php b/spec/Coduo/PhpSpec/PrepareExtension/Runner/Maintainer/BeforeMaintainerSpec.php
similarity index 97%
rename from spec/Coduo/PhpSpec/Runner/Maintainer/BeforeMaintainerSpec.php
rename to spec/Coduo/PhpSpec/PrepareExtension/Runner/Maintainer/BeforeMaintainerSpec.php
index 7d6b211..9fd7a4f 100644
--- a/spec/Coduo/PhpSpec/Runner/Maintainer/BeforeMaintainerSpec.php
+++ b/spec/Coduo/PhpSpec/PrepareExtension/Runner/Maintainer/BeforeMaintainerSpec.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace spec\Coduo\PhpSpec\Runner\Maintainer;
+namespace spec\Coduo\PhpSpec\PrepareExtension\Runner\Maintainer;
 
 use PhpSpec\Loader\Node\ExampleNode;
 use PhpSpec\Loader\Node\SpecificationNode;
diff --git a/src/Coduo/PhpSpec/PrepareExtension.php b/src/Coduo/PhpSpec/PrepareExtension.php
index 2f794af..18932a4 100644
--- a/src/Coduo/PhpSpec/PrepareExtension.php
+++ b/src/Coduo/PhpSpec/PrepareExtension.php
@@ -2,7 +2,7 @@
 
 namespace Coduo\PhpSpec;
 
-use Coduo\PhpSpec\Runner\Maintainer\BeforeMaintainer;
+use Coduo\PhpSpec\PrepareExtension\Runner\Maintainer\BeforeMaintainer;
 use PhpSpec\Extension\ExtensionInterface;
 use PhpSpec\ServiceContainer;
 
diff --git a/src/Coduo/PhpSpec/Annotation/Parser.php b/src/Coduo/PhpSpec/PrepareExtension/Annotation/Parser.php
similarity index 90%
rename from src/Coduo/PhpSpec/Annotation/Parser.php
rename to src/Coduo/PhpSpec/PrepareExtension/Annotation/Parser.php
index 35c41ae..b61726b 100644
--- a/src/Coduo/PhpSpec/Annotation/Parser.php
+++ b/src/Coduo/PhpSpec/PrepareExtension/Annotation/Parser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Coduo\PhpSpec\Annotation;
+namespace Coduo\PhpSpec\PrepareExtension\Annotation;
 
 class Parser
 {
diff --git a/src/Coduo/PhpSpec/Runner/Maintainer/BeforeMaintainer.php b/src/Coduo/PhpSpec/PrepareExtension/Runner/Maintainer/BeforeMaintainer.php
similarity index 96%
rename from src/Coduo/PhpSpec/Runner/Maintainer/BeforeMaintainer.php
rename to src/Coduo/PhpSpec/PrepareExtension/Runner/Maintainer/BeforeMaintainer.php
index 7c6df7e..c98bf7d 100644
--- a/src/Coduo/PhpSpec/Runner/Maintainer/BeforeMaintainer.php
+++ b/src/Coduo/PhpSpec/PrepareExtension/Runner/Maintainer/BeforeMaintainer.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Coduo\PhpSpec\Runner\Maintainer;
+namespace Coduo\PhpSpec\PrepareExtension\Runner\Maintainer;
 
-use Coduo\PhpSpec\Annotation\Parser;
+use Coduo\PhpSpec\PrepareExtension\Annotation\Parser;
 use PhpSpec\Loader\Node\ExampleNode;
 use PhpSpec\Runner\Maintainer\MaintainerInterface;
 use PhpSpec\SpecificationInterface;