diff --git a/.gitignore b/.gitignore
index af41f6cf..bb1fd8c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
 /composer-install.bat
 /composer-update.bat
 /composer.lock
-.DS_Store
 /git.bat
 /phpunit-tests-run-with-coverage.bat
 /phpunit-tests-run.bat
@@ -14,3 +13,4 @@
 /vendors-install.bat
 /vendors-update.bat
 /vendors-whatsnew.bat
+.DS_Store
diff --git a/CraueFormFlowBundle.php b/CraueFormFlowBundle.php
index 6ea820b5..f771a296 100644
--- a/CraueFormFlowBundle.php
+++ b/CraueFormFlowBundle.php
@@ -2,7 +2,9 @@
 
 namespace Craue\FormFlowBundle;
 
-use Craue\FormFlowBundle\Util\TempFileUtil;
+use Craue\FormFlowBundle\DependencyInjection\Compiler\LoadTranslationsCompilerPass;
+use Craue\FormFlowBundle\FormFlow\Util\TempFileUtil;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
@@ -25,4 +27,12 @@ public function boot() {
 		});
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	public function build(ContainerBuilder $container) {
+		parent::build($container);
+		$container->addCompilerPass(new LoadTranslationsCompilerPass());
+	}
+
 }
diff --git a/DependencyInjection/Compiler/LoadTranslationsCompilerPass.php b/DependencyInjection/Compiler/LoadTranslationsCompilerPass.php
new file mode 100644
index 00000000..48c53026
--- /dev/null
+++ b/DependencyInjection/Compiler/LoadTranslationsCompilerPass.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Craue\FormFlowBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\Config\Resource\DirectoryResource;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\Finder\Finder;
+
+/**
+ * Explicitly registers translation files in their uncommon location.
+ *
+ * @author Christian Raue <christian.raue@gmail.com>
+ * @copyright 2011-2015 Christian Raue
+ * @license http://opensource.org/licenses/mit-license.php MIT License
+ */
+class LoadTranslationsCompilerPass implements CompilerPassInterface {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function process(ContainerBuilder $container) {
+		$dir = __DIR__ . '/../../FormFlow/Resources/translations';
+
+		// taken roughly from https://github.com/symfony/symfony/blob/ce15db564736d7a0cf02a0db688a0ee101959cb5/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php#L650
+		$container->addResource(new DirectoryResource($dir));
+
+		$finder = Finder::create()
+			->files()
+			->in($dir)
+			->filter(function (\SplFileInfo $file) {
+				$basename = $file->getBasename();
+				return substr_count($basename, '.') === 2 && preg_match('/\.\w+$/', $basename);
+			})
+		;
+
+		$translator = $container->findDefinition('translator');
+
+		foreach ($finder as $file) {
+			list($domain, $locale, $format) = explode('.', $file->getBasename(), 3);
+			$translator->addMethodCall('addResource', array($format, (string) $file, $locale, $domain));
+		}
+	}
+
+}
diff --git a/FormFlow/.gitignore b/FormFlow/.gitignore
new file mode 100644
index 00000000..3f9236b3
--- /dev/null
+++ b/FormFlow/.gitignore
@@ -0,0 +1,6 @@
+/.buildpath
+/.project
+/.settings
+/git-subtree-split.bat
+/git.bat
+.DS_Store
diff --git a/Event/FormFlowEvent.php b/FormFlow/Event/FormFlowEvent.php
similarity index 84%
rename from Event/FormFlowEvent.php
rename to FormFlow/Event/FormFlowEvent.php
index 669a6ba0..bbc0ab5c 100644
--- a/Event/FormFlowEvent.php
+++ b/FormFlow/Event/FormFlowEvent.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Event;
+namespace Craue\FormFlowBundle\FormFlow\Event;
 
