diff --git a/make/Main.gmk b/make/Main.gmk
index e7a4bc9f30e..1eb3b2b1dfd 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -127,7 +127,7 @@ GENSRC_TARGETS += $(sort $(GENSRC_MODULEINFO_TARGETS) \
 define DeclareModuleInfoRecipe
   $1-gensrc-moduleinfo:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
-	    -f gensrc/GensrcModuleInfo.gmk MODULE=$1)
+	    -f common/modules/GensrcModuleInfo.gmk MODULE=$1)
 
   $1-gensrc: $1-gensrc-moduleinfo
 endef
diff --git a/make/MainSupport.gmk b/make/MainSupport.gmk
index a31b84426e3..5fdcd77e2f8 100644
--- a/make/MainSupport.gmk
+++ b/make/MainSupport.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -129,18 +129,17 @@ define DeclareRecipeForModuleMakefile
   $2-$$($1_TARGET_SUFFIX):
         ifeq ($$($1_USE_WRAPPER), true)
 	  +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
-	      -f ModuleWrapper.gmk \
+	      -f ModuleWrapper.gmk -I $$(TOPDIR)/make/common/modules  \
 	      $$(addprefix -I, $$(PHASE_MAKEDIRS) \
-	          $$(addsuffix /$$($1_MAKE_SUBDIR), $$(PHASE_MAKEDIRS)) \
+	          $$(addsuffix /modules/$2, $$(PHASE_MAKEDIRS)) \
 	      ) \
 	      MODULE=$2 MAKEFILE_PREFIX=$$($1_FILE_PREFIX) $$($1_EXTRA_ARGS))
         else
-	  +($(CD) $$(dir $$(firstword $$(wildcard $$(addsuffix \
-	      /$$($1_MAKE_SUBDIR)/$$($1_FILE_PREFIX)-$2.gmk, $$(PHASE_MAKEDIRS))))) \
+	  +($(CD) $$(TOPDIR)/make \
 	  && $(MAKE) $(MAKE_ARGS) \
-	      -f $$($1_FILE_PREFIX)-$2.gmk \
+	      -f modules/$2/$$($1_FILE_PREFIX).gmk -I $$(TOPDIR)/make/common/modules \
 	      $$(addprefix -I, $$(PHASE_MAKEDIRS) \
-	          $$(addsuffix /$$($1_MAKE_SUBDIR), $$(PHASE_MAKEDIRS)) \
+	          $$(addsuffix /modules/$2, $$(PHASE_MAKEDIRS)) \
 	      ) \
 	      MODULE=$2 $$($1_EXTRA_ARGS) \
 	  )
@@ -153,7 +152,7 @@ endef
 # Param 2: Module name
 define DeclareRecipesForPhaseAndModule
   $1_$2_MAKEFILES := $$(strip $$(wildcard \
-      $$(addsuffix /$$($1_MAKE_SUBDIR)/$$($1_FILE_PREFIX)-$2.gmk, $$(PHASE_MAKEDIRS))))
+      $$(addsuffix /modules/$2/$$($1_FILE_PREFIX).gmk, $$(PHASE_MAKEDIRS))))
 
   # Only declare recipes if there are makefiles to call
   ifneq ($$($1_$2_MAKEFILES), )
diff --git a/make/ModuleWrapper.gmk b/make/ModuleWrapper.gmk
index 84813264e79..c9f1de23995 100644
--- a/make/ModuleWrapper.gmk
+++ b/make/ModuleWrapper.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,7 @@ include MakeBase.gmk
 TARGETS :=
 
 # Include the file being wrapped.
-include $(MAKEFILE_PREFIX)-$(MODULE).gmk
+include modules/$(MODULE)/$(MAKEFILE_PREFIX).gmk
 
 # Setup copy rules from the modules directories to the jdk image directory.
 ifeq ($(call isTargetOs, windows), true)
diff --git a/make/copy/CopyCommon.gmk b/make/common/modules/CopyCommon.gmk
similarity index 100%
rename from make/copy/CopyCommon.gmk
rename to make/common/modules/CopyCommon.gmk
diff --git a/make/gendata/GendataCommon.gmk b/make/common/modules/GendataCommon.gmk
similarity index 100%
rename from make/gendata/GendataCommon.gmk
rename to make/common/modules/GendataCommon.gmk
diff --git a/make/gensrc/GensrcCommonJdk.gmk b/make/common/modules/GensrcCommonJdk.gmk
similarity index 100%
rename from make/gensrc/GensrcCommonJdk.gmk
rename to make/common/modules/GensrcCommonJdk.gmk
diff --git a/make/gensrc/GensrcCommonLangtools.gmk b/make/common/modules/GensrcCommonLangtools.gmk
similarity index 100%
rename from make/gensrc/GensrcCommonLangtools.gmk
rename to make/common/modules/GensrcCommonLangtools.gmk
diff --git a/make/gensrc/GensrcModuleInfo.gmk b/make/common/modules/GensrcModuleInfo.gmk
similarity index 100%
rename from make/gensrc/GensrcModuleInfo.gmk
rename to make/common/modules/GensrcModuleInfo.gmk
diff --git a/make/gensrc/GensrcProperties.gmk b/make/common/modules/GensrcProperties.gmk
similarity index 100%
rename from make/gensrc/GensrcProperties.gmk
rename to make/common/modules/GensrcProperties.gmk
diff --git a/make/launcher/LauncherCommon.gmk b/make/common/modules/LauncherCommon.gmk
similarity index 100%
rename from make/launcher/LauncherCommon.gmk
rename to make/common/modules/LauncherCommon.gmk
diff --git a/make/lib/LibCommon.gmk b/make/common/modules/LibCommon.gmk
similarity index 100%
rename from make/lib/LibCommon.gmk
rename to make/common/modules/LibCommon.gmk
diff --git a/make/copy/Copy-java.base.gmk b/make/modules/java.base/Copy.gmk
similarity index 97%
rename from make/copy/Copy-java.base.gmk
rename to make/modules/java.base/Copy.gmk
index 7e262a39389..c2251fa18af 100644
--- a/make/copy/Copy-java.base.gmk
+++ b/make/modules/java.base/Copy.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,8 @@ include CopyCommon.gmk
 include Modules.gmk
 include TextFileProcessing.gmk
 
