diff --git a/Makefile b/Makefile
index 9f71720..bd346ce 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,23 @@
 #Makefile at top of application tree
 TOP = .
 include $(TOP)/configure/CONFIG
-DIRS := $(DIRS) $(filter-out $(DIRS), configure)
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *App))
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *app))
-ifeq ($(BUILD_APPS), YES)
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard iocBoot))
+DIRS := $(DIRS) configure
+DIRS := $(DIRS) andorSupport
+DIRS := $(DIRS) andorApp
+andorApp_DEPEND_DIRS += andorSupport
+ifeq ($(BUILD_IOCS), YES)
+DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard iocs))
+iocs_DEPEND_DIRS += andorApp
 endif
 include $(TOP)/configure/RULES_TOP
+
+uninstall: uninstall_iocs
+uninstall_iocs:
+	$(MAKE) -C iocs uninstall
+.PHONY: uninstall uninstall_iocs
+
+realuninstall: realuninstall_iocs
+realuninstall_iocs:
+	$(MAKE) -C iocs realuninstall
+.PHONY: realuninstall realuninstall_iocs
+