diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 0000000..8863a59
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false" colors="true" bootstrap="./test/bootstrap.php">
+	<testsuite name="Mustache">
+		<directory>./test</directory>
+	</testsuite>
+
+	<filter>
+		<whitelist>
+			<directory suffix=".php">./src/Mustache</directory>
+		</whitelist>
+	</filter>
+</phpunit>
\ No newline at end of file
diff --git a/Mustache.php b/src/Mustache/Mustache.php
similarity index 100%
rename from Mustache.php
rename to src/Mustache/Mustache.php
diff --git a/MustacheLoader.php b/src/Mustache/MustacheLoader.php
similarity index 100%
rename from MustacheLoader.php
rename to src/Mustache/MustacheLoader.php
diff --git a/test/MustacheCallTest.php b/test/Mustache/Test/MustacheCallTest.php
similarity index 100%
rename from test/MustacheCallTest.php
rename to test/Mustache/Test/MustacheCallTest.php
diff --git a/test/MustacheExceptionTest.php b/test/Mustache/Test/MustacheExceptionTest.php
similarity index 100%
rename from test/MustacheExceptionTest.php
rename to test/Mustache/Test/MustacheExceptionTest.php
diff --git a/test/MustacheHigherOrderSectionsTest.php b/test/Mustache/Test/MustacheHigherOrderSectionsTest.php
similarity index 100%
rename from test/MustacheHigherOrderSectionsTest.php
rename to test/Mustache/Test/MustacheHigherOrderSectionsTest.php
diff --git a/test/MustacheInjectionTest.php b/test/Mustache/Test/MustacheInjectionTest.php
similarity index 100%
rename from test/MustacheInjectionTest.php
rename to test/Mustache/Test/MustacheInjectionTest.php
diff --git a/test/MustacheLoaderTest.php b/test/Mustache/Test/MustacheLoaderTest.php
similarity index 100%
rename from test/MustacheLoaderTest.php
rename to test/Mustache/Test/MustacheLoaderTest.php
diff --git a/test/MustacheObjectSectionTest.php b/test/Mustache/Test/MustacheObjectSectionTest.php
similarity index 100%
rename from test/MustacheObjectSectionTest.php
rename to test/Mustache/Test/MustacheObjectSectionTest.php
diff --git a/test/MustachePragmaTest.php b/test/Mustache/Test/MustachePragmaTest.php
similarity index 100%
rename from test/MustachePragmaTest.php
rename to test/Mustache/Test/MustachePragmaTest.php
diff --git a/test/MustachePragmaUnescapedTest.php b/test/Mustache/Test/MustachePragmaUnescapedTest.php
similarity index 100%
rename from test/MustachePragmaUnescapedTest.php
rename to test/Mustache/Test/MustachePragmaUnescapedTest.php
diff --git a/test/MustacheSpecTest.php b/test/Mustache/Test/MustacheSpecTest.php
similarity index 100%
rename from test/MustacheSpecTest.php
rename to test/Mustache/Test/MustacheSpecTest.php
diff --git a/test/MustacheTest.php b/test/Mustache/Test/MustacheTest.php
similarity index 100%
rename from test/MustacheTest.php
rename to test/Mustache/Test/MustacheTest.php
diff --git a/test/phpunit.xml b/test/phpunit.xml
deleted file mode 100644
index 891fa8e..0000000
--- a/test/phpunit.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit colors="true">
-	<testsuite name="Mustache">
-		<directory>./</directory>
-	</testsuite>
-	<blacklist>
-		<directory suffix=".php">../examples</directory>
-		<directory suffix=".php">./</directory>
-	</blacklist>
-</phpunit>
\ No newline at end of file