-$(eval $(call IncludeCustomExtension, copy/Copy-java.base.gmk))
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, modules/java.base/Copy.gmk))
 
 ################################################################################
 
diff --git a/make/gendata/Gendata-java.base.gmk b/make/modules/java.base/Gendata.gmk
similarity index 90%
rename from make/gendata/Gendata-java.base.gmk
rename to make/modules/java.base/Gendata.gmk
index 9e4580e9c89..6ca9c6dee32 100644
--- a/make/gendata/Gendata-java.base.gmk
+++ b/make/modules/java.base/Gendata.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -25,18 +25,15 @@
 
 include GendataCommon.gmk
 
-# Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, gendata/Gendata-java.base.gmk))
+include gendata/GendataBreakIterator.gmk
 
-include GendataBreakIterator.gmk
+include gendata/GendataTZDB.gmk
 
-include GendataTZDB.gmk
+include gendata/GendataBlacklistedCerts.gmk
 
-include GendataBlacklistedCerts.gmk
+include gendata/GendataCryptoPolicy.gmk
 
-include GendataCryptoPolicy.gmk
-
-include GendataPublicSuffixList.gmk
+include gendata/GendataPublicSuffixList.gmk
 
 ################################################################################
 
diff --git a/make/gensrc/Gensrc-java.base.gmk b/make/modules/java.base/Gensrc.gmk
similarity index 90%
rename from make/gensrc/Gensrc-java.base.gmk
rename to make/modules/java.base/Gensrc.gmk
index 81d37181e38..7b54a6980ae 100644
--- a/make/gensrc/Gensrc-java.base.gmk
+++ b/make/modules/java.base/Gensrc.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -25,16 +25,16 @@
 
 include GensrcCommonJdk.gmk
 
-include GensrcLocaleData.gmk
-include GensrcCharacterData.gmk
-include GensrcMisc.gmk
-include GensrcCharsetMapping.gmk
-include GensrcCharsetCoder.gmk
-include GensrcBuffer.gmk
-include GensrcExceptions.gmk
-include GensrcVarHandles.gmk
-include GensrcModuleLoaderMap.gmk
-include GensrcEmojiData.gmk
+include gensrc/GensrcLocaleData.gmk
+include gensrc/GensrcCharacterData.gmk
+include gensrc/GensrcMisc.gmk
+include gensrc/GensrcCharsetMapping.gmk
+include gensrc/GensrcCharsetCoder.gmk
+include gensrc/GensrcBuffer.gmk
+include gensrc/GensrcExceptions.gmk
+include gensrc/GensrcVarHandles.gmk
+include gensrc/GensrcModuleLoaderMap.gmk
+include gensrc/GensrcEmojiData.gmk
 
 ################################################################################
 
diff --git a/make/launcher/Launcher-java.base.gmk b/make/modules/java.base/Launcher.gmk
similarity index 96%
rename from make/launcher/Launcher-java.base.gmk
rename to make/modules/java.base/Launcher.gmk
index cc5fb458312..92b668788b4 100644
--- a/make/launcher/Launcher-java.base.gmk
+++ b/make/modules/java.base/Launcher.gmk
@@ -25,7 +25,8 @@
 
 include LauncherCommon.gmk
 
-$(eval $(call IncludeCustomExtension, launcher/Launcher-java.base.gmk))
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, modules/java.base/Launcher.gmk))
 
 JAVA_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/launcher/java.rc
 
diff --git a/make/lib/Lib-java.base.gmk b/make/modules/java.base/Lib.gmk
similarity index 98%
rename from make/lib/Lib-java.base.gmk
rename to make/modules/java.base/Lib.gmk
index f128e3bc80a..9f33e2340b8 100644
--- a/make/lib/Lib-java.base.gmk
+++ b/make/modules/java.base/Lib.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 include LibCommon.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, lib/Lib-java.base.gmk))
+$(eval $(call IncludeCustomExtension, modules/java.base/Lib.gmk))
 
 # Prepare the find cache.
 $(call FillFindCache, $(wildcard $(TOPDIR)/src/java.base/*/native))
@@ -34,7 +34,7 @@ $(call FillFindCache, $(wildcard $(TOPDIR)/src/java.base/*/native))
 ################################################################################
 # Create all the core libraries
 
-include CoreLibraries.gmk
+include lib/CoreLibraries.gmk
 
 ################################################################################
 # Create the network library
diff --git a/make/gendata/GendataBlacklistedCerts.gmk b/make/modules/java.base/gendata/GendataBlacklistedCerts.gmk
similarity index 91%
rename from make/gendata/GendataBlacklistedCerts.gmk
rename to make/modules/java.base/gendata/GendataBlacklistedCerts.gmk
index 9ebf13ce885..d5a5d0b61ff 100644
--- a/make/gendata/GendataBlacklistedCerts.gmk
+++ b/make/modules/java.base/gendata/GendataBlacklistedCerts.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,6 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, gendata/GendataBlacklistedCerts.gmk))
-
 GENDATA_BLACKLISTED_CERTS_SRC += $(TOPDIR)/make/data/blacklistedcertsconverter/blacklisted.certs.pem
 GENDATA_BLACKLISTED_CERTS := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)/security/blacklisted.certs
 
