diff --git a/.gitignore b/.gitignore
index 0114e671..89acecc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,14 @@
 ## Java
 
 lwjgl3/build/
-packaging/out-windows-launch4j/jre/
+packaging/exe/jre/
 *.class
 *.war
 *.ear
 hs_err_pid*
 
-deb/
-packaging/
+packaging/exe/jre/
+packaging/exe/tko-electronics-sim.exe
 
 ## Robovm
 /ios/robovm-build/
diff --git a/new_package_config.xml b/new_package_config.xml
deleted file mode 100644
index 01f984ff..00000000
--- a/new_package_config.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launch4jConfig>
-  <dontWrapJar>false</dontWrapJar>
-  <headerType>gui</headerType>
-  <jar>/home/kronos/development/FRC_amhsrobotics/tko-electronics-sim/packaging/out-windows-launch4j/bin/tko-electronics-sim.jar</jar>
-  <outfile>/home/kronos/development/FRC_amhsrobotics/tko-electronics-sim/packaging/out-windows-launch4j/bin/tko-electronics-sim.exe</outfile>
-  <errTitle>TKO Circuit Simulator Requires Java!</errTitle>
-  <cmdLine></cmdLine>
-  <chdir>.</chdir>
-  <priority>normal</priority>
-  <downloadUrl>http://java.com/download</downloadUrl>
-  <supportUrl></supportUrl>
-  <stayAlive>true</stayAlive>
-  <restartOnCrash>false</restartOnCrash>
-  <manifest></manifest>
-  <icon>/home/kronos/development/FRC_amhsrobotics/tko-electronics-sim/lwjgl3/src/main/resources/logo.ico</icon>
-  <classPath>
-    <mainClass>com.amhsrobotics.circuitsim.lwjgl3.DesktopLauncher</mainClass>
-  </classPath>
-  <jre>
-    <path>../jre</path>
-    <bundledJre64Bit>true</bundledJre64Bit>
-    <bundledJreAsFallback>false</bundledJreAsFallback>
-    <minVersion>1.8.0</minVersion>
-    <maxVersion>1.14.0</maxVersion>
-    <jdkPreference>preferJre</jdkPreference>
-    <runtimeBits>64/32</runtimeBits>
-    <initialHeapSize>1024</initialHeapSize>
-    <maxHeapSize>1024</maxHeapSize>
-  </jre>
-</launch4jConfig>
\ No newline at end of file
diff --git a/package_config.xml b/package_config.xml
deleted file mode 100644
index 5d166338..00000000
--- a/package_config.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launch4jConfig>
-  <dontWrapJar>true</dontWrapJar>
-  <headerType>gui</headerType>
-  <jar>tko-electronics-sim-0.0.1.jar</jar>
-  <outfile>/home/kronos/development/FRC_amhsrobotics/tko-electronics-sim/packaging/windows/bin/TKOcircuitsim.exe</outfile>
-  <errTitle></errTitle>
-  <cmdLine></cmdLine>
-  <chdir>.</chdir>
-  <priority>normal</priority>
-  <downloadUrl>http://java.com/download</downloadUrl>
-  <supportUrl></supportUrl>
-  <stayAlive>true</stayAlive>
-  <restartOnCrash>false</restartOnCrash>
-  <manifest></manifest>
-  <icon>/home/kronos/development/FRC_amhsrobotics/tko-electronics-sim/lwjgl3/src/main/resources/logo.ico</icon>
-  <classPath>
-    <mainClass>com.amhsrobotics.circuitsim.lwjgl3.DesktopLauncher</mainClass>
-  </classPath>
-  <jre>
-    <path>../jre</path>
-    <bundledJre64Bit>true</bundledJre64Bit>
-    <bundledJreAsFallback>false</bundledJreAsFallback>
-    <minVersion>1.8.0</minVersion>
-    <maxVersion>1.13</maxVersion>
-    <jdkPreference>preferJre</jdkPreference>
-    <runtimeBits>64/32</runtimeBits>
-    <initialHeapSize>1024</initialHeapSize>
-    <maxHeapSize>1024</maxHeapSize>
-  </jre>
-</launch4jConfig>
\ No newline at end of file
diff --git a/deb/changelog b/packaging/deb/changelog
similarity index 50%
rename from deb/changelog
rename to packaging/deb/changelog
index 774d3505..7c53c01b 100644
--- a/deb/changelog
+++ b/packaging/deb/changelog
@@ -1,3 +1,3 @@
 tko-electronics-sim (2.1.1) trusty; urgency=low
   * Rebuild
