diff --git a/benchmarks/Lexer.php b/benchmarks/Lexer.php
index a11f8909..a1c2a424 100644
--- a/benchmarks/Lexer.php
+++ b/benchmarks/Lexer.php
@@ -1,7 +1,7 @@
 <?php
 
 // emulates inserting a dir called HTMLPurifier into your class dir
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../');
+set_include_path(get_include_path() . PATH_SEPARATOR . '../library/');
 
 require_once 'HTMLPurifier/Lexer/DirectLex.php';
 require_once 'HTMLPurifier/Lexer/PEARSax3.php';
diff --git a/HTMLPurifier.php b/library/HTMLPurifier.php
similarity index 100%
rename from HTMLPurifier.php
rename to library/HTMLPurifier.php
diff --git a/AttrDef.php b/library/HTMLPurifier/AttrDef.php
similarity index 100%
rename from AttrDef.php
rename to library/HTMLPurifier/AttrDef.php
diff --git a/ChildDef.php b/library/HTMLPurifier/ChildDef.php
similarity index 100%
rename from ChildDef.php
rename to library/HTMLPurifier/ChildDef.php
diff --git a/Definition.php b/library/HTMLPurifier/Definition.php
similarity index 100%
rename from Definition.php
rename to library/HTMLPurifier/Definition.php
diff --git a/Generator.php b/library/HTMLPurifier/Generator.php
similarity index 100%
rename from Generator.php
rename to library/HTMLPurifier/Generator.php
diff --git a/Lexer.php b/library/HTMLPurifier/Lexer.php
similarity index 100%
rename from Lexer.php
rename to library/HTMLPurifier/Lexer.php
diff --git a/Lexer/DOMLex.php b/library/HTMLPurifier/Lexer/DOMLex.php
similarity index 100%
rename from Lexer/DOMLex.php
rename to library/HTMLPurifier/Lexer/DOMLex.php
diff --git a/Lexer/DirectLex.php b/library/HTMLPurifier/Lexer/DirectLex.php
similarity index 100%
rename from Lexer/DirectLex.php
rename to library/HTMLPurifier/Lexer/DirectLex.php
diff --git a/Lexer/PEARSax3.php b/library/HTMLPurifier/Lexer/PEARSax3.php
similarity index 100%
rename from Lexer/PEARSax3.php
rename to library/HTMLPurifier/Lexer/PEARSax3.php
diff --git a/Token.php b/library/HTMLPurifier/Token.php
similarity index 100%
rename from Token.php
rename to library/HTMLPurifier/Token.php
diff --git a/tests/HTMLPurifier.php b/tests/HTMLPurifier.php
deleted file mode 100644
index abe6ae4f..00000000
--- a/tests/HTMLPurifier.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-require_once 'HTMLPurifier/HTMLPurifier.php';
-
-class Test_HTMLPurifier extends UnitTestCase
-{
-    
-    function Test_HTMLPurifier() {
-        
-        
-        
-    }
-    
-}
-
-?>
\ No newline at end of file
diff --git a/tests/ChildDef.php b/tests/HTMLPurifier/ChildDefTest.php
similarity index 94%
rename from tests/ChildDef.php
rename to tests/HTMLPurifier/ChildDefTest.php
index 0d5f9977..a95589ab 100644
--- a/tests/ChildDef.php
+++ b/tests/HTMLPurifier/ChildDefTest.php
@@ -4,13 +4,13 @@ require_once 'HTMLPurifier/ChildDef.php';
 require_once 'HTMLPurifier/Lexer.php';
 require_once 'HTMLPurifier/Generator.php';
 