diff --git a/make/gendata/GendataBreakIterator.gmk b/make/modules/java.base/gendata/GendataBreakIterator.gmk
similarity index 100%
rename from make/gendata/GendataBreakIterator.gmk
rename to make/modules/java.base/gendata/GendataBreakIterator.gmk
diff --git a/make/gendata/GendataCryptoPolicy.gmk b/make/modules/java.base/gendata/GendataCryptoPolicy.gmk
similarity index 100%
rename from make/gendata/GendataCryptoPolicy.gmk
rename to make/modules/java.base/gendata/GendataCryptoPolicy.gmk
diff --git a/make/gendata/GendataPublicSuffixList.gmk b/make/modules/java.base/gendata/GendataPublicSuffixList.gmk
similarity index 100%
rename from make/gendata/GendataPublicSuffixList.gmk
rename to make/modules/java.base/gendata/GendataPublicSuffixList.gmk
diff --git a/make/gendata/GendataTZDB.gmk b/make/modules/java.base/gendata/GendataTZDB.gmk
similarity index 100%
rename from make/gendata/GendataTZDB.gmk
rename to make/modules/java.base/gendata/GendataTZDB.gmk
diff --git a/make/gensrc/GensrcBuffer.gmk b/make/modules/java.base/gensrc/GensrcBuffer.gmk
similarity index 100%
rename from make/gensrc/GensrcBuffer.gmk
rename to make/modules/java.base/gensrc/GensrcBuffer.gmk
diff --git a/make/gensrc/GensrcCharacterData.gmk b/make/modules/java.base/gensrc/GensrcCharacterData.gmk
similarity index 100%
rename from make/gensrc/GensrcCharacterData.gmk
rename to make/modules/java.base/gensrc/GensrcCharacterData.gmk
diff --git a/make/gensrc/GensrcCharsetCoder.gmk b/make/modules/java.base/gensrc/GensrcCharsetCoder.gmk
similarity index 100%
rename from make/gensrc/GensrcCharsetCoder.gmk
rename to make/modules/java.base/gensrc/GensrcCharsetCoder.gmk
diff --git a/make/gensrc/GensrcCharsetMapping.gmk b/make/modules/java.base/gensrc/GensrcCharsetMapping.gmk
similarity index 100%
rename from make/gensrc/GensrcCharsetMapping.gmk
rename to make/modules/java.base/gensrc/GensrcCharsetMapping.gmk
diff --git a/make/gensrc/GensrcEmojiData.gmk b/make/modules/java.base/gensrc/GensrcEmojiData.gmk
similarity index 100%
rename from make/gensrc/GensrcEmojiData.gmk
rename to make/modules/java.base/gensrc/GensrcEmojiData.gmk
diff --git a/make/gensrc/GensrcExceptions.gmk b/make/modules/java.base/gensrc/GensrcExceptions.gmk
similarity index 100%
rename from make/gensrc/GensrcExceptions.gmk
rename to make/modules/java.base/gensrc/GensrcExceptions.gmk
diff --git a/make/gensrc/GensrcLocaleData.gmk b/make/modules/java.base/gensrc/GensrcLocaleData.gmk
similarity index 100%
rename from make/gensrc/GensrcLocaleData.gmk
rename to make/modules/java.base/gensrc/GensrcLocaleData.gmk
diff --git a/make/gensrc/GensrcMisc.gmk b/make/modules/java.base/gensrc/GensrcMisc.gmk
similarity index 100%
rename from make/gensrc/GensrcMisc.gmk
rename to make/modules/java.base/gensrc/GensrcMisc.gmk
diff --git a/make/gensrc/GensrcModuleLoaderMap.gmk b/make/modules/java.base/gensrc/GensrcModuleLoaderMap.gmk
similarity index 100%
rename from make/gensrc/GensrcModuleLoaderMap.gmk
rename to make/modules/java.base/gensrc/GensrcModuleLoaderMap.gmk
diff --git a/make/gensrc/GensrcVarHandles.gmk b/make/modules/java.base/gensrc/GensrcVarHandles.gmk
similarity index 97%
rename from make/gensrc/GensrcVarHandles.gmk
rename to make/modules/java.base/gensrc/GensrcVarHandles.gmk
index fa9804c6014..4efbe146e23 100644
--- a/make/gensrc/GensrcVarHandles.gmk
+++ b/make/modules/java.base/gensrc/GensrcVarHandles.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -277,6 +277,3 @@ $(foreach t, $(VARHANDLES_MEMORY_ADDRESS_TYPES), \
   $(eval $(call GenerateVarHandleMemoryAddress,VAR_HANDLE_MEMORY_ADDRESS_$t,$t)))
 
 GENSRC_JAVA_BASE += $(GENSRC_VARHANDLES)
-
-# Include custom extension post hook
-$(eval $(call IncludeCustomExtension, gensrc/GensrcVarHandles-post.gmk))
diff --git a/make/lib/CoreLibraries.gmk b/make/modules/java.base/lib/CoreLibraries.gmk
similarity index 97%
rename from make/lib/CoreLibraries.gmk
rename to make/modules/java.base/lib/CoreLibraries.gmk
index 2c789f65b8e..ab8a75cf454 100644
--- a/make/lib/CoreLibraries.gmk
+++ b/make/modules/java.base/lib/CoreLibraries.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,10 +23,6 @@
 # questions.
 #
 
-# Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, lib/CoreLibraries.gmk))
-
-
 ##########################################################################################
 # libfdlibm is statically linked with libjava below and not delivered into the
 # product on its own.
