diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml
new file mode 100644
index 00000000..bcf1462b
--- /dev/null
+++ b/.github/workflows/build_release.yml
@@ -0,0 +1,45 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Build new release
+on:
+  push:
+    # Sequence of patterns matched against refs/tags
+    tags:
+    - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: '8'
+        distribution: 'adopt'
+        cache: maven
+    - name: Build project
+      run: make dist
+    - name: Create the release
+      id: create_release
+      uses: actions/create-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ github.ref }}
+        release_name: Release ${{ github.ref }}
+        draft: false
+        prerelease: false
+    - name: Upload .zip file to release
+      id: upload-release-asset 
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
+        asset_path: ./ublu-dist.zip
+        asset_name: ublu-dist.zip
+        asset_content_type: application/zip
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 00000000..cac1b44c
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,28 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: '8'
+        distribution: 'temurin'
+        cache: maven
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
+    - name: Build the Distribution
+      run: make dist
diff --git a/.gitignore b/.gitignore
index bb5ec422..b8ed9740 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,14 @@
-/dist/
-/src/ublu/Version.java
+/target/
+/src/main/java/ublu/Version.java
 /lib/postgresql-9.2-1003.jdbc4.jar
 /oldlib/
 /nbproject/private/
 /build/
-/lib/mssql-jdbc-7.0.0.jre8.jar
\ No newline at end of file
+/lib/mssql-jdbc-7.0.0.jre8.jar
+/ublu-dist.zip
+/dist-build/
+/dist/
+MakeVer.class
+.classpath
+.project
+.settings/
\ No newline at end of file
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..07f96c88
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,25 @@
+target/ublu.jar: FORCE
+	rm -f src/main/java/ublu/Version.java
+	rm -rf target
+	mvn package
+	cp target/ublu-*-with-dependencies.jar target/ublu.jar
+
+FORCE:
+
+clean:
+	rm -rf target dist-build ublu-dist.zip src/main/java/ublu/Version.java MakeVer.class
+
+dist: target/ublu.jar
+	rm -fr dist-build
+	mkdir dist-build
+	cp target/ublu.jar dist-build/ublu.jar
+	cp -R bin dist-build/
+	cp -R examples dist-build/
+	cp -R extensions dist-build/
+	cp -R man dist-build/
+	cp -R share dist-build/
+	cp -R userdoc dist-build/
+	mkdir -p dist-build/licenses
+	cp *license* dist-build/licenses
+	cp *LICENSE* dist-build/licenses
+	cd dist-build/ && zip -rmv ../ublu-dist.zip ./*
\ No newline at end of file
diff --git a/Version.java.tpl b/Version.java.tpl
new file mode 100755
index 00000000..64c9f7c9
--- /dev/null
+++ b/Version.java.tpl
@@ -0,0 +1,5 @@
+package ublu;
+class Version {
+      static String compileDateTime = "@timestamp@ (GMT)";
+      static String ubluVersion = "@ubluversion@";
+}
\ No newline at end of file
diff --git a/bin/ublu b/bin/ublu
index 0e88bde2..b1fb25ee 100755
--- a/bin/ublu
+++ b/bin/ublu
@@ -6,6 +6,17 @@
 
 MYPGM=$0
 
+# If we have readlink, use it to resolve the full path to this script.
+# This is needed for the case where 'ublu' is just a symlink to
+# somewhere else
+if [ -x "/QOpenSys/pkgs/bin/readlink" ]
+then
+	MYPGM=$(/QOpenSys/pkgs/bin/readlink -f $0)
+elif [ -x "/usr/bin/readlink" ]
+then
+	MYPGM=$(/usr/bin/readlink -f $0)
+fi
+
 # Usage message
 function usage {
 echo "Ublu is free open source software with NO WARRANTY and NO GUARANTEE, including as regards fitness for any application."
@@ -55,7 +66,16 @@ REMAINING_ARGS="$*"
 
 if [ "$UBLU_CLASSPATH" == "" ]
 then
-	UBLU_CLASSPATH="/opt/ublu/ublu.jar"
+  if [ -f $(dirname $MYPGM)/../ublu.jar ]
+	then
+		UBLU_CLASSPATH="$(dirname $MYPGM)/../ublu.jar"
+	elif [ -f /opt/ublu/ublu.jar ]
+	then
+		UBLU_CLASSPATH="/opt/ublu/ublu.jar"
+	else
+		echo "Ublu not found in /opt/ublu/ublu.jar or $(dirname $MYPGM)/../ublu.jar"
+		exit 1
+	fi
 fi
 
 if [ "$CLASSPATH" != "" ]
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 60276cc9..00000000
--- a/build.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
-<project name="ublu" default="default" basedir=".">
-    <description>Builds, tests, and runs the project Ublu</description>
-    <import file="nbproject/build-impl.xml"/>
-    <!--
-
-    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
-
-      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
-
-    (Targets beginning with '-' are not intended to be called on their own.)
-
-    Example of inserting an obfuscator after compilation could look like this:
-
-        <target name="-post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
-
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
-
-
-    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
-
-      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
-      -do-jar-with-manifest:    JAR building (if you are using a manifest)
-      -do-jar-without-manifest: JAR building (if you are not using a manifest)
-      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
-
-    An example of overriding the target for project execution could look like this:
-
-        <target name="run" depends="Ublu-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
-            </exec>
-        </target>
-
-    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
-
-    -->
-    <target name="-pre-compile">  
-        <tstamp>
-            <format property="COMPILE_DATE_TIME" pattern="yyyy-MM-dd HH:mm:ss"/>
-        </tstamp>
-        <filter token="compile.date.time" value="${COMPILE_DATE_TIME}"/>
-        <filter token="ublu.version" value="${ublu.version}"/>
-        <copy file="share/_proto_Version.java" tofile="${src.dir}/ublu/Version.java" filtering="true" overwrite="true"/>
-    </target>
-
-<!--    <target name="distextras" description="copy bin and share directories to dist dir for zipitup">
-        <copy todir="${dist.dir}/bin">
-            <fileset dir="${basedir}/bin">               
-            </fileset>
-        </copy>
-        <copy todir="${dist.dir}/share">
-            <fileset dir="${basedir}/share">               
-            </fileset>
-        </copy>
-        <copy todir="${dist.dir}/man">
-            <fileset dir="${basedir}/man">               
-            </fileset>
-        </copy>
-    </target>-->
-    
-    <!-- Make zip archive of installable distribution -->
-    <target name="zipitup" description="Make zip archive of distribution">
-        <property file="nbproject/project.properties"/>
-        <tstamp>
-            <format property="ZIP_DATE_TIME" pattern="yyyyMMdd.HHmm"/>
-        </tstamp>
-        <zip basedir="${dist.dir}/.." compress="yes" destfile="${dist.dir}/ublu_${ublu.version}.${ZIP_DATE_TIME}.zip" excludes="**">
-            <zipfileset dir="${dist.dir}" includes="ublu.jar,lib/**" excludes="lib/mssql*"/>
-            <zipfileset dir="." includes="examples/**,extensions/**,userdoc/**,bin/**,share/**,man/**"/>
-        </zip>        
-    </target>
-
-    <!-- Make zip archive of source and installable distribution -->
-    <target name="zipprojup" description="Make zip archive of project with all sources and libs">
-        <property file="nbproject/project.properties"/>
-        <tstamp>
-            <format property="ZIP_DATE_TIME" pattern="yyyyMMdd.HHmm"/>
-        </tstamp>
-        <zip basedir="${basedir}" compress="yes" destfile="dist/ublu_${ublu.version}.all.${ZIP_DATE_TIME}.zip" excludes="**">
-            <zipfileset dir="${dist.dir}" includes="ublu.jar,javadoc/**"/>
-            <zipfileset dir="${basedir}" excludes="build/**,dist/**,lib/mssql*,nbproject/private/**"/>
-        </zip>        
-    </target>
-
-    <!-- Make tar archive of distribution -->
-    <target name="taritup" description="Make tar archive buildable for RPM">
-        <property file="nbproject/project.properties"/>
-        <tstamp>
-            <format property="ZIP_DATE_TIME" pattern="yyyyMMdd.HHmm"/>
-        </tstamp>
-        <tar basedir="${dist.dir}/.." 
-             compression="gzip" 
-             destfile="${dist.dir}/ublu-${ublu.version}.${ZIP_DATE_TIME}.tar.gz" 
-             excludes="**/**">
-            <tarfileset dir="." excludes="build/**,dist/**,lib/mssql*,test**" prefix="ublu-${ublu.version}"/>
-        </tar>        
-    </target>
-    
-    <target name="allarchives" depends="zipitup,zipprojup,taritup"/>
-    
-    <target name="rpm-setup" description="Setup to build an RPM - depends on RPM.dir being set">
-        <property file="nbproject/project.properties"/>
-        <copy todir="${RPM.dir}/TEMP/ublu-${ublu.version}/nbproject">
-            <fileset dir="${basedir}/nbproject">               
-            </fileset>
-        </copy>
-        <copy todir="${RPM.dir}/TEMP/ublu-${ublu.version}/src">
-            <fileset dir="${basedir}/src">               
-            </fileset>
-        </copy>
-        <copy todir="${RPM.dir}/TEMP/ublu-${ublu.version}/lib">
-            <fileset dir="${basedir}/lib" excludes="mssql*">               
-            </fileset>
-        </copy>
-        <copy todir="${RPM.dir}/TEMP/ublu-${ublu.version}/share">
-            <fileset dir="${basedir}/share">               
-            </fileset>
-        </copy>
-        <copy todir="${RPM.dir}/TEMP/ublu-${ublu.version}/bin">
-            <fileset dir="${basedir}/bin">               
-            </fileset>
-        </copy>
-        <copy todir="${RPM.dir}/TEMP/ublu-${ublu.version}/userdoc">
-            <fileset dir="${basedir}/userdoc">               
-            </fileset>
-        </copy>
-        <copy todir="${RPM.dir}/TEMP/ublu-${ublu.version}/examples">
-            <fileset dir="${basedir}/examples">               
-            </fileset>
-        </copy>
-        <copy todir="${RPM.dir}/TEMP/ublu-${ublu.version}/extensions">
-            <fileset dir="${basedir}/extensions">               
-            </fileset>
-        </copy>
-        <copy todir="${RPM.dir}/TEMP/ublu-${ublu.version}" file="${basedir}/share/RPM/Makefile"/>
-        <copy todir="${RPM.dir}/TEMP/ublu-${ublu.version}" file="${basedir}/build.xml"/>
-        <tar basedir="${RPM.dir}/TEMP" compression="gzip" destfile="${RPM.dir}/SOURCES/ublu-${ublu.version}.tar.gz"/>
-    </target>
-    
-    <!-- finish our distrib -->
-    <target name="-post-jar">
-<!--        <antcall target="distextras"/>-->
-        <antcall target="zipitup"/>
-    </target>
-        
-</project>
diff --git a/lib/postgresql-42.2.5.jre7.jar b/lib/postgresql-42.2.5.jre7.jar
deleted file mode 100644
index 261df835..00000000
Binary files a/lib/postgresql-42.2.5.jre7.jar and /dev/null differ
diff --git a/lib/jt400.jar b/lib/ublu/staticlib/jt400/9.6-patched/jt400-9.6-patched.jar
similarity index 100%
rename from lib/jt400.jar
rename to lib/ublu/staticlib/jt400/9.6-patched/jt400-9.6-patched.jar
diff --git a/lib/ublu/staticlib/jt400/9.6-patched/jt400-9.6-patched.pom b/lib/ublu/staticlib/jt400/9.6-patched/jt400-9.6-patched.pom
new file mode 100644
index 00000000..2257d2ed
--- /dev/null
+++ b/lib/ublu/staticlib/jt400/9.6-patched/jt400-9.6-patched.pom
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>ublu.staticlib</groupId>
+  <artifactId>jt400</artifactId>
+  <version>9.6-patched</version>
+  <description>POM was created from install:install-file</description>
+</project>
diff --git a/lib/ublu/staticlib/jt400/maven-metadata-local.xml b/lib/ublu/staticlib/jt400/maven-metadata-local.xml
new file mode 100644
index 00000000..edf2a7c5
--- /dev/null
+++ b/lib/ublu/staticlib/jt400/maven-metadata-local.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>ublu.staticlib</groupId>
+  <artifactId>jt400</artifactId>
+  <versioning>
+    <release>9.6-patched</release>
+    <versions>
+      <version>9.6-patched</version>
+    </versions>
+    <lastUpdated>20220201004916</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/lib/ublu/staticlib/pigiron/maven-metadata-local.xml b/lib/ublu/staticlib/pigiron/maven-metadata-local.xml
new file mode 100644
index 00000000..a5de1526
--- /dev/null
+++ b/lib/ublu/staticlib/pigiron/maven-metadata-local.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>ublu.staticlib</groupId>
+  <artifactId>pigiron</artifactId>
+  <versioning>
+    <release>only</release>
+    <versions>
+      <version>only</version>
+    </versions>
+    <lastUpdated>20220201003103</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/lib/pigiron.jar b/lib/ublu/staticlib/pigiron/only/pigiron-only.jar
similarity index 100%
rename from lib/pigiron.jar
rename to lib/ublu/staticlib/pigiron/only/pigiron-only.jar
diff --git a/lib/ublu/staticlib/pigiron/only/pigiron-only.pom b/lib/ublu/staticlib/pigiron/only/pigiron-only.pom
new file mode 100644
index 00000000..8c77e8aa
--- /dev/null
+++ b/lib/ublu/staticlib/pigiron/only/pigiron-only.pom
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>ublu.staticlib</groupId>
+  <artifactId>pigiron</artifactId>
+  <version>only</version>
+  <description>POM was created from install:install-file</description>
+</project>
diff --git a/lib/ublu/staticlib/postgresql/maven-metadata-local.xml b/lib/ublu/staticlib/postgresql/maven-metadata-local.xml
new file mode 100644
index 00000000..1fc63c14
--- /dev/null
+++ b/lib/ublu/staticlib/postgresql/maven-metadata-local.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>ublu.staticlib</groupId>
+  <artifactId>postgresql</artifactId>
+  <versioning>
+    <release>42.2.5-local</release>
+    <versions>
+      <version>42.2.5-local</version>
+    </versions>
+    <lastUpdated>20220201003503</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/lib/ublu/staticlib/sblim-cim-client2-HEAD/maven-metadata-local.xml b/lib/ublu/staticlib/sblim-cim-client2-HEAD/maven-metadata-local.xml
new file mode 100644
index 00000000..68427628
--- /dev/null
+++ b/lib/ublu/staticlib/sblim-cim-client2-HEAD/maven-metadata-local.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>ublu.staticlib</groupId>
+  <artifactId>sblim-cim-client2-HEAD</artifactId>
+  <versioning>
+    <release>only</release>
+    <versions>
+      <version>only</version>
+    </versions>
+    <lastUpdated>20220201003243</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/lib/sblim-cim-client2-HEAD.jar b/lib/ublu/staticlib/sblim-cim-client2-HEAD/only/sblim-cim-client2-HEAD-only.jar
similarity index 100%
rename from lib/sblim-cim-client2-HEAD.jar
rename to lib/ublu/staticlib/sblim-cim-client2-HEAD/only/sblim-cim-client2-HEAD-only.jar
diff --git a/lib/ublu/staticlib/sblim-cim-client2-HEAD/only/sblim-cim-client2-HEAD-only.pom b/lib/ublu/staticlib/sblim-cim-client2-HEAD/only/sblim-cim-client2-HEAD-only.pom
new file mode 100644
index 00000000..9384fca8
--- /dev/null
+++ b/lib/ublu/staticlib/sblim-cim-client2-HEAD/only/sblim-cim-client2-HEAD-only.pom
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>ublu.staticlib</groupId>
+  <artifactId>sblim-cim-client2-HEAD</artifactId>
+  <version>only</version>
+  <description>POM was created from install:install-file</description>
+</project>
diff --git a/lib/ublu/staticlib/tn5250j/maven-metadata-local.xml b/lib/ublu/staticlib/tn5250j/maven-metadata-local.xml
new file mode 100644
index 00000000..4f9e5a93
--- /dev/null
+++ b/lib/ublu/staticlib/tn5250j/maven-metadata-local.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>ublu.staticlib</groupId>
+  <artifactId>tn5250j</artifactId>
+  <versioning>
+    <release>only</release>
+    <versions>
+      <version>only</version>
+    </versions>
+    <lastUpdated>20220201003345</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/lib/tn5250j.jar b/lib/ublu/staticlib/tn5250j/only/tn5250j-only.jar
similarity index 100%
rename from lib/tn5250j.jar
rename to lib/ublu/staticlib/tn5250j/only/tn5250j-only.jar
diff --git a/lib/ublu/staticlib/tn5250j/only/tn5250j-only.pom b/lib/ublu/staticlib/tn5250j/only/tn5250j-only.pom
new file mode 100644
index 00000000..b3334835
--- /dev/null
+++ b/lib/ublu/staticlib/tn5250j/only/tn5250j-only.pom
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>ublu.staticlib</groupId>
+  <artifactId>tn5250j</artifactId>
+  <version>only</version>
+  <description>POM was created from install:install-file</description>
+</project>
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
deleted file mode 100644
index 701cca31..00000000
--- a/nbproject/build-impl.xml
+++ /dev/null
@@ -1,1796 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
-
-For the purpose of easier reading the script
-is divided into following sections:
-
-  - initialization
-  - compilation
-  - jar
-  - execution
-  - debugging
-  - javadoc
-  - test compilation
-  - test execution
-  - test debugging
-  - applet
-  - cleanup
-
-        -->
-<project xmlns:if="ant:if" xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" xmlns:unless="ant:unless" basedir=".." default="default" name="Ublu-impl">
-    <fail message="Please build using Ant 1.8.0 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.8.0"/>
-            </not>
-        </condition>
-    </fail>
-    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
-    <!-- 
-                ======================
-                INITIALIZATION SECTION 
-                ======================
-            -->
-    <target name="-pre-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init" name="-init-private">
-        <property file="nbproject/private/config.properties"/>
-        <property file="nbproject/private/configs/${config}.properties"/>
-        <property file="nbproject/private/private.properties"/>
-    </target>
-    <target name="-pre-init-libraries">
-        <property location="lib/nblibraries.properties" name="libraries.path"/>
-        <dirname file="${libraries.path}" property="libraries.dir.nativedirsep"/>
-        <pathconvert dirsep="/" property="libraries.dir">
-            <path path="${libraries.dir.nativedirsep}"/>
-        </pathconvert>
-        <basename file="${libraries.path}" property="libraries.basename" suffix=".properties"/>
-        <available file="${libraries.dir}/${libraries.basename}-private.properties" property="private.properties.available"/>
-    </target>
-    <target depends="-pre-init-libraries" if="private.properties.available" name="-init-private-libraries">
-        <loadproperties encoding="ISO-8859-1" srcfile="${libraries.dir}/${libraries.basename}-private.properties">
-            <filterchain>
-                <replacestring from="$${base}" to="${libraries.dir}"/>
-                <escapeunicode/>
-            </filterchain>
-        </loadproperties>
-    </target>
-    <target depends="-pre-init,-init-private,-init-private-libraries" name="-init-libraries">
-        <loadproperties encoding="ISO-8859-1" srcfile="${libraries.path}">
-            <filterchain>
-                <replacestring from="$${base}" to="${libraries.dir}"/>
-                <escapeunicode/>
-            </filterchain>
-        </loadproperties>
-    </target>
-    <target depends="-pre-init,-init-private,-init-libraries" name="-init-user">
-        <property file="${user.properties.file}"/>
-        <!-- The two properties below are usually overridden -->
-        <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.8"/>
-        <property name="default.javac.target" value="1.8"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-libraries,-init-user" name="-init-project">
-        <property file="nbproject/configs/${config}.properties"/>
-        <property file="nbproject/project.properties"/>
-    </target>
-    <target name="-init-modules-supported">
-        <condition property="modules.supported.internal" value="true">
-            <not>
-                <matches pattern="1\.[0-8](\..*)?" string="${javac.source}"/>
-            </not>
-        </condition>
-    </target>
-    <target depends="-init-modules-supported" if="modules.supported.internal" name="-init-macrodef-modulename">
-        <macrodef name="modulename" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute name="property"/>
-            <attribute name="sourcepath"/>
-            <sequential>
-                <loadresource property="@{property}" quiet="true">
-                    <javaresource classpath="@{sourcepath}" name="module-info.java" parentFirst="false"/>
-                    <filterchain>
-                        <stripjavacomments/>
-                        <linecontainsregexp>
-                            <regexp pattern="module .* \{"/>
-                        </linecontainsregexp>
-                        <tokenfilter>
-                            <linetokenizer/>
-                            <replaceregex flags="s" pattern="(\s*module\s+)(\S*)(\s*\{.*)" replace="\2"/>
-                        </tokenfilter>
-                        <striplinebreaks/>
-                    </filterchain>
-                </loadresource>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-modules-supported,-init-macrodef-modulename" if="modules.supported.internal" name="-init-source-module-properties">
-        <fail message="Java 9 support requires Ant 1.10.0 or higher.">
-            <condition>
-                <not>
-                    <antversion atleast="1.10.0"/>
-                </not>
-            </condition>
-        </fail>
-        <j2seproject3:modulename property="module.name" sourcepath="${src.dir}"/>
-        <condition property="named.module.internal">
-            <and>
-                <isset property="module.name"/>
-                <length length="0" string="${module.name}" when="greater"/>
-            </and>
-        </condition>
-        <condition property="unnamed.module.internal">
-            <not>
-                <isset property="named.module.internal"/>
-            </not>
-        </condition>
-        <property name="javac.modulepath" value=""/>
-        <property name="run.modulepath" value="${javac.modulepath}"/>
-        <property name="module.build.classes.dir" value="${build.classes.dir}"/>
-        <property name="debug.modulepath" value="${run.modulepath}"/>
-        <property name="javac.upgrademodulepath" value=""/>
-        <property name="run.upgrademodulepath" value="${javac.upgrademodulepath}"/>
-        <condition else="" property="javac.systemmodulepath.cmd.line.arg" value="--system '${javac.systemmodulepath}'">
-            <and>
-                <isset property="javac.systemmodulepath"/>
-                <length length="0" string="${javac.systemmodulepath}" when="greater"/>
-            </and>
-        </condition>
-        <property name="dist.jlink.dir" value="${dist.dir}/jlink"/>
-        <property name="dist.jlink.output" value="${dist.jlink.dir}/${application.title}"/>
-        <property name="module.name" value=""/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property,-init-modules-supported" name="-do-init">
-        <property name="platform.java" value="${java.home}/bin/java"/>
-        <available file="${manifest.file}" property="manifest.available"/>
-        <condition property="splashscreen.available">
-            <and>
-                <not>
-                    <equals arg1="${application.splash}" arg2="" trim="true"/>
-                </not>
-                <available file="${application.splash}"/>
-            </and>
-        </condition>
-        <condition property="main.class.available">
-            <and>
-                <isset property="main.class"/>
-                <not>
-                    <equals arg1="${main.class}" arg2="" trim="true"/>
-                </not>
-            </and>
-        </condition>
-        <condition property="profile.available">
-            <and>
-                <isset property="javac.profile"/>
-                <length length="0" string="${javac.profile}" when="greater"/>
-                <not>
-                    <matches pattern="1\.[0-7](\..*)?" string="${javac.source}"/>
-                </not>
-            </and>
-        </condition>
-        <condition property="do.archive">
-            <or>
-                <not>
-                    <istrue value="${jar.archive.disabled}"/>
-                </not>
-                <istrue value="${not.archive.disabled}"/>
-            </or>
-        </condition>
-        <condition property="do.archive+manifest.available">
-            <and>
-                <isset property="manifest.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="do.archive+main.class.available">
-            <and>
-                <isset property="main.class.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="do.archive+splashscreen.available">
-            <and>
-                <isset property="splashscreen.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="do.archive+profile.available">
-            <and>
-                <isset property="profile.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="have.tests">
-            <or>
-                <available file="${test.src.dir}"/>
-            </or>
-        </condition>
-        <condition property="have.sources">
-            <or>
-                <available file="${src.dir}"/>
-            </or>
-        </condition>
-        <condition property="netbeans.home+have.tests">
-            <and>
-                <isset property="netbeans.home"/>
-                <isset property="have.tests"/>
-            </and>
-        </condition>
-        <condition property="no.javadoc.preview">
-            <and>
-                <isset property="javadoc.preview"/>
-                <isfalse value="${javadoc.preview}"/>
-            </and>
-        </condition>
-        <property name="run.jvmargs" value=""/>
-        <property name="run.jvmargs.ide" value=""/>
-        <property name="javac.compilerargs" value=""/>
-        <property name="work.dir" value="${basedir}"/>
-        <condition property="no.deps">
-            <and>
-                <istrue value="${no.dependencies}"/>
-            </and>
-        </condition>
-        <property name="javac.debug" value="true"/>
-        <property name="javadoc.preview" value="true"/>
-        <property name="application.args" value=""/>
-        <property name="source.encoding" value="${file.encoding}"/>
-        <property name="runtime.encoding" value="${source.encoding}"/>
-        <property name="manifest.encoding" value="${source.encoding}"/>
-        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
-            <and>
-                <isset property="javadoc.encoding"/>
-                <not>
-                    <equals arg1="${javadoc.encoding}" arg2=""/>
-                </not>
-            </and>
-        </condition>
-        <property name="javadoc.encoding.used" value="${source.encoding}"/>
-        <property name="includes" value="**"/>
-        <property name="excludes" value=""/>
-        <property name="do.depend" value="false"/>
-        <condition property="do.depend.true">
-            <istrue value="${do.depend}"/>
-        </condition>
-        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
-        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
-            <and>
-                <isset property="endorsed.classpath"/>
-                <not>
-                    <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
-                </not>
-            </and>
-        </condition>
-        <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
-            <isset property="profile.available"/>
-        </condition>
-        <condition else="false" property="jdkBug6558476">
-            <and>
-                <matches pattern="1\.[56]" string="${java.specification.version}"/>
-                <not>
-                    <os family="unix"/>
-                </not>
-            </and>
-        </condition>
-        <condition else="false" property="javac.fork">
-            <or>
-                <istrue value="${jdkBug6558476}"/>
-                <istrue value="${javac.external.vm}"/>
-            </or>
-        </condition>
-        <property name="jar.index" value="false"/>
-        <property name="jar.index.metainf" value="${jar.index}"/>
-        <property name="copylibs.rebase" value="true"/>
-        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
-        <condition property="junit.available">
-            <or>
-                <available classname="org.junit.Test" classpath="${run.test.classpath}"/>
-                <available classname="junit.framework.Test" classpath="${run.test.classpath}"/>
-            </or>
-        </condition>
-        <condition property="testng.available">
-            <available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/>
-        </condition>
-        <condition property="junit+testng.available">
-            <and>
-                <istrue value="${junit.available}"/>
-                <istrue value="${testng.available}"/>
-            </and>
-        </condition>
-        <condition else="testng" property="testng.mode" value="mixed">
-            <istrue value="${junit+testng.available}"/>
-        </condition>
-        <condition else="" property="testng.debug.mode" value="-mixed">
-            <istrue value="${junit+testng.available}"/>
-        </condition>
-        <property name="java.failonerror" value="true"/>
-    </target>
-    <target name="-post-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init" name="-init-check">
-        <fail unless="src.dir">Must set src.dir</fail>
-        <fail unless="test.src.dir">Must set test.src.dir</fail>
-        <fail unless="build.dir">Must set build.dir</fail>
-        <fail unless="dist.dir">Must set dist.dir</fail>
-        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
-        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
-        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
-        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
-        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
-        <fail unless="dist.jar">Must set dist.jar</fail>
-    </target>
-    <target name="-init-macrodef-property">
-        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute name="name"/>
-            <attribute name="value"/>
-            <sequential>
-                <property name="@{name}" value="${@{value}}"/>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="modules.supported.internal" name="-init-macrodef-javac-with-module">
-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <attribute default="${javac.modulepath}" name="modulepath"/>
-            <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/>
-            <attribute default="${javac.processorpath}" name="processorpath"/>
-            <attribute default="${javac.processormodulepath}" name="processormodulepath"/>
-            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="${javac.debug}" name="debug"/>
-            <attribute default="${empty.dir}" name="sourcepath" unless:set="named.module.internal"/>
-            <attribute default="${src.dir}" if:set="named.module.internal" name="sourcepath"/>
-            <attribute default="${empty.dir}" name="gensrcdir"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <condition property="warn.excludes.internal">
-                    <and>
-                        <isset property="named.module.internal"/>
-                        <length length="0" string="@{excludes}" trim="true" when="greater"/>
-                    </and>
-                </condition>
-                <echo if:set="warn.excludes.internal" level="warning" message="The javac excludes are not supported in the JDK 9 Named Module."/>
-                <property location="${build.dir}/empty" name="empty.dir"/>
-                <mkdir dir="${empty.dir}"/>
-                <mkdir dir="@{apgeneratedsrcdir}"/>
-                <condition property="processormodulepath.set">
-                    <resourcecount count="0" when="greater">
-                        <path>
-                            <pathelement path="@{processormodulepath}"/>
-                        </path>
-                    </resourcecount>
-                </condition>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
-                    <src>
-                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
-                            <include name="*"/>
-                        </dirset>
-                    </src>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <modulepath>
-                        <path path="@{modulepath}"/>
-                    </modulepath>
-                    <upgrademodulepath>
-                        <path path="@{upgrademodulepath}"/>
-                    </upgrademodulepath>
-                    <compilerarg line="${javac.systemmodulepath.cmd.line.arg}"/>
-                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
-                    <compilerarg line="${javac.compilerargs}"/>
-                    <compilerarg if:set="processormodulepath.set" value="--processor-module-path"/>
-                    <compilerarg if:set="processormodulepath.set" path="@{processormodulepath}"/>
-                    <compilerarg unless:set="processormodulepath.set" value="-processorpath"/>
-                    <compilerarg path="@{processorpath}:${empty.dir}" unless:set="processormodulepath.set"/>
-                    <compilerarg line="${ap.processors.internal}"/>
-                    <compilerarg line="${annotation.processing.processor.options}"/>
-                    <compilerarg value="-s"/>
-                    <compilerarg path="@{apgeneratedsrcdir}"/>
-                    <compilerarg line="${ap.proc.none.internal}"/>
-                    <customize/>
-                </javac>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors" unless="modules.supported.internal">
-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <attribute default="${javac.modulepath}" name="modulepath"/>
-            <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/>
-            <attribute default="${javac.processorpath}" name="processorpath"/>
-            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="${javac.debug}" name="debug"/>
-            <attribute default="${empty.dir}" name="sourcepath"/>
-            <attribute default="${empty.dir}" name="gensrcdir"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property location="${build.dir}/empty" name="empty.dir"/>
-                <mkdir dir="${empty.dir}"/>
-                <mkdir dir="@{apgeneratedsrcdir}"/>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
-                    <src>
-                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
-                            <include name="*"/>
-                        </dirset>
-                    </src>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
-                    <compilerarg line="${javac.compilerargs}"/>
-                    <compilerarg value="-processorpath"/>
-                    <compilerarg path="@{processorpath}:${empty.dir}"/>
-                    <compilerarg line="${ap.processors.internal}"/>
-                    <compilerarg line="${annotation.processing.processor.options}"/>
-                    <compilerarg value="-s"/>
-                    <compilerarg path="@{apgeneratedsrcdir}"/>
-                    <compilerarg line="${ap.proc.none.internal}"/>
-                    <customize/>
-                </javac>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-ap-cmdline-properties,-init-source-module-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <attribute default="${javac.modulepath}" name="modulepath"/>
-            <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/>
-            <attribute default="${javac.processorpath}" name="processorpath"/>
-            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="${javac.debug}" name="debug"/>
-            <attribute default="${empty.dir}" name="sourcepath"/>
-            <attribute default="${empty.dir}" name="gensrcdir"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property location="${build.dir}/empty" name="empty.dir"/>
-                <mkdir dir="${empty.dir}"/>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
-                    <src>
-                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
-                            <include name="*"/>
-                        </dirset>
-                    </src>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
-                    <compilerarg line="${javac.compilerargs}"/>
-                    <customize/>
-                </javac>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-javac-with-module,-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
-        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <sequential>
-                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </depend>
-            </sequential>
-        </macrodef>
-        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <sequential>
-                <fail unless="javac.includes">Must set javac.includes</fail>
-                <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
-                    <path>
-                        <filelist dir="@{destdir}" files="${javac.includes}"/>
-                    </path>
-                    <globmapper from="*.java" to="*.class"/>
-                </pathconvert>
-                <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
-                <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
-                <delete>
-                    <files includesfile="${javac.includesfile.binary}"/>
-                </delete>
-                <delete>
-                    <fileset file="${javac.includesfile.binary}"/>
-                </delete>
-            </sequential>
-        </macrodef>
-    </target>
-    <target if="${junit.available}" name="-init-macrodef-junit-init">
-        <condition else="false" property="nb.junit.batch" value="true">
-            <and>
-                <istrue value="${junit.available}"/>
-                <not>
-                    <isset property="test.method"/>
-                </not>
-            </and>
-        </condition>
-        <condition else="false" property="nb.junit.single" value="true">
-            <and>
-                <istrue value="${junit.available}"/>
-                <isset property="test.method"/>
-            </and>
-        </condition>
-    </target>
-    <target name="-init-test-properties">
-        <property name="test.binaryincludes" value="&lt;nothing&gt;"/>
-        <property name="test.binarytestincludes" value=""/>
-        <property name="test.binaryexcludes" value=""/>
-    </target>
-    <target depends="-init-modules-supported" if="modules.supported.internal" name="-init-macrodef-junit-prototype-with-module">
-        <macrodef name="junit-prototype" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <element name="customizePrototype" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <classpath>
-                        <path path="${run.test.classpath}"/>
-                    </classpath>
-                    <modulepath>
-                        <path path="${run.test.modulepath}"/>
-                    </modulepath>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg value="-ea"/>
-                    <jvmarg line="${run.test.jvmargs}"/>
-                    <customizePrototype/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-modules-supported" name="-init-macrodef-junit-prototype-without-module" unless="modules.supported.internal">
-        <macrodef name="junit-prototype" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <element name="customizePrototype" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <classpath>
-                        <path path="${run.test.classpath}"/>
-                    </classpath>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg value="-ea"/>
-                    <customizePrototype/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-test-properties,-init-macrodef-junit-prototype-with-module,-init-macrodef-junit-prototype-without-module" if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <j2seproject3:junit-prototype>
-                    <customizePrototype>
-                        <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
-                        <customize/>
-                    </customizePrototype>
-                </j2seproject3:junit-prototype>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-test-properties,-init-macrodef-junit-prototype-with-module,-init-macrodef-junit-prototype-without-module" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <j2seproject3:junit-prototype>
-                    <customizePrototype>
-                        <batchtest todir="${build.test.results.dir}">
-                            <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                                <filename name="@{testincludes}"/>
-                            </fileset>
-                            <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
-                                <filename name="${test.binarytestincludes}"/>
-                            </fileset>
-                        </batchtest>
-                        <customize/>
-                    </customizePrototype>
-                </j2seproject3:junit-prototype>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/>
-    <target if="${testng.available}" name="-init-macrodef-testng">
-        <macrodef name="testng" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}">
-                    <isset property="test.method"/>
-                </condition>
-                <union id="test.set">
-                    <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
-                        <filename name="@{testincludes}"/>
-                    </fileset>
-                </union>
-                <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
-                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Ublu" testname="TestNG tests" workingDir="${work.dir}">
-                    <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
-                    <propertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </propertyset>
-                    <classpath>
-                        <path path="${run.test.classpath}"/>
-                    </classpath>
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <customize/>
-                </testng>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-test-impl">
-        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <echo>No tests executed.</echo>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl">
-        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize/>
-                </j2seproject3:junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl">
-        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <j2seproject3:testng excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize/>
-                </j2seproject3:testng>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test">
-        <macrodef name="test" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <sequential>
-                <j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize>
-                        <jvmarg line="${run.jvmargs}"/>
-                        <jvmarg line="${run.jvmargs.ide}"/>
-                    </customize>
-                </j2seproject3:test-impl>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
-        <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customizeDebuggee" optional="true"/>
-            <sequential>
-                <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize>
-                        <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
-                        <customizeDebuggee/>
-                    </customize>
-                </j2seproject3:junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target if="${testng.available}" name="-init-macrodef-testng-debug">
-        <macrodef name="testng-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <element name="customize2" optional="true"/>
-            <sequential>
-                <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
-                    <isset property="test.method"/>
-                </condition>
-                <condition else="-suitename Ublu -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
-                    <matches pattern=".*\.xml" string="@{testClass}"/>
-                </condition>
-                <delete dir="${build.test.results.dir}" quiet="true"/>
-                <mkdir dir="${build.test.results.dir}"/>
-                <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}">
-                    <customizeDebuggee>
-                        <customize2/>
-                        <jvmarg value="-ea"/>
-                        <arg line="${testng.debug.mode}"/>
-                        <arg line="-d ${build.test.results.dir}"/>
-                        <arg line="-listener org.testng.reporters.VerboseReporter"/>
-                        <arg line="${testng.cmd.args}"/>
-                    </customizeDebuggee>
-                </j2seproject3:debug>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl">
-        <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <element implicit="true" name="customize2" optional="true"/>
-            <sequential>
-                <j2seproject3:testng-debug testClass="@{testClass}" testMethod="@{testMethod}">
-                    <customize2/>
-                </j2seproject3:testng-debug>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit">
-        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <sequential>
-                <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customizeDebuggee>
-                        <jvmarg line="${run.jvmargs}"/>
-                        <jvmarg line="${run.jvmargs.ide}"/>
-                    </customizeDebuggee>
-                </j2seproject3:test-debug-impl>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng">
-        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <sequential>
-                <j2seproject3:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">
-                    <customize2>
-                        <syspropertyset>
-                            <propertyref prefix="test-sys-prop."/>
-                            <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                        </syspropertyset>
-                    </customize2>
-                </j2seproject3:testng-debug-impl>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>
-    <!--
-                pre NB7.2 profiling section; consider it deprecated
-            -->
-    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
-    <target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="profiler.info.jvmargs.agent" name="-profile-post-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="profiler.info.jvmargs.agent" name="-profile-init-macrodef-profile">
-        <macrodef name="resolve">
-            <attribute name="name"/>
-            <attribute name="value"/>
-            <sequential>
-                <property name="@{name}" value="${env.@{value}}"/>
-            </sequential>
-        </macrodef>
-        <macrodef name="profile">
-            <attribute default="${main.class}" name="classname"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property environment="env"/>
-                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
-                <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}">
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg value="${profiler.info.jvmargs.agent}"/>
-                    <jvmarg line="${profiler.info.jvmargs}"/>
-                    <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
-                    <arg line="${application.args}"/>
-                    <classpath>
-                        <path path="${run.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" if="profiler.info.jvmargs.agent" name="-profile-init-check">
-        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
-        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
-    </target>
-    <!--
-                end of pre NB7.2 profiling section
-            -->
-    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
-        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${main.class}" name="name"/>
-            <attribute default="${debug.modulepath}" name="modulepath"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <attribute default="" name="stopclassname"/>
-            <sequential>
-                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
-                    <modulepath>
-                        <path path="@{modulepath}"/>
-                    </modulepath>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </nbjpdastart>
-            </sequential>
-        </macrodef>
-        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${build.classes.dir}" name="dir"/>
-            <sequential>
-                <nbjpdareload>
-                    <fileset dir="@{dir}" includes="${fix.classes}">
-                        <include name="${fix.includes}*.class"/>
-                    </fileset>
-                </nbjpdareload>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-debug-args">
-        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
-            <os family="windows"/>
-        </condition>
-        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
-            <isset property="debug.transport"/>
-        </condition>
-    </target>
-    <target depends="-init-debug-args" name="-init-macrodef-debug">
-        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${module.name}" name="modulename"/>
-            <attribute default="${main.class}" name="classname"/>
-            <attribute default="${debug.modulepath}" name="modulepath"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <element name="customizeDebuggee" optional="true"/>
-            <sequential>
-                <j2seproject1:java classname="@{classname}" classpath="@{classpath}" modulename="@{modulename}" modulepath="@{modulepath}">
-                    <customize>
-                        <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
-                        <customizeDebuggee/>
-                    </customize>
-                </j2seproject1:java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-source-module-properties" if="named.module.internal" name="-init-macrodef-java-with-module">
-        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${module.name}" name="modulename"/>
-            <attribute default="${main.class}" name="classname"/>
-            <attribute default="${run.modulepath}" name="modulepath"/>
-            <attribute default="${run.upgrademodulepath}" name="upgrademodulepath"/>
-            <attribute default="${run.classpath}" name="classpath"/>
-            <attribute default="jvm" name="jvm"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" module="@{modulename}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <modulepath>
-                        <pathelement path="@{modulepath}"/>
-                        <pathelement location="${module.build.classes.dir}"/>
-                    </modulepath>
-                    <upgrademodulepath>
-                        <path path="@{upgrademodulepath}"/>
-                    </upgrademodulepath>
-                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
-                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                    <jvmarg line="${run.jvmargs.ide}"/>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-source-module-properties" if="unnamed.module.internal" name="-init-macrodef-java-with-unnamed-module">
-        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="" name="modulename"/>
-            <attribute default="${main.class}" name="classname"/>
-            <attribute default="${run.modulepath}" name="modulepath"/>
-            <attribute default="${run.upgrademodulepath}" name="upgrademodulepath"/>
-            <attribute default="${run.classpath}" name="classpath"/>
-            <attribute default="jvm" name="jvm"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <modulepath>
-                        <path path="@{modulepath}"/>
-                    </modulepath>
-                    <upgrademodulepath>
-                        <path path="@{upgrademodulepath}"/>
-                    </upgrademodulepath>
-                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
-                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                    <jvmarg line="${run.jvmargs.ide}"/>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-source-module-properties" name="-init-macrodef-java-without-module" unless="modules.supported.internal">
-        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="" name="modulename"/>
-            <attribute default="${main.class}" name="classname"/>
-            <attribute default="" name="modulepath"/>
-            <attribute default="${run.classpath}" name="classpath"/>
-            <attribute default="jvm" name="jvm"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
-                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                    <jvmarg line="${run.jvmargs.ide}"/>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-java-with-module, -init-macrodef-java-with-unnamed-module, -init-macrodef-java-without-module" name="-init-macrodef-java"/>
-    <target name="-init-macrodef-copylibs">
-        <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${manifest.file}" name="manifest"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-                <pathconvert property="run.classpath.without.build.classes.dir">
-                    <path path="${run.classpath}"/>
-                    <map from="${build.classes.dir.resolved}" to=""/>
-                </pathconvert>
-                <pathconvert pathsep=" " property="jar.classpath">
-                    <path path="${run.classpath.without.build.classes.dir}"/>
-                    <chainedmapper>
-                        <flattenmapper/>
-                        <filtermapper>
-                            <replacestring from=" " to="%20"/>
-                        </filtermapper>
-                        <globmapper from="*" to="lib/*"/>
-                    </chainedmapper>
-                </pathconvert>
-                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" manifestencoding="UTF-8" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
-                    <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
-                    <manifest>
-                        <attribute name="Class-Path" value="${jar.classpath}"/>
-                        <customize/>
-                    </manifest>
-                </copylibs>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-presetdef-jar">
-        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
-                <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
-            </jar>
-        </presetdef>
-    </target>
-    <target name="-init-ap-cmdline-properties">
-        <property name="annotation.processing.enabled" value="true"/>
-        <property name="annotation.processing.processors.list" value=""/>
-        <property name="annotation.processing.processor.options" value=""/>
-        <property name="annotation.processing.run.all.processors" value="true"/>
-        <property name="javac.processorpath" value="${javac.classpath}"/>
-        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
-        <condition property="ap.supported.internal" value="true">
-            <not>
-                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
-            </not>
-        </condition>
-    </target>
-    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
-        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
-            <isfalse value="${annotation.processing.run.all.processors}"/>
-        </condition>
-        <condition else="" property="ap.proc.none.internal" value="-proc:none">
-            <isfalse value="${annotation.processing.enabled}"/>
-        </condition>
-    </target>
-    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
-        <property name="ap.cmd.line.internal" value=""/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
-    <!--
-                ===================
-                COMPILATION SECTION
-                ===================
-            -->
-    <target name="-deps-jar-init" unless="built-jar.properties">
-        <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>
-        <delete file="${built-jar.properties}" quiet="true"/>
-    </target>
-    <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
-        <echo level="warn" message="Cycle detected: Ublu was already built"/>
-    </target>
-    <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
-        <mkdir dir="${build.dir}"/>
-        <touch file="${built-jar.properties}" verbose="false"/>
-        <property file="${built-jar.properties}" prefix="already.built.jar."/>
-        <antcall target="-warn-already-built-jar"/>
-        <propertyfile file="${built-jar.properties}">
-            <entry key="${basedir}" value=""/>
-        </propertyfile>
-    </target>
-    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
-    <target depends="init" name="-check-automatic-build">
-        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
-    </target>
-    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
-        <antcall target="clean">
-            <param name="no.dependencies" value="true"/>
-        </antcall>
-    </target>
-    <target depends="init,deps-jar" name="-pre-pre-compile">
-        <mkdir dir="${build.classes.dir}"/>
-    </target>
-    <target name="-pre-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="do.depend.true" name="-compile-depend">
-        <pathconvert property="build.generated.subdirs">
-            <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                <include name="*"/>
-            </dirset>
-        </pathconvert>
-        <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
-        <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
-        <copy todir="${build.classes.dir}">
-            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target if="has.persistence.xml" name="-copy-persistence-xml">
-        <mkdir dir="${build.classes.dir}/META-INF"/>
-        <copy todir="${build.classes.dir}/META-INF">
-            <fileset dir="${meta.inf.dir}" includes="persistence.xml orm.xml"/>
-        </copy>
-    </target>
-    <target name="-post-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
-    <target name="-pre-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}, module-info.java" sourcepath="${src.dir}"/>
-    </target>
-    <target name="-post-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
-    <!--
-                ====================
-                JAR BUILDING SECTION
-                ====================
-            -->
-    <target depends="init" name="-pre-pre-jar">
-        <dirname file="${dist.jar}" property="dist.jar.dir"/>
-        <mkdir dir="${dist.jar.dir}"/>
-    </target>
-    <target name="-pre-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile" name="-check-module-main-class">
-        <pathconvert property="main.class.file">
-            <string value="${main.class}"/>
-            <unpackagemapper from="*" to="*.class"/>
-        </pathconvert>
-        <condition property="do.module.main.class">
-            <and>
-                <isset property="main.class.available"/>
-                <available file="${build.classes.dir}/module-info.class"/>
-                <available file="${build.classes.dir}/${main.class.file}"/>
-                <isset property="libs.CopyLibs.classpath"/>
-                <available classname="org.netbeans.modules.java.j2seproject.moduletask.ModuleMainClass" classpath="${libs.CopyLibs.classpath}"/>
-            </and>
-        </condition>
-    </target>
-    <target depends="-check-module-main-class" if="do.module.main.class" name="-set-module-main-class">
-        <taskdef classname="org.netbeans.modules.java.j2seproject.moduletask.ModuleMainClass" classpath="${libs.CopyLibs.classpath}" name="modulemainclass"/>
-        <modulemainclass failonerror="false" mainclass="${main.class}" moduleinfo="${build.classes.dir}/module-info.class"/>
-    </target>
-    <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
-        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
-        <touch file="${tmp.manifest.file}" verbose="false"/>
-    </target>
-    <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
-        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
-        <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
-    </target>
-    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
-        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
-            <attribute name="Main-Class" value="${main.class}"/>
-        </manifest>
-    </target>
-    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
-        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
-            <attribute name="Profile" value="${javac.profile}"/>
-        </manifest>
-    </target>
-    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
-        <basename file="${application.splash}" property="splashscreen.basename"/>
-        <mkdir dir="${build.classes.dir}/META-INF"/>
-        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
-        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
-            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
-        </manifest>
-    </target>
-    <target depends="init,compile" name="-check-do-mkdist">
-        <condition property="do.mkdist">
-            <and>
-                <isset property="do.archive"/>
-                <isset property="libs.CopyLibs.classpath"/>
-                <not>
-                    <istrue value="${mkdist.disabled}"/>
-                </not>
-                <not>
-                    <available file="${build.classes.dir}/module-info.class"/>
-                </not>
-            </and>
-        </condition>
-    </target>
-    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist" if="do.mkdist" name="-do-jar-copylibs">
-        <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
-        <echo level="info">To run this application from the command line without Ant, try:</echo>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <echo level="info">java -jar "${dist.jar.resolved}"</echo>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
-        <j2seproject1:jar manifest="${tmp.manifest.file}"/>
-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <condition else="${dist.jar.resolved}" property="jar.usage.message.class.path.replacement" value="">
-            <isset property="named.module.internal"/>
-        </condition>
-        <pathconvert property="run.classpath.with.dist.jar">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to="${jar.usage.message.class.path.replacement}"/>
-        </pathconvert>
-        <pathconvert property="run.modulepath.with.dist.jar">
-            <path location="${dist.jar.resolved}"/>
-            <path path="${run.modulepath}"/>
-            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
-        </pathconvert>
-        <condition else="${run.modulepath}" property="jar.usage.message.run.modulepath.with.dist.jar" value="${run.modulepath.with.dist.jar}">
-            <isset property="named.module.internal"/>
-        </condition>
-        <condition else="" property="jar.usage.message.module.path" value=" -p ${jar.usage.message.run.modulepath.with.dist.jar}">
-            <and>
-                <isset property="modules.supported.internal"/>
-                <length length="0" string="${jar.usage.message.run.modulepath.with.dist.jar}" when="greater"/>
-            </and>
-        </condition>
-        <condition else="" property="jar.usage.message.class.path" value=" -cp ${run.classpath.with.dist.jar}">
-            <length length="0" string="${run.classpath.with.dist.jar}" when="greater"/>
-        </condition>
-        <condition else="/${main.class}" property="jar.usage.message.main.class.class.selector" value="">
-            <isset property="do.module.main.class"/>
-        </condition>
-        <condition else=" ${main.class}" property="jar.usage.message.main.class" value=" -m ${module.name}${jar.usage.message.main.class.class.selector}">
-            <isset property="named.module.internal"/>
-        </condition>
-        <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java}${jar.usage.message.module.path}${jar.usage.message.class.path}${jar.usage.message.main.class}">
-            <isset property="main.class.available"/>
-        </condition>
-        <condition else="debug" property="jar.usage.level" value="info">
-            <isset property="main.class.available"/>
-        </condition>
-        <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
-    </target>
-    <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
-        <delete>
-            <fileset file="${tmp.manifest.file}"/>
-        </delete>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-jar,-do-jar-delete-manifest" name="-do-jar-without-libraries"/>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-copylibs,-do-jar-delete-manifest" name="-do-jar-with-libraries"/>
-    <target name="-post-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-jar,-set-module-main-class,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
-    <target depends="init,compile,-pre-jar,-do-jar,-post-jar,deploy" description="Build JAR." name="jar"/>
-    <!--
-                =================
-                DEPLOY SECTION
-                =================
-            -->
-    <target name="-pre-deploy">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init" name="-check-jlink">
-        <condition property="do.jlink.internal">
-            <and>
-                <istrue value="${do.jlink}"/>
-                <isset property="do.archive"/>
-                <isset property="named.module.internal"/>
-            </and>
-        </condition>
-    </target>
-    <target depends="init,-do-jar,-post-jar,-pre-deploy,-check-jlink" if="do.jlink.internal" name="-do-deploy">
-        <delete dir="${dist.jlink.dir}" failonerror="false" quiet="true"/>
-        <property name="jlink.launcher.name" value="${application.title}"/>
-        <condition else="${module.name}" property="jlink.add.modules" value="${module.name},${jlink.additionalmodules}">
-            <and>
-                <isset property="jlink.additionalmodules"/>
-                <length length="0" string="${jlink.additionalmodules}" when="greater"/>
-            </and>
-        </condition>
-        <condition property="jlink.do.strip.internal">
-            <and>
-                <isset property="jlink.strip"/>
-                <istrue value="${jlink.strip}"/>
-            </and>
-        </condition>
-        <condition property="jlink.do.additionalparam.internal">
-            <and>
-                <isset property="jlink.additionalparam"/>
-                <length length="0" string="${jlink.additionalparam}" when="greater"/>
-            </and>
-        </condition>
-        <condition property="jlink.do.launcher.internal">
-            <and>
-                <istrue value="${jlink.launcher}"/>
-                <isset property="main.class.available"/>
-            </and>
-        </condition>
-        <property name="platform.jlink" value="${jdk.home}/bin/jlink"/>
-        <property name="jlink.systemmodules.internal" value="${jdk.home}/jmods"/>
-        <exec executable="${platform.jlink}">
-            <arg value="--module-path"/>
-            <arg path="${jlink.systemmodules.internal}:${run.modulepath}:${dist.jar}"/>
-            <arg value="--add-modules"/>
-            <arg value="${jlink.add.modules}"/>
-            <arg if:set="jlink.do.strip.internal" value="--strip-debug"/>
-            <arg if:set="jlink.do.launcher.internal" value="--launcher"/>
-            <arg if:set="jlink.do.launcher.internal" value="${jlink.launcher.name}=${module.name}/${main.class}"/>
-            <arg if:set="jlink.do.additionalparam.internal" line="${jlink.additionalparam}"/>
-            <arg value="--output"/>
-            <arg value="${dist.jlink.output}"/>
-        </exec>
-    </target>
-    <target name="-post-deploy">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-do-jar,-post-jar,-pre-deploy,-do-deploy,-post-deploy" name="deploy"/>
-    <!--
-                =================
-                EXECUTION SECTION
-                =================
-            -->
-    <target depends="init,compile" description="Run a main class." name="run">
-        <j2seproject1:java>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <target name="-do-not-recompile">
-        <property name="javac.includes.binary" value=""/>
-    </target>
-    <target depends="init,compile-single" name="run-single">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <j2seproject1:java classname="${run.class}"/>
-    </target>
-    <target depends="init,compile-test-single" name="run-test-with-main">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
-    </target>
-    <!--
-                =================
-                DEBUGGING SECTION
-                =================
-            -->
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
-        <j2seproject1:nbjpdastart name="${debug.class}"/>
-    </target>
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
-        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
-    </target>
-    <target depends="init,compile" name="-debug-start-debuggee">
-        <j2seproject3:debug>
-            <customizeDebuggee>
-                <arg line="${application.args}"/>
-            </customizeDebuggee>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
-        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
-    </target>
-    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-        <j2seproject3:debug classname="${debug.class}"/>
-    </target>
-    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
-    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-        <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
-    </target>
-    <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
-    <target depends="init" name="-pre-debug-fix">
-        <fail unless="fix.includes">Must set fix.includes</fail>
-        <property name="javac.includes" value="${fix.includes}.java"/>
-    </target>
-    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
-        <j2seproject1:nbjpdareload/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
-    <!--
-                =================
-                PROFILING SECTION
-                =================
-            -->
-    <!--
-                pre NB7.2 profiler integration
-            -->
-    <target depends="profile-init,compile" description="Profile a project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <profile/>
-    </target>
-    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="profiler.info.jvmargs.agent" name="-profile-single-pre72">
-        <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <profile classname="${profile.class}"/>
-    </target>
-    <target depends="profile-init,compile-single" if="profiler.info.jvmargs.agent" name="-profile-applet-pre72">
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <profile classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </profile>
-    </target>
-    <target depends="-init-macrodef-junit,profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.test.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <j2seproject3:junit excludes="${excludes}" includes="${includes}" testincludes="${profile.class}" testmethods="">
-            <customize>
-                <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
-                <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
-                <jvmarg value="${profiler.info.jvmargs.agent}"/>
-                <jvmarg line="${profiler.info.jvmargs}"/>
-                <classpath>
-                    <path path="${run.test.classpath}"/>
-                </classpath>
-            </customize>
-        </j2seproject3:junit>
-    </target>
-    <!--
-                end of pre NB72 profiling section
-            -->
-    <target if="netbeans.home" name="-profile-check">
-        <condition property="profiler.configured">
-            <or>
-                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/>
-                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/>
-            </or>
-        </condition>
-    </target>
-    <target depends="-profile-check,-profile-pre72" description="Profile a project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent">
-        <startprofiler/>
-        <antcall target="run"/>
-    </target>
-    <target depends="-profile-check,-profile-single-pre72" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-single" unless="profiler.info.jvmargs.agent">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <startprofiler/>
-        <antcall target="run-single"/>
-    </target>
-    <target depends="-profile-test-single-pre72" description="Profile a selected test in the IDE." name="profile-test-single"/>
-    <target depends="-profile-check" description="Profile a selected test in the IDE." if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs">
-        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <startprofiler/>
-        <antcall target="test-single"/>
-    </target>
-    <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <startprofiler/>
-        <antcall target="run-test-with-main"/>
-    </target>
-    <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <startprofiler/>
-        <antcall target="run-applet"/>
-    </target>
-    <!--
-                ===============
-                JAVADOC SECTION
-                ===============
-            -->
-    <target depends="init" if="have.sources" name="-javadoc-build">
-        <mkdir dir="${dist.javadoc.dir}"/>
-        <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}">
-            <and>
-                <isset property="endorsed.classpath.cmd.line.arg"/>
-                <not>
-                    <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/>
-                </not>
-            </and>
-        </condition>
-        <condition else="" property="bug5101868workaround" value="*.java">
-            <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
-        </condition>
-        <condition else="" property="javadoc.html5.cmd.line.arg" value="-html5">
-            <and>
-                <isset property="javadoc.html5"/>
-                <available file="${jdk.home}${file.separator}lib${file.separator}jrt-fs.jar"/>
-            </and>
-        </condition>
-        <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
-            <classpath>
-                <path path="${javac.classpath}"/>
-            </classpath>
-            <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                <include name="**/*.java"/>
-                <exclude name="*.java"/>
-            </fileset>
-            <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
-            <arg line="${javadoc.html5.cmd.line.arg}"/>
-        </javadoc>
-        <copy todir="${dist.javadoc.dir}">
-            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/doc-files/**"/>
-            </fileset>
-            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                <include name="**/doc-files/**"/>
-            </fileset>
-        </copy>
-    </target>
-    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
-        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
-    </target>
-    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
-    <!--
-                =========================
-                TEST COMPILATION SECTION
-                =========================
-            -->
-    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
-        <mkdir dir="${build.test.classes.dir}"/>
-    </target>
-    <target name="-pre-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-init-source-module-properties" if="named.module.internal" name="-init-test-javac-module-properties-with-module">
-        <j2seproject3:modulename property="test.module.name" sourcepath="${test.src.dir}"/>
-        <condition else="${empty.dir}" property="javac.test.sourcepath" value="${test.src.dir}">
-            <and>
-                <isset property="test.module.name"/>
-                <length length="0" string="${test.module.name}" when="greater"/>
-            </and>
-        </condition>
-        <condition else="--patch-module ${module.name}=${test.src.dir} --add-reads ${module.name}=ALL-UNNAMED" property="javac.test.compilerargs" value="--add-reads ${test.module.name}=ALL-UNNAMED">
-            <and>
-                <isset property="test.module.name"/>
-                <length length="0" string="${test.module.name}" when="greater"/>
-            </and>
-        </condition>
-    </target>
-    <target depends="-init-source-module-properties" if="named.module.internal" name="-init-test-run-module-properties">
-        <condition else="${module.name}" property="run.test.addexport.source.module.internal" value="${test.module.name}">
-            <and>
-                <isset property="test.module.name"/>
-                <length length="0" string="${test.module.name}" when="greater"/>
-            </and>
-        </condition>
-        <fileset dir="${build.test.classes.dir}" id="run.test.packages.internal" includes="**/*.class"/>
-        <property location="${build.test.classes.dir}" name="build.test.classes.dir.abs.internal"/>
-        <pathconvert pathsep=" " property="run.test.addexports.internal" refid="run.test.packages.internal">
-            <chainedmapper>
-                <regexpmapper from="^(.*)\Q${file.separator}\E.*\.class$$" to="\1"/>
-                <filtermapper>
-                    <uniqfilter/>
-                    <replacestring from="${build.test.classes.dir.abs.internal}" to=""/>
-                </filtermapper>
-                <cutdirsmapper dirs="1"/>
-                <packagemapper from="*" to="--add-exports ${run.test.addexport.source.module.internal}/*=ALL-UNNAMED"/>
-            </chainedmapper>
-        </pathconvert>
-        <condition else="--patch-module ${module.name}=${build.test.classes.dir} --add-modules ${module.name} --add-reads ${module.name}=ALL-UNNAMED ${run.test.addexports.internal}" property="run.test.jvmargs" value="--add-modules ${test.module.name} --add-reads ${test.module.name}=ALL-UNNAMED ${run.test.addexports.internal}">
-            <and>
-                <isset property="test.module.name"/>
-                <length length="0" string="${test.module.name}" when="greater"/>
-            </and>
-        </condition>
-    </target>
-    <target depends="-init-source-module-properties" name="-init-test-module-properties-without-module" unless="named.module.internal">
-        <property name="javac.test.sourcepath" value="${empty.dir}"/>
-        <property name="javac.test.compilerargs" value=""/>
-        <property name="run.test.jvmargs" value=""/>
-    </target>
-    <target depends="-init-test-javac-module-properties-with-module,-init-test-module-properties-without-module" name="-init-test-module-properties"/>
-    <target if="do.depend.true" name="-compile-test-depend">
-        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
-    </target>
-    <target depends="init,deps-jar,compile,-init-test-module-properties,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${javac.test.sourcepath}" srcdir="${test.src.dir}">
-            <customize>
-                <compilerarg line="${javac.test.compilerargs}"/>
-            </customize>
-        </j2seproject3:javac>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
-    <target name="-pre-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,compile,-init-test-module-properties,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}, module-info.java" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}">
-            <customize>
-                <compilerarg line="${javac.test.compilerargs}"/>
-            </customize>
-        </j2seproject3:javac>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
-    <!--
-                =======================
-                TEST EXECUTION SECTION
-                =======================
-            -->
-    <target depends="init" if="have.tests" name="-pre-test-run">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test,-init-test-run-module-properties,-pre-test-run" if="have.tests" name="-do-test-run">
-        <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
-        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init" if="have.tests" name="test-report"/>
-    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
-    <target depends="init" if="have.tests" name="-pre-test-run-single">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
-        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <j2seproject3:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
-        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">
-        <fail unless="test.class">Must select some files in the IDE or set test.class</fail>
-        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
-        <j2seproject3:test excludes="" includes="${javac.includes}" testincludes="${test.class}" testmethods="${test.method}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">
-        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
-    <!--
-                =======================
-                TEST DEBUGGING SECTION
-                =======================
-            -->
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">
-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method">
-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
-        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/>
-    </target>
-    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
-        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
-    </target>
-    <target depends="init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
-    <target depends="init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
-    <target depends="debug-test-method" name="debug-single-method"/>
-    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
-        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
-    <!--
-                =========================
-                APPLET EXECUTION SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" name="run-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject1:java classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <!--
-                =========================
-                APPLET DEBUGGING  SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject3:debug classname="sun.applet.AppletViewer">
-            <customizeDebuggee>
-                <arg value="${applet.url}"/>
-            </customizeDebuggee>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
-    <!--
-                ===============
-                CLEANUP SECTION
-                ===============
-            -->
-    <target name="-deps-clean-init" unless="built-clean.properties">
-        <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>
-        <delete file="${built-clean.properties}" quiet="true"/>
-    </target>
-    <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
-        <echo level="warn" message="Cycle detected: Ublu was already built"/>
-    </target>
-    <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
-        <mkdir dir="${build.dir}"/>
-        <touch file="${built-clean.properties}" verbose="false"/>
-        <property file="${built-clean.properties}" prefix="already.built.clean."/>
-        <antcall target="-warn-already-built-clean"/>
-        <propertyfile file="${built-clean.properties}">
-            <entry key="${basedir}" value=""/>
-        </propertyfile>
-    </target>
-    <target depends="init" name="-do-clean">
-        <delete dir="${build.dir}"/>
-        <delete dir="${dist.jlink.output}"/>
-        <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
-    </target>
-    <target name="-post-clean">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
-    <target name="-check-call-dep">
-        <property file="${call.built.properties}" prefix="already.built."/>
-        <condition property="should.call.dep">
-            <and>
-                <not>
-                    <isset property="already.built.${call.subproject}"/>
-                </not>
-                <available file="${call.script}"/>
-            </and>
-        </condition>
-    </target>
-    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
-        <ant antfile="${call.script}" inheritall="false" target="${call.target}">
-            <propertyset>
-                <propertyref prefix="transfer."/>
-                <mapper from="transfer.*" to="*" type="glob"/>
-            </propertyset>
-        </ant>
-    </target>
-</project>
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
deleted file mode 100644
index 5eb06c6a..00000000
--- a/nbproject/genfiles.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=0a7760f0
-build.xml.script.CRC32=bd230d98
-build.xml.stylesheet.CRC32=28e38971@1.56.1.46
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=2564a769
-nbproject/build-impl.xml.script.CRC32=bdb96f1a
-nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.100.0.48
diff --git a/nbproject/licenseheader.txt b/nbproject/licenseheader.txt
deleted file mode 100644
index e0b2fba1..00000000
--- a/nbproject/licenseheader.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-<#if licenseFirst??>
-${licenseFirst}
-</#if>
-${licensePrefix}Copyright (c) 2015, Absolute Performance, Inc. http://www.absolute-performance.com
-${licensePrefix}Copyright (c) ${date?date?string("yyyy")}, Jack J. Woehr jwoehr@softwoehr.com 
-${licensePrefix}SoftWoehr LLC PO Box 51, Golden CO 80402-0051 http://www.softwoehr.com
-${licensePrefix}All rights reserved.
-${licensePrefix?replace(" +$", "", "r")}
-${licensePrefix}Redistribution and use in source and binary forms, with or without
-${licensePrefix}modification, are permitted provided that the following conditions are met:
-${licensePrefix?replace(" +$", "", "r")}
-${licensePrefix}* Redistributions of source code must retain the above copyright notice, this
-${licensePrefix}  list of conditions and the following disclaimer.
-${licensePrefix}* Redistributions in binary form must reproduce the above copyright notice,
-${licensePrefix}  this list of conditions and the following disclaimer in the documentation
-${licensePrefix}  and/or other materials provided with the distribution.
-${licensePrefix?replace(" +$", "", "r")}
-${licensePrefix}THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-${licensePrefix}AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-${licensePrefix}IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-${licensePrefix}ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-${licensePrefix}LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-${licensePrefix}CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-${licensePrefix}SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-${licensePrefix}INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-${licensePrefix}CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-${licensePrefix}ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-${licensePrefix}POSSIBILITY OF SUCH DAMAGE.
-<#if licenseLast??>
-${licenseLast}
-</#if>
diff --git a/nbproject/project.properties b/nbproject/project.properties
deleted file mode 100644
index f27f5dc1..00000000
--- a/nbproject/project.properties
+++ /dev/null
@@ -1,136 +0,0 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
-annotation.processing.processors.list=
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.title=Ublu
-application.vendor=Administrator
-auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form,**/*.html
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
-    ${run.classpath}
-debug.modulepath=\
-    ${run.modulepath}
-debug.test.classpath=\
-    ${run.test.classpath}
-debug.test.modulepath=\
-    ${run.test.modulepath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/ublu.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-file.reference.jt400.jar=lib/jt400.jar
-file.reference.mssql-jdbc-7.0.0.jre8.jar=lib/mssql-jdbc-7.0.0.jre8.jar
-file.reference.pigiron.jar=lib/pigiron.jar
-file.reference.postgresql-42.2.5.jre7.jar=lib/postgresql-42.2.5.jre7.jar
-file.reference.sblim-cim-client2-HEAD.jar=lib/sblim-cim-client2-HEAD.jar
-file.reference.tn5250j.jar=lib/tn5250j.jar
-includes=**
-jar.archive.disabled=${jnlp.enabled}
-jar.compress=false
-jar.index=${jnlp.enabled}
-javac.classpath=\
-    ${file.reference.jt400.jar}:\
-    ${file.reference.pigiron.jar}:\
-    ${file.reference.tn5250j.jar}:\
-    ${file.reference.sblim-cim-client2-HEAD.jar}:\
-    ${file.reference.postgresql-42.2.5.jre7.jar}:\
-    ${file.reference.mssql-jdbc-7.0.0.jre8.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=-Xlint:unchecked
-javac.deprecation=false
-javac.external.vm=false
-javac.modulepath=
-javac.processormodulepath=
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=1.7
-javac.target=1.7
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-javac.test.modulepath=\
-    ${javac.modulepath}
-javac.test.processorpath=\
-    ${javac.test.classpath}
-javadoc.additionalparam=-overview ${src.dir}/overview.html
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.html5=false
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.reference.jt400.jar=/usr/local/src/JTOpen/dist/doc.zip
-javadoc.reference.mssql-jdbc-7.0.0.jre8.jar=https://javadoc.io/doc/com.microsoft.sqlserver/mssql-jdbc/7.1.2.jre11-preview
-javadoc.reference.pigiron.jar=../../../PigIron/Checkout/pigiron/dist/javadoc
-javadoc.reference.postgresql-42.2.5.jre7.jar=/usr/local/doc/PostgreSQL
-javadoc.reference.sblim-cim-client2-HEAD.jar=../../../sblim/Checkout/jsr48-client/build/doc
-javadoc.reference.tn5250j.jar=/home/jax/work/TN5250J/Checkout/tn5250j/build/javadoc
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=Ublu Mainframe and Midrange Life Cycle Extension Language
-jlink.launcher=false
-jlink.launcher.name=Ublu
-jnlp.codebase.type=no.codebase
-jnlp.descriptor=application
-jnlp.enabled=false
-jnlp.mixed.code=default
-jnlp.offline-allowed=false
-jnlp.signed=false
-jnlp.signing=
-jnlp.signing.alias=
-jnlp.signing.keystore=
-main.class=ublu.Ublu
-# Optional override of default Application-Library-Allowable-Codebase attribute identifying the locations where your signed RIA is expected to be found.
-manifest.custom.application.library.allowable.codebase=
-# Optional override of default Caller-Allowable-Codebase attribute identifying the domains from which JavaScript code can make calls to your RIA without security prompts.
-manifest.custom.caller.allowable.codebase=
-# Optional override of default Codebase manifest attribute, use to prevent RIAs from being repurposed
-manifest.custom.codebase=
-# Optional override of default Permissions manifest attribute (supported values: sandbox, all-permissions)
-manifest.custom.permissions=
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
-platform.active=default_platform
-project.license=bsd
-project.licensePath=./nbproject/licenseheader.txt
-project.organization=Jack J. Woehr jwoehr@softwoehr.com
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project.
-# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
-# To set system properties for unit tests define test-sys-prop.name=value:
-run.jvmargs=
-run.modulepath=\
-    ${javac.modulepath}
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-run.test.modulepath=\
-    ${javac.test.modulepath}
-source.encoding=UTF-8
-source.reference.jt400.jar=/usr/local/src/JTOpen/dist6/src.zip
-source.reference.pigiron.jar=../../../PigIron/Checkout/pigiron/src
-source.reference.postgresql-42.2.5.jre7.jar=/usr/local/src/PostgreSQL/pgjdbc/pgjdbc/src/main/java
-source.reference.sblim-cim-client2-HEAD.jar=../../../sblim/Checkout/jsr48-client/src
-source.reference.tn5250j.jar=/home/jax/work/TN5250J/Checkout/tn5250j/src
-src.dir=src
-test.src.dir=test
-ublu.version=1.2.2+
diff --git a/nbproject/project.xml b/nbproject/project.xml
deleted file mode 100644
index d7215a6d..00000000
--- a/nbproject/project.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.java.j2seproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>Ublu</name>
-            <source-roots>
-                <root id="src.dir"/>
-            </source-roots>
-            <test-roots>
-                <root id="test.src.dir"/>
-            </test-roots>
-        </data>
-        <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
-            <definitions>lib/nblibraries.properties</definitions>
-        </libraries>
-    </configuration>
-</project>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 00000000..0e0b5f8a
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,288 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>io.github.jwoehr</groupId>
+    <artifactId>ublu</artifactId>
+    <version>2.0.0</version>
+    <name>Ublu</name>
+    <description>Ublu Midrange and Mainframe Life Cycle Extension Language</description>
+    <url>https://github.com/jwoehr/ublu</url>
+    <packaging>jar</packaging>
+    <scm>
+        <connection>scm:git:https://github.com/jwoehr/ublu</connection>
+        <developerConnection>scm:git:https://github.com/jwoehr/ublu</developerConnection>
+        <tag>HEAD</tag>
+        <url>https://github.com/jwoehr/ublu</url>
+    </scm>
+    <developers>
+        <developer>
+            <id>jwoehr</id>
+            <name>Jack Woehr</name>
+            <email>jack@softwoehr.com</email>
+        </developer>
+    </developers>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
+    </properties>
+    <build>
+        <defaultGoal>install</defaultGoal>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>3.3.1</version>
+                    <configuration>
+                        <encoding>UTF-8</encoding>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>attach-javadocs</id>
+                            <goals>
+                                <goal>jar</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>3.2.0</version>
+                    <executions>
+                        <execution>
+                            <id>attach-sources</id>
+                            <phase>verify</phase>
+                            <goals>
+                                <goal>jar-no-fork</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.9.0</version>
+                    <configuration>
+                        <source>8</source>
+                        <target>8</target>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>3.2.0</version>
+                    <configuration>
+                        <encoding>UTF-8</encoding>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>com.google.code.maven-replacer-plugin</groupId>
+                    <artifactId>maven-replacer-plugin</artifactId>
+                    <version>1.4.0</version>
+                    <executions>
+                        <execution>
+                            <phase>process-sources</phase>
+                            <goals>
+                                <goal>replace</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <file>Version.java.tpl</file>
+                        <outputFile>src/main/java/ublu/Version.java</outputFile>
+                        <replacements>
+                            <replacement>
+                                <token>@ubluversion@</token>
+                                <value>${project.version}</value>
+                            </replacement>
+
+                            <replacement>
+                                <token>@timestamp@</token>
+                                <value>${maven.build.timestamp}</value>
+                            </replacement>
+                        </replacements>
+                    </configuration>
+                </plugin>
+                <!-- Allows the program to be built into a single executable jar -->
+                <plugin>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <executions>
+                        <execution>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>single</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <archive>
+                            <manifest>
+                                <addClasspath>true</addClasspath>
+                                <mainClass>ublu.Ublu</mainClass>
+                            </manifest>
+                        </archive>
+                        <descriptorRefs>
+                            <descriptorRef>jar-with-dependencies</descriptorRef>
+                        </descriptorRefs>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-gpg-plugin</artifactId>
+                    <version>3.0.1</version>
+                    <executions>
+                        <execution>
+                            <id>sign-artifacts</id>
+                            <phase>verify</phase>
+                            <goals>
+                                <goal>sign</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <gpgArguments>
+                            <arg>--pinentry-mode</arg>
+                            <arg>loopback</arg>
+                        </gpgArguments>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.sonatype.plugins</groupId>
+                    <artifactId>nexus-staging-maven-plugin</artifactId>
+                    <version>1.6.7</version>
+                    <extensions>true</extensions>
+                    <configuration>
+                        <serverId>ossrh</serverId>
+                        <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+                        <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                </plugin>
+                <plugin>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>com.google.code.maven-replacer-plugin</groupId>
+                                        <artifactId>maven-replacer-plugin</artifactId>
+                                        <versionRange>[0.0,)</versionRange>
+                                        <goals>
+                                            <goal>replace</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <execute>
+                                            <runOnIncremental>true</runOnIncremental>
+                                        </execute>
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
+        <plugins>
+
+            <plugin>
+                <groupId>com.google.code.maven-replacer-plugin</groupId>
+                <artifactId>maven-replacer-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.eclipse.m2e</groupId>
+                <artifactId>lifecycle-mapping</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+    <distributionManagement>
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+    </distributionManagement>
+    <repositories>
+        <repository>
+            <id>my-local-repo</id>
+            <url>file://${project.basedir}/lib</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>ublu.staticlib</groupId>
+            <artifactId>pigiron</artifactId>
+            <version>only</version>
+        </dependency>
+        <dependency>
+            <groupId>ublu.staticlib</groupId>
+            <artifactId>tn5250j</artifactId>
+            <version>only</version>
+        </dependency>
+        <dependency>
+            <groupId>ublu.staticlib</groupId>
+            <artifactId>sblim-cim-client2-HEAD</artifactId>
+            <version>only</version>
+        </dependency>
+        <dependency>
+            <groupId>ublu.staticlib</groupId>
+            <artifactId>jt400</artifactId>
+            <version>9.6-patched</version>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>42.2.5</version>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>mssql-jdbc</artifactId>
+            <version>9.4.1.jre8</version>
+        </dependency>
+    </dependencies>
+
+</project>
+  
\ No newline at end of file
diff --git a/src/ublu/AS400Factory.java b/src/main/java/ublu/AS400Factory.java
similarity index 100%
rename from src/ublu/AS400Factory.java
rename to src/main/java/ublu/AS400Factory.java
diff --git a/src/ublu/License.java b/src/main/java/ublu/License.java
similarity index 100%
rename from src/ublu/License.java
rename to src/main/java/ublu/License.java
diff --git a/src/ublu/Monitors.java b/src/main/java/ublu/Monitors.java
similarity index 100%
rename from src/ublu/Monitors.java
rename to src/main/java/ublu/Monitors.java
diff --git a/src/ublu/NullSignonHandler.java b/src/main/java/ublu/NullSignonHandler.java
similarity index 100%
rename from src/ublu/NullSignonHandler.java
rename to src/main/java/ublu/NullSignonHandler.java
diff --git a/src/ublu/ReportFetcher.java b/src/main/java/ublu/ReportFetcher.java
similarity index 100%
rename from src/ublu/ReportFetcher.java
rename to src/main/java/ublu/ReportFetcher.java
diff --git a/src/ublu/SignonHandler.java b/src/main/java/ublu/SignonHandler.java
similarity index 100%
rename from src/ublu/SignonHandler.java
rename to src/main/java/ublu/SignonHandler.java
diff --git a/src/ublu/SpooledFileFetcher.java b/src/main/java/ublu/SpooledFileFetcher.java
similarity index 100%
rename from src/ublu/SpooledFileFetcher.java
rename to src/main/java/ublu/SpooledFileFetcher.java
diff --git a/src/ublu/SpooledFileLister.java b/src/main/java/ublu/SpooledFileLister.java
similarity index 100%
rename from src/ublu/SpooledFileLister.java
rename to src/main/java/ublu/SpooledFileLister.java
diff --git a/src/ublu/SpooledFilePageFetcher.java b/src/main/java/ublu/SpooledFilePageFetcher.java
similarity index 100%
rename from src/ublu/SpooledFilePageFetcher.java
rename to src/main/java/ublu/SpooledFilePageFetcher.java
diff --git a/src/ublu/TransformedSpooledFileFetcher.java b/src/main/java/ublu/TransformedSpooledFileFetcher.java
similarity index 100%
rename from src/ublu/TransformedSpooledFileFetcher.java
rename to src/main/java/ublu/TransformedSpooledFileFetcher.java
diff --git a/src/ublu/Ublu.java b/src/main/java/ublu/Ublu.java
similarity index 100%
rename from src/ublu/Ublu.java
rename to src/main/java/ublu/Ublu.java
diff --git a/src/main/java/ublu/Version.java b/src/main/java/ublu/Version.java
new file mode 100644
index 00000000..e4c46d24
--- /dev/null
+++ b/src/main/java/ublu/Version.java
@@ -0,0 +1,5 @@
+package ublu;
+class Version {
+      static String compileDateTime = "DEVELOPMENT_BUILD";
+      static String ubluVersion = "DEVELOPMENT_BUILD";
+}
\ No newline at end of file
diff --git a/src/ublu/command/CmdAS400.java b/src/main/java/ublu/command/CmdAS400.java
similarity index 100%
rename from src/ublu/command/CmdAS400.java
rename to src/main/java/ublu/command/CmdAS400.java
diff --git a/src/ublu/command/CmdAsk.java b/src/main/java/ublu/command/CmdAsk.java
similarity index 100%
rename from src/ublu/command/CmdAsk.java
rename to src/main/java/ublu/command/CmdAsk.java
diff --git a/src/ublu/command/CmdBang.java b/src/main/java/ublu/command/CmdBang.java
similarity index 100%
rename from src/ublu/command/CmdBang.java
rename to src/main/java/ublu/command/CmdBang.java
diff --git a/src/ublu/command/CmdBreak.java b/src/main/java/ublu/command/CmdBreak.java
similarity index 100%
rename from src/ublu/command/CmdBreak.java
rename to src/main/java/ublu/command/CmdBreak.java
diff --git a/src/ublu/command/CmdBye.java b/src/main/java/ublu/command/CmdBye.java
similarity index 100%
rename from src/ublu/command/CmdBye.java
rename to src/main/java/ublu/command/CmdBye.java
diff --git a/src/ublu/command/CmdCall.java b/src/main/java/ublu/command/CmdCall.java
similarity index 100%
rename from src/ublu/command/CmdCall.java
rename to src/main/java/ublu/command/CmdCall.java
diff --git a/src/ublu/command/CmdCallJava.java b/src/main/java/ublu/command/CmdCallJava.java
similarity index 100%
rename from src/ublu/command/CmdCallJava.java
rename to src/main/java/ublu/command/CmdCallJava.java
diff --git a/src/ublu/command/CmdCim.java b/src/main/java/ublu/command/CmdCim.java
similarity index 100%
rename from src/ublu/command/CmdCim.java
rename to src/main/java/ublu/command/CmdCim.java
diff --git a/src/ublu/command/CmdCimi.java b/src/main/java/ublu/command/CmdCimi.java
similarity index 100%
rename from src/ublu/command/CmdCimi.java
rename to src/main/java/ublu/command/CmdCimi.java
diff --git a/src/ublu/command/CmdCollection.java b/src/main/java/ublu/command/CmdCollection.java
similarity index 100%
rename from src/ublu/command/CmdCollection.java
rename to src/main/java/ublu/command/CmdCollection.java
diff --git a/src/ublu/command/CmdCommandCall.java b/src/main/java/ublu/command/CmdCommandCall.java
similarity index 100%
rename from src/ublu/command/CmdCommandCall.java
rename to src/main/java/ublu/command/CmdCommandCall.java
diff --git a/src/ublu/command/CmdComment.java b/src/main/java/ublu/command/CmdComment.java
similarity index 100%
rename from src/ublu/command/CmdComment.java
rename to src/main/java/ublu/command/CmdComment.java
diff --git a/src/ublu/command/CmdCommentQuote.java b/src/main/java/ublu/command/CmdCommentQuote.java
similarity index 100%
rename from src/ublu/command/CmdCommentQuote.java
rename to src/main/java/ublu/command/CmdCommentQuote.java
diff --git a/src/ublu/command/CmdConst.java b/src/main/java/ublu/command/CmdConst.java
similarity index 100%
rename from src/ublu/command/CmdConst.java
rename to src/main/java/ublu/command/CmdConst.java
diff --git a/src/ublu/command/CmdCs.java b/src/main/java/ublu/command/CmdCs.java
similarity index 100%
rename from src/ublu/command/CmdCs.java
rename to src/main/java/ublu/command/CmdCs.java
diff --git a/src/ublu/command/CmdDPoint.java b/src/main/java/ublu/command/CmdDPoint.java
similarity index 100%
rename from src/ublu/command/CmdDPoint.java
rename to src/main/java/ublu/command/CmdDPoint.java
diff --git a/src/ublu/command/CmdDataArea.java b/src/main/java/ublu/command/CmdDataArea.java
similarity index 100%
rename from src/ublu/command/CmdDataArea.java
rename to src/main/java/ublu/command/CmdDataArea.java
diff --git a/src/ublu/command/CmdDb.java b/src/main/java/ublu/command/CmdDb.java
similarity index 100%
rename from src/ublu/command/CmdDb.java
rename to src/main/java/ublu/command/CmdDb.java
diff --git a/src/ublu/command/CmdDbug.java b/src/main/java/ublu/command/CmdDbug.java
similarity index 100%
rename from src/ublu/command/CmdDbug.java
rename to src/main/java/ublu/command/CmdDbug.java
diff --git a/src/ublu/command/CmdDefun.java b/src/main/java/ublu/command/CmdDefun.java
similarity index 100%
rename from src/ublu/command/CmdDefun.java
rename to src/main/java/ublu/command/CmdDefun.java
diff --git a/src/ublu/command/CmdDesktop.java b/src/main/java/ublu/command/CmdDesktop.java
similarity index 100%
rename from src/ublu/command/CmdDesktop.java
rename to src/main/java/ublu/command/CmdDesktop.java
diff --git a/src/ublu/command/CmdDict.java b/src/main/java/ublu/command/CmdDict.java
similarity index 100%
rename from src/ublu/command/CmdDict.java
rename to src/main/java/ublu/command/CmdDict.java
diff --git a/src/ublu/command/CmdDo.java b/src/main/java/ublu/command/CmdDo.java
similarity index 100%
rename from src/ublu/command/CmdDo.java
rename to src/main/java/ublu/command/CmdDo.java
diff --git a/src/ublu/command/CmdDq.java b/src/main/java/ublu/command/CmdDq.java
similarity index 100%
rename from src/ublu/command/CmdDq.java
rename to src/main/java/ublu/command/CmdDq.java
diff --git a/src/ublu/command/CmdElse.java b/src/main/java/ublu/command/CmdElse.java
similarity index 100%
rename from src/ublu/command/CmdElse.java
rename to src/main/java/ublu/command/CmdElse.java
diff --git a/src/ublu/command/CmdEval.java b/src/main/java/ublu/command/CmdEval.java
similarity index 100%
rename from src/ublu/command/CmdEval.java
rename to src/main/java/ublu/command/CmdEval.java
diff --git a/src/ublu/command/CmdExit.java b/src/main/java/ublu/command/CmdExit.java
similarity index 100%
rename from src/ublu/command/CmdExit.java
rename to src/main/java/ublu/command/CmdExit.java
diff --git a/src/ublu/command/CmdFTP.java b/src/main/java/ublu/command/CmdFTP.java
similarity index 100%
rename from src/ublu/command/CmdFTP.java
rename to src/main/java/ublu/command/CmdFTP.java
diff --git a/src/ublu/command/CmdFTPNu.java b/src/main/java/ublu/command/CmdFTPNu.java
similarity index 100%
rename from src/ublu/command/CmdFTPNu.java
rename to src/main/java/ublu/command/CmdFTPNu.java
diff --git a/src/ublu/command/CmdFile.java b/src/main/java/ublu/command/CmdFile.java
similarity index 100%
rename from src/ublu/command/CmdFile.java
rename to src/main/java/ublu/command/CmdFile.java
diff --git a/src/ublu/command/CmdFor.java b/src/main/java/ublu/command/CmdFor.java
similarity index 100%
rename from src/ublu/command/CmdFor.java
rename to src/main/java/ublu/command/CmdFor.java
diff --git a/src/ublu/command/CmdFun.java b/src/main/java/ublu/command/CmdFun.java
similarity index 100%
rename from src/ublu/command/CmdFun.java
rename to src/main/java/ublu/command/CmdFun.java
diff --git a/src/ublu/command/CmdFunc.java b/src/main/java/ublu/command/CmdFunc.java
similarity index 100%
rename from src/ublu/command/CmdFunc.java
rename to src/main/java/ublu/command/CmdFunc.java
diff --git a/src/ublu/command/CmdGenSh.java b/src/main/java/ublu/command/CmdGenSh.java
similarity index 100%
rename from src/ublu/command/CmdGenSh.java
rename to src/main/java/ublu/command/CmdGenSh.java
diff --git a/src/ublu/command/CmdHistory.java b/src/main/java/ublu/command/CmdHistory.java
similarity index 100%
rename from src/ublu/command/CmdHistory.java
rename to src/main/java/ublu/command/CmdHistory.java
diff --git a/src/ublu/command/CmdHistoryLog.java b/src/main/java/ublu/command/CmdHistoryLog.java
similarity index 100%
rename from src/ublu/command/CmdHistoryLog.java
rename to src/main/java/ublu/command/CmdHistoryLog.java
diff --git a/src/ublu/command/CmdHost.java b/src/main/java/ublu/command/CmdHost.java
similarity index 100%
rename from src/ublu/command/CmdHost.java
rename to src/main/java/ublu/command/CmdHost.java
diff --git a/src/ublu/command/CmdIFS.java b/src/main/java/ublu/command/CmdIFS.java
similarity index 100%
rename from src/ublu/command/CmdIFS.java
rename to src/main/java/ublu/command/CmdIFS.java
diff --git a/src/ublu/command/CmdIf.java b/src/main/java/ublu/command/CmdIf.java
similarity index 100%
rename from src/ublu/command/CmdIf.java
rename to src/main/java/ublu/command/CmdIf.java
diff --git a/src/ublu/command/CmdInclude.java b/src/main/java/ublu/command/CmdInclude.java
similarity index 100%
rename from src/ublu/command/CmdInclude.java
rename to src/main/java/ublu/command/CmdInclude.java
diff --git a/src/ublu/command/CmdInterpret.java b/src/main/java/ublu/command/CmdInterpret.java
similarity index 100%
rename from src/ublu/command/CmdInterpret.java
rename to src/main/java/ublu/command/CmdInterpret.java
diff --git a/src/ublu/command/CmdInterpreter.java b/src/main/java/ublu/command/CmdInterpreter.java
similarity index 100%
rename from src/ublu/command/CmdInterpreter.java
rename to src/main/java/ublu/command/CmdInterpreter.java
diff --git a/src/ublu/command/CmdJMX.java b/src/main/java/ublu/command/CmdJMX.java
similarity index 100%
rename from src/ublu/command/CmdJMX.java
rename to src/main/java/ublu/command/CmdJMX.java
diff --git a/src/ublu/command/CmdJVM.java b/src/main/java/ublu/command/CmdJVM.java
similarity index 100%
rename from src/ublu/command/CmdJVM.java
rename to src/main/java/ublu/command/CmdJVM.java
diff --git a/src/ublu/command/CmdJob.java b/src/main/java/ublu/command/CmdJob.java
similarity index 100%
rename from src/ublu/command/CmdJob.java
rename to src/main/java/ublu/command/CmdJob.java
diff --git a/src/ublu/command/CmdJobList.java b/src/main/java/ublu/command/CmdJobList.java
similarity index 100%
rename from src/ublu/command/CmdJobList.java
rename to src/main/java/ublu/command/CmdJobList.java
diff --git a/src/ublu/command/CmdJobLog.java b/src/main/java/ublu/command/CmdJobLog.java
similarity index 100%
rename from src/ublu/command/CmdJobLog.java
rename to src/main/java/ublu/command/CmdJobLog.java
diff --git a/src/ublu/command/CmdJson.java b/src/main/java/ublu/command/CmdJson.java
similarity index 100%
rename from src/ublu/command/CmdJson.java
rename to src/main/java/ublu/command/CmdJson.java
diff --git a/src/ublu/command/CmdLicense.java b/src/main/java/ublu/command/CmdLicense.java
similarity index 100%
rename from src/ublu/command/CmdLicense.java
rename to src/main/java/ublu/command/CmdLicense.java
diff --git a/src/ublu/command/CmdLifo.java b/src/main/java/ublu/command/CmdLifo.java
similarity index 100%
rename from src/ublu/command/CmdLifo.java
rename to src/main/java/ublu/command/CmdLifo.java
diff --git a/src/ublu/command/CmdList.java b/src/main/java/ublu/command/CmdList.java
similarity index 100%
rename from src/ublu/command/CmdList.java
rename to src/main/java/ublu/command/CmdList.java
diff --git a/src/ublu/command/CmdLocal.java b/src/main/java/ublu/command/CmdLocal.java
similarity index 100%
rename from src/ublu/command/CmdLocal.java
rename to src/main/java/ublu/command/CmdLocal.java
diff --git a/src/ublu/command/CmdMap.java b/src/main/java/ublu/command/CmdMap.java
similarity index 100%
rename from src/ublu/command/CmdMap.java
rename to src/main/java/ublu/command/CmdMap.java
diff --git a/src/ublu/command/CmdMonitor.java b/src/main/java/ublu/command/CmdMonitor.java
similarity index 100%
rename from src/ublu/command/CmdMonitor.java
rename to src/main/java/ublu/command/CmdMonitor.java
diff --git a/src/ublu/command/CmdMsg.java b/src/main/java/ublu/command/CmdMsg.java
similarity index 100%
rename from src/ublu/command/CmdMsg.java
rename to src/main/java/ublu/command/CmdMsg.java
diff --git a/src/ublu/command/CmdMsgQ.java b/src/main/java/ublu/command/CmdMsgQ.java
similarity index 100%
rename from src/ublu/command/CmdMsgQ.java
rename to src/main/java/ublu/command/CmdMsgQ.java
diff --git a/src/ublu/command/CmdNumber.java b/src/main/java/ublu/command/CmdNumber.java
similarity index 100%
rename from src/ublu/command/CmdNumber.java
rename to src/main/java/ublu/command/CmdNumber.java
diff --git a/src/ublu/command/CmdObjDesc.java b/src/main/java/ublu/command/CmdObjDesc.java
similarity index 100%
rename from src/ublu/command/CmdObjDesc.java
rename to src/main/java/ublu/command/CmdObjDesc.java
diff --git a/src/ublu/command/CmdObjList.java b/src/main/java/ublu/command/CmdObjList.java
similarity index 100%
rename from src/ublu/command/CmdObjList.java
rename to src/main/java/ublu/command/CmdObjList.java
diff --git a/src/ublu/command/CmdOutQ.java b/src/main/java/ublu/command/CmdOutQ.java
similarity index 100%
rename from src/ublu/command/CmdOutQ.java
rename to src/main/java/ublu/command/CmdOutQ.java
diff --git a/src/ublu/command/CmdPpl.java b/src/main/java/ublu/command/CmdPpl.java
similarity index 100%
rename from src/ublu/command/CmdPpl.java
rename to src/main/java/ublu/command/CmdPpl.java
diff --git a/src/ublu/command/CmdPrinter.java b/src/main/java/ublu/command/CmdPrinter.java
similarity index 100%
rename from src/ublu/command/CmdPrinter.java
rename to src/main/java/ublu/command/CmdPrinter.java
diff --git a/src/ublu/command/CmdProgramCall.java b/src/main/java/ublu/command/CmdProgramCall.java
similarity index 100%
rename from src/ublu/command/CmdProgramCall.java
rename to src/main/java/ublu/command/CmdProgramCall.java
diff --git a/src/ublu/command/CmdProps.java b/src/main/java/ublu/command/CmdProps.java
similarity index 100%
rename from src/ublu/command/CmdProps.java
rename to src/main/java/ublu/command/CmdProps.java
diff --git a/src/ublu/command/CmdPut.java b/src/main/java/ublu/command/CmdPut.java
similarity index 100%
rename from src/ublu/command/CmdPut.java
rename to src/main/java/ublu/command/CmdPut.java
diff --git a/src/ublu/command/CmdRecord.java b/src/main/java/ublu/command/CmdRecord.java
similarity index 100%
rename from src/ublu/command/CmdRecord.java
rename to src/main/java/ublu/command/CmdRecord.java
diff --git a/src/ublu/command/CmdRs.java b/src/main/java/ublu/command/CmdRs.java
similarity index 100%
rename from src/ublu/command/CmdRs.java
rename to src/main/java/ublu/command/CmdRs.java
diff --git a/src/ublu/command/CmdSavF.java b/src/main/java/ublu/command/CmdSavF.java
similarity index 100%
rename from src/ublu/command/CmdSavF.java
rename to src/main/java/ublu/command/CmdSavF.java
diff --git a/src/ublu/command/CmdSaveF.java b/src/main/java/ublu/command/CmdSaveF.java
similarity index 100%
rename from src/ublu/command/CmdSaveF.java
rename to src/main/java/ublu/command/CmdSaveF.java
diff --git a/src/ublu/command/CmdSaveSys.java b/src/main/java/ublu/command/CmdSaveSys.java
similarity index 100%
rename from src/ublu/command/CmdSaveSys.java
rename to src/main/java/ublu/command/CmdSaveSys.java
diff --git a/src/ublu/command/CmdServer.java b/src/main/java/ublu/command/CmdServer.java
similarity index 100%
rename from src/ublu/command/CmdServer.java
rename to src/main/java/ublu/command/CmdServer.java
diff --git a/src/ublu/command/CmdSession.java b/src/main/java/ublu/command/CmdSession.java
similarity index 100%
rename from src/ublu/command/CmdSession.java
rename to src/main/java/ublu/command/CmdSession.java
diff --git a/src/ublu/command/CmdSleep.java b/src/main/java/ublu/command/CmdSleep.java
similarity index 100%
rename from src/ublu/command/CmdSleep.java
rename to src/main/java/ublu/command/CmdSleep.java
diff --git a/src/ublu/command/CmdSmapi.java b/src/main/java/ublu/command/CmdSmapi.java
similarity index 100%
rename from src/ublu/command/CmdSmapi.java
rename to src/main/java/ublu/command/CmdSmapi.java
diff --git a/src/ublu/command/CmdSocket.java b/src/main/java/ublu/command/CmdSocket.java
similarity index 100%
rename from src/ublu/command/CmdSocket.java
rename to src/main/java/ublu/command/CmdSocket.java
diff --git a/src/ublu/command/CmdSpoolF.java b/src/main/java/ublu/command/CmdSpoolF.java
similarity index 100%
rename from src/ublu/command/CmdSpoolF.java
rename to src/main/java/ublu/command/CmdSpoolF.java
diff --git a/src/ublu/command/CmdSpoolFList.java b/src/main/java/ublu/command/CmdSpoolFList.java
similarity index 100%
rename from src/ublu/command/CmdSpoolFList.java
rename to src/main/java/ublu/command/CmdSpoolFList.java
diff --git a/src/ublu/command/CmdSpoolFOpenList.java b/src/main/java/ublu/command/CmdSpoolFOpenList.java
similarity index 100%
rename from src/ublu/command/CmdSpoolFOpenList.java
rename to src/main/java/ublu/command/CmdSpoolFOpenList.java
diff --git a/src/ublu/command/CmdStreamFile.java b/src/main/java/ublu/command/CmdStreamFile.java
similarity index 100%
rename from src/ublu/command/CmdStreamFile.java
rename to src/main/java/ublu/command/CmdStreamFile.java
diff --git a/src/ublu/command/CmdString.java b/src/main/java/ublu/command/CmdString.java
similarity index 100%
rename from src/ublu/command/CmdString.java
rename to src/main/java/ublu/command/CmdString.java
diff --git a/src/ublu/command/CmdSubSystem.java b/src/main/java/ublu/command/CmdSubSystem.java
similarity index 100%
rename from src/ublu/command/CmdSubSystem.java
rename to src/main/java/ublu/command/CmdSubSystem.java
diff --git a/src/ublu/command/CmdSwitch.java b/src/main/java/ublu/command/CmdSwitch.java
similarity index 100%
rename from src/ublu/command/CmdSwitch.java
rename to src/main/java/ublu/command/CmdSwitch.java
diff --git a/src/ublu/command/CmdSysVal.java b/src/main/java/ublu/command/CmdSysVal.java
similarity index 100%
rename from src/ublu/command/CmdSysVal.java
rename to src/main/java/ublu/command/CmdSysVal.java
diff --git a/src/ublu/command/CmdSystem.java b/src/main/java/ublu/command/CmdSystem.java
similarity index 100%
rename from src/ublu/command/CmdSystem.java
rename to src/main/java/ublu/command/CmdSystem.java
diff --git a/src/ublu/command/CmdTN5250.java b/src/main/java/ublu/command/CmdTN5250.java
similarity index 100%
rename from src/ublu/command/CmdTN5250.java
rename to src/main/java/ublu/command/CmdTN5250.java
diff --git a/src/ublu/command/CmdTask.java b/src/main/java/ublu/command/CmdTask.java
similarity index 100%
rename from src/ublu/command/CmdTask.java
rename to src/main/java/ublu/command/CmdTask.java
diff --git a/src/ublu/command/CmdTest.java b/src/main/java/ublu/command/CmdTest.java
similarity index 100%
rename from src/ublu/command/CmdTest.java
rename to src/main/java/ublu/command/CmdTest.java
diff --git a/src/ublu/command/CmdThen.java b/src/main/java/ublu/command/CmdThen.java
similarity index 100%
rename from src/ublu/command/CmdThen.java
rename to src/main/java/ublu/command/CmdThen.java
diff --git a/src/ublu/command/CmdThread.java b/src/main/java/ublu/command/CmdThread.java
similarity index 100%
rename from src/ublu/command/CmdThread.java
rename to src/main/java/ublu/command/CmdThread.java
diff --git a/src/ublu/command/CmdThrow.java b/src/main/java/ublu/command/CmdThrow.java
similarity index 100%
rename from src/ublu/command/CmdThrow.java
rename to src/main/java/ublu/command/CmdThrow.java
diff --git a/src/ublu/command/CmdTrace.java b/src/main/java/ublu/command/CmdTrace.java
similarity index 100%
rename from src/ublu/command/CmdTrace.java
rename to src/main/java/ublu/command/CmdTrace.java
diff --git a/src/ublu/command/CmdTry.java b/src/main/java/ublu/command/CmdTry.java
similarity index 100%
rename from src/ublu/command/CmdTry.java
rename to src/main/java/ublu/command/CmdTry.java
diff --git a/src/ublu/command/CmdTuple.java b/src/main/java/ublu/command/CmdTuple.java
similarity index 100%
rename from src/ublu/command/CmdTuple.java
rename to src/main/java/ublu/command/CmdTuple.java
diff --git a/src/ublu/command/CmdUsage.java b/src/main/java/ublu/command/CmdUsage.java
similarity index 100%
rename from src/ublu/command/CmdUsage.java
rename to src/main/java/ublu/command/CmdUsage.java
diff --git a/src/ublu/command/CmdUser.java b/src/main/java/ublu/command/CmdUser.java
similarity index 100%
rename from src/ublu/command/CmdUser.java
rename to src/main/java/ublu/command/CmdUser.java
diff --git a/src/ublu/command/CmdUserList.java b/src/main/java/ublu/command/CmdUserList.java
similarity index 100%
rename from src/ublu/command/CmdUserList.java
rename to src/main/java/ublu/command/CmdUserList.java
diff --git a/src/ublu/command/CmdWatson.java b/src/main/java/ublu/command/CmdWatson.java
similarity index 100%
rename from src/ublu/command/CmdWatson.java
rename to src/main/java/ublu/command/CmdWatson.java
diff --git a/src/ublu/command/CmdWhile.java b/src/main/java/ublu/command/CmdWhile.java
similarity index 100%
rename from src/ublu/command/CmdWhile.java
rename to src/main/java/ublu/command/CmdWhile.java
diff --git a/src/ublu/command/Command.java b/src/main/java/ublu/command/Command.java
similarity index 100%
rename from src/ublu/command/Command.java
rename to src/main/java/ublu/command/Command.java
diff --git a/src/ublu/command/CommandInterface.java b/src/main/java/ublu/command/CommandInterface.java
similarity index 100%
rename from src/ublu/command/CommandInterface.java
rename to src/main/java/ublu/command/CommandInterface.java
diff --git a/src/ublu/command/CommandMap.java b/src/main/java/ublu/command/CommandMap.java
similarity index 100%
rename from src/ublu/command/CommandMap.java
rename to src/main/java/ublu/command/CommandMap.java
diff --git a/src/ublu/command/package-info.java b/src/main/java/ublu/command/package-info.java
similarity index 100%
rename from src/ublu/command/package-info.java
rename to src/main/java/ublu/command/package-info.java
diff --git a/src/ublu/db/Csv.java b/src/main/java/ublu/db/Csv.java
similarity index 100%
rename from src/ublu/db/Csv.java
rename to src/main/java/ublu/db/Csv.java
diff --git a/src/ublu/db/Db.java b/src/main/java/ublu/db/Db.java
similarity index 100%
rename from src/ublu/db/Db.java
rename to src/main/java/ublu/db/Db.java
diff --git a/src/ublu/db/DbAS400.java b/src/main/java/ublu/db/DbAS400.java
similarity index 100%
rename from src/ublu/db/DbAS400.java
rename to src/main/java/ublu/db/DbAS400.java
diff --git a/src/ublu/db/DbHelper.java b/src/main/java/ublu/db/DbHelper.java
similarity index 100%
rename from src/ublu/db/DbHelper.java
rename to src/main/java/ublu/db/DbHelper.java
diff --git a/src/ublu/db/DbMSSQL.java b/src/main/java/ublu/db/DbMSSQL.java
similarity index 100%
rename from src/ublu/db/DbMSSQL.java
rename to src/main/java/ublu/db/DbMSSQL.java
diff --git a/src/ublu/db/DbPostgres.java b/src/main/java/ublu/db/DbPostgres.java
similarity index 100%
rename from src/ublu/db/DbPostgres.java
rename to src/main/java/ublu/db/DbPostgres.java
diff --git a/src/ublu/db/Json.java b/src/main/java/ublu/db/Json.java
similarity index 100%
rename from src/ublu/db/Json.java
rename to src/main/java/ublu/db/Json.java
diff --git a/src/ublu/db/ResultSetClosure.java b/src/main/java/ublu/db/ResultSetClosure.java
similarity index 100%
rename from src/ublu/db/ResultSetClosure.java
rename to src/main/java/ublu/db/ResultSetClosure.java
diff --git a/src/ublu/db/ResultSetFormatter.java b/src/main/java/ublu/db/ResultSetFormatter.java
similarity index 100%
rename from src/ublu/db/ResultSetFormatter.java
rename to src/main/java/ublu/db/ResultSetFormatter.java
diff --git a/src/ublu/db/ResultSetHelper.java b/src/main/java/ublu/db/ResultSetHelper.java
similarity index 100%
rename from src/ublu/db/ResultSetHelper.java
rename to src/main/java/ublu/db/ResultSetHelper.java
diff --git a/src/ublu/db/Statements.java b/src/main/java/ublu/db/Statements.java
similarity index 100%
rename from src/ublu/db/Statements.java
rename to src/main/java/ublu/db/Statements.java
diff --git a/src/ublu/db/TableReplicator.java b/src/main/java/ublu/db/TableReplicator.java
similarity index 100%
rename from src/ublu/db/TableReplicator.java
rename to src/main/java/ublu/db/TableReplicator.java
diff --git a/src/ublu/db/package-info.java b/src/main/java/ublu/db/package-info.java
similarity index 100%
rename from src/ublu/db/package-info.java
rename to src/main/java/ublu/db/package-info.java
diff --git a/src/ublu/package-info.java b/src/main/java/ublu/package-info.java
similarity index 100%
rename from src/ublu/package-info.java
rename to src/main/java/ublu/package-info.java
diff --git a/src/ublu/server/Listener.java b/src/main/java/ublu/server/Listener.java
similarity index 100%
rename from src/ublu/server/Listener.java
rename to src/main/java/ublu/server/Listener.java
diff --git a/src/ublu/server/Server.java b/src/main/java/ublu/server/Server.java
similarity index 100%
rename from src/ublu/server/Server.java
rename to src/main/java/ublu/server/Server.java
diff --git a/src/ublu/server/package-info.java b/src/main/java/ublu/server/package-info.java
similarity index 100%
rename from src/ublu/server/package-info.java
rename to src/main/java/ublu/server/package-info.java
diff --git a/src/ublu/smapi/Host.java b/src/main/java/ublu/smapi/Host.java
similarity index 100%
rename from src/ublu/smapi/Host.java
rename to src/main/java/ublu/smapi/Host.java
diff --git a/src/ublu/smapi/SmapiHelper.java b/src/main/java/ublu/smapi/SmapiHelper.java
similarity index 100%
rename from src/ublu/smapi/SmapiHelper.java
rename to src/main/java/ublu/smapi/SmapiHelper.java
diff --git a/src/ublu/smapi/package-info.java b/src/main/java/ublu/smapi/package-info.java
similarity index 100%
rename from src/ublu/smapi/package-info.java
rename to src/main/java/ublu/smapi/package-info.java
diff --git a/src/ublu/util/ArgArray.java b/src/main/java/ublu/util/ArgArray.java
similarity index 100%
rename from src/ublu/util/ArgArray.java
rename to src/main/java/ublu/util/ArgArray.java
diff --git a/src/ublu/util/Argument.java b/src/main/java/ublu/util/Argument.java
similarity index 100%
rename from src/ublu/util/Argument.java
rename to src/main/java/ublu/util/Argument.java
diff --git a/src/ublu/util/Autonome.java b/src/main/java/ublu/util/Autonome.java
similarity index 100%
rename from src/ublu/util/Autonome.java
rename to src/main/java/ublu/util/Autonome.java
diff --git a/src/ublu/util/BrkInterpreter.java b/src/main/java/ublu/util/BrkInterpreter.java
similarity index 100%
rename from src/ublu/util/BrkInterpreter.java
rename to src/main/java/ublu/util/BrkInterpreter.java
diff --git a/src/ublu/util/ByteArraySplitter.java b/src/main/java/ublu/util/ByteArraySplitter.java
similarity index 100%
rename from src/ublu/util/ByteArraySplitter.java
rename to src/main/java/ublu/util/ByteArraySplitter.java
diff --git a/src/ublu/util/CimUbluHelper.java b/src/main/java/ublu/util/CimUbluHelper.java
similarity index 100%
rename from src/ublu/util/CimUbluHelper.java
rename to src/main/java/ublu/util/CimUbluHelper.java
diff --git a/src/ublu/util/Const.java b/src/main/java/ublu/util/Const.java
similarity index 100%
rename from src/ublu/util/Const.java
rename to src/main/java/ublu/util/Const.java
diff --git a/src/ublu/util/DBug.java b/src/main/java/ublu/util/DBug.java
similarity index 100%
rename from src/ublu/util/DBug.java
rename to src/main/java/ublu/util/DBug.java
diff --git a/src/ublu/util/DBugInterpreter.java b/src/main/java/ublu/util/DBugInterpreter.java
similarity index 100%
rename from src/ublu/util/DBugInterpreter.java
rename to src/main/java/ublu/util/DBugInterpreter.java
diff --git a/src/ublu/util/DataSink.java b/src/main/java/ublu/util/DataSink.java
similarity index 100%
rename from src/ublu/util/DataSink.java
rename to src/main/java/ublu/util/DataSink.java
diff --git a/src/ublu/util/Functor.java b/src/main/java/ublu/util/Functor.java
similarity index 100%
rename from src/ublu/util/Functor.java
rename to src/main/java/ublu/util/Functor.java
diff --git a/src/ublu/util/GenSh.java b/src/main/java/ublu/util/GenSh.java
similarity index 100%
rename from src/ublu/util/GenSh.java
rename to src/main/java/ublu/util/GenSh.java
diff --git a/src/ublu/util/Generics.java b/src/main/java/ublu/util/Generics.java
similarity index 100%
rename from src/ublu/util/Generics.java
rename to src/main/java/ublu/util/Generics.java
diff --git a/src/ublu/util/GetArgs.java b/src/main/java/ublu/util/GetArgs.java
similarity index 100%
rename from src/ublu/util/GetArgs.java
rename to src/main/java/ublu/util/GetArgs.java
diff --git a/src/ublu/util/History.java b/src/main/java/ublu/util/History.java
similarity index 100%
rename from src/ublu/util/History.java
rename to src/main/java/ublu/util/History.java
diff --git a/src/ublu/util/Interpreter.java b/src/main/java/ublu/util/Interpreter.java
similarity index 100%
rename from src/ublu/util/Interpreter.java
rename to src/main/java/ublu/util/Interpreter.java
diff --git a/src/ublu/util/InterpreterFrame.java b/src/main/java/ublu/util/InterpreterFrame.java
similarity index 100%
rename from src/ublu/util/InterpreterFrame.java
rename to src/main/java/ublu/util/InterpreterFrame.java
diff --git a/src/ublu/util/InterpreterLogger.java b/src/main/java/ublu/util/InterpreterLogger.java
similarity index 100%
rename from src/ublu/util/InterpreterLogger.java
rename to src/main/java/ublu/util/InterpreterLogger.java
diff --git a/src/ublu/util/InterpreterThread.java b/src/main/java/ublu/util/InterpreterThread.java
similarity index 100%
rename from src/ublu/util/InterpreterThread.java
rename to src/main/java/ublu/util/InterpreterThread.java
diff --git a/src/ublu/util/JMXHelper.java b/src/main/java/ublu/util/JMXHelper.java
similarity index 100%
rename from src/ublu/util/JMXHelper.java
rename to src/main/java/ublu/util/JMXHelper.java
diff --git a/src/ublu/util/JVMHelper.java b/src/main/java/ublu/util/JVMHelper.java
similarity index 100%
rename from src/ublu/util/JVMHelper.java
rename to src/main/java/ublu/util/JVMHelper.java
diff --git a/src/ublu/util/JavaCallHelper.java b/src/main/java/ublu/util/JavaCallHelper.java
similarity index 100%
rename from src/ublu/util/JavaCallHelper.java
rename to src/main/java/ublu/util/JavaCallHelper.java
diff --git a/src/ublu/util/LocaleHelper.java b/src/main/java/ublu/util/LocaleHelper.java
similarity index 100%
rename from src/ublu/util/LocaleHelper.java
rename to src/main/java/ublu/util/LocaleHelper.java
diff --git a/src/ublu/util/ParamSubTuple.java b/src/main/java/ublu/util/ParamSubTuple.java
similarity index 100%
rename from src/ublu/util/ParamSubTuple.java
rename to src/main/java/ublu/util/ParamSubTuple.java
diff --git a/src/ublu/util/Parser.java b/src/main/java/ublu/util/Parser.java
similarity index 100%
rename from src/ublu/util/Parser.java
rename to src/main/java/ublu/util/Parser.java
diff --git a/src/ublu/util/ProgramCallHelper.java b/src/main/java/ublu/util/ProgramCallHelper.java
similarity index 100%
rename from src/ublu/util/ProgramCallHelper.java
rename to src/main/java/ublu/util/ProgramCallHelper.java
diff --git a/src/ublu/util/Props.java b/src/main/java/ublu/util/Props.java
similarity index 100%
rename from src/ublu/util/Props.java
rename to src/main/java/ublu/util/Props.java
diff --git a/src/ublu/util/Putter.java b/src/main/java/ublu/util/Putter.java
similarity index 100%
rename from src/ublu/util/Putter.java
rename to src/main/java/ublu/util/Putter.java
diff --git a/src/ublu/util/Renderer.java b/src/main/java/ublu/util/Renderer.java
similarity index 100%
rename from src/ublu/util/Renderer.java
rename to src/main/java/ublu/util/Renderer.java
diff --git a/src/ublu/util/Sess5250.java b/src/main/java/ublu/util/Sess5250.java
similarity index 100%
rename from src/ublu/util/Sess5250.java
rename to src/main/java/ublu/util/Sess5250.java
diff --git a/src/ublu/util/SpoolFHelper.java b/src/main/java/ublu/util/SpoolFHelper.java
similarity index 100%
rename from src/ublu/util/SpoolFHelper.java
rename to src/main/java/ublu/util/SpoolFHelper.java
diff --git a/src/ublu/util/StreamFileHelper.java b/src/main/java/ublu/util/StreamFileHelper.java
similarity index 100%
rename from src/ublu/util/StreamFileHelper.java
rename to src/main/java/ublu/util/StreamFileHelper.java
diff --git a/src/ublu/util/SysShepFormatter.java b/src/main/java/ublu/util/SysShepFormatter.java
similarity index 100%
rename from src/ublu/util/SysShepFormatter.java
rename to src/main/java/ublu/util/SysShepFormatter.java
diff --git a/src/ublu/util/SysShepHelper.java b/src/main/java/ublu/util/SysShepHelper.java
similarity index 100%
rename from src/ublu/util/SysShepHelper.java
rename to src/main/java/ublu/util/SysShepHelper.java
diff --git a/src/ublu/util/SysValHelper.java b/src/main/java/ublu/util/SysValHelper.java
similarity index 100%
rename from src/ublu/util/SysValHelper.java
rename to src/main/java/ublu/util/SysValHelper.java
diff --git a/src/ublu/util/SystemHelper.java b/src/main/java/ublu/util/SystemHelper.java
similarity index 100%
rename from src/ublu/util/SystemHelper.java
rename to src/main/java/ublu/util/SystemHelper.java
diff --git a/src/ublu/util/TN5250Helper.java b/src/main/java/ublu/util/TN5250Helper.java
similarity index 100%
rename from src/ublu/util/TN5250Helper.java
rename to src/main/java/ublu/util/TN5250Helper.java
diff --git a/src/ublu/util/Tuple.java b/src/main/java/ublu/util/Tuple.java
similarity index 100%
rename from src/ublu/util/Tuple.java
rename to src/main/java/ublu/util/Tuple.java
diff --git a/src/ublu/util/TupleMap.java b/src/main/java/ublu/util/TupleMap.java
similarity index 100%
rename from src/ublu/util/TupleMap.java
rename to src/main/java/ublu/util/TupleMap.java
diff --git a/src/ublu/util/Utils.java b/src/main/java/ublu/util/Utils.java
similarity index 100%
rename from src/ublu/util/Utils.java
rename to src/main/java/ublu/util/Utils.java
diff --git a/src/ublu/util/WatsonHelper.java b/src/main/java/ublu/util/WatsonHelper.java
similarity index 100%
rename from src/ublu/util/WatsonHelper.java
rename to src/main/java/ublu/util/WatsonHelper.java
diff --git a/src/ublu/util/package-info.java b/src/main/java/ublu/util/package-info.java
similarity index 100%
rename from src/ublu/util/package-info.java
rename to src/main/java/ublu/util/package-info.java
diff --git a/src/ublu/win/ColorChooser.form b/src/main/java/ublu/win/ColorChooser.form
similarity index 100%
rename from src/ublu/win/ColorChooser.form
rename to src/main/java/ublu/win/ColorChooser.form
diff --git a/src/ublu/win/ColorChooser.java b/src/main/java/ublu/win/ColorChooser.java
similarity index 100%
rename from src/ublu/win/ColorChooser.java
rename to src/main/java/ublu/win/ColorChooser.java
diff --git a/src/ublu/win/FontChooser.java b/src/main/java/ublu/win/FontChooser.java
similarity index 100%
rename from src/ublu/win/FontChooser.java
rename to src/main/java/ublu/win/FontChooser.java
diff --git a/src/ublu/win/TextAreaOutputStream.java b/src/main/java/ublu/win/TextAreaOutputStream.java
similarity index 100%
rename from src/ublu/win/TextAreaOutputStream.java
rename to src/main/java/ublu/win/TextAreaOutputStream.java
diff --git a/src/ublu/win/UbluFrame.form b/src/main/java/ublu/win/UbluFrame.form
similarity index 100%
rename from src/ublu/win/UbluFrame.form
rename to src/main/java/ublu/win/UbluFrame.form
diff --git a/src/ublu/win/UbluFrame.java b/src/main/java/ublu/win/UbluFrame.java
similarity index 100%
rename from src/ublu/win/UbluFrame.java
rename to src/main/java/ublu/win/UbluFrame.java
diff --git a/src/ublu/win/UbluPanel.form b/src/main/java/ublu/win/UbluPanel.form
similarity index 100%
rename from src/ublu/win/UbluPanel.form
rename to src/main/java/ublu/win/UbluPanel.form
diff --git a/src/ublu/win/UbluPanel.java b/src/main/java/ublu/win/UbluPanel.java
similarity index 100%
rename from src/ublu/win/UbluPanel.java
rename to src/main/java/ublu/win/UbluPanel.java
diff --git a/src/ublu/win/UbluWin.java b/src/main/java/ublu/win/UbluWin.java
similarity index 100%
rename from src/ublu/win/UbluWin.java
rename to src/main/java/ublu/win/UbluWin.java
diff --git a/src/ublu/win/UbluWinController.java b/src/main/java/ublu/win/UbluWinController.java
similarity index 100%
rename from src/ublu/win/UbluWinController.java
rename to src/main/java/ublu/win/UbluWinController.java
diff --git a/src/ublu/win/UbluWinInputStream.java b/src/main/java/ublu/win/UbluWinInputStream.java
similarity index 100%
rename from src/ublu/win/UbluWinInputStream.java
rename to src/main/java/ublu/win/UbluWinInputStream.java
diff --git a/src/ublu/win/WinProps.java b/src/main/java/ublu/win/WinProps.java
similarity index 100%
rename from src/ublu/win/WinProps.java
rename to src/main/java/ublu/win/WinProps.java
diff --git a/src/ublu/resource/Candlespace.gif b/src/main/resources/ublu/resource/Candlespace.gif
similarity index 100%
rename from src/ublu/resource/Candlespace.gif
rename to src/main/resources/ublu/resource/Candlespace.gif
diff --git a/src/ublu/resource/MessageBundle_en_US.properties b/src/main/resources/ublu/resource/MessageBundle_en_US.properties
similarity index 100%
rename from src/ublu/resource/MessageBundle_en_US.properties
rename to src/main/resources/ublu/resource/MessageBundle_en_US.properties
diff --git a/src/ublu/resource/MessageBundle_fr_FR.properties b/src/main/resources/ublu/resource/MessageBundle_fr_FR.properties
similarity index 100%
rename from src/ublu/resource/MessageBundle_fr_FR.properties
rename to src/main/resources/ublu/resource/MessageBundle_fr_FR.properties
diff --git a/src/ublu/win/Bundle.properties b/src/main/resources/ublu/win/Bundle.properties
similarity index 100%
rename from src/ublu/win/Bundle.properties
rename to src/main/resources/ublu/win/Bundle.properties