diff --git a/composer.json b/composer.json
index f8f9e0230..2f38ab24a 100644
--- a/composer.json
+++ b/composer.json
@@ -51,7 +51,8 @@
       "core",
       "application",
       "sources/application",
-      "sources/Composer"
+      "sources/Composer",
+      "sources/Renderer"
     ],
     "exclude-from-classmap": [
       "core/dbobjectsearch.class.php",
diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php
index 23a433436..235f9c65d 100644
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -153,6 +153,21 @@ return array(
     'Combodo\\iTop\\Composer\\iTopComposer' => $baseDir . '/sources/Composer/iTopComposer.php',
     'Combodo\\iTop\\DesignDocument' => $baseDir . '/core/designdocument.class.inc.php',
     'Combodo\\iTop\\DesignElement' => $baseDir . '/core/designdocument.class.inc.php',
+    'Combodo\\iTop\\Renderer\\Bootstrap\\BsFormRenderer' => $baseDir . '/sources/Renderer/Bootstrap/BsFormRenderer.php',
+    'Combodo\\iTop\\Renderer\\Bootstrap\\FieldRenderer\\BsFieldRenderer' => $baseDir . '/sources/Renderer/Bootstrap/FieldRenderer/BsFieldRenderer.php',
+    'Combodo\\iTop\\Renderer\\Bootstrap\\FieldRenderer\\BsFileUploadFieldRenderer' => $baseDir . '/sources/Renderer/Bootstrap/FieldRenderer/BsFileUploadFieldRenderer.php',
+    'Combodo\\iTop\\Renderer\\Bootstrap\\FieldRenderer\\BsLinkedSetFieldRenderer' => $baseDir . '/sources/Renderer/Bootstrap/FieldRenderer/BsLinkedSetFieldRenderer.php',
+    'Combodo\\iTop\\Renderer\\Bootstrap\\FieldRenderer\\BsSelectObjectFieldRenderer' => $baseDir . '/sources/Renderer/Bootstrap/FieldRenderer/BsSelectObjectFieldRenderer.php',
+    'Combodo\\iTop\\Renderer\\Bootstrap\\FieldRenderer\\BsSetFieldRenderer' => $baseDir . '/sources/Renderer/Bootstrap/FieldRenderer/BsSetFieldRenderer.php',
+    'Combodo\\iTop\\Renderer\\Bootstrap\\FieldRenderer\\BsSimpleFieldRenderer' => $baseDir . '/sources/Renderer/Bootstrap/FieldRenderer/BsSimpleFieldRenderer.php',
+    'Combodo\\iTop\\Renderer\\Bootstrap\\FieldRenderer\\BsSubFormFieldRenderer' => $baseDir . '/sources/Renderer/Bootstrap/FieldRenderer/BsSubFormFieldRenderer.php',
+    'Combodo\\iTop\\Renderer\\Console\\ConsoleFormRenderer' => $baseDir . '/sources/Renderer/Console/ConsoleFormRenderer.php',
+    'Combodo\\iTop\\Renderer\\Console\\FieldRenderer\\ConsoleSelectObjectFieldRenderer' => $baseDir . '/sources/Renderer/Console/FieldRenderer/ConsoleSelectObjectFieldRenderer.php',
+    'Combodo\\iTop\\Renderer\\Console\\FieldRenderer\\ConsoleSimpleFieldRenderer' => $baseDir . '/sources/Renderer/Console/FieldRenderer/ConsoleSimpleFieldRenderer.php',
+    'Combodo\\iTop\\Renderer\\Console\\FieldRenderer\\ConsoleSubFormFieldRenderer' => $baseDir . '/sources/Renderer/Console/FieldRenderer/ConsoleSubFormFieldRenderer.php',
+    'Combodo\\iTop\\Renderer\\FieldRenderer' => $baseDir . '/sources/Renderer/FieldRenderer.php',
+    'Combodo\\iTop\\Renderer\\FormRenderer' => $baseDir . '/sources/Renderer/FormRenderer.php',
+    'Combodo\\iTop\\Renderer\\RenderingOutput' => $baseDir . '/sources/Renderer/RenderingOutput.php',
     'Combodo\\iTop\\TwigExtension' => $baseDir . '/application/twigextension.class.inc.php',
     'Config' => $baseDir . '/core/config.class.inc.php',
     'ConfigException' => $baseDir . '/core/config.class.inc.php',
diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php
index ab1d94aec..1d291e148 100644
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -383,6 +383,21 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'Combodo\\iTop\\Composer\\iTopComposer' => __DIR__ . '/../..' . '/sources/Composer/iTopComposer.php',
         'Combodo\\iTop\\DesignDocument' => __DIR__ . '/../..' . '/core/designdocument.class.inc.php',
         'Combodo\\iTop\\DesignElement' => __DIR__ . '/../..' . '/core/designdocument.class.inc.php',
+        'Combodo\\iTop\\Renderer\\Bootstrap\\BsFormRenderer' => __DIR__ . '/../..' . '/sources/Renderer/Bootstrap/BsFormRenderer.php',
+        'Combodo\\iTop\\Renderer\\Bootstrap\\FieldRenderer\\BsFieldRenderer' => __DIR__ . '/../..' . '/sources/Renderer/Bootstrap/FieldRenderer/BsFieldRenderer.php',
+        'Combodo\\iTop\\Renderer\\Bootstrap\\FieldRenderer\\BsFileUploadFieldRenderer' => __DIR__ . '/../..' . '/sources/Renderer/Bootstrap/FieldRenderer/BsFileUploadFieldRenderer.php',
+        'Combodo\\iTop\\Renderer\\Bootstrap\\FieldRenderer\\BsLinkedSetFieldRenderer' => __DIR__ . '/../..' . '/sources/Renderer/Bootstrap/FieldRenderer/BsLinkedSetFieldRenderer.php',
+        'Combodo\\iTop\\Renderer\\Bootstrap\\FieldRenderer\\BsSelectObjectFieldRenderer' => __DIR__ . '/../..' . '/sources/Renderer/Bootstrap/FieldRenderer/BsSelectObjectFieldRenderer.php',
+        'Combodo\\iTop\\Renderer\\Bootstrap\\FieldRenderer\\BsSetFieldRenderer' => __DIR__ . '/../..' . '/sources/Renderer/Bootstrap/FieldRenderer/BsSetFieldRenderer.php',
+        'Combodo\\iTop\\Renderer\\Bootstrap\\FieldRenderer\\BsSimpleFieldRenderer' => __DIR__ . '/../..' . '/sources/Renderer/Bootstrap/FieldRenderer/BsSimpleFieldRenderer.php',
+        'Combodo\\iTop\\Renderer\\Bootstrap\\FieldRenderer\\BsSubFormFieldRenderer' => __DIR__ . '/../..' . '/sources/Renderer/Bootstrap/FieldRenderer/BsSubFormFieldRenderer.php',
+        'Combodo\\iTop\\Renderer\\Console\\ConsoleFormRenderer' => __DIR__ . '/../..' . '/sources/Renderer/Console/ConsoleFormRenderer.php',
+        'Combodo\\iTop\\Renderer\\Console\\FieldRenderer\\ConsoleSelectObjectFieldRenderer' => __DIR__ . '/../..' . '/sources/Renderer/Console/FieldRenderer/ConsoleSelectObjectFieldRenderer.php',
+        'Combodo\\iTop\\Renderer\\Console\\FieldRenderer\\ConsoleSimpleFieldRenderer' => __DIR__ . '/../..' . '/sources/Renderer/Console/FieldRenderer/ConsoleSimpleFieldRenderer.php',
+        'Combodo\\iTop\\Renderer\\Console\\FieldRenderer\\ConsoleSubFormFieldRenderer' => __DIR__ . '/../..' . '/sources/Renderer/Console/FieldRenderer/ConsoleSubFormFieldRenderer.php',
+        'Combodo\\iTop\\Renderer\\FieldRenderer' => __DIR__ . '/../..' . '/sources/Renderer/FieldRenderer.php',
+        'Combodo\\iTop\\Renderer\\FormRenderer' => __DIR__ . '/../..' . '/sources/Renderer/FormRenderer.php',
+        'Combodo\\iTop\\Renderer\\RenderingOutput' => __DIR__ . '/../..' . '/sources/Renderer/RenderingOutput.php',
         'Combodo\\iTop\\TwigExtension' => __DIR__ . '/../..' . '/application/twigextension.class.inc.php',
         'Config' => __DIR__ . '/../..' . '/core/config.class.inc.php',
         'ConfigException' => __DIR__ . '/../..' . '/core/config.class.inc.php',
diff --git a/sources/renderer/bootstrap/bsformrenderer.class.inc.php b/sources/Renderer/Bootstrap/BsFormRenderer.php
similarity index 100%
rename from sources/renderer/bootstrap/bsformrenderer.class.inc.php
rename to sources/Renderer/Bootstrap/BsFormRenderer.php
diff --git a/sources/renderer/bootstrap/fieldrenderer/bsfieldrenderer.class.inc.php b/sources/Renderer/Bootstrap/FieldRenderer/BsFieldRenderer.php
similarity index 100%
rename from sources/renderer/bootstrap/fieldrenderer/bsfieldrenderer.class.inc.php
rename to sources/Renderer/Bootstrap/FieldRenderer/BsFieldRenderer.php
diff --git a/sources/renderer/bootstrap/fieldrenderer/bsfileuploadfieldrenderer.class.inc.php b/sources/Renderer/Bootstrap/FieldRenderer/BsFileUploadFieldRenderer.php
similarity index 100%
rename from sources/renderer/bootstrap/fieldrenderer/bsfileuploadfieldrenderer.class.inc.php
rename to sources/Renderer/Bootstrap/FieldRenderer/BsFileUploadFieldRenderer.php
diff --git a/sources/renderer/bootstrap/fieldrenderer/bslinkedsetfieldrenderer.class.inc.php b/sources/Renderer/Bootstrap/FieldRenderer/BsLinkedSetFieldRenderer.php
similarity index 100%
rename from sources/renderer/bootstrap/fieldrenderer/bslinkedsetfieldrenderer.class.inc.php
rename to sources/Renderer/Bootstrap/FieldRenderer/BsLinkedSetFieldRenderer.php
diff --git a/sources/renderer/bootstrap/fieldrenderer/bsselectobjectfieldrenderer.class.inc.php b/sources/Renderer/Bootstrap/FieldRenderer/BsSelectObjectFieldRenderer.php
similarity index 100%
rename from sources/renderer/bootstrap/fieldrenderer/bsselectobjectfieldrenderer.class.inc.php
rename to sources/Renderer/Bootstrap/FieldRenderer/BsSelectObjectFieldRenderer.php
diff --git a/sources/renderer/bootstrap/fieldrenderer/bssetfieldrenderer.class.inc.php b/sources/Renderer/Bootstrap/FieldRenderer/BsSetFieldRenderer.php
similarity index 100%
rename from sources/renderer/bootstrap/fieldrenderer/bssetfieldrenderer.class.inc.php
rename to sources/Renderer/Bootstrap/FieldRenderer/BsSetFieldRenderer.php
diff --git a/sources/renderer/bootstrap/fieldrenderer/bssimplefieldrenderer.class.inc.php b/sources/Renderer/Bootstrap/FieldRenderer/BsSimpleFieldRenderer.php
similarity index 100%
rename from sources/renderer/bootstrap/fieldrenderer/bssimplefieldrenderer.class.inc.php
rename to sources/Renderer/Bootstrap/FieldRenderer/BsSimpleFieldRenderer.php
diff --git a/sources/renderer/bootstrap/fieldrenderer/bssubformfieldrenderer.class.inc.php b/sources/Renderer/Bootstrap/FieldRenderer/BsSubFormFieldRenderer.php
similarity index 100%
rename from sources/renderer/bootstrap/fieldrenderer/bssubformfieldrenderer.class.inc.php
rename to sources/Renderer/Bootstrap/FieldRenderer/BsSubFormFieldRenderer.php
diff --git a/sources/renderer/console/consoleformrenderer.class.inc.php b/sources/Renderer/Console/ConsoleFormRenderer.php
similarity index 88%
rename from sources/renderer/console/consoleformrenderer.class.inc.php
rename to sources/Renderer/Console/ConsoleFormRenderer.php
index 2d1dbf2fe..92091f110 100644
--- a/sources/renderer/console/consoleformrenderer.class.inc.php
+++ b/sources/Renderer/Console/ConsoleFormRenderer.php
@@ -21,10 +21,6 @@ namespace Combodo\iTop\Renderer\Console;
 use Combodo\iTop\Form\Form;
 use Combodo\iTop\Renderer\FormRenderer;
 
-require_once('fieldrenderer/consolesimplefieldrenderer.class.inc.php');
-require_once('fieldrenderer/consoleselectobjectfieldrenderer.class.inc.php');
-require_once('fieldrenderer/consolesubformfieldrenderer.class.inc.php');
-
 class ConsoleFormRenderer extends FormRenderer
 {
 	const DEFAULT_RENDERER_NAMESPACE = 'Combodo\\iTop\\Renderer\\Console\\FieldRenderer\\';
diff --git a/sources/renderer/console/fieldrenderer/consoleselectobjectfieldrenderer.class.inc.php b/sources/Renderer/Console/FieldRenderer/ConsoleSelectObjectFieldRenderer.php
similarity index 100%
rename from sources/renderer/console/fieldrenderer/consoleselectobjectfieldrenderer.class.inc.php
rename to sources/Renderer/Console/FieldRenderer/ConsoleSelectObjectFieldRenderer.php
diff --git a/sources/renderer/console/fieldrenderer/consolesimplefieldrenderer.class.inc.php b/sources/Renderer/Console/FieldRenderer/ConsoleSimpleFieldRenderer.php
similarity index 100%
rename from sources/renderer/console/fieldrenderer/consolesimplefieldrenderer.class.inc.php
rename to sources/Renderer/Console/FieldRenderer/ConsoleSimpleFieldRenderer.php
diff --git a/sources/renderer/console/fieldrenderer/consolesubformfieldrenderer.class.inc.php b/sources/Renderer/Console/FieldRenderer/ConsoleSubFormFieldRenderer.php
similarity index 100%
rename from sources/renderer/console/fieldrenderer/consolesubformfieldrenderer.class.inc.php
rename to sources/Renderer/Console/FieldRenderer/ConsoleSubFormFieldRenderer.php
diff --git a/sources/renderer/fieldrenderer.class.inc.php b/sources/Renderer/FieldRenderer.php
similarity index 100%
rename from sources/renderer/fieldrenderer.class.inc.php
rename to sources/Renderer/FieldRenderer.php
diff --git a/sources/renderer/formrenderer.class.inc.php b/sources/Renderer/FormRenderer.php
similarity index 100%
rename from sources/renderer/formrenderer.class.inc.php
rename to sources/Renderer/FormRenderer.php
diff --git a/sources/renderer/renderingoutput.class.inc.php b/sources/Renderer/RenderingOutput.php
similarity index 100%
rename from sources/renderer/renderingoutput.class.inc.php
rename to sources/Renderer/RenderingOutput.php
diff --git a/sources/autoload.php b/sources/autoload.php
index 518eb985c..27e0f7822 100644
--- a/sources/autoload.php
+++ b/sources/autoload.php
@@ -53,14 +53,3 @@ require_once APPROOT . 'sources/form/validator/validator.class.inc.php';
 require_once APPROOT . 'sources/form/validator/mandatoryvalidator.class.inc.php';
 require_once APPROOT . 'sources/form/validator/integervalidator.class.inc.php';
 require_once APPROOT . 'sources/form/validator/notemptyextkeyvalidator.class.inc.php';
-require_once APPROOT . 'sources/renderer/formrenderer.class.inc.php';
-require_once APPROOT . 'sources/renderer/fieldrenderer.class.inc.php';
-require_once APPROOT . 'sources/renderer/renderingoutput.class.inc.php';
-require_once APPROOT . 'sources/renderer/bootstrap/bsformrenderer.class.inc.php';
-require_once APPROOT . 'sources/renderer/bootstrap/fieldrenderer/bsfieldrenderer.class.inc.php';
-require_once APPROOT . 'sources/renderer/bootstrap/fieldrenderer/bssimplefieldrenderer.class.inc.php';
-require_once APPROOT . 'sources/renderer/bootstrap/fieldrenderer/bsselectobjectfieldrenderer.class.inc.php';
-require_once APPROOT . 'sources/renderer/bootstrap/fieldrenderer/bssetfieldrenderer.class.inc.php';
-require_once APPROOT . 'sources/renderer/bootstrap/fieldrenderer/bslinkedsetfieldrenderer.class.inc.php';
-require_once APPROOT . 'sources/renderer/bootstrap/fieldrenderer/bssubformfieldrenderer.class.inc.php';
-require_once APPROOT . 'sources/renderer/bootstrap/fieldrenderer/bsfileuploadfieldrenderer.class.inc.php';