- -- Rohan Bansal <rohan@rbansal.dev>  Fri, 02 Jul 2021 12:16:34 -0700
+ -- Rohan Bansal <rohan@rbansal.dev>  Tue, 06 Jul 2021 10:52:06 -0700
diff --git a/deb/control b/packaging/deb/control
similarity index 100%
rename from deb/control
rename to packaging/deb/control
diff --git a/deb/copyright b/packaging/deb/copyright
similarity index 100%
rename from deb/copyright
rename to packaging/deb/copyright
diff --git a/deb/packagedeb.sh b/packaging/deb/packagedeb.sh
similarity index 100%
rename from deb/packagedeb.sh
rename to packaging/deb/packagedeb.sh
diff --git a/deb/tko-electronics-sim b/packaging/deb/tko-electronics-sim
similarity index 100%
rename from deb/tko-electronics-sim
rename to packaging/deb/tko-electronics-sim
diff --git a/deb/tko-electronics-sim-icon.png b/packaging/deb/tko-electronics-sim-icon.png
similarity index 100%
rename from deb/tko-electronics-sim-icon.png
rename to packaging/deb/tko-electronics-sim-icon.png
diff --git a/deb/tko-electronics-sim.desktop b/packaging/deb/tko-electronics-sim.desktop
similarity index 100%
rename from deb/tko-electronics-sim.desktop
rename to packaging/deb/tko-electronics-sim.desktop
diff --git a/lwjgl3/jpackage/.gitkeep b/packaging/exe/.gitkeep
similarity index 100%
rename from lwjgl3/jpackage/.gitkeep
rename to packaging/exe/.gitkeep
diff --git a/new_package_config2.xml b/packaging/exe/windows_package_config.xml
similarity index 88%
rename from new_package_config2.xml
rename to packaging/exe/windows_package_config.xml
index 7b6af2cf..07af1da9 100644
--- a/new_package_config2.xml
+++ b/packaging/exe/windows_package_config.xml
@@ -2,7 +2,7 @@
 <launch4jConfig>
   <dontWrapJar>false</dontWrapJar>
   <headerType>gui</headerType>
-  <jar>/home/kronos/development/FRC_amhsrobotics/tko-electronics-sim/packaging/out-windows-launch4j/tko-electronics-sim.jar</jar>
+  <jar>/home/kronos/development/FRC_amhsrobotics/tko-electronics-sim/lwjgl3/build/libs/tko-electronics-sim-0.0.1.jar</jar>
   <outfile>/home/kronos/development/FRC_amhsrobotics/tko-electronics-sim/packaging/out-windows-launch4j/tko-electronics-sim.exe</outfile>
   <errTitle>TKO Circuit Simulator Requires Java!</errTitle>
   <cmdLine></cmdLine>
@@ -15,7 +15,7 @@
   <manifest></manifest>
   <icon>/home/kronos/development/FRC_amhsrobotics/tko-electronics-sim/lwjgl3/src/main/resources/logo.ico</icon>
   <classPath>
-    <mainClass>com.amhsrobotics.circuitsim.lwjgl3.DesktopLauncher</mainClass>
+    <mainClass>com.amhsrobotics.circuitsim.lwjgl3.Lwjgl3Launcher</mainClass>
   </classPath>
   <jre>
     <path>jre</path>
diff --git a/packr-config.json b/packr-config.json
deleted file mode 100644
index fe890edf..00000000
--- a/packr-config.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "platform": "windows64",
-  "jdk": "/home/kronos/Documents/prebuilt_jdk_jre/windows/OpenJDK8U-jre_x64_windows_hotspot_8u292b10.zip",
-  "executable": "tko-electronics-sim",
-  "classpath": [
-    "lwjgl3/build/libs/tko-electronics-sim-0.0.1.jar"
-  ],
-  "mainclass": "com.amhsrobotics.circuitsim.lwjgl3.Lwjgl3Launcher",
-  "vmargs": [
-    "Xmx1G"
-  ],
-  "resources": [
-    "lwjgl3/src/main/resources/",
-    "assets/"
-  ],
-  "minimizejre": "soft",
-  "output": "packaging/out-windows",
-  "verbose": true
-}
\ No newline at end of file