diff --git a/build.xml b/build.xml
index 0e1eada..e8d2e41 100644
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="Xyster" default="dist" basedir=".">
+	<property name="version" value="xyster-build1" />
+    <property name="svnDir" value="./build/${version}" />
+
     <target name="prepare">
-        <echo msg="Making directory ./build" />
+        <echo msg="Making directories..." />
         <mkdir dir="./build" />
         <mkdir dir="./build/reports" />
         <mkdir dir="./build/reports/coverage" />
@@ -9,41 +12,41 @@
 
         <echo msg="Exporting SVN files to build directory..." />
 		<svnexport
-		   repositoryurl="https://xyster.devweblog.org/svn/trunk/library"
-		   todir="./build/svn/library"/>
-		<svnexport
-		   repositoryurl="https://xyster.devweblog.org/svn/trunk/tests"
-		   todir="./build/svn/tests"/>
+		   repositoryurl="https://xyster.devweblog.org/svn/trunk/"
+		   todir="${svnDir}/"/>
+		<delete dir="${svnDir}/graphic_design" includeemptydirs="true" />
+		<delete file="${svnDir}/build.xml" />
     </target>
 
     <target name="build" depends="prepare">
 		<echo msg="Generating API documentation..." />
 		<phpdoc title="Xyster Framework API" 
 		  destdir="./build/api"
+		  quiet="true"
 		  defaultpackagename="Xyster"
 		  defaultcategoryname="Xyster"
 		  output="HTML:frames:default">
-		   <fileset dir="./build/svn/library">
+		   <fileset dir="${svnDir}/library">
 		      <include name="**/*.php" />
 		   </fileset>
 		</phpdoc>
         
         <echo msg="Running Unit tests..." />
-        <resolvepath propertyName="absolutePathLibrary" file="./build/svn/library" />
-        <resolvepath propertyName="absolutePathTests" file="./build/svn/tests" />
+        <resolvepath propertyName="absolutePathLibrary" file="${svnDir}/library" />
+        <resolvepath propertyName="absolutePathTests" file="${svnDir}/tests" />
         
         <includepath classpath="${absolutePathTests}" />
         <includepath classpath="${absolutePathLibrary}" />
         
 		<coverage-setup database="./build/coverage.db">
-		  <fileset dir="./build/svn/library">
+		  <fileset dir="${svnDir}/library">
 		    <include name="**/*.php"/>
 		  </fileset>
 		</coverage-setup>
 		
 		<phpunit codecoverage="true" printsummary="true">
 		  <batchtest>
-		    <fileset dir="./build/svn/tests">
+		    <fileset dir="${svnDir}/tests">
 		      <include name="**/*Test.php"/>
 		    </fileset>
 		  </batchtest>
@@ -60,11 +63,10 @@
     <target name="dist" depends="build">
         <echo msg="Creating archive..." />
 
-		<exec command="7z a -r xyster-build.7z library tests *.txt" dir="./build/svn" />
-		
-		<move file="./build/svn/xyster-build.7z" tofile="./build/xyster-build.7z" />
+		<exec command="7z a -r ${version}.7z ${version}" dir="./build" />
+		<exec command="7z a -r ${version}-api.7z api" dir="./build" />
 
         <echo msg="Deleting SVN files..." />
-		<delete dir="./build/svn" includeemptydirs="true" failonerror="false" />
+		<delete dir="${svnDir}" includeemptydirs="true" failonerror="false" />
     </target>
 </project>
\ No newline at end of file