diff --git a/common/bin/unshuffle_list.txt b/common/bin/unshuffle_list.txt
index 99bf0391e0e..68acb88fde4 100644
--- a/common/bin/unshuffle_list.txt
+++ b/common/bin/unshuffle_list.txt
@@ -1301,7 +1301,6 @@ jdk/src/jdk.deploy.osx/macosx/native/libosx/CFileManager.m : jdk/src/macosx/nati
 jdk/src/jdk.deploy.osx/macosx/native/libosx/Dispatch.m : jdk/src/macosx/native/com/apple/concurrent/Dispatch.m
 jdk/src/jdk.deploy.osx/macosx/native/libosx/JavaAppLauncher.m : jdk/src/macosx/native/apple/launcher/JavaAppLauncher.m
 jdk/src/jdk.deploy.osx/macosx/native/libosx/KeystoreImpl.m : jdk/src/macosx/native/apple/security/KeystoreImpl.m
-jdk/src/jdk.dev/share/classes/com/sun/tools/hat : jdk/src/share/classes/com/sun/tools/hat
 jdk/src/jdk.hprof.agent/share/classes/com/sun/demo/jvmti/hprof : jdk/src/share/classes/com/sun/demo/jvmti/hprof
 jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver : jdk/src/share/classes/com/sun/net/httpserver
 jdk/src/jdk.httpserver/share/classes/sun/net/httpserver : jdk/src/share/classes/sun/net/httpserver
@@ -1486,16 +1485,16 @@ langtools/src/java.compiler/share/classes/javax/annotation/processing : langtool
 langtools/src/java.compiler/share/classes/javax/lang/model : langtools/src/share/classes/javax/lang/model
 langtools/src/java.compiler/share/classes/javax/tools : langtools/src/share/classes/javax/tools
 langtools/src/jdk.compiler/share/classes/com/sun/source : langtools/src/share/classes/com/sun/source
-langtools/src/jdk.compiler/share/classes/com/sun/tools/classfile : langtools/src/share/classes/com/sun/tools/classfile
 langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint : langtools/src/share/classes/com/sun/tools/doclint
 langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources : langtools/src/share/classes/com/sun/tools/doclint/resources
 langtools/src/jdk.compiler/share/classes/com/sun/tools/javac : langtools/src/share/classes/com/sun/tools/javac
 langtools/src/jdk.compiler/share/classes/com/sun/tools/javah : langtools/src/share/classes/com/sun/tools/javah
-langtools/src/jdk.compiler/share/classes/com/sun/tools/javap : langtools/src/share/classes/com/sun/tools/javap
 langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac : langtools/src/share/classes/com/sun/tools/sjavac
-langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps : langtools/src/share/classes/com/sun/tools/jdeps
-langtools/src/jdk.dev/share/classes/com/sun/tools/jdeps/resources : langtools/src/share/classes/com/sun/tools/jdeps/resources
 langtools/src/jdk.javadoc/share/classes/com/sun/javadoc : langtools/src/share/classes/com/sun/javadoc
 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets : langtools/src/share/classes/com/sun/tools/doclets
 langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc : langtools/src/share/classes/com/sun/tools/javadoc
+langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile : langtools/src/share/classes/com/sun/tools/classfile
+langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap : langtools/src/share/classes/com/sun/tools/javap
+langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps : langtools/src/share/classes/com/sun/tools/jdeps
+langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources : langtools/src/share/classes/com/sun/tools/jdeps/resources
 nashorn/src/jdk.scripting.nashorn/share/classes : nashorn/src
diff --git a/make/CheckModules.gmk b/make/CheckModules.gmk
index 1000400cf6e..4872c912e49 100644
--- a/make/CheckModules.gmk
+++ b/make/CheckModules.gmk
@@ -29,7 +29,7 @@ default: all
 include $(SPEC)
 include MakeBase.gmk
 
