diff --git a/.classpath b/.classpath
deleted file mode 100644
index e819e57..0000000
--- a/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="var" path="SWT_JAR"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/ANT_JAR"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/.gitignore b/.gitignore
index 6fe9cfa..b234c5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,9 +12,12 @@ TODO.local
 work
 TestImage.*
 **/Thumbs.db
-.settings/org.eclipse.jdt.ui.prefs
-.settings/org.eclipse.jdt.core.prefs
 build/ACBuild.properties
 build/AppleCommander.preferences
 *.o
 *.lst
+.classpath
+.project
+.settings
+.gradle
+/build/
diff --git a/.project b/.project
deleted file mode 100644
index 45ade22..0000000
--- a/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>AppleCommander</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.ibm.sse.model.structuredbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 7c991fe..0000000
--- a/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Jul 11 09:14:44 CDT 2004
-eclipse.preferences.version=1
-encoding//src/com/webcodepro/applecommander/storage/StorageBundle.properties=8859_1
-encoding//src/com/webcodepro/applecommander/compiler/CompilerBundle.properties=8859_1
diff --git a/DEVELOPER.md b/DEVELOPER.md
new file mode 100644
index 0000000..4b8d512
--- /dev/null
+++ b/DEVELOPER.md
@@ -0,0 +1,29 @@
+# Developer Notes
+
+AppleCommander has switched to using [Gradle](https://gradle.org/) for build and build dependencies.
+
+## Tests
+
+> Note that test currently fail due to dependencies on disk images not present in the repository.
+
+```
+$ ./gradlew test
+```
+
+## Building
+
+```
+$ ./gradlew assemble
+
+BUILD SUCCESSFUL in 2s
+6 actionable tasks: 6 executed
+```
+
+This will create the `build` directory and populate with an uber-jar.
+
+To launch AppleCommander, use the following:
+
+* Mac OS X:
+  `java -XstartOnFirstThread -jar build/libs/AppleCommander.jar`
+
+The build is currently only setup for Mac OS X. 
diff --git a/NATIVE-COMPILE b/NATIVE-COMPILE
deleted file mode 100644
index 2dc4c4c..0000000
--- a/NATIVE-COMPILE
+++ /dev/null
@@ -1,85 +0,0 @@
-
-*********************
-**     LINUX       **
-*********************
-
-See build/build-applecommander-linux-gtk for the script which builds
-an executable of AppleCommander.  The build/build-swt-linux-gtk script
-builds the SWT swt.so file.
-
-
-**********************
-**     WINDOWS      **
-**********************
-
-Building AppleCommander for Windows using MinGW (2.0.3 with GCJ update to 3.3).
-See build/build-applecommander-mingw for the current script.
-
-1.  Export to the filesystem AppleCommander/src/com directory tree into the build
-    directory.
-
-2.  Using MinGW, date related support classes are not compiled in.  This is a known
-    issue and there is a suggested work-around posted here:
-        http://gcc.gnu.org/ml/java/2002-04/msg00180.html
-    Basically, force a reference to the classes which cause the error - the problem
-    lies in classes loaded by reflection, so this forces these classes to be
-    compiled in.  The suggested prelude is:
-        // static references to these classes ensure that the linker will include them
-        private static Class c1 = gnu.java.locale.Calendar.class;
-        private static Class c2 = java.util.GregorianCalendar.class;
-        private static Class c3 = gnu.gcj.convert.Input_ASCII.class;
-        private static Class c4 = gnu.gcj.convert.Input_UTF8.class;
-        private static Class c5 = gnu.gcj.convert.Input_8859_1.class;
-        private static Class c6 = gnu.java.locale.LocaleInformation.class;
-        private static Class c7 = gnu.gcj.convert.Output_ASCII.class;
-    Presumably, this is just needed in one class - probably the class which contains
-    the main method.  I am currently pasting this into AppleCommander.java itself.
-    A better solution would be to do this automatically...
-
-3.  Place a copy of the AppleCommander JAR file in the build directory - name it
-    AppleCommander.jar.
-    
-4.  Copy swt.jar, libswt.a, and swt-win32-*.dll into the build directory.
-    (Check at http://www.thisiscool.com/gcc_mingw.htm and grab a copy.)
-
-5.  Ensure that UPX is on the path.  You will need to set this manually.
-    I placed UPX in C:\UPX - so I use the following command:
-    	export PATH=$PATH:/c/UPX
-
-5.  Run build-applecommander-mingw script from MinGW in the build directory.
-
-6.  Distribution consists of smallest executable plus the SWT DLL file.
-
-
-*************************
-** MISCELLANEOUS NOTES **
-*************************
-
-Update #1:
-    GraphicsFilter was reengineered to accomodate GCJ.  GCJ is not quite JDK 1.4 compliant
-    and is obviously not a SUN JDK.  The image creation and saving responsibility was moved
-    into subclasses of AppleImage.  AppleImage itself functions as a factory and tries to
-    instantiate possible AppleImage classes via Reflection - this allows code to be compiled
-    without patching the code.  When building with GCJ, the AppleImage classes that do not
-    apply are simply not compiled nor linked into the executable. 
-
-Update #2:
-    Resources can be compiled/attached to a specific Java class.  AppleCommander has
-    a number of resources that should be built into the exe class.  This simplifies
-    the distribution to be the AppleCommander executable and the SWT support DLL.
-    See the AppleCommander build script for details.
-
-Update #3:
-    UPX is a very good compression tool for executables.  It should be standard practice 
-    (and part of the automated build process) to run the final EXE and DLL files through 
-    UPX to ensure a small filesize.  This has been incorporated into the AppleCommander
-    build script but you may want to review how it is built in as detection can be funky.
-
-Update #4:
-    There are speed issues with the compiled version of AppleCommander which appear to
-    be releated to GCJ 3.2 but do not show up in GCJ 3.3.  The speed issues do not
-    appear to be present when run as a normal Java/SWT application.  I am unclear what
-    the issue was, but the current assumption is that a bug or optimization to GCJ 3.3
-    was introduced.  Additional note - this version of GCJ 3.3 also is packaged with 
-    SWT 2052 which is a few point releases higher than other versions of SWT, so it also
-    may be SWT releated.
diff --git a/TODO b/TODO
index eb12861..f322d69 100644
--- a/TODO
+++ b/TODO
@@ -2,7 +2,9 @@ THINGS TO DO
 ============
 This is the internal list of items that need to be done.
 
--- 1.3.5 -- 
+-- 1.3.5 --
+* Migration to GitHub
+* Update SWT libraries 
 
 --- FUTURE ---
 o Add binaries to repository to simplify AC development and builds
diff --git a/build/ACBuild-default.properties b/ant-build/ACBuild-default.properties
similarity index 100%
rename from build/ACBuild-default.properties
rename to ant-build/ACBuild-default.properties
diff --git a/build/AppleCommander-boot.s b/ant-build/AppleCommander-boot.s
similarity index 100%
rename from build/AppleCommander-boot.s
rename to ant-build/AppleCommander-boot.s
diff --git a/build/README-Windows.txt b/ant-build/README-Windows.txt
similarity index 100%
rename from build/README-Windows.txt
rename to ant-build/README-Windows.txt
diff --git a/build/README-bundle.txt b/ant-build/README-bundle.txt
similarity index 100%
rename from build/README-bundle.txt
rename to ant-build/README-bundle.txt
diff --git a/build/README-linux-gtk b/ant-build/README-linux-gtk
similarity index 100%
rename from build/README-linux-gtk
rename to ant-build/README-linux-gtk
diff --git a/build/ac.mf b/ant-build/ac.mf
similarity index 100%
rename from build/ac.mf
rename to ant-build/ac.mf
diff --git a/build/build-applecommander-linux-gtk b/ant-build/build-applecommander-linux-gtk
similarity index 100%
rename from build/build-applecommander-linux-gtk
rename to ant-build/build-applecommander-linux-gtk
diff --git a/build/build-applecommander-mingw b/ant-build/build-applecommander-mingw
similarity index 100%
rename from build/build-applecommander-mingw
rename to ant-build/build-applecommander-mingw
diff --git a/build/build-swt-from-java-source b/ant-build/build-swt-from-java-source
similarity index 100%
rename from build/build-swt-from-java-source
rename to ant-build/build-swt-from-java-source
diff --git a/build/build-swt-linux-gtk b/ant-build/build-swt-linux-gtk
similarity index 100%
rename from build/build-swt-linux-gtk
rename to ant-build/build-swt-linux-gtk
diff --git a/build/build-testacant.xml b/ant-build/build-testacant.xml
similarity index 100%
rename from build/build-testacant.xml
rename to ant-build/build-testacant.xml
diff --git a/build/build.xml b/ant-build/build.xml
similarity index 100%
rename from build/build.xml
rename to ant-build/build.xml
diff --git a/build/bundle-pom.xml b/ant-build/bundle-pom.xml
similarity index 100%
rename from build/bundle-pom.xml
rename to ant-build/bundle-pom.xml
diff --git a/build/manifest.mf b/ant-build/manifest.mf
similarity index 100%
rename from build/manifest.mf
rename to ant-build/manifest.mf
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..1f73b6d
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,34 @@
+
+// Apply the java plugin to add support for Java
+apply plugin: 'java'
+
+// Apply the application plugin to add support for building an application
+apply plugin: 'application'
+
+// Define the main class for the application
+mainClassName = 'com.webcodepro.applecommander.ui.AppleCommander'
+
+// In this section you declare where to find the dependencies of your project
+repositories {
+    mavenCentral()
+    maven {
+        url "http://maven-eclipse.github.io/maven"
+    }
+}
+
+dependencies {
+    compile "org.eclipse.swt:org.eclipse.swt.cocoa.macosx.x86_64:$swtVersion"
+    
+    compileOnly "org.apache.ant:ant:$antVersion"
+
+    testCompile "junit:junit:$junitVersion"
+}
+
+jar {
+    manifest {
+        attributes 'Main-Class': "$mainClassName"
+    } 
+    doFirst {
+        from { configurations.runtime.collect { it.isDirectory() ? it : zipTree(it) } }
+    }
+}
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..28231a8
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,5 @@
+
+swtVersion = 4.6.1
+junitVersion = 4.12
+antVersion = 1.8.2
+
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..6b6ea3a
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..0e680f3
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip
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/init.gradle b/init.gradle
new file mode 100644
index 0000000..f99a85c
--- /dev/null
+++ b/init.gradle
@@ -0,0 +1,18 @@
+/*
+ * This settings file was generated by the Gradle 'init' task.
+ *
+ * The settings file is used to specify which projects to include in your build.
+ * In a single project build this file can be empty or even removed.
+ *
+ * Detailed information about configuring a multi-project build in Gradle can be found
+ * in the user guide at https://docs.gradle.org/4.3.1/userguide/multi_project_builds.html
+ */
+
+/*
+// To declare projects as part of a multi-project build use the 'include' method
+include 'shared'
+include 'api'
+include 'services:webservice'
+*/
+
+rootProject.name = 'AppleCommander'
diff --git a/src/com/webcodepro/applecommander/compiler/ApplesoftCompiler.java b/src/main/java/com/webcodepro/applecommander/compiler/ApplesoftCompiler.java
similarity index 100%
rename from src/com/webcodepro/applecommander/compiler/ApplesoftCompiler.java
rename to src/main/java/com/webcodepro/applecommander/compiler/ApplesoftCompiler.java
diff --git a/src/com/webcodepro/applecommander/compiler/CompileException.java b/src/main/java/com/webcodepro/applecommander/compiler/CompileException.java
similarity index 100%
rename from src/com/webcodepro/applecommander/compiler/CompileException.java
rename to src/main/java/com/webcodepro/applecommander/compiler/CompileException.java
diff --git a/src/com/webcodepro/applecommander/compiler/CompilerBundle.java b/src/main/java/com/webcodepro/applecommander/compiler/CompilerBundle.java
similarity index 100%
rename from src/com/webcodepro/applecommander/compiler/CompilerBundle.java
rename to src/main/java/com/webcodepro/applecommander/compiler/CompilerBundle.java
diff --git a/src/com/webcodepro/applecommander/compiler/Variable.java b/src/main/java/com/webcodepro/applecommander/compiler/Variable.java
similarity index 100%
rename from src/com/webcodepro/applecommander/compiler/Variable.java
rename to src/main/java/com/webcodepro/applecommander/compiler/Variable.java
diff --git a/src/com/webcodepro/applecommander/storage/DirectoryEntry.java b/src/main/java/com/webcodepro/applecommander/storage/DirectoryEntry.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/DirectoryEntry.java
rename to src/main/java/com/webcodepro/applecommander/storage/DirectoryEntry.java
diff --git a/src/com/webcodepro/applecommander/storage/Disk.java b/src/main/java/com/webcodepro/applecommander/storage/Disk.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/Disk.java
rename to src/main/java/com/webcodepro/applecommander/storage/Disk.java
diff --git a/src/com/webcodepro/applecommander/storage/DiskFullException.java b/src/main/java/com/webcodepro/applecommander/storage/DiskFullException.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/DiskFullException.java
rename to src/main/java/com/webcodepro/applecommander/storage/DiskFullException.java
diff --git a/src/com/webcodepro/applecommander/storage/FileEntry.java b/src/main/java/com/webcodepro/applecommander/storage/FileEntry.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/FileEntry.java
rename to src/main/java/com/webcodepro/applecommander/storage/FileEntry.java
diff --git a/src/com/webcodepro/applecommander/storage/FileEntryComparator.java b/src/main/java/com/webcodepro/applecommander/storage/FileEntryComparator.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/FileEntryComparator.java
rename to src/main/java/com/webcodepro/applecommander/storage/FileEntryComparator.java
diff --git a/src/com/webcodepro/applecommander/storage/FileFilter.java b/src/main/java/com/webcodepro/applecommander/storage/FileFilter.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/FileFilter.java
rename to src/main/java/com/webcodepro/applecommander/storage/FileFilter.java
diff --git a/src/com/webcodepro/applecommander/storage/FormattedDisk.java b/src/main/java/com/webcodepro/applecommander/storage/FormattedDisk.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/FormattedDisk.java
rename to src/main/java/com/webcodepro/applecommander/storage/FormattedDisk.java
diff --git a/src/com/webcodepro/applecommander/storage/StorageBundle.java b/src/main/java/com/webcodepro/applecommander/storage/StorageBundle.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/StorageBundle.java
rename to src/main/java/com/webcodepro/applecommander/storage/StorageBundle.java
diff --git a/src/com/webcodepro/applecommander/storage/filters/AppleWorksDataBaseFileFilter.java b/src/main/java/com/webcodepro/applecommander/storage/filters/AppleWorksDataBaseFileFilter.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/filters/AppleWorksDataBaseFileFilter.java
rename to src/main/java/com/webcodepro/applecommander/storage/filters/AppleWorksDataBaseFileFilter.java
diff --git a/src/com/webcodepro/applecommander/storage/filters/AppleWorksSpreadSheetFileFilter.java b/src/main/java/com/webcodepro/applecommander/storage/filters/AppleWorksSpreadSheetFileFilter.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/filters/AppleWorksSpreadSheetFileFilter.java
rename to src/main/java/com/webcodepro/applecommander/storage/filters/AppleWorksSpreadSheetFileFilter.java
diff --git a/src/com/webcodepro/applecommander/storage/filters/AppleWorksWordProcessorFileFilter.java b/src/main/java/com/webcodepro/applecommander/storage/filters/AppleWorksWordProcessorFileFilter.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/filters/AppleWorksWordProcessorFileFilter.java
rename to src/main/java/com/webcodepro/applecommander/storage/filters/AppleWorksWordProcessorFileFilter.java
diff --git a/src/com/webcodepro/applecommander/storage/filters/ApplesoftFileFilter.java b/src/main/java/com/webcodepro/applecommander/storage/filters/ApplesoftFileFilter.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/filters/ApplesoftFileFilter.java
rename to src/main/java/com/webcodepro/applecommander/storage/filters/ApplesoftFileFilter.java
diff --git a/src/com/webcodepro/applecommander/storage/filters/AssemblySourceFileFilter.java b/src/main/java/com/webcodepro/applecommander/storage/filters/AssemblySourceFileFilter.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/filters/AssemblySourceFileFilter.java
rename to src/main/java/com/webcodepro/applecommander/storage/filters/AssemblySourceFileFilter.java
diff --git a/src/com/webcodepro/applecommander/storage/filters/BinaryFileFilter.java b/src/main/java/com/webcodepro/applecommander/storage/filters/BinaryFileFilter.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/filters/BinaryFileFilter.java
rename to src/main/java/com/webcodepro/applecommander/storage/filters/BinaryFileFilter.java
diff --git a/src/com/webcodepro/applecommander/storage/filters/BusinessBASICFileFilter.java b/src/main/java/com/webcodepro/applecommander/storage/filters/BusinessBASICFileFilter.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/filters/BusinessBASICFileFilter.java
rename to src/main/java/com/webcodepro/applecommander/storage/filters/BusinessBASICFileFilter.java
diff --git a/src/com/webcodepro/applecommander/storage/filters/GraphicsFileFilter.java b/src/main/java/com/webcodepro/applecommander/storage/filters/GraphicsFileFilter.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/filters/GraphicsFileFilter.java
rename to src/main/java/com/webcodepro/applecommander/storage/filters/GraphicsFileFilter.java
diff --git a/src/com/webcodepro/applecommander/storage/filters/GutenbergFileFilter.java b/src/main/java/com/webcodepro/applecommander/storage/filters/GutenbergFileFilter.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/filters/GutenbergFileFilter.java
rename to src/main/java/com/webcodepro/applecommander/storage/filters/GutenbergFileFilter.java
diff --git a/src/com/webcodepro/applecommander/storage/filters/HexDumpFileFilter.java b/src/main/java/com/webcodepro/applecommander/storage/filters/HexDumpFileFilter.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/filters/HexDumpFileFilter.java
rename to src/main/java/com/webcodepro/applecommander/storage/filters/HexDumpFileFilter.java
diff --git a/src/com/webcodepro/applecommander/storage/filters/IntegerBasicFileFilter.java b/src/main/java/com/webcodepro/applecommander/storage/filters/IntegerBasicFileFilter.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/filters/IntegerBasicFileFilter.java
rename to src/main/java/com/webcodepro/applecommander/storage/filters/IntegerBasicFileFilter.java
diff --git a/src/com/webcodepro/applecommander/storage/filters/PascalTextFileFilter.java b/src/main/java/com/webcodepro/applecommander/storage/filters/PascalTextFileFilter.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/filters/PascalTextFileFilter.java
rename to src/main/java/com/webcodepro/applecommander/storage/filters/PascalTextFileFilter.java
diff --git a/src/com/webcodepro/applecommander/storage/filters/TextFileFilter.java b/src/main/java/com/webcodepro/applecommander/storage/filters/TextFileFilter.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/filters/TextFileFilter.java
rename to src/main/java/com/webcodepro/applecommander/storage/filters/TextFileFilter.java
diff --git a/src/com/webcodepro/applecommander/storage/filters/imagehandlers/AppleImage.java b/src/main/java/com/webcodepro/applecommander/storage/filters/imagehandlers/AppleImage.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/filters/imagehandlers/AppleImage.java
rename to src/main/java/com/webcodepro/applecommander/storage/filters/imagehandlers/AppleImage.java
diff --git a/src/com/webcodepro/applecommander/storage/filters/imagehandlers/ImageIoImage.java b/src/main/java/com/webcodepro/applecommander/storage/filters/imagehandlers/ImageIoImage.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/filters/imagehandlers/ImageIoImage.java
rename to src/main/java/com/webcodepro/applecommander/storage/filters/imagehandlers/ImageIoImage.java
diff --git a/src/com/webcodepro/applecommander/storage/filters/imagehandlers/SunJpegImage.java b/src/main/java/com/webcodepro/applecommander/storage/filters/imagehandlers/SunJpegImage.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/filters/imagehandlers/SunJpegImage.java
rename to src/main/java/com/webcodepro/applecommander/storage/filters/imagehandlers/SunJpegImage.java
diff --git a/src/com/webcodepro/applecommander/storage/filters/imagehandlers/SwtImage.java b/src/main/java/com/webcodepro/applecommander/storage/filters/imagehandlers/SwtImage.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/filters/imagehandlers/SwtImage.java
rename to src/main/java/com/webcodepro/applecommander/storage/filters/imagehandlers/SwtImage.java
diff --git a/src/com/webcodepro/applecommander/storage/os/cpm/CpmFileEntry.java b/src/main/java/com/webcodepro/applecommander/storage/os/cpm/CpmFileEntry.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/os/cpm/CpmFileEntry.java
rename to src/main/java/com/webcodepro/applecommander/storage/os/cpm/CpmFileEntry.java
diff --git a/src/com/webcodepro/applecommander/storage/os/cpm/CpmFormatDisk.java b/src/main/java/com/webcodepro/applecommander/storage/os/cpm/CpmFormatDisk.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/os/cpm/CpmFormatDisk.java
rename to src/main/java/com/webcodepro/applecommander/storage/os/cpm/CpmFormatDisk.java
diff --git a/src/com/webcodepro/applecommander/storage/os/dos33/DosFileEntry.java b/src/main/java/com/webcodepro/applecommander/storage/os/dos33/DosFileEntry.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/os/dos33/DosFileEntry.java
rename to src/main/java/com/webcodepro/applecommander/storage/os/dos33/DosFileEntry.java
diff --git a/src/com/webcodepro/applecommander/storage/os/dos33/DosFormatDisk.java b/src/main/java/com/webcodepro/applecommander/storage/os/dos33/DosFormatDisk.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/os/dos33/DosFormatDisk.java
rename to src/main/java/com/webcodepro/applecommander/storage/os/dos33/DosFormatDisk.java
diff --git a/src/com/webcodepro/applecommander/storage/os/dos33/OzDosFormatDisk.java b/src/main/java/com/webcodepro/applecommander/storage/os/dos33/OzDosFormatDisk.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/os/dos33/OzDosFormatDisk.java
rename to src/main/java/com/webcodepro/applecommander/storage/os/dos33/OzDosFormatDisk.java
diff --git a/src/com/webcodepro/applecommander/storage/os/dos33/UniDosFormatDisk.java b/src/main/java/com/webcodepro/applecommander/storage/os/dos33/UniDosFormatDisk.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/os/dos33/UniDosFormatDisk.java
rename to src/main/java/com/webcodepro/applecommander/storage/os/dos33/UniDosFormatDisk.java
diff --git a/src/com/webcodepro/applecommander/storage/os/gutenberg/GutenbergFileEntry.java b/src/main/java/com/webcodepro/applecommander/storage/os/gutenberg/GutenbergFileEntry.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/os/gutenberg/GutenbergFileEntry.java
rename to src/main/java/com/webcodepro/applecommander/storage/os/gutenberg/GutenbergFileEntry.java
diff --git a/src/com/webcodepro/applecommander/storage/os/gutenberg/GutenbergFormatDisk.java b/src/main/java/com/webcodepro/applecommander/storage/os/gutenberg/GutenbergFormatDisk.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/os/gutenberg/GutenbergFormatDisk.java
rename to src/main/java/com/webcodepro/applecommander/storage/os/gutenberg/GutenbergFormatDisk.java
diff --git a/src/com/webcodepro/applecommander/storage/os/nakedos/NakedosFileEntry.java b/src/main/java/com/webcodepro/applecommander/storage/os/nakedos/NakedosFileEntry.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/os/nakedos/NakedosFileEntry.java
rename to src/main/java/com/webcodepro/applecommander/storage/os/nakedos/NakedosFileEntry.java
diff --git a/src/com/webcodepro/applecommander/storage/os/nakedos/NakedosFormatDisk.java b/src/main/java/com/webcodepro/applecommander/storage/os/nakedos/NakedosFormatDisk.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/os/nakedos/NakedosFormatDisk.java
rename to src/main/java/com/webcodepro/applecommander/storage/os/nakedos/NakedosFormatDisk.java
diff --git a/src/com/webcodepro/applecommander/storage/os/pascal/PascalFileEntry.java b/src/main/java/com/webcodepro/applecommander/storage/os/pascal/PascalFileEntry.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/os/pascal/PascalFileEntry.java
rename to src/main/java/com/webcodepro/applecommander/storage/os/pascal/PascalFileEntry.java
diff --git a/src/com/webcodepro/applecommander/storage/os/pascal/PascalFormatDisk.java b/src/main/java/com/webcodepro/applecommander/storage/os/pascal/PascalFormatDisk.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/os/pascal/PascalFormatDisk.java
rename to src/main/java/com/webcodepro/applecommander/storage/os/pascal/PascalFormatDisk.java
diff --git a/src/com/webcodepro/applecommander/storage/os/prodos/ProdosCommonDirectoryHeader.java b/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosCommonDirectoryHeader.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/os/prodos/ProdosCommonDirectoryHeader.java
rename to src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosCommonDirectoryHeader.java
diff --git a/src/com/webcodepro/applecommander/storage/os/prodos/ProdosCommonEntry.java b/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosCommonEntry.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/os/prodos/ProdosCommonEntry.java
rename to src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosCommonEntry.java
diff --git a/src/com/webcodepro/applecommander/storage/os/prodos/ProdosDirectoryEntry.java b/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosDirectoryEntry.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/os/prodos/ProdosDirectoryEntry.java
rename to src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosDirectoryEntry.java
diff --git a/src/com/webcodepro/applecommander/storage/os/prodos/ProdosDiskSizeDoesNotMatchException.java b/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosDiskSizeDoesNotMatchException.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/os/prodos/ProdosDiskSizeDoesNotMatchException.java
rename to src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosDiskSizeDoesNotMatchException.java
diff --git a/src/com/webcodepro/applecommander/storage/os/prodos/ProdosFileEntry.java b/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosFileEntry.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/os/prodos/ProdosFileEntry.java
rename to src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosFileEntry.java
diff --git a/src/com/webcodepro/applecommander/storage/os/prodos/ProdosFormatDisk.java b/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosFormatDisk.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/os/prodos/ProdosFormatDisk.java
rename to src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosFormatDisk.java
diff --git a/src/com/webcodepro/applecommander/storage/os/prodos/ProdosSubdirectoryHeader.java b/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosSubdirectoryHeader.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/os/prodos/ProdosSubdirectoryHeader.java
rename to src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosSubdirectoryHeader.java
diff --git a/src/com/webcodepro/applecommander/storage/os/prodos/ProdosVolumeDirectoryHeader.java b/src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosVolumeDirectoryHeader.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/os/prodos/ProdosVolumeDirectoryHeader.java
rename to src/main/java/com/webcodepro/applecommander/storage/os/prodos/ProdosVolumeDirectoryHeader.java
diff --git a/src/com/webcodepro/applecommander/storage/os/rdos/RdosFileEntry.java b/src/main/java/com/webcodepro/applecommander/storage/os/rdos/RdosFileEntry.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/os/rdos/RdosFileEntry.java
rename to src/main/java/com/webcodepro/applecommander/storage/os/rdos/RdosFileEntry.java
diff --git a/src/com/webcodepro/applecommander/storage/os/rdos/RdosFormatDisk.java b/src/main/java/com/webcodepro/applecommander/storage/os/rdos/RdosFormatDisk.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/os/rdos/RdosFormatDisk.java
rename to src/main/java/com/webcodepro/applecommander/storage/os/rdos/RdosFormatDisk.java
diff --git a/src/com/webcodepro/applecommander/storage/physical/ByteArrayImageLayout.java b/src/main/java/com/webcodepro/applecommander/storage/physical/ByteArrayImageLayout.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/physical/ByteArrayImageLayout.java
rename to src/main/java/com/webcodepro/applecommander/storage/physical/ByteArrayImageLayout.java
diff --git a/src/com/webcodepro/applecommander/storage/physical/DosOrder.java b/src/main/java/com/webcodepro/applecommander/storage/physical/DosOrder.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/physical/DosOrder.java
rename to src/main/java/com/webcodepro/applecommander/storage/physical/DosOrder.java
diff --git a/src/com/webcodepro/applecommander/storage/physical/ImageOrder.java b/src/main/java/com/webcodepro/applecommander/storage/physical/ImageOrder.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/physical/ImageOrder.java
rename to src/main/java/com/webcodepro/applecommander/storage/physical/ImageOrder.java
diff --git a/src/com/webcodepro/applecommander/storage/physical/NibbleOrder.java b/src/main/java/com/webcodepro/applecommander/storage/physical/NibbleOrder.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/physical/NibbleOrder.java
rename to src/main/java/com/webcodepro/applecommander/storage/physical/NibbleOrder.java
diff --git a/src/com/webcodepro/applecommander/storage/physical/ProdosOrder.java b/src/main/java/com/webcodepro/applecommander/storage/physical/ProdosOrder.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/physical/ProdosOrder.java
rename to src/main/java/com/webcodepro/applecommander/storage/physical/ProdosOrder.java
diff --git a/src/com/webcodepro/applecommander/storage/physical/UniversalDiskImageLayout.java b/src/main/java/com/webcodepro/applecommander/storage/physical/UniversalDiskImageLayout.java
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/physical/UniversalDiskImageLayout.java
rename to src/main/java/com/webcodepro/applecommander/storage/physical/UniversalDiskImageLayout.java
diff --git a/src/com/webcodepro/applecommander/ui/AntTask.java b/src/main/java/com/webcodepro/applecommander/ui/AntTask.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/AntTask.java
rename to src/main/java/com/webcodepro/applecommander/ui/AntTask.java
diff --git a/src/com/webcodepro/applecommander/ui/AppleCommander.java b/src/main/java/com/webcodepro/applecommander/ui/AppleCommander.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/AppleCommander.java
rename to src/main/java/com/webcodepro/applecommander/ui/AppleCommander.java
diff --git a/src/com/webcodepro/applecommander/ui/ImportSpecification.java b/src/main/java/com/webcodepro/applecommander/ui/ImportSpecification.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/ImportSpecification.java
rename to src/main/java/com/webcodepro/applecommander/ui/ImportSpecification.java
diff --git a/src/com/webcodepro/applecommander/ui/UiBundle.java b/src/main/java/com/webcodepro/applecommander/ui/UiBundle.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/UiBundle.java
rename to src/main/java/com/webcodepro/applecommander/ui/UiBundle.java
diff --git a/src/com/webcodepro/applecommander/ui/UserPreferences.java b/src/main/java/com/webcodepro/applecommander/ui/UserPreferences.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/UserPreferences.java
rename to src/main/java/com/webcodepro/applecommander/ui/UserPreferences.java
diff --git a/src/com/webcodepro/applecommander/ui/ac.java b/src/main/java/com/webcodepro/applecommander/ui/ac.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/ac.java
rename to src/main/java/com/webcodepro/applecommander/ui/ac.java
diff --git a/src/com/webcodepro/applecommander/ui/swing/DiskExplorer.java b/src/main/java/com/webcodepro/applecommander/ui/swing/DiskExplorer.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swing/DiskExplorer.java
rename to src/main/java/com/webcodepro/applecommander/ui/swing/DiskExplorer.java
diff --git a/src/com/webcodepro/applecommander/ui/swing/EmulatorFileFilter.java b/src/main/java/com/webcodepro/applecommander/ui/swing/EmulatorFileFilter.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swing/EmulatorFileFilter.java
rename to src/main/java/com/webcodepro/applecommander/ui/swing/EmulatorFileFilter.java
diff --git a/src/com/webcodepro/applecommander/ui/swing/SwingAppleCommander.java b/src/main/java/com/webcodepro/applecommander/ui/swing/SwingAppleCommander.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swing/SwingAppleCommander.java
rename to src/main/java/com/webcodepro/applecommander/ui/swing/SwingAppleCommander.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/DiskExplorerTab.java b/src/main/java/com/webcodepro/applecommander/ui/swt/DiskExplorerTab.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/DiskExplorerTab.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/DiskExplorerTab.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/DiskInfoTab.java b/src/main/java/com/webcodepro/applecommander/ui/swt/DiskInfoTab.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/DiskInfoTab.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/DiskInfoTab.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/DiskMapTab.java b/src/main/java/com/webcodepro/applecommander/ui/swt/DiskMapTab.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/DiskMapTab.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/DiskMapTab.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/DiskWindow.java b/src/main/java/com/webcodepro/applecommander/ui/swt/DiskWindow.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/DiskWindow.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/DiskWindow.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/FileViewerWindow.java b/src/main/java/com/webcodepro/applecommander/ui/swt/FileViewerWindow.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/FileViewerWindow.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/FileViewerWindow.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/SwtAppleCommander.java b/src/main/java/com/webcodepro/applecommander/ui/swt/SwtAppleCommander.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/SwtAppleCommander.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/SwtAppleCommander.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/filteradapter/ApplesoftFilterAdapter.java b/src/main/java/com/webcodepro/applecommander/ui/swt/filteradapter/ApplesoftFilterAdapter.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/filteradapter/ApplesoftFilterAdapter.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/filteradapter/ApplesoftFilterAdapter.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/filteradapter/BusinessBASICFilterAdapter.java b/src/main/java/com/webcodepro/applecommander/ui/swt/filteradapter/BusinessBASICFilterAdapter.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/filteradapter/BusinessBASICFilterAdapter.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/filteradapter/BusinessBASICFilterAdapter.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/filteradapter/FilterAdapter.java b/src/main/java/com/webcodepro/applecommander/ui/swt/filteradapter/FilterAdapter.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/filteradapter/FilterAdapter.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/filteradapter/FilterAdapter.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/filteradapter/GraphicsFilterAdapter.java b/src/main/java/com/webcodepro/applecommander/ui/swt/filteradapter/GraphicsFilterAdapter.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/filteradapter/GraphicsFilterAdapter.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/filteradapter/GraphicsFilterAdapter.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/filteradapter/HexFilterAdapter.java b/src/main/java/com/webcodepro/applecommander/ui/swt/filteradapter/HexFilterAdapter.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/filteradapter/HexFilterAdapter.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/filteradapter/HexFilterAdapter.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/filteradapter/RawDumpFilterAdapter.java b/src/main/java/com/webcodepro/applecommander/ui/swt/filteradapter/RawDumpFilterAdapter.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/filteradapter/RawDumpFilterAdapter.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/filteradapter/RawDumpFilterAdapter.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/filteradapter/TextFilterAdapter.java b/src/main/java/com/webcodepro/applecommander/ui/swt/filteradapter/TextFilterAdapter.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/filteradapter/TextFilterAdapter.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/filteradapter/TextFilterAdapter.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/util/DropDownSelectionListener.java b/src/main/java/com/webcodepro/applecommander/ui/swt/util/DropDownSelectionListener.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/util/DropDownSelectionListener.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/util/DropDownSelectionListener.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/util/ImageCanvas.java b/src/main/java/com/webcodepro/applecommander/ui/swt/util/ImageCanvas.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/util/ImageCanvas.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/util/ImageCanvas.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/util/ImageManager.java b/src/main/java/com/webcodepro/applecommander/ui/swt/util/ImageManager.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/util/ImageManager.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/util/ImageManager.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/util/SwtUtil.java b/src/main/java/com/webcodepro/applecommander/ui/swt/util/SwtUtil.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/util/SwtUtil.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/util/SwtUtil.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/util/contentadapter/ContentTypeAdapter.java b/src/main/java/com/webcodepro/applecommander/ui/swt/util/contentadapter/ContentTypeAdapter.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/util/contentadapter/ContentTypeAdapter.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/util/contentadapter/ContentTypeAdapter.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/util/contentadapter/ImageCanvasAdapter.java b/src/main/java/com/webcodepro/applecommander/ui/swt/util/contentadapter/ImageCanvasAdapter.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/util/contentadapter/ImageCanvasAdapter.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/util/contentadapter/ImageCanvasAdapter.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/util/contentadapter/NoActionContentTypeAdapter.java b/src/main/java/com/webcodepro/applecommander/ui/swt/util/contentadapter/NoActionContentTypeAdapter.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/util/contentadapter/NoActionContentTypeAdapter.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/util/contentadapter/NoActionContentTypeAdapter.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/util/contentadapter/StyledTextAdapter.java b/src/main/java/com/webcodepro/applecommander/ui/swt/util/contentadapter/StyledTextAdapter.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/util/contentadapter/StyledTextAdapter.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/util/contentadapter/StyledTextAdapter.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/wizard/Wizard.java b/src/main/java/com/webcodepro/applecommander/ui/swt/wizard/Wizard.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/wizard/Wizard.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/wizard/Wizard.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/wizard/WizardPane.java b/src/main/java/com/webcodepro/applecommander/ui/swt/wizard/WizardPane.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/wizard/WizardPane.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/wizard/WizardPane.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/wizard/comparedisks/CompareDisksResultsPane.java b/src/main/java/com/webcodepro/applecommander/ui/swt/wizard/comparedisks/CompareDisksResultsPane.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/wizard/comparedisks/CompareDisksResultsPane.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/wizard/comparedisks/CompareDisksResultsPane.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/wizard/comparedisks/CompareDisksStartPane.java b/src/main/java/com/webcodepro/applecommander/ui/swt/wizard/comparedisks/CompareDisksStartPane.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/wizard/comparedisks/CompareDisksStartPane.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/wizard/comparedisks/CompareDisksStartPane.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/wizard/comparedisks/CompareDisksWizard.java b/src/main/java/com/webcodepro/applecommander/ui/swt/wizard/comparedisks/CompareDisksWizard.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/wizard/comparedisks/CompareDisksWizard.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/wizard/comparedisks/CompareDisksWizard.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/wizard/compilefile/CompileFileStartPane.java b/src/main/java/com/webcodepro/applecommander/ui/swt/wizard/compilefile/CompileFileStartPane.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/wizard/compilefile/CompileFileStartPane.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/wizard/compilefile/CompileFileStartPane.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/wizard/compilefile/CompileWizard.java b/src/main/java/com/webcodepro/applecommander/ui/swt/wizard/compilefile/CompileWizard.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/wizard/compilefile/CompileWizard.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/wizard/compilefile/CompileWizard.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageFormatPane.java b/src/main/java/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageFormatPane.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageFormatPane.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageFormatPane.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageNamePane.java b/src/main/java/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageNamePane.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageNamePane.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageNamePane.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageOrderPane.java b/src/main/java/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageOrderPane.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageOrderPane.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageOrderPane.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageSizePane.java b/src/main/java/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageSizePane.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageSizePane.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageSizePane.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageWizard.java b/src/main/java/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageWizard.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageWizard.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/wizard/diskimage/DiskImageWizard.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/wizard/exportfile/AppleWorksWordProcessorPane.java b/src/main/java/com/webcodepro/applecommander/ui/swt/wizard/exportfile/AppleWorksWordProcessorPane.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/wizard/exportfile/AppleWorksWordProcessorPane.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/wizard/exportfile/AppleWorksWordProcessorPane.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportFileDestinationPane.java b/src/main/java/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportFileDestinationPane.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportFileDestinationPane.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportFileDestinationPane.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportFileStartPane.java b/src/main/java/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportFileStartPane.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportFileStartPane.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportFileStartPane.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportGraphicsTypePane.java b/src/main/java/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportGraphicsTypePane.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportGraphicsTypePane.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportGraphicsTypePane.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportWizard.java b/src/main/java/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportWizard.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportWizard.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/wizard/exportfile/ExportWizard.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/wizard/importfile/ImportSelectFilesWizardPane.java b/src/main/java/com/webcodepro/applecommander/ui/swt/wizard/importfile/ImportSelectFilesWizardPane.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/wizard/importfile/ImportSelectFilesWizardPane.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/wizard/importfile/ImportSelectFilesWizardPane.java
diff --git a/src/com/webcodepro/applecommander/ui/swt/wizard/importfile/ImportWizard.java b/src/main/java/com/webcodepro/applecommander/ui/swt/wizard/importfile/ImportWizard.java
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/swt/wizard/importfile/ImportWizard.java
rename to src/main/java/com/webcodepro/applecommander/ui/swt/wizard/importfile/ImportWizard.java
diff --git a/src/com/webcodepro/applecommander/util/AppleUtil.java b/src/main/java/com/webcodepro/applecommander/util/AppleUtil.java
similarity index 100%
rename from src/com/webcodepro/applecommander/util/AppleUtil.java
rename to src/main/java/com/webcodepro/applecommander/util/AppleUtil.java
diff --git a/src/com/webcodepro/applecommander/util/ApplesoftToken.java b/src/main/java/com/webcodepro/applecommander/util/ApplesoftToken.java
similarity index 100%
rename from src/com/webcodepro/applecommander/util/ApplesoftToken.java
rename to src/main/java/com/webcodepro/applecommander/util/ApplesoftToken.java
diff --git a/src/com/webcodepro/applecommander/util/ApplesoftTokenizer.java b/src/main/java/com/webcodepro/applecommander/util/ApplesoftTokenizer.java
similarity index 100%
rename from src/com/webcodepro/applecommander/util/ApplesoftTokenizer.java
rename to src/main/java/com/webcodepro/applecommander/util/ApplesoftTokenizer.java
diff --git a/src/com/webcodepro/applecommander/util/ApplesoftTokens.java b/src/main/java/com/webcodepro/applecommander/util/ApplesoftTokens.java
similarity index 100%
rename from src/com/webcodepro/applecommander/util/ApplesoftTokens.java
rename to src/main/java/com/webcodepro/applecommander/util/ApplesoftTokens.java
diff --git a/src/com/webcodepro/applecommander/util/BusinessBASICToken.java b/src/main/java/com/webcodepro/applecommander/util/BusinessBASICToken.java
similarity index 100%
rename from src/com/webcodepro/applecommander/util/BusinessBASICToken.java
rename to src/main/java/com/webcodepro/applecommander/util/BusinessBASICToken.java
diff --git a/src/com/webcodepro/applecommander/util/BusinessBASICTokenizer.java b/src/main/java/com/webcodepro/applecommander/util/BusinessBASICTokenizer.java
similarity index 100%
rename from src/com/webcodepro/applecommander/util/BusinessBASICTokenizer.java
rename to src/main/java/com/webcodepro/applecommander/util/BusinessBASICTokenizer.java
diff --git a/src/com/webcodepro/applecommander/util/BusinessBASICTokens.java b/src/main/java/com/webcodepro/applecommander/util/BusinessBASICTokens.java
similarity index 100%
rename from src/com/webcodepro/applecommander/util/BusinessBASICTokens.java
rename to src/main/java/com/webcodepro/applecommander/util/BusinessBASICTokens.java
diff --git a/src/com/webcodepro/applecommander/util/Host.java b/src/main/java/com/webcodepro/applecommander/util/Host.java
similarity index 100%
rename from src/com/webcodepro/applecommander/util/Host.java
rename to src/main/java/com/webcodepro/applecommander/util/Host.java
diff --git a/src/com/webcodepro/applecommander/util/StreamUtil.java b/src/main/java/com/webcodepro/applecommander/util/StreamUtil.java
similarity index 100%
rename from src/com/webcodepro/applecommander/util/StreamUtil.java
rename to src/main/java/com/webcodepro/applecommander/util/StreamUtil.java
diff --git a/src/com/webcodepro/applecommander/util/TextBundle.java b/src/main/java/com/webcodepro/applecommander/util/TextBundle.java
similarity index 100%
rename from src/com/webcodepro/applecommander/util/TextBundle.java
rename to src/main/java/com/webcodepro/applecommander/util/TextBundle.java
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/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/src/com/webcodepro/applecommander/compiler/AppleMemoryAddresses.properties b/src/main/resources/com/webcodepro/applecommander/compiler/AppleMemoryAddresses.properties
similarity index 100%
rename from src/com/webcodepro/applecommander/compiler/AppleMemoryAddresses.properties
rename to src/main/resources/com/webcodepro/applecommander/compiler/AppleMemoryAddresses.properties
diff --git a/src/com/webcodepro/applecommander/compiler/CompilerBundle.properties b/src/main/resources/com/webcodepro/applecommander/compiler/CompilerBundle.properties
similarity index 100%
rename from src/com/webcodepro/applecommander/compiler/CompilerBundle.properties
rename to src/main/resources/com/webcodepro/applecommander/compiler/CompilerBundle.properties
diff --git a/src/com/webcodepro/applecommander/storage/AppleCommander-boot.dump b/src/main/resources/com/webcodepro/applecommander/storage/AppleCommander-boot.dump
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/AppleCommander-boot.dump
rename to src/main/resources/com/webcodepro/applecommander/storage/AppleCommander-boot.dump
diff --git a/src/com/webcodepro/applecommander/storage/StorageBundle.properties b/src/main/resources/com/webcodepro/applecommander/storage/StorageBundle.properties
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/StorageBundle.properties
rename to src/main/resources/com/webcodepro/applecommander/storage/StorageBundle.properties
diff --git a/src/com/webcodepro/applecommander/storage/os/prodos/ProdosFileTypes.properties b/src/main/resources/com/webcodepro/applecommander/storage/os/prodos/ProdosFileTypes.properties
similarity index 100%
rename from src/com/webcodepro/applecommander/storage/os/prodos/ProdosFileTypes.properties
rename to src/main/resources/com/webcodepro/applecommander/storage/os/prodos/ProdosFileTypes.properties
diff --git a/src/com/webcodepro/applecommander/ui/UiBundle.properties b/src/main/resources/com/webcodepro/applecommander/ui/UiBundle.properties
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/UiBundle.properties
rename to src/main/resources/com/webcodepro/applecommander/ui/UiBundle.properties
diff --git a/src/com/webcodepro/applecommander/ui/UiBundle_de.properties b/src/main/resources/com/webcodepro/applecommander/ui/UiBundle_de.properties
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/UiBundle_de.properties
rename to src/main/resources/com/webcodepro/applecommander/ui/UiBundle_de.properties
diff --git a/src/com/webcodepro/applecommander/ui/UiBundle_es.properties b/src/main/resources/com/webcodepro/applecommander/ui/UiBundle_es.properties
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/UiBundle_es.properties
rename to src/main/resources/com/webcodepro/applecommander/ui/UiBundle_es.properties
diff --git a/src/com/webcodepro/applecommander/ui/images/AppleCommanderLogo.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/AppleCommanderLogo.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/AppleCommanderLogo.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/AppleCommanderLogo.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/CompareImageWizardLogo.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/CompareImageWizardLogo.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/CompareImageWizardLogo.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/CompareImageWizardLogo.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/CompileWizardLogo.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/CompileWizardLogo.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/CompileWizardLogo.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/CompileWizardLogo.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/DiskImageWizardLogo.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/DiskImageWizardLogo.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/DiskImageWizardLogo.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/DiskImageWizardLogo.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/ExportWizardLogo.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/ExportWizardLogo.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/ExportWizardLogo.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/ExportWizardLogo.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/ImportWizardLogo.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/ImportWizardLogo.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/ImportWizardLogo.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/ImportWizardLogo.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/about.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/about.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/about.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/about.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/appleicon.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/appleicon.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/appleicon.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/appleicon.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/changeorder.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/changeorder.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/changeorder.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/changeorder.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/comparedisks.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/comparedisks.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/comparedisks.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/comparedisks.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/compile.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/compile.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/compile.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/compile.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/copy.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/copy.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/copy.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/copy.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/database.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/database.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/database.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/database.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/deletedfiles.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/deletedfiles.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/deletedfiles.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/deletedfiles.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/deletefile.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/deletefile.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/deletefile.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/deletefile.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/detailfileview.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/detailfileview.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/detailfileview.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/detailfileview.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/diskicon.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/diskicon.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/diskicon.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/diskicon.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/exportfile.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/exportfile.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/exportfile.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/exportfile.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/hex.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/hex.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/hex.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/hex.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/image.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/image.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/image.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/image.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/importfile.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/importfile.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/importfile.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/importfile.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/nativefileview.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/nativefileview.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/nativefileview.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/nativefileview.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/newdisk.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/newdisk.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/newdisk.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/newdisk.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/opendisk.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/opendisk.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/opendisk.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/opendisk.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/print.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/print.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/print.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/print.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/raw.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/raw.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/raw.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/raw.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/saveas.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/saveas.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/saveas.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/saveas.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/saveimage.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/saveimage.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/saveimage.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/saveimage.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/spreadsheet.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/spreadsheet.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/spreadsheet.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/spreadsheet.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/standardfileview.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/standardfileview.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/standardfileview.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/standardfileview.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/text.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/text.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/text.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/text.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/viewfile.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/viewfile.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/viewfile.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/viewfile.gif
diff --git a/src/com/webcodepro/applecommander/ui/images/wordprocessor.gif b/src/main/resources/com/webcodepro/applecommander/ui/images/wordprocessor.gif
similarity index 100%
rename from src/com/webcodepro/applecommander/ui/images/wordprocessor.gif
rename to src/main/resources/com/webcodepro/applecommander/ui/images/wordprocessor.gif
diff --git a/src/com/webcodepro/applecommander/util/TextBundle.properties b/src/main/resources/com/webcodepro/applecommander/util/TextBundle.properties
similarity index 100%
rename from src/com/webcodepro/applecommander/util/TextBundle.properties
rename to src/main/resources/com/webcodepro/applecommander/util/TextBundle.properties
diff --git a/test/com/webcodepro/applecommander/compiler/ApplesoftCompilerTest.java b/src/test/java/com/webcodepro/applecommander/compiler/ApplesoftCompilerTest.java
similarity index 100%
rename from test/com/webcodepro/applecommander/compiler/ApplesoftCompilerTest.java
rename to src/test/java/com/webcodepro/applecommander/compiler/ApplesoftCompilerTest.java
diff --git a/test/com/webcodepro/applecommander/storage/DiskHelperTest.java b/src/test/java/com/webcodepro/applecommander/storage/DiskHelperTest.java
similarity index 100%
rename from test/com/webcodepro/applecommander/storage/DiskHelperTest.java
rename to src/test/java/com/webcodepro/applecommander/storage/DiskHelperTest.java
diff --git a/test/com/webcodepro/applecommander/storage/DiskWriterTest.java b/src/test/java/com/webcodepro/applecommander/storage/DiskWriterTest.java
similarity index 100%
rename from test/com/webcodepro/applecommander/storage/DiskWriterTest.java
rename to src/test/java/com/webcodepro/applecommander/storage/DiskWriterTest.java
diff --git a/test/com/webcodepro/applecommander/storage/filters/imagehandlers/SwtImageTest.java b/src/test/java/com/webcodepro/applecommander/storage/filters/imagehandlers/SwtImageTest.java
similarity index 100%
rename from test/com/webcodepro/applecommander/storage/filters/imagehandlers/SwtImageTest.java
rename to src/test/java/com/webcodepro/applecommander/storage/filters/imagehandlers/SwtImageTest.java
diff --git a/test/com/webcodepro/applecommander/testconfig/TestConfig.java b/src/test/java/com/webcodepro/applecommander/testconfig/TestConfig.java
similarity index 100%
rename from test/com/webcodepro/applecommander/testconfig/TestConfig.java
rename to src/test/java/com/webcodepro/applecommander/testconfig/TestConfig.java
diff --git a/test/com/webcodepro/applecommander/ui/swt/Sleak.java b/src/test/java/com/webcodepro/applecommander/ui/swt/Sleak.java
similarity index 100%
rename from test/com/webcodepro/applecommander/ui/swt/Sleak.java
rename to src/test/java/com/webcodepro/applecommander/ui/swt/Sleak.java
diff --git a/test/com/webcodepro/applecommander/util/AppleUtilTest.java b/src/test/java/com/webcodepro/applecommander/util/AppleUtilTest.java
similarity index 100%
rename from test/com/webcodepro/applecommander/util/AppleUtilTest.java
rename to src/test/java/com/webcodepro/applecommander/util/AppleUtilTest.java
diff --git a/test/com/webcodepro/applecommander/testconfig/TestConfig.properties b/src/test/resources/com/webcodepro/applecommander/testconfig/TestConfig.properties
similarity index 100%
rename from test/com/webcodepro/applecommander/testconfig/TestConfig.properties
rename to src/test/resources/com/webcodepro/applecommander/testconfig/TestConfig.properties