diff --git a/build.xml b/build.xml
index 9855da347650a6055d73d917cc848d969f2b44ab..70dec7cac0b95de6686fca1878fdb3227630c9eb 100644
--- a/build.xml
+++ b/build.xml
@@ -72,28 +72,25 @@
     -->
     <target name="-post-jar">
         <property name="store.jar.name" value="LiFiBenchmarkFat"/>
-        <property name="store.dir" value="dist"/>
-        <property name="store.jar" value="${store.dir}/${store.jar.name}.jar"/>
+        <property name="store.jar" value="${dist.dir}/${store.jar.name}.jar"/>
         <echo message="Packaging ${application.title} into a single JAR at ${store.jar}"/>
-        <!--<delete dir="${store.dir}"/>
-        <mkdir dir="${store.dir}"/> -->
-        <jar destfile="${store.dir}/temp_final.jar" filesetmanifest="skip">
-            <zipgroupfileset dir="dist" includes="*.jar"/>
-            <zipgroupfileset dir="dist/lib" includes="*.jar"/>
+        <!--mkdir dir="${dist.dir}/lib-->
+        <jar destfile="${dist.dir}/temp_final.jar" filesetmanifest="skip">
+            <zipgroupfileset dir="${dist.dir}" includes="*.jar"/>
+            <zipgroupfileset dir="${dist.dir}/lib" includes="*.jar"/>
             <manifest>
                 <attribute name="Main-Class" value="${main.class}"/>
             </manifest>
         </jar>
         <zip destfile="${store.jar}">
-            <zipfileset src="${store.dir}/temp_final.jar" excludes="META-INF/*.SF, META-INF/*.DSA, META-INF/*.RSA"/>
+            <zipfileset src="${dist.dir}/temp_final.jar" excludes="META-INF/*.SF, META-INF/*.DSA, META-INF/*.RSA"/>
         </zip>
-        <delete file="${store.dir}/temp_final.jar"/>
+        <delete file="${dist.dir}/temp_final.jar"/>
         
-        <copy todir="dist" overwrite="true">
-            <fileset dir="runscripts">
-            </fileset>
+        <copy todir="${dist.dir}" overwrite="true">
+            <fileset dir="runscripts"/>
         </copy>
-        <chmod dir="dist" perm="u=rwx,go=rx" includes="**/*.sh"/>
+        <chmod dir="${dist.dir}" perm="u=rwx,go=rx" includes="**/*.sh"/>
         <delete file="${dist.dir}/README.TXT"/>
         <delete file="${dist.jar}"/>
         <delete dir="${dist.dir}/lib"/>