diff --git a/settings.gradle b/settings.gradle
index 999ad001..4e87fcd5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,6 @@ include 'desktop'
 include 'android'
 
 include 'mpqviewer'
-include 'ds1viewer' // deprecated
 
 include 'server:bnls'
 include 'server:bncs'
@@ -19,6 +18,7 @@ include 'tools:font-metrics'
 include 'tools:d2s-reader'
 include 'tools:camera'
 include 'tools:direction'
+include 'tools:ds1-viewer' // deprecated
 include 'tools:mpq-viewer'
 project(':tools:mpq-viewer').projectDir = project(':mpqviewer').projectDir
 
diff --git a/ds1viewer/build.gradle b/tools/ds1-viewer/build.gradle
similarity index 97%
rename from ds1viewer/build.gradle
rename to tools/ds1-viewer/build.gradle
index ccfa5d06..1dd0b4f5 100644
--- a/ds1viewer/build.gradle
+++ b/tools/ds1-viewer/build.gradle
@@ -18,6 +18,7 @@ dependencies {
   implementation "com.kotcrab.vis:vis-ui:$visuiVersion"
 }
 
+description = 'View and debug DS1 prefabs.'
 application {
   mainClass = 'com.riiablo.map.DS1Viewer'
 }
diff --git a/ds1viewer/src/main/java/com/riiablo/map/DS1Types.java b/tools/ds1-viewer/src/main/java/com/riiablo/map/DS1Types.java
similarity index 100%
rename from ds1viewer/src/main/java/com/riiablo/map/DS1Types.java
rename to tools/ds1-viewer/src/main/java/com/riiablo/map/DS1Types.java
diff --git a/ds1viewer/src/main/java/com/riiablo/map/DS1Viewer.java b/tools/ds1-viewer/src/main/java/com/riiablo/map/DS1Viewer.java
similarity index 100%
rename from ds1viewer/src/main/java/com/riiablo/map/DS1Viewer.java
rename to tools/ds1-viewer/src/main/java/com/riiablo/map/DS1Viewer.java