diff --git a/composer.json b/composer.json
index 8fdb31f..6677a99 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
 	],
     "autoload": {
         "psr-0": {
-			"Canteen\\HTML5" : "src/"
+			"Canteen\\HTML5\\" : "src/"
 		},
 		"files": ["src/Canteen/HTML5/html.php"]
     },
diff --git a/src/Canteen/HTML5/Attribute.php b/src/Attribute.php
similarity index 100%
rename from src/Canteen/HTML5/Attribute.php
rename to src/Attribute.php
diff --git a/src/Canteen/HTML5/Comment.php b/src/Comment.php
similarity index 100%
rename from src/Canteen/HTML5/Comment.php
rename to src/Comment.php
diff --git a/src/Canteen/HTML5/Document.php b/src/Document.php
similarity index 100%
rename from src/Canteen/HTML5/Document.php
rename to src/Document.php
diff --git a/src/Canteen/HTML5/HTML5Error.php b/src/HTML5Error.php
similarity index 100%
rename from src/Canteen/HTML5/HTML5Error.php
rename to src/HTML5Error.php
diff --git a/src/Canteen/HTML5/Node.php b/src/Node.php
similarity index 100%
rename from src/Canteen/HTML5/Node.php
rename to src/Node.php
diff --git a/src/Canteen/HTML5/NodeContainer.php b/src/NodeContainer.php
similarity index 100%
rename from src/Canteen/HTML5/NodeContainer.php
rename to src/NodeContainer.php
diff --git a/src/Canteen/HTML5/SimpleList.php b/src/SimpleList.php
similarity index 100%
rename from src/Canteen/HTML5/SimpleList.php
rename to src/SimpleList.php
diff --git a/src/Canteen/HTML5/Table.php b/src/Table.php
similarity index 100%
rename from src/Canteen/HTML5/Table.php
rename to src/Table.php
diff --git a/src/Canteen/HTML5/Text.php b/src/Text.php
similarity index 100%
rename from src/Canteen/HTML5/Text.php
rename to src/Text.php
diff --git a/src/Canteen/HTML5/html.php b/src/html.php
similarity index 100%
rename from src/Canteen/HTML5/html.php
rename to src/html.php