diff --git a/make/copy/Copy-java.desktop.gmk b/make/modules/java.desktop/Copy.gmk
similarity index 95%
rename from make/copy/Copy-java.desktop.gmk
rename to make/modules/java.desktop/Copy.gmk
index cfe209e581a..fe59c21cfb1 100644
--- a/make/copy/Copy-java.desktop.gmk
+++ b/make/modules/java.desktop/Copy.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,6 @@
 include CopyCommon.gmk
 include Modules.gmk
 
-$(eval $(call IncludeCustomExtension, copy/Copy-java.desktop.gmk))
-
 ################################################################################
 
 $(CONF_DST_DIR)/sound.properties: $(TOPDIR)/src/java.desktop/share/conf/sound.properties
diff --git a/make/gendata/Gendata-java.desktop.gmk b/make/modules/java.desktop/Gendata.gmk
similarity index 89%
rename from make/gendata/Gendata-java.desktop.gmk
rename to make/modules/java.desktop/Gendata.gmk
index 73dbec0d873..a3f0c926ca6 100644
--- a/make/gendata/Gendata-java.desktop.gmk
+++ b/make/modules/java.desktop/Gendata.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,6 @@
 
 include GendataCommon.gmk
 
-include GendataFontConfig.gmk
+include gendata/GendataFontConfig.gmk
 
-include GendataHtml32dtd.gmk
+include gendata/GendataHtml32dtd.gmk
diff --git a/make/gensrc/Gensrc-java.desktop.gmk b/make/modules/java.desktop/Gensrc.gmk
similarity index 92%
rename from make/gensrc/Gensrc-java.desktop.gmk
rename to make/modules/java.desktop/Gensrc.gmk
index c41ef00aa08..c32107a529f 100644
--- a/make/gensrc/Gensrc-java.desktop.gmk
+++ b/make/modules/java.desktop/Gensrc.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,17 +26,17 @@
 include GensrcCommonJdk.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, gensrc/Gensrc-java.desktop.gmk))
+$(eval $(call IncludeCustomExtension, modules/java.desktop/Gensrc.gmk))
 
 ifeq ($(call isTargetOs, windows), false)
-  include GensrcIcons.gmk
+  include gensrc/GensrcIcons.gmk
 endif
 
 ifeq ($(call isTargetOs, linux solaris aix), true)
-  include GensrcX11Wrappers.gmk
+  include gensrc/GensrcX11Wrappers.gmk
 endif
 
-include GensrcSwing.gmk
+include gensrc/GensrcSwing.gmk
 
 ################################################################################
 
diff --git a/make/lib/Lib-java.desktop.gmk b/make/modules/java.desktop/Lib.gmk
similarity index 96%
rename from make/lib/Lib-java.desktop.gmk
rename to make/modules/java.desktop/Lib.gmk
index 6171b6566ce..c72cbdb9929 100644
--- a/make/lib/Lib-java.desktop.gmk
+++ b/make/modules/java.desktop/Lib.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 include LibCommon.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, lib/Lib-java.desktop.gmk))
+$(eval $(call IncludeCustomExtension, modules/java.desktop/Lib.gmk))
 
 # Prepare the find cache.
 $(call FillFindCache, $(wildcard $(TOPDIR)/src/java.desktop/*/native))
@@ -34,7 +34,7 @@ $(call FillFindCache, $(wildcard $(TOPDIR)/src/java.desktop/*/native))
 ################################################################################
 # Create the AWT/2D libraries
 
-include Awt2dLibraries.gmk
+include lib/Awt2dLibraries.gmk
 
 ################################################################################
 # Create the libjsound library
diff --git a/make/gendata/GendataFontConfig.gmk b/make/modules/java.desktop/gendata/GendataFontConfig.gmk
similarity index 100%
rename from make/gendata/GendataFontConfig.gmk
rename to make/modules/java.desktop/gendata/GendataFontConfig.gmk
diff --git a/make/gendata/GendataHtml32dtd.gmk b/make/modules/java.desktop/gendata/GendataHtml32dtd.gmk
similarity index 100%
rename from make/gendata/GendataHtml32dtd.gmk
rename to make/modules/java.desktop/gendata/GendataHtml32dtd.gmk
diff --git a/make/gensrc/GensrcIcons.gmk b/make/modules/java.desktop/gensrc/GensrcIcons.gmk
similarity index 97%
rename from make/gensrc/GensrcIcons.gmk
rename to make/modules/java.desktop/gensrc/GensrcIcons.gmk
index 53a406c2357..8757030166e 100644
--- a/make/gensrc/GensrcIcons.gmk
+++ b/make/modules/java.desktop/gensrc/GensrcIcons.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,6 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, gensrc/GensrcIcons.gmk))
-
 GENSRC_AWT_ICONS :=
 GENSRC_AWT_ICONS_SRC :=
 GENSRC_AWT_ICONS_TMP := $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop
diff --git a/make/gensrc/GensrcSwing.gmk b/make/modules/java.desktop/gensrc/GensrcSwing.gmk
similarity index 100%
rename from make/gensrc/GensrcSwing.gmk
rename to make/modules/java.desktop/gensrc/GensrcSwing.gmk
diff --git a/make/gensrc/GensrcX11Wrappers.gmk b/make/modules/java.desktop/gensrc/GensrcX11Wrappers.gmk
similarity index 100%
rename from make/gensrc/GensrcX11Wrappers.gmk
rename to make/modules/java.desktop/gensrc/GensrcX11Wrappers.gmk
diff --git a/make/lib/Awt2dLibraries.gmk b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
similarity index 98%
rename from make/lib/Awt2dLibraries.gmk
rename to make/modules/java.desktop/lib/Awt2dLibraries.gmk
index 7f2eeae1d9c..0c0dee57275 100644
--- a/make/lib/Awt2dLibraries.gmk
+++ b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,6 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, lib/Awt2dLibraries-pre.gmk))
-
 WIN_AWT_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt/awt.lib
 
 LIBAWT_DEFAULT_HEADER_DIRS := \
