diff --git a/configure/CONFIG b/configure/CONFIG
index a6f25bee68a64f6b4bc7c32f608b4758bf66d283..c4970f13e545cfc406742ae42330430866bbd637 100644
--- a/configure/CONFIG
+++ b/configure/CONFIG
@@ -24,9 +24,9 @@ include $(TOP)/configure/E3/CONFIG_REQUIRE
 include $(TOP)/configure/E3/CONFIG_SHELL
 include $(TOP)/configure/E3/CONFIG_E3_PATH
 include $(TOP)/configure/E3/CONFIG_E3_MAKEFILE
+include $(TOP)/configure/E3/CONFIG_TEST
 include $(TOP)/configure/E3/CONFIG_EPICS
 include $(TOP)/configure/E3/CONFIG_EXPORT
-include $(TOP)/configure/E3/CONFIG_TEST
 
 
 VARS_EXCLUDES+=BASE_3_14
diff --git a/configure/RULES b/configure/RULES
index a22a8c59a5445247303065363002dc1dedbfbd1f..aced32cafaee3b3c8dd5096ec0525be146a80e21 100644
--- a/configure/RULES
+++ b/configure/RULES
@@ -9,10 +9,10 @@ include $(TOP)/configure/E3/RULES_E3
 include $(TOP)/configure/E3/RULES_EPICS
 
 
-include $(TOP)/configure/E3/RULES_REQUIRE
+include $(TOP)/configure/module/RULES_REQUIRE
 
 include $(TOP)/configure/E3/RULES_PATCH
-include $(TOP)/configure/E3/RULES_DB
+include $(TOP)/configure/module/RULES_DB
 include $(TOP)/configure/E3/RULES_VARS
 include $(TOP)/configure/module/RULES_TEST
 
diff --git a/configure/E3/RULES_DB b/configure/module/RULES_DB
similarity index 68%
rename from configure/E3/RULES_DB
rename to configure/module/RULES_DB
index 9c751131d4076db1cf1c94f4dbd986867d1142e4..e2f8c95342461c39607d5a0c141bccfa2e00e6bc 100644
--- a/configure/E3/RULES_DB
+++ b/configure/module/RULES_DB
@@ -2,6 +2,8 @@
 ## This RULE should be used in case of inflating DB files
 ##
 
+# TODO: This belong in configure/module, same as for other modules
+
 .PHONY: db
 
 
diff --git a/configure/E3/RULES_REQUIRE b/configure/module/RULES_REQUIRE
similarity index 100%
rename from configure/E3/RULES_REQUIRE
rename to configure/module/RULES_REQUIRE