diff --git a/400_xowa/.classpath b/400_xowa/.classpath
index 1237a2c17..87c5f483d 100644
--- a/400_xowa/.classpath
+++ b/400_xowa/.classpath
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="lib" path="lib/luaj_xowa.jar"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/baselib"/>
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/100_core"/>
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/140_dbs"/>
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/150_gfui"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="lib/jtidy_xowa.jar"/>
-	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/gplx.gflucene"/>
+	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="lib" path="lib/luaj_xowa.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jtidy_xowa.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/icu4j-57_1.jar"/>
 	<classpathentry kind="lib" path="lib/vnu.jar"/>
 	<classpathentry kind="lib" path="lib/Saxon-HE-9.9.1-2.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/baselib"/>
-	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/res/dev/make/ant/xowa_compile.xml b/res/dev/make/ant/xowa_compile.xml
index 842963be7..9309afc9a 100644
--- a/res/dev/make/ant/xowa_compile.xml
+++ b/res/dev/make/ant/xowa_compile.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project default="compile_xowa" name="create runnable jar for XOWA">
+    <target name="compile_baselib">
+        <delete dir="${root_dir}/src/baselib/bin"/>
+        <mkdir  dir="${root_dir}/src/baselib/bin"/>
+        <javac includeantruntime="false" target="${jdk}" source="${jdk}" sourcepath="" 
+		  srcdir   ="${root_dir}/src/baselib"
+		  destdir  ="${root_dir}/src/baselib/bin"
+		  classpath="${root_dir}/src/lib/junit.jar">
+          <include name="**/*.java"/>
+        </javac>
+    </target>
     <target name="compile_core">
         <delete dir="${root_dir}/src/100_core/bin"/>
         <mkdir  dir="${root_dir}/src/100_core/bin"/>
@@ -50,7 +60,7 @@
           <include name="**/*.java"/>
         </javac>
     </target>
-    <target name="compile_xowa" depends="compile_core,compile_gfml,compile_dbs,compile_gfui,compile_gflucene">
+    <target name="compile_xowa" depends="compile_baselib,compile_core,compile_gfml,compile_dbs,compile_gfui,compile_gflucene">
         <delete dir="${root_dir}/src/400_xowa/bin"/>
         <mkdir  dir="${root_dir}/src/400_xowa/bin"/>
         <javac includeantruntime="false" target="${jdk}" source="${jdk}" sourcepath=""
diff --git a/res/dev/make/ant/xowa_make_jar.xml b/res/dev/make/ant/xowa_make_jar.xml
index a9005daf4..25fc71044 100644
--- a/res/dev/make/ant/xowa_make_jar.xml
+++ b/res/dev/make/ant/xowa_make_jar.xml
@@ -6,6 +6,7 @@
                 <attribute name="Main-Class" value="gplx.xowa.Xowa_main"/>
                 <attribute name="Class-Path" value=". bin/${plat_name}/swt/swt.jar bin/any/java/apache/commons-compress-1.5.jar bin/any/java/jdbc/sqlite/sqlite-jdbc-3.18.0.jar bin/any/java/luaj/luaj_xowa.jar bin/any/java/jtidy/jtidy_xowa.jar bin/any/java/xz/xz-1.5.jar bin/any/java/icu4j/icu4j-57_1.jar bin/any/java/lucene/5.3.0.drd/lucene-core-5.3.0-mobile-2.jar bin/any/java/lucene/5.3.0.drd/lucene-highlighter-5.3.0-mobile-2.jar bin/any/java/lucene/5.3.0.drd/lucene-memory-5.3.0-mobile-2.jar bin/any/java/lucene/5.3.0.drd/lucene-queryparser-5.3.0-mobile-2.jar bin/any/java/lucene/5.3.0.drd/lucene-analyzers-common-5.3.0-mobile-2.jar bin/any/java/lucene/5.3.0.drd/lucene-queries-5.3.0-mobile-2.jar bin/any/java/vnu/vnu.jar bin/any/java/vnu/Saxon-HE-9.9.1-2.jar"/>
             </manifest>
+            <fileset dir="${root_dir}/src/baselib/bin"/>
             <fileset dir="${root_dir}/src/100_core/bin"/>
             <fileset dir="${root_dir}/src/110_gfml/bin"/>
             <fileset dir="${root_dir}/src/140_dbs/bin"/>
diff --git a/res/dev/make/maven/xowa_maven_files.sh b/res/dev/make/maven/xowa_maven_files.sh
index 0bc9f1b6f..10062581e 100644
--- a/res/dev/make/maven/xowa_maven_files.sh
+++ b/res/dev/make/maven/xowa_maven_files.sh
@@ -40,6 +40,9 @@ mavenize_xowa ()
     -exec cp --parents -pr$verbose '{}' './src/xowa_maven/src/test/java/gplx/' ';'
 }
 
+# package: baselib
+mavenize_xowa ./src/xowa/baselib/
+
 # package: core
 mavenize_xowa ./src/xowa/100_core/