@@ -900,8 +898,3 @@ ifeq ($(call isTargetOs, macosx), true)
   $(BUILD_LIBOSXUI): $(BUILD_LIBAWT_LWAWT)
 
 endif
-
-################################################################################
-
-# Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, lib/Awt2dLibraries.gmk))
diff --git a/make/lib/Lib-java.instrument.gmk b/make/modules/java.instrument/Lib.gmk
similarity index 93%
rename from make/lib/Lib-java.instrument.gmk
rename to make/modules/java.instrument/Lib.gmk
index dfb1b63bb73..6a28ba9dbfb 100644
--- a/make/lib/Lib-java.instrument.gmk
+++ b/make/modules/java.instrument/Lib.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,6 @@
 
 include LibCommon.gmk
 
-# Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, lib/Lib-java.instrument.gmk))
-
 ################################################################################
 
 ifeq ($(call isTargetOs, windows), true)
diff --git a/make/copy/Copy-java.logging.gmk b/make/modules/java.logging/Copy.gmk
similarity index 100%
rename from make/copy/Copy-java.logging.gmk
rename to make/modules/java.logging/Copy.gmk
diff --git a/make/gensrc/Gensrc-java.logging.gmk b/make/modules/java.logging/Gensrc.gmk
similarity index 100%
rename from make/gensrc/Gensrc-java.logging.gmk
rename to make/modules/java.logging/Gensrc.gmk
diff --git a/make/lib/Lib-java.management.gmk b/make/modules/java.management/Lib.gmk
similarity index 83%
rename from make/lib/Lib-java.management.gmk
rename to make/modules/java.management/Lib.gmk
index 92475323056..1817d266476 100644
--- a/make/lib/Lib-java.management.gmk
+++ b/make/modules/java.management/Lib.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,6 @@
 
 include LibCommon.gmk
 
-# Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, lib/Lib-java.management.gmk))
-
 ################################################################################
 
 LIBMANAGEMENT_OPTIMIZATION := HIGH
@@ -52,8 +49,3 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBMANAGEMENT, \
 $(BUILD_LIBMANAGEMENT): $(call FindLib, java.base, java)
 
 TARGETS += $(BUILD_LIBMANAGEMENT)
-
-################################################################################
-
-# Include custom extension post hook
-$(eval $(call IncludeCustomExtension, lib/Lib-java.management-post.gmk))
diff --git a/make/lib/Lib-java.prefs.gmk b/make/modules/java.prefs/Lib.gmk
similarity index 100%
rename from make/lib/Lib-java.prefs.gmk
rename to make/modules/java.prefs/Lib.gmk
diff --git a/make/launcher/Launcher-java.rmi.gmk b/make/modules/java.rmi/Launcher.gmk
similarity index 100%
rename from make/launcher/Launcher-java.rmi.gmk
rename to make/modules/java.rmi/Launcher.gmk
diff --git a/make/lib/Lib-java.rmi.gmk b/make/modules/java.rmi/Lib.gmk
similarity index 100%
rename from make/lib/Lib-java.rmi.gmk
rename to make/modules/java.rmi/Lib.gmk
diff --git a/make/launcher/Launcher-java.scripting.gmk b/make/modules/java.scripting/Launcher.gmk
similarity index 100%
rename from make/launcher/Launcher-java.scripting.gmk
rename to make/modules/java.scripting/Launcher.gmk
diff --git a/make/launcher/Launcher-java.security.jgss.gmk b/make/modules/java.security.jgss/Launcher.gmk
similarity index 100%
rename from make/launcher/Launcher-java.security.jgss.gmk
rename to make/modules/java.security.jgss/Launcher.gmk
diff --git a/make/lib/Lib-java.security.jgss.gmk b/make/modules/java.security.jgss/Lib.gmk
similarity index 100%
rename from make/lib/Lib-java.security.jgss.gmk
rename to make/modules/java.security.jgss/Lib.gmk
diff --git a/make/lib/Lib-java.smartcardio.gmk b/make/modules/java.smartcardio/Lib.gmk
similarity index 100%
rename from make/lib/Lib-java.smartcardio.gmk
rename to make/modules/java.smartcardio/Lib.gmk
diff --git a/make/copy/Copy-jdk.accessibility.gmk b/make/modules/jdk.accessibility/Copy.gmk
similarity index 100%
rename from make/copy/Copy-jdk.accessibility.gmk
rename to make/modules/jdk.accessibility/Copy.gmk
diff --git a/make/launcher/Launcher-jdk.accessibility.gmk b/make/modules/jdk.accessibility/Launcher.gmk
similarity index 100%
rename from make/launcher/Launcher-jdk.accessibility.gmk
rename to make/modules/jdk.accessibility/Launcher.gmk
diff --git a/make/lib/Lib-jdk.accessibility.gmk b/make/modules/jdk.accessibility/Lib.gmk
similarity index 100%
rename from make/lib/Lib-jdk.accessibility.gmk
rename to make/modules/jdk.accessibility/Lib.gmk
diff --git a/make/launcher/Launcher-jdk.aot.gmk b/make/modules/jdk.aot/Launcher.gmk
similarity index 100%
rename from make/launcher/Launcher-jdk.aot.gmk
rename to make/modules/jdk.aot/Launcher.gmk
diff --git a/make/lib/Lib-jdk.attach.gmk b/make/modules/jdk.attach/Lib.gmk
similarity index 100%
rename from make/lib/Lib-jdk.attach.gmk
rename to make/modules/jdk.attach/Lib.gmk
diff --git a/make/gensrc/Gensrc-jdk.charsets.gmk b/make/modules/jdk.charsets/Gensrc.gmk
similarity index 100%
rename from make/gensrc/Gensrc-jdk.charsets.gmk
rename to make/modules/jdk.charsets/Gensrc.gmk
diff --git a/make/gendata/Gendata-jdk.compiler.gmk b/make/modules/jdk.compiler/Gendata.gmk
similarity index 98%
rename from make/gendata/Gendata-jdk.compiler.gmk
rename to make/modules/jdk.compiler/Gendata.gmk
index 40af9b5fa71..ed98ab4ee23 100644
--- a/make/gendata/Gendata-jdk.compiler.gmk
+++ b/make/modules/jdk.compiler/Gendata.gmk
@@ -30,7 +30,7 @@ include Modules.gmk
 ################################################################################
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, gendata/Gendata-jdk.compiler-pre.gmk))
+$(eval $(call IncludeCustomExtension, modules/jdk.compiler/Gendata.gmk))
 
 # This is needed to properly setup DOCS_MODULES.
 $(eval $(call ReadImportMetaData))
