diff --git a/.gitattributes b/.gitattributes
index 070358ca..26887740 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-android/assets/* linguist-vendored
\ No newline at end of file
+assets/* linguist-vendored
diff --git a/.idea/runConfigurations/AnimationTool.xml b/.idea/runConfigurations/AnimationTool.xml
index 06566247..eb65a685 100644
--- a/.idea/runConfigurations/AnimationTool.xml
+++ b/.idea/runConfigurations/AnimationTool.xml
@@ -4,7 +4,7 @@
     <module name="tools" />
     <option name="PROGRAM_PARAMETERS" value="&quot;C:\Program Files (x86)\Steam\steamapps\common\Diablo II&quot;" />
     <option name="VM_PARAMETERS" value="-ea" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/BreakpointsTool.xml b/.idea/runConfigurations/BreakpointsTool.xml
index bfa5b3b1..925eb471 100644
--- a/.idea/runConfigurations/BreakpointsTool.xml
+++ b/.idea/runConfigurations/BreakpointsTool.xml
@@ -3,7 +3,7 @@
     <option name="MAIN_CLASS_NAME" value="com.riiablo.BreakpointsTool" />
     <module name="tools" />
     <option name="VM_PARAMETERS" value="-ea" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/COF_Finder.xml b/.idea/runConfigurations/COF_Finder.xml
index 57c85f9e..3a6145f0 100644
--- a/.idea/runConfigurations/COF_Finder.xml
+++ b/.idea/runConfigurations/COF_Finder.xml
@@ -4,7 +4,7 @@
     <module name="tools" />
     <option name="PROGRAM_PARAMETERS" value="&quot;C:\Program Files (x86)\Steam\steamapps\common\Diablo II&quot; SKDT1HS" />
     <option name="VM_PARAMETERS" value="-ea" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/CameraTool.xml b/.idea/runConfigurations/CameraTool.xml
index bef26cf1..a3c2dfac 100644
--- a/.idea/runConfigurations/CameraTool.xml
+++ b/.idea/runConfigurations/CameraTool.xml
@@ -3,7 +3,7 @@
     <option name="MAIN_CLASS_NAME" value="com.riiablo.camera.CameraTool" />
     <module name="tools" />
     <option name="VM_PARAMETERS" value="-ea" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/D2_Finder.xml b/.idea/runConfigurations/D2_Finder.xml
index 6fc55eb9..2dc3f942 100644
--- a/.idea/runConfigurations/D2_Finder.xml
+++ b/.idea/runConfigurations/D2_Finder.xml
@@ -4,7 +4,7 @@
     <module name="tools" />
     <option name="PROGRAM_PARAMETERS" value="&quot;C:\Program Files (x86)\Steam\steamapps\common\Diablo II&quot; SOSC1HS" />
     <option name="VM_PARAMETERS" value="-ea" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/DirectionTool.xml b/.idea/runConfigurations/DirectionTool.xml
index 2f420248..6021a084 100644
--- a/.idea/runConfigurations/DirectionTool.xml
+++ b/.idea/runConfigurations/DirectionTool.xml
@@ -3,7 +3,7 @@
     <option name="MAIN_CLASS_NAME" value="com.riiablo.engine.DirectionTool" />
     <module name="tools" />
     <option name="VM_PARAMETERS" value="-ea" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/ExcelGenerationTool.xml b/.idea/runConfigurations/ExcelGenerationTool.xml
index b34a456e..079bfb1a 100644
--- a/.idea/runConfigurations/ExcelGenerationTool.xml
+++ b/.idea/runConfigurations/ExcelGenerationTool.xml
@@ -4,7 +4,7 @@
     <module name="tools" />
     <option name="PROGRAM_PARAMETERS" value="com.riiablo.codec.excel.MonStats" />
     <option name="VM_PARAMETERS" value="-ea" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/FontMetricsTool.xml b/.idea/runConfigurations/FontMetricsTool.xml
index 7639ec2a..ac08d6ff 100644
--- a/.idea/runConfigurations/FontMetricsTool.xml
+++ b/.idea/runConfigurations/FontMetricsTool.xml
@@ -4,7 +4,7 @@
     <module name="tools" />
     <option name="PROGRAM_PARAMETERS" value="&quot;C:\Program Files (x86)\Steam\steamapps\common\Diablo II&quot; font8" />
     <option name="VM_PARAMETERS" value="-ea" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Map_Viewer.xml b/.idea/runConfigurations/Map_Viewer.xml
index 1565da5d..f10f3cea 100644
--- a/.idea/runConfigurations/Map_Viewer.xml
+++ b/.idea/runConfigurations/Map_Viewer.xml
@@ -4,7 +4,7 @@
     <module name="tools" />
     <option name="PROGRAM_PARAMETERS" value="&quot;C:\Program Files (x86)\Steam\steamapps\common\Diablo II&quot; 0 0 0" />
     <option name="VM_PARAMETERS" value="-ea" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/desktop__debug_.xml b/.idea/runConfigurations/desktop__debug_.xml
index 55299b8b..ac7e691b 100644
--- a/.idea/runConfigurations/desktop__debug_.xml
+++ b/.idea/runConfigurations/desktop__debug_.xml
@@ -4,7 +4,7 @@
     <module name="desktop" />
     <option name="PROGRAM_PARAMETERS" value="-fps -w -logLevel debug -home &quot;C:\Program Files (x86)/steam/steamapps/common/Diablo II&quot;" />
     <option name="VM_PARAMETERS" value="-ea" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/desktop__debug___1280x720_.xml b/.idea/runConfigurations/desktop__debug___1280x720_.xml
index 8eb7edec..47be9267 100644
--- a/.idea/runConfigurations/desktop__debug___1280x720_.xml
+++ b/.idea/runConfigurations/desktop__debug___1280x720_.xml
@@ -4,7 +4,7 @@
     <module name="desktop" />
     <option name="PROGRAM_PARAMETERS" value="-i 1280 -o 720 -fps -w -logLevel debug -home &quot;C:\Program Files (x86)\Steam\steamapps\common\Diablo II&quot;" />
     <option name="VM_PARAMETERS" value="-ea" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/desktop__debug___640x480_.xml b/.idea/runConfigurations/desktop__debug___640x480_.xml
index 5e9f101e..ae01ab6d 100644
--- a/.idea/runConfigurations/desktop__debug___640x480_.xml
+++ b/.idea/runConfigurations/desktop__debug___640x480_.xml
@@ -4,7 +4,7 @@
     <module name="desktop" />
     <option name="PROGRAM_PARAMETERS" value="-i 640 -o 480 -fps -w -logLevel debug -home &quot;C:\Program Files (x86)\Steam\steamapps\common\Diablo II&quot;" />
     <option name="VM_PARAMETERS" value="-ea" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/desktop__debug___720x360_.xml b/.idea/runConfigurations/desktop__debug___720x360_.xml
index b88f0be1..0a0fbbc1 100644
--- a/.idea/runConfigurations/desktop__debug___720x360_.xml
+++ b/.idea/runConfigurations/desktop__debug___720x360_.xml
@@ -4,7 +4,7 @@
     <module name="desktop" />
     <option name="PROGRAM_PARAMETERS" value="-i 720 -o 360 -fps -w -logLevel debug -home &quot;C:\Program Files (x86)\Steam\steamapps\common\Diablo II&quot;" />
     <option name="VM_PARAMETERS" value="-ea" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/desktop__debug___840x360_.xml b/.idea/runConfigurations/desktop__debug___840x360_.xml
index cea9979b..7f28fe50 100644
--- a/.idea/runConfigurations/desktop__debug___840x360_.xml
+++ b/.idea/runConfigurations/desktop__debug___840x360_.xml
@@ -4,7 +4,7 @@
     <module name="desktop" />
     <option name="PROGRAM_PARAMETERS" value="-i 840 -o 360 -fps -w -logLevel debug -home &quot;C:\Program Files (x86)\Steam\steamapps\common\Diablo II&quot;" />
     <option name="VM_PARAMETERS" value="-ea" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/desktop__debug___853x480_.xml b/.idea/runConfigurations/desktop__debug___853x480_.xml
index 937fc35d..4b23e0d6 100644
--- a/.idea/runConfigurations/desktop__debug___853x480_.xml
+++ b/.idea/runConfigurations/desktop__debug___853x480_.xml
@@ -4,7 +4,7 @@
     <module name="desktop" />
     <option name="PROGRAM_PARAMETERS" value="-i 853 -o 480 -fps -w -logLevel debug -home &quot;C:\Program Files (x86)\Steam\steamapps\common\Diablo II&quot;" />
     <option name="VM_PARAMETERS" value="-ea" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/desktop__debug___854x480_.xml b/.idea/runConfigurations/desktop__debug___854x480_.xml
index 2064584a..c3e7e32b 100644
--- a/.idea/runConfigurations/desktop__debug___854x480_.xml
+++ b/.idea/runConfigurations/desktop__debug___854x480_.xml
@@ -4,7 +4,7 @@
     <module name="desktop" />
     <option name="PROGRAM_PARAMETERS" value="-i 854 -o 480 -fps -w -logLevel debug -home &quot;C:\Program Files (x86)\Steam\steamapps\common\Diablo II&quot;" />
     <option name="VM_PARAMETERS" value="-ea" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android/assets" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/assets" />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/android/build.gradle b/android/build.gradle
index 048c7972..7abe36e0 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -10,7 +10,7 @@ android {
       aidl.srcDirs = ['src/main/java']
       renderscript.srcDirs = ['src/main/java']
       res.srcDirs = ['res']
-      assets.srcDirs = ['assets']
+      assets.srcDirs = ['../assets']
       jniLibs.srcDirs = ['libs']
     }
   }
diff --git a/android/assets/(listfile) b/assets/(listfile)
similarity index 100%
rename from android/assets/(listfile)
rename to assets/(listfile)
diff --git a/android/assets/(listfile).0 b/assets/(listfile).0
similarity index 100%
rename from android/assets/(listfile).0
rename to assets/(listfile).0
diff --git a/android/assets/(listfile).1 b/assets/(listfile).1
similarity index 100%
rename from android/assets/(listfile).1
rename to assets/(listfile).1
diff --git a/android/assets/consolas12.fnt b/assets/consolas12.fnt
similarity index 100%
rename from android/assets/consolas12.fnt
rename to assets/consolas12.fnt
diff --git a/android/assets/consolas12.png b/assets/consolas12.png
similarity index 100%
rename from android/assets/consolas12.png
rename to assets/consolas12.png
diff --git a/android/assets/consolas16.fnt b/assets/consolas16.fnt
similarity index 100%
rename from android/assets/consolas16.fnt
rename to assets/consolas16.fnt
diff --git a/android/assets/consolas16.png b/assets/consolas16.png
similarity index 100%
rename from android/assets/consolas16.png
rename to assets/consolas16.png
diff --git a/android/assets/consolas48.fnt b/assets/consolas48.fnt
similarity index 100%
rename from android/assets/consolas48.fnt
rename to assets/consolas48.fnt
diff --git a/android/assets/consolas48.png b/assets/consolas48.png
similarity index 100%
rename from android/assets/consolas48.png
rename to assets/consolas48.png
diff --git a/android/assets/consolas8.fnt b/assets/consolas8.fnt
similarity index 100%
rename from android/assets/consolas8.fnt
rename to assets/consolas8.fnt
diff --git a/android/assets/consolas8.png b/assets/consolas8.png
similarity index 100%
rename from android/assets/consolas8.png
rename to assets/consolas8.png
diff --git a/android/assets/data/ds1types.txt b/assets/data/ds1types.txt
similarity index 100%
rename from android/assets/data/ds1types.txt
rename to assets/data/ds1types.txt
diff --git a/android/assets/data/obj.txt b/assets/data/obj.txt
similarity index 100%
rename from android/assets/data/obj.txt
rename to assets/data/obj.txt
diff --git a/android/assets/data/quests.txt b/assets/data/quests.txt
similarity index 100%
rename from android/assets/data/quests.txt
rename to assets/data/quests.txt
diff --git a/android/assets/data/speech.txt b/assets/data/speech.txt
similarity index 100%
rename from android/assets/data/speech.txt
rename to assets/data/speech.txt
diff --git a/android/assets/default.fnt b/assets/default.fnt
similarity index 100%
rename from android/assets/default.fnt
rename to assets/default.fnt
diff --git a/android/assets/default.png b/assets/default.png
similarity index 100%
rename from android/assets/default.png
rename to assets/default.png
diff --git a/android/assets/ds1edit.dt1 b/assets/ds1edit.dt1
similarity index 100%
rename from android/assets/ds1edit.dt1
rename to assets/ds1edit.dt1
diff --git a/android/assets/ic_launcher_128.png b/assets/ic_launcher_128.png
similarity index 100%
rename from android/assets/ic_launcher_128.png
rename to assets/ic_launcher_128.png
diff --git a/android/assets/ic_launcher_16.png b/assets/ic_launcher_16.png
similarity index 100%
rename from android/assets/ic_launcher_16.png
rename to assets/ic_launcher_16.png
diff --git a/android/assets/ic_launcher_32.png b/assets/ic_launcher_32.png
similarity index 100%
rename from android/assets/ic_launcher_32.png
rename to assets/ic_launcher_32.png
diff --git a/android/assets/lang/Client.properties b/assets/lang/Client.properties
similarity index 100%
rename from android/assets/lang/Client.properties
rename to assets/lang/Client.properties
diff --git a/android/assets/profiler/uiskin.atlas b/assets/profiler/uiskin.atlas
similarity index 100%
rename from android/assets/profiler/uiskin.atlas
rename to assets/profiler/uiskin.atlas
diff --git a/android/assets/profiler/uiskin.json b/assets/profiler/uiskin.json
similarity index 100%
rename from android/assets/profiler/uiskin.json
rename to assets/profiler/uiskin.json
diff --git a/android/assets/profiler/uiskin.png b/assets/profiler/uiskin.png
similarity index 100%
rename from android/assets/profiler/uiskin.png
rename to assets/profiler/uiskin.png
diff --git a/android/assets/shaders/indexpalette.frag b/assets/shaders/indexpalette.frag
similarity index 100%
rename from android/assets/shaders/indexpalette.frag
rename to assets/shaders/indexpalette.frag
diff --git a/android/assets/shaders/indexpalette.vert b/assets/shaders/indexpalette.vert
similarity index 100%
rename from android/assets/shaders/indexpalette.vert
rename to assets/shaders/indexpalette.vert
diff --git a/android/assets/shaders/indexpalette2.frag b/assets/shaders/indexpalette2.frag
similarity index 100%
rename from android/assets/shaders/indexpalette2.frag
rename to assets/shaders/indexpalette2.frag
diff --git a/android/assets/shaders/indexpalette2.vert b/assets/shaders/indexpalette2.vert
similarity index 100%
rename from android/assets/shaders/indexpalette2.vert
rename to assets/shaders/indexpalette2.vert
diff --git a/android/assets/shaders/indexpalette3.frag b/assets/shaders/indexpalette3.frag
similarity index 100%
rename from android/assets/shaders/indexpalette3.frag
rename to assets/shaders/indexpalette3.frag
diff --git a/android/assets/shaders/indexpalette3.vert b/assets/shaders/indexpalette3.vert
similarity index 100%
rename from android/assets/shaders/indexpalette3.vert
rename to assets/shaders/indexpalette3.vert
diff --git a/android/assets/textures/touchBackground.png b/assets/textures/touchBackground.png
similarity index 100%
rename from android/assets/textures/touchBackground.png
rename to assets/textures/touchBackground.png
diff --git a/android/assets/textures/touchKnob.png b/assets/textures/touchKnob.png
similarity index 100%
rename from android/assets/textures/touchKnob.png
rename to assets/textures/touchKnob.png
diff --git a/desktop/build.gradle b/desktop/build.gradle
index 6addb1f1..a99896aa 100644
--- a/desktop/build.gradle
+++ b/desktop/build.gradle
@@ -5,7 +5,7 @@ import org.apache.tools.ant.taskdefs.condition.Os
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
 project.ext.mainClassName = 'com.riiablo.DesktopLauncher'
-project.ext.assetsDir = new File('../android/assets');
+project.ext.assetsDir = new File('../assets');
 
 dependencies {
   implementation project(':core')
diff --git a/ds1viewer/build.gradle b/ds1viewer/build.gradle
index 51fee4ea..cc6d7465 100644
--- a/ds1viewer/build.gradle
+++ b/ds1viewer/build.gradle
@@ -5,7 +5,7 @@ import org.apache.tools.ant.taskdefs.condition.Os
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
 project.ext.mainClassName = 'com.riiablo.map.DS1Viewer'
-project.ext.assetsDir = new File('../android/assets');
+project.ext.assetsDir = new File('../assets');
 project.ext.visuiVersion = '1.4.0'
 
 dependencies {
diff --git a/server/d2gs/build.gradle b/server/d2gs/build.gradle
index e0ed7890..6868691c 100644
--- a/server/d2gs/build.gradle
+++ b/server/d2gs/build.gradle
@@ -5,7 +5,7 @@ import org.apache.tools.ant.taskdefs.condition.Os
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
 project.ext.mainClassName = 'com.riiablo.server.d2gs.D2GS'
-project.ext.assetsDir = new File('../../android/assets');
+project.ext.assetsDir = new File('../../assets');
 
 task run(dependsOn: classes, type: JavaExec) {
   main = project.mainClassName
diff --git a/server/netty/build.gradle b/server/netty/build.gradle
index 9b97ce31..2101c4a6 100644
--- a/server/netty/build.gradle
+++ b/server/netty/build.gradle
@@ -5,7 +5,7 @@ import org.apache.tools.ant.taskdefs.condition.Os
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
 project.ext.mainClassName = 'com.riiablo.server.d2gs.Main'
-project.ext.assetsDir = new File("../../android/assets");
+project.ext.assetsDir = new File("../../assets");
 
 task run(dependsOn: classes, type: JavaExec) {
   main = project.mainClassName
diff --git a/tools/src/main/java/com/riiablo/codec/excel/BinGenerationTool.java b/tools/src/main/java/com/riiablo/codec/excel/BinGenerationTool.java
index 88abae23..d939a925 100644
--- a/tools/src/main/java/com/riiablo/codec/excel/BinGenerationTool.java
+++ b/tools/src/main/java/com/riiablo/codec/excel/BinGenerationTool.java
@@ -45,7 +45,7 @@ public class BinGenerationTool extends ApplicationAdapter {
       FileHandle src = home.child("core/src").child(pkgPath);
       Gdx.app.log(TAG, "src=" + src);
 
-      FileHandle dst = home.child("android/assets").child(args[1]);
+      FileHandle dst = home.child("assets").child(args[1]);
       Gdx.app.log(TAG, "dst=" + dst);
 
       FileHandle mpqPath = Gdx.files.absolute(args[2]);
@@ -65,7 +65,7 @@ public class BinGenerationTool extends ApplicationAdapter {
 
         FileHandle txt = mpqs.resolve("data\\global\\excel\\" + name + ".txt");
         if (txt == null) { // attempt to resolve one of my own txts
-          txt = home.child("android/assets/data").child(name + ".txt");
+          txt = home.child("assets/data").child(name + ".txt");
           if (!txt.exists()) continue;
         }
         FileHandle bin = dst.child(name + ".bin");