diff --git a/.gitignore b/.gitignore
new file mode 100755
index 0000000..84c048a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/build/
diff --git a/Zutil.iml b/Zutil.iml
index 176f1f1..0848f64 100755
--- a/Zutil.iml
+++ b/Zutil.iml
@@ -8,19 +8,6 @@
     </content>
     <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library name="libs">
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/libs" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$MODULE_DIR$/libs" />
-        </SOURCES>
-        <jarDirectory url="file://$MODULE_DIR$/libs" recursive="false" />
-        <jarDirectory url="file://$MODULE_DIR$/libs" recursive="false" type="SOURCES" />
-      </library>
-    </orderEntry>
     <orderEntry type="module-library" scope="TEST">
       <library name="JUnit4">
         <CLASSES>
@@ -31,5 +18,18 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library name="lib">
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/lib" />
+        </SOURCES>
+        <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
+        <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" type="SOURCES" />
+      </library>
+    </orderEntry>
   </component>
 </module>
\ No newline at end of file
diff --git a/build.xml b/build.xml
new file mode 100755
index 0000000..c2a3686
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Zutil" >
+	
+	<!-- ________________________ PROPERTIES AND SETTINGS ________________________ -->
+	
+	<!--common properties-->
+	<property name="gitRoot" value="." />
+	<property name="srcDir" value="${gitRoot}/src" />
+	<property name="testDir" value="${gitRoot}/test" />
+	<property name="libDir" value="${gitRoot}/lib" />
+    <property name="buildRoot" value="${gitRoot}/build" />
+	<property name="buildDir" value="${buildRoot}/production" />
+    <property name="buildTestDir" value="${buildRoot}/test" />
+    <property name="releaseDir" value="${buildRoot}/release" />
+    <property name="reportsDir" value="${buildRoot}/reports" />
+
+	<!--define standard arduments for javac-->
+	<presetdef name="javac">
+		<javac includeantruntime="false" />
+	</presetdef>
+
+	<!-- ________________________ CLASSPATHS ________________________ -->
+	
+	<!--classpath included when building-->
+	<path id="classpath.build">
+        <fileset dir="${libDir}">
+            <include name="**/*.jar"/>
+        </fileset>
+        <pathelement location="${buildDir}" />
+	</path>
+
+    <path id="classpath.test">
+        <pathelement location="${buildTestDir}" />
+        <path refid="classpath.build"/>
+    </path>
+	
+	<!-- ________________________ EXECUTION TARGETS ________________________ -->
+
+    <target name="test" depends="build-test">
+        <mkdir dir="${reportsDir}" />
+        <junit printsummary="yes" haltonfailure="false">
+            <classpath refid="classpath.test" />
+            <formatter type="xml" /> <!-- to file -->
+
+            <batchtest todir="${reportsDir}">
+                <fileset dir="${buildTestDir}" includes="**/*Test*.class" />
+            </batchtest>
+        </junit>
+    </target>
+
+    <!-- ________________________ BUILD TARGETS ________________________ -->
+
+	<!--clean all build paths-->
+	<target name="clean">
+		<delete includeemptydirs="true" failonerror="false">
+			<fileset dir="${buildRoot}" includes="**/*"/>
+		</delete>
+	</target>
+
+	<!--build product code-->
+    <target name="release" depends="build">
+        <jar destfile="${releaseDir}/Zutil.jar" basedir="${buildDir}" />
+    </target>
+
+	<target name="build">
+		<mkdir dir="${buildDir}" />
+		<javac srcdir="${srcDir}" destdir="${buildDir}" debug="yes" debugLevel="lines,vars,source">
+            <classpath refid="classpath.build" />
+			<include name="**/*.java" />
+		</javac>
+	</target>
+
+    <target name="build-test" depends="build">
+        <mkdir dir="${buildTestDir}" />
+        <javac srcdir="${testDir}" destdir="${buildTestDir}" debug="yes" debugLevel="lines,vars,source">
+            <classpath refid="classpath.build" />
+            <classpath refid="classpath.test" />
+            <include name="**/*.java" />
+        </javac>
+    </target>
+		
+</project>
diff --git a/libs/commons-fileupload-1.2.1.jar b/lib/commons-fileupload-1.2.1.jar
similarity index 100%
rename from libs/commons-fileupload-1.2.1.jar
rename to lib/commons-fileupload-1.2.1.jar
diff --git a/libs/commons-io-1.4.jar b/lib/commons-io-1.4.jar
similarity index 100%
rename from libs/commons-io-1.4.jar
rename to lib/commons-io-1.4.jar
diff --git a/libs/dom4j-1.6.1.jar b/lib/dom4j-1.6.1.jar
similarity index 100%
rename from libs/dom4j-1.6.1.jar
rename to lib/dom4j-1.6.1.jar
diff --git a/lib/hamcrest-core-1.3.jar b/lib/hamcrest-core-1.3.jar
new file mode 100755
index 0000000..9d5fe16
Binary files /dev/null and b/lib/hamcrest-core-1.3.jar differ
diff --git a/lib/junit-4.12.jar b/lib/junit-4.12.jar
new file mode 100755
index 0000000..3a7fc26
Binary files /dev/null and b/lib/junit-4.12.jar differ
diff --git a/libs/junit-benchmarks-0.7.0.jar b/lib/junit-benchmarks-0.7.0.jar
similarity index 100%
rename from libs/junit-benchmarks-0.7.0.jar
rename to lib/junit-benchmarks-0.7.0.jar
diff --git a/libs/mysql-connector-java-5.1.36-bin.jar b/lib/mysql-connector-java-5.1.36-bin.jar
similarity index 100%
rename from libs/mysql-connector-java-5.1.36-bin.jar
rename to lib/mysql-connector-java-5.1.36-bin.jar
diff --git a/libs/servlet-api.jar b/lib/servlet-api.jar
similarity index 100%
rename from libs/servlet-api.jar
rename to lib/servlet-api.jar
diff --git a/libs/sqlite-jdbc-3.8.11.2.jar b/lib/sqlite-jdbc-3.8.11.2.jar
similarity index 100%
rename from libs/sqlite-jdbc-3.8.11.2.jar
rename to lib/sqlite-jdbc-3.8.11.2.jar