diff --git a/make/gensrc/Gensrc-jdk.compiler.gmk b/make/modules/jdk.compiler/Gensrc.gmk
similarity index 100%
rename from make/gensrc/Gensrc-jdk.compiler.gmk
rename to make/modules/jdk.compiler/Gensrc.gmk
diff --git a/make/launcher/Launcher-jdk.compiler.gmk b/make/modules/jdk.compiler/Launcher.gmk
similarity index 100%
rename from make/launcher/Launcher-jdk.compiler.gmk
rename to make/modules/jdk.compiler/Launcher.gmk
diff --git a/make/copy/Copy-jdk.crypto.cryptoki.gmk b/make/modules/jdk.crypto.cryptoki/Copy.gmk
similarity index 100%
rename from make/copy/Copy-jdk.crypto.cryptoki.gmk
rename to make/modules/jdk.crypto.cryptoki/Copy.gmk
diff --git a/make/lib/Lib-jdk.crypto.cryptoki.gmk b/make/modules/jdk.crypto.cryptoki/Lib.gmk
similarity index 100%
rename from make/lib/Lib-jdk.crypto.cryptoki.gmk
rename to make/modules/jdk.crypto.cryptoki/Lib.gmk
diff --git a/make/lib/Lib-jdk.crypto.ec.gmk b/make/modules/jdk.crypto.ec/Lib.gmk
similarity index 100%
rename from make/lib/Lib-jdk.crypto.ec.gmk
rename to make/modules/jdk.crypto.ec/Lib.gmk
diff --git a/make/lib/Lib-jdk.crypto.mscapi.gmk b/make/modules/jdk.crypto.mscapi/Lib.gmk
similarity index 100%
rename from make/lib/Lib-jdk.crypto.mscapi.gmk
rename to make/modules/jdk.crypto.mscapi/Lib.gmk
diff --git a/make/copy/Copy-jdk.crypto.ucrypto.gmk b/make/modules/jdk.crypto.ucrypto/Copy.gmk
similarity index 100%
rename from make/copy/Copy-jdk.crypto.ucrypto.gmk
rename to make/modules/jdk.crypto.ucrypto/Copy.gmk
diff --git a/make/lib/Lib-jdk.crypto.ucrypto.gmk b/make/modules/jdk.crypto.ucrypto/Lib.gmk
similarity index 100%
rename from make/lib/Lib-jdk.crypto.ucrypto.gmk
rename to make/modules/jdk.crypto.ucrypto/Lib.gmk
diff --git a/make/gensrc/Gensrc-jdk.hotspot.agent.gmk b/make/modules/jdk.hotspot.agent/Gensrc.gmk
similarity index 100%
rename from make/gensrc/Gensrc-jdk.hotspot.agent.gmk
rename to make/modules/jdk.hotspot.agent/Gensrc.gmk
diff --git a/make/launcher/Launcher-jdk.hotspot.agent.gmk b/make/modules/jdk.hotspot.agent/Launcher.gmk
similarity index 100%
rename from make/launcher/Launcher-jdk.hotspot.agent.gmk
rename to make/modules/jdk.hotspot.agent/Launcher.gmk
diff --git a/make/lib/Lib-jdk.hotspot.agent.gmk b/make/modules/jdk.hotspot.agent/Lib.gmk
similarity index 95%
rename from make/lib/Lib-jdk.hotspot.agent.gmk
rename to make/modules/jdk.hotspot.agent/Lib.gmk
index b05211c301c..c7bb98f313e 100644
--- a/make/lib/Lib-jdk.hotspot.agent.gmk
+++ b/make/modules/jdk.hotspot.agent/Lib.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
 
 include LibCommon.gmk
 
-$(eval $(call IncludeCustomExtension, hotspot/lib/Lib-jdk.hotspot.agent.gmk))
-
 ################################################################################
 
 ifeq ($(call isTargetOs, linux), true)
