diff --git a/SPD-classes/build.gradle b/SPD-classes/build.gradle
index 4da553659..71066fc52 100644
--- a/SPD-classes/build.gradle
+++ b/SPD-classes/build.gradle
@@ -1,6 +1,7 @@
 apply plugin: 'java-library'
 
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
+sourceCompatibility = targetCompatibility = appJavaCompatibility
 
 dependencies {
     //TODO migrate this to implementation from api
diff --git a/android/build.gradle b/android/build.gradle
index a94c5805e..07313255f 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,28 +1,10 @@
-/*
- * Pixel Dungeon
- * Copyright (C) 2012-2015 Oleg Dolya
- *
- * Shattered Pixel Dungeon
- * Copyright (C) 2014-2019 Evan Debenham
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- */
-
 apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion appAndroidCompileSDK
+    compileOptions.sourceCompatibility = compileOptions.targetCompatibility = appJavaCompatibility
+
+    sourceSets.main.assets.srcDirs = [new File(project(':core').projectDir, "/src/main/assets")]
 
     defaultConfig {
         manifestPlaceholders = [appName:appName]
diff --git a/build.gradle b/build.gradle
index eb228e29e..6c62c6052 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,6 +17,8 @@ allprojects {
         appVersionCode = 382
         appVersionName = '0.7.5e'
 
+        appJavaCompatibility = 1.8
+
         appAndroidCompileSDK = 29
         appAndroidMinSDK = 9
         appAndroidTargetSDK = 29
diff --git a/core/build.gradle b/core/build.gradle
index 720ae960f..38ebe7568 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -1,6 +1,7 @@
 apply plugin: 'java-library'
 
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
+sourceCompatibility = targetCompatibility = appJavaCompatibility
 
 dependencies {
     api project(':SPD-classes')
diff --git a/android/src/main/assets/amulet.png b/core/src/main/assets/amulet.png
similarity index 100%
rename from android/src/main/assets/amulet.png
rename to core/src/main/assets/amulet.png
diff --git a/android/src/main/assets/arcs1.png b/core/src/main/assets/arcs1.png
similarity index 100%
rename from android/src/main/assets/arcs1.png
rename to core/src/main/assets/arcs1.png
diff --git a/android/src/main/assets/arcs2.png b/core/src/main/assets/arcs2.png
similarity index 100%
rename from android/src/main/assets/arcs2.png
rename to core/src/main/assets/arcs2.png
diff --git a/android/src/main/assets/avatars.png b/core/src/main/assets/avatars.png
similarity index 100%
rename from android/src/main/assets/avatars.png
rename to core/src/main/assets/avatars.png
diff --git a/android/src/main/assets/badges.png b/core/src/main/assets/badges.png
similarity index 100%
rename from android/src/main/assets/badges.png
rename to core/src/main/assets/badges.png
diff --git a/android/src/main/assets/banners.png b/core/src/main/assets/banners.png
similarity index 100%
rename from android/src/main/assets/banners.png
rename to core/src/main/assets/banners.png
diff --git a/android/src/main/assets/bat.png b/core/src/main/assets/bat.png
similarity index 100%
rename from android/src/main/assets/bat.png
rename to core/src/main/assets/bat.png
diff --git a/android/src/main/assets/bee.png b/core/src/main/assets/bee.png
similarity index 100%
rename from android/src/main/assets/bee.png
rename to core/src/main/assets/bee.png
diff --git a/android/src/main/assets/blacksmith.png b/core/src/main/assets/blacksmith.png
similarity index 100%
rename from android/src/main/assets/blacksmith.png
rename to core/src/main/assets/blacksmith.png
diff --git a/android/src/main/assets/boss_hp.png b/core/src/main/assets/boss_hp.png
similarity index 100%
rename from android/src/main/assets/boss_hp.png
rename to core/src/main/assets/boss_hp.png
diff --git a/android/src/main/assets/brute.png b/core/src/main/assets/brute.png
similarity index 100%
rename from android/src/main/assets/brute.png
rename to core/src/main/assets/brute.png
diff --git a/android/src/main/assets/buffs.png b/core/src/main/assets/buffs.png
similarity index 100%
rename from android/src/main/assets/buffs.png
rename to core/src/main/assets/buffs.png
diff --git a/android/src/main/assets/burning_fist.png b/core/src/main/assets/burning_fist.png
similarity index 100%
rename from android/src/main/assets/burning_fist.png
rename to core/src/main/assets/burning_fist.png
diff --git a/android/src/main/assets/chrome.png b/core/src/main/assets/chrome.png
similarity index 100%
rename from android/src/main/assets/chrome.png
rename to core/src/main/assets/chrome.png
diff --git a/android/src/main/assets/consumable_icons.png b/core/src/main/assets/consumable_icons.png
similarity index 100%
rename from android/src/main/assets/consumable_icons.png
rename to core/src/main/assets/consumable_icons.png
diff --git a/android/src/main/assets/crab.png b/core/src/main/assets/crab.png
similarity index 100%
rename from android/src/main/assets/crab.png
rename to core/src/main/assets/crab.png
diff --git a/android/src/main/assets/custom_tiles/prison_exit_new.png b/core/src/main/assets/custom_tiles/prison_exit_new.png
similarity index 100%
rename from android/src/main/assets/custom_tiles/prison_exit_new.png
rename to core/src/main/assets/custom_tiles/prison_exit_new.png
diff --git a/android/src/main/assets/custom_tiles/prison_exit_old.png b/core/src/main/assets/custom_tiles/prison_exit_old.png
similarity index 100%
rename from android/src/main/assets/custom_tiles/prison_exit_old.png
rename to core/src/main/assets/custom_tiles/prison_exit_old.png
diff --git a/android/src/main/assets/custom_tiles/prison_quests.png b/core/src/main/assets/custom_tiles/prison_quests.png
similarity index 100%
rename from android/src/main/assets/custom_tiles/prison_quests.png
rename to core/src/main/assets/custom_tiles/prison_quests.png
diff --git a/android/src/main/assets/custom_tiles/sewer_boss.png b/core/src/main/assets/custom_tiles/sewer_boss.png
similarity index 100%
rename from android/src/main/assets/custom_tiles/sewer_boss.png
rename to core/src/main/assets/custom_tiles/sewer_boss.png
diff --git a/android/src/main/assets/custom_tiles/weak_floor.png b/core/src/main/assets/custom_tiles/weak_floor.png
similarity index 100%
rename from android/src/main/assets/custom_tiles/weak_floor.png
rename to core/src/main/assets/custom_tiles/weak_floor.png
diff --git a/android/src/main/assets/demon.png b/core/src/main/assets/demon.png
similarity index 100%
rename from android/src/main/assets/demon.png
rename to core/src/main/assets/demon.png
diff --git a/android/src/main/assets/dm300.png b/core/src/main/assets/dm300.png
similarity index 100%
rename from android/src/main/assets/dm300.png
rename to core/src/main/assets/dm300.png
diff --git a/android/src/main/assets/effects.png b/core/src/main/assets/effects.png
similarity index 100%
rename from android/src/main/assets/effects.png
rename to core/src/main/assets/effects.png
diff --git a/android/src/main/assets/elemental.png b/core/src/main/assets/elemental.png
similarity index 100%
rename from android/src/main/assets/elemental.png
rename to core/src/main/assets/elemental.png
diff --git a/android/src/main/assets/exp_bar.png b/core/src/main/assets/exp_bar.png
similarity index 100%
rename from android/src/main/assets/exp_bar.png
rename to core/src/main/assets/exp_bar.png
diff --git a/android/src/main/assets/eye.png b/core/src/main/assets/eye.png
similarity index 100%
rename from android/src/main/assets/eye.png
rename to core/src/main/assets/eye.png
diff --git a/android/src/main/assets/fireball.png b/core/src/main/assets/fireball.png
similarity index 100%
rename from android/src/main/assets/fireball.png
rename to core/src/main/assets/fireball.png
diff --git a/android/src/main/assets/game.ogg b/core/src/main/assets/game.ogg
similarity index 100%
rename from android/src/main/assets/game.ogg
rename to core/src/main/assets/game.ogg
diff --git a/android/src/main/assets/ghost.png b/core/src/main/assets/ghost.png
similarity index 100%
rename from android/src/main/assets/ghost.png
rename to core/src/main/assets/ghost.png
diff --git a/android/src/main/assets/gnoll.png b/core/src/main/assets/gnoll.png
similarity index 100%
rename from android/src/main/assets/gnoll.png
rename to core/src/main/assets/gnoll.png
diff --git a/android/src/main/assets/golem.png b/core/src/main/assets/golem.png
similarity index 100%
rename from android/src/main/assets/golem.png
rename to core/src/main/assets/golem.png
diff --git a/android/src/main/assets/goo.png b/core/src/main/assets/goo.png
similarity index 100%
rename from android/src/main/assets/goo.png
rename to core/src/main/assets/goo.png
diff --git a/android/src/main/assets/guard.png b/core/src/main/assets/guard.png
similarity index 100%
rename from android/src/main/assets/guard.png
rename to core/src/main/assets/guard.png
diff --git a/android/src/main/assets/guardian.png b/core/src/main/assets/guardian.png
similarity index 100%
rename from android/src/main/assets/guardian.png
rename to core/src/main/assets/guardian.png
diff --git a/android/src/main/assets/hp_bar.png b/core/src/main/assets/hp_bar.png
similarity index 100%
rename from android/src/main/assets/hp_bar.png
rename to core/src/main/assets/hp_bar.png
diff --git a/android/src/main/assets/huntress.png b/core/src/main/assets/huntress.png
similarity index 100%
rename from android/src/main/assets/huntress.png
rename to core/src/main/assets/huntress.png
diff --git a/android/src/main/assets/icons.png b/core/src/main/assets/icons.png
similarity index 100%
rename from android/src/main/assets/icons.png
rename to core/src/main/assets/icons.png
diff --git a/android/src/main/assets/items.png b/core/src/main/assets/items.png
similarity index 100%
rename from android/src/main/assets/items.png
rename to core/src/main/assets/items.png
diff --git a/android/src/main/assets/king.png b/core/src/main/assets/king.png
similarity index 100%
rename from android/src/main/assets/king.png
rename to core/src/main/assets/king.png
diff --git a/android/src/main/assets/large_buffs.png b/core/src/main/assets/large_buffs.png
similarity index 100%
rename from android/src/main/assets/large_buffs.png
rename to core/src/main/assets/large_buffs.png
diff --git a/android/src/main/assets/larva.png b/core/src/main/assets/larva.png
similarity index 100%
rename from android/src/main/assets/larva.png
rename to core/src/main/assets/larva.png
diff --git a/android/src/main/assets/loading_caves.png b/core/src/main/assets/loading_caves.png
similarity index 100%
rename from android/src/main/assets/loading_caves.png
rename to core/src/main/assets/loading_caves.png
diff --git a/android/src/main/assets/loading_city.png b/core/src/main/assets/loading_city.png
similarity index 100%
rename from android/src/main/assets/loading_city.png
rename to core/src/main/assets/loading_city.png
diff --git a/android/src/main/assets/loading_halls.png b/core/src/main/assets/loading_halls.png
similarity index 100%
rename from android/src/main/assets/loading_halls.png
rename to core/src/main/assets/loading_halls.png
diff --git a/android/src/main/assets/loading_prison.png b/core/src/main/assets/loading_prison.png
similarity index 100%
rename from android/src/main/assets/loading_prison.png
rename to core/src/main/assets/loading_prison.png
diff --git a/android/src/main/assets/loading_sewers.png b/core/src/main/assets/loading_sewers.png
similarity index 100%
rename from android/src/main/assets/loading_sewers.png
rename to core/src/main/assets/loading_sewers.png
diff --git a/android/src/main/assets/locked_badge.png b/core/src/main/assets/locked_badge.png
similarity index 100%
rename from android/src/main/assets/locked_badge.png
rename to core/src/main/assets/locked_badge.png
diff --git a/android/src/main/assets/mage.png b/core/src/main/assets/mage.png
similarity index 100%
rename from android/src/main/assets/mage.png
rename to core/src/main/assets/mage.png
diff --git a/android/src/main/assets/menu_button.png b/core/src/main/assets/menu_button.png
similarity index 100%
rename from android/src/main/assets/menu_button.png
rename to core/src/main/assets/menu_button.png
diff --git a/android/src/main/assets/mimic.png b/core/src/main/assets/mimic.png
similarity index 100%
rename from android/src/main/assets/mimic.png
rename to core/src/main/assets/mimic.png
diff --git a/android/src/main/assets/monk.png b/core/src/main/assets/monk.png
similarity index 100%
rename from android/src/main/assets/monk.png
rename to core/src/main/assets/monk.png
diff --git a/android/src/main/assets/necromancer.png b/core/src/main/assets/necromancer.png
similarity index 100%
rename from android/src/main/assets/necromancer.png
rename to core/src/main/assets/necromancer.png
diff --git a/android/src/main/assets/pet.png b/core/src/main/assets/pet.png
similarity index 100%
rename from android/src/main/assets/pet.png
rename to core/src/main/assets/pet.png
diff --git a/android/src/main/assets/piranha.png b/core/src/main/assets/piranha.png
similarity index 100%
rename from android/src/main/assets/piranha.png
rename to core/src/main/assets/piranha.png
diff --git a/android/src/main/assets/pixel_font.png b/core/src/main/assets/pixel_font.png
similarity index 100%
rename from android/src/main/assets/pixel_font.png
rename to core/src/main/assets/pixel_font.png
diff --git a/android/src/main/assets/pixel_font.ttf b/core/src/main/assets/pixel_font.ttf
similarity index 100%
rename from android/src/main/assets/pixel_font.ttf
rename to core/src/main/assets/pixel_font.ttf
diff --git a/android/src/main/assets/rat.png b/core/src/main/assets/rat.png
similarity index 100%
rename from android/src/main/assets/rat.png
rename to core/src/main/assets/rat.png
diff --git a/android/src/main/assets/ratking.png b/core/src/main/assets/ratking.png
similarity index 100%
rename from android/src/main/assets/ratking.png
rename to core/src/main/assets/ratking.png
diff --git a/android/src/main/assets/rogue.png b/core/src/main/assets/rogue.png
similarity index 100%
rename from android/src/main/assets/rogue.png
rename to core/src/main/assets/rogue.png
diff --git a/android/src/main/assets/rot_heart.png b/core/src/main/assets/rot_heart.png
similarity index 100%
rename from android/src/main/assets/rot_heart.png
rename to core/src/main/assets/rot_heart.png
diff --git a/android/src/main/assets/rot_lasher.png b/core/src/main/assets/rot_lasher.png
similarity index 100%
rename from android/src/main/assets/rot_lasher.png
rename to core/src/main/assets/rot_lasher.png
diff --git a/android/src/main/assets/rotting_fist.png b/core/src/main/assets/rotting_fist.png
similarity index 100%
rename from android/src/main/assets/rotting_fist.png
rename to core/src/main/assets/rotting_fist.png
diff --git a/android/src/main/assets/scorpio.png b/core/src/main/assets/scorpio.png
similarity index 100%
rename from android/src/main/assets/scorpio.png
rename to core/src/main/assets/scorpio.png
diff --git a/android/src/main/assets/shadow.png b/core/src/main/assets/shadow.png
similarity index 100%
rename from android/src/main/assets/shadow.png
rename to core/src/main/assets/shadow.png
diff --git a/android/src/main/assets/shaman.png b/core/src/main/assets/shaman.png
similarity index 100%
rename from android/src/main/assets/shaman.png
rename to core/src/main/assets/shaman.png
diff --git a/android/src/main/assets/sheep.png b/core/src/main/assets/sheep.png
similarity index 100%
rename from android/src/main/assets/sheep.png
rename to core/src/main/assets/sheep.png
diff --git a/android/src/main/assets/shield_bar.png b/core/src/main/assets/shield_bar.png
similarity index 100%
rename from android/src/main/assets/shield_bar.png
rename to core/src/main/assets/shield_bar.png
diff --git a/android/src/main/assets/shopkeeper.png b/core/src/main/assets/shopkeeper.png
similarity index 100%
rename from android/src/main/assets/shopkeeper.png
rename to core/src/main/assets/shopkeeper.png
diff --git a/android/src/main/assets/skeleton.png b/core/src/main/assets/skeleton.png
similarity index 100%
rename from android/src/main/assets/skeleton.png
rename to core/src/main/assets/skeleton.png
diff --git a/android/src/main/assets/slime.png b/core/src/main/assets/slime.png
similarity index 100%
rename from android/src/main/assets/slime.png
rename to core/src/main/assets/slime.png
diff --git a/android/src/main/assets/snake.png b/core/src/main/assets/snake.png
similarity index 100%
rename from android/src/main/assets/snake.png
rename to core/src/main/assets/snake.png
diff --git a/android/src/main/assets/snd_alert.mp3 b/core/src/main/assets/snd_alert.mp3
similarity index 100%
rename from android/src/main/assets/snd_alert.mp3
rename to core/src/main/assets/snd_alert.mp3
diff --git a/android/src/main/assets/snd_badge.mp3 b/core/src/main/assets/snd_badge.mp3
similarity index 100%
rename from android/src/main/assets/snd_badge.mp3
rename to core/src/main/assets/snd_badge.mp3
diff --git a/android/src/main/assets/snd_beacon.mp3 b/core/src/main/assets/snd_beacon.mp3
similarity index 100%
rename from android/src/main/assets/snd_beacon.mp3
rename to core/src/main/assets/snd_beacon.mp3
diff --git a/android/src/main/assets/snd_bee.mp3 b/core/src/main/assets/snd_bee.mp3
similarity index 100%
rename from android/src/main/assets/snd_bee.mp3
rename to core/src/main/assets/snd_bee.mp3
diff --git a/android/src/main/assets/snd_blast.mp3 b/core/src/main/assets/snd_blast.mp3
similarity index 100%
rename from android/src/main/assets/snd_blast.mp3
rename to core/src/main/assets/snd_blast.mp3
diff --git a/android/src/main/assets/snd_bones.mp3 b/core/src/main/assets/snd_bones.mp3
similarity index 100%
rename from android/src/main/assets/snd_bones.mp3
rename to core/src/main/assets/snd_bones.mp3
diff --git a/android/src/main/assets/snd_boss.mp3 b/core/src/main/assets/snd_boss.mp3
similarity index 100%
rename from android/src/main/assets/snd_boss.mp3
rename to core/src/main/assets/snd_boss.mp3
diff --git a/android/src/main/assets/snd_burning.mp3 b/core/src/main/assets/snd_burning.mp3
similarity index 100%
rename from android/src/main/assets/snd_burning.mp3
rename to core/src/main/assets/snd_burning.mp3
diff --git a/android/src/main/assets/snd_challenge.mp3 b/core/src/main/assets/snd_challenge.mp3
similarity index 100%
rename from android/src/main/assets/snd_challenge.mp3
rename to core/src/main/assets/snd_challenge.mp3
diff --git a/android/src/main/assets/snd_charms.mp3 b/core/src/main/assets/snd_charms.mp3
similarity index 100%
rename from android/src/main/assets/snd_charms.mp3
rename to core/src/main/assets/snd_charms.mp3
diff --git a/android/src/main/assets/snd_click.mp3 b/core/src/main/assets/snd_click.mp3
similarity index 100%
rename from android/src/main/assets/snd_click.mp3
rename to core/src/main/assets/snd_click.mp3
diff --git a/android/src/main/assets/snd_cursed.mp3 b/core/src/main/assets/snd_cursed.mp3
similarity index 100%
rename from android/src/main/assets/snd_cursed.mp3
rename to core/src/main/assets/snd_cursed.mp3
diff --git a/android/src/main/assets/snd_death.mp3 b/core/src/main/assets/snd_death.mp3
similarity index 100%
rename from android/src/main/assets/snd_death.mp3
rename to core/src/main/assets/snd_death.mp3
diff --git a/android/src/main/assets/snd_degrade.mp3 b/core/src/main/assets/snd_degrade.mp3
similarity index 100%
rename from android/src/main/assets/snd_degrade.mp3
rename to core/src/main/assets/snd_degrade.mp3
diff --git a/android/src/main/assets/snd_descend.mp3 b/core/src/main/assets/snd_descend.mp3
similarity index 100%
rename from android/src/main/assets/snd_descend.mp3
rename to core/src/main/assets/snd_descend.mp3
diff --git a/android/src/main/assets/snd_dewdrop.mp3 b/core/src/main/assets/snd_dewdrop.mp3
similarity index 100%
rename from android/src/main/assets/snd_dewdrop.mp3
rename to core/src/main/assets/snd_dewdrop.mp3
diff --git a/android/src/main/assets/snd_door_open.mp3 b/core/src/main/assets/snd_door_open.mp3
similarity index 100%
rename from android/src/main/assets/snd_door_open.mp3
rename to core/src/main/assets/snd_door_open.mp3
diff --git a/android/src/main/assets/snd_drink.mp3 b/core/src/main/assets/snd_drink.mp3
similarity index 100%
rename from android/src/main/assets/snd_drink.mp3
rename to core/src/main/assets/snd_drink.mp3
diff --git a/android/src/main/assets/snd_eat.mp3 b/core/src/main/assets/snd_eat.mp3
similarity index 100%
rename from android/src/main/assets/snd_eat.mp3
rename to core/src/main/assets/snd_eat.mp3
diff --git a/android/src/main/assets/snd_evoke.mp3 b/core/src/main/assets/snd_evoke.mp3
similarity index 100%
rename from android/src/main/assets/snd_evoke.mp3
rename to core/src/main/assets/snd_evoke.mp3
diff --git a/android/src/main/assets/snd_falling.mp3 b/core/src/main/assets/snd_falling.mp3
similarity index 100%
rename from android/src/main/assets/snd_falling.mp3
rename to core/src/main/assets/snd_falling.mp3
diff --git a/android/src/main/assets/snd_ghost.mp3 b/core/src/main/assets/snd_ghost.mp3
similarity index 100%
rename from android/src/main/assets/snd_ghost.mp3
rename to core/src/main/assets/snd_ghost.mp3
diff --git a/android/src/main/assets/snd_gold.mp3 b/core/src/main/assets/snd_gold.mp3
similarity index 100%
rename from android/src/main/assets/snd_gold.mp3
rename to core/src/main/assets/snd_gold.mp3
diff --git a/android/src/main/assets/snd_hit.mp3 b/core/src/main/assets/snd_hit.mp3
similarity index 100%
rename from android/src/main/assets/snd_hit.mp3
rename to core/src/main/assets/snd_hit.mp3
diff --git a/android/src/main/assets/snd_item.mp3 b/core/src/main/assets/snd_item.mp3
similarity index 100%
rename from android/src/main/assets/snd_item.mp3
rename to core/src/main/assets/snd_item.mp3
diff --git a/android/src/main/assets/snd_levelup.mp3 b/core/src/main/assets/snd_levelup.mp3
similarity index 100%
rename from android/src/main/assets/snd_levelup.mp3
rename to core/src/main/assets/snd_levelup.mp3
diff --git a/android/src/main/assets/snd_lightning.mp3 b/core/src/main/assets/snd_lightning.mp3
similarity index 100%
rename from android/src/main/assets/snd_lightning.mp3
rename to core/src/main/assets/snd_lightning.mp3
diff --git a/android/src/main/assets/snd_lullaby.mp3 b/core/src/main/assets/snd_lullaby.mp3
similarity index 100%
rename from android/src/main/assets/snd_lullaby.mp3
rename to core/src/main/assets/snd_lullaby.mp3
diff --git a/android/src/main/assets/snd_mastery.mp3 b/core/src/main/assets/snd_mastery.mp3
similarity index 100%
rename from android/src/main/assets/snd_mastery.mp3
rename to core/src/main/assets/snd_mastery.mp3
diff --git a/android/src/main/assets/snd_meld.mp3 b/core/src/main/assets/snd_meld.mp3
similarity index 100%
rename from android/src/main/assets/snd_meld.mp3
rename to core/src/main/assets/snd_meld.mp3
diff --git a/android/src/main/assets/snd_mimic.mp3 b/core/src/main/assets/snd_mimic.mp3
similarity index 100%
rename from android/src/main/assets/snd_mimic.mp3
rename to core/src/main/assets/snd_mimic.mp3
diff --git a/android/src/main/assets/snd_miss.mp3 b/core/src/main/assets/snd_miss.mp3
similarity index 100%
rename from android/src/main/assets/snd_miss.mp3
rename to core/src/main/assets/snd_miss.mp3
diff --git a/android/src/main/assets/snd_plant.mp3 b/core/src/main/assets/snd_plant.mp3
similarity index 100%
rename from android/src/main/assets/snd_plant.mp3
rename to core/src/main/assets/snd_plant.mp3
diff --git a/android/src/main/assets/snd_puff.mp3 b/core/src/main/assets/snd_puff.mp3
similarity index 100%
rename from android/src/main/assets/snd_puff.mp3
rename to core/src/main/assets/snd_puff.mp3
diff --git a/android/src/main/assets/snd_ray.mp3 b/core/src/main/assets/snd_ray.mp3
similarity index 100%
rename from android/src/main/assets/snd_ray.mp3
rename to core/src/main/assets/snd_ray.mp3
diff --git a/android/src/main/assets/snd_read.mp3 b/core/src/main/assets/snd_read.mp3
similarity index 100%
rename from android/src/main/assets/snd_read.mp3
rename to core/src/main/assets/snd_read.mp3
diff --git a/android/src/main/assets/snd_rocks.mp3 b/core/src/main/assets/snd_rocks.mp3
similarity index 100%
rename from android/src/main/assets/snd_rocks.mp3
rename to core/src/main/assets/snd_rocks.mp3
diff --git a/android/src/main/assets/snd_secret.mp3 b/core/src/main/assets/snd_secret.mp3
similarity index 100%
rename from android/src/main/assets/snd_secret.mp3
rename to core/src/main/assets/snd_secret.mp3
diff --git a/android/src/main/assets/snd_shatter.mp3 b/core/src/main/assets/snd_shatter.mp3
similarity index 100%
rename from android/src/main/assets/snd_shatter.mp3
rename to core/src/main/assets/snd_shatter.mp3
diff --git a/android/src/main/assets/snd_step.mp3 b/core/src/main/assets/snd_step.mp3
similarity index 100%
rename from android/src/main/assets/snd_step.mp3
rename to core/src/main/assets/snd_step.mp3
diff --git a/android/src/main/assets/snd_teleport.mp3 b/core/src/main/assets/snd_teleport.mp3
similarity index 100%
rename from android/src/main/assets/snd_teleport.mp3
rename to core/src/main/assets/snd_teleport.mp3
diff --git a/android/src/main/assets/snd_tomb.mp3 b/core/src/main/assets/snd_tomb.mp3
similarity index 100%
rename from android/src/main/assets/snd_tomb.mp3
rename to core/src/main/assets/snd_tomb.mp3
diff --git a/android/src/main/assets/snd_trap.mp3 b/core/src/main/assets/snd_trap.mp3
similarity index 100%
rename from android/src/main/assets/snd_trap.mp3
rename to core/src/main/assets/snd_trap.mp3
diff --git a/android/src/main/assets/snd_unlock.mp3 b/core/src/main/assets/snd_unlock.mp3
similarity index 100%
rename from android/src/main/assets/snd_unlock.mp3
rename to core/src/main/assets/snd_unlock.mp3
diff --git a/android/src/main/assets/snd_water.mp3 b/core/src/main/assets/snd_water.mp3
similarity index 100%
rename from android/src/main/assets/snd_water.mp3
rename to core/src/main/assets/snd_water.mp3
diff --git a/android/src/main/assets/snd_zap.mp3 b/core/src/main/assets/snd_zap.mp3
similarity index 100%
rename from android/src/main/assets/snd_zap.mp3
rename to core/src/main/assets/snd_zap.mp3
diff --git a/android/src/main/assets/specks.png b/core/src/main/assets/specks.png
similarity index 100%
rename from android/src/main/assets/specks.png
rename to core/src/main/assets/specks.png
diff --git a/android/src/main/assets/spell_icons.png b/core/src/main/assets/spell_icons.png
similarity index 100%
rename from android/src/main/assets/spell_icons.png
rename to core/src/main/assets/spell_icons.png
diff --git a/android/src/main/assets/spinner.png b/core/src/main/assets/spinner.png
similarity index 100%
rename from android/src/main/assets/spinner.png
rename to core/src/main/assets/spinner.png
diff --git a/android/src/main/assets/statue.png b/core/src/main/assets/statue.png
similarity index 100%
rename from android/src/main/assets/statue.png
rename to core/src/main/assets/statue.png
diff --git a/android/src/main/assets/status_pane.png b/core/src/main/assets/status_pane.png
similarity index 100%
rename from android/src/main/assets/status_pane.png
rename to core/src/main/assets/status_pane.png
diff --git a/android/src/main/assets/succubus.png b/core/src/main/assets/succubus.png
similarity index 100%
rename from android/src/main/assets/succubus.png
rename to core/src/main/assets/succubus.png
diff --git a/android/src/main/assets/surface.ogg b/core/src/main/assets/surface.ogg
similarity index 100%
rename from android/src/main/assets/surface.ogg
rename to core/src/main/assets/surface.ogg
diff --git a/android/src/main/assets/surface.png b/core/src/main/assets/surface.png
similarity index 100%
rename from android/src/main/assets/surface.png
rename to core/src/main/assets/surface.png
diff --git a/android/src/main/assets/swarm.png b/core/src/main/assets/swarm.png
similarity index 100%
rename from android/src/main/assets/swarm.png
rename to core/src/main/assets/swarm.png
diff --git a/android/src/main/assets/tengu.png b/core/src/main/assets/tengu.png
similarity index 100%
rename from android/src/main/assets/tengu.png
rename to core/src/main/assets/tengu.png
diff --git a/android/src/main/assets/terrain_features.png b/core/src/main/assets/terrain_features.png
similarity index 100%
rename from android/src/main/assets/terrain_features.png
rename to core/src/main/assets/terrain_features.png
diff --git a/android/src/main/assets/theme.ogg b/core/src/main/assets/theme.ogg
similarity index 100%
rename from android/src/main/assets/theme.ogg
rename to core/src/main/assets/theme.ogg
diff --git a/android/src/main/assets/thief.png b/core/src/main/assets/thief.png
similarity index 100%
rename from android/src/main/assets/thief.png
rename to core/src/main/assets/thief.png
diff --git a/android/src/main/assets/tiles_caves.png b/core/src/main/assets/tiles_caves.png
similarity index 100%
rename from android/src/main/assets/tiles_caves.png
rename to core/src/main/assets/tiles_caves.png
diff --git a/android/src/main/assets/tiles_city.png b/core/src/main/assets/tiles_city.png
similarity index 100%
rename from android/src/main/assets/tiles_city.png
rename to core/src/main/assets/tiles_city.png
diff --git a/android/src/main/assets/tiles_halls.png b/core/src/main/assets/tiles_halls.png
similarity index 100%
rename from android/src/main/assets/tiles_halls.png
rename to core/src/main/assets/tiles_halls.png
diff --git a/android/src/main/assets/tiles_prison.png b/core/src/main/assets/tiles_prison.png
similarity index 100%
rename from android/src/main/assets/tiles_prison.png
rename to core/src/main/assets/tiles_prison.png
diff --git a/android/src/main/assets/tiles_sewers.png b/core/src/main/assets/tiles_sewers.png
similarity index 100%
rename from android/src/main/assets/tiles_sewers.png
rename to core/src/main/assets/tiles_sewers.png
diff --git a/android/src/main/assets/toolbar.png b/core/src/main/assets/toolbar.png
similarity index 100%
rename from android/src/main/assets/toolbar.png
rename to core/src/main/assets/toolbar.png
diff --git a/android/src/main/assets/undead.png b/core/src/main/assets/undead.png
similarity index 100%
rename from android/src/main/assets/undead.png
rename to core/src/main/assets/undead.png
diff --git a/android/src/main/assets/visual_grid.png b/core/src/main/assets/visual_grid.png
similarity index 100%
rename from android/src/main/assets/visual_grid.png
rename to core/src/main/assets/visual_grid.png
diff --git a/android/src/main/assets/wall_blocking.png b/core/src/main/assets/wall_blocking.png
similarity index 100%
rename from android/src/main/assets/wall_blocking.png
rename to core/src/main/assets/wall_blocking.png
diff --git a/android/src/main/assets/wandmaker.png b/core/src/main/assets/wandmaker.png
similarity index 100%
rename from android/src/main/assets/wandmaker.png
rename to core/src/main/assets/wandmaker.png
diff --git a/android/src/main/assets/wards.png b/core/src/main/assets/wards.png
similarity index 100%
rename from android/src/main/assets/wards.png
rename to core/src/main/assets/wards.png
diff --git a/android/src/main/assets/warlock.png b/core/src/main/assets/warlock.png
similarity index 100%
rename from android/src/main/assets/warlock.png
rename to core/src/main/assets/warlock.png
diff --git a/android/src/main/assets/warrior.png b/core/src/main/assets/warrior.png
similarity index 100%
rename from android/src/main/assets/warrior.png
rename to core/src/main/assets/warrior.png
diff --git a/android/src/main/assets/water0.png b/core/src/main/assets/water0.png
similarity index 100%
rename from android/src/main/assets/water0.png
rename to core/src/main/assets/water0.png
diff --git a/android/src/main/assets/water1.png b/core/src/main/assets/water1.png
similarity index 100%
rename from android/src/main/assets/water1.png
rename to core/src/main/assets/water1.png
diff --git a/android/src/main/assets/water2.png b/core/src/main/assets/water2.png
similarity index 100%
rename from android/src/main/assets/water2.png
rename to core/src/main/assets/water2.png
diff --git a/android/src/main/assets/water3.png b/core/src/main/assets/water3.png
similarity index 100%
rename from android/src/main/assets/water3.png
rename to core/src/main/assets/water3.png
diff --git a/android/src/main/assets/water4.png b/core/src/main/assets/water4.png
similarity index 100%
rename from android/src/main/assets/water4.png
rename to core/src/main/assets/water4.png
diff --git a/android/src/main/assets/wraith.png b/core/src/main/assets/wraith.png
similarity index 100%
rename from android/src/main/assets/wraith.png
rename to core/src/main/assets/wraith.png
diff --git a/android/src/main/assets/yog.png b/core/src/main/assets/yog.png
similarity index 100%
rename from android/src/main/assets/yog.png
rename to core/src/main/assets/yog.png
diff --git a/desktop/build.gradle b/desktop/build.gradle
index 6adcfe77d..5345c79ba 100644
--- a/desktop/build.gradle
+++ b/desktop/build.gradle
@@ -1,52 +1,24 @@
-/*
- * Pixel Dungeon
- * Copyright (C) 2012-2015 Oleg Dolya
- *
- * Shattered Pixel Dungeon
- * Copyright (C) 2014-2019 Evan Debenham
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- */
-
 apply plugin: "java"
 
-sourceSets.main.java.srcDirs = [ "src/" ]
-
-ext {
-    mainClassName = "com.shatteredpixel.shatteredpixeldungeon.desktop.DesktopLauncher"
-    //desktop-specific resources and shared resources
-    //TODO shared resources can probably be moved out of android module, right?
-    assetsDirs = ["../android/src/main/assets", "assets/"]
-}
-
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
+sourceCompatibility = targetCompatibility = appJavaCompatibility
 
-task runDebug(type: JavaExec) {
-    main = mainClassName
+sourceSets.main.resources.srcDirs = [new File(project(':core').projectDir, "/src/main/assets"),
+                                     new File(project(':desktop').projectDir,"/src/main/assets")]
+
+task runDebug(dependsOn: classes, type: JavaExec) {
+    main = "com.shatteredpixel.shatteredpixeldungeon.desktop.DesktopLauncher"
     classpath = sourceSets.main.runtimeClasspath
-    sourceSets.main.resources.srcDirs = assetsDirs
 
     ignoreExitValue = true
 }
 
-task releaseJAR(type: Jar) {
+task releaseJAR(dependsOn: classes, type: Jar) {
     from sourceSets.main.output
-    sourceSets.main.resources.srcDirs = assetsDirs
     from { configurations.runtimeClasspath.findAll { it.name.endsWith('jar') }.collect { zipTree(it) } }
 
     manifest {
-        attributes 'Main-Class': mainClassName
+        attributes 'Main-Class': "com.shatteredpixel.shatteredpixeldungeon.desktop.DesktopLauncher"
         attributes 'Specification-Name': appName
         attributes 'Specification-Version': appVersionName
         attributes 'Implementation-Version': appVersionCode
diff --git a/desktop/assets/DroidSansFallback.ttf b/desktop/src/main/assets/DroidSansFallback.ttf
similarity index 100%
rename from desktop/assets/DroidSansFallback.ttf
rename to desktop/src/main/assets/DroidSansFallback.ttf
diff --git a/desktop/src/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopLauncher.java b/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopLauncher.java
similarity index 100%
rename from desktop/src/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopLauncher.java
rename to desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopLauncher.java
diff --git a/desktop/src/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopPlatformSupport.java b/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopPlatformSupport.java
similarity index 100%
rename from desktop/src/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopPlatformSupport.java
rename to desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopPlatformSupport.java