diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..67bcc2f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.gradle/
+build/
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..f093167
--- /dev/null
+++ b/README.md
@@ -0,0 +1,5 @@
+# ShrinkIt Archive Library for Java
+
+This project is a direct off-shoot of the AppleCommander project and implements a pure Java API to manipulate ShrinkIt (NuFX) 
+archives ([Apple File Type Note $E0/8002](http://www.apple2online.com/web_documents/ft_e0.8002_shrinkit.pdf)).
+
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..9b98e7e
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,20 @@
+apply plugin: 'java'
+apply plugin: 'application'
+
+repositories {
+    jcenter()  
+}
+
+dependencies {
+    testCompile 'junit:junit:4.12'         
+}
+
+mainClassName = 'com.webcodepro.shrinkit.NufxScan' 
+
+jar {
+  manifest {
+    attributes(
+      'Main-Class': mainClassName
+    )
+  }
+}
diff --git a/build/.cvsignore b/build/.cvsignore
deleted file mode 100644
index d392f0e..0000000
--- a/build/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.jar
diff --git a/build/build.xml b/build/build.xml
deleted file mode 100644
index 8e89c80..0000000
--- a/build/build.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="ShrinkItArchive" default="jar" basedir="..">
-	<property name="versionString" value="1.0.0" />
-	<property name="distName" value="ShrinkItArchive-${versionString}" />
-	<property name="builddir" value="${basedir}/build" />
-
-	<target name="jar">
-		<jar jarfile="${builddir}/${distName}.jar"
-			basedir="${basedir}/bin"
-			includes="com/**/*.class" />
-	</target>
-</project>
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..f6b961f
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..bf3de21
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..cccdd3d
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..e95643d
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/local_src/com/webcodepro/shrinkit/.cvsignore b/local_src/com/webcodepro/shrinkit/.cvsignore
deleted file mode 100644
index e78f50f..0000000
--- a/local_src/com/webcodepro/shrinkit/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-NufxScan.txt
diff --git a/local_src/com/webcodepro/shrinkit/NufxScan-sample.txt b/local_src/com/webcodepro/shrinkit/NufxScan-sample.txt
deleted file mode 100644
index 0cb9938..0000000
--- a/local_src/com/webcodepro/shrinkit/NufxScan-sample.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-C:\Apple2\backups
-C:\Apple2\shk
-C:\Temp
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..9e73035
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'ShrinkItArchive'
diff --git a/src/com/webcodepro/shrinkit/CRC16.java b/src/main/java/com/webcodepro/shrinkit/CRC16.java
similarity index 100%
rename from src/com/webcodepro/shrinkit/CRC16.java
rename to src/main/java/com/webcodepro/shrinkit/CRC16.java
diff --git a/src/com/webcodepro/shrinkit/HeaderBlock.java b/src/main/java/com/webcodepro/shrinkit/HeaderBlock.java
similarity index 100%
rename from src/com/webcodepro/shrinkit/HeaderBlock.java
rename to src/main/java/com/webcodepro/shrinkit/HeaderBlock.java
diff --git a/src/com/webcodepro/shrinkit/MasterHeaderBlock.java b/src/main/java/com/webcodepro/shrinkit/MasterHeaderBlock.java
similarity index 100%
rename from src/com/webcodepro/shrinkit/MasterHeaderBlock.java
rename to src/main/java/com/webcodepro/shrinkit/MasterHeaderBlock.java
diff --git a/src/com/webcodepro/shrinkit/NuFileArchive.java b/src/main/java/com/webcodepro/shrinkit/NuFileArchive.java
similarity index 100%
rename from src/com/webcodepro/shrinkit/NuFileArchive.java
rename to src/main/java/com/webcodepro/shrinkit/NuFileArchive.java
diff --git a/local_src/com/webcodepro/shrinkit/NufxScan.java b/src/main/java/com/webcodepro/shrinkit/NufxScan.java
similarity index 100%
rename from local_src/com/webcodepro/shrinkit/NufxScan.java
rename to src/main/java/com/webcodepro/shrinkit/NufxScan.java
diff --git a/src/com/webcodepro/shrinkit/ThreadClass.java b/src/main/java/com/webcodepro/shrinkit/ThreadClass.java
similarity index 100%
rename from src/com/webcodepro/shrinkit/ThreadClass.java
rename to src/main/java/com/webcodepro/shrinkit/ThreadClass.java
diff --git a/src/com/webcodepro/shrinkit/ThreadFormat.java b/src/main/java/com/webcodepro/shrinkit/ThreadFormat.java
similarity index 100%
rename from src/com/webcodepro/shrinkit/ThreadFormat.java
rename to src/main/java/com/webcodepro/shrinkit/ThreadFormat.java
diff --git a/src/com/webcodepro/shrinkit/ThreadKind.java b/src/main/java/com/webcodepro/shrinkit/ThreadKind.java
similarity index 100%
rename from src/com/webcodepro/shrinkit/ThreadKind.java
rename to src/main/java/com/webcodepro/shrinkit/ThreadKind.java
diff --git a/src/com/webcodepro/shrinkit/ThreadRecord.java b/src/main/java/com/webcodepro/shrinkit/ThreadRecord.java
similarity index 100%
rename from src/com/webcodepro/shrinkit/ThreadRecord.java
rename to src/main/java/com/webcodepro/shrinkit/ThreadRecord.java
diff --git a/src/com/webcodepro/shrinkit/TimeRec.java b/src/main/java/com/webcodepro/shrinkit/TimeRec.java
similarity index 100%
rename from src/com/webcodepro/shrinkit/TimeRec.java
rename to src/main/java/com/webcodepro/shrinkit/TimeRec.java
diff --git a/src/com/webcodepro/shrinkit/Utilities.java b/src/main/java/com/webcodepro/shrinkit/Utilities.java
similarity index 100%
rename from src/com/webcodepro/shrinkit/Utilities.java
rename to src/main/java/com/webcodepro/shrinkit/Utilities.java
diff --git a/src/com/webcodepro/shrinkit/io/BitConstants.java b/src/main/java/com/webcodepro/shrinkit/io/BitConstants.java
similarity index 100%
rename from src/com/webcodepro/shrinkit/io/BitConstants.java
rename to src/main/java/com/webcodepro/shrinkit/io/BitConstants.java
diff --git a/src/com/webcodepro/shrinkit/io/BitInputStream.java b/src/main/java/com/webcodepro/shrinkit/io/BitInputStream.java
similarity index 100%
rename from src/com/webcodepro/shrinkit/io/BitInputStream.java
rename to src/main/java/com/webcodepro/shrinkit/io/BitInputStream.java
diff --git a/src/com/webcodepro/shrinkit/io/BitOutputStream.java b/src/main/java/com/webcodepro/shrinkit/io/BitOutputStream.java
similarity index 100%
rename from src/com/webcodepro/shrinkit/io/BitOutputStream.java
rename to src/main/java/com/webcodepro/shrinkit/io/BitOutputStream.java
diff --git a/src/com/webcodepro/shrinkit/io/ByteConstants.java b/src/main/java/com/webcodepro/shrinkit/io/ByteConstants.java
similarity index 100%
rename from src/com/webcodepro/shrinkit/io/ByteConstants.java
rename to src/main/java/com/webcodepro/shrinkit/io/ByteConstants.java
diff --git a/src/com/webcodepro/shrinkit/io/LittleEndianByteInputStream.java b/src/main/java/com/webcodepro/shrinkit/io/LittleEndianByteInputStream.java
similarity index 100%
rename from src/com/webcodepro/shrinkit/io/LittleEndianByteInputStream.java
rename to src/main/java/com/webcodepro/shrinkit/io/LittleEndianByteInputStream.java
diff --git a/src/com/webcodepro/shrinkit/io/LittleEndianByteOutputStream.java b/src/main/java/com/webcodepro/shrinkit/io/LittleEndianByteOutputStream.java
similarity index 100%
rename from src/com/webcodepro/shrinkit/io/LittleEndianByteOutputStream.java
rename to src/main/java/com/webcodepro/shrinkit/io/LittleEndianByteOutputStream.java
diff --git a/src/com/webcodepro/shrinkit/io/LzwInputStream.java b/src/main/java/com/webcodepro/shrinkit/io/LzwInputStream.java
similarity index 100%
rename from src/com/webcodepro/shrinkit/io/LzwInputStream.java
rename to src/main/java/com/webcodepro/shrinkit/io/LzwInputStream.java
diff --git a/src/com/webcodepro/shrinkit/io/LzwOutputStream.java b/src/main/java/com/webcodepro/shrinkit/io/LzwOutputStream.java
similarity index 100%
rename from src/com/webcodepro/shrinkit/io/LzwOutputStream.java
rename to src/main/java/com/webcodepro/shrinkit/io/LzwOutputStream.java
diff --git a/src/com/webcodepro/shrinkit/io/NufxLzw1InputStream.java b/src/main/java/com/webcodepro/shrinkit/io/NufxLzw1InputStream.java
similarity index 100%
rename from src/com/webcodepro/shrinkit/io/NufxLzw1InputStream.java
rename to src/main/java/com/webcodepro/shrinkit/io/NufxLzw1InputStream.java
diff --git a/src/com/webcodepro/shrinkit/io/NufxLzw2InputStream.java b/src/main/java/com/webcodepro/shrinkit/io/NufxLzw2InputStream.java
similarity index 100%
rename from src/com/webcodepro/shrinkit/io/NufxLzw2InputStream.java
rename to src/main/java/com/webcodepro/shrinkit/io/NufxLzw2InputStream.java
diff --git a/src/com/webcodepro/shrinkit/io/RleInputStream.java b/src/main/java/com/webcodepro/shrinkit/io/RleInputStream.java
similarity index 100%
rename from src/com/webcodepro/shrinkit/io/RleInputStream.java
rename to src/main/java/com/webcodepro/shrinkit/io/RleInputStream.java
diff --git a/src/com/webcodepro/shrinkit/io/RleOutputStream.java b/src/main/java/com/webcodepro/shrinkit/io/RleOutputStream.java
similarity index 100%
rename from src/com/webcodepro/shrinkit/io/RleOutputStream.java
rename to src/main/java/com/webcodepro/shrinkit/io/RleOutputStream.java
diff --git a/test_src/com/webcodepro/shrinkit/CRC16Test.java b/src/test/java/com/webcodepro/shrinkit/CRC16Test.java
similarity index 100%
rename from test_src/com/webcodepro/shrinkit/CRC16Test.java
rename to src/test/java/com/webcodepro/shrinkit/CRC16Test.java
diff --git a/test_src/com/webcodepro/shrinkit/HeaderBlockTest.java b/src/test/java/com/webcodepro/shrinkit/HeaderBlockTest.java
similarity index 100%
rename from test_src/com/webcodepro/shrinkit/HeaderBlockTest.java
rename to src/test/java/com/webcodepro/shrinkit/HeaderBlockTest.java
diff --git a/test_src/com/webcodepro/shrinkit/MasterHeaderBlockTest.java b/src/test/java/com/webcodepro/shrinkit/MasterHeaderBlockTest.java
similarity index 100%
rename from test_src/com/webcodepro/shrinkit/MasterHeaderBlockTest.java
rename to src/test/java/com/webcodepro/shrinkit/MasterHeaderBlockTest.java
diff --git a/test_src/com/webcodepro/shrinkit/ThreadRecordTest.java b/src/test/java/com/webcodepro/shrinkit/ThreadRecordTest.java
similarity index 100%
rename from test_src/com/webcodepro/shrinkit/ThreadRecordTest.java
rename to src/test/java/com/webcodepro/shrinkit/ThreadRecordTest.java
diff --git a/test_src/com/webcodepro/shrinkit/io/BitInputStreamTest.java b/src/test/java/com/webcodepro/shrinkit/io/BitInputStreamTest.java
similarity index 100%
rename from test_src/com/webcodepro/shrinkit/io/BitInputStreamTest.java
rename to src/test/java/com/webcodepro/shrinkit/io/BitInputStreamTest.java
diff --git a/test_src/com/webcodepro/shrinkit/io/BitOutputStreamTest.java b/src/test/java/com/webcodepro/shrinkit/io/BitOutputStreamTest.java
similarity index 100%
rename from test_src/com/webcodepro/shrinkit/io/BitOutputStreamTest.java
rename to src/test/java/com/webcodepro/shrinkit/io/BitOutputStreamTest.java
diff --git a/test_src/com/webcodepro/shrinkit/io/LittleEndianByteInputStreamTest.java b/src/test/java/com/webcodepro/shrinkit/io/LittleEndianByteInputStreamTest.java
similarity index 100%
rename from test_src/com/webcodepro/shrinkit/io/LittleEndianByteInputStreamTest.java
rename to src/test/java/com/webcodepro/shrinkit/io/LittleEndianByteInputStreamTest.java
diff --git a/test_src/com/webcodepro/shrinkit/io/LittleEndianByteOutputStreamTest.java b/src/test/java/com/webcodepro/shrinkit/io/LittleEndianByteOutputStreamTest.java
similarity index 100%
rename from test_src/com/webcodepro/shrinkit/io/LittleEndianByteOutputStreamTest.java
rename to src/test/java/com/webcodepro/shrinkit/io/LittleEndianByteOutputStreamTest.java
diff --git a/test_src/com/webcodepro/shrinkit/io/LzwTest.java b/src/test/java/com/webcodepro/shrinkit/io/LzwTest.java
similarity index 100%
rename from test_src/com/webcodepro/shrinkit/io/LzwTest.java
rename to src/test/java/com/webcodepro/shrinkit/io/LzwTest.java
diff --git a/test_src/com/webcodepro/shrinkit/io/NufxLzw1Test.java b/src/test/java/com/webcodepro/shrinkit/io/NufxLzw1Test.java
similarity index 100%
rename from test_src/com/webcodepro/shrinkit/io/NufxLzw1Test.java
rename to src/test/java/com/webcodepro/shrinkit/io/NufxLzw1Test.java
diff --git a/test_src/com/webcodepro/shrinkit/io/NufxLzwTest.java b/src/test/java/com/webcodepro/shrinkit/io/NufxLzwTest.java
similarity index 67%
rename from test_src/com/webcodepro/shrinkit/io/NufxLzwTest.java
rename to src/test/java/com/webcodepro/shrinkit/io/NufxLzwTest.java
index 88f27c0..de68bfe 100644
--- a/test_src/com/webcodepro/shrinkit/io/NufxLzwTest.java
+++ b/src/test/java/com/webcodepro/shrinkit/io/NufxLzwTest.java
@@ -17,30 +17,30 @@ import com.webcodepro.shrinkit.ThreadRecord;
  */
 public class NufxLzwTest extends TestCaseHelper {
 	public void testNufxLzw1() throws IOException {
-		check("APPLE.II-LZW1.SHK", "APPLE.II", "APPLE.II.txt");
+		check("/APPLE.II-LZW1.SHK", "APPLE.II", "/APPLE.II.txt");
 	}
 	public void testNufxLzw2() throws IOException {
-		check("APPLE.II-LZW2.SHK", "APPLE.II", "APPLE.II.txt");
+		check("/APPLE.II-LZW2.SHK", "APPLE.II", "/APPLE.II.txt");
 	}
 	
 	public void testLargerFilesNufxLzw1() throws IOException {
-		check("PRODOS.MSTR-LZW1.SHK", "SYSUTIL.SYSTEM", "SYSUTIL.SYSTEM.bin");
-		check("PRODOS.MSTR-LZW1.SHK", "UTIL.0", "UTIL.0.bin");
-		check("PRODOS.MSTR-LZW1.SHK", "UTIL.1", "UTIL.1.bin");
-		check("PRODOS.MSTR-LZW1.SHK", "UTIL.2", "UTIL.2.bin");
+		check("/PRODOS.MSTR-LZW1.SHK", "SYSUTIL.SYSTEM", "/SYSUTIL.SYSTEM.bin");
+		check("/PRODOS.MSTR-LZW1.SHK", "UTIL.0", "/UTIL.0.bin");
+		check("/PRODOS.MSTR-LZW1.SHK", "UTIL.1", "/UTIL.1.bin");
+		check("/PRODOS.MSTR-LZW1.SHK", "UTIL.2", "/UTIL.2.bin");
 	}
 	public void testLargerFilesNufxLzw2() throws IOException {
-		check("PRODOS.MSTR-LZW2.SHK", "SYSUTIL.SYSTEM", "SYSUTIL.SYSTEM.bin");
-		check("PRODOS.MSTR-LZW2.SHK", "UTIL.0", "UTIL.0.bin");
-		check("PRODOS.MSTR-LZW2.SHK", "UTIL.1", "UTIL.1.bin");
-		check("PRODOS.MSTR-LZW2.SHK", "UTIL.2", "UTIL.2.bin");
+		check("/PRODOS.MSTR-LZW2.SHK", "SYSUTIL.SYSTEM", "/SYSUTIL.SYSTEM.bin");
+		check("/PRODOS.MSTR-LZW2.SHK", "UTIL.0", "/UTIL.0.bin");
+		check("/PRODOS.MSTR-LZW2.SHK", "UTIL.1", "/UTIL.1.bin");
+		check("/PRODOS.MSTR-LZW2.SHK", "UTIL.2", "/UTIL.2.bin");
 	}
 	
 	public void testUncompressedFiles() throws IOException {
-		check("UNCOMPRESSED.SHK", "APPLE.II-LZW1.SHK", "APPLE.II-LZW1.SHK");
-		check("UNCOMPRESSED.SHK", "APPLE.II-LZW2.SHK", "APPLE.II-LZW2.SHK");
-		check("UNCOMPRESSED.SHK", "PRODOS.MSTR-LZW1.SHK", "PRODOS.MSTR-LZW1.SHK");
-		check("UNCOMPRESSED.SHK", "PRODOS.MSTR-LZW2.SHK", "PRODOS.MSTR-LZW2.SHK");
+		check("/UNCOMPRESSED.SHK", "APPLE.II-LZW1.SHK", "/APPLE.II-LZW1.SHK");
+		check("/UNCOMPRESSED.SHK", "APPLE.II-LZW2.SHK", "/APPLE.II-LZW2.SHK");
+		check("/UNCOMPRESSED.SHK", "PRODOS.MSTR-LZW1.SHK", "/PRODOS.MSTR-LZW1.SHK");
+		check("/UNCOMPRESSED.SHK", "PRODOS.MSTR-LZW2.SHK", "/PRODOS.MSTR-LZW2.SHK");
 	}
 	
 	/**
diff --git a/test_src/com/webcodepro/shrinkit/io/RleTest.java b/src/test/java/com/webcodepro/shrinkit/io/RleTest.java
similarity index 100%
rename from test_src/com/webcodepro/shrinkit/io/RleTest.java
rename to src/test/java/com/webcodepro/shrinkit/io/RleTest.java
diff --git a/test_src/com/webcodepro/shrinkit/io/TestCaseHelper.java b/src/test/java/com/webcodepro/shrinkit/io/TestCaseHelper.java
similarity index 100%
rename from test_src/com/webcodepro/shrinkit/io/TestCaseHelper.java
rename to src/test/java/com/webcodepro/shrinkit/io/TestCaseHelper.java
diff --git a/test_src/com/webcodepro/shrinkit/io/APPLE.II-LZW1.SHK b/src/test/resources/APPLE.II-LZW1.SHK
similarity index 100%
rename from test_src/com/webcodepro/shrinkit/io/APPLE.II-LZW1.SHK
rename to src/test/resources/APPLE.II-LZW1.SHK
diff --git a/test_src/com/webcodepro/shrinkit/io/APPLE.II-LZW2.SHK b/src/test/resources/APPLE.II-LZW2.SHK
similarity index 100%
rename from test_src/com/webcodepro/shrinkit/io/APPLE.II-LZW2.SHK
rename to src/test/resources/APPLE.II-LZW2.SHK
diff --git a/test_src/com/webcodepro/shrinkit/io/APPLE.II.txt b/src/test/resources/APPLE.II.txt
similarity index 100%
rename from test_src/com/webcodepro/shrinkit/io/APPLE.II.txt
rename to src/test/resources/APPLE.II.txt
diff --git a/test_src/com/webcodepro/shrinkit/io/HGR.COLORS-thread-sample.bin b/src/test/resources/HGR.COLORS-thread-sample.bin
similarity index 100%
rename from test_src/com/webcodepro/shrinkit/io/HGR.COLORS-thread-sample.bin
rename to src/test/resources/HGR.COLORS-thread-sample.bin
diff --git a/test_src/com/webcodepro/shrinkit/io/PRODOS.MSTR-LZW1.SHK b/src/test/resources/PRODOS.MSTR-LZW1.SHK
similarity index 100%
rename from test_src/com/webcodepro/shrinkit/io/PRODOS.MSTR-LZW1.SHK
rename to src/test/resources/PRODOS.MSTR-LZW1.SHK
diff --git a/test_src/com/webcodepro/shrinkit/io/PRODOS.MSTR-LZW2.SHK b/src/test/resources/PRODOS.MSTR-LZW2.SHK
similarity index 100%
rename from test_src/com/webcodepro/shrinkit/io/PRODOS.MSTR-LZW2.SHK
rename to src/test/resources/PRODOS.MSTR-LZW2.SHK
diff --git a/test_src/com/webcodepro/shrinkit/io/SYSUTIL.SYSTEM.bin b/src/test/resources/SYSUTIL.SYSTEM.bin
similarity index 100%
rename from test_src/com/webcodepro/shrinkit/io/SYSUTIL.SYSTEM.bin
rename to src/test/resources/SYSUTIL.SYSTEM.bin
diff --git a/test_src/com/webcodepro/shrinkit/io/UNCOMPRESSED.SHK b/src/test/resources/UNCOMPRESSED.SHK
similarity index 100%
rename from test_src/com/webcodepro/shrinkit/io/UNCOMPRESSED.SHK
rename to src/test/resources/UNCOMPRESSED.SHK
diff --git a/test_src/com/webcodepro/shrinkit/io/UTIL.0.bin b/src/test/resources/UTIL.0.bin
similarity index 100%
rename from test_src/com/webcodepro/shrinkit/io/UTIL.0.bin
rename to src/test/resources/UTIL.0.bin
diff --git a/test_src/com/webcodepro/shrinkit/io/UTIL.1.bin b/src/test/resources/UTIL.1.bin
similarity index 100%
rename from test_src/com/webcodepro/shrinkit/io/UTIL.1.bin
rename to src/test/resources/UTIL.1.bin
diff --git a/test_src/com/webcodepro/shrinkit/io/UTIL.2.bin b/src/test/resources/UTIL.2.bin
similarity index 100%
rename from test_src/com/webcodepro/shrinkit/io/UTIL.2.bin
rename to src/test/resources/UTIL.2.bin