diff --git a/make/launcher/Launcher-jdk.incubator.jpackage.gmk b/make/modules/jdk.incubator.jpackage/Launcher.gmk
similarity index 100%
rename from make/launcher/Launcher-jdk.incubator.jpackage.gmk
rename to make/modules/jdk.incubator.jpackage/Launcher.gmk
diff --git a/make/lib/Lib-jdk.incubator.jpackage.gmk b/make/modules/jdk.incubator.jpackage/Lib.gmk
similarity index 100%
rename from make/lib/Lib-jdk.incubator.jpackage.gmk
rename to make/modules/jdk.incubator.jpackage/Lib.gmk
diff --git a/make/lib/Lib-jdk.internal.le.gmk b/make/modules/jdk.internal.le/Lib.gmk
similarity index 100%
rename from make/lib/Lib-jdk.internal.le.gmk
rename to make/modules/jdk.internal.le/Lib.gmk
diff --git a/make/gensrc/Gensrc-jdk.internal.vm.compiler.management.gmk b/make/modules/jdk.internal.vm.compiler.management/Gensrc.gmk
similarity index 100%
rename from make/gensrc/Gensrc-jdk.internal.vm.compiler.management.gmk
rename to make/modules/jdk.internal.vm.compiler.management/Gensrc.gmk
diff --git a/make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk b/make/modules/jdk.internal.vm.compiler/Gensrc.gmk
similarity index 97%
rename from make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk
rename to make/modules/jdk.internal.vm.compiler/Gensrc.gmk
index 2fdf530730a..be0b85f462d 100644
--- a/make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk
+++ b/make/modules/jdk.internal.vm.compiler/Gensrc.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -28,8 +28,6 @@ default: all
 include $(SPEC)
 include MakeBase.gmk
 
-$(eval $(call IncludeCustomExtension, gensrc/Gensrc-jdk.internal.vm.compiler.gmk))
-
 GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)
 SRC_DIR := $(TOPDIR)/src/$(MODULE)/share/classes
 
