diff --git a/Makefile b/Makefile
index 9c9af86..cae11fd 100644
--- a/Makefile
+++ b/Makefile
@@ -97,7 +97,7 @@ endif
 
 
 # which modules (subdirectories) of the project to include in compiling
-MODULES		= driver mqtt user
+MODULES		= driver mqtt user modules
 EXTRA_INCDIR    = include $(SDK_BASE)/../include
 
 # libraries used in this project, mainly provided by the SDK
diff --git a/modules/Makefile b/modules/Makefile
new file mode 100644
index 0000000..db53f43
--- /dev/null
+++ b/modules/Makefile
@@ -0,0 +1,44 @@
+
+#############################################################
+# Required variables for each makefile
+# Discard this section from all parent makefiles
+# Expected variables (with automatic defaults):
+#   CSRCS (all "C" files in the dir)
+#   SUBDIRS (all subdirs with a Makefile)
+#   GEN_LIBS - list of libs to be generated ()
+#   GEN_IMAGES - list of images to be generated ()
+#   COMPONENTS_xxx - a list of libs/objs in the form
+#     subdir/lib to be extracted and rolled up into
+#     a generated lib/image xxx.a ()
+#
+ifndef PDIR
+GEN_LIBS = libmqtt.a
+endif
+
+
+#############################################################
+# Configuration i.e. compile options etc.
+# Target specific stuff (defines etc.) goes in here!
+# Generally values applying to a tree are captured in the
+#   makefile at its root level - these are then overridden
+#   for a subtree within the makefile rooted therein
+#
+#DEFINES += 
+
+#############################################################
+# Recursion Magic - Don't touch this!!
+#
+# Each subtree potentially has an include directory
+#   corresponding to the common APIs applicable to modules
+#   rooted at that subtree. Accordingly, the INCLUDE PATH
+#   of a module can only contain the include directories up
+#   its parent path, and not its siblings
+#
+# Required for each makefile to inherit from the parent
+#
+
+INCLUDES := $(INCLUDES) -I $(PDIR)include
+INCLUDES += -I ./
+PDIR := ../$(PDIR)
+sinclude $(PDIR)Makefile
+
diff --git a/user/config.c b/modules/config.c
similarity index 100%
rename from user/config.c
rename to modules/config.c
diff --git a/user/config.h b/modules/include/config.h
similarity index 100%
rename from user/config.h
rename to modules/include/config.h
diff --git a/user/wifi.h b/modules/include/wifi.h
similarity index 100%
rename from user/wifi.h
rename to modules/include/wifi.h
diff --git a/user/wifi.c b/modules/wifi.c
similarity index 100%
rename from user/wifi.c
rename to modules/wifi.c