diff --git a/android/build.gradle b/android/build.gradle
index 85bb32a4d..fd50ca9be 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -43,7 +43,7 @@ android {
     applicationVariants.all { variant ->
         if (variant.buildType.name == 'release') {
             variant.outputs.all {
-                outputFileName = "CarbonizedPD-v${defaultConfig.versionName}-Android.apk"
+                outputFileName = "carbonizedpd-android-${defaultConfig.versionName}.apk"
             }
         }
     }
diff --git a/build.gradle b/build.gradle
index a98c8bda7..c77851360 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
     }
 }
 
@@ -22,8 +22,8 @@ allprojects {
         appAndroidMinSDK = 16
         appAndroidTargetSDK = 31
 
-        gdxVersion = '1.11.0'
-        gdxControllersVersion = '2.2.2'
+        gdxVersion = '1.12.0'
+        gdxControllersVersion = '2.2.3'
     }
     version = appVersionName
 
diff --git a/core/build.gradle b/core/build.gradle
index 4979c4297..005230d30 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'java-library'
 sourceCompatibility = targetCompatibility = appJavaCompatibility
 
 dependencies {
-    api project(':PD-classes')//TODO might be nice to remove this, should decide
+    api project(':engine')//TODO might be nice to remove this, should decide
     implementation project(':services:updates')
     implementation project(':services:news')
 }
diff --git a/desktop/build.gradle b/desktop/build.gradle
index 478623b8f..306b97c68 100644
--- a/desktop/build.gradle
+++ b/desktop/build.gradle
@@ -41,7 +41,7 @@ task release(dependsOn: compileForRelease, type: Jar) {
         attributes 'Implementation-Version': appVersionCode
     }
 
