diff --git a/.idea/runConfigurations/Map_Viewer.xml b/.idea/runConfigurations/Map_Viewer.xml
index dd670203..56f83463 100644
--- a/.idea/runConfigurations/Map_Viewer.xml
+++ b/.idea/runConfigurations/Map_Viewer.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Map Viewer" type="Application" factoryName="Application" singleton="true">
     <option name="MAIN_CLASS_NAME" value="com.riiablo.map.MapViewer" />
-    <module name="riiablo.tools" />
+    <module name="riiablo.tools.map-viewer" />
     <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="$PROJECT_DIR$/assets" />
diff --git a/settings.gradle b/settings.gradle
index 0480b0d2..92ddc8b5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -7,3 +7,4 @@ include 'tools', 'ds1viewer', 'mpqviewer'
 include 'tester'
 include 'server:bnls', 'server:bncs', 'server:mcp', 'server:d2gs'
 include 'server:netty'
+include 'tools:map-viewer'
diff --git a/tools/build.gradle b/tools/build.gradle
index 245639e8..510ed307 100644
--- a/tools/build.gradle
+++ b/tools/build.gradle
@@ -17,3 +17,22 @@ dependencies {
   implementation "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-desktop"
   implementation "com.badlogicgames.box2dlights:box2dlights:$box2DLightsVersion"
 }
+
+subprojects {
+  apply plugin: 'java'
+  apply plugin: 'application'
+
+  dependencies {
+    implementation project(':core')
+    implementation "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
+    implementation "com.badlogicgames.gdx:gdx-backend-headless:$gdxVersion"
+    implementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
+
+    implementation "commons-cli:commons-cli:$cliVersion"
+    implementation "com.kotcrab.vis:vis-ui:$visuiVersion"
+  }
+
+  dependencies {
+    testImplementation 'junit:junit:4.12'
+  }
+}
diff --git a/tools/map-viewer/build.gradle b/tools/map-viewer/build.gradle
new file mode 100644
index 00000000..28bb32f5
--- /dev/null
+++ b/tools/map-viewer/build.gradle
@@ -0,0 +1,26 @@
+application {
+    mainClass = 'com.riiablo.map.MapViewer'
+}
+
+run {
+  workingDir = rootProject.file('assets').path
+  setIgnoreExitValue(true)
+
+  // Required to run LWJGL3 java apps on MacOS
+  if (org.gradle.internal.os.OperatingSystem.current() == org.gradle.internal.os.OperatingSystem.MAC_OS) {
+    jvmArgs += "-XstartOnFirstThread"
+  }
+}
+
+jar {
+  archiveBaseName = project.name
+  dependsOn configurations.runtimeClasspath
+  from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
+  manifest {
+    attributes 'Main-Class': application.mainClass
+  }
+
+  doLast {
+    file(archiveFile).setExecutable(true, false)
+  }
+}
diff --git a/tools/src/main/java/com/riiablo/map/MapViewer.java b/tools/map-viewer/src/main/java/com/riiablo/map/MapViewer.java
similarity index 100%
rename from tools/src/main/java/com/riiablo/map/MapViewer.java
rename to tools/map-viewer/src/main/java/com/riiablo/map/MapViewer.java