1 files changed, 9 insertions, 7 deletions
diff --git a/src/HTML5/Parser.php b/src/HTML5/Parser.php
index 5f9ca56..892ab54 100644
--- a/src/HTML5/Parser.php
+++ b/src/HTML5/Parser.php
@@ -1,14 +1,16 @@
 <?php
+namespace HTML5;
 
-require_once dirname(__FILE__) . '/Data.php';
-require_once dirname(__FILE__) . '/InputStream.php';
-require_once dirname(__FILE__) . '/TreeBuilder.php';
-require_once dirname(__FILE__) . '/Tokenizer.php';
+# Use autoloader
+#require_once dirname(__FILE__) . '/Data.php';
+#require_once dirname(__FILE__) . '/InputStream.php';
+#require_once dirname(__FILE__) . '/TreeBuilder.php';
+#require_once dirname(__FILE__) . '/Tokenizer.php';
 
 /**
  * Outwards facing interface for HTML5.
  */
-class HTML5_Parser
+class Parser
 {
     /**
      * Parses a full HTML document.
@@ -17,7 +19,7 @@ class HTML5_Parser
      * @return Parsed HTML as DOMDocument
      */
     static public function parse($text, $builder = null) {
-        $tokenizer = new HTML5_Tokenizer($text, $builder);
+        $tokenizer = new Tokenizer($text, $builder);
         $tokenizer->parse();
         return $tokenizer->save();
     }
@@ -29,7 +31,7 @@ class HTML5_Parser
      * @return Parsed HTML as DOMDocument
      */
     static public function parseFragment($text, $context = null, $builder = null) {
-        $tokenizer = new HTML5_Tokenizer($text, $builder);
+        $tokenizer = new Tokenizer($text, $builder);
         $tokenizer->parseFragment($context);
         return $tokenizer->save();
     }