diff --git a/Makefile b/Makefile
index d3eb2e896..d8f951bb2 100644
--- a/Makefile
+++ b/Makefile
@@ -14,21 +14,11 @@
 #
 
 TOP=.
-include $(TOP)/config/CONFIG_BASE
+include $(TOP)/configure/CONFIG
 
-DIRS = src config
+DIRS = src
 
-INSTALL_BIN = $(INSTALL_LOCATION)/bin/$(HOST_ARCH)
-
-#
-# this bootstraps in makeMakefile.pl (and others) so that it can
-# be used to create the first O.xxxx/Makefile
-#
-PERL_BOOTSTRAP_SCRIPTS = $(notdir $(wildcard $(TOP)/src/tools/*.pl))
-PERL_BOOTSTRAP_SCRIPTS_INSTALL = $(PERL_BOOTSTRAP_SCRIPTS:%=$(INSTALL_BIN)/%)
-all host cross inc rebuild uninstall clean depends buildInstall :: $(PERL_BOOTSTRAP_SCRIPTS_INSTALL)
-
-include $(TOP)/config/RULES_TOP
+include $(TOP)/configure/RULES_TOP
 
 release: 
 	@echo TOP: Creating Release...
@@ -38,6 +28,3 @@ built_release:
 	@echo TOP: Creating Fully Built Release...
 	@./MakeRelease -b $(INSTALL_LOCATION)
 
-$(INSTALL_BIN)/%.pl: $(TOP)/src/tools/%.pl
-	$(PERL) $(TOP)/src/tools/installEpics.pl -d -m 555 $< $(INSTALL_BIN)
-