diff --git a/build.xml b/build.xml
index 31082a02..eadb4674 100644
--- a/build.xml
+++ b/build.xml
@@ -37,19 +37,11 @@
 	<target name="build" depends="build-prepare">
 		<wepp-dir-min dir="${build.dir}/_h5ai/css" todir="${build.dir}/_h5ai/css" />
 		<wepp-dir-min dir="${build.dir}/_h5ai/js" todir="${build.dir}/_h5ai/js" />
-		<delete dir="${build.dir}/_h5ai/css/inc" >
-			<fileset dir="." includes="${build.dir}/_h5ai/css/**/*.less" />
-		</delete>
-		<delete dir="${build.dir}/_h5ai/js/inc" />
 	</target>
 
 	<target name="build-uncompressed" depends="build-prepare">
 		<wepp-dir dir="${build.dir}/_h5ai/css" todir="${build.dir}/_h5ai/css" />
 		<wepp-dir dir="${build.dir}/_h5ai/js" todir="${build.dir}/_h5ai/js" />
-		<delete dir="${build.dir}/_h5ai/css/inc" >
-			<fileset dir="." includes="${build.dir}/_h5ai/css/**/*.less" />
-		</delete>
-		<delete dir="${build.dir}/_h5ai/js/inc" />
 	</target>
 
 	<target name="release" depends="build">
@@ -58,8 +50,8 @@
 	</target>
 
 	<target name="lint" depends="build-prepare">
-		<wepp file="${build.dir}/_h5ai/js/main.js" tofile="${build.dir}/_h5ai/js/main.js" />
-		<jslint files="${build.dir}/_h5ai/js/main.js" />
+		<wepp file="${build.dir}/_h5ai/js/inc/main.js" tofile="${build.dir}/_h5ai/js/inc/main.js" />
+		<jslint files="${build.dir}/_h5ai/js/inc/main.js" />
 	</target>
 
 
@@ -94,6 +86,9 @@
 		<attribute name="todir" />
 		<sequential>
 			<wepp-args args="--nc --inDir '@{dir}' --outDir '@{todir}'" />
+			<delete dir="@{todir}/inc" >
+				<fileset dir="." includes="@{todir}/**/*.less" />
+			</delete>
 		</sequential>
 	</macrodef>
 
@@ -102,6 +97,9 @@
 		<attribute name="todir" />
 		<sequential>
 			<wepp-args args="--inDir '@{dir}' --outDir '@{todir}'" />
+			<delete dir="@{todir}/inc" >
+				<fileset dir="." includes="@{todir}/**/*.less" />
+			</delete>
 		</sequential>
 	</macrodef>
 
diff --git a/src/_h5ai/footer.html b/src/_h5ai/footer.html
index d32323cc..e1f65ffe 100644
--- a/src/_h5ai/footer.html
+++ b/src/_h5ai/footer.html
@@ -25,8 +25,7 @@
 			</span>
 		</span>
 	</footer>
-	<script src="/_h5ai/js/libs.js"></script>
 	<script src="/_h5ai/config.js"></script>
-	<script src="/_h5ai/js/main.js"></script>
+	<script src="/_h5ai/js/libs.js"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/_h5ai/js/main.js b/src/_h5ai/js/inc/main.js
similarity index 63%
rename from src/_h5ai/js/main.js
rename to src/_h5ai/js/inc/main.js
index 29b6b672..9fa0b7f1 100644
--- a/src/_h5ai/js/main.js
+++ b/src/_h5ai/js/inc/main.js
@@ -6,17 +6,17 @@
 
 	var H5AI = {};
 
-	// @include "inc/Util.js"
-	// @include "inc/Core.js"
-	// @include "inc/Sort.js"
-	// @include "inc/ZippedDownload.js"
-	// @include "inc/Finder.js"
-	// @include "inc/Context.js"
+	// @include "Util.js"
+	// @include "Core.js"
+	// @include "Sort.js"
+	// @include "ZippedDownload.js"
+	// @include "Finder.js"
+	// @include "Context.js"
 
-	// @include "inc/Path.js"
-	// @include "inc/Connector.js"
-	// @include "inc/Html.js"
-	// @include "inc/Extended.js"
+	// @include "Path.js"
+	// @include "Connector.js"
+	// @include "Html.js"
+	// @include "Extended.js"
 
 	$(function () {
 
diff --git a/src/_h5ai/js/libs.js b/src/_h5ai/js/libs.js
index 12299eb8..1df256fb 100644
--- a/src/_h5ai/js/libs.js
+++ b/src/_h5ai/js/libs.js
@@ -7,3 +7,5 @@
 
 // @include "inc/lib/amplify.min.js"
 // @include "inc/lib/date.js"
+
+// @include "inc/main.js"