-class Test_HTMLPurifier_ChildDef extends UnitTestCase
+class HTMLPurifier_ChildDefTest extends UnitTestCase
 {
     
     var $lex;
     var $gen;
     
-    function Test_HTMLPurifier_ChildDef() {
+    function HTMLPurifier_ChildDefTest() {
         $this->lex = HTMLPurifier_Lexer::create();
         $this->gen = new HTMLPurifier_Generator();
         parent::UnitTestCase();
diff --git a/tests/Definition.php b/tests/HTMLPurifier/DefinitionTest.php
similarity index 96%
rename from tests/Definition.php
rename to tests/HTMLPurifier/DefinitionTest.php
index c4c8f923..30dc24bc 100644
--- a/tests/Definition.php
+++ b/tests/HTMLPurifier/DefinitionTest.php
@@ -3,12 +3,12 @@
 require_once 'HTMLPurifier/Definition.php';
 require_once 'HTMLPurifier/Lexer.php';
 
-class Test_HTMLPurifier_Definition extends UnitTestCase
+class HTMLPurifier_DefinitionTest extends UnitTestCase
 {
     
     var $def, $lex;
     
-    function Test_HTMLPurifier_Definition() {
+    function HTMLPurifier_DefinitionTest() {
         $this->UnitTestCase();
         $this->def = new HTMLPurifier_Definition();
         $this->def->loadData();
diff --git a/tests/Generator.php b/tests/HTMLPurifier/GeneratorTest.php
similarity index 93%
rename from tests/Generator.php
rename to tests/HTMLPurifier/GeneratorTest.php
index ec215ec2..f39280ef 100644
--- a/tests/Generator.php
+++ b/tests/HTMLPurifier/GeneratorTest.php
@@ -2,12 +2,12 @@
 
 require_once 'HTMLPurifier/Generator.php';
 
-class Test_HTMLPurifier_Generator extends UnitTestCase
+class HTMLPurifier_GeneratorTest extends UnitTestCase
 {
     
     var $gen;
     
-    function Test_HTMLPurifier_Generator() {
+    function HTMLPurifier_GeneratorTest() {
         $this->UnitTestCase();
         $this->gen = new HTMLPurifier_Generator();
     }
diff --git a/tests/Lexer.php b/tests/HTMLPurifier/LexerTest.php
similarity index 96%
rename from tests/Lexer.php
rename to tests/HTMLPurifier/LexerTest.php
index 20891c78..421805e9 100644
--- a/tests/Lexer.php
+++ b/tests/HTMLPurifier/LexerTest.php
@@ -3,7 +3,7 @@
 require_once 'HTMLPurifier/Lexer/DirectLex.php';
 require_once 'HTMLPurifier/Lexer/PEARSax3.php';
 
-class Test_HTMLPurifier_Lexer extends UnitTestCase
+class HTMLPurifier_LexerTest extends UnitTestCase
 {
     
     var $DirectLex, $PEARSax3, $DOMLex;
diff --git a/tests/HTMLPurifierTest.php b/tests/HTMLPurifierTest.php
new file mode 100644
index 00000000..19e6d280
--- /dev/null
+++ b/tests/HTMLPurifierTest.php
@@ -0,0 +1,16 @@
+<?php
+
+require_once 'HTMLPurifier.php';
+
+class HTMLPurifierTest extends UnitTestCase
+{
+    
+    function HTMLPurifierTest() {
+        
+        
+        
+    }
+    
+}
+
+?>
\ No newline at end of file
diff --git a/tests/index.php b/tests/index.php
index 625a34c9..770cd5c0 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -3,16 +3,16 @@
 load_simpletest(); // includes all relevant simpletest files
 
 // emulates inserting a dir called HTMLPurifier into your class dir
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../');
+set_include_path(get_include_path() . PATH_SEPARATOR . '../library');
 
 $test = new GroupTest('HTMLPurifier');
 
-$test->addTestFile('HTMLPurifier.php');
-$test->addTestFile('Lexer.php');
-//$test->addTestFile('Token.php');
-$test->addTestFile('Definition.php');
-$test->addTestFile('ChildDef.php');
-$test->addTestFile('Generator.php');
+$test->addTestFile('HTMLPurifierTest.php');
+$test->addTestFile('HTMLPurifier/LexerTest.php');
+//$test->addTestFile('TokenTest.php');
+$test->addTestFile('HTMLPurifier/DefinitionTest.php');
+$test->addTestFile('HTMLPurifier/ChildDefTest.php');
+$test->addTestFile('HTMLPurifier/GeneratorTest.php');
 
 $test->run( new HtmlReporter() );