diff --git a/.gitignore b/.gitignore
index 9fd11c0..f1dccdf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 # Build Files
 out/
 data/
+build/
 
 # BlueJ files
 *.ctxt
@@ -107,7 +108,8 @@ imgui.ini
 ### IntelliJ Specific Java Settings ###
 .idea/
 *.iml
+.gradle/
 
 
 ### FlowerKnight Specific Files ###
-data/logs.txt
+logs.txt
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..09d99db
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,72 @@
+plugins {
+    id 'java'
+}
+
+sourceCompatibility = JavaVersion.VERSION_16
+targetCompatibility = JavaVersion.VERSION_16
+
+import org.gradle.internal.os.OperatingSystem
+
+project.ext.lwjglVersion = "3.3.0-SNAPSHOT"
+
+switch (OperatingSystem.current()) {
+    case OperatingSystem.LINUX:
+        def osArch = System.getProperty("os.arch")
+        project.ext.lwjglNatives = osArch.startsWith("arm") || osArch.startsWith("aarch64")
+                ? "natives-linux-${osArch.contains("64") || osArch.startsWith("armv8") ? "arm64" : "arm32"}"
+                : "natives-linux"
+        break
+    case OperatingSystem.MAC_OS:
+        project.ext.lwjglNatives = System.getProperty("os.arch").startsWith("aarch64") ? "natives-macos-arm64" : "natives-macos"
+        break
+    case OperatingSystem.WINDOWS:
+        def osArch = System.getProperty("os.arch")
+        project.ext.lwjglNatives = osArch.contains("64")
+                ? "natives-windows${osArch.startsWith("aarch64") ? "-arm64" : ""}"
+                : "natives-windows-x86"
+        break
+}
+
+group 'org.dhsdev'
+version '1.0-SNAPSHOT'
+
+repositories {
+    mavenCentral()
+    maven {
+        url "https://oss.sonatype.org/content/repositories/snapshots/"
+    }
+}
+
+sourceSets {
+    main {
+        java {
+            srcDirs = ['src/main']
+        }
+    }
+}
+
+dependencies {
+    // Junit Testing
+    implementation 'junit:junit:4.12'
+
+    // LWJGL
+    implementation platform("org.lwjgl:lwjgl-bom:$lwjglVersion")
+
+    implementation "org.lwjgl:lwjgl"
+    implementation "org.lwjgl:lwjgl-assimp"
+    implementation "org.lwjgl:lwjgl-cuda"
+    implementation "org.lwjgl:lwjgl-glfw"
+    implementation "org.lwjgl:lwjgl-openal"
+    implementation "org.lwjgl:lwjgl-opencl"
+    implementation "org.lwjgl:lwjgl-opengl"
+    implementation "org.lwjgl:lwjgl-stb"
+    runtimeOnly "org.lwjgl:lwjgl::$lwjglNatives"
+    runtimeOnly "org.lwjgl:lwjgl-assimp::$lwjglNatives"
+    runtimeOnly "org.lwjgl:lwjgl-glfw::$lwjglNatives"
+    runtimeOnly "org.lwjgl:lwjgl-openal::$lwjglNatives"
+    runtimeOnly "org.lwjgl:lwjgl-opengl::$lwjglNatives"
+    runtimeOnly "org.lwjgl:lwjgl-stb::$lwjglNatives"
+
+    // PNG Encoder
+    implementation group: 'im.bci', name: 'pngdecoder', version: '0.13'
+}
diff --git a/data/logs.txt b/data/logs.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..e708b1c
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..f371643
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..4f906e0
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  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='"-Xmx64m" "-Xms64m"'
+
+# 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 or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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=`expr $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"
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..ac1b06f
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@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 Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@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="-Xmx64m" "-Xms64m"
+
+@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 execute
+
+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 execute
+
+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
+
+: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 %*
+
+: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/jars/lwjgl-glfw-javadoc.jar b/jars/lwjgl-glfw-javadoc.jar
deleted file mode 100755
index 5e328ce..0000000
Binary files a/jars/lwjgl-glfw-javadoc.jar and /dev/null differ
diff --git a/jars/lwjgl-glfw-natives-linux-arm32.jar b/jars/lwjgl-glfw-natives-linux-arm32.jar
deleted file mode 100755
index 54441cd..0000000
Binary files a/jars/lwjgl-glfw-natives-linux-arm32.jar and /dev/null differ
diff --git a/jars/lwjgl-glfw-natives-linux-arm64.jar b/jars/lwjgl-glfw-natives-linux-arm64.jar
deleted file mode 100755
index 9f5bbf3..0000000
Binary files a/jars/lwjgl-glfw-natives-linux-arm64.jar and /dev/null differ
diff --git a/jars/lwjgl-glfw-natives-linux.jar b/jars/lwjgl-glfw-natives-linux.jar
deleted file mode 100755
index 2f48c49..0000000
Binary files a/jars/lwjgl-glfw-natives-linux.jar and /dev/null differ
diff --git a/jars/lwjgl-glfw-natives-macos.jar b/jars/lwjgl-glfw-natives-macos.jar
deleted file mode 100755
index 148ea41..0000000
Binary files a/jars/lwjgl-glfw-natives-macos.jar and /dev/null differ
diff --git a/jars/lwjgl-glfw-natives-windows-x86.jar b/jars/lwjgl-glfw-natives-windows-x86.jar
deleted file mode 100755
index 0b61721..0000000
Binary files a/jars/lwjgl-glfw-natives-windows-x86.jar and /dev/null differ
diff --git a/jars/lwjgl-glfw-natives-windows.jar b/jars/lwjgl-glfw-natives-windows.jar
deleted file mode 100755
index ba29a14..0000000
Binary files a/jars/lwjgl-glfw-natives-windows.jar and /dev/null differ
diff --git a/jars/lwjgl-glfw-sources.jar b/jars/lwjgl-glfw-sources.jar
deleted file mode 100755
index 3f11673..0000000
Binary files a/jars/lwjgl-glfw-sources.jar and /dev/null differ
diff --git a/jars/lwjgl-glfw.jar b/jars/lwjgl-glfw.jar
deleted file mode 100755
index 5408c4d..0000000
Binary files a/jars/lwjgl-glfw.jar and /dev/null differ
diff --git a/jars/lwjgl-javadoc.jar b/jars/lwjgl-javadoc.jar
deleted file mode 100755
index 6751cba..0000000
Binary files a/jars/lwjgl-javadoc.jar and /dev/null differ
diff --git a/jars/lwjgl-natives-linux-arm32.jar b/jars/lwjgl-natives-linux-arm32.jar
deleted file mode 100755
index 25a176a..0000000
Binary files a/jars/lwjgl-natives-linux-arm32.jar and /dev/null differ
diff --git a/jars/lwjgl-natives-linux-arm64.jar b/jars/lwjgl-natives-linux-arm64.jar
deleted file mode 100755
index c32df86..0000000
Binary files a/jars/lwjgl-natives-linux-arm64.jar and /dev/null differ
diff --git a/jars/lwjgl-natives-linux.jar b/jars/lwjgl-natives-linux.jar
deleted file mode 100755
index f6509cf..0000000
Binary files a/jars/lwjgl-natives-linux.jar and /dev/null differ
diff --git a/jars/lwjgl-natives-macos.jar b/jars/lwjgl-natives-macos.jar
deleted file mode 100755
index a7f9872..0000000
Binary files a/jars/lwjgl-natives-macos.jar and /dev/null differ
diff --git a/jars/lwjgl-natives-windows-x86.jar b/jars/lwjgl-natives-windows-x86.jar
deleted file mode 100755
index 82fbbd0..0000000
Binary files a/jars/lwjgl-natives-windows-x86.jar and /dev/null differ
diff --git a/jars/lwjgl-natives-windows.jar b/jars/lwjgl-natives-windows.jar
deleted file mode 100755
index 78a7620..0000000
Binary files a/jars/lwjgl-natives-windows.jar and /dev/null differ
diff --git a/jars/lwjgl-opengl-javadoc.jar b/jars/lwjgl-opengl-javadoc.jar
deleted file mode 100755
index 5e5ba83..0000000
Binary files a/jars/lwjgl-opengl-javadoc.jar and /dev/null differ
diff --git a/jars/lwjgl-opengl-natives-linux-arm32.jar b/jars/lwjgl-opengl-natives-linux-arm32.jar
deleted file mode 100755
index cebb767..0000000
Binary files a/jars/lwjgl-opengl-natives-linux-arm32.jar and /dev/null differ
diff --git a/jars/lwjgl-opengl-natives-linux-arm64.jar b/jars/lwjgl-opengl-natives-linux-arm64.jar
deleted file mode 100755
index 6aa0769..0000000
Binary files a/jars/lwjgl-opengl-natives-linux-arm64.jar and /dev/null differ
diff --git a/jars/lwjgl-opengl-natives-linux.jar b/jars/lwjgl-opengl-natives-linux.jar
deleted file mode 100755
index bbe4538..0000000
Binary files a/jars/lwjgl-opengl-natives-linux.jar and /dev/null differ
diff --git a/jars/lwjgl-opengl-natives-macos.jar b/jars/lwjgl-opengl-natives-macos.jar
deleted file mode 100755
index 084072e..0000000
Binary files a/jars/lwjgl-opengl-natives-macos.jar and /dev/null differ
diff --git a/jars/lwjgl-opengl-natives-windows-x86.jar b/jars/lwjgl-opengl-natives-windows-x86.jar
deleted file mode 100755
index c7da8fe..0000000
Binary files a/jars/lwjgl-opengl-natives-windows-x86.jar and /dev/null differ
diff --git a/jars/lwjgl-opengl-natives-windows.jar b/jars/lwjgl-opengl-natives-windows.jar
deleted file mode 100755
index 977cfcb..0000000
Binary files a/jars/lwjgl-opengl-natives-windows.jar and /dev/null differ
diff --git a/jars/lwjgl-opengl-sources.jar b/jars/lwjgl-opengl-sources.jar
deleted file mode 100755
index 17ff783..0000000
Binary files a/jars/lwjgl-opengl-sources.jar and /dev/null differ
diff --git a/jars/lwjgl-opengl.jar b/jars/lwjgl-opengl.jar
deleted file mode 100755
index b7dcfa3..0000000
Binary files a/jars/lwjgl-opengl.jar and /dev/null differ
diff --git a/jars/lwjgl.jar b/jars/lwjgl.jar
deleted file mode 100755
index e2f71fb..0000000
Binary files a/jars/lwjgl.jar and /dev/null differ
diff --git a/jars/pngdecoder-1.0.jar b/jars/pngdecoder-1.0.jar
deleted file mode 100644
index 89b3661..0000000
Binary files a/jars/pngdecoder-1.0.jar and /dev/null differ
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..2aefc98
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'flowerknight'
diff --git a/src/org/dhsdev/flowerknight/FlowerKnight.java b/src/main/org/dhsdev/flowerknight/FlowerKnight.java
similarity index 90%
rename from src/org/dhsdev/flowerknight/FlowerKnight.java
rename to src/main/org/dhsdev/flowerknight/FlowerKnight.java
index 3fe6be1..0ac1c5a 100644
--- a/src/org/dhsdev/flowerknight/FlowerKnight.java
+++ b/src/main/org/dhsdev/flowerknight/FlowerKnight.java
@@ -4,6 +4,8 @@
 import org.dhsdev.flowerknight.game.GameObject;
 import org.dhsdev.flowerknight.gl.Shader;
 import org.dhsdev.flowerknight.gl.Window;
