diff --git a/buildandtest b/buildandtest
index a3b0e76..b3fc628 100755
--- a/buildandtest
+++ b/buildandtest
@@ -1,3 +1,3 @@
 #!/bin/sh
-ruby fakegen.rb > fff3.h && make clean && make all && build/fff_test_c && build/fff_test_cpp --gtest_output=xml:build/test_results.xml && build/ui_test_ansic && build/ui_test_cpp --gtest_output=xml:build/example_results.xml && build/fff_test_glob_c && build/fff_test_glob_cpp --gtest_output=xml:build/test_global_results.xml
+ruby fakegen.rb > fff.h && make clean && make all && build/fff_test_c && build/fff_test_cpp --gtest_output=xml:build/test_results.xml && build/ui_test_ansic && build/ui_test_cpp --gtest_output=xml:build/example_results.xml && build/fff_test_glob_c && build/fff_test_glob_cpp --gtest_output=xml:build/test_global_results.xml
 
diff --git a/examples/Makefile b/examples/Makefile
index 4f1d63c..49a2e20 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,67 +1,5 @@
-$(VERBOSE).SILENT:
+all: 
+	cd embedded_ui; make all
 
-BUILD_DIR = ../build
-TEMPLATE_PROGNAME = $(BUILD_DIR)/template
-C_PROGNAME = $(BUILD_DIR)/ui_test_ansic
-CPP_PROGNAME = $(BUILD_DIR)/ui_test_cpp
-CC = gcc
-CC += -c
-CPP = g++
-CPP += -c
-LD = g++
-
-GTEST_OBJS = $(BUILD_DIR)/gtest-all.o $(BUILD_DIR)/gtest-main.o
-C_OBJFILES = $(BUILD_DIR)/UI_test_ansic.o $(BUILD_DIR)/UI.o
-TEMPLATE_OBJFILES = $(BUILD_DIR)/test_suite_template.o
-CPP_OBJFILES = $(BUILD_DIR)/UI_test_cpp.o $(BUILD_DIR)/UI.o $(GTEST_OBJS)
-CPP_LIBS = -lpthread 
-
-
-all: $(C_PROGNAME) $(CPP_PROGNAME) $(TEMPLATE_PROGNAME)
-
-.PHONY: clean
-
-clean:
-	@echo "Cleaning object files"
-	@echo "    rm -f     $(BUILD_DIR)/*.o"
-	rm -f $(BUILD_DIR)/*.o
-	@echo "Cleaning backups"
-	@echo "    rm -f     *~"
-	rm -f *~
-	@echo "Removing programs"
-	@echo "    rm -f     "$(C_PROGNAME)
-	rm -f $(C_PROGNAME)
-	@echo "    rm -f     "$(CPP_PROGNAME) $(TEMPLATE_PROGNAME)
-	rm -f $(CPP_PROGNAME) $(TEMPLATE_PROGNAME)
-
-
-$(BUILD_DIR)/%.o: %.c
-	@echo "Compiling "$@
-	@echo "    CC        "$<
-	$(CC)  -o $@ $<
-
-$(BUILD_DIR)/%.o: %.cpp
-	@echo "Compiling "$@
-	@echo "    CPP       "$<
-	$(CPP) -I.. -o $@ $< 
-
-$(TEMPLATE_PROGNAME): $(TEMPLATE_OBJFILES)
-	@echo "Linking "$@
-	@echo "    LD        -o "ctemplate"        "$(TEMPLATE_OBJFILES)
-	$(LD) -o $(TEMPLATE_PROGNAME) $(TEMPLATE_OBJFILES)
-
-$(C_PROGNAME): $(C_OBJFILES)
-	@echo "Linking "$@
-	@echo "    LD        -o "$(C_PROGNAME)"        "$(C_OBJFILES)
-	$(LD) -o $(C_PROGNAME) $(C_OBJFILES)
-
-$(CPP_PROGNAME): $(CPP_OBJFILES) $(C_OBJFILES)
-	@echo "Linking "$@
-	@echo "    LD        -o "$(CPP_PROGNAME)"        "$(CPP_OBJFILES)
-	$(LD) -o $(CPP_PROGNAME) $(CPP_OBJFILES) $(CPP_LIBS)
-
-
-
-nothing:
-	@echo "Nothing to do; quitting  :("
-	@echo "HINT: Try make all"
+clean: 
+	cd embedded_ui; make clean
diff --git a/examples/DISPLAY.h b/examples/embedded_ui/DISPLAY.h
similarity index 100%
rename from examples/DISPLAY.h
rename to examples/embedded_ui/DISPLAY.h
diff --git a/examples/Kata.txt b/examples/embedded_ui/Kata.txt
similarity index 100%
rename from examples/Kata.txt
rename to examples/embedded_ui/Kata.txt
diff --git a/examples/embedded_ui/Makefile b/examples/embedded_ui/Makefile
new file mode 100644
index 0000000..84582c9
--- /dev/null
+++ b/examples/embedded_ui/Makefile
@@ -0,0 +1,67 @@
+$(VERBOSE).SILENT:
+
+BUILD_DIR = ../../build
+TEMPLATE_PROGNAME = $(BUILD_DIR)/template
+C_PROGNAME = $(BUILD_DIR)/ui_test_ansic
+CPP_PROGNAME = $(BUILD_DIR)/ui_test_cpp
+CC = gcc
+CC += -c
+CPP = g++
+CPP += -c
+LD = g++
+
+GTEST_OBJS = $(BUILD_DIR)/gtest-all.o $(BUILD_DIR)/gtest-main.o
+C_OBJFILES = $(BUILD_DIR)/UI_test_ansic.o $(BUILD_DIR)/UI.o
+TEMPLATE_OBJFILES = $(BUILD_DIR)/test_suite_template.o
+CPP_OBJFILES = $(BUILD_DIR)/UI_test_cpp.o $(BUILD_DIR)/UI.o $(GTEST_OBJS)
+CPP_LIBS = -lpthread 
+
+
+all: $(C_PROGNAME) $(CPP_PROGNAME) $(TEMPLATE_PROGNAME)
+
+.PHONY: clean
+
+clean:
+	@echo "Cleaning object files"
+	@echo "    rm -f     $(BUILD_DIR)/*.o"
+	rm -f $(BUILD_DIR)/*.o
+	@echo "Cleaning backups"
+	@echo "    rm -f     *~"
+	rm -f *~
+	@echo "Removing programs"
+	@echo "    rm -f     "$(C_PROGNAME)
+	rm -f $(C_PROGNAME)
+	@echo "    rm -f     "$(CPP_PROGNAME) $(TEMPLATE_PROGNAME)
+	rm -f $(CPP_PROGNAME) $(TEMPLATE_PROGNAME)
+
+
+$(BUILD_DIR)/%.o: %.c
+	@echo "Compiling "$@
+	@echo "    CC        "$<
+	$(CC)  -o $@ $<
+
+$(BUILD_DIR)/%.o: %.cpp
+	@echo "Compiling "$@
+	@echo "    CPP       "$<
+	$(CPP) -I../.. -o $@ $< 
+
+$(TEMPLATE_PROGNAME): $(TEMPLATE_OBJFILES)
+	@echo "Linking "$@
+	@echo "    LD        -o "ctemplate"        "$(TEMPLATE_OBJFILES)
+	$(LD) -o $(TEMPLATE_PROGNAME) $(TEMPLATE_OBJFILES)
+
+$(C_PROGNAME): $(C_OBJFILES)
+	@echo "Linking "$@
+	@echo "    LD        -o "$(C_PROGNAME)"        "$(C_OBJFILES)
+	$(LD) -o $(C_PROGNAME) $(C_OBJFILES)
+
+$(CPP_PROGNAME): $(CPP_OBJFILES) $(C_OBJFILES)
+	@echo "Linking "$@
+	@echo "    LD        -o "$(CPP_PROGNAME)"        "$(CPP_OBJFILES)
+	$(LD) -o $(CPP_PROGNAME) $(CPP_OBJFILES) $(CPP_LIBS)
+
+
+
+nothing:
+	@echo "Nothing to do; quitting  :("
+	@echo "HINT: Try make all"
diff --git a/examples/SYSTEM.h b/examples/embedded_ui/SYSTEM.h
similarity index 100%
rename from examples/SYSTEM.h
rename to examples/embedded_ui/SYSTEM.h
diff --git a/examples/UI.c b/examples/embedded_ui/UI.c
similarity index 100%
rename from examples/UI.c
rename to examples/embedded_ui/UI.c
diff --git a/examples/UI.h b/examples/embedded_ui/UI.h
similarity index 100%
rename from examples/UI.h
rename to examples/embedded_ui/UI.h
diff --git a/examples/UI_test_ansic.c b/examples/embedded_ui/UI_test_ansic.c
similarity index 99%
rename from examples/UI_test_ansic.c
rename to examples/embedded_ui/UI_test_ansic.c
index 2e4d8d2..f98e409 100644
--- a/examples/UI_test_ansic.c
+++ b/examples/embedded_ui/UI_test_ansic.c
@@ -1,5 +1,5 @@
 #include "UI.h"
-#include "../fff3.h"
+#include "../../fff.h"
 #include "SYSTEM.h"
 #include "DISPLAY.h"
 
diff --git a/examples/UI_test_cpp.cpp b/examples/embedded_ui/UI_test_cpp.cpp
similarity index 99%
rename from examples/UI_test_cpp.cpp
rename to examples/embedded_ui/UI_test_cpp.cpp
index 7beac2b..70c1cd1 100644
--- a/examples/UI_test_cpp.cpp
+++ b/examples/embedded_ui/UI_test_cpp.cpp
@@ -3,7 +3,7 @@ extern "C"{
 #include "SYSTEM.h"
 #include "DISPLAY.h"
 }
-#include "../fff3.h"
+#include "../../fff.h"
 
 #include <gtest/gtest.h>
 
diff --git a/examples/test_suite_template.c b/examples/embedded_ui/test_suite_template.c
similarity index 91%
rename from examples/test_suite_template.c
rename to examples/embedded_ui/test_suite_template.c
index 19600af..00df5bb 100644
--- a/examples/test_suite_template.c
+++ b/examples/embedded_ui/test_suite_template.c
@@ -1,4 +1,4 @@
-#include "../test/c_test_framework.h"
+#include "../../test/c_test_framework.h"
 
 /* Initialializers called for every test */
 void setup()