diff --git a/min_extras/unit_tests/HTTP_ConditionalGet/2.php b/min_extras/test/HTTP_ConditionalGet/2.php
similarity index 100%
rename from min_extras/unit_tests/HTTP_ConditionalGet/2.php
rename to min_extras/test/HTTP_ConditionalGet/2.php
diff --git a/min_extras/unit_tests/HTTP_ConditionalGet/3.php b/min_extras/test/HTTP_ConditionalGet/3.php
similarity index 100%
rename from min_extras/unit_tests/HTTP_ConditionalGet/3.php
rename to min_extras/test/HTTP_ConditionalGet/3.php
diff --git a/min_extras/unit_tests/HTTP_ConditionalGet/4.php b/min_extras/test/HTTP_ConditionalGet/4.php
similarity index 100%
rename from min_extras/unit_tests/HTTP_ConditionalGet/4.php
rename to min_extras/test/HTTP_ConditionalGet/4.php
diff --git a/min_extras/unit_tests/HTTP_ConditionalGet/5.php b/min_extras/test/HTTP_ConditionalGet/5.php
similarity index 100%
rename from min_extras/unit_tests/HTTP_ConditionalGet/5.php
rename to min_extras/test/HTTP_ConditionalGet/5.php
diff --git a/min_extras/unit_tests/HTTP_ConditionalGet/_include.php b/min_extras/test/HTTP_ConditionalGet/_include.php
similarity index 100%
rename from min_extras/unit_tests/HTTP_ConditionalGet/_include.php
rename to min_extras/test/HTTP_ConditionalGet/_include.php
diff --git a/min_extras/unit_tests/HTTP_ConditionalGet/index.php b/min_extras/test/HTTP_ConditionalGet/index.php
similarity index 100%
rename from min_extras/unit_tests/HTTP_ConditionalGet/index.php
rename to min_extras/test/HTTP_ConditionalGet/index.php
diff --git a/min_extras/unit_tests/HTTP_Encoder/green.png b/min_extras/test/HTTP_Encoder/green.png
similarity index 100%
rename from min_extras/unit_tests/HTTP_Encoder/green.png
rename to min_extras/test/HTTP_Encoder/green.png
diff --git a/min_extras/unit_tests/HTTP_Encoder/index.php b/min_extras/test/HTTP_Encoder/index.php
similarity index 100%
rename from min_extras/unit_tests/HTTP_Encoder/index.php
rename to min_extras/test/HTTP_Encoder/index.php
diff --git a/min_extras/unit_tests/_inc.php b/min_extras/test/_inc.php
similarity index 100%
rename from min_extras/unit_tests/_inc.php
rename to min_extras/test/_inc.php
diff --git a/min_extras/unit_tests/_test_files/css/comments.css b/min_extras/test/_test_files/css/comments.css
similarity index 100%
rename from min_extras/unit_tests/_test_files/css/comments.css
rename to min_extras/test/_test_files/css/comments.css
diff --git a/min_extras/unit_tests/_test_files/css/comments.min.css b/min_extras/test/_test_files/css/comments.min.css
similarity index 100%
rename from min_extras/unit_tests/_test_files/css/comments.min.css
rename to min_extras/test/_test_files/css/comments.min.css
diff --git a/min_extras/unit_tests/_test_files/css/hacks.css b/min_extras/test/_test_files/css/hacks.css
similarity index 100%
rename from min_extras/unit_tests/_test_files/css/hacks.css
rename to min_extras/test/_test_files/css/hacks.css
diff --git a/min_extras/unit_tests/_test_files/css/hacks.min.css b/min_extras/test/_test_files/css/hacks.min.css
similarity index 100%
rename from min_extras/unit_tests/_test_files/css/hacks.min.css
rename to min_extras/test/_test_files/css/hacks.min.css
diff --git a/min_extras/unit_tests/_test_files/css/paths.css b/min_extras/test/_test_files/css/paths.css
similarity index 100%
rename from min_extras/unit_tests/_test_files/css/paths.css
rename to min_extras/test/_test_files/css/paths.css
diff --git a/min_extras/unit_tests/_test_files/css/paths.min.css b/min_extras/test/_test_files/css/paths.min.css
similarity index 100%
rename from min_extras/unit_tests/_test_files/css/paths.min.css
rename to min_extras/test/_test_files/css/paths.min.css
diff --git a/min_extras/unit_tests/_test_files/css/readme.txt b/min_extras/test/_test_files/css/readme.txt
similarity index 100%
rename from min_extras/unit_tests/_test_files/css/readme.txt
rename to min_extras/test/_test_files/css/readme.txt
diff --git a/min_extras/unit_tests/_test_files/css/selectors.css b/min_extras/test/_test_files/css/selectors.css
similarity index 100%
rename from min_extras/unit_tests/_test_files/css/selectors.css
rename to min_extras/test/_test_files/css/selectors.css
diff --git a/min_extras/unit_tests/_test_files/css/selectors.min.css b/min_extras/test/_test_files/css/selectors.min.css
similarity index 100%
rename from min_extras/unit_tests/_test_files/css/selectors.min.css
rename to min_extras/test/_test_files/css/selectors.min.css
diff --git a/min_extras/unit_tests/_test_files/css/styles.css b/min_extras/test/_test_files/css/styles.css
similarity index 100%
rename from min_extras/unit_tests/_test_files/css/styles.css
rename to min_extras/test/_test_files/css/styles.css
diff --git a/min_extras/unit_tests/_test_files/css/styles.min.css b/min_extras/test/_test_files/css/styles.min.css
similarity index 100%
rename from min_extras/unit_tests/_test_files/css/styles.min.css
rename to min_extras/test/_test_files/css/styles.min.css
diff --git a/min_extras/unit_tests/_test_files/css/subsilver.css b/min_extras/test/_test_files/css/subsilver.css
similarity index 100%
rename from min_extras/unit_tests/_test_files/css/subsilver.css
rename to min_extras/test/_test_files/css/subsilver.css
diff --git a/min_extras/unit_tests/_test_files/css/subsilver.min.css b/min_extras/test/_test_files/css/subsilver.min.css
similarity index 100%
rename from min_extras/unit_tests/_test_files/css/subsilver.min.css
rename to min_extras/test/_test_files/css/subsilver.min.css
diff --git a/min_extras/unit_tests/_test_files/css/unusual_strings.css b/min_extras/test/_test_files/css/unusual_strings.css
similarity index 100%
rename from min_extras/unit_tests/_test_files/css/unusual_strings.css
rename to min_extras/test/_test_files/css/unusual_strings.css
diff --git a/min_extras/unit_tests/_test_files/css/unusual_strings.min.css b/min_extras/test/_test_files/css/unusual_strings.min.css
similarity index 100%
rename from min_extras/unit_tests/_test_files/css/unusual_strings.min.css
rename to min_extras/test/_test_files/css/unusual_strings.min.css
diff --git a/min_extras/unit_tests/_test_files/css/vladmirated.css b/min_extras/test/_test_files/css/vladmirated.css
similarity index 100%
rename from min_extras/unit_tests/_test_files/css/vladmirated.css
rename to min_extras/test/_test_files/css/vladmirated.css
diff --git a/min_extras/unit_tests/_test_files/css/vladmirated.min.css b/min_extras/test/_test_files/css/vladmirated.min.css
similarity index 100%
rename from min_extras/unit_tests/_test_files/css/vladmirated.min.css
rename to min_extras/test/_test_files/css/vladmirated.min.css
diff --git a/min_extras/unit_tests/_test_files/cssLinearizer/1/adjacent.css b/min_extras/test/_test_files/cssLinearizer/1/adjacent.css
similarity index 100%
rename from min_extras/unit_tests/_test_files/cssLinearizer/1/adjacent.css
rename to min_extras/test/_test_files/cssLinearizer/1/adjacent.css
diff --git a/min_extras/unit_tests/_test_files/cssLinearizer/1/bad.css b/min_extras/test/_test_files/cssLinearizer/1/bad.css
similarity index 100%
rename from min_extras/unit_tests/_test_files/cssLinearizer/1/bad.css
rename to min_extras/test/_test_files/cssLinearizer/1/bad.css
diff --git a/min_extras/unit_tests/_test_files/cssLinearizer/1/tv.css b/min_extras/test/_test_files/cssLinearizer/1/tv.css
similarity index 100%
rename from min_extras/unit_tests/_test_files/cssLinearizer/1/tv.css
rename to min_extras/test/_test_files/cssLinearizer/1/tv.css
diff --git a/min_extras/unit_tests/_test_files/cssLinearizer/adjacent.css b/min_extras/test/_test_files/cssLinearizer/adjacent.css
similarity index 100%
rename from min_extras/unit_tests/_test_files/cssLinearizer/adjacent.css
rename to min_extras/test/_test_files/cssLinearizer/adjacent.css
diff --git a/min_extras/unit_tests/_test_files/cssLinearizer/input.css b/min_extras/test/_test_files/cssLinearizer/input.css
similarity index 100%
rename from min_extras/unit_tests/_test_files/cssLinearizer/input.css
rename to min_extras/test/_test_files/cssLinearizer/input.css
diff --git a/min_extras/unit_tests/_test_files/cssLinearizer/output.css b/min_extras/test/_test_files/cssLinearizer/output.css
similarity index 100%
rename from min_extras/unit_tests/_test_files/cssLinearizer/output.css
rename to min_extras/test/_test_files/cssLinearizer/output.css
diff --git a/min_extras/unit_tests/_test_files/html/before.html b/min_extras/test/_test_files/html/before.html
similarity index 100%
rename from min_extras/unit_tests/_test_files/html/before.html
rename to min_extras/test/_test_files/html/before.html
diff --git a/min_extras/unit_tests/_test_files/html/before.min.html b/min_extras/test/_test_files/html/before.min.html
similarity index 100%
rename from min_extras/unit_tests/_test_files/html/before.min.html
rename to min_extras/test/_test_files/html/before.min.html
diff --git a/min_extras/unit_tests/_test_files/html/before2.html b/min_extras/test/_test_files/html/before2.html
similarity index 100%
rename from min_extras/unit_tests/_test_files/html/before2.html
rename to min_extras/test/_test_files/html/before2.html
diff --git a/min_extras/unit_tests/_test_files/html/before2.min.html b/min_extras/test/_test_files/html/before2.min.html
similarity index 100%
rename from min_extras/unit_tests/_test_files/html/before2.min.html
rename to min_extras/test/_test_files/html/before2.min.html
diff --git a/min_extras/unit_tests/_test_files/js/before.js b/min_extras/test/_test_files/js/before.js
similarity index 100%
rename from min_extras/unit_tests/_test_files/js/before.js
rename to min_extras/test/_test_files/js/before.js
diff --git a/min_extras/unit_tests/_test_files/js/before.min.js b/min_extras/test/_test_files/js/before.min.js
similarity index 100%
rename from min_extras/unit_tests/_test_files/js/before.min.js
rename to min_extras/test/_test_files/js/before.min.js
diff --git a/min_extras/unit_tests/_test_files/js/before_noComments.min.js b/min_extras/test/_test_files/js/before_noComments.min.js
similarity index 100%
rename from min_extras/unit_tests/_test_files/js/before_noComments.min.js
rename to min_extras/test/_test_files/js/before_noComments.min.js
diff --git a/min_extras/unit_tests/_test_files/minify/QueryString.js b/min_extras/test/_test_files/minify/QueryString.js
similarity index 100%
rename from min_extras/unit_tests/_test_files/minify/QueryString.js
rename to min_extras/test/_test_files/minify/QueryString.js
diff --git a/min_extras/unit_tests/_test_files/minify/email.js b/min_extras/test/_test_files/minify/email.js
similarity index 100%
rename from min_extras/unit_tests/_test_files/minify/email.js
rename to min_extras/test/_test_files/minify/email.js
diff --git a/min_extras/unit_tests/_test_files/minify/lines_output.js b/min_extras/test/_test_files/minify/lines_output.js
similarity index 100%
rename from min_extras/unit_tests/_test_files/minify/lines_output.js
rename to min_extras/test/_test_files/minify/lines_output.js
diff --git a/min_extras/unit_tests/_test_files/minify/minified.css b/min_extras/test/_test_files/minify/minified.css
similarity index 100%
rename from min_extras/unit_tests/_test_files/minify/minified.css
rename to min_extras/test/_test_files/minify/minified.css
diff --git a/min_extras/unit_tests/_test_files/minify/minified.js b/min_extras/test/_test_files/minify/minified.js
similarity index 100%
rename from min_extras/unit_tests/_test_files/minify/minified.js
rename to min_extras/test/_test_files/minify/minified.js
diff --git a/min_extras/unit_tests/test_CSS.php b/min_extras/test/test_CSS.php
similarity index 100%
rename from min_extras/unit_tests/test_CSS.php
rename to min_extras/test/test_CSS.php
diff --git a/min_extras/unit_tests/test_HTML.php b/min_extras/test/test_HTML.php
similarity index 100%
rename from min_extras/unit_tests/test_HTML.php
rename to min_extras/test/test_HTML.php
diff --git a/min_extras/unit_tests/test_HTTP_ConditionalGet.php b/min_extras/test/test_HTTP_ConditionalGet.php
similarity index 100%
rename from min_extras/unit_tests/test_HTTP_ConditionalGet.php
rename to min_extras/test/test_HTTP_ConditionalGet.php
diff --git a/min_extras/unit_tests/test_HTTP_Encoder.php b/min_extras/test/test_HTTP_Encoder.php
similarity index 100%
rename from min_extras/unit_tests/test_HTTP_Encoder.php
rename to min_extras/test/test_HTTP_Encoder.php
diff --git a/min_extras/unit_tests/test_Javascript.php b/min_extras/test/test_Javascript.php
similarity index 100%
rename from min_extras/unit_tests/test_Javascript.php
rename to min_extras/test/test_Javascript.php
diff --git a/min_extras/unit_tests/test_Lines.php b/min_extras/test/test_Lines.php
similarity index 100%
rename from min_extras/unit_tests/test_Lines.php
rename to min_extras/test/test_Lines.php
diff --git a/min_extras/unit_tests/test_Minify.php b/min_extras/test/test_Minify.php
similarity index 100%
rename from min_extras/unit_tests/test_Minify.php
rename to min_extras/test/test_Minify.php
diff --git a/min_extras/unit_tests/test_Minify_Build.php b/min_extras/test/test_Minify_Build.php
similarity index 100%
rename from min_extras/unit_tests/test_Minify_Build.php
rename to min_extras/test/test_Minify_Build.php
diff --git a/min_extras/unit_tests/test_Minify_CSS_Linearizer.php b/min_extras/test/test_Minify_CSS_Linearizer.php
similarity index 100%
rename from min_extras/unit_tests/test_Minify_CSS_Linearizer.php
rename to min_extras/test/test_Minify_CSS_Linearizer.php
diff --git a/min_extras/unit_tests/test_all.php b/min_extras/test/test_all.php
similarity index 100%
rename from min_extras/unit_tests/test_all.php
rename to min_extras/test/test_all.php
diff --git a/min_extras/version1/index.html b/min_extras/version1/index.html
new file mode 100644
index 0000000..2f09c89
--- /dev/null
+++ b/min_extras/version1/index.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
+<head>
+    <title>Test minify.php</title>
+</head>
+<body>
+<h1>Test minify.php</h1>
+
+<ul>
+    
+    <li><a href="minify.php?files=../test/_test_files/js/before.js">?files=../test/_test_files/js/before.js</a></li>
+    <li><a href="minify.php?files=../test/_test_files/js/before.js,../test/_test_files/minify/QueryString.js">?files=../test/_test_files/js/before.js,../test/_test_files/minify/QueryString.js</a></li>
+    <li><a href="minify.php?files=../test/_test_files/css/paths.css">?files=../test/_test_files/css/paths.css</a> (Note that relative URIs in path.css have been rewritten to point to the same location as if paths.css were linked directly.)</li>
+    <li><a href="minify.php?files=../test/_test_files/css/paths.css,../test/_test_files/css/styles.css">?files=../test/_test_files/css/paths.css,../test/_test_files/css/styles.css</a></li>
+</ul>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/min_extras/version1/minify.php b/min_extras/version1/minify.php
new file mode 100644
index 0000000..3a05bd6
--- /dev/null
+++ b/min_extras/version1/minify.php
@@ -0,0 +1,6 @@
+<?php
+
+require '../config.php'; // just to set include_path
+require 'Minify.php';
+
+Minify::serve('Version1');