diff --git a/build.xml b/build.xml
index 1b17822b..f977269f 100644
--- a/build.xml
+++ b/build.xml
@@ -45,11 +45,11 @@
         <mkdir dir="${DIST_DIR}" />
         <concat destfile="${JQ}">
             <fileset dir="${SRC_DIR}" includes="intro.js" />
-            <fileset dir="${SRC_DIR}" includes="jquery/jquery.js" />
-            <fileset dir="${SRC_DIR}" includes="selector/selector.js" />
-            <fileset dir="${SRC_DIR}" includes="event/event.js" />
-            <fileset dir="${SRC_DIR}" includes="fx/fx.js" />
-            <fileset dir="${SRC_DIR}" includes="ajax/ajax.js" />
+            <fileset dir="${SRC_DIR}" includes="core.js" />
+            <fileset dir="${SRC_DIR}" includes="selector.js" />
+            <fileset dir="${SRC_DIR}" includes="event.js" />
+            <fileset dir="${SRC_DIR}" includes="fx.js" />
+            <fileset dir="${SRC_DIR}" includes="ajax.js" />
             <fileset dir="${PLUGIN_DIR}" includes="${PLUGINS}" />
             <fileset dir="${SRC_DIR}" includes="outro.js" />
         </concat>
@@ -104,12 +104,14 @@
 
     <target name="test" depends="jquery" description="Copy files for the test suite into their own directory.">
         <echo message="Building Test Suite" />
+	<!--
         <delete dir="${TEST_DIR}" />
         <mkdir dir="${TEST_DIR}/data" />
         <copy todir="${TEST_DIR}/data">
             <fileset dir="${BUILD_DIR}/test/data/" />
         </copy>
         <copy todir="${TEST_DIR}" file="${BUILD_DIR}/test/index.html" />
+	-->
         <echo message="Test Suite built." />
     </target>
 
diff --git a/src/jquery.js b/src/core.js
similarity index 100%
rename from src/jquery.js
rename to src/core.js
diff --git a/test/unit/ajaxTest.js b/test/unit/ajax.js
similarity index 100%
rename from test/unit/ajaxTest.js
rename to test/unit/ajax.js
diff --git a/test/unit/coreTest.js b/test/unit/core.js
similarity index 100%
rename from test/unit/coreTest.js
rename to test/unit/core.js
diff --git a/test/unit/eventTest.js b/test/unit/event.js
similarity index 100%
rename from test/unit/eventTest.js
rename to test/unit/event.js
diff --git a/test/unit/fxTest.js b/test/unit/fx.js
similarity index 100%
rename from test/unit/fxTest.js
rename to test/unit/fx.js
diff --git a/test/unit/selectorTest.js b/test/unit/selector.js
similarity index 100%
rename from test/unit/selectorTest.js
rename to test/unit/selector.js