diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..fabcd80b9
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "core/lib/Thelia/Tpex"]
+	path = core/lib/Thelia/Tpex
+	url = git@github.com:thelia/Tpex.git
diff --git a/composer.json b/composer.json
index d13d12324..d6bb08d5b 100644
--- a/composer.json
+++ b/composer.json
@@ -6,12 +6,6 @@
         "forum" : "http://thelia.net/forum",
         "wiki" : "http://thelia.net/wiki"
     },
-    "repositories" : [
-        {
-            "type" : "vcs",
-            "url" : "https://github.com/thelia/Tpex"
-        }
-    ],
     "require":{
         "php": ">=5.4.0",
         "ircmaxell/password-compat": "dev-master",
@@ -23,8 +17,7 @@
         "symfony/dependency-injection" : "2.1.*",
         "symfony/event-dispatcher" : "2.1.*",
         "symfony/http-kernel" : "2.1.*",
-        "symfony/routing" : "2.1.*",
-        "Thelia/Tpex" : "dev-master"
+        "symfony/routing" : "2.1.*"
     },
     "minimum-stability": "stable",
     "config" : {
diff --git a/composer.lock b/composer.lock
index 192c4320d..35a1e4b1e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,38 +1,6 @@
 {
-    "hash": "2f31adf8756fec850487c80b20b42e0f",
+    "hash": "668b9cca3649c47d9016fb912f74856a",
     "packages": [
-        {
-            "name": "Thelia/Tpex",
-            "version": "dev-master",
-            "target-dir": "Thelia/Tpex",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thelia/Tpex.git",
-                "reference": "c2b8151f4c378d30887900290467b21585a0eb15"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/thelia/Tpex/zipball/c2b8151f4c378d30887900290467b21585a0eb15",
-                "reference": "c2b8151f4c378d30887900290467b21585a0eb15",
-                "shasum": ""
-            },
-            "require": {
-                "symfony/event-dispatcher": "2.1.*",
-                "symfony/http-foundation": "2.1.*"
-            },
-            "time": "2013-02-18 22:51:33",
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Thelia\\Tpex": ""
-                }
-            },
-            "homepage": "http://thelia.net",
-            "support": {
-                "source": "https://github.com/thelia/Tpex/tree/master",
-                "issues": "https://github.com/thelia/Tpex/issues"
-            }
-        },
         {
             "name": "ircmaxell/password-compat",
             "version": "dev-master",
@@ -616,7 +584,6 @@
     "minimum-stability": "stable",
     "stability-flags": {
         "ircmaxell/password-compat": 20,
-        "psr/log": 20,
-        "thelia/tpex": 20
+        "psr/log": 20
     }
 }
diff --git a/core/lib/Thelia/Core/Template/Parser.php b/core/lib/Thelia/Core/Template/Parser.php
index 9cffd2cc6..9a49e03e3 100644
--- a/core/lib/Thelia/Core/Template/Parser.php
+++ b/core/lib/Thelia/Core/Template/Parser.php
@@ -69,8 +69,6 @@ class Parser implements ParserInterface
     
     protected $template = "default";
     
-    protected $init = false;
-
     /**
      *
      * @param type $container
@@ -83,27 +81,6 @@ class Parser implements ParserInterface
         $this->tpex = $tpex;
     }
     
-    protected function initialize()
-    {
-        if ($this->init === true) {
-            return;
-        }
-        
-        /** /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\
-         * @TODO
-         * 
-         * Avant le lancement du parser, enregistrer les boucles, filtres.
-         * Pour ne pas le faire à chaque lancement, on va créer une class qui contient toutes les classes nécessaires
-         * 
-         * Créer : 
-         * un dumper
-         * une méthode qui récupère les différents éléments : boucles, filtres, substitutions, etc
-         * 
-         * 
-         * /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ 
-         */
-    }
-    
     /**
      * 
      * @return Symfony\Component\HttpFoundation\Request
diff --git a/core/lib/Thelia/Tpex b/core/lib/Thelia/Tpex
new file mode 160000
index 000000000..34959348e
--- /dev/null
+++ b/core/lib/Thelia/Tpex
@@ -0,0 +1 @@
+Subproject commit 34959348e4867237846260b14dee5ec7b629679a
diff --git a/templates/default/include1.html b/templates/default/include1.html
new file mode 100644
index 000000000..c4e876fb4
--- /dev/null
+++ b/templates/default/include1.html
@@ -0,0 +1,2 @@
+include 1 success<br />
+#INCLUDE "subinclude1.html"
diff --git a/templates/default/subinclude1.html b/templates/default/subinclude1.html
new file mode 100644
index 000000000..d777eec92
--- /dev/null
+++ b/templates/default/subinclude1.html
@@ -0,0 +1 @@
+subinclude1 success
\ No newline at end of file