diff --git a/configure/modules/CONFIG b/configure/E3/CONFIG
similarity index 100%
rename from configure/modules/CONFIG
rename to configure/E3/CONFIG
diff --git a/configure/modules/CONFIG_CELL b/configure/E3/CONFIG_CELL
similarity index 100%
rename from configure/modules/CONFIG_CELL
rename to configure/E3/CONFIG_CELL
diff --git a/configure/modules/CONFIG_DKMS b/configure/E3/CONFIG_DKMS
similarity index 100%
rename from configure/modules/CONFIG_DKMS
rename to configure/E3/CONFIG_DKMS
diff --git a/configure/modules/RULES_CELL b/configure/E3/RULES_CELL
similarity index 100%
rename from configure/modules/RULES_CELL
rename to configure/E3/RULES_CELL
diff --git a/configure/modules/RULES_DKMS b/configure/E3/RULES_DKMS
similarity index 100%
rename from configure/modules/RULES_DKMS
rename to configure/E3/RULES_DKMS
diff --git a/configure/modules/RULES_E3_SITEAPPS b/configure/E3/RULES_E3_SITEAPPS
similarity index 100%
rename from configure/modules/RULES_E3_SITEAPPS
rename to configure/E3/RULES_E3_SITEAPPS
diff --git a/configure/modules/RULES_E3_SITELIBS b/configure/E3/RULES_E3_SITELIBS
similarity index 100%
rename from configure/modules/RULES_E3_SITELIBS
rename to configure/E3/RULES_E3_SITELIBS
diff --git a/configure/modules/RULES_SITEAPPS b/configure/E3/RULES_SITEAPPS
similarity index 100%
rename from configure/modules/RULES_SITEAPPS
rename to configure/E3/RULES_SITEAPPS
diff --git a/configure/modules/RULES_SITEMODS b/configure/E3/RULES_SITEMODS
similarity index 100%
rename from configure/modules/RULES_SITEMODS
rename to configure/E3/RULES_SITEMODS
diff --git a/configure/module/RULES_REQUIRE b/configure/module/RULES_REQUIRE
index 9eb6379b0936cb23ad4e930b476566b9627d7c42..c1d0494663b452863c116e15f1e3e481da42218d 100644
--- a/configure/module/RULES_REQUIRE
+++ b/configure/module/RULES_REQUIRE
@@ -10,7 +10,7 @@ E3_TEST_SCRIPT    := $(TOP)/tools/test_installed_modules.sh
 E3_SHELL_FILES    := $(wildcard $(E3_MODULE_SRC_PATH)/tools/iocsh*.bash)
 E3_IOC_CFG_FILES  += $(E3_MODULE_SRC_PATH)/tools/setE3Env.bash
 E3_IOC_CFG_FILES  += $(E3_MODULE_SRC_PATH)/tools/promptE3Env.bash
