diff --git a/composer.json b/composer.json
index 536e71e68..3cb4e6bf1 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
     },
     "autoload": {
         "psr-0": { 
-            "": "local/plugins/",
+            "": "local/modules/",
             "Thelia" : "core/lib/"
         }
     },
diff --git a/composer.lock b/composer.lock
index 4b7adeb60..03f55c3bd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3,7 +3,7 @@
         "This file locks the dependencies of your project to a known state",
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
     ],
-    "hash": "01f45cf9b2249fce35b127051f36f68d",
+    "hash": "fed0f90bca039760e3021c1febd59371",
     "packages": [
         {
             "name": "ezyang/htmlpurifier",
@@ -55,12 +55,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/ircmaxell/password_compat.git",
-                "reference": "733c06c599bfeb511f54253ddb127701bce0917d"
+                "reference": "6925da603b31bfff9488480c0a9db48a0feeadf1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/733c06c599bfeb511f54253ddb127701bce0917d",
-                "reference": "733c06c599bfeb511f54253ddb127701bce0917d",
+                "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/6925da603b31bfff9488480c0a9db48a0feeadf1",
+                "reference": "6925da603b31bfff9488480c0a9db48a0feeadf1",
                 "shasum": ""
             },
             "type": "library",
@@ -76,7 +76,7 @@
             "authors": [
                 {
                     "name": "Anthony Ferrara",
-                    "email": "ircmaxell@php.net",
+                    "email": "ircmaxell@ircmaxell.com",
                     "homepage": "http://blog.ircmaxell.com"
                 }
             ],
@@ -86,7 +86,7 @@
                 "hashing",
                 "password"
             ],
-            "time": "2013-02-13 16:58:34"
+            "time": "2013-05-10 11:19:13"
         },
         {
             "name": "phing/phing",
@@ -772,12 +772,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/fzaninotto/Faker.git",
-                "reference": "a9c1c8b76abe4622b285dcd7aa342cab9dfb6de6"
+                "reference": "c2b06f9741106c35eb7e21dda4c72a54415277dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/a9c1c8b76abe4622b285dcd7aa342cab9dfb6de6",
-                "reference": "a9c1c8b76abe4622b285dcd7aa342cab9dfb6de6",
+                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/c2b06f9741106c35eb7e21dda4c72a54415277dd",
+                "reference": "c2b06f9741106c35eb7e21dda4c72a54415277dd",
                 "shasum": ""
             },
             "require": {
@@ -809,7 +809,7 @@
                 "faker",
                 "fixtures"
             ],
-            "time": "2013-04-23 12:35:55"
+            "time": "2013-05-13 07:57:43"
         }
     ],
     "aliases": [
@@ -822,7 +822,7 @@
         "fzaninotto/faker": 20
     },
     "platform": {
-        "php": ">=5.3.7"
+        "php": ">=5.4"
     },
     "platform-dev": [
 
diff --git a/core/bootstrap.php b/core/bootstrap.php
index 46ac5e9e4..923d029e5 100644
--- a/core/bootstrap.php
+++ b/core/bootstrap.php
@@ -7,7 +7,7 @@
  */
 define('THELIA_ROOT', realpath(__DIR__ .'/../') . "/");
 define('THELIA_CONF_DIR', THELIA_ROOT . '/local/config');
-define('THELIA_PLUGIN_DIR', THELIA_ROOT . '/local/plugins');
+define('THELIA_MODULE_DIR', THELIA_ROOT . '/local/modules');
 define('THELIA_TEMPLATE_DIR', THELIA_ROOT . 'templates/');
 $loader = require __DIR__ . "/vendor/autoload.php";
 
diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php
index 076d66e5c..a5a24532a 100644
--- a/core/lib/Thelia/Core/Thelia.php
+++ b/core/lib/Thelia/Core/Thelia.php
@@ -122,7 +122,7 @@ class Thelia extends Kernel
         foreach ($modules as $module) {
 
             try {
-                $loader = new XmlFileLoader($container, new FileLocator(THELIA_PLUGIN_DIR . "/" . ucfirst($module->getCode()) . "/Config"));
+                $loader = new XmlFileLoader($container, new FileLocator(THELIA_MODULE_DIR . "/" . ucfirst($module->getCode()) . "/Config"));
                 $loader->load("config.xml");
             } catch(\InvalidArgumentException $e) {
 
diff --git a/local/plugins/.gitkeep b/local/modules/.gitkeep
similarity index 100%
rename from local/plugins/.gitkeep
rename to local/modules/.gitkeep
diff --git a/local/plugins/Test/Config/config.xml b/local/modules/Test/Config/config.xml
similarity index 100%
rename from local/plugins/Test/Config/config.xml
rename to local/modules/Test/Config/config.xml
diff --git a/local/plugins/Test/Loop/Doobitch.php b/local/modules/Test/Loop/Doobitch.php
similarity index 100%
rename from local/plugins/Test/Loop/Doobitch.php
rename to local/modules/Test/Loop/Doobitch.php
diff --git a/local/plugins/Test/Loop/Foo.php b/local/modules/Test/Loop/Foo.php
similarity index 100%
rename from local/plugins/Test/Loop/Foo.php
rename to local/modules/Test/Loop/Foo.php
diff --git a/local/plugins/Test/TestLoop/Equal.php b/local/modules/Test/TestLoop/Equal.php
similarity index 100%
rename from local/plugins/Test/TestLoop/Equal.php
rename to local/modules/Test/TestLoop/Equal.php
diff --git a/templates/default/index.html b/templates/default/index.html
index 1fba3e475..0023dd36b 100644
--- a/templates/default/index.html
+++ b/templates/default/index.html
@@ -6,7 +6,7 @@
     </head>
     <body>
         <div>TODO write content<br />
-        <THELIA_cat type="category">
+            <THELIA_cat type="category">
             #__COUNT__ - #TITLE <br />
             nb child : #NB_CHILD <br /><br />
         </THELIA_cat>