-JDEPS_MODULES_XML := $(JDK_OUTPUTDIR)/modules/jdk.dev/com/sun/tools/jdeps/resources/jdeps-modules.xml
+JDEPS_MODULES_XML := $(JDK_OUTPUTDIR)/modules/jdk.jdeps/com/sun/tools/jdeps/resources/jdeps-modules.xml
 
 #
 # Verify access across module boundaries
diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk
index 4f7e46e5871..298eb0f6e96 100644
--- a/make/CompileJavaModules.gmk
+++ b/make/CompileJavaModules.gmk
@@ -412,6 +412,12 @@ jdk.jconsole_CLEAN_FILES := $(wildcard \
 
 ################################################################################
 
+jdk.jdeps_CLEAN_FILES := $(wildcard \
+    $(JDK_TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/*.properties \
+    $(JDK_TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/*.properties)
+
+################################################################################
+
 jdk.jdi_EXCLUDES += \
     com/sun/tools/example/debug/bdi \
     com/sun/tools/example/debug/event \
diff --git a/make/Images.gmk b/make/Images.gmk
index b2b713b93c4..832e0b59cb0 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -46,7 +46,7 @@ PROVIDER_MODULES += jdk.charsets jdk.crypto.ec jdk.crypto.pkcs11 jdk.jvmstat jdk
 
 # tools
 TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev jdk.javadoc jdk.jcmd jdk.jconsole \
-               jdk.hotspot.agent jdk.hprof.agent jdk.jartool jdk.jdi jdk.jdwp.agent \
+               jdk.hotspot.agent jdk.hprof.agent jdk.jartool jdk.jdeps jdk.jdi jdk.jdwp.agent \
                jdk.policytool jdk.rmic jdk.xml.bind jdk.xml.ws
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
diff --git a/make/Main.gmk b/make/Main.gmk
index 15e899a9333..8423864ed57 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -412,7 +412,7 @@ else
   # Explicitly add dependencies for special targets
   java.base-java: unpack-sec
 
-  jdk.dev-gendata: java rmic
+  jdk.jdeps-gendata: java rmic
 
   zip-security: java.base-java java.security.jgss-java java.security.jgss-libs \
       $(filter jdk.crypto%, $(JAVA_TARGETS))
diff --git a/modules.xml b/modules.xml
index 3bdafff2112..355f56a4270 100644
--- a/modules.xml
+++ b/modules.xml
@@ -1522,10 +1522,6 @@
     <export>
       <name>com.sun.tools.javac</name>
     </export>
-    <export>
-      <name>com.sun.tools.classfile</name>
-      <to>jdk.dev</to>
-    </export>
     <export>
       <name>com.sun.tools.doclint</name>
       <to>jdk.javadoc</to>
@@ -1545,6 +1541,7 @@
     <export>
       <name>com.sun.tools.javac.file</name>
       <to>jdk.javadoc</to>
+      <to>jdk.jdeps</to>
     </export>
     <export>
       <name>com.sun.tools.javac.jvm</name>
@@ -1569,6 +1566,7 @@
     <export>
       <name>com.sun.tools.javac.util</name>
       <to>jdk.javadoc</to>
+      <to>jdk.jdeps</to>
     </export>
   </module>
   <module>
@@ -1601,8 +1599,6 @@
   <module>
     <name>jdk.dev</name>
     <depend>java.base</depend>
-    <depend>java.xml</depend>
-    <depend>jdk.compiler</depend>
   </module>
   <module>
     <name>jdk.hotspot.agent</name>
@@ -1671,6 +1667,13 @@
       <name>com.sun.tools.jconsole</name>
     </export>
   </module>
+  <module>
+    <name>jdk.jdeps</name>
+    <depend>java.base</depend>
+    <depend>java.compiler</depend>
+    <depend>java.xml</depend>
+    <depend>jdk.compiler</depend>
+  </module>
   <module>
     <name>jdk.jdi</name>
     <depend>java.base</depend>