diff --git a/composer.json b/composer.json
index 7f3e0b4..2a2ba6b 100644
--- a/composer.json
+++ b/composer.json
@@ -16,10 +16,8 @@
         }
 	],
     "autoload": {
-        "psr-0": {
-			"Canteen" : "src"
-		},
-		"files": ["src/html.php"]
+        "psr-0": {"Canteen": "src/"},
+		"files": ["src/Canteen/HTML5/html.php"]
     },
 	"require": {
 		"php": ">=5.3.0"
diff --git a/src/Attribute.php b/src/Canteen/HTML5/Attribute.php
similarity index 100%
rename from src/Attribute.php
rename to src/Canteen/HTML5/Attribute.php
diff --git a/src/Comment.php b/src/Canteen/HTML5/Comment.php
similarity index 100%
rename from src/Comment.php
rename to src/Canteen/HTML5/Comment.php
diff --git a/src/Document.php b/src/Canteen/HTML5/Document.php
similarity index 100%
rename from src/Document.php
rename to src/Canteen/HTML5/Document.php
diff --git a/src/HTML5Error.php b/src/Canteen/HTML5/HTML5Error.php
similarity index 100%
rename from src/HTML5Error.php
rename to src/Canteen/HTML5/HTML5Error.php
diff --git a/src/Node.php b/src/Canteen/HTML5/Node.php
similarity index 100%
rename from src/Node.php
rename to src/Canteen/HTML5/Node.php
diff --git a/src/NodeContainer.php b/src/Canteen/HTML5/NodeContainer.php
similarity index 100%
rename from src/NodeContainer.php
rename to src/Canteen/HTML5/NodeContainer.php
diff --git a/src/SimpleList.php b/src/Canteen/HTML5/SimpleList.php
similarity index 100%
rename from src/SimpleList.php
rename to src/Canteen/HTML5/SimpleList.php
diff --git a/src/Table.php b/src/Canteen/HTML5/Table.php
similarity index 100%
rename from src/Table.php
rename to src/Canteen/HTML5/Table.php
diff --git a/src/Text.php b/src/Canteen/HTML5/Text.php
similarity index 100%
rename from src/Text.php
rename to src/Canteen/HTML5/Text.php
diff --git a/src/html.php b/src/Canteen/HTML5/html.php
similarity index 100%
rename from src/html.php
rename to src/Canteen/HTML5/html.php