-    archiveName('CarbonizedPD-v' + appVersionName + '-Desktop.jar');
+    archivesBaseName('carbonizedpd-desktop');
 }
 
 dependencies {
@@ -56,8 +56,8 @@ dependencies {
     implementation "com.badlogicgames.gdx-controllers:gdx-controllers-desktop:$gdxControllersVersion"
 
     //we use LWJGL tinyFD directly to display crash messages and (for now) single-line text input
-    implementation "org.lwjgl:lwjgl-tinyfd:3.2.3"
-    implementation "org.lwjgl:lwjgl-tinyfd:3.2.3:natives-windows"
-    implementation "org.lwjgl:lwjgl-tinyfd:3.2.3:natives-macos"
-    implementation "org.lwjgl:lwjgl-tinyfd:3.2.3:natives-linux"
+    implementation "org.lwjgl:lwjgl-tinyfd:3.3.2"
+    implementation "org.lwjgl:lwjgl-tinyfd:3.3.2:natives-windows"
+    implementation "org.lwjgl:lwjgl-tinyfd:3.3.2:natives-macos"
+    implementation "org.lwjgl:lwjgl-tinyfd:3.3.2:natives-linux"
 }
\ No newline at end of file
diff --git a/PD-classes/build.gradle b/engine/build.gradle
similarity index 100%
rename from PD-classes/build.gradle
rename to engine/build.gradle
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/glscripts/Script.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/glscripts/Script.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/glscripts/Script.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/glscripts/Script.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/gltextures/Atlas.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/gltextures/Atlas.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/gltextures/Atlas.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/gltextures/Atlas.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/gltextures/SmartTexture.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/gltextures/SmartTexture.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/gltextures/SmartTexture.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/gltextures/SmartTexture.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/gltextures/TextureCache.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/gltextures/TextureCache.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/gltextures/TextureCache.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/gltextures/TextureCache.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Attribute.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Attribute.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Attribute.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Attribute.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Blending.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Blending.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Blending.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Blending.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Framebuffer.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Framebuffer.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Framebuffer.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Framebuffer.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Matrix.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Matrix.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Matrix.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Matrix.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Program.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Program.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Program.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Program.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Quad.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Quad.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Quad.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Quad.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Renderbuffer.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Renderbuffer.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Renderbuffer.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Renderbuffer.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Shader.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Shader.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Shader.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Shader.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Texture.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Texture.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Texture.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Texture.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Uniform.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Uniform.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Uniform.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Uniform.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Vertexbuffer.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Vertexbuffer.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Vertexbuffer.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/glwrap/Vertexbuffer.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/input/ControllerHandler.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/input/ControllerHandler.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/input/ControllerHandler.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/input/ControllerHandler.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/input/GameAction.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/input/GameAction.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/input/GameAction.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/input/GameAction.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/input/InputHandler.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/input/InputHandler.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/input/InputHandler.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/input/InputHandler.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/input/KeyBindings.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/input/KeyBindings.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/input/KeyBindings.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/input/KeyBindings.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/input/KeyEvent.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/input/KeyEvent.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/input/KeyEvent.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/input/KeyEvent.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/input/PointerEvent.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/input/PointerEvent.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/input/PointerEvent.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/input/PointerEvent.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/input/ScrollEvent.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/input/ScrollEvent.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/input/ScrollEvent.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/input/ScrollEvent.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/BitmapText.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/BitmapText.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/BitmapText.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/BitmapText.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Camera.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Camera.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Camera.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Camera.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/ColorBlock.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/ColorBlock.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/ColorBlock.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/ColorBlock.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Game.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Game.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Game.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Game.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Gizmo.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Gizmo.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Gizmo.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Gizmo.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Group.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Group.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Group.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Group.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Halo.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Halo.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Halo.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Halo.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Image.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Image.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Image.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Image.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/MovieClip.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/MovieClip.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/MovieClip.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/MovieClip.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/NinePatch.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/NinePatch.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/NinePatch.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/NinePatch.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/NoosaScript.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/NoosaScript.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/NoosaScript.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/NoosaScript.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/NoosaScriptNoLighting.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/NoosaScriptNoLighting.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/NoosaScriptNoLighting.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/NoosaScriptNoLighting.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/PointerArea.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/PointerArea.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/PointerArea.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/PointerArea.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/PseudoPixel.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/PseudoPixel.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/PseudoPixel.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/PseudoPixel.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/RenderedText.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/RenderedText.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/RenderedText.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/RenderedText.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Resizable.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Resizable.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Resizable.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Resizable.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Scene.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Scene.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Scene.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Scene.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/ScrollArea.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/ScrollArea.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/ScrollArea.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/ScrollArea.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/SkinnedBlock.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/SkinnedBlock.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/SkinnedBlock.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/SkinnedBlock.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/TextInput.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/TextInput.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/TextInput.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/TextInput.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/TextureFilm.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/TextureFilm.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/TextureFilm.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/TextureFilm.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Tilemap.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Tilemap.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Tilemap.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Tilemap.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Visual.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Visual.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Visual.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/Visual.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/audio/Music.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/audio/Music.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/audio/Music.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/audio/Music.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/audio/Sample.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/audio/Sample.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/audio/Sample.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/audio/Sample.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/particles/BitmaskEmitter.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/particles/BitmaskEmitter.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/particles/BitmaskEmitter.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/particles/BitmaskEmitter.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/particles/Emitter.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/particles/Emitter.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/particles/Emitter.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/particles/Emitter.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/particles/PixelParticle.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/particles/PixelParticle.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/particles/PixelParticle.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/particles/PixelParticle.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/tweeners/AlphaTweener.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/tweeners/AlphaTweener.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/tweeners/AlphaTweener.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/tweeners/AlphaTweener.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/tweeners/CameraScrollTweener.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/tweeners/CameraScrollTweener.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/tweeners/CameraScrollTweener.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/tweeners/CameraScrollTweener.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/tweeners/Delayer.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/tweeners/Delayer.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/tweeners/Delayer.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/tweeners/Delayer.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/tweeners/PosTweener.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/tweeners/PosTweener.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/tweeners/PosTweener.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/tweeners/PosTweener.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/tweeners/ScaleTweener.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/tweeners/ScaleTweener.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/tweeners/ScaleTweener.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/tweeners/ScaleTweener.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/tweeners/Tweener.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/tweeners/Tweener.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/tweeners/Tweener.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/tweeners/Tweener.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/ui/Component.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/ui/Component.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/ui/Component.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/ui/Component.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/ui/Cursor.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/ui/Cursor.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/noosa/ui/Cursor.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/noosa/ui/Cursor.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/BitmapCache.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/BitmapCache.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/BitmapCache.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/BitmapCache.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/BitmapFilm.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/BitmapFilm.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/BitmapFilm.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/BitmapFilm.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/Bundlable.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/Bundlable.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/Bundlable.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/Bundlable.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/Bundle.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/Bundle.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/Bundle.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/Bundle.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/Callback.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/Callback.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/Callback.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/Callback.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/ColorMath.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/ColorMath.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/ColorMath.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/ColorMath.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/FileUtils.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/FileUtils.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/FileUtils.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/FileUtils.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/GameMath.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/GameMath.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/GameMath.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/GameMath.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/GameSettings.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/GameSettings.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/GameSettings.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/GameSettings.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/Graph.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/Graph.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/Graph.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/Graph.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/Highlighter.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/Highlighter.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/Highlighter.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/Highlighter.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/PathFinder.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/PathFinder.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/PathFinder.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/PathFinder.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/PlatformSupport.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/PlatformSupport.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/PlatformSupport.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/PlatformSupport.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/Point.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/Point.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/Point.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/Point.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/PointF.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/PointF.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/PointF.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/PointF.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/QuietCallable.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/QuietCallable.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/QuietCallable.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/QuietCallable.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/Random.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/Random.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/Random.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/Random.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/Rect.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/Rect.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/Rect.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/Rect.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/RectF.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/RectF.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/RectF.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/RectF.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/Reflection.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/Reflection.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/Reflection.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/Reflection.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/Signal.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/Signal.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/Signal.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/Signal.java
diff --git a/PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/SparseArray.java b/engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/SparseArray.java
similarity index 100%
rename from PD-classes/src/main/java/com/tianscar/pixeldungeonclasses/utils/SparseArray.java
rename to engine/src/main/java/com/tianscar/pixeldungeonclasses/utils/SparseArray.java
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b1159fc54..3a0290794 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/services/news/build.gradle b/services/news/build.gradle
index 4f24a9156..fecbacd10 100644
--- a/services/news/build.gradle
+++ b/services/news/build.gradle
@@ -25,6 +25,6 @@ apply plugin: 'java-library'
 sourceCompatibility = targetCompatibility = appJavaCompatibility
 
 dependencies {
-    implementation project(':PD-classes')
+    implementation project(':engine')
     api project(':services')
 }
diff --git a/services/updates/build.gradle b/services/updates/build.gradle
index 53fffc2a4..05c48915c 100644
--- a/services/updates/build.gradle
+++ b/services/updates/build.gradle
@@ -4,6 +4,6 @@ apply plugin: 'java-library'
 sourceCompatibility = targetCompatibility = appJavaCompatibility
 
 dependencies {
-    implementation project(':PD-classes')
+    implementation project(':engine')
     api project(':services')
 }
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 465874f33..c5e497eef 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
 //core game code modules
-include ':PD-classes'
 include ':core'
+include ':engine'
 
 //platform modules
 include ':android'