+import org.dhsdev.flowerknight.util.Logger;
+import org.dhsdev.flowerknight.util.Severity;
 import org.dhsdev.flowerknight.util.TestImage;
 import org.lwjgl.opengl.GL;
 
@@ -33,7 +35,11 @@ private FlowerKnight() {
     public static void init() {
 
         // Set up GLFW. Errors should be checked here later.
-        glfwInit();
+        try {
+            glfwInit();
+        } catch (Throwable glfwInit){
+            Logger.log("GLFW Failed to Initialize", Severity.ERROR);
+        }
 
         // macOS needs to request a forward profile for a later
         // version of OpenGL explicitly. Version 3.3, to be specific.
diff --git a/src/org/dhsdev/flowerknight/GetOSType.java b/src/main/org/dhsdev/flowerknight/GetOSType.java
similarity index 100%
rename from src/org/dhsdev/flowerknight/GetOSType.java
rename to src/main/org/dhsdev/flowerknight/GetOSType.java
diff --git a/src/org/dhsdev/flowerknight/Main.java b/src/main/org/dhsdev/flowerknight/Main.java
similarity index 100%
rename from src/org/dhsdev/flowerknight/Main.java
rename to src/main/org/dhsdev/flowerknight/Main.java
diff --git a/src/org/dhsdev/flowerknight/OSType.java b/src/main/org/dhsdev/flowerknight/OSType.java
similarity index 100%
rename from src/org/dhsdev/flowerknight/OSType.java
rename to src/main/org/dhsdev/flowerknight/OSType.java
diff --git a/src/org/dhsdev/flowerknight/game/Camera.java b/src/main/org/dhsdev/flowerknight/game/Camera.java
similarity index 100%
rename from src/org/dhsdev/flowerknight/game/Camera.java
rename to src/main/org/dhsdev/flowerknight/game/Camera.java
diff --git a/src/org/dhsdev/flowerknight/game/GameObject.java b/src/main/org/dhsdev/flowerknight/game/GameObject.java
similarity index 99%
rename from src/org/dhsdev/flowerknight/game/GameObject.java
rename to src/main/org/dhsdev/flowerknight/game/GameObject.java
index 4e4e4d4..4f7b490 100644
--- a/src/org/dhsdev/flowerknight/game/GameObject.java
+++ b/src/main/org/dhsdev/flowerknight/game/GameObject.java
@@ -12,7 +12,7 @@ public class GameObject {
     /**
      * This contains all game objects in the game.
      */
-    private static final List<GameObject> objects = new ArrayList();
+    private static final List<GameObject> objects = new ArrayList<>();
 
     /**
      * The strength of gravity. Until we get an actual game object, we have no
diff --git a/src/org/dhsdev/flowerknight/gl/GLStates.java b/src/main/org/dhsdev/flowerknight/gl/GLStates.java
similarity index 100%
rename from src/org/dhsdev/flowerknight/gl/GLStates.java
rename to src/main/org/dhsdev/flowerknight/gl/GLStates.java
diff --git a/src/org/dhsdev/flowerknight/gl/Mesh.java b/src/main/org/dhsdev/flowerknight/gl/Mesh.java
similarity index 100%
rename from src/org/dhsdev/flowerknight/gl/Mesh.java
rename to src/main/org/dhsdev/flowerknight/gl/Mesh.java
diff --git a/src/org/dhsdev/flowerknight/gl/Shader.java b/src/main/org/dhsdev/flowerknight/gl/Shader.java
similarity index 100%
rename from src/org/dhsdev/flowerknight/gl/Shader.java
rename to src/main/org/dhsdev/flowerknight/gl/Shader.java
diff --git a/src/org/dhsdev/flowerknight/gl/Texture.java b/src/main/org/dhsdev/flowerknight/gl/Texture.java
similarity index 100%
rename from src/org/dhsdev/flowerknight/gl/Texture.java
rename to src/main/org/dhsdev/flowerknight/gl/Texture.java
diff --git a/src/org/dhsdev/flowerknight/gl/Window.java b/src/main/org/dhsdev/flowerknight/gl/Window.java
similarity index 100%
rename from src/org/dhsdev/flowerknight/gl/Window.java
rename to src/main/org/dhsdev/flowerknight/gl/Window.java
diff --git a/src/org/dhsdev/flowerknight/util/Logger.java b/src/main/org/dhsdev/flowerknight/util/Logger.java
similarity index 97%
rename from src/org/dhsdev/flowerknight/util/Logger.java
rename to src/main/org/dhsdev/flowerknight/util/Logger.java
index 0b02037..0f69dfb 100644
--- a/src/org/dhsdev/flowerknight/util/Logger.java
+++ b/src/main/org/dhsdev/flowerknight/util/Logger.java
@@ -23,7 +23,7 @@ private Logger() {
      * @author jakeroggenbuck
      */
     public static synchronized void log(String message, Severity severity) {
-        final var logFile = new File("data/logs.txt");
+        final var logFile = new File("logs.txt");
 
         try {
             logFile.createNewFile();
@@ -62,4 +62,4 @@ public static synchronized void log(String message, Severity severity) {
             e.printStackTrace();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/org/dhsdev/flowerknight/util/Severity.java b/src/main/org/dhsdev/flowerknight/util/Severity.java
similarity index 100%
rename from src/org/dhsdev/flowerknight/util/Severity.java
rename to src/main/org/dhsdev/flowerknight/util/Severity.java
diff --git a/src/org/dhsdev/flowerknight/util/TestImage.java b/src/main/org/dhsdev/flowerknight/util/TestImage.java
similarity index 100%
rename from src/org/dhsdev/flowerknight/util/TestImage.java
rename to src/main/org/dhsdev/flowerknight/util/TestImage.java
diff --git a/src/shader/game_vert.glsl b/src/main/shader/game_vert.glsl
similarity index 100%
rename from src/shader/game_vert.glsl
rename to src/main/shader/game_vert.glsl
diff --git a/src/shader/trivial_frag.glsl b/src/main/shader/trivial_frag.glsl
similarity index 100%
rename from src/shader/trivial_frag.glsl
rename to src/main/shader/trivial_frag.glsl
diff --git a/src/shader/trivial_vert.glsl b/src/main/shader/trivial_vert.glsl
similarity index 100%
rename from src/shader/trivial_vert.glsl
rename to src/main/shader/trivial_vert.glsl