-E3_REQUIRE_CONF_FILES := $(filter-out $(FILE_FILTER), $(wildcard $(TOP)/configure/modules/*))
+E3_REQUIRE_CONF_FILES := $(filter-out $(FILE_FILTER), $(wildcard $(TOP)/configure/E3/*))
 
 check_uninstall:
 ifneq (,$(strip $(wildcard $(E3_SITEMODS_PATH)/*)))
diff --git a/configure/modules/CONFIG_E3_MAKEFILE b/configure/modules/CONFIG_E3_MAKEFILE
deleted file mode 100644
index f3d6ba4b6dc5230b20519468f7d7bf27325ed657..0000000000000000000000000000000000000000
--- a/configure/modules/CONFIG_E3_MAKEFILE
+++ /dev/null
@@ -1,34 +0,0 @@
-# Pass necessary driver.makefile variables through makefile options
-#
-
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS := -C $(E3_MODULE_SRC_PATH)
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += -f $(E3_MODULE_MAKEFILE)
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += LIBVERSION="$(E3_MODULE_VERSION)"
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += PROJECT="$(E3_MODULE_NAME)"
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += EPICS_MODULES="$(E3_MODULES_PATH)"
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += EPICS_LOCATION="$(EPICS_BASE)"
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += BUILDCLASSES="Linux"
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += E3_SITEMODS_PATH="$(E3_SITEMODS_PATH)"
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += E3_SITEAPPS_PATH="$(E3_SITEAPPS_PATH)"
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += E3_SITELIBS_PATH="$(E3_SITELIBS_PATH)"
-
-ifeq ($(shell git status > /dev/null 2>&1; echo $$?),0)
-GIT_REMOTE_NAME := $(shell git remote | head -n 1)
-
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += $(E3_MODULE_NAME)_E3_GIT_DESC="$(shell git describe --tags 2> /dev/null || git rev-parse HEAD 2> /dev/null || echo 'Not a git repository')"
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += $(E3_MODULE_NAME)_E3_GIT_STATUS="[ $(shell git status --porcelain | sed 's/^/\\\\\\\"/' | sed 's/$$/\\\\\\\", /')]"
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += $(E3_MODULE_NAME)_E3_GIT_URL="$(shell git config --get remote.$(GIT_REMOTE_NAME).url 2> /dev/null | sed 's%^https://[^@]*@%https://%')"
-else
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += $(E3_MODULE_NAME)_E3_GIT_DESC=
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += $(E3_MODULE_NAME)_E3_GIT_STATUS=
-E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += $(E3_MODULE_NAME)_E3_GIT_URL=
-endif
-
-
-E3_MODULE_MAKE_CMDS:=make $(E3_REQUIRE_MAKEFILE_INPUT_OPTIONS)
-
-
-## the following variables to display
-
-VARS_EXCLUDES+=E3_REQUIRE_MAKEFILE_INPUT_OPTIONS
-VARS_EXCLUDES+=GIT_REMOTE_NAME
diff --git a/configure/modules/CONFIG_E3_PATH b/configure/modules/CONFIG_E3_PATH
deleted file mode 100644
index 43e724ec3742ad84de80b6225c4ee2e1fa0bafba..0000000000000000000000000000000000000000
--- a/configure/modules/CONFIG_E3_PATH
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-E3_SITEMODS_PATH:=$(E3_REQUIRE_LOCATION)/siteMods
-E3_SITELIBS_PATH:=$(E3_REQUIRE_LOCATION)/siteLibs
-E3_SITEAPPS_PATH:=$(E3_REQUIRE_LOCATION)/siteApps
-
-E3_MODULES_INSTALL_LOCATION:=$(E3_MODULES_PATH)/$(E3_MODULE_NAME)/$(E3_MODULE_VERSION)
-
-E3_MODULES_INSTALL_LOCATION_INC:=$(E3_MODULES_INSTALL_LOCATION)/include
-E3_MODULES_INSTALL_LOCATION_DB:=$(E3_MODULES_INSTALL_LOCATION)/db
-E3_MODULES_INSTALL_LOCATION_BIN:=$(E3_MODULES_INSTALL_LOCATION)/bin
-E3_MODULES_INSTALL_LOCATION_LIB:=$(E3_MODULES_INSTALL_LOCATION)/lib
-
-EXPORT_VARS+=E3_MODULES_INSTALL_LOCATION_LIB
diff --git a/configure/modules/CONFIG_EPICS b/configure/modules/CONFIG_EPICS
deleted file mode 100644
index 432e0d3fdebe3f1c49d216f5000723c2b19c32e7..0000000000000000000000000000000000000000
--- a/configure/modules/CONFIG_EPICS
+++ /dev/null
@@ -1,81 +0,0 @@
-COMMUNITY_EPICS_MODULES:=$(EPICS_BASE)/epics-modules
-
-M_AUTOSAVE:=$(COMMUNITY_EPICS_MODULES)/autosave
-M_DEVLIB2:=$(COMMUNITY_EPICS_MODULES)/devlib2
-M_IOCSTATS:=$(COMMUNITY_EPICS_MODULES)/iocStats
-M_ASYN:=$(COMMUNITY_EPICS_MODULES)/asyn
-M_BUSY:=$(COMMUNITY_EPICS_MODULES)/busy
-M_MODBUS:=$(COMMUNITY_EPICS_MODULES)/modbus
-M_MRFIOC2:=$(COMMUNITY_EPICS_MODULES)/mrfioc2
-M_LUA:=$(COMMUNITY_EPICS_MODULES)/lua
-M_IPMICOMM:=$(COMMUNITY_EPICS_MODULES)/ipmiComm
-M_STREAM:=$(COMMUNITY_EPICS_MODULES)/stream
-M_CALC:=$(COMMUNITY_EPICS_MODULES)/calc
-M_MOTOR:=$(COMMUNITY_EPICS_MODULES)/motor
-M_SSCAN:=$(COMMUNITY_EPICS_MODULES)/sscan
-M_SNCSEQ:=$(COMMUNITY_EPICS_MODULES)/seq
-M_IP:=$(COMMUNITY_EPICS_MODULES)/ip
-M_IPAC:=$(COMMUNITY_EPICS_MODULES)/ipac
-M_ADSUPPORT:=$(COMMUNITY_EPICS_MODULES)/adsupport
-M_ADCORE:=$(COMMUNITY_EPICS_MODULES)/adcore
-M_OPCUA:=$(COMMUNITY_EPICS_MODULES)/opcua
-
-
-
-export M_AUTOSAVE
-export M_DEVLIB2
-export M_IOCSTATS
-export M_ASYN
-export M_BUSY
-export M_MODBUS
-export M_MRFIOC2
-export M_LUA
-export M_IPMICOMM
-export M_STREAM
-export M_CALC
-export M_MOTOR
-export M_SSCAN
-export M_SNCSEQ
-export M_IP
-export M_IPAC
-export M_ADSUPPORT
-export M_ADCORE
-export M_OPCUA
-
-## This is needed since the target "epics" (in configure/RULES_MODULE in most modules)
-## uses SUDOBASH to run the make process:
-#
-#.PHONY: epics
-#epics:
-#	$(QUIET)echo "EPICS_BASE:=$(EPICS_BASE)"        > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/RELEASE
-#	$(QUIET)echo "ASYN:=$(M_ASYN)"                  > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/RELEASE
-#	$(QUIET)echo "CHECK_RELEASE:=YES"             > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/CONFIG_SITE
-#	$(QUIET)echo "INSTALL_LOCATION:=$(M_DEVLIB2)"  >> $(TOP)/$(E3_MODULE_SRC_PATH)/configure/CONFIG_SITE
-#	$(SUDOBASH) "$(MAKE) -C $(E3_MODULE_SRC_PATH)"
-#
-## And so that last line will only run if SUDOBASH is defined to be "bash -c"
-SUDOBASH := bash -c
-
-### Exclude the following variables to display
-VARS_EXCLUDES+=COMMUNITY_EPICS_MODULES
-VARS_EXCLUDES+=M_AUTOSAVE
-VARS_EXCLUDES+=M_DEVLIB2
-VARS_EXCLUDES+=M_IOCSTATS
-VARS_EXCLUDES+=M_ASYN
-VARS_EXCLUDES+=M_BUSY
-VARS_EXCLUDES+=M_MODBUS
-VARS_EXCLUDES+=M_MRFIOC2
-VARS_EXCLUDES+=M_LUA
-VARS_EXCLUDES+=M_IPMICOMM
-VARS_EXCLUDES+=M_STREAM
-VARS_EXCLUDES+=M_CALC
-VARS_EXCLUDES+=M_MOTOR
-VARS_EXCLUDES+=M_SSCAN
-VARS_EXCLUDES+=M_SNCSEQ
-VARS_EXCLUDES+=M_IP
-VARS_EXCLUDES+=M_IPAC
-VARS_EXCLUDES+=M_ADSUPPORT
-VARS_EXCLUDES+=M_ADCORE
-VARS_EXCLUDES+=M_OPCUA
-
-VARS_EXCLUDES+=SUDOBASH
diff --git a/configure/modules/CONFIG_EXPORT b/configure/modules/CONFIG_EXPORT
deleted file mode 100644
index 6d5b66093de4e210d1c539f72b5e2ea155d3a2f9..0000000000000000000000000000000000000000
--- a/configure/modules/CONFIG_EXPORT
+++ /dev/null
@@ -1,25 +0,0 @@
-# Variables should be transferred to module_name.makefile
-
-EPICS_HOST_ARCH:=$(shell perl $(EPICS_BASE)/lib/perl/EpicsHostArch.pl 2> /dev/null)
-
-MSI:=$(EPICS_BASE)/bin/$(EPICS_HOST_ARCH)/msi
-
-EXPORT_VARS+=EPICS_HOST_ARCH
-EXPORT_VARS+=EPICS_BASE
-EXPORT_VARS+=MSI
-EXPORT_VARS+=E3_MODULE_NAME
-EXPORT_VARS+=E3_MODULE_VERSION
-EXPORT_VARS+=E3_SITEMODS_PATH
-EXPORT_VARS+=E3_SITEAPPS_PATH
-EXPORT_VARS+=E3_SITELIBS_PATH
-EXPORT_VARS+=$(filter E3_REQUIRE_%,$(.VARIABLES))
-
-EXPORT_VARS+=QUIET
-EXPORT_VARS+=$(filter %_DEP_VERSION,$(.VARIABLES))
-EXPORT_VARS+=$(filter WITH_%,$(.VARIABLES))
-EXPORT_VARS+=$(filter %_EXTERNAL,$(.VARIABLES))
-
-export_version=$(eval export $1)
-$(eval $(foreach v,$(EXPORT_VARS),$(call export_version,$v)))
-
-VARS_EXCLUDES+=export_version
diff --git a/configure/modules/CONFIG_REQUIRE b/configure/modules/CONFIG_REQUIRE
deleted file mode 100644
index 045f42b54ef166f16c597e6cd6a34b3af31a235c..0000000000000000000000000000000000000000
--- a/configure/modules/CONFIG_REQUIRE
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# The following VARIABLES are the same as other modules ones.
-#
-
-E3_REQUIRE_LOCATION:=$(EPICS_BASE)/$(E3_REQUIRE_NAME)/$(E3_REQUIRE_VERSION)
-
-E3_REQUIRE_TOOLS:=$(E3_REQUIRE_LOCATION)/tools
-E3_REQUIRE_BIN:=$(E3_REQUIRE_LOCATION)/bin
-E3_REQUIRE_LIB:=$(E3_REQUIRE_LOCATION)/lib
-E3_REQUIRE_DB:=$(E3_REQUIRE_LOCATION)/db
-E3_REQUIRE_DBD:=$(E3_REQUIRE_LOCATION)/dbd
-E3_REQUIRE_INC:=$(E3_REQUIRE_LOCATION)/include
-E3_REQUIRE_CONFIG:=$(E3_REQUIRE_LOCATION)/configure
diff --git a/configure/modules/CONFIG_SHELL b/configure/modules/CONFIG_SHELL
deleted file mode 100644
index b35126f3d81d2ac2200ce10c844ce1f0973cc0eb..0000000000000000000000000000000000000000
--- a/configure/modules/CONFIG_SHELL
+++ /dev/null
@@ -1,8 +0,0 @@
-
-ifdef DEBUG_SHELL
-  SHELL = /bin/sh -x
-else
-  SHELL = /usr/bin/bash
-endif
-
-VARS_EXCLUDES+=SHELL
diff --git a/configure/modules/CONFIG_TEST b/configure/modules/CONFIG_TEST
deleted file mode 100644
index d9792f20aa9dcede18a97366c77c25df8997eccd..0000000000000000000000000000000000000000
--- a/configure/modules/CONFIG_TEST
+++ /dev/null
@@ -1,11 +0,0 @@
-TEST_DIR:=$(TOP)/tests
-
-RUN_IOCSH_TEST_COMMAND = run-iocsh --name "${EPICS_BASE}/require/${E3_REQUIRE_VERSION}/bin/iocsh.bash" -r "$(E3_MODULE_NAME),$(E3_MODULE_VERSION)" -l $(TEMP_CELL_PATH)
-TEMP_CELL_PATH := $(TOP)/testMods-$(shell date +"%y%m%d%H%M%S")
-RMDIR = $(RM) -rf
-
-EXPORT_VARS+=TEMP_CELL_PATH
-
-VARS_EXCLUDES+=TEST_DIR
-VARS_EXCLUDES+=RMDIR
-VARS_EXCLUDES+=TEMP_CELL_PATH
diff --git a/configure/modules/DECOUPLE_FLAGS b/configure/modules/DECOUPLE_FLAGS
deleted file mode 100644
index 476159b45bc50c2028b81b053709696a0c98d4dc..0000000000000000000000000000000000000000
--- a/configure/modules/DECOUPLE_FLAGS
+++ /dev/null
@@ -1,7 +0,0 @@
-# Legacy file. Needed since <module>.Makefiles include the boilerplate code
-#
-# where_am_I := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
-# include ${E3_REQUIRE_TOOLS}/driver.makefile
-# include $(E3_REQUIRE_CONFIG)/DECOUPLE_FLAGS
-#
-# which fails if this file does not exist. TODO: Remove this line from all modules
diff --git a/configure/modules/DEFINES_FT b/configure/modules/DEFINES_FT
deleted file mode 100644
index fc7d5628d700d312faabd446f4b47763861f8ab2..0000000000000000000000000000000000000000
--- a/configure/modules/DEFINES_FT
+++ /dev/null
@@ -1,50 +0,0 @@
-# Keep always the module up-to-date
-define git_update =
-git submodule deinit -f $@/
-sed -i '/submodule/,24465d'  $(TOP)/.git/config
-rm -rf $(TOP)/.git/modules/$@
-git submodule init $@/
-git submodule update --init --recursive $@/.
-git submodule update --remote --merge $@/
-endef
-
-define git_module_init_update =
-git submodule update --init --recursive $@/.
-git submodule update --remote --merge $@/
-endef
-
-define patch_site
-patches=$$(ls $(TOP)/patch/Site/$(E3_MODULE_VERSION)/*.p0.patch 2> /dev/null); \
-if [ -n "$$patches" ]; then \
-  for i in $$patches; do \
-    printf "\nPatching %s with the file : %s\n" "$(E3_MODULE_SRC_PATH)" "$$i"; \
-    git apply --directory=$(E3_MODULE_SRC_PATH) --ignore-whitespace -p0 $$i; \
-  done; \
-else \
-  echo ">>> No patches to apply" >&2; \
-fi
-endef
-
-define patch_revert_site
-patches=$$(ls $(TOP)/patch/Site/$(E3_MODULE_VERSION)/*.p0.patch 2> /dev/null); \
-if [ -n "$$patches" ]; then \
-  for i in $$patches; do\
-    printf "\nReverting applied patch %s with the file : %s\n" "$(E3_MODULE_SRC_PATH)" "$$i"; \
-    git apply -R --directory=$(E3_MODULE_SRC_PATH) --ignore-whitespace -p0 $$i;\
-  done \
-else \
-  echo ">>> No patches to revert" >&2; \
-fi
-endef
-
-ifndef VERBOSE
-  QUIET := @
-endif
-
-### Exclude the following variables to display
-VARS_EXCLUDES+=git_update
-VARS_EXCLUDES+=git_module_init_update
-VARS_EXCLUDES+=patch_site
-VARS_EXCLUDES+=patch_revert_site
-VARS_EXCLUDES+=QUIET
-VARS_EXCLUDES+=SHELL
diff --git a/configure/modules/RULES_CHECKS b/configure/modules/RULES_CHECKS
deleted file mode 100644
index 875a02a72a62c53ba14bb05de241dbe521e8ba39..0000000000000000000000000000000000000000
--- a/configure/modules/RULES_CHECKS
+++ /dev/null
@@ -1,26 +0,0 @@
-.PHONY: consistency_checks
-consistency_checks: module_name_check loc-check
-
-ifneq (require,$(E3_MODULE_NAME))
-consistency_checks: sitemods_check
-endif
-
-# Check that the module name satisfies a few conditions before we go on.
-module_name_check:
-ifneq ($(shell echo $(E3_MODULE_NAME) | grep -q '^[a-z_][a-z0-9_]*$$' ; echo $$?),0)
-	$(error E3_MODULE_NAME '$(E3_MODULE_NAME)' is not valid. It should consist only of lowercase letters, numbers, and underscores.)
-endif
-
-# Check that a module is including RULES_SITEMODS instead of RULES_SITEAPPS or manually including RULES_E3
-.PHONY: sitemods_check
-sitemods_check:
-ifeq ($(filter RULES_SITEMODS,$(notdir $(MAKEFILE_LIST))),)
-	$(error RULES_E3 should only be loaded from RULES_SITEMODS)
-endif
-
-# Check that e3 wrappers are using EPICS_MODULE_TAG to manage local source mode
-.PHONU: loc-check
-loc-check:
-ifneq (,$(findstring -loc,$(E3_MODULE_SRC_PATH)))
-	$(error DEPRECATED: Local source mode "-loc" has being deprecated. Please comment out the EPICS_MODULE_TAG to use local source mode.)
-endif
diff --git a/configure/modules/RULES_DEV b/configure/modules/RULES_DEV
deleted file mode 100644
index 2c7e9a9ff1cc71b052b00178c0658dd0b1dc1c5f..0000000000000000000000000000000000000000
--- a/configure/modules/RULES_DEV
+++ /dev/null
@@ -1,72 +0,0 @@
-# -*- mode: Makefile;-*-
-
-.PHONY: devvars devenv devinit devbuild devclean devinstall devrebuild devuninstall devdistclean devconf devepics devepics-clean devepics-distclean devpatch devpatchrevert devexistent devdep devvers
-
-devvars: vars
-
-devenv: devvars
-
-## Initializes a dev setup, defined with configure/CONFIG_MODULE_DEV and configure/RELEASE_DEV
-devinit: git-submodule-sync
-	git clone $(E3_MODULE_DEV_GITURL) $(E3_MODULE_SRC_PATH)
-	cd $(E3_MODULE_SRC_PATH) && git checkout $(EPICS_MODULE_TAG)
-
-# E3_MODULE_SRC_PATH_FLAG 1 : the directory is not there
-# E3_MODULE_SRC_PATH_FLAG 0 : the directory is there
-E3_MODULE_SRC_PATH_FLAG := $(shell test -d $(E3_MODULE_SRC_PATH) 1>&2 2> /dev/null; echo $$?)
-
-# Note that this is re-defined in CONFIG_MODULE_DEV, which is included if you do a `make dev*`.
-ifeq "$(E3_MODULE_SRC_PATH_FLAG)" "1"
-
-devbuild: nonexists
-devclean: nonexists
-devinstall: nonexists
-devrebuild: nonexists
-devuninstall: nonexists
-devdistclean: nonexists
-devconf: nonexists
-devepics: nonexists
-devepics-clean: nonexists
-devepics-distclean: nonexists
-devpatch: nonexists
-devpatchrevert: nonexists
-devexistent: nonexists
-devdep: nonexists
-devvers: nonexists
-nonexists:
-	$(QUIET)echo ""
-	$(QUIET)echo "------------------------------------------------------------"
-	$(QUIET)echo "          Could not find $(E3_MODULE_SRC_PATH) "
-	$(QUIET)echo "          Please make devinit first !          "
-	$(QUIET)echo "------------------------------------------------------------"
-	$(QUIET)echo ""
-else
-
-## Displays information about the build process (development mode)
-devdebug: debug
-
-## Build current module (development mode)
-devbuild: build
-
-## Deletes temporary build files (development mode)
-devclean: clean
-
-## Install the current module (development mode)
-devinstall: install
-devrebuild: rebuild
-
-## Uninstall the current module (development mode)
-devuninstall: uninstall
-devconf: conf
-devdistclean: clean
-	$(QUIET)echo "Removing $(E3_MODULE_SRC_PATH) ......... "
-	rm -rf $(E3_MODULE_SRC_PATH)
-devepics: epics
-devepics-clean: epics-clean
-devepics-distclean: epics-distclean
-devpatch: patch
-devpatchrevert: patchrevert
-devexistent: existent
-devdep: dep
-devvers: vers
-endif
diff --git a/configure/modules/RULES_E3 b/configure/modules/RULES_E3
deleted file mode 100644
index 941ea4fa794419fd5ad3cb957f8a63abc4ef68b1..0000000000000000000000000000000000000000
--- a/configure/modules/RULES_E3
+++ /dev/null
@@ -1,113 +0,0 @@
-# -*- mode: Makefile;-*-
-.NOTPARALLEL:
-
-.DEFAULT_GOAL := help
-
-.PHONY: help default install uninstall build rebuild clean conf all prebuild
-
-default: help
-
-# # help is defined in
-# # https://gist.github.com/rcmachado/af3db315e31383502660
-help:
-	$(info --------------------------------------- )
-	$(info Available targets)
-	$(info --------------------------------------- )
-	$(QUIET) awk '/^[a-zA-Z\-\_0-9]+:/ {            \
-	  nb = sub( /^## /, "", helpMsg );              \
-	  if(nb == 0) {                                 \
-	    helpMsg = $$0;                              \
-	    nb = sub( /^[^:]*:.* ## /, "", helpMsg );   \
-	  }                                             \
-	  if (nb)                                       \
-	    print  $$1 "\t" helpMsg;                    \
-	}                                               \
-	{ helpMsg = $$0 }'                              \
-	$(MAKEFILE_LIST) | column -ts:
-
-
-
-
-## Install module to $(E3_MODULES_INSTALL_LOCATION)
-install: install_module
-
-.PHONY: db
-db: err_no_db_rule
-
-.PHONY: err_no_db_rule
-err_no_db_rule:
-	$(error The 'db' target has been discontinued. If you have custom database expansion rule to use, please contact the e3 team)
-
-.PHONY: install_module
-install_module: build db_internal
-	$(QUIET) $(E3_MODULE_MAKE_CMDS) install
-
-.PHONY: check_uninstall
-check_uninstall:
-
-## Uninstall the current module
-uninstall: check_uninstall conf
-	$(QUIET) $(E3_MODULE_MAKE_CMDS) uninstall
-
-## Build current module
-build: conf checkout prebuild
-	$(QUIET) $(E3_MODULE_MAKE_CMDS) build
-
-## Run module-specific commands before building
-prebuild: conf
-	$(QUIET) $(E3_MODULE_MAKE_CMDS) prebuild
-
-## Displays information about the build process
-debug: conf
-	$(QUIET) $(E3_MODULE_MAKE_CMDS) debug
-
-.PHONY: db_internal
-db_internal: conf
-	$(QUIET) $(E3_MODULE_MAKE_CMDS) db_internal
-
-## Clean, build, and install the current module
-rebuild: clean build install
-
-## Deletes temporary build files
-clean: conf
-	$(QUIET) $(E3_MODULE_MAKE_CMDS) clean
-
-## Initializes, patches, builds, and installs
-all: init patch rebuild
-
-# Copy $(E3_MODULE_MAKEFILE) into $(E3_MODULE_SRC_PATH)
-include $(REQUIRE_CONFIG)/RULES_CHECKS
-conf: consistency_checks
-	$(QUIET) install -p -m 644 $(TOP)/$(E3_MODULE_MAKEFILE)  $(E3_MODULE_SRC_PATH)/
-
-.PHONY: init git-submodule-sync $(E3_MODULE_SRC_PATH) checkout
-
-ifeq (,$(strip $(EPICS_MODULE_TAG)))
-E3_LOCAL_SOURCE:=1
-endif
-
-ifeq ($(E3_LOCAL_SOURCE),1)
-init:
-	$(QUIET) echo ">> You are in the local source mode."
-	$(QUIET) echo ">> Nothing happens."
-
-checkout:
-
-else
-## Syncs and checks out the tag $(EPICS_MODULE_TAG) for the submodule
-init: git-submodule-sync $(E3_MODULE_SRC_PATH)  checkout
-
-
-git-submodule-sync:
-	$(QUIET) git submodule sync
-
-
-$(E3_MODULE_SRC_PATH):
-	$(QUIET) $(git_update)
-
-
-checkout:
-	cd $(E3_MODULE_SRC_PATH) && git checkout $(EPICS_MODULE_TAG)
-
-
-endif
diff --git a/configure/modules/RULES_EPICS b/configure/modules/RULES_EPICS
deleted file mode 100644
index f7dac66e307723441d0be314c998d09d346f31dd..0000000000000000000000000000000000000000
--- a/configure/modules/RULES_EPICS
+++ /dev/null
@@ -1,10 +0,0 @@
-# One should define the any dependency modules and EPICS base path
-# in the following directory
-
-.PHONY: epics-clean epics-distclean
-
-epics-clean:
-	$(MAKE) -C $(E3_MODULE_SRC_PATH) clean
-
-epics-distclean:
-	$(MAKE) -C $(E3_MODULE_SRC_PATH) distclean
diff --git a/configure/modules/RULES_PATCH b/configure/modules/RULES_PATCH
deleted file mode 100644
index d2a6d0f6613be31117328fd8f01c4ba5b3fad9e8..0000000000000000000000000000000000000000
--- a/configure/modules/RULES_PATCH
+++ /dev/null
@@ -1,15 +0,0 @@
-
-.PHONY: patch patchrevert
-
-.PHONY: check_for_old_patches
-check_for_old_patches:
-	$(if $(wildcard $(TOP)/patch/Site/$(patsubst %+0,%,$(E3_MODULE_VERSION))*.p0.patch),$(warning Warning: old-style patches detected. Please move them to patch/Site/$$E3_MODULE_VERSION/.))
-
-
-## Apply Patch Files
-patch: check_for_old_patches
-	$(QUIET) $(call patch_site)
-
-## Revert Patch Files
-patchrevert: check_for_old_patches
-	$(QUIET) $(call patch_revert_site)
diff --git a/configure/modules/RULES_TEST b/configure/modules/RULES_TEST
deleted file mode 100644
index f542ecb693592fb72d2be104a9af22ee88f25880..0000000000000000000000000000000000000000
--- a/configure/modules/RULES_TEST
+++ /dev/null
@@ -1,29 +0,0 @@
-.PHONY: test
-## Tests the current build
-test:
-
-ifeq ($(shell command -v run-iocsh > /dev/null 2>&1 ; echo $$?),0)
-
-test: temp_install run_test module_tests cleanup_test
-
-.PHONY: temp_install
-temp_install:
-	$(MAKE) cellinstall E3_CELL_PATH=$(TEMP_CELL_PATH)
-
-.PHONY: run_test
-run_test:
-	$(RUN_IOCSH_TEST_COMMAND)
-
-.PHONY: module_tests
-module_tests:
-
-.PHONY: cleanup_test
-cleanup_test:
-	$(RMDIR) $(TEMP_CELL_PATH)
-
-else  # if the if-run-iocsh-exists test fails
-
-test:
-	$(error run-iocsh must be installed to use the test capability. Please install run-iocsh from PyPI.)
-
-endif
diff --git a/configure/modules/RULES_VARS b/configure/modules/RULES_VARS
deleted file mode 100644
index fa5c1a92e7fe8178627e6d3523bdbb8bdf7ede38..0000000000000000000000000000000000000000
--- a/configure/modules/RULES_VARS
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- mode: Makefile;-*-
-
-E3_MODULES_VARIABLES:=$(sort $(filter-out $(VARS_EXCLUDES) VARS_EXCLUDES,$(.VARIABLES)))
-
-DEP_MODULES:=$(filter %_DEP_VERSION, $(E3_MODULES_VARIABLES))
-
-LEVEL?=2
-
-GENERATED_DEP_FILE:=$(E3_MODULES_INSTALL_LOCATION_LIB)/$(EPICS_HOST_ARCH)/$(E3_MODULE_NAME).dep
-
-## Print relevant environment variables
-.PHONY: vars
-vars: header
-	$(foreach v, $(filter-out %_DEP_VERSION,$(E3_MODULES_VARIABLES)), $(info $(v) = $($(v)))) @#noop
-	$(foreach v, $(filter %_DEP_VERSION,$(E3_MODULES_VARIABLES)), $(info $(v) = $($(v)))) @#noop
-
-.PHONY: header
-header:
-	$(QUIET)echo ""
-	$(QUIET)echo "------------------------------------------------------------"
-	$(QUIET)echo ">>>>     Current EPICS and E3 Environment Variables     <<<<"
-	$(QUIET)echo "------------------------------------------------------------"
-	$(QUIET)echo ""
-
-## Show installed versions of the current module
-existent:
-ifeq (,$(shell which tree))
-	$(QUIET)ls -d $(E3_MODULES_PATH)/$(E3_MODULE_NAME)
-	$(QUIET)find $(E3_MODULES_PATH)/$(E3_MODULE_NAME)/ -maxdepth $(LEVEL) | sed -e "s/[^-][^\/]*\// |/g" -e "s/|\([^ ]\)/:---\1/"
-else
-	$(QUIET)tree -L $(LEVEL) $(E3_MODULES_PATH)/$(E3_MODULE_NAME)
-endif
-
-## Displays dependency information, both configured and generated
-.PHONY: dep
-dep:
-	$(QUIET)echo "require $(E3_MODULE_NAME),$(E3_MODULE_VERSION)"
-	$(QUIET)echo "< configured ..."
-	$(foreach v, $(DEP_MODULES), $(info $(v) = $($(v)))) @#noop
-ifneq ("$(wildcard $(GENERATED_DEP_FILE))","")
-	$(QUIET)echo "> generated ..."
-	$(QUIET)tail -n+2 $(GENERATED_DEP_FILE)
-endif
-
-.PHONY: vers
-vers:
-	$(QUIET)echo "EPICS_MODULE_TAG:=$(EPICS_MODULE_TAG), origin : $(origin EPICS_MODULE_TAG)"
-	$(QUIET)echo "E3_MODULE_VERSION:=$(E3_MODULE_VERSION), origin : $(origin E3_MODULE_VERSION)"
-
-# https://www.cmcrossroads.com/article/printing-value-makefile-variable
-print-%:
-	$(QUIET)echo $* = $($*)
-	$(QUIET)echo $*\'s origin is $(origin $*)