diff --git a/build.bat b/build.bat
new file mode 100644
index 0000000..adb6eb1
--- /dev/null
+++ b/build.bat
@@ -0,0 +1,2 @@
+@echo off
+start gradlew clean build
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..359952d
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,17 @@
+plugins {
+    id 'java'
+}
+
+group 'com.superliminal'
+version '1.0-SNAPSHOT'
+
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
+
+jar {
+    manifest {
+        attributes(
+                'Main-Class': 'com.superliminal.magiccube4d.MC4DSwing'
+        )
+    }
+}
\ 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..7a3265e
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..e8894b0
--- /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-6.7-bin.zip
diff --git a/gradlew b/gradlew
new file mode 100644
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/src/com/donhatchsw/util/Arrays.java b/src/main/java/com/donhatchsw/util/Arrays.java
similarity index 100%
rename from src/com/donhatchsw/util/Arrays.java
rename to src/main/java/com/donhatchsw/util/Arrays.java
diff --git a/src/com/donhatchsw/util/Arrows.java b/src/main/java/com/donhatchsw/util/Arrows.java
similarity index 100%
rename from src/com/donhatchsw/util/Arrows.java
rename to src/main/java/com/donhatchsw/util/Arrows.java
diff --git a/src/com/donhatchsw/util/CSG.java b/src/main/java/com/donhatchsw/util/CSG.java
similarity index 100%
rename from src/com/donhatchsw/util/CSG.java
rename to src/main/java/com/donhatchsw/util/CSG.java
diff --git a/src/com/donhatchsw/util/FuzzyPointHashTable.java b/src/main/java/com/donhatchsw/util/FuzzyPointHashTable.java
similarity index 100%
rename from src/com/donhatchsw/util/FuzzyPointHashTable.java
rename to src/main/java/com/donhatchsw/util/FuzzyPointHashTable.java
diff --git a/src/com/donhatchsw/util/LinearProgramming.java b/src/main/java/com/donhatchsw/util/LinearProgramming.java
similarity index 100%
rename from src/com/donhatchsw/util/LinearProgramming.java
rename to src/main/java/com/donhatchsw/util/LinearProgramming.java
diff --git a/src/com/donhatchsw/util/MergeFind.java b/src/main/java/com/donhatchsw/util/MergeFind.java
similarity index 100%
rename from src/com/donhatchsw/util/MergeFind.java
rename to src/main/java/com/donhatchsw/util/MergeFind.java
diff --git a/src/com/donhatchsw/util/Minimizer.java b/src/main/java/com/donhatchsw/util/Minimizer.java
similarity index 100%
rename from src/com/donhatchsw/util/Minimizer.java
rename to src/main/java/com/donhatchsw/util/Minimizer.java
diff --git a/src/com/donhatchsw/util/MyMath.java b/src/main/java/com/donhatchsw/util/MyMath.java
similarity index 100%
rename from src/com/donhatchsw/util/MyMath.java
rename to src/main/java/com/donhatchsw/util/MyMath.java
diff --git a/src/com/donhatchsw/util/MyPanel.java b/src/main/java/com/donhatchsw/util/MyPanel.java
similarity index 100%
rename from src/com/donhatchsw/util/MyPanel.java
rename to src/main/java/com/donhatchsw/util/MyPanel.java
diff --git a/src/com/donhatchsw/util/Poly.java b/src/main/java/com/donhatchsw/util/Poly.java
similarity index 100%
rename from src/com/donhatchsw/util/Poly.java
rename to src/main/java/com/donhatchsw/util/Poly.java
diff --git a/src/com/donhatchsw/util/PolyCSG.java b/src/main/java/com/donhatchsw/util/PolyCSG.java
similarity index 100%
rename from src/com/donhatchsw/util/PolyCSG.java
rename to src/main/java/com/donhatchsw/util/PolyCSG.java
diff --git a/src/com/donhatchsw/util/SortStuff.java b/src/main/java/com/donhatchsw/util/SortStuff.java
similarity index 100%
rename from src/com/donhatchsw/util/SortStuff.java
rename to src/main/java/com/donhatchsw/util/SortStuff.java
diff --git a/src/com/donhatchsw/util/TriangulationOptimizer.java b/src/main/java/com/donhatchsw/util/TriangulationOptimizer.java
similarity index 100%
rename from src/com/donhatchsw/util/TriangulationOptimizer.java
rename to src/main/java/com/donhatchsw/util/TriangulationOptimizer.java
diff --git a/src/com/donhatchsw/util/Triangulator.java b/src/main/java/com/donhatchsw/util/Triangulator.java
similarity index 100%
rename from src/com/donhatchsw/util/Triangulator.java
rename to src/main/java/com/donhatchsw/util/Triangulator.java
diff --git a/src/com/donhatchsw/util/VecMath.java b/src/main/java/com/donhatchsw/util/VecMath.java
similarity index 100%
rename from src/com/donhatchsw/util/VecMath.java
rename to src/main/java/com/donhatchsw/util/VecMath.java
diff --git a/src/com/superliminal/magiccube4d/Audio.java b/src/main/java/com/superliminal/magiccube4d/Audio.java
similarity index 100%
rename from src/com/superliminal/magiccube4d/Audio.java
rename to src/main/java/com/superliminal/magiccube4d/Audio.java
diff --git a/src/com/superliminal/magiccube4d/Congratulations.java b/src/main/java/com/superliminal/magiccube4d/Congratulations.java
similarity index 100%
rename from src/com/superliminal/magiccube4d/Congratulations.java
rename to src/main/java/com/superliminal/magiccube4d/Congratulations.java
diff --git a/src/com/superliminal/magiccube4d/History.java b/src/main/java/com/superliminal/magiccube4d/History.java
similarity index 100%
rename from src/com/superliminal/magiccube4d/History.java
rename to src/main/java/com/superliminal/magiccube4d/History.java
diff --git a/src/com/superliminal/magiccube4d/MC4DApplet.java b/src/main/java/com/superliminal/magiccube4d/MC4DApplet.java
similarity index 100%
rename from src/com/superliminal/magiccube4d/MC4DApplet.java
rename to src/main/java/com/superliminal/magiccube4d/MC4DApplet.java
diff --git a/src/com/superliminal/magiccube4d/MC4DLauncher.java b/src/main/java/com/superliminal/magiccube4d/MC4DLauncher.java
similarity index 100%
rename from src/com/superliminal/magiccube4d/MC4DLauncher.java
rename to src/main/java/com/superliminal/magiccube4d/MC4DLauncher.java
diff --git a/src/com/superliminal/magiccube4d/MC4DSwing.java b/src/main/java/com/superliminal/magiccube4d/MC4DSwing.java
similarity index 100%
rename from src/com/superliminal/magiccube4d/MC4DSwing.java
rename to src/main/java/com/superliminal/magiccube4d/MC4DSwing.java
diff --git a/src/com/superliminal/magiccube4d/MC4DView.java b/src/main/java/com/superliminal/magiccube4d/MC4DView.java
similarity index 100%
rename from src/com/superliminal/magiccube4d/MC4DView.java
rename to src/main/java/com/superliminal/magiccube4d/MC4DView.java
diff --git a/src/com/superliminal/magiccube4d/Macro.java b/src/main/java/com/superliminal/magiccube4d/Macro.java
similarity index 100%
rename from src/com/superliminal/magiccube4d/Macro.java
rename to src/main/java/com/superliminal/magiccube4d/Macro.java
diff --git a/src/com/superliminal/magiccube4d/MacroControls.java b/src/main/java/com/superliminal/magiccube4d/MacroControls.java
similarity index 100%
rename from src/com/superliminal/magiccube4d/MacroControls.java
rename to src/main/java/com/superliminal/magiccube4d/MacroControls.java
diff --git a/src/com/superliminal/magiccube4d/MacroManager.java b/src/main/java/com/superliminal/magiccube4d/MacroManager.java
similarity index 100%
rename from src/com/superliminal/magiccube4d/MacroManager.java
rename to src/main/java/com/superliminal/magiccube4d/MacroManager.java
diff --git a/src/com/superliminal/magiccube4d/MagicCube.java b/src/main/java/com/superliminal/magiccube4d/MagicCube.java
similarity index 100%
rename from src/com/superliminal/magiccube4d/MagicCube.java
rename to src/main/java/com/superliminal/magiccube4d/MagicCube.java
diff --git a/src/com/superliminal/magiccube4d/Math4d.java b/src/main/java/com/superliminal/magiccube4d/Math4d.java
similarity index 100%
rename from src/com/superliminal/magiccube4d/Math4d.java
rename to src/main/java/com/superliminal/magiccube4d/Math4d.java
diff --git a/src/com/superliminal/magiccube4d/NdSolve.java b/src/main/java/com/superliminal/magiccube4d/NdSolve.java
similarity index 100%
rename from src/com/superliminal/magiccube4d/NdSolve.java
rename to src/main/java/com/superliminal/magiccube4d/NdSolve.java
diff --git a/src/com/superliminal/magiccube4d/PipelineUtils.java b/src/main/java/com/superliminal/magiccube4d/PipelineUtils.java
similarity index 100%
rename from src/com/superliminal/magiccube4d/PipelineUtils.java
rename to src/main/java/com/superliminal/magiccube4d/PipelineUtils.java
diff --git a/src/com/superliminal/magiccube4d/PolytopePuzzleDescription.java b/src/main/java/com/superliminal/magiccube4d/PolytopePuzzleDescription.java
similarity index 100%
rename from src/com/superliminal/magiccube4d/PolytopePuzzleDescription.java
rename to src/main/java/com/superliminal/magiccube4d/PolytopePuzzleDescription.java
diff --git a/src/com/superliminal/magiccube4d/ProgressManager.java b/src/main/java/com/superliminal/magiccube4d/ProgressManager.java
similarity index 100%
rename from src/com/superliminal/magiccube4d/ProgressManager.java
rename to src/main/java/com/superliminal/magiccube4d/ProgressManager.java
diff --git a/src/com/superliminal/magiccube4d/PuzzleDescription.java b/src/main/java/com/superliminal/magiccube4d/PuzzleDescription.java
similarity index 100%
rename from src/com/superliminal/magiccube4d/PuzzleDescription.java
rename to src/main/java/com/superliminal/magiccube4d/PuzzleDescription.java
diff --git a/src/com/superliminal/magiccube4d/PuzzleManager.java b/src/main/java/com/superliminal/magiccube4d/PuzzleManager.java
similarity index 100%
rename from src/com/superliminal/magiccube4d/PuzzleManager.java
rename to src/main/java/com/superliminal/magiccube4d/PuzzleManager.java
diff --git a/src/com/superliminal/magiccube4d/RotationHandler.java b/src/main/java/com/superliminal/magiccube4d/RotationHandler.java
similarity index 100%
rename from src/com/superliminal/magiccube4d/RotationHandler.java
rename to src/main/java/com/superliminal/magiccube4d/RotationHandler.java
diff --git a/src/com/superliminal/magiccube4d/Sort.java b/src/main/java/com/superliminal/magiccube4d/Sort.java
similarity index 100%
rename from src/com/superliminal/magiccube4d/Sort.java
rename to src/main/java/com/superliminal/magiccube4d/Sort.java
diff --git a/src/com/superliminal/magiccube4d/Vec_h.java b/src/main/java/com/superliminal/magiccube4d/Vec_h.java
similarity index 100%
rename from src/com/superliminal/magiccube4d/Vec_h.java
rename to src/main/java/com/superliminal/magiccube4d/Vec_h.java
diff --git a/src/com/superliminal/test/ModuleTest.java b/src/main/java/com/superliminal/test/ModuleTest.java
similarity index 100%
rename from src/com/superliminal/test/ModuleTest.java
rename to src/main/java/com/superliminal/test/ModuleTest.java
diff --git a/src/com/superliminal/util/ColorButton.java b/src/main/java/com/superliminal/util/ColorButton.java
similarity index 100%
rename from src/com/superliminal/util/ColorButton.java
rename to src/main/java/com/superliminal/util/ColorButton.java
diff --git a/src/com/superliminal/util/ColorUtils.java b/src/main/java/com/superliminal/util/ColorUtils.java
similarity index 100%
rename from src/com/superliminal/util/ColorUtils.java
rename to src/main/java/com/superliminal/util/ColorUtils.java
diff --git a/src/com/superliminal/util/Console.java b/src/main/java/com/superliminal/util/Console.java
similarity index 100%
rename from src/com/superliminal/util/Console.java
rename to src/main/java/com/superliminal/util/Console.java
diff --git a/src/com/superliminal/util/FloatSlider.java b/src/main/java/com/superliminal/util/FloatSlider.java
similarity index 100%
rename from src/com/superliminal/util/FloatSlider.java
rename to src/main/java/com/superliminal/util/FloatSlider.java
diff --git a/src/com/superliminal/util/PropControls.java b/src/main/java/com/superliminal/util/PropControls.java
similarity index 100%
rename from src/com/superliminal/util/PropControls.java
rename to src/main/java/com/superliminal/util/PropControls.java
diff --git a/src/com/superliminal/util/PropertyManager.java b/src/main/java/com/superliminal/util/PropertyManager.java
similarity index 100%
rename from src/com/superliminal/util/PropertyManager.java
rename to src/main/java/com/superliminal/util/PropertyManager.java
diff --git a/src/com/superliminal/util/ResourceUtils.java b/src/main/java/com/superliminal/util/ResourceUtils.java
similarity index 100%
rename from src/com/superliminal/util/ResourceUtils.java
rename to src/main/java/com/superliminal/util/ResourceUtils.java
diff --git a/src/com/superliminal/util/SpringUtilities.java b/src/main/java/com/superliminal/util/SpringUtilities.java
similarity index 100%
rename from src/com/superliminal/util/SpringUtilities.java
rename to src/main/java/com/superliminal/util/SpringUtilities.java
diff --git a/src/com/superliminal/util/StaticUtils.java b/src/main/java/com/superliminal/util/StaticUtils.java
similarity index 100%
rename from src/com/superliminal/util/StaticUtils.java
rename to src/main/java/com/superliminal/util/StaticUtils.java
diff --git a/src/click.wav b/src/main/resources/click.wav
similarity index 100%
rename from src/click.wav
rename to src/main/resources/click.wav
diff --git a/src/close.wav b/src/main/resources/close.wav
similarity index 100%
rename from src/close.wav
rename to src/main/resources/close.wav
diff --git a/src/congratulations.png b/src/main/resources/congratulations.png
similarity index 100%
rename from src/congratulations.png
rename to src/main/resources/congratulations.png
diff --git a/src/correct.wav b/src/main/resources/correct.wav
similarity index 100%
rename from src/correct.wav
rename to src/main/resources/correct.wav
diff --git a/src/fanfare.wav b/src/main/resources/fanfare.wav
similarity index 100%
rename from src/fanfare.wav
rename to src/main/resources/fanfare.wav
diff --git a/src/mc4d.png b/src/main/resources/mc4d.png
similarity index 100%
rename from src/mc4d.png
rename to src/main/resources/mc4d.png
diff --git a/src/version.txt b/src/main/resources/version.txt
similarity index 100%
rename from src/version.txt
rename to src/main/resources/version.txt
diff --git a/src/white1000.wav b/src/main/resources/white1000.wav
similarity index 100%
rename from src/white1000.wav
rename to src/main/resources/white1000.wav