diff --git a/make/gensrc/Gensrc-jdk.jartool.gmk b/make/modules/jdk.jartool/Gensrc.gmk
similarity index 100%
rename from make/gensrc/Gensrc-jdk.jartool.gmk
rename to make/modules/jdk.jartool/Gensrc.gmk
diff --git a/make/launcher/Launcher-jdk.jartool.gmk b/make/modules/jdk.jartool/Launcher.gmk
similarity index 100%
rename from make/launcher/Launcher-jdk.jartool.gmk
rename to make/modules/jdk.jartool/Launcher.gmk
diff --git a/make/gensrc/Gensrc-jdk.javadoc.gmk b/make/modules/jdk.javadoc/Gensrc.gmk
similarity index 100%
rename from make/gensrc/Gensrc-jdk.javadoc.gmk
rename to make/modules/jdk.javadoc/Gensrc.gmk
diff --git a/make/launcher/Launcher-jdk.javadoc.gmk b/make/modules/jdk.javadoc/Launcher.gmk
similarity index 100%
rename from make/launcher/Launcher-jdk.javadoc.gmk
rename to make/modules/jdk.javadoc/Launcher.gmk
diff --git a/make/launcher/Launcher-jdk.jcmd.gmk b/make/modules/jdk.jcmd/Launcher.gmk
similarity index 91%
rename from make/launcher/Launcher-jdk.jcmd.gmk
rename to make/modules/jdk.jcmd/Launcher.gmk
index 7117fa78059..0f171502fe4 100644
--- a/make/launcher/Launcher-jdk.jcmd.gmk
+++ b/make/modules/jdk.jcmd/Launcher.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -60,6 +60,3 @@ $(eval $(call SetupBuildLauncher, jstat, \
 $(eval $(call SetupBuildLauncher, jcmd, \
     MAIN_CLASS := sun.tools.jcmd.JCmd, \
 ))
-
-# Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, launcher/Launcher-jdk.jcmd-post.gmk))
diff --git a/make/launcher/Launcher-jdk.jconsole.gmk b/make/modules/jdk.jconsole/Launcher.gmk
similarity index 100%
rename from make/launcher/Launcher-jdk.jconsole.gmk
rename to make/modules/jdk.jconsole/Launcher.gmk
diff --git a/make/gensrc/Gensrc-jdk.jdeps.gmk b/make/modules/jdk.jdeps/Gensrc.gmk
similarity index 100%
rename from make/gensrc/Gensrc-jdk.jdeps.gmk
rename to make/modules/jdk.jdeps/Gensrc.gmk
diff --git a/make/launcher/Launcher-jdk.jdeps.gmk b/make/modules/jdk.jdeps/Launcher.gmk
similarity index 100%
rename from make/launcher/Launcher-jdk.jdeps.gmk
rename to make/modules/jdk.jdeps/Launcher.gmk
diff --git a/make/gensrc/Gensrc-jdk.jdi.gmk b/make/modules/jdk.jdi/Gensrc.gmk
similarity index 100%
rename from make/gensrc/Gensrc-jdk.jdi.gmk
rename to make/modules/jdk.jdi/Gensrc.gmk
diff --git a/make/launcher/Launcher-jdk.jdi.gmk b/make/modules/jdk.jdi/Launcher.gmk
similarity index 100%
rename from make/launcher/Launcher-jdk.jdi.gmk
rename to make/modules/jdk.jdi/Launcher.gmk
diff --git a/make/lib/Lib-jdk.jdi.gmk b/make/modules/jdk.jdi/Lib.gmk
similarity index 100%
rename from make/lib/Lib-jdk.jdi.gmk
rename to make/modules/jdk.jdi/Lib.gmk
diff --git a/make/copy/Copy-jdk.jdwp.agent.gmk b/make/modules/jdk.jdwp.agent/Copy.gmk
similarity index 100%
rename from make/copy/Copy-jdk.jdwp.agent.gmk
rename to make/modules/jdk.jdwp.agent/Copy.gmk
diff --git a/make/lib/Lib-jdk.jdwp.agent.gmk b/make/modules/jdk.jdwp.agent/Lib.gmk
similarity index 100%
rename from make/lib/Lib-jdk.jdwp.agent.gmk
rename to make/modules/jdk.jdwp.agent/Lib.gmk
diff --git a/make/copy/Copy-jdk.jfr.gmk b/make/modules/jdk.jfr/Copy.gmk
similarity index 100%
rename from make/copy/Copy-jdk.jfr.gmk
rename to make/modules/jdk.jfr/Copy.gmk
diff --git a/make/launcher/Launcher-jdk.jfr.gmk b/make/modules/jdk.jfr/Launcher.gmk
similarity index 100%
rename from make/launcher/Launcher-jdk.jfr.gmk
rename to make/modules/jdk.jfr/Launcher.gmk
diff --git a/make/gensrc/Gensrc-jdk.jlink.gmk b/make/modules/jdk.jlink/Gensrc.gmk
similarity index 100%
rename from make/gensrc/Gensrc-jdk.jlink.gmk
rename to make/modules/jdk.jlink/Gensrc.gmk
diff --git a/make/launcher/Launcher-jdk.jlink.gmk b/make/modules/jdk.jlink/Launcher.gmk
similarity index 100%
rename from make/launcher/Launcher-jdk.jlink.gmk
rename to make/modules/jdk.jlink/Launcher.gmk
diff --git a/make/gensrc/Gensrc-jdk.jshell.gmk b/make/modules/jdk.jshell/Gensrc.gmk
similarity index 100%
rename from make/gensrc/Gensrc-jdk.jshell.gmk
rename to make/modules/jdk.jshell/Gensrc.gmk
diff --git a/make/launcher/Launcher-jdk.jshell.gmk b/make/modules/jdk.jshell/Launcher.gmk
similarity index 100%
rename from make/launcher/Launcher-jdk.jshell.gmk
rename to make/modules/jdk.jshell/Launcher.gmk
diff --git a/make/launcher/Launcher-jdk.jstatd.gmk b/make/modules/jdk.jstatd/Launcher.gmk
similarity index 85%
rename from make/launcher/Launcher-jdk.jstatd.gmk
rename to make/modules/jdk.jstatd/Launcher.gmk
index e9286d63094..de481b78b6c 100644
--- a/make/launcher/Launcher-jdk.jstatd.gmk
+++ b/make/modules/jdk.jstatd/Launcher.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,3 @@ include LauncherCommon.gmk
 $(eval $(call SetupBuildLauncher, jstatd, \
     MAIN_CLASS := sun.tools.jstatd.Jstatd, \
 ))
-
-# Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, launcher/Launcher-jdk.jstatd-post.gmk))
diff --git a/make/gensrc/Gensrc-jdk.localedata.gmk b/make/modules/jdk.localedata/Gensrc.gmk
similarity index 91%
rename from make/gensrc/Gensrc-jdk.localedata.gmk
rename to make/modules/jdk.localedata/Gensrc.gmk
index d7fc8ef226b..7812d9d2be1 100644
--- a/make/gensrc/Gensrc-jdk.localedata.gmk
+++ b/make/modules/jdk.localedata/Gensrc.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,7 @@
 
 include GensrcCommonJdk.gmk
 
-# Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, gensrc/Gensrc-jdk.localedata.gmk))
-
-include GensrcLocaleData.gmk
+include modules/java.base/gensrc/GensrcLocaleData.gmk
 
 ################################################################################
 
diff --git a/make/copy/Copy-jdk.management.agent.gmk b/make/modules/jdk.management.agent/Copy.gmk
similarity index 100%
rename from make/copy/Copy-jdk.management.agent.gmk
rename to make/modules/jdk.management.agent/Copy.gmk
diff --git a/make/gensrc/Gensrc-jdk.management.agent.gmk b/make/modules/jdk.management.agent/Gensrc.gmk
similarity index 100%
rename from make/gensrc/Gensrc-jdk.management.agent.gmk
rename to make/modules/jdk.management.agent/Gensrc.gmk
diff --git a/make/lib/Lib-jdk.management.agent.gmk b/make/modules/jdk.management.agent/Lib.gmk
similarity index 100%
rename from make/lib/Lib-jdk.management.agent.gmk
rename to make/modules/jdk.management.agent/Lib.gmk
diff --git a/make/lib/Lib-jdk.management.gmk b/make/modules/jdk.management/Lib.gmk
similarity index 85%
rename from make/lib/Lib-jdk.management.gmk
rename to make/modules/jdk.management/Lib.gmk
index e32025ab2f7..6118d2effac 100644
--- a/make/lib/Lib-jdk.management.gmk
+++ b/make/modules/jdk.management/Lib.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,6 @@
 
 include LibCommon.gmk
 
-# Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, lib/Lib-jdk.management.gmk))
-
 ################################################################################
 
 ifeq ($(call isTargetOs, windows), true)
@@ -60,8 +57,3 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBMANAGEMENT_EXT, \
 $(BUILD_LIBMANAGEMENT_EXT): $(call FindLib, java.base, java)
 
 TARGETS += $(BUILD_LIBMANAGEMENT_EXT)
-
-################################################################################
-
-# Include custom extension post hook
-$(eval $(call IncludeCustomExtension, lib/Lib-jdk.management-post.gmk))
diff --git a/make/lib/Lib-jdk.net.gmk b/make/modules/jdk.net/Lib.gmk
similarity index 100%
rename from make/lib/Lib-jdk.net.gmk
rename to make/modules/jdk.net/Lib.gmk
diff --git a/make/lib/Lib-jdk.sctp.gmk b/make/modules/jdk.sctp/Lib.gmk
similarity index 100%
rename from make/lib/Lib-jdk.sctp.gmk
rename to make/modules/jdk.sctp/Lib.gmk
diff --git a/make/lib/Lib-jdk.security.auth.gmk b/make/modules/jdk.security.auth/Lib.gmk
similarity index 100%
rename from make/lib/Lib-jdk.security.auth.gmk
rename to make/modules/jdk.security.auth/Lib.gmk