diff --git a/.gitignore b/.gitignore
index da84e31..c6064c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 composer.lock
 vendor
 **.swp
+docs/contract.html
\ No newline at end of file
diff --git a/README.md b/README.md
index 8feba98..9b468ac 100644
--- a/README.md
+++ b/README.md
@@ -454,3 +454,5 @@ to set the cache directory.
 V2.0.0 End support for PHP <5.6
 
 V2.1.0 Remove hard dependency on Captcha library
+
+V2.1.1 Standardise code structure
\ No newline at end of file
diff --git a/autoload.php b/autoload.php
deleted file mode 100644
index d3365e5..0000000
--- a/autoload.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-$vendor = __DIR__.'/vendor/autoload.php';
-if (file_exists($vendor)) {
-    require($vendor);
-}
-
-/**
- * Registers an autoload for all the classes
- */
-spl_autoload_register(function ($className) {
-    $namespace = 'Gregwar\\Formidable';
-
-    if (strpos($className, $namespace) === 0) {
-        $className = str_replace($namespace, '', $className);
-        $fileName = __DIR__ . '/' . str_replace('\\', '/', $className) . '.php';
-        if (file_exists($fileName)) {
-            require($fileName);
-        }
-    }
-});
diff --git a/composer.json b/composer.json
index 4aaa947..115d4d6 100644
--- a/composer.json
+++ b/composer.json
@@ -33,10 +33,9 @@
   "suggest": {
     "gregwar/captcha": "To implement Captcha capability into forms"
   },
-  "target-dir": "Gregwar/Formidable",
   "autoload": {
-    "psr-0": {
-      "Gregwar\\Formidable": ""
+    "psr-4": {
+      "Gregwar\\Formidable\\": "src"
     }
   }
 }
diff --git a/docs/.gitkeep b/docs/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/examples/basic.php b/examples/basic.php
index 67f0d5b..f8cfd76 100644
--- a/examples/basic.php
+++ b/examples/basic.php
@@ -1,6 +1,6 @@
 <?php
 