-use Craue\FormFlowBundle\Form\FormFlowInterface;
+use Craue\FormFlowBundle\FormFlow\FormFlowInterface;
 use Symfony\Component\EventDispatcher\Event;
 
 /**
diff --git a/Event/GetStepsEvent.php b/FormFlow/Event/GetStepsEvent.php
similarity index 84%
rename from Event/GetStepsEvent.php
rename to FormFlow/Event/GetStepsEvent.php
index 907d72a5..d52d5975 100644
--- a/Event/GetStepsEvent.php
+++ b/FormFlow/Event/GetStepsEvent.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Event;
+namespace Craue\FormFlowBundle\FormFlow\Event;
 
-use Craue\FormFlowBundle\Form\StepInterface;
+use Craue\FormFlowBundle\FormFlow\StepInterface;
 
 /**
  * Is called once to define steps for the flow.
diff --git a/Event/PostBindFlowEvent.php b/FormFlow/Event/PostBindFlowEvent.php
similarity index 86%
rename from Event/PostBindFlowEvent.php
rename to FormFlow/Event/PostBindFlowEvent.php
index 39d445a6..2ef1d85b 100644
--- a/Event/PostBindFlowEvent.php
+++ b/FormFlow/Event/PostBindFlowEvent.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Event;
+namespace Craue\FormFlowBundle\FormFlow\Event;
 
-use Craue\FormFlowBundle\Form\FormFlowInterface;
+use Craue\FormFlowBundle\FormFlow\FormFlowInterface;
 
 /**
  * Is called once after binding all step's saved form data and determining the current step.
diff --git a/Event/PostBindRequestEvent.php b/FormFlow/Event/PostBindRequestEvent.php
similarity index 90%
rename from Event/PostBindRequestEvent.php
rename to FormFlow/Event/PostBindRequestEvent.php
index 452ed5a8..4480d0a8 100644
--- a/Event/PostBindRequestEvent.php
+++ b/FormFlow/Event/PostBindRequestEvent.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Event;
+namespace Craue\FormFlowBundle\FormFlow\Event;
 
-use Craue\FormFlowBundle\Form\FormFlowInterface;
+use Craue\FormFlowBundle\FormFlow\FormFlowInterface;
 
 /**
  * Is called once for the current step after binding the request.
diff --git a/Event/PostBindSavedDataEvent.php b/FormFlow/Event/PostBindSavedDataEvent.php
similarity index 90%
rename from Event/PostBindSavedDataEvent.php
rename to FormFlow/Event/PostBindSavedDataEvent.php
index 44ce3b5f..9ba7896c 100644
--- a/Event/PostBindSavedDataEvent.php
+++ b/FormFlow/Event/PostBindSavedDataEvent.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Event;
+namespace Craue\FormFlowBundle\FormFlow\Event;
 
-use Craue\FormFlowBundle\Form\FormFlowInterface;
+use Craue\FormFlowBundle\FormFlow\FormFlowInterface;
 
 /**
  * Is called for each step after binding its saved form data.
diff --git a/Event/PostValidateEvent.php b/FormFlow/Event/PostValidateEvent.php
similarity index 87%
rename from Event/PostValidateEvent.php
rename to FormFlow/Event/PostValidateEvent.php
index d91faceb..9f490d9c 100644
--- a/Event/PostValidateEvent.php
+++ b/FormFlow/Event/PostValidateEvent.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Event;
+namespace Craue\FormFlowBundle\FormFlow\Event;
 
-use Craue\FormFlowBundle\Form\FormFlowInterface;
+use Craue\FormFlowBundle\FormFlow\FormFlowInterface;
 
 /**
  * Is called once for the current step after validating the form data.
diff --git a/Event/PreBindEvent.php b/FormFlow/Event/PreBindEvent.php
similarity index 91%
rename from Event/PreBindEvent.php
rename to FormFlow/Event/PreBindEvent.php
index 1aff8905..d28c9251 100644
--- a/Event/PreBindEvent.php
+++ b/FormFlow/Event/PreBindEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Craue\FormFlowBundle\Event;
+namespace Craue\FormFlowBundle\FormFlow\Event;
 
 /**
  * Is called once prior to binding any (neither saved nor request) data.
diff --git a/Event/PreviousStepInvalidEvent.php b/FormFlow/Event/PreviousStepInvalidEvent.php
similarity index 91%
rename from Event/PreviousStepInvalidEvent.php
rename to FormFlow/Event/PreviousStepInvalidEvent.php
index afab59ce..c53296a4 100644
--- a/Event/PreviousStepInvalidEvent.php
+++ b/FormFlow/Event/PreviousStepInvalidEvent.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Event;
+namespace Craue\FormFlowBundle\FormFlow\Event;
 
-use Craue\FormFlowBundle\Form\FormFlowInterface;
+use Craue\FormFlowBundle\FormFlow\FormFlowInterface;
 use Symfony\Component\Form\FormInterface;
 
 /**
diff --git a/EventListener/PreviousStepInvalidEventListener.php b/FormFlow/EventListener/PreviousStepInvalidEventListener.php
similarity index 87%
rename from EventListener/PreviousStepInvalidEventListener.php
rename to FormFlow/EventListener/PreviousStepInvalidEventListener.php
index 9bf907f3..626ea07d 100644
--- a/EventListener/PreviousStepInvalidEventListener.php
+++ b/FormFlow/EventListener/PreviousStepInvalidEventListener.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\EventListener;
+namespace Craue\FormFlowBundle\FormFlow\EventListener;
 
-use Craue\FormFlowBundle\Event\PreviousStepInvalidEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PreviousStepInvalidEvent;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Translation\TranslatorInterface;
 
diff --git a/Exception/InvalidTypeException.php b/FormFlow/Exception/InvalidTypeException.php
similarity index 91%
rename from Exception/InvalidTypeException.php
rename to FormFlow/Exception/InvalidTypeException.php
index 93fe753f..34c5ad85 100644
--- a/Exception/InvalidTypeException.php
+++ b/FormFlow/Exception/InvalidTypeException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Craue\FormFlowBundle\Exception;
+namespace Craue\FormFlowBundle\FormFlow\Exception;
 
 /**
  * @author Christian Raue <christian.raue@gmail.com>
diff --git a/Form/Extension/FormFlowFormExtension.php b/FormFlow/Extension/FormFlowFormExtension.php
similarity index 97%
rename from Form/Extension/FormFlowFormExtension.php
rename to FormFlow/Extension/FormFlowFormExtension.php
index e7f99188..28e5c6fe 100644
--- a/Form/Extension/FormFlowFormExtension.php
+++ b/FormFlow/Extension/FormFlowFormExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Craue\FormFlowBundle\Form\Extension;
+namespace Craue\FormFlowBundle\FormFlow\Extension;
 
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\FormBuilderInterface;
diff --git a/Form/Extension/FormFlowHiddenFieldExtension.php b/FormFlow/Extension/FormFlowHiddenFieldExtension.php
similarity index 97%
rename from Form/Extension/FormFlowHiddenFieldExtension.php
rename to FormFlow/Extension/FormFlowHiddenFieldExtension.php
index e122de16..59a70e82 100644
--- a/Form/Extension/FormFlowHiddenFieldExtension.php
+++ b/FormFlow/Extension/FormFlowHiddenFieldExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Craue\FormFlowBundle\Form\Extension;
+namespace Craue\FormFlowBundle\FormFlow\Extension;
 
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\FormInterface;
diff --git a/Form/FormFlow.php b/FormFlow/FormFlow.php
similarity index 97%
rename from Form/FormFlow.php
rename to FormFlow/FormFlow.php
index 30a1e6bd..a8638664 100644
--- a/Form/FormFlow.php
+++ b/FormFlow/FormFlow.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Craue\FormFlowBundle\Form;
-
-use Craue\FormFlowBundle\Event\GetStepsEvent;
-use Craue\FormFlowBundle\Event\PostBindFlowEvent;
-use Craue\FormFlowBundle\Event\PostBindRequestEvent;
-use Craue\FormFlowBundle\Event\PostBindSavedDataEvent;
-use Craue\FormFlowBundle\Event\PostValidateEvent;
-use Craue\FormFlowBundle\Event\PreBindEvent;
-use Craue\FormFlowBundle\Event\PreviousStepInvalidEvent;
-use Craue\FormFlowBundle\Exception\InvalidTypeException;
-use Craue\FormFlowBundle\Storage\DataManagerInterface;
-use Craue\FormFlowBundle\Util\StringUtil;
+namespace Craue\FormFlowBundle\FormFlow;
+
+use Craue\FormFlowBundle\FormFlow\Event\GetStepsEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PostBindFlowEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PostBindRequestEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PostBindSavedDataEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PostValidateEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PreBindEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PreviousStepInvalidEvent;
+use Craue\FormFlowBundle\FormFlow\Exception\InvalidTypeException;
+use Craue\FormFlowBundle\FormFlow\Storage\DataManagerInterface;
+use Craue\FormFlowBundle\FormFlow\Util\StringUtil;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormInterface;
diff --git a/Form/FormFlowEvents.php b/FormFlow/FormFlowEvents.php
similarity index 93%
rename from Form/FormFlowEvents.php
rename to FormFlow/FormFlowEvents.php
index d875d071..4b2049e9 100644
--- a/Form/FormFlowEvents.php
+++ b/FormFlow/FormFlowEvents.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Craue\FormFlowBundle\Form;
+namespace Craue\FormFlowBundle\FormFlow;
 
 /**
  * @author Marcus Stöhr <dafish@soundtrack-board.de>
diff --git a/Form/FormFlowInterface.php b/FormFlow/FormFlowInterface.php
similarity index 95%
rename from Form/FormFlowInterface.php
rename to FormFlow/FormFlowInterface.php
index 17b8c61e..5404a3c9 100644
--- a/Form/FormFlowInterface.php
+++ b/FormFlow/FormFlowInterface.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Craue\FormFlowBundle\Form;
+namespace Craue\FormFlowBundle\FormFlow;
 
-use Craue\FormFlowBundle\Exception\InvalidTypeException;
-use Craue\FormFlowBundle\Storage\DataManagerInterface;
+use Craue\FormFlowBundle\FormFlow\Exception\InvalidTypeException;
+use Craue\FormFlowBundle\FormFlow\Storage\DataManagerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormInterface;
diff --git a/FormFlow/LICENSE b/FormFlow/LICENSE
new file mode 100644
index 00000000..bf54824b
--- /dev/null
+++ b/FormFlow/LICENSE
@@ -0,0 +1,2 @@
+Copyright (c) 2011-2015 Christian Raue <christian.raue@gmail.com>
+Licensed under the MIT License: http://opensource.org/licenses/mit-license.php
diff --git a/FormFlow/README.md b/FormFlow/README.md
new file mode 100644
index 00000000..1a036e09
--- /dev/null
+++ b/FormFlow/README.md
@@ -0,0 +1 @@
+For further information refer to https://github.com/craue/CraueFormFlowBundle.
diff --git a/Resources/translations/CraueFormFlowBundle.cs.yml b/FormFlow/Resources/translations/CraueFormFlowBundle.cs.yml
similarity index 100%
rename from Resources/translations/CraueFormFlowBundle.cs.yml
rename to FormFlow/Resources/translations/CraueFormFlowBundle.cs.yml
diff --git a/Resources/translations/CraueFormFlowBundle.de.yml b/FormFlow/Resources/translations/CraueFormFlowBundle.de.yml
similarity index 100%
rename from Resources/translations/CraueFormFlowBundle.de.yml
rename to FormFlow/Resources/translations/CraueFormFlowBundle.de.yml
diff --git a/Resources/translations/CraueFormFlowBundle.en.yml b/FormFlow/Resources/translations/CraueFormFlowBundle.en.yml
similarity index 100%
rename from Resources/translations/CraueFormFlowBundle.en.yml
rename to FormFlow/Resources/translations/CraueFormFlowBundle.en.yml
diff --git a/Resources/translations/CraueFormFlowBundle.es.yml b/FormFlow/Resources/translations/CraueFormFlowBundle.es.yml
similarity index 100%
rename from Resources/translations/CraueFormFlowBundle.es.yml
rename to FormFlow/Resources/translations/CraueFormFlowBundle.es.yml
diff --git a/Resources/translations/CraueFormFlowBundle.fa.yml b/FormFlow/Resources/translations/CraueFormFlowBundle.fa.yml
similarity index 100%
rename from Resources/translations/CraueFormFlowBundle.fa.yml
rename to FormFlow/Resources/translations/CraueFormFlowBundle.fa.yml
diff --git a/Resources/translations/CraueFormFlowBundle.fr.yml b/FormFlow/Resources/translations/CraueFormFlowBundle.fr.yml
similarity index 100%
rename from Resources/translations/CraueFormFlowBundle.fr.yml
rename to FormFlow/Resources/translations/CraueFormFlowBundle.fr.yml
diff --git a/Resources/translations/CraueFormFlowBundle.nl.yml b/FormFlow/Resources/translations/CraueFormFlowBundle.nl.yml
similarity index 100%
rename from Resources/translations/CraueFormFlowBundle.nl.yml
rename to FormFlow/Resources/translations/CraueFormFlowBundle.nl.yml
diff --git a/Resources/translations/CraueFormFlowBundle.pl.yml b/FormFlow/Resources/translations/CraueFormFlowBundle.pl.yml
similarity index 100%
rename from Resources/translations/CraueFormFlowBundle.pl.yml
rename to FormFlow/Resources/translations/CraueFormFlowBundle.pl.yml
diff --git a/Resources/translations/CraueFormFlowBundle.pt_BR.yml b/FormFlow/Resources/translations/CraueFormFlowBundle.pt_BR.yml
similarity index 100%
rename from Resources/translations/CraueFormFlowBundle.pt_BR.yml
rename to FormFlow/Resources/translations/CraueFormFlowBundle.pt_BR.yml
diff --git a/Resources/translations/CraueFormFlowBundle.ru.yml b/FormFlow/Resources/translations/CraueFormFlowBundle.ru.yml
similarity index 100%
rename from Resources/translations/CraueFormFlowBundle.ru.yml
rename to FormFlow/Resources/translations/CraueFormFlowBundle.ru.yml
diff --git a/Resources/translations/CraueFormFlowBundle.uk.yml b/FormFlow/Resources/translations/CraueFormFlowBundle.uk.yml
similarity index 100%
rename from Resources/translations/CraueFormFlowBundle.uk.yml
rename to FormFlow/Resources/translations/CraueFormFlowBundle.uk.yml
diff --git a/Resources/translations/CraueFormFlowBundle.zh.yml b/FormFlow/Resources/translations/CraueFormFlowBundle.zh.yml
similarity index 100%
rename from Resources/translations/CraueFormFlowBundle.zh.yml
rename to FormFlow/Resources/translations/CraueFormFlowBundle.zh.yml
diff --git a/Resources/translations/validators.cs.yml b/FormFlow/Resources/translations/validators.cs.yml
similarity index 100%
rename from Resources/translations/validators.cs.yml
rename to FormFlow/Resources/translations/validators.cs.yml
diff --git a/Resources/translations/validators.de.yml b/FormFlow/Resources/translations/validators.de.yml
similarity index 100%
rename from Resources/translations/validators.de.yml
rename to FormFlow/Resources/translations/validators.de.yml
diff --git a/Resources/translations/validators.en.yml b/FormFlow/Resources/translations/validators.en.yml
similarity index 100%
rename from Resources/translations/validators.en.yml
rename to FormFlow/Resources/translations/validators.en.yml
diff --git a/Resources/translations/validators.es.yml b/FormFlow/Resources/translations/validators.es.yml
similarity index 100%
rename from Resources/translations/validators.es.yml
rename to FormFlow/Resources/translations/validators.es.yml
diff --git a/Resources/translations/validators.fa.yml b/FormFlow/Resources/translations/validators.fa.yml
similarity index 100%
rename from Resources/translations/validators.fa.yml
rename to FormFlow/Resources/translations/validators.fa.yml
diff --git a/Resources/translations/validators.fr.yml b/FormFlow/Resources/translations/validators.fr.yml
similarity index 100%
rename from Resources/translations/validators.fr.yml
rename to FormFlow/Resources/translations/validators.fr.yml
diff --git a/Resources/translations/validators.nl.yml b/FormFlow/Resources/translations/validators.nl.yml
similarity index 100%
rename from Resources/translations/validators.nl.yml
rename to FormFlow/Resources/translations/validators.nl.yml
diff --git a/Resources/translations/validators.pl.yml b/FormFlow/Resources/translations/validators.pl.yml
similarity index 100%
rename from Resources/translations/validators.pl.yml
rename to FormFlow/Resources/translations/validators.pl.yml
diff --git a/Resources/translations/validators.pt_BR.yml b/FormFlow/Resources/translations/validators.pt_BR.yml
similarity index 100%
rename from Resources/translations/validators.pt_BR.yml
rename to FormFlow/Resources/translations/validators.pt_BR.yml
diff --git a/Resources/translations/validators.ru.yml b/FormFlow/Resources/translations/validators.ru.yml
similarity index 100%
rename from Resources/translations/validators.ru.yml
rename to FormFlow/Resources/translations/validators.ru.yml
diff --git a/Resources/translations/validators.uk.yml b/FormFlow/Resources/translations/validators.uk.yml
similarity index 100%
rename from Resources/translations/validators.uk.yml
rename to FormFlow/Resources/translations/validators.uk.yml
diff --git a/Resources/translations/validators.zh.yml b/FormFlow/Resources/translations/validators.zh.yml
similarity index 100%
rename from Resources/translations/validators.zh.yml
rename to FormFlow/Resources/translations/validators.zh.yml
diff --git a/Form/Step.php b/FormFlow/Step.php
similarity index 97%
rename from Form/Step.php
rename to FormFlow/Step.php
index 07541fa1..d24d6292 100644
--- a/Form/Step.php
+++ b/FormFlow/Step.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Form;
+namespace Craue\FormFlowBundle\FormFlow;
 
-use Craue\FormFlowBundle\Exception\InvalidTypeException;
+use Craue\FormFlowBundle\FormFlow\Exception\InvalidTypeException;
 use Symfony\Component\Form\FormTypeInterface;
 
 /**
diff --git a/Form/StepInterface.php b/FormFlow/StepInterface.php
similarity index 94%
rename from Form/StepInterface.php
rename to FormFlow/StepInterface.php
index 110b11a1..f43adde8 100644
--- a/Form/StepInterface.php
+++ b/FormFlow/StepInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Craue\FormFlowBundle\Form;
+namespace Craue\FormFlowBundle\FormFlow;
 
 use Symfony\Component\Form\FormTypeInterface;
 
diff --git a/Storage/DataManager.php b/FormFlow/Storage/DataManager.php
similarity index 97%
rename from Storage/DataManager.php
rename to FormFlow/Storage/DataManager.php
index 4872d6f0..ca965dd5 100644
--- a/Storage/DataManager.php
+++ b/FormFlow/Storage/DataManager.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Storage;
+namespace Craue\FormFlowBundle\FormFlow\Storage;
 
-use Craue\FormFlowBundle\Form\FormFlowInterface;
+use Craue\FormFlowBundle\FormFlow\FormFlowInterface;
 
 /**
  * Manages data of flows and their steps.
diff --git a/Storage/DataManagerInterface.php b/FormFlow/Storage/DataManagerInterface.php
similarity index 88%
rename from Storage/DataManagerInterface.php
rename to FormFlow/Storage/DataManagerInterface.php
index 3371252c..937f5338 100644
--- a/Storage/DataManagerInterface.php
+++ b/FormFlow/Storage/DataManagerInterface.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Storage;
+namespace Craue\FormFlowBundle\FormFlow\Storage;
 
-use Craue\FormFlowBundle\Form\FormFlowInterface;
+use Craue\FormFlowBundle\FormFlow\FormFlowInterface;
 
 /**
  * @author Christian Raue <christian.raue@gmail.com>
diff --git a/Storage/ExtendedDataManagerInterface.php b/FormFlow/Storage/ExtendedDataManagerInterface.php
similarity index 94%
rename from Storage/ExtendedDataManagerInterface.php
rename to FormFlow/Storage/ExtendedDataManagerInterface.php
index bf898e61..e271f02b 100644
--- a/Storage/ExtendedDataManagerInterface.php
+++ b/FormFlow/Storage/ExtendedDataManagerInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Craue\FormFlowBundle\Storage;
+namespace Craue\FormFlowBundle\FormFlow\Storage;
 
 /**
  * Extends the base {@link DataManagerInterface} by methods which may be used for custom flow management.
diff --git a/Storage/SerializableFile.php b/FormFlow/Storage/SerializableFile.php
similarity index 92%
rename from Storage/SerializableFile.php
rename to FormFlow/Storage/SerializableFile.php
index 550aae6b..bcd6a7fd 100644
--- a/Storage/SerializableFile.php
+++ b/FormFlow/Storage/SerializableFile.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Craue\FormFlowBundle\Storage;
+namespace Craue\FormFlowBundle\FormFlow\Storage;
 
-use Craue\FormFlowBundle\Exception\InvalidTypeException;
-use Craue\FormFlowBundle\Util\TempFileUtil;
+use Craue\FormFlowBundle\FormFlow\Exception\InvalidTypeException;
+use Craue\FormFlowBundle\FormFlow\Util\TempFileUtil;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 /**
diff --git a/Storage/SessionStorage.php b/FormFlow/Storage/SessionStorage.php
similarity index 94%
rename from Storage/SessionStorage.php
rename to FormFlow/Storage/SessionStorage.php
index 6386b781..b1b07f50 100644
--- a/Storage/SessionStorage.php
+++ b/FormFlow/Storage/SessionStorage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Craue\FormFlowBundle\Storage;
+namespace Craue\FormFlowBundle\FormFlow\Storage;
 
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
diff --git a/Storage/StorageInterface.php b/FormFlow/Storage/StorageInterface.php
similarity index 94%
rename from Storage/StorageInterface.php
rename to FormFlow/Storage/StorageInterface.php
index b756a3e8..3d4dfced 100644
--- a/Storage/StorageInterface.php
+++ b/FormFlow/Storage/StorageInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Craue\FormFlowBundle\Storage;
+namespace Craue\FormFlowBundle\FormFlow\Storage;
 
 /**
  * @author Toni Uebernickel <tuebernickel@gmail.com>
diff --git a/Util/StringUtil.php b/FormFlow/Util/StringUtil.php
similarity index 92%
rename from Util/StringUtil.php
rename to FormFlow/Util/StringUtil.php
index 576f5e31..f9517683 100644
--- a/Util/StringUtil.php
+++ b/FormFlow/Util/StringUtil.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Util;
+namespace Craue\FormFlowBundle\FormFlow\Util;
 
-use Craue\FormFlowBundle\Exception\InvalidTypeException;
+use Craue\FormFlowBundle\FormFlow\Exception\InvalidTypeException;
 
 /**
  * @author Christian Raue <christian.raue@gmail.com>
diff --git a/Util/TempFileUtil.php b/FormFlow/Util/TempFileUtil.php
similarity index 94%
rename from Util/TempFileUtil.php
rename to FormFlow/Util/TempFileUtil.php
index 0940e9db..4b5903cb 100644
--- a/Util/TempFileUtil.php
+++ b/FormFlow/Util/TempFileUtil.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Craue\FormFlowBundle\Util;
+namespace Craue\FormFlowBundle\FormFlow\Util;
 
 /**
  * Keeps track of temporary files to be able to remove them when no longer needed.
diff --git a/FormFlow/composer.json b/FormFlow/composer.json
new file mode 100644
index 00000000..026e3e5a
--- /dev/null
+++ b/FormFlow/composer.json
@@ -0,0 +1,37 @@
+{
+	"name": "craue/formflow",
+	"type": "library",
+	"description": "Subtree split of the core library of CraueFormFlowBundle for standalone usage.",
+	"keywords": ["form", "wizard", "step"],
+	"homepage": "https://github.com/craue/CraueFormFlow",
+	"license": "MIT",
+	"authors": [
+		{
+			"name": "Christian Raue",
+			"email": "christian.raue@gmail.com"
+		},
+		{
+			"name": "Symfony Community",
+			"homepage": "https://github.com/craue/CraueFormFlowBundle/contributors"
+		}
+	],
+	"require": {
+		"php": ">=5.3.2",
+		"symfony/form": "~2.3",
+		"symfony/http-kernel": "~2.3",
+		"symfony/translation": "~2.3",
+		"symfony/yaml": "~2.3"
+	},
+	"minimum-stability": "stable",
+	"prefer-stable": true,
+	"autoload": {
+		"psr-4": {
+			"Craue\\FormFlowBundle\\FormFlow\\": ""
+		}
+	},
+	"extra": {
+		"branch-alias": {
+			"dev-master": "3.0.x-dev"
+		}
+	}
+}
diff --git a/README.md b/README.md
index 44a4269b..c7aa644b 100644
--- a/README.md
+++ b/README.md
@@ -54,8 +54,8 @@ This approach makes it easy to turn an existing (usual) form into a form flow.
 
 ```php
 // src/MyCompany/MyBundle/Form/CreateVehicleFlow.php
-use Craue\FormFlowBundle\Form\FormFlow;
-use Craue\FormFlowBundle\Form\FormFlowInterface;
+use Craue\FormFlowBundle\FormFlow\FormFlow;
+use Craue\FormFlowBundle\FormFlow\FormFlowInterface;
 use Symfony\Component\Form\FormTypeInterface;
 
 class CreateVehicleFlow extends FormFlow {
@@ -176,8 +176,8 @@ This approach makes it easy to reuse the form types to compose other forms.
 
 ```php
 // src/MyCompany/MyBundle/Form/CreateVehicleFlow.php
-use Craue\FormFlowBundle\Form\FormFlow;
-use Craue\FormFlowBundle\Form\FormFlowInterface;
+use Craue\FormFlowBundle\FormFlow\FormFlow;
+use Craue\FormFlowBundle\FormFlow\FormFlowInterface;
 
 class CreateVehicleFlow extends FormFlow {
 
@@ -625,13 +625,13 @@ There are some events which you can subscribe to. Using all of them right inside
 
 ```php
 // in src/MyCompany/MyBundle/Form/CreateVehicleFlow.php
-use Craue\FormFlowBundle\Event\GetStepsEvent;
-use Craue\FormFlowBundle\Event\PostBindFlowEvent;
-use Craue\FormFlowBundle\Event\PostBindRequestEvent;
-use Craue\FormFlowBundle\Event\PostBindSavedDataEvent;
-use Craue\FormFlowBundle\Event\PostValidateEvent;
-use Craue\FormFlowBundle\Event\PreBindEvent;
-use Craue\FormFlowBundle\Form\FormFlowEvents;
+use Craue\FormFlowBundle\FormFlow\Event\GetStepsEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PostBindFlowEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PostBindRequestEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PostBindSavedDataEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PostValidateEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PreBindEvent;
+use Craue\FormFlowBundle\FormFlow\FormFlowEvents;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
diff --git a/Resources/config/form_flow.xml b/Resources/config/form_flow.xml
index 3943b045..895b2f6a 100644
--- a/Resources/config/form_flow.xml
+++ b/Resources/config/form_flow.xml
@@ -10,10 +10,10 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 	<parameters>
-		<parameter key="craue.form.flow.class">Craue\FormFlowBundle\Form\FormFlow</parameter>
-		<parameter key="craue.form.flow.storage.class">Craue\FormFlowBundle\Storage\SessionStorage</parameter>
-		<parameter key="craue.form.flow.event_listener.previous_step_invalid.class">Craue\FormFlowBundle\EventListener\PreviousStepInvalidEventListener</parameter>
-		<parameter key="craue.form.flow.event_listener.previous_step_invalid.event" type="constant">Craue\FormFlowBundle\Form\FormFlowEvents::PREVIOUS_STEP_INVALID</parameter>
+		<parameter key="craue.form.flow.class">Craue\FormFlowBundle\FormFlow\FormFlow</parameter>
+		<parameter key="craue.form.flow.storage.class">Craue\FormFlowBundle\FormFlow\Storage\SessionStorage</parameter>
+		<parameter key="craue.form.flow.event_listener.previous_step_invalid.class">Craue\FormFlowBundle\FormFlow\EventListener\PreviousStepInvalidEventListener</parameter>
+		<parameter key="craue.form.flow.event_listener.previous_step_invalid.event" type="constant">Craue\FormFlowBundle\FormFlow\FormFlowEvents::PREVIOUS_STEP_INVALID</parameter>
 	</parameters>
 
 	<services>
@@ -23,7 +23,7 @@
 
 		<service id="craue.form.flow.storage" alias="craue.form.flow.storage_default" scope="request" />
 
-		<service id="craue.form.flow.data_manager_default" class="Craue\FormFlowBundle\Storage\DataManager" scope="request" public="false">
+		<service id="craue.form.flow.data_manager_default" class="Craue\FormFlowBundle\FormFlow\Storage\DataManager" scope="request" public="false">
 			<argument type="service" id="craue.form.flow.storage" />
 		</service>
 
@@ -44,11 +44,11 @@
 			</call>
 		</service>
 
-		<service id="craue.form.flow.form_extension" class="Craue\FormFlowBundle\Form\Extension\FormFlowFormExtension">
+		<service id="craue.form.flow.form_extension" class="Craue\FormFlowBundle\FormFlow\Extension\FormFlowFormExtension">
 			<tag name="form.type_extension" alias="form" />
 		</service>
 
-		<service id="craue.form.flow.hidden_field_extension" class="Craue\FormFlowBundle\Form\Extension\FormFlowHiddenFieldExtension">
+		<service id="craue.form.flow.hidden_field_extension" class="Craue\FormFlowBundle\FormFlow\Extension\FormFlowHiddenFieldExtension">
 			<tag name="form.type_extension" alias="hidden" />
 		</service>
 
diff --git a/Tests/Event/PostBindFlowEventTest.php b/Tests/FormFlow/Event/PostBindFlowEventTest.php
similarity index 81%
rename from Tests/Event/PostBindFlowEventTest.php
rename to Tests/FormFlow/Event/PostBindFlowEventTest.php
index 2ee078ae..89af42c4 100644
--- a/Tests/Event/PostBindFlowEventTest.php
+++ b/Tests/FormFlow/Event/PostBindFlowEventTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Tests\Event;
+namespace Craue\FormFlowBundle\Tests\FormFlow\Event;
 
-use Craue\FormFlowBundle\Event\PostBindFlowEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PostBindFlowEvent;
 use Craue\FormFlowBundle\Tests\UnitTestCase;
 
 /**
diff --git a/Tests/Event/PostBindRequestEventTest.php b/Tests/FormFlow/Event/PostBindRequestEventTest.php
similarity index 84%
rename from Tests/Event/PostBindRequestEventTest.php
rename to Tests/FormFlow/Event/PostBindRequestEventTest.php
index 24214cc1..f47f3098 100644
--- a/Tests/Event/PostBindRequestEventTest.php
+++ b/Tests/FormFlow/Event/PostBindRequestEventTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Tests\Event;
+namespace Craue\FormFlowBundle\Tests\FormFlow\Event;
 
-use Craue\FormFlowBundle\Event\PostBindRequestEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PostBindRequestEvent;
 use Craue\FormFlowBundle\Tests\UnitTestCase;
 
 /**
diff --git a/Tests/Event/PostBindSavedDataEventTest.php b/Tests/FormFlow/Event/PostBindSavedDataEventTest.php
similarity index 83%
rename from Tests/Event/PostBindSavedDataEventTest.php
rename to Tests/FormFlow/Event/PostBindSavedDataEventTest.php
index 50d20b57..459693cc 100644
--- a/Tests/Event/PostBindSavedDataEventTest.php
+++ b/Tests/FormFlow/Event/PostBindSavedDataEventTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Tests\Event;
+namespace Craue\FormFlowBundle\Tests\FormFlow\Event;
 
-use Craue\FormFlowBundle\Event\PostBindSavedDataEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PostBindSavedDataEvent;
 use Craue\FormFlowBundle\Tests\UnitTestCase;
 
 /**
diff --git a/Tests/Event/PostValidateEventTest.php b/Tests/FormFlow/Event/PostValidateEventTest.php
similarity index 81%
rename from Tests/Event/PostValidateEventTest.php
rename to Tests/FormFlow/Event/PostValidateEventTest.php
index debd0e53..f5f44faa 100644
--- a/Tests/Event/PostValidateEventTest.php
+++ b/Tests/FormFlow/Event/PostValidateEventTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Tests\Event;
+namespace Craue\FormFlowBundle\Tests\FormFlow\Event;
 
-use Craue\FormFlowBundle\Event\PostValidateEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PostValidateEvent;
 use Craue\FormFlowBundle\Tests\UnitTestCase;
 
 /**
diff --git a/Tests/Exception/InvalidTypeExceptionTest.php b/Tests/FormFlow/Exception/InvalidTypeExceptionTest.php
similarity index 86%
rename from Tests/Exception/InvalidTypeExceptionTest.php
rename to Tests/FormFlow/Exception/InvalidTypeExceptionTest.php
index a638f6ca..1f75a056 100644
--- a/Tests/Exception/InvalidTypeExceptionTest.php
+++ b/Tests/FormFlow/Exception/InvalidTypeExceptionTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Tests\Exception;
+namespace Craue\FormFlowBundle\Tests\FormFlow\Exception;
 
-use Craue\FormFlowBundle\Exception\InvalidTypeException;
+use Craue\FormFlowBundle\FormFlow\Exception\InvalidTypeException;
 
 /**
  * @author Christian Raue <christian.raue@gmail.com>
diff --git a/Tests/Form/Extension/FormFlowFormExtensionTest.php b/Tests/FormFlow/Extension/FormFlowFormExtensionTest.php
similarity index 77%
rename from Tests/Form/Extension/FormFlowFormExtensionTest.php
rename to Tests/FormFlow/Extension/FormFlowFormExtensionTest.php
index d1ef25be..e71d5d40 100644
--- a/Tests/Form/Extension/FormFlowFormExtensionTest.php
+++ b/Tests/FormFlow/Extension/FormFlowFormExtensionTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Tests\Form\Extension;
+namespace Craue\FormFlowBundle\Tests\FormFlow\Extension;
 
-use Craue\FormFlowBundle\Form\Extension\FormFlowFormExtension;
+use Craue\FormFlowBundle\FormFlow\Extension\FormFlowFormExtension;
 
 /**
  * @group unit
diff --git a/Tests/Form/Extension/FormFlowHiddenFieldExtensionTest.php b/Tests/FormFlow/Extension/FormFlowHiddenFieldExtensionTest.php
similarity index 76%
rename from Tests/Form/Extension/FormFlowHiddenFieldExtensionTest.php
rename to Tests/FormFlow/Extension/FormFlowHiddenFieldExtensionTest.php
index d68ce438..b433eb13 100644
--- a/Tests/Form/Extension/FormFlowHiddenFieldExtensionTest.php
+++ b/Tests/FormFlow/Extension/FormFlowHiddenFieldExtensionTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Tests\Form\Extension;
+namespace Craue\FormFlowBundle\Tests\FormFlow\Extension;
 
-use Craue\FormFlowBundle\Form\Extension\FormFlowHiddenFieldExtension;
+use Craue\FormFlowBundle\FormFlow\Extension\FormFlowHiddenFieldExtension;
 
 /**
  * @group unit
diff --git a/Tests/Form/FormFlowBcMethodsTest.php b/Tests/FormFlow/FormFlowBcMethodsTest.php
similarity index 94%
rename from Tests/Form/FormFlowBcMethodsTest.php
rename to Tests/FormFlow/FormFlowBcMethodsTest.php
index a7579bd4..9a40579e 100644
--- a/Tests/Form/FormFlowBcMethodsTest.php
+++ b/Tests/FormFlow/FormFlowBcMethodsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Craue\FormFlowBundle\Tests\Form;
+namespace Craue\FormFlowBundle\Tests\FormFlow;
 
 use Craue\FormFlowBundle\Tests\UnitTestCase;
 
@@ -17,7 +17,7 @@ class FormFlowBcMethodsTest extends UnitTestCase {
 
 	protected $collectDeprecationNotices = true;
 
-	private $deprecatedMessage = 'Method Craue\FormFlowBundle\Form\FormFlow::%s is deprecated since version 2.0. Use method %s instead.';
+	private $deprecatedMessage = 'Method Craue\FormFlowBundle\FormFlow\FormFlow::%s is deprecated since version 2.0. Use method %s instead.';
 
 	public function testBcMethodDelegation_getCurrentStep() {
 		$flow = $this->getFlowWithMockedMethods(array('getName', 'getCurrentStepNumber'));
diff --git a/Tests/Form/FormFlowTest.php b/Tests/FormFlow/FormFlowTest.php
similarity index 98%
rename from Tests/Form/FormFlowTest.php
rename to Tests/FormFlow/FormFlowTest.php
index 2ee60555..c7e0a605 100644
--- a/Tests/Form/FormFlowTest.php
+++ b/Tests/FormFlow/FormFlowTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Craue\FormFlowBundle\Tests\Form;
+namespace Craue\FormFlowBundle\Tests\FormFlow;
 
-use Craue\FormFlowBundle\Event\GetStepsEvent;
-use Craue\FormFlowBundle\Form\FormFlowEvents;
+use Craue\FormFlowBundle\FormFlow\Event\GetStepsEvent;
+use Craue\FormFlowBundle\FormFlow\FormFlowEvents;
 use Craue\FormFlowBundle\Tests\UnitTestCase;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationRequestHandler;
@@ -517,7 +517,7 @@ public function dataApplySkipping_invalidArguments() {
 
 	/**
 	 * @dataProvider dataGetStep_invalidArguments
-	 * @expectedException \Craue\FormFlowBundle\Exception\InvalidTypeException
+	 * @expectedException \Craue\FormFlowBundle\FormFlow\Exception\InvalidTypeException
 	 */
 	public function testGetStep_invalidArguments($stepNumber) {
 		$this->getMockedFlow()->getStep($stepNumber);
diff --git a/Tests/Form/StepBcTest.php b/Tests/FormFlow/StepBcTest.php
similarity index 88%
rename from Tests/Form/StepBcTest.php
rename to Tests/FormFlow/StepBcTest.php
index 0f262e13..37595d74 100644
--- a/Tests/Form/StepBcTest.php
+++ b/Tests/FormFlow/StepBcTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Tests\Form;
+namespace Craue\FormFlowBundle\Tests\FormFlow;
 
-use Craue\FormFlowBundle\Form\Step;
+use Craue\FormFlowBundle\FormFlow\Step;
 use Craue\FormFlowBundle\Tests\UnitTestCase;
 
 /**
diff --git a/Tests/Form/StepTest.php b/Tests/FormFlow/StepTest.php
similarity index 92%
rename from Tests/Form/StepTest.php
rename to Tests/FormFlow/StepTest.php
index cf486176..e831ae32 100644
--- a/Tests/Form/StepTest.php
+++ b/Tests/FormFlow/StepTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Craue\FormFlowBundle\Tests\Form;
+namespace Craue\FormFlowBundle\Tests\FormFlow;
 
-use Craue\FormFlowBundle\Form\FormFlowInterface;
-use Craue\FormFlowBundle\Form\Step;
+use Craue\FormFlowBundle\FormFlow\FormFlowInterface;
+use Craue\FormFlowBundle\FormFlow\Step;
 use Craue\FormFlowBundle\Tests\UnitTestCase;
 
 /**
@@ -97,7 +97,7 @@ public function dataSetGetNumber() {
 
 	/**
 	 * @dataProvider dataSetGetNumber_invalidArguments
-	 * @expectedException \Craue\FormFlowBundle\Exception\InvalidTypeException
+	 * @expectedException \Craue\FormFlowBundle\FormFlow\Exception\InvalidTypeException
 	 */
 	public function testSetGetNumber_invalidArguments($number) {
 		$step = new Step();
@@ -130,7 +130,7 @@ public function dataSetGetLabel() {
 
 	/**
 	 * @dataProvider dataSetGetLabel_invalidArguments
-	 * @expectedException \Craue\FormFlowBundle\Exception\InvalidTypeException
+	 * @expectedException \Craue\FormFlowBundle\FormFlow\Exception\InvalidTypeException
 	 */
 	public function testSetGetLabel_invalidArguments($label) {
 		$step = new Step();
@@ -163,7 +163,7 @@ public function dataSetGetFormType() {
 
 	/**
 	 * @dataProvider dataSetGetFormType_invalidArguments
-	 * @expectedException \Craue\FormFlowBundle\Exception\InvalidTypeException
+	 * @expectedException \Craue\FormFlowBundle\FormFlow\Exception\InvalidTypeException
 	 */
 	public function testSetGetFormType_invalidArguments($formType) {
 		$step = new Step();
@@ -197,7 +197,7 @@ public function dataSetGetFormOptions() {
 
 	/**
 	 * @dataProvider dataSetGetFormOptions_invalidArguments
-	 * @expectedException \Craue\FormFlowBundle\Exception\InvalidTypeException
+	 * @expectedException \Craue\FormFlowBundle\FormFlow\Exception\InvalidTypeException
 	 */
 	public function testSetGetFormOptions_invalidArguments($formOptions) {
 		$step = new Step();
@@ -216,7 +216,7 @@ public function dataSetGetFormOptions_invalidArguments() {
 
 	/**
 	 * @dataProvider dataSetSkip_invalidArguments
-	 * @expectedException \Craue\FormFlowBundle\Exception\InvalidTypeException
+	 * @expectedException \Craue\FormFlowBundle\FormFlow\Exception\InvalidTypeException
 	 */
 	public function testSetSkip_invalidArguments($skip) {
 		$step = new Step();
diff --git a/Tests/Storage/AbstractStorageTest.php b/Tests/FormFlow/Storage/AbstractStorageTest.php
similarity index 90%
rename from Tests/Storage/AbstractStorageTest.php
rename to Tests/FormFlow/Storage/AbstractStorageTest.php
index 5299c96d..bad472df 100644
--- a/Tests/Storage/AbstractStorageTest.php
+++ b/Tests/FormFlow/Storage/AbstractStorageTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Tests\Storage;
+namespace Craue\FormFlowBundle\Tests\FormFlow\Storage;
 
-use Craue\FormFlowBundle\Storage\StorageInterface;
+use Craue\FormFlowBundle\FormFlow\Storage\StorageInterface;
 
 /**
  * @group unit
diff --git a/Tests/Storage/DataManagerTest.php b/Tests/FormFlow/Storage/DataManagerTest.php
similarity index 93%
rename from Tests/Storage/DataManagerTest.php
rename to Tests/FormFlow/Storage/DataManagerTest.php
index 5f190702..6d81a4d5 100644
--- a/Tests/Storage/DataManagerTest.php
+++ b/Tests/FormFlow/Storage/DataManagerTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Craue\FormFlowBundle\Tests\Storage;
-
-use Craue\FormFlowBundle\Form\FormFlow;
-use Craue\FormFlowBundle\Storage\DataManager;
-use Craue\FormFlowBundle\Storage\DataManagerInterface;
-use Craue\FormFlowBundle\Storage\ExtendedDataManagerInterface;
-use Craue\FormFlowBundle\Storage\SessionStorage;
-use Craue\FormFlowBundle\Storage\StorageInterface;
+namespace Craue\FormFlowBundle\Tests\FormFlow\Storage;
+
+use Craue\FormFlowBundle\FormFlow\FormFlow;
+use Craue\FormFlowBundle\FormFlow\Storage\DataManager;
+use Craue\FormFlowBundle\FormFlow\Storage\DataManagerInterface;
+use Craue\FormFlowBundle\FormFlow\Storage\ExtendedDataManagerInterface;
+use Craue\FormFlowBundle\FormFlow\Storage\SessionStorage;
+use Craue\FormFlowBundle\FormFlow\Storage\StorageInterface;
 use Craue\FormFlowBundle\Tests\UnitTestCase;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
diff --git a/Tests/Storage/SerializableFileTest.php b/Tests/FormFlow/Storage/SerializableFileTest.php
similarity index 91%
rename from Tests/Storage/SerializableFileTest.php
rename to Tests/FormFlow/Storage/SerializableFileTest.php
index 1251751a..d28c303c 100644
--- a/Tests/Storage/SerializableFileTest.php
+++ b/Tests/FormFlow/Storage/SerializableFileTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Craue\FormFlowBundle\Tests\Storage;
+namespace Craue\FormFlowBundle\Tests\FormFlow\Storage;
 
-use Craue\FormFlowBundle\Storage\SerializableFile;
-use Craue\FormFlowBundle\Util\TempFileUtil;
+use Craue\FormFlowBundle\FormFlow\Storage\SerializableFile;
+use Craue\FormFlowBundle\FormFlow\Util\TempFileUtil;
 use Symfony\Component\HttpFoundation\File\File;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
@@ -16,7 +16,7 @@
  */
 class SerializableFileTest extends \PHPUnit_Framework_TestCase {
 
-	const DOCUMENT = '/../Fixtures/some-text.txt';
+	const DOCUMENT = '/../../Fixtures/some-text.txt';
 
 	private $tempFolder = null;
 
@@ -79,7 +79,7 @@ public function testSerialization_customTempDir_nonexistent() {
 	}
 
 	/**
-	 * @expectedException \Craue\FormFlowBundle\Exception\InvalidTypeException
+	 * @expectedException \Craue\FormFlowBundle\FormFlow\Exception\InvalidTypeException
 	 * @expectedExceptionMessage Expected argument of type "Symfony\Component\HttpFoundation\File\UploadedFile", but "Symfony\Component\HttpFoundation\File\File" given.
 	 */
 	public function testSerialization_unsupportedType() {
diff --git a/Tests/Storage/SessionStorageTest.php b/Tests/FormFlow/Storage/SessionStorageTest.php
similarity index 82%
rename from Tests/Storage/SessionStorageTest.php
rename to Tests/FormFlow/Storage/SessionStorageTest.php
index 811e9ee4..b12fd73e 100644
--- a/Tests/Storage/SessionStorageTest.php
+++ b/Tests/FormFlow/Storage/SessionStorageTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Tests\Storage;
+namespace Craue\FormFlowBundle\Tests\FormFlow\Storage;
 
-use Craue\FormFlowBundle\Storage\SessionStorage;
+use Craue\FormFlowBundle\FormFlow\Storage\SessionStorage;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 
diff --git a/Tests/Util/StringUtilTest.php b/Tests/FormFlow/Util/StringUtilTest.php
similarity index 85%
rename from Tests/Util/StringUtilTest.php
rename to Tests/FormFlow/Util/StringUtilTest.php
index c5f4e343..13728a83 100644
--- a/Tests/Util/StringUtilTest.php
+++ b/Tests/FormFlow/Util/StringUtilTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Craue\FormFlowBundle\Tests\Util;
+namespace Craue\FormFlowBundle\Tests\FormFlow\Util;
 
-use Craue\FormFlowBundle\Util\StringUtil;
+use Craue\FormFlowBundle\FormFlow\Util\StringUtil;
 
 /**
  * @group unit
@@ -19,7 +19,7 @@ public function testGenerateRandomString() {
 	}
 
 	/**
-	 * @expectedException \Craue\FormFlowBundle\Exception\InvalidTypeException
+	 * @expectedException \Craue\FormFlowBundle\FormFlow\Exception\InvalidTypeException
 	 */
 	public function testGenerateRandomString_lengthNotInteger() {
 		StringUtil::generateRandomString(null);
@@ -47,7 +47,7 @@ public function testIsRandomString() {
 	}
 
 	/**
-	 * @expectedException \Craue\FormFlowBundle\Exception\InvalidTypeException
+	 * @expectedException \Craue\FormFlowBundle\FormFlow\Exception\InvalidTypeException
 	 * @expectedExceptionMessage Expected argument of type "string", but "NULL" given.
 	 */
 	public function testIsRandomString_inputNotString() {
@@ -55,7 +55,7 @@ public function testIsRandomString_inputNotString() {
 	}
 
 	/**
-	 * @expectedException \Craue\FormFlowBundle\Exception\InvalidTypeException
+	 * @expectedException \Craue\FormFlowBundle\FormFlow\Exception\InvalidTypeException
 	 * @expectedExceptionMessage Expected argument of type "integer", but "NULL" given.
 	 */
 	public function testIsRandomString_lengthNotInteger() {
diff --git a/Tests/IntegrationTestBundle/Controller/FormFlowController.php b/Tests/IntegrationTestBundle/Controller/FormFlowController.php
index 0a3431b0..4f7d6670 100644
--- a/Tests/IntegrationTestBundle/Controller/FormFlowController.php
+++ b/Tests/IntegrationTestBundle/Controller/FormFlowController.php
@@ -2,7 +2,7 @@
 
 namespace Craue\FormFlowBundle\Tests\IntegrationTestBundle\Controller;
 
-use Craue\FormFlowBundle\Form\FormFlow;
+use Craue\FormFlowBundle\FormFlow\FormFlow;
 use Craue\FormFlowBundle\Tests\IntegrationTestBundle\Entity\Issue149Data;
 use Craue\FormFlowBundle\Tests\IntegrationTestBundle\Entity\Issue64Data;
 use Craue\FormFlowBundle\Tests\IntegrationTestBundle\Entity\PhotoUpload;
diff --git a/Tests/IntegrationTestBundle/Form/CreateTopicFlow.php b/Tests/IntegrationTestBundle/Form/CreateTopicFlow.php
index 386d3740..262b309a 100644
--- a/Tests/IntegrationTestBundle/Form/CreateTopicFlow.php
+++ b/Tests/IntegrationTestBundle/Form/CreateTopicFlow.php
@@ -2,8 +2,8 @@
 
 namespace Craue\FormFlowBundle\Tests\IntegrationTestBundle\Form;
 
-use Craue\FormFlowBundle\Form\FormFlow;
-use Craue\FormFlowBundle\Form\FormFlowInterface;
+use Craue\FormFlowBundle\FormFlow\FormFlow;
+use Craue\FormFlowBundle\FormFlow\FormFlowInterface;
 use Symfony\Component\Form\FormTypeInterface;
 
 /**
diff --git a/Tests/IntegrationTestBundle/Form/CreateVehicleFlow.php b/Tests/IntegrationTestBundle/Form/CreateVehicleFlow.php
index 83ada902..b6b72ffd 100644
--- a/Tests/IntegrationTestBundle/Form/CreateVehicleFlow.php
+++ b/Tests/IntegrationTestBundle/Form/CreateVehicleFlow.php
@@ -2,8 +2,8 @@
 
 namespace Craue\FormFlowBundle\Tests\IntegrationTestBundle\Form;
 
-use Craue\FormFlowBundle\Form\FormFlow;
-use Craue\FormFlowBundle\Form\FormFlowInterface;
+use Craue\FormFlowBundle\FormFlow\FormFlow;
+use Craue\FormFlowBundle\FormFlow\FormFlowInterface;
 
 /**
  * @author Christian Raue <christian.raue@gmail.com>
diff --git a/Tests/IntegrationTestBundle/Form/Demo1Flow.php b/Tests/IntegrationTestBundle/Form/Demo1Flow.php
index c9c2627c..1a8b90a7 100644
--- a/Tests/IntegrationTestBundle/Form/Demo1Flow.php
+++ b/Tests/IntegrationTestBundle/Form/Demo1Flow.php
@@ -2,14 +2,14 @@
 
 namespace Craue\FormFlowBundle\Tests\IntegrationTestBundle\Form;
 
-use Craue\FormFlowBundle\Event\GetStepsEvent;
-use Craue\FormFlowBundle\Event\PostBindFlowEvent;
-use Craue\FormFlowBundle\Event\PostBindRequestEvent;
-use Craue\FormFlowBundle\Event\PostBindSavedDataEvent;
-use Craue\FormFlowBundle\Event\PostValidateEvent;
-use Craue\FormFlowBundle\Event\PreBindEvent;
-use Craue\FormFlowBundle\Form\FormFlow;
-use Craue\FormFlowBundle\Form\FormFlowEvents;
+use Craue\FormFlowBundle\FormFlow\Event\GetStepsEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PostBindFlowEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PostBindRequestEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PostBindSavedDataEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PostValidateEvent;
+use Craue\FormFlowBundle\FormFlow\Event\PreBindEvent;
+use Craue\FormFlowBundle\FormFlow\FormFlow;
+use Craue\FormFlowBundle\FormFlow\FormFlowEvents;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
diff --git a/Tests/IntegrationTestBundle/Form/Issue149Flow.php b/Tests/IntegrationTestBundle/Form/Issue149Flow.php
index f7911c25..8407dd49 100644
--- a/Tests/IntegrationTestBundle/Form/Issue149Flow.php
+++ b/Tests/IntegrationTestBundle/Form/Issue149Flow.php
@@ -2,7 +2,7 @@
 
 namespace Craue\FormFlowBundle\Tests\IntegrationTestBundle\Form;
 
-use Craue\FormFlowBundle\Form\FormFlow;
+use Craue\FormFlowBundle\FormFlow\FormFlow;
 
 /**
  * @author Christian Raue <christian.raue@gmail.com>
diff --git a/Tests/IntegrationTestBundle/Form/Issue64Flow.php b/Tests/IntegrationTestBundle/Form/Issue64Flow.php
index 5744773b..a33821fe 100644
--- a/Tests/IntegrationTestBundle/Form/Issue64Flow.php
+++ b/Tests/IntegrationTestBundle/Form/Issue64Flow.php
@@ -2,7 +2,7 @@
 
 namespace Craue\FormFlowBundle\Tests\IntegrationTestBundle\Form;
 
-use Craue\FormFlowBundle\Form\FormFlow;
+use Craue\FormFlowBundle\FormFlow\FormFlow;
 
 /**
  * @author Christian Raue <christian.raue@gmail.com>
diff --git a/Tests/IntegrationTestBundle/Form/Issue87Flow.php b/Tests/IntegrationTestBundle/Form/Issue87Flow.php
index 605f6318..29f4b799 100644
--- a/Tests/IntegrationTestBundle/Form/Issue87Flow.php
+++ b/Tests/IntegrationTestBundle/Form/Issue87Flow.php
@@ -2,7 +2,7 @@
 
 namespace Craue\FormFlowBundle\Tests\IntegrationTestBundle\Form;
 
-use Craue\FormFlowBundle\Form\FormFlow;
+use Craue\FormFlowBundle\FormFlow\FormFlow;
 
 /**
  * @author Christian Raue <christian.raue@gmail.com>
diff --git a/Tests/IntegrationTestBundle/Form/OnlyOneStepFlow.php b/Tests/IntegrationTestBundle/Form/OnlyOneStepFlow.php
index 334921c0..4999718d 100644
--- a/Tests/IntegrationTestBundle/Form/OnlyOneStepFlow.php
+++ b/Tests/IntegrationTestBundle/Form/OnlyOneStepFlow.php
@@ -2,7 +2,7 @@
 
 namespace Craue\FormFlowBundle\Tests\IntegrationTestBundle\Form;
 
-use Craue\FormFlowBundle\Form\FormFlow;
+use Craue\FormFlowBundle\FormFlow\FormFlow;
 
 /**
  * @author Christian Raue <christian.raue@gmail.com>
diff --git a/Tests/IntegrationTestBundle/Form/PhotoUploadFlow.php b/Tests/IntegrationTestBundle/Form/PhotoUploadFlow.php
index 2ad7b925..4cc17598 100644
--- a/Tests/IntegrationTestBundle/Form/PhotoUploadFlow.php
+++ b/Tests/IntegrationTestBundle/Form/PhotoUploadFlow.php
@@ -2,7 +2,7 @@
 
 namespace Craue\FormFlowBundle\Tests\IntegrationTestBundle\Form;
 
-use Craue\FormFlowBundle\Form\FormFlow;
+use Craue\FormFlowBundle\FormFlow\FormFlow;
 
 /**
  * @author Christian Raue <christian.raue@gmail.com>
diff --git a/Tests/IntegrationTestBundle/Form/RemoveSecondStepSkipMarkOnResetFlow.php b/Tests/IntegrationTestBundle/Form/RemoveSecondStepSkipMarkOnResetFlow.php
index 3609624e..f3a66d83 100644
--- a/Tests/IntegrationTestBundle/Form/RemoveSecondStepSkipMarkOnResetFlow.php
+++ b/Tests/IntegrationTestBundle/Form/RemoveSecondStepSkipMarkOnResetFlow.php
@@ -2,8 +2,8 @@
 
 namespace Craue\FormFlowBundle\Tests\IntegrationTestBundle\Form;
 
-use Craue\FormFlowBundle\Form\FormFlow;
-use Craue\FormFlowBundle\Form\FormFlowInterface;
+use Craue\FormFlowBundle\FormFlow\FormFlow;
+use Craue\FormFlowBundle\FormFlow\FormFlowInterface;
 
 /**
  * @author Christian Raue <christian.raue@gmail.com>
diff --git a/Tests/IntegrationTestBundle/Form/RevalidatePreviousStepsFlow.php b/Tests/IntegrationTestBundle/Form/RevalidatePreviousStepsFlow.php
index 06ea40cf..f9b86c18 100644
--- a/Tests/IntegrationTestBundle/Form/RevalidatePreviousStepsFlow.php
+++ b/Tests/IntegrationTestBundle/Form/RevalidatePreviousStepsFlow.php
@@ -2,9 +2,9 @@
 
 namespace Craue\FormFlowBundle\Tests\IntegrationTestBundle\Form;
 
-use Craue\FormFlowBundle\Event\PreviousStepInvalidEvent;
-use Craue\FormFlowBundle\Form\FormFlow;
-use Craue\FormFlowBundle\Form\FormFlowEvents;
+use Craue\FormFlowBundle\FormFlow\Event\PreviousStepInvalidEvent;
+use Craue\FormFlowBundle\FormFlow\FormFlow;
+use Craue\FormFlowBundle\FormFlow\FormFlowEvents;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
diff --git a/Tests/IntegrationTestBundle/Form/SkipFirstStepUsingClosureFlow.php b/Tests/IntegrationTestBundle/Form/SkipFirstStepUsingClosureFlow.php
index 9f187efb..913a6d47 100644
--- a/Tests/IntegrationTestBundle/Form/SkipFirstStepUsingClosureFlow.php
+++ b/Tests/IntegrationTestBundle/Form/SkipFirstStepUsingClosureFlow.php
@@ -2,8 +2,8 @@
 
 namespace Craue\FormFlowBundle\Tests\IntegrationTestBundle\Form;
 
-use Craue\FormFlowBundle\Form\FormFlow;
-use Craue\FormFlowBundle\Form\FormFlowInterface;
+use Craue\FormFlowBundle\FormFlow\FormFlow;
+use Craue\FormFlowBundle\FormFlow\FormFlowInterface;
 
 /**
  * @author Christian Raue <christian.raue@gmail.com>
diff --git a/Tests/Resources/TemplateRenderingTest.php b/Tests/Resources/TemplateRenderingTest.php
index 5e517bb3..7ed3e2ea 100644
--- a/Tests/Resources/TemplateRenderingTest.php
+++ b/Tests/Resources/TemplateRenderingTest.php
@@ -2,9 +2,9 @@
 
 namespace Craue\FormFlowBundle\Tests\Form;
 
-use Craue\FormFlowBundle\Form\FormFlow;
-use Craue\FormFlowBundle\Storage\DataManager;
-use Craue\FormFlowBundle\Storage\SessionStorage;
+use Craue\FormFlowBundle\FormFlow\FormFlow;
+use Craue\FormFlowBundle\FormFlow\Storage\DataManager;
+use Craue\FormFlowBundle\FormFlow\Storage\SessionStorage;
 use Craue\FormFlowBundle\Tests\IntegrationTestCase;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
@@ -274,7 +274,7 @@ public function testStepList_stepSkipped() {
 	 */
 	protected function getFlowStub(array $stubbedMethods = array(), array $stepsConfig = null) {
 		/* @var $flow \PHPUnit_Framework_MockObject_MockObject|FormFlow */
-		$flow = $this->getMock('\Craue\FormFlowBundle\Form\FormFlow', array_merge(array('getName', 'loadStepsConfig'), $stubbedMethods));
+		$flow = $this->getMock('\Craue\FormFlowBundle\FormFlow\FormFlow', array_merge(array('getName', 'loadStepsConfig'), $stubbedMethods));
 
 		$flow->setDataManager(new DataManager(new SessionStorage(new Session(new MockArraySessionStorage()))));
 
diff --git a/Tests/UnitTestCase.php b/Tests/UnitTestCase.php
index 56849ca3..25197e61 100644
--- a/Tests/UnitTestCase.php
+++ b/Tests/UnitTestCase.php
@@ -2,10 +2,10 @@
 
 namespace Craue\FormFlowBundle\Tests;
 
-use Craue\FormFlowBundle\Form\FormFlow;
-use Craue\FormFlowBundle\Form\FormFlowInterface;
-use Craue\FormFlowBundle\Form\StepInterface;
-use Craue\FormFlowBundle\Storage\DataManagerInterface;
+use Craue\FormFlowBundle\FormFlow\FormFlow;
+use Craue\FormFlowBundle\FormFlow\FormFlowInterface;
+use Craue\FormFlowBundle\FormFlow\StepInterface;
+use Craue\FormFlowBundle\FormFlow\Storage\DataManagerInterface;
 
 /**
  * @author Christian Raue <christian.raue@gmail.com>
@@ -56,14 +56,14 @@ protected function getDeprecationNotices() {
 	 * @return \PHPUnit_Framework_MockObject_MockObject|FormFlow
 	 */
 	protected function getMockedFlow() {
-		return $this->getMockForAbstractClass('\Craue\FormFlowBundle\Form\FormFlow');
+		return $this->getMockForAbstractClass('\Craue\FormFlowBundle\FormFlow\FormFlow');
 	}
 
 	/**
 	 * @return \PHPUnit_Framework_MockObject_MockObject|FormFlowInterface
 	 */
 	protected function getMockedFlowInterface() {
-		return $this->getMock('\Craue\FormFlowBundle\Form\FormFlowInterface');
+		return $this->getMock('\Craue\FormFlowBundle\FormFlow\FormFlowInterface');
 	}
 
 	/**
@@ -71,21 +71,21 @@ protected function getMockedFlowInterface() {
 	 * @return PHPUnit_Framework_MockObject_MockObject|FormFlow
 	 */
 	protected function getFlowWithMockedMethods(array $methodNames) {
-		return $this->getMock('\Craue\FormFlowBundle\Form\FormFlow', $methodNames);
+		return $this->getMock('\Craue\FormFlowBundle\FormFlow\FormFlow', $methodNames);
 	}
 
 	/**
 	 * @return \PHPUnit_Framework_MockObject_MockObject|StepInterface
 	 */
 	protected function getMockedStepInterface() {
-		return $this->getMock('\Craue\FormFlowBundle\Form\StepInterface');
+		return $this->getMock('\Craue\FormFlowBundle\FormFlow\StepInterface');
 	}
 
 	/**
 	 * @return \PHPUnit_Framework_MockObject_MockObject|DataManagerInterface
 	 */
 	protected function getMockedDataManagerInterface() {
-		return $this->getMock('\Craue\FormFlowBundle\Storage\DataManagerInterface');
+		return $this->getMock('\Craue\FormFlowBundle\FormFlow\Storage\DataManagerInterface');
 	}
 
 }
diff --git a/Twig/Extension/FormFlowExtension.php b/Twig/Extension/FormFlowExtension.php
index 5f246c19..82e32b77 100644
--- a/Twig/Extension/FormFlowExtension.php
+++ b/Twig/Extension/FormFlowExtension.php
@@ -2,7 +2,7 @@
 
 namespace Craue\FormFlowBundle\Twig\Extension;
 
-use Craue\FormFlowBundle\Form\FormFlow;
+use Craue\FormFlowBundle\FormFlow\FormFlow;
 use Craue\FormFlowBundle\Util\FormFlowUtil;
 
 /**
diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md
index 4f46e476..91221ccc 100644
--- a/UPGRADE-3.0.md
+++ b/UPGRADE-3.0.md
@@ -1,5 +1,15 @@
 # Upgrade from 2.1.x to 3.0
 
+## Namespace changes
+
+In order to make the core features also available as a standalone library, most files had to be moved into a subfolder.
+Thus, the namespace for those files has changed. Just perform a search & replace in your project to adapt these changes.
+
+- `Craue\FormFlowBundle\Event` to `Craue\FormFlowBundle\FormFlow\Event`
+- `Craue\FormFlowBundle\Exception` to `Craue\FormFlowBundle\FormFlow\Exception`
+- `Craue\FormFlowBundle\Form` to `Craue\FormFlowBundle\FormFlow`
+- `Craue\FormFlowBundle\Storage` to `Craue\FormFlowBundle\FormFlow\Storage`
+
 ## Renaming step config option `type` to `form_type`
 
 The step config option to specify the form type for each step within the `loadStepsConfig` method has been renamed from
diff --git a/Util/FormFlowUtil.php b/Util/FormFlowUtil.php
index 8918a64b..ea0ab925 100644
--- a/Util/FormFlowUtil.php
+++ b/Util/FormFlowUtil.php
@@ -2,7 +2,7 @@
 
 namespace Craue\FormFlowBundle\Util;
 
-use Craue\FormFlowBundle\Form\FormFlow;
+use Craue\FormFlowBundle\FormFlow\FormFlow;
 
 /**
  * @author Christian Raue <christian.raue@gmail.com>
diff --git a/composer.json b/composer.json
index 53374ab9..8c1d68b6 100644
--- a/composer.json
+++ b/composer.json
@@ -28,6 +28,9 @@
 		"sensio/framework-extra-bundle": "~2.1|~3.0",
 		"symfony/symfony": "~2.3"
 	},
+	"replace": {
+		"craue/formflow": "self.version"
+	},
 	"minimum-stability": "stable",
 	"prefer-stable": true,
 	"autoload": {