-include(__DIR__.'/../autoload.php');
+include(__DIR__ . '/../vendor/autoload.php');
 
 $form = new Gregwar\Formidable\Form('<form method="post">
     What\'s your name? <input type="text" name="nom" /><br />
diff --git a/examples/cache-file.php b/examples/cache-file.php
index 0454324..d17d032 100644
--- a/examples/cache-file.php
+++ b/examples/cache-file.php
@@ -1,7 +1,7 @@
 <?php
 $_SESSION = array();
 
-include(__DIR__.'/../autoload.php');
+include(__DIR__ . '/../vendor/autoload.php');
 
 $form = new Gregwar\Formidable\Form('forms/performances.html', null, true);
 
diff --git a/examples/cache.php b/examples/cache.php
index 5350677..1147352 100644
--- a/examples/cache.php
+++ b/examples/cache.php
@@ -1,7 +1,7 @@
 <?php
 $_SESSION = array();
 
-include(__DIR__.'/../autoload.php');
+include(__DIR__ . '/../vendor/autoload.php');
 
 $form = new Gregwar\Formidable\Form('<form method="post">
     What\'s your name? <input type="text" name="nom" /><br />
diff --git a/examples/custom.php b/examples/custom.php
index e845890..f1d15d3 100644
--- a/examples/custom.php
+++ b/examples/custom.php
@@ -1,6 +1,6 @@
 <?php
 
-include(__DIR__.'/../autoload.php');
+include(__DIR__ . '/../vendor/autoload.php');
 
 $form = new Gregwar\Formidable\Form('<form method="post">
     <custom source="something" />
diff --git a/examples/index.php b/examples/index.php
index 8fcb6e4..10d6f4c 100644
--- a/examples/index.php
+++ b/examples/index.php
@@ -1,6 +1,6 @@
 <?php
 session_start(); // required for CSRF
-include(__DIR__.'/../autoload.php');
+include(__DIR__ . '/../vendor/autoload.php');
 include('person.php');
 
 $form = new Gregwar\Formidable\Form('forms/demoform.html', array());
@@ -35,7 +35,7 @@
         <h1>Formidable Demo</h1>
         <?php if ($errors) { ?>
             <div style="color:red">
-                <h2>Validations error</h1>
+                <h1>Validations error</h1>
                 <ul>
                 <?php foreach ($errors as $error) { ?>
                     <li><?php echo $error; ?></li>
diff --git a/examples/mapping.php b/examples/mapping.php
index 15ab7b1..033ce7b 100644
--- a/examples/mapping.php
+++ b/examples/mapping.php
@@ -1,6 +1,6 @@
 <?php
 
-include(__DIR__.'/../autoload.php');
+include(__DIR__ . '/../vendor/autoload.php');
 
 class Person
 {
diff --git a/examples/minmax.php b/examples/minmax.php
index 7eaa784..218445c 100644
--- a/examples/minmax.php
+++ b/examples/minmax.php
@@ -1,6 +1,6 @@
 <?php
 
-include(__DIR__.'/../autoload.php');
+include(__DIR__ . '/../vendor/autoload.php');
 
 $form = new Gregwar\Formidable\Form('<form method="post">
     How old are you? <input type="int" name="age" min="18" max="130" />
diff --git a/examples/multiple.php b/examples/multiple.php
index 13d3575..032cf58 100644
--- a/examples/multiple.php
+++ b/examples/multiple.php
@@ -6,7 +6,7 @@ class Film
     public $actors;
 }
 
-include(__DIR__.'/../autoload.php');
+include(__DIR__ . '/../vendor/autoload.php');
 
 $form = new Gregwar\Formidable\Form('<form method="post">
 
diff --git a/examples/performances.php b/examples/performances.php
index 826a769..9869bde 100644
--- a/examples/performances.php
+++ b/examples/performances.php
@@ -1,5 +1,5 @@
 <?php
-include(__DIR__.'/../autoload.php');
+include(__DIR__ . '/../vendor/autoload.php');
 
 $iterations = 5000;
 
diff --git a/examples/placeholder.php b/examples/placeholder.php
index 823df46..ec86844 100644
--- a/examples/placeholder.php
+++ b/examples/placeholder.php
@@ -1,6 +1,6 @@
 <?php
 
-include(__DIR__.'/../autoload.php');
+include(__DIR__ . '/../vendor/autoload.php');
 
 $form = new Gregwar\Formidable\Form('<form method="post">
     <span style="color:{{ color }}">Hello</span>
diff --git a/examples/select.php b/examples/select.php
index 0535e7b..702e58e 100644
--- a/examples/select.php
+++ b/examples/select.php
@@ -1,6 +1,6 @@
 <?php
 
-include(__DIR__.'/../autoload.php');
+include(__DIR__ . '/../vendor/autoload.php');
 
 $form = new Gregwar\Formidable\Form('<form method="post">
     <select name="colour">
diff --git a/examples/source.php b/examples/source.php
index 9494c14..49d0920 100644
--- a/examples/source.php
+++ b/examples/source.php
@@ -1,6 +1,6 @@
 <?php
 
-include(__DIR__.'/../autoload.php');
+include(__DIR__ . '/../vendor/autoload.php');
 
 $form = new Gregwar\Formidable\Form('<form method="post">
     <select name="animal">
diff --git a/phpunit.xml b/phpunit.xml
index 8ec678f..acb769c 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -9,15 +9,20 @@
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="false"
-         bootstrap="tests/bootstrap.php"
+         bootstrap="./vendor/autoload.php"
 >
     <testsuites>
-        <testsuite name="Formidable Test Suite">
-            <file>./tests/ParserTests.php</file>
-            <file>./tests/FormTests.php</file>
-            <file>./tests/ContextTests.php</file>
-            <file>./tests/ConstraintsTests.php</file>
+        <testsuite name="Default">
+            <directory suffix="Test.php">./test</directory>
         </testsuite>
     </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./src</directory>
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="testdox-html" target="./docs/contract.html"/>
+    </logging>
 
 </phpunit>
diff --git a/DataForm.php b/src/DataForm.php
similarity index 100%
rename from DataForm.php
rename to src/DataForm.php
diff --git a/Error.php b/src/Error.php
similarity index 100%
rename from Error.php
rename to src/Error.php
diff --git a/Factory.php b/src/Factory.php
similarity index 100%
rename from Factory.php
rename to src/Factory.php
diff --git a/Fields/ButtonField.php b/src/Fields/ButtonField.php
similarity index 100%
rename from Fields/ButtonField.php
rename to src/Fields/ButtonField.php
diff --git a/Fields/CaptchaField.php b/src/Fields/CaptchaField.php
similarity index 100%
rename from Fields/CaptchaField.php
rename to src/Fields/CaptchaField.php
diff --git a/Fields/CheckboxField.php b/src/Fields/CheckboxField.php
similarity index 100%
rename from Fields/CheckboxField.php
rename to src/Fields/CheckboxField.php
diff --git a/Fields/DateField.php b/src/Fields/DateField.php
similarity index 100%
rename from Fields/DateField.php
rename to src/Fields/DateField.php
diff --git a/Fields/EmailField.php b/src/Fields/EmailField.php
similarity index 100%
rename from Fields/EmailField.php
rename to src/Fields/EmailField.php
diff --git a/Fields/Field.php b/src/Fields/Field.php
similarity index 100%
rename from Fields/Field.php
rename to src/Fields/Field.php
diff --git a/Fields/FileField.php b/src/Fields/FileField.php
similarity index 100%
rename from Fields/FileField.php
rename to src/Fields/FileField.php
diff --git a/Fields/Group.php b/src/Fields/Group.php
similarity index 100%
rename from Fields/Group.php
rename to src/Fields/Group.php
diff --git a/Fields/HiddenField.php b/src/Fields/HiddenField.php
similarity index 100%
rename from Fields/HiddenField.php
rename to src/Fields/HiddenField.php
diff --git a/Fields/IntField.php b/src/Fields/IntField.php
similarity index 100%
rename from Fields/IntField.php
rename to src/Fields/IntField.php
diff --git a/Fields/MulticheckboxField.php b/src/Fields/MulticheckboxField.php
similarity index 100%
rename from Fields/MulticheckboxField.php
rename to src/Fields/MulticheckboxField.php
diff --git a/Fields/Multiple.php b/src/Fields/Multiple.php
similarity index 100%
rename from Fields/Multiple.php
rename to src/Fields/Multiple.php
diff --git a/Fields/MultiradioField.php b/src/Fields/MultiradioField.php
similarity index 100%
rename from Fields/MultiradioField.php
rename to src/Fields/MultiradioField.php
diff --git a/Fields/NumberField.php b/src/Fields/NumberField.php
similarity index 100%
rename from Fields/NumberField.php
rename to src/Fields/NumberField.php
diff --git a/Fields/Option.php b/src/Fields/Option.php
similarity index 100%
rename from Fields/Option.php
rename to src/Fields/Option.php
diff --git a/Fields/Options.php b/src/Fields/Options.php
similarity index 100%
rename from Fields/Options.php
rename to src/Fields/Options.php
diff --git a/Fields/PasswordField.php b/src/Fields/PasswordField.php
similarity index 100%
rename from Fields/PasswordField.php
rename to src/Fields/PasswordField.php
diff --git a/Fields/RadioField.php b/src/Fields/RadioField.php
similarity index 100%
rename from Fields/RadioField.php
rename to src/Fields/RadioField.php
diff --git a/Fields/Radios.php b/src/Fields/Radios.php
similarity index 100%
rename from Fields/Radios.php
rename to src/Fields/Radios.php
diff --git a/Fields/Select.php b/src/Fields/Select.php
similarity index 100%
rename from Fields/Select.php
rename to src/Fields/Select.php
diff --git a/Fields/TextField.php b/src/Fields/TextField.php
similarity index 100%
rename from Fields/TextField.php
rename to src/Fields/TextField.php
diff --git a/Fields/Textarea.php b/src/Fields/Textarea.php
similarity index 100%
rename from Fields/Textarea.php
rename to src/Fields/Textarea.php
diff --git a/Form.php b/src/Form.php
similarity index 83%
rename from Form.php
rename to src/Form.php
index bde31a8..d4b0676 100644
--- a/Form.php
+++ b/src/Form.php
@@ -2,6 +2,9 @@
 
 namespace Gregwar\Formidable;
 
+use Gregwar\Cache\Cache;
+use Gregwar\Formidable\Fields\Field;
+use Gregwar\Formidable\Language\Language;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
 
 /**
@@ -13,55 +16,78 @@ class Form
 {
     /**
      * HTML contents of the form
+     * @var string
      */
     protected $content = null;
 
     /**
      * File path
+     * @var string
      */
     protected $path = null;
 
     /**
      * File variables
+     * @var array [key=>value,...]
      */
-    protected $variables = null;
+    protected $variables = [];
 
     /**
      * Current position for iterator
+     * @var int
      */
     protected $position = 0;
 
     /**
-     * Factory
+     * @var Factory
      */
     protected $factory;
 
     /**
      * Parser raw data
+     * @var ?
      */
     protected $originalParserData;
+
+    /**
+     * @var ParserData
+     */
     protected $parserData;
 
     /**
      * Property accessor
+     * @var ?
      */
     protected $accessor = null;
 
     /***
      * Cache system
+     * @var Cache|null
      */
     protected $cache = null;
 
     /**
      * Form constraints
+     * @var array
      */
-    protected $constraints = array();
+    protected $constraints = [];
 
     /**
      * Is the form cached?
+     * @var bool
      */
     public $isCached = true;
 
+    /**
+     * Form constructor.
+     *
+     * @param string $pathOrContent
+     * @param array|null   $variables
+     * @param Cache|bool|null   $cache
+     * @param Factory|null   $factory
+     *
+     * @throws \InvalidArgumentException
+     */
     public function __construct($pathOrContent = '', $variables = null, $cache = false, $factory = null)
     {
         if (null === $factory) {
@@ -72,8 +98,8 @@ public function __construct($pathOrContent = '', $variables = null, $cache = fal
 
         if ($cache !== null && $cache !== false) {
             if ($cache === true) {
-                $this->cache = new \Gregwar\Cache\Cache;
-            } else if ($cache instanceof \Gregwar\Cache\Cache) {
+                $this->cache = new Cache;
+            } else if ($cache instanceof Cache) {
                 $this->cache = $cache;
             } else {
                 throw new \InvalidArgumentException('The parameter $cache should be false, true or an instance of Gregwar\Cache\Cache');
@@ -92,6 +118,9 @@ public function __construct($pathOrContent = '', $variables = null, $cache = fal
         $this->parse();
     }
 
+    /**
+     * @return Factory|null
+     */
     public function getFactory()
     {
         return $this->factory;
@@ -99,6 +128,8 @@ public function getFactory()
 
     /**
      * Gets the parser data
+     *
+     * @return ParserData
      */
     public function getParserData()
     {
@@ -107,8 +138,10 @@ public function getParserData()
 
     /**
      * Sets the language
+     *
+     * @param Language $language
      */
-    public function setLanguage(Language\Language $language)
+    public function setLanguage(Language $language)
     {
         $this->factory->setLanguage($language);
         $this->pushLanguage();
@@ -122,8 +155,8 @@ protected function pushLanguage()
         $language = $this->factory->getLanguage();
 
         if ($language && $this->parserData) {
-            $fields = $this->parserData->getFields();
-            foreach ($fields as &$field) {
+            /** @var  Field $field */
+            foreach ($this->parserData->getFields() as &$field) {
                 $field->setLanguage($this->factory->getLanguage());
             }
         }
@@ -131,6 +164,10 @@ protected function pushLanguage()
 
     /**
      * Get the form contents
+     *
+     * @return string
+     *
+     * @throws \InvalidArgumentException
      */
     public function getContent()
     {
@@ -156,11 +193,10 @@ public function getContent()
      */
     protected function parse()
     {
-        $formidable = $this;
-        $generate = function() use ($formidable) {
+        $generate = function() {
             // Parses the contents
-            $parser = $formidable->getFactory()->getParser($formidable->getContent());
-            $formidable->isCached = false;
+            $parser = $this->getFactory()->getParser($this->getContent());
+            $this->isCached = false;
 
             return $parser;
         };
@@ -240,6 +276,10 @@ public function getValues()
      */
     public function setValues($values, array $files = array())
     {
+        /**
+         * @var string $name
+         * @var Field $field
+         */
         foreach ($this->getFields() as $name => $field) {
             $name = $field->getBaseName();
             $index = $field->getIndex();
@@ -298,6 +338,7 @@ public function setData($entity)
             $this->accessor = new PropertyAccessor;
         }
 
+        /** @var Field $field */
         foreach ($this->getFields() as $field) {
             if (is_object($field)) {
                 if (($mapping = $field->getMappingName()) && !$field->readOnly()) {
@@ -316,6 +357,9 @@ public function setData($entity)
 
     /**
      * Defines a field value
+     *
+     * @param string $name
+     * @param mixed $value
      */
     public function setValue($name, $value)
     {
@@ -324,6 +368,9 @@ public function setValue($name, $value)
 
     /**
      * Defines a placeholder value
+     *
+     * @param string $name
+     * @param mixed $value
      */
     public function setPlaceholder($name, $value)
     {
@@ -332,6 +379,10 @@ public function setPlaceholder($name, $value)
 
     /**
      * Gets a field value
+     *
+     * @param string $name
+     *
+     * @return mixed
      */
     public function getValue($name)
     {
@@ -340,6 +391,9 @@ public function getValue($name)
 
     /**
      * Add a constraint on a field
+     *
+     * @param string $name
+     * @param \Closure|callable $closure
      */
     public function addConstraint($name, $closure = null)
     {
@@ -357,6 +411,10 @@ public function addConstraint($name, $closure = null)
 
     /**
      * Defines an attribute value
+     *
+     * @param string $name Field name
+     * @param string $attribute Attribute name
+     * @param string $value Attribute value
      */
     public function setAttribute($name, $attribute, $value)
     {
@@ -381,19 +439,28 @@ public function setOptionClass($select, $val, $class)
 
     /**
      * Get a field
+     *
+     * @return Field
      */
     public function getField($name)
     {
         return $this->parserData->getField($name);
     }
 
+    /**
+     * Get all fields
+     *
+     * @return array [Field,...]
+     */
     public function getFields()
     {
         return $this->parserData->getFields();
     }
 
     /**
-     * Convert to HTML
+     * @proxy getHtml()
+     *
+     * @return string Html string
      */
     public function __toString()
     {
@@ -402,6 +469,8 @@ public function __toString()
 
     /**
      * Get the JavaScript code to embed
+     *
+     * @return string Html script tag
      */
     public function getJs()
     {
@@ -415,6 +484,8 @@ public function getJs()
 
     /**
      * Convert to HTML
+     *
+     * @return string HTML
      */
     public function getHtml()
     {
@@ -441,6 +512,8 @@ public function getHtml()
 
     /**
      * Error checking
+     *
+     * @return array [Error,...]
      */
     public function check()
     {
@@ -474,16 +547,25 @@ public function check()
 
     /**
      * Values sourcing
+     *
+     * @param string $source
+     * @param mixed $data
      */
     public function source($source, $data)
     {
-        $sources = $this->parserData->getSources();
-
-        $sources[$source]->source($data);
+        $this->parserData
+            ->getSources()[$source]
+            ->source($data);
     }
 
     /**
      * Gets the data using mapping
+     *
+     * Side effect:?
+     *
+     * @param array $entity
+     *
+     * @return ?
      */
     public function getData($entity = array())
     {
@@ -506,6 +588,10 @@ public function getData($entity = array())
 
     /**
      * Get a field's value
+     *
+     * @param string $name
+     *
+     * @return mixed
      */
     public function __get($name)
     {
@@ -514,6 +600,9 @@ public function __get($name)
 
     /**
      * Set a field value
+     *
+     * @param string $var
+     * @param mixed $val
      */
     public function __set($var, $val)
     {
@@ -522,6 +611,8 @@ public function __set($var, $val)
 
     /**
      * Get the CSRF manager
+     *
+     * @return PostIndicator|null
      */
     public function getPostIndicator()
     {
@@ -536,6 +627,8 @@ public function getPostIndicator()
 
     /**
      * Gets the post indicator
+     *
+     * @return string
      */
     public function getToken()
     {
@@ -544,6 +637,12 @@ public function getToken()
 
     /**
      * Check if the form was posted
+     *
+     * Side effect: will set form values according to $_GET, $_POST and $_FILES
+     *
+     * @param string $method
+     *
+     * @return bool
      */
     public function posted($method = 'post')
     {
@@ -563,8 +662,13 @@ public function posted($method = 'post')
 
     /**
      * Check a form, helper function
+     *
+     * @param callable|null $callback
+     * @param callable|null $errorsCallback
+     *
+     * @return array
      */
-    public function handle($callback = null, $errorsCallback = null)
+    public function handle(callable $callback = null, callable $errorsCallback = null)
     {
         if ($this->posted()) {
             $errors = $this->check();
diff --git a/Formidable.php b/src/Formidable.php
similarity index 100%
rename from Formidable.php
rename to src/Formidable.php
diff --git a/Head.php b/src/Head.php
similarity index 100%
rename from Head.php
rename to src/Head.php
diff --git a/Js/formidable.js b/src/Js/formidable.js
similarity index 100%
rename from Js/formidable.js
rename to src/Js/formidable.js
diff --git a/Language/English.php b/src/Language/English.php
similarity index 100%
rename from Language/English.php
rename to src/Language/English.php
diff --git a/Language/French.php b/src/Language/French.php
similarity index 100%
rename from Language/French.php
rename to src/Language/French.php
diff --git a/Language/German.php b/src/Language/German.php
similarity index 100%
rename from Language/German.php
rename to src/Language/German.php
diff --git a/Language/Language.php b/src/Language/Language.php
similarity index 100%
rename from Language/Language.php
rename to src/Language/Language.php
diff --git a/Language/LanguageAware.php b/src/Language/LanguageAware.php
similarity index 100%
rename from Language/LanguageAware.php
rename to src/Language/LanguageAware.php
diff --git a/Language/Spanish.php b/src/Language/Spanish.php
similarity index 100%
rename from Language/Spanish.php
rename to src/Language/Spanish.php
diff --git a/Language/Turkish.php b/src/Language/Turkish.php
similarity index 99%
rename from Language/Turkish.php
rename to src/Language/Turkish.php
index 9d7a47c..9f100d1 100644
--- a/Language/Turkish.php
+++ b/src/Language/Turkish.php
@@ -1,6 +1,4 @@
-
 <?php
-
 namespace Gregwar\Formidable\Language;
 
 class Turkish extends Language
diff --git a/Parser.php b/src/Parser.php
similarity index 100%
rename from Parser.php
rename to src/Parser.php
diff --git a/ParserData.php b/src/ParserData.php
similarity index 95%
rename from ParserData.php
rename to src/ParserData.php
index a0d1003..703485e 100644
--- a/ParserData.php
+++ b/src/ParserData.php
@@ -52,6 +52,7 @@ public function getData()
 
     /**
      * Fields mapped by name
+     * @return array
      */
     public function getFields()
     {
@@ -92,6 +93,10 @@ public function needJs()
 
     /**
      * Gets a field
+     *
+     * @return Field
+     *
+     * @throws \InvalidArgumentException
      */
     public function getField($name)
     {
diff --git a/ParserException.php b/src/ParserException.php
similarity index 100%
rename from ParserException.php
rename to src/ParserException.php
diff --git a/Placeholder.php b/src/Placeholder.php
similarity index 100%
rename from Placeholder.php
rename to src/Placeholder.php
diff --git a/PostIndicator.php b/src/PostIndicator.php
similarity index 100%
rename from PostIndicator.php
rename to src/PostIndicator.php
diff --git a/tests/ConstraintsTests.php b/test/ConstraintsTest.php
similarity index 95%
rename from tests/ConstraintsTests.php
rename to test/ConstraintsTest.php
index 73ee7d1..17e3963 100644
--- a/tests/ConstraintsTests.php
+++ b/test/ConstraintsTest.php
@@ -1,4 +1,5 @@
 <?php
+namespace Test\Gregwar\Formidable;
 
 use Gregwar\Formidable\Form;
 use Gregwar\Formidable\Factory;
@@ -20,7 +21,7 @@ public function save($filename)
  *
  * @author Grégoire Passault <g.passault@gmail.com>
  */
-class ConstraintsTests extends \PHPUnit\Framework\TestCase
+class ConstraintsTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Testing rendering a required field
@@ -213,6 +214,10 @@ public function testCustomConstraintType()
      */
     public function testCaptcha()
     {
+        if (!function_exists('imagettfbbox')) {
+            $this->markTestSkipped('No TrueType support');
+            return;
+        }
         $form = $this->getForm('captcha.html');
         $html = "$form";
 
@@ -241,6 +246,10 @@ public function testCaptcha()
      */
     public function testCaptchaNotReusable()
     {
+        if (!function_exists('imagettfbbox')) {
+            $this->markTestSkipped('No TrueType support');
+            return;
+        }
         $form = $this->getForm('captcha.html');
         $html = "$form";
 
@@ -558,9 +567,9 @@ public function testMultiCheckBoxSetValue()
     public function testFile()
     {
         $factory = new Factory;
-        $factory->registerType('file', '\FileField_NoSave');
-        $form = $factory->getForm(__DIR__.'/files/form/upload.html');
-        $file = __DIR__.'/files/upload/test.txt';
+        $factory->registerType('file', '\Test\Gregwar\Formidable\FileField_NoSave');
+        $form = $factory->getForm(__DIR__.'/fixtures/form/upload.html');
+        $file = __DIR__.'/fixtures/upload/test.txt';
         $hash = sha1(file_get_contents($file));
 
         $this->assertContains('file', "$form");
@@ -577,7 +586,7 @@ public function testFile()
         $this->assertEquals($hash, $form->attachement->save(null));
         $this->assertEquals('test.txt', $form->getField('attachement')->fileName());
 
-        $file = __DIR__.'/files/upload/long.txt';
+        $file = __DIR__.'/fixtures/upload/long.txt';
         $this->assertRefuse($form, array(), array(
             'attachement' => array(
                 'size' => filesize($file),
@@ -593,9 +602,9 @@ public function testFile()
     public function testMultipleFiles()
     {
         $factory = new Factory;
-        $factory->registerType('file', '\FileField_NoSave');
-        $form = $factory->getForm(__DIR__.'/files/form/multiple_file.html');
-        $file = __DIR__.'/files/upload/test.txt';
+        $factory->registerType('file', '\Test\Gregwar\Formidable\FileField_NoSave');
+        $form = $factory->getForm(__DIR__.'/fixtures/form/multiple_file.html');
+        $file = __DIR__.'/fixtures/upload/test.txt';
 
         $this->assertAccept($form, array(), array(
             'files' => array(
@@ -636,7 +645,7 @@ public function testFileImage()
     {
         $form = $this->getForm('upload_image.html');
 
-        $file = __DIR__.'/files/upload/image.jpg';
+        $file = __DIR__.'/fixtures/upload/image.jpg';
         $this->assertAccept($form, array(), array(
             'photo' => array(
                 'size' => filesize($file),
@@ -645,7 +654,7 @@ public function testFileImage()
             )
         ));
 
-        $file = __DIR__.'/files/upload/test.txt';
+        $file = __DIR__.'/fixtures/upload/test.txt';
         $this->assertRefuse($form, array(), array(
             'photo' => array(
                 'size' => filesize($file),
@@ -934,7 +943,7 @@ private function assertRefuse($form, $data, $files = array()) {
 
     private function getForm($file)
     {
-        return new Form(__DIR__.'/files/form/'.$file);
+        return new Form(__DIR__.'/fixtures/form/'.$file);
     }
 
     public function setup()
diff --git a/tests/FactoryTests.php b/test/FactoryTest.php
similarity index 76%
rename from tests/FactoryTests.php
rename to test/FactoryTest.php
index 9347b29..8703b91 100644
--- a/tests/FactoryTests.php
+++ b/test/FactoryTest.php
@@ -1,4 +1,5 @@
 <?php
+namespace Test\Gregwar\Formidable;
 
 use Gregwar\Formidable\Factory;
 
@@ -7,7 +8,7 @@
  *
  * @author Grégoire Passault <g.passault@gmail.com>
  */
-class FactoryTests extends \PHPUnit\Framework\TestCase
+class FactoryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Testing creating forms using the factory
@@ -15,7 +16,7 @@ class FactoryTests extends \PHPUnit\Framework\TestCase
     public function testFactoryCreation()
     {
         $factory = new Factory;
-        $form = $factory->getForm(__DIR__.'/files/factory/form.html');
+        $form = $factory->getForm(__DIR__.'/fixtures/context/form.html');
 
         $html = "$form";
         $this->assertContains('test', $html);
@@ -30,7 +31,7 @@ public function testFactoryCustomType()
         $factory = new Factory;
         $factory->registerType('testing', '\Gregwar\Formidable\Fields\TextField');
 
-        $form = $factory->getForm(__DIR__.'/files/factory/testing.html');
+        $form = $factory->getForm(__DIR__.'/fixtures/context/testing.html');
         $html = "$form";
         $this->assertContains('text', $html);
         $this->assertEquals('Hello', $form->test);
diff --git a/tests/FormTests.php b/test/FormTest.php
similarity index 97%
rename from tests/FormTests.php
rename to test/FormTest.php
index 1b90c4d..71c5837 100644
--- a/tests/FormTests.php
+++ b/test/FormTest.php
@@ -1,14 +1,16 @@
 <?php
+namespace Test\Gregwar\Formidable;
 
 use Gregwar\Formidable\Form;
 use Gregwar\Formidable\PostIndicator;
+use Gregwar\Cache\Cache;
 
 /**
  * Testing Formidable forms
  *
  * @author Grégoire Passault <g.passault@gmail.com>
  */
-class FormTests extends \PHPUnit\Framework\TestCase
+class FormTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Testing that toString() give the same thing as getHtml()
@@ -286,7 +288,7 @@ public function testPlaceholder()
      */
     public function testCache()
     {
-        $cache = new Gregwar\Cache\Cache;
+        $cache = new Cache();
         $cache->setCacheDirectory($this->getCacheDirectory());
 
         $form = $this->getForm('basic.html', null, $cache);
@@ -323,7 +325,7 @@ public function testSourceOrder()
 
     private function getForm($file, $vars = array(), $cache = false)
     {
-        return new Form(__DIR__.'/files/form/'.$file, $vars, $cache);
+        return new Form(__DIR__.'/fixtures/form/'.$file, $vars, $cache);
     }
 
     public function setup()
diff --git a/tests/ParserTests.php b/test/ParserTest.php
similarity index 96%
rename from tests/ParserTests.php
rename to test/ParserTest.php
index d067be5..c5e1608 100644
--- a/tests/ParserTests.php
+++ b/test/ParserTest.php
@@ -1,4 +1,5 @@
 <?php
+namespace Test\Gregwar\Formidable;
 
 use Gregwar\Formidable\Parser;
 use Gregwar\Formidable\ParserException;
@@ -8,7 +9,7 @@
  *
  * @author Grégoire Passault <g.passault@gmail.com>
  */
-class ParserTests extends \PHPUnit\Framework\TestCase
+class ParserTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Testing the returns of a basic parse
@@ -145,6 +146,6 @@ public function testOptionOutOfSelectException()
 
     private function getParser($file)
     {
-        return new Parser(file_get_contents(__DIR__.'/files/parser/'.$file));
+        return new Parser(file_get_contents(__DIR__.'/fixtures/parser/'.$file));
     }
 }
diff --git a/tests/files/context/form.html b/test/fixtures/context/form.html
similarity index 100%
rename from tests/files/context/form.html
rename to test/fixtures/context/form.html
diff --git a/tests/files/context/testing.html b/test/fixtures/context/testing.html
similarity index 100%
rename from tests/files/context/testing.html
rename to test/fixtures/context/testing.html
diff --git a/tests/files/form/array.html b/test/fixtures/form/array.html
similarity index 100%
rename from tests/files/form/array.html
rename to test/fixtures/form/array.html
diff --git a/tests/files/form/attributes.html b/test/fixtures/form/attributes.html
similarity index 100%
rename from tests/files/form/attributes.html
rename to test/fixtures/form/attributes.html
diff --git a/tests/files/form/bad_type.html b/test/fixtures/form/bad_type.html
similarity index 100%
rename from tests/files/form/bad_type.html
rename to test/fixtures/form/bad_type.html
diff --git a/tests/files/form/basic.html b/test/fixtures/form/basic.html
similarity index 100%
rename from tests/files/form/basic.html
rename to test/fixtures/form/basic.html
diff --git a/tests/files/form/button.html b/test/fixtures/form/button.html
similarity index 100%
rename from tests/files/form/button.html
rename to test/fixtures/form/button.html
diff --git a/tests/files/form/captcha.html b/test/fixtures/form/captcha.html
similarity index 100%
rename from tests/files/form/captcha.html
rename to test/fixtures/form/captcha.html
diff --git a/tests/files/form/chk_array.html b/test/fixtures/form/chk_array.html
similarity index 100%
rename from tests/files/form/chk_array.html
rename to test/fixtures/form/chk_array.html
diff --git a/tests/files/form/custom-constraint.html b/test/fixtures/form/custom-constraint.html
similarity index 100%
rename from tests/files/form/custom-constraint.html
rename to test/fixtures/form/custom-constraint.html
diff --git a/tests/files/form/custom.php b/test/fixtures/form/custom.php
similarity index 100%
rename from tests/files/form/custom.php
rename to test/fixtures/form/custom.php
diff --git a/tests/files/form/date.html b/test/fixtures/form/date.html
similarity index 100%
rename from tests/files/form/date.html
rename to test/fixtures/form/date.html
diff --git a/tests/files/form/empty.html b/test/fixtures/form/empty.html
similarity index 100%
rename from tests/files/form/empty.html
rename to test/fixtures/form/empty.html
diff --git a/tests/files/form/empty2.html b/test/fixtures/form/empty2.html
similarity index 100%
rename from tests/files/form/empty2.html
rename to test/fixtures/form/empty2.html
diff --git a/tests/files/form/enctype_file.html b/test/fixtures/form/enctype_file.html
similarity index 100%
rename from tests/files/form/enctype_file.html
rename to test/fixtures/form/enctype_file.html
diff --git a/tests/files/form/enctype_normal.html b/test/fixtures/form/enctype_normal.html
similarity index 100%
rename from tests/files/form/enctype_normal.html
rename to test/fixtures/form/enctype_normal.html
diff --git a/tests/files/form/escape.html b/test/fixtures/form/escape.html
similarity index 100%
rename from tests/files/form/escape.html
rename to test/fixtures/form/escape.html
diff --git a/tests/files/form/hidden.html b/test/fixtures/form/hidden.html
similarity index 100%
rename from tests/files/form/hidden.html
rename to test/fixtures/form/hidden.html
diff --git a/tests/files/form/maxlength.html b/test/fixtures/form/maxlength.html
similarity index 100%
rename from tests/files/form/maxlength.html
rename to test/fixtures/form/maxlength.html
diff --git a/tests/files/form/minlength.html b/test/fixtures/form/minlength.html
similarity index 100%
rename from tests/files/form/minlength.html
rename to test/fixtures/form/minlength.html
diff --git a/tests/files/form/minmax.html b/test/fixtures/form/minmax.html
similarity index 100%
rename from tests/files/form/minmax.html
rename to test/fixtures/form/minmax.html
diff --git a/tests/files/form/multicheckbox.html b/test/fixtures/form/multicheckbox.html
similarity index 100%
rename from tests/files/form/multicheckbox.html
rename to test/fixtures/form/multicheckbox.html
diff --git a/tests/files/form/multiple.html b/test/fixtures/form/multiple.html
similarity index 100%
rename from tests/files/form/multiple.html
rename to test/fixtures/form/multiple.html
diff --git a/tests/files/form/multiple_file.html b/test/fixtures/form/multiple_file.html
similarity index 100%
rename from tests/files/form/multiple_file.html
rename to test/fixtures/form/multiple_file.html
diff --git a/tests/files/form/multiple_fixed.html b/test/fixtures/form/multiple_fixed.html
similarity index 100%
rename from tests/files/form/multiple_fixed.html
rename to test/fixtures/form/multiple_fixed.html
diff --git a/tests/files/form/multiradio.html b/test/fixtures/form/multiradio.html
similarity index 100%
rename from tests/files/form/multiradio.html
rename to test/fixtures/form/multiradio.html
diff --git a/tests/files/form/multiradio_optional.html b/test/fixtures/form/multiradio_optional.html
similarity index 100%
rename from tests/files/form/multiradio_optional.html
rename to test/fixtures/form/multiradio_optional.html
diff --git a/tests/files/form/optional.html b/test/fixtures/form/optional.html
similarity index 100%
rename from tests/files/form/optional.html
rename to test/fixtures/form/optional.html
diff --git a/tests/files/form/options.html b/test/fixtures/form/options.html
similarity index 100%
rename from tests/files/form/options.html
rename to test/fixtures/form/options.html
diff --git a/tests/files/form/out_in.html b/test/fixtures/form/out_in.html
similarity index 100%
rename from tests/files/form/out_in.html
rename to test/fixtures/form/out_in.html
diff --git a/tests/files/form/passwords.html b/test/fixtures/form/passwords.html
similarity index 100%
rename from tests/files/form/passwords.html
rename to test/fixtures/form/passwords.html
diff --git a/tests/files/form/placeholder.html b/test/fixtures/form/placeholder.html
similarity index 100%
rename from tests/files/form/placeholder.html
rename to test/fixtures/form/placeholder.html
diff --git a/tests/files/form/placeholder_multiline.html b/test/fixtures/form/placeholder_multiline.html
similarity index 100%
rename from tests/files/form/placeholder_multiline.html
rename to test/fixtures/form/placeholder_multiline.html
diff --git a/tests/files/form/post-indicator.html b/test/fixtures/form/post-indicator.html
similarity index 100%
rename from tests/files/form/post-indicator.html
rename to test/fixtures/form/post-indicator.html
diff --git a/tests/files/form/post-values.html b/test/fixtures/form/post-values.html
similarity index 100%
rename from tests/files/form/post-values.html
rename to test/fixtures/form/post-values.html
diff --git a/tests/files/form/radios.html b/test/fixtures/form/radios.html
similarity index 100%
rename from tests/files/form/radios.html
rename to test/fixtures/form/radios.html
diff --git a/tests/files/form/readonly.html b/test/fixtures/form/readonly.html
similarity index 100%
rename from tests/files/form/readonly.html
rename to test/fixtures/form/readonly.html
diff --git a/tests/files/form/regex.html b/test/fixtures/form/regex.html
similarity index 100%
rename from tests/files/form/regex.html
rename to test/fixtures/form/regex.html
diff --git a/tests/files/form/required.html b/test/fixtures/form/required.html
similarity index 100%
rename from tests/files/form/required.html
rename to test/fixtures/form/required.html
diff --git a/tests/files/form/reset.html b/test/fixtures/form/reset.html
similarity index 100%
rename from tests/files/form/reset.html
rename to test/fixtures/form/reset.html
diff --git a/tests/files/form/select-multiple.html b/test/fixtures/form/select-multiple.html
similarity index 100%
rename from tests/files/form/select-multiple.html
rename to test/fixtures/form/select-multiple.html
diff --git a/tests/files/form/select-required.html b/test/fixtures/form/select-required.html
similarity index 100%
rename from tests/files/form/select-required.html
rename to test/fixtures/form/select-required.html
diff --git a/tests/files/form/select.html b/test/fixtures/form/select.html
similarity index 100%
rename from tests/files/form/select.html
rename to test/fixtures/form/select.html
diff --git a/tests/files/form/source.html b/test/fixtures/form/source.html
similarity index 100%
rename from tests/files/form/source.html
rename to test/fixtures/form/source.html
diff --git a/tests/files/form/step.html b/test/fixtures/form/step.html
similarity index 100%
rename from tests/files/form/step.html
rename to test/fixtures/form/step.html
diff --git a/tests/files/form/step_default.html b/test/fixtures/form/step_default.html
similarity index 100%
rename from tests/files/form/step_default.html
rename to test/fixtures/form/step_default.html
diff --git a/tests/files/form/step_default_int.html b/test/fixtures/form/step_default_int.html
similarity index 100%
rename from tests/files/form/step_default_int.html
rename to test/fixtures/form/step_default_int.html
diff --git a/tests/files/form/test.html b/test/fixtures/form/test.html
similarity index 100%
rename from tests/files/form/test.html
rename to test/fixtures/form/test.html
diff --git a/tests/files/form/upload.html b/test/fixtures/form/upload.html
similarity index 100%
rename from tests/files/form/upload.html
rename to test/fixtures/form/upload.html
diff --git a/tests/files/form/upload_image.html b/test/fixtures/form/upload_image.html
similarity index 100%
rename from tests/files/form/upload_image.html
rename to test/fixtures/form/upload_image.html
diff --git a/tests/files/form/values.html b/test/fixtures/form/values.html
similarity index 100%
rename from tests/files/form/values.html
rename to test/fixtures/form/values.html
diff --git a/tests/files/parser/attributes.html b/test/fixtures/parser/attributes.html
similarity index 100%
rename from tests/files/parser/attributes.html
rename to test/fixtures/parser/attributes.html
diff --git a/tests/files/parser/basic.html b/test/fixtures/parser/basic.html
similarity index 100%
rename from tests/files/parser/basic.html
rename to test/fixtures/parser/basic.html
diff --git a/tests/files/parser/form_presence.html b/test/fixtures/parser/form_presence.html
similarity index 100%
rename from tests/files/parser/form_presence.html
rename to test/fixtures/parser/form_presence.html
diff --git a/tests/files/parser/head.html b/test/fixtures/parser/head.html
similarity index 100%
rename from tests/files/parser/head.html
rename to test/fixtures/parser/head.html
diff --git a/tests/files/parser/option_out_of_select.html b/test/fixtures/parser/option_out_of_select.html
similarity index 100%
rename from tests/files/parser/option_out_of_select.html
rename to test/fixtures/parser/option_out_of_select.html
diff --git a/tests/files/parser/types.html b/test/fixtures/parser/types.html
similarity index 100%
rename from tests/files/parser/types.html
rename to test/fixtures/parser/types.html
diff --git a/tests/files/parser/untyped_input.html b/test/fixtures/parser/untyped_input.html
similarity index 100%
rename from tests/files/parser/untyped_input.html
rename to test/fixtures/parser/untyped_input.html
diff --git a/tests/files/parser/values.html b/test/fixtures/parser/values.html
similarity index 100%
rename from tests/files/parser/values.html
rename to test/fixtures/parser/values.html
diff --git a/tests/files/upload/image.jpg b/test/fixtures/upload/image.jpg
similarity index 100%
rename from tests/files/upload/image.jpg
rename to test/fixtures/upload/image.jpg
diff --git a/tests/files/upload/long.txt b/test/fixtures/upload/long.txt
similarity index 100%
rename from tests/files/upload/long.txt
rename to test/fixtures/upload/long.txt
diff --git a/tests/files/upload/test.txt b/test/fixtures/upload/test.txt
similarity index 100%
rename from tests/files/upload/test.txt
rename to test/fixtures/upload/test.txt
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index 8d96fac..0000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-// backward compatibility
-if (!class_exists('\PHPUnit\Framework\TestCase') &&
-    class_exists('\PHPUnit_Framework_TestCase')) {
-    class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase');
-}
-
-/**
- * Loading files to bootstrap testing
- *
- * @author Grégoire Passault <g.passault@gmail.com>
- */
-include(__DIR__.'/../autoload.php');
-