diff --git a/demos/AVR/NIL-ARDUINO-MEGA/Makefile b/demos/AVR/NIL-ARDUINO-MEGA/Makefile
index e59043ea4..0a47b4c68 100644
--- a/demos/AVR/NIL-ARDUINO-MEGA/Makefile
+++ b/demos/AVR/NIL-ARDUINO-MEGA/Makefile
@@ -83,7 +83,10 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../..
+CHIBIOS  := ../../..
+CONFDIR  := ./cfg
+BUILDDIR := ./build
+DEPDIR   := ./.dep
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
@@ -106,7 +109,7 @@ CSRC =  $(ALLCSRC) \
 CPPSRC = $(ALLCPPSRC)
 
 # Header files here.
-INCDIR =  $(ALLINC)
+INCDIR =  $(CONFDIR) $(ALLINC)
 
 #
 # Project, sources and paths.
diff --git a/demos/AVR/NIL-ARDUINO-MEGA/chconf.h b/demos/AVR/NIL-ARDUINO-MEGA/cfg/chconf.h
similarity index 100%
rename from demos/AVR/NIL-ARDUINO-MEGA/chconf.h
rename to demos/AVR/NIL-ARDUINO-MEGA/cfg/chconf.h
diff --git a/demos/AVR/NIL-ARDUINO-MEGA/halconf.h b/demos/AVR/NIL-ARDUINO-MEGA/cfg/halconf.h
similarity index 100%
rename from demos/AVR/NIL-ARDUINO-MEGA/halconf.h
rename to demos/AVR/NIL-ARDUINO-MEGA/cfg/halconf.h
diff --git a/demos/AVR/NIL-ARDUINO-MEGA/mcuconf.h b/demos/AVR/NIL-ARDUINO-MEGA/cfg/mcuconf.h
similarity index 100%
rename from demos/AVR/NIL-ARDUINO-MEGA/mcuconf.h
rename to demos/AVR/NIL-ARDUINO-MEGA/cfg/mcuconf.h
diff --git a/demos/AVR/NIL-ARDUINO-MINI/Makefile b/demos/AVR/NIL-ARDUINO-MINI/Makefile
index 37be20733..8bdfa3127 100644
--- a/demos/AVR/NIL-ARDUINO-MINI/Makefile
+++ b/demos/AVR/NIL-ARDUINO-MINI/Makefile
@@ -83,7 +83,10 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../..
+CHIBIOS  := ../../..
+CONFDIR  := ./cfg
+BUILDDIR := ./build
+DEPDIR   := ./.dep
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
@@ -106,7 +109,7 @@ CSRC =  $(ALLCSRC) \
 CPPSRC = $(ALLCPPSRC)
 
 # Header files here.
-INCDIR =  $(ALLINC)
+INCDIR =  $(CONFDIR) $(ALLINC)
 
 #
 # Project, sources and paths.
diff --git a/demos/AVR/NIL-ARDUINO-MINI/chconf.h b/demos/AVR/NIL-ARDUINO-MINI/cfg/chconf.h
similarity index 100%
rename from demos/AVR/NIL-ARDUINO-MINI/chconf.h
rename to demos/AVR/NIL-ARDUINO-MINI/cfg/chconf.h
diff --git a/demos/AVR/NIL-ARDUINO-MINI/halconf.h b/demos/AVR/NIL-ARDUINO-MINI/cfg/halconf.h
similarity index 100%
rename from demos/AVR/NIL-ARDUINO-MINI/halconf.h
rename to demos/AVR/NIL-ARDUINO-MINI/cfg/halconf.h
diff --git a/demos/AVR/NIL-ARDUINO-MINI/mcuconf.h b/demos/AVR/NIL-ARDUINO-MINI/cfg/mcuconf.h
similarity index 100%
rename from demos/AVR/NIL-ARDUINO-MINI/mcuconf.h
rename to demos/AVR/NIL-ARDUINO-MINI/cfg/mcuconf.h
diff --git a/demos/AVR/NIL-ARDUINO-NANO/Makefile b/demos/AVR/NIL-ARDUINO-NANO/Makefile
index cc34c15cd..2b39575b5 100644
--- a/demos/AVR/NIL-ARDUINO-NANO/Makefile
+++ b/demos/AVR/NIL-ARDUINO-NANO/Makefile
@@ -83,7 +83,10 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../..
+CHIBIOS  := ../../..
+CONFDIR  := ./cfg
+BUILDDIR := ./build
+DEPDIR   := ./.dep
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
@@ -106,7 +109,7 @@ CSRC =  $(ALLCSRC) \
 CPPSRC = $(ALLCPPSRC)
 
 # Header files here.
-INCDIR =  $(ALLINC)
+INCDIR = $(CONFDIR) $(ALLINC)
 
 #
 # Project, sources and paths.
diff --git a/demos/AVR/NIL-ARDUINO-NANO/chconf.h b/demos/AVR/NIL-ARDUINO-NANO/cfg/chconf.h
similarity index 100%
rename from demos/AVR/NIL-ARDUINO-NANO/chconf.h
rename to demos/AVR/NIL-ARDUINO-NANO/cfg/chconf.h
diff --git a/demos/AVR/NIL-ARDUINO-NANO/halconf.h b/demos/AVR/NIL-ARDUINO-NANO/cfg/halconf.h
similarity index 100%
rename from demos/AVR/NIL-ARDUINO-NANO/halconf.h
rename to demos/AVR/NIL-ARDUINO-NANO/cfg/halconf.h
diff --git a/demos/AVR/NIL-ARDUINO-NANO/mcuconf.h b/demos/AVR/NIL-ARDUINO-NANO/cfg/mcuconf.h
similarity index 100%
rename from demos/AVR/NIL-ARDUINO-NANO/mcuconf.h
rename to demos/AVR/NIL-ARDUINO-NANO/cfg/mcuconf.h
diff --git a/demos/AVR/NIL-ARDUINO-UNO/Makefile b/demos/AVR/NIL-ARDUINO-UNO/Makefile
index ac5766333..9958e06f8 100644
--- a/demos/AVR/NIL-ARDUINO-UNO/Makefile
+++ b/demos/AVR/NIL-ARDUINO-UNO/Makefile
@@ -83,7 +83,10 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../..
+CHIBIOS  := ../../..
+CONFDIR  := ./cfg
+BUILDDIR := ./build
+DEPDIR   := ./.dep
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
@@ -106,7 +109,7 @@ CSRC =  $(ALLCSRC) \
 CPPSRC = $(ALLCPPSRC)
 
 # Header files here.
-INCDIR =  $(ALLINC)
+INCDIR = $(CONFDIR) $(ALLINC)
 
 #
 # Project, sources and paths.
diff --git a/demos/AVR/NIL-ARDUINO-UNO/chconf.h b/demos/AVR/NIL-ARDUINO-UNO/cfg/chconf.h
similarity index 100%
rename from demos/AVR/NIL-ARDUINO-UNO/chconf.h
rename to demos/AVR/NIL-ARDUINO-UNO/cfg/chconf.h
diff --git a/demos/AVR/NIL-ARDUINO-UNO/halconf.h b/demos/AVR/NIL-ARDUINO-UNO/cfg/halconf.h
similarity index 100%
rename from demos/AVR/NIL-ARDUINO-UNO/halconf.h
rename to demos/AVR/NIL-ARDUINO-UNO/cfg/halconf.h
diff --git a/demos/AVR/NIL-ARDUINO-UNO/mcuconf.h b/demos/AVR/NIL-ARDUINO-UNO/cfg/mcuconf.h
similarity index 100%
rename from demos/AVR/NIL-ARDUINO-UNO/mcuconf.h
rename to demos/AVR/NIL-ARDUINO-UNO/cfg/mcuconf.h
diff --git a/demos/AVR/NIL-DIGISPARK-ATTINY-167/Makefile b/demos/AVR/NIL-DIGISPARK-ATTINY-167/Makefile
index f1e7c4ffb..153943b3d 100644
--- a/demos/AVR/NIL-DIGISPARK-ATTINY-167/Makefile
+++ b/demos/AVR/NIL-DIGISPARK-ATTINY-167/Makefile
@@ -83,7 +83,10 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../..
+CHIBIOS  := ../../..
+CONFDIR  := ./cfg
+BUILDDIR := ./build
+DEPDIR   := ./.dep
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
@@ -106,7 +109,7 @@ CSRC =  $(ALLCSRC) \
 CPPSRC = $(ALLCPPSRC)
 
 # Header files here.
-INCDIR =  $(ALLINC)
+INCDIR = $(CONFDIR)  $(ALLINC)
 
 #
 # Project, sources and paths.
diff --git a/demos/AVR/NIL-DIGISPARK-ATTINY-167/chconf.h b/demos/AVR/NIL-DIGISPARK-ATTINY-167/cfg/chconf.h
similarity index 100%
rename from demos/AVR/NIL-DIGISPARK-ATTINY-167/chconf.h
rename to demos/AVR/NIL-DIGISPARK-ATTINY-167/cfg/chconf.h
diff --git a/demos/AVR/NIL-DIGISPARK-ATTINY-167/halconf.h b/demos/AVR/NIL-DIGISPARK-ATTINY-167/cfg/halconf.h
similarity index 100%
rename from demos/AVR/NIL-DIGISPARK-ATTINY-167/halconf.h
rename to demos/AVR/NIL-DIGISPARK-ATTINY-167/cfg/halconf.h
diff --git a/demos/AVR/NIL-DIGISPARK-ATTINY-167/mcuconf.h b/demos/AVR/NIL-DIGISPARK-ATTINY-167/cfg/mcuconf.h
similarity index 100%
rename from demos/AVR/NIL-DIGISPARK-ATTINY-167/mcuconf.h
rename to demos/AVR/NIL-DIGISPARK-ATTINY-167/cfg/mcuconf.h
diff --git a/demos/AVR/NIL-MT-DB-X4/Makefile b/demos/AVR/NIL-MT-DB-X4/Makefile
index 05a922ef7..544d6b241 100644
--- a/demos/AVR/NIL-MT-DB-X4/Makefile
+++ b/demos/AVR/NIL-MT-DB-X4/Makefile
@@ -83,7 +83,10 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../..
+CHIBIOS := ../../..
+CONFDIR  := ./cfg
+BUILDDIR := ./build
+DEPDIR   := ./.dep
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
@@ -106,7 +109,7 @@ CSRC =  $(ALLCSRC) \
 CPPSRC = $(ALLCPPSRC)
 
 # Header files here.
-INCDIR =  $(ALLINC)
+INCDIR = $(CONFDIR) $(ALLINC)
 
 #
 # Project, sources and paths.
diff --git a/demos/AVR/NIL-MT-DB-X4/chconf.h b/demos/AVR/NIL-MT-DB-X4/cfg/chconf.h
similarity index 100%
rename from demos/AVR/NIL-MT-DB-X4/chconf.h
rename to demos/AVR/NIL-MT-DB-X4/cfg/chconf.h
diff --git a/demos/AVR/NIL-MT-DB-X4/halconf.h b/demos/AVR/NIL-MT-DB-X4/cfg/halconf.h
similarity index 100%
rename from demos/AVR/NIL-MT-DB-X4/halconf.h
rename to demos/AVR/NIL-MT-DB-X4/cfg/halconf.h
diff --git a/demos/AVR/NIL-MT-DB-X4/mcuconf.h b/demos/AVR/NIL-MT-DB-X4/cfg/mcuconf.h
similarity index 100%
rename from demos/AVR/NIL-MT-DB-X4/mcuconf.h
rename to demos/AVR/NIL-MT-DB-X4/cfg/mcuconf.h
diff --git a/demos/AVR/RT-ARDUINO-LEONARDO/Makefile b/demos/AVR/RT-ARDUINO-LEONARDO/Makefile
index a7db9891d..19b801190 100644
--- a/demos/AVR/RT-ARDUINO-LEONARDO/Makefile
+++ b/demos/AVR/RT-ARDUINO-LEONARDO/Makefile
@@ -83,7 +83,10 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../..
+CHIBIOS  := ../../..
+CONFDIR  := ./cfg
+BUILDDIR := ./build
+DEPDIR   := ./.dep
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
@@ -107,7 +110,7 @@ CSRC =  $(ALLCSRC)  \
 CPPSRC = $(ALLCPPSRC)
 
 # Header files here.
-INCDIR =  $(ALLINC)
+INCDIR = $(CONFDIR) $(ALLINC)
 
 #
 # Project, sources and paths.
diff --git a/demos/AVR/RT-ARDUINO-LEONARDO/chconf.h b/demos/AVR/RT-ARDUINO-LEONARDO/cfg/chconf.h
similarity index 100%
rename from demos/AVR/RT-ARDUINO-LEONARDO/chconf.h
rename to demos/AVR/RT-ARDUINO-LEONARDO/cfg/chconf.h
diff --git a/demos/AVR/RT-ARDUINO-LEONARDO/halconf.h b/demos/AVR/RT-ARDUINO-LEONARDO/cfg/halconf.h
similarity index 100%
rename from demos/AVR/RT-ARDUINO-LEONARDO/halconf.h
rename to demos/AVR/RT-ARDUINO-LEONARDO/cfg/halconf.h
diff --git a/demos/AVR/RT-ARDUINO-LEONARDO/mcuconf.h b/demos/AVR/RT-ARDUINO-LEONARDO/cfg/mcuconf.h
similarity index 100%
rename from demos/AVR/RT-ARDUINO-LEONARDO/mcuconf.h
rename to demos/AVR/RT-ARDUINO-LEONARDO/cfg/mcuconf.h
diff --git a/demos/AVR/RT-ARDUINO-MEGA/Makefile b/demos/AVR/RT-ARDUINO-MEGA/Makefile
index 8e33e768b..a56c98447 100644
--- a/demos/AVR/RT-ARDUINO-MEGA/Makefile
+++ b/demos/AVR/RT-ARDUINO-MEGA/Makefile
@@ -83,7 +83,10 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../..
+CHIBIOS  := ../../..
+CONFDIR  := ./cfg
+BUILDDIR := ./build
+DEPDIR   := ./.dep
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
@@ -106,7 +109,7 @@ CSRC =  $(ALLCSRC) \
 CPPSRC = $(ALLCPPSRC)
 
 # Header files here.
-INCDIR =  $(ALLINC)
+INCDIR = $(CONFDIR) $(ALLINC)
 
 #
 # Project, sources and paths.
diff --git a/demos/AVR/RT-ARDUINO-MEGA/chconf.h b/demos/AVR/RT-ARDUINO-MEGA/cfg/chconf.h
similarity index 100%
rename from demos/AVR/RT-ARDUINO-MEGA/chconf.h
rename to demos/AVR/RT-ARDUINO-MEGA/cfg/chconf.h
diff --git a/demos/AVR/RT-ARDUINO-MEGA/halconf.h b/demos/AVR/RT-ARDUINO-MEGA/cfg/halconf.h
similarity index 100%
rename from demos/AVR/RT-ARDUINO-MEGA/halconf.h
rename to demos/AVR/RT-ARDUINO-MEGA/cfg/halconf.h
diff --git a/demos/AVR/RT-ARDUINO-MEGA/mcuconf.h b/demos/AVR/RT-ARDUINO-MEGA/cfg/mcuconf.h
similarity index 100%
rename from demos/AVR/RT-ARDUINO-MEGA/mcuconf.h
rename to demos/AVR/RT-ARDUINO-MEGA/cfg/mcuconf.h
diff --git a/demos/AVR/RT-ARDUINO-MINI/Makefile b/demos/AVR/RT-ARDUINO-MINI/Makefile
index 40397fa71..3ae27047b 100644
--- a/demos/AVR/RT-ARDUINO-MINI/Makefile
+++ b/demos/AVR/RT-ARDUINO-MINI/Makefile
@@ -84,7 +84,10 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../..
+CHIBIOS  := ../../..
+CONFDIR  := ./cfg
+BUILDDIR := ./build
+DEPDIR   := ./.dep
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
@@ -107,7 +110,7 @@ CSRC =  $(ALLCSRC) \
 CPPSRC = $(ALLCPPSRC)
 
 # Header files here.
-INCDIR =  $(ALLINC)
+INCDIR = $(CONFDIR) $(ALLINC)
 
 #
 # Project, sources and paths.
diff --git a/demos/AVR/RT-ARDUINO-MINI/chconf.h b/demos/AVR/RT-ARDUINO-MINI/cfg/chconf.h
similarity index 100%
rename from demos/AVR/RT-ARDUINO-MINI/chconf.h
rename to demos/AVR/RT-ARDUINO-MINI/cfg/chconf.h
diff --git a/demos/AVR/RT-ARDUINO-MINI/halconf.h b/demos/AVR/RT-ARDUINO-MINI/cfg/halconf.h
similarity index 100%
rename from demos/AVR/RT-ARDUINO-MINI/halconf.h
rename to demos/AVR/RT-ARDUINO-MINI/cfg/halconf.h
diff --git a/demos/AVR/RT-ARDUINO-MINI/mcuconf.h b/demos/AVR/RT-ARDUINO-MINI/cfg/mcuconf.h
similarity index 100%
rename from demos/AVR/RT-ARDUINO-MINI/mcuconf.h
rename to demos/AVR/RT-ARDUINO-MINI/cfg/mcuconf.h
diff --git a/demos/AVR/RT-ARDUINO-NANO/Makefile b/demos/AVR/RT-ARDUINO-NANO/Makefile
index 19d19e244..d249716de 100644
--- a/demos/AVR/RT-ARDUINO-NANO/Makefile
+++ b/demos/AVR/RT-ARDUINO-NANO/Makefile
@@ -84,7 +84,10 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../..
+CHIBIOS  := ../../..
+CONFDIR  := ./cfg
+BUILDDIR := ./build
+DEPDIR   := ./.dep
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
@@ -107,7 +110,7 @@ CSRC =  $(ALLCSRC) \
 CPPSRC = $(ALLCPPSRC)
 
 # Header files here.
-INCDIR =  $(ALLINC)
+INCDIR = $(CONFDIR) $(ALLINC)
 
 #
 # Project, sources and paths.
diff --git a/demos/AVR/RT-ARDUINO-NANO/chconf.h b/demos/AVR/RT-ARDUINO-NANO/cfg/chconf.h
similarity index 100%
rename from demos/AVR/RT-ARDUINO-NANO/chconf.h
rename to demos/AVR/RT-ARDUINO-NANO/cfg/chconf.h
diff --git a/demos/AVR/RT-ARDUINO-NANO/halconf.h b/demos/AVR/RT-ARDUINO-NANO/cfg/halconf.h
similarity index 100%
rename from demos/AVR/RT-ARDUINO-NANO/halconf.h
rename to demos/AVR/RT-ARDUINO-NANO/cfg/halconf.h
diff --git a/demos/AVR/RT-ARDUINO-NANO/mcuconf.h b/demos/AVR/RT-ARDUINO-NANO/cfg/mcuconf.h
similarity index 100%
rename from demos/AVR/RT-ARDUINO-NANO/mcuconf.h
rename to demos/AVR/RT-ARDUINO-NANO/cfg/mcuconf.h
diff --git a/demos/AVR/RT-ARDUINO-UNO/Makefile b/demos/AVR/RT-ARDUINO-UNO/Makefile
index dd071181c..ce75ebd2b 100644
--- a/demos/AVR/RT-ARDUINO-UNO/Makefile
+++ b/demos/AVR/RT-ARDUINO-UNO/Makefile
@@ -82,8 +82,11 @@ endif
 # Define project name here.
 PROJECT = ch
 
-# Imported source files and paths
-CHIBIOS = ../../..
+# Imported source files and paths.
+CHIBIOS  := ../../..
+CONFDIR  := ./cfg
+BUILDDIR := ./build
+DEPDIR   := ./.dep
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
@@ -106,7 +109,7 @@ CSRC =  $(ALLCSRC) \
 CPPSRC = $(ALLCPPSRC)
 
 # Header files here.
-INCDIR =  $(ALLINC)
+INCDIR =  $(CONFDIR) $(ALLINC)
 
 #
 # Project, sources and paths.
diff --git a/demos/AVR/RT-ARDUINO-UNO/chconf.h b/demos/AVR/RT-ARDUINO-UNO/cfg/chconf.h
similarity index 100%
rename from demos/AVR/RT-ARDUINO-UNO/chconf.h
rename to demos/AVR/RT-ARDUINO-UNO/cfg/chconf.h
diff --git a/demos/AVR/RT-ARDUINO-UNO/halconf.h b/demos/AVR/RT-ARDUINO-UNO/cfg/halconf.h
similarity index 100%
rename from demos/AVR/RT-ARDUINO-UNO/halconf.h
rename to demos/AVR/RT-ARDUINO-UNO/cfg/halconf.h
diff --git a/demos/AVR/RT-ARDUINO-UNO/mcuconf.h b/demos/AVR/RT-ARDUINO-UNO/cfg/mcuconf.h
similarity index 100%
rename from demos/AVR/RT-ARDUINO-UNO/mcuconf.h
rename to demos/AVR/RT-ARDUINO-UNO/cfg/mcuconf.h
diff --git a/demos/AVR/RT-DIGISPARK-ATTINY-167/Makefile b/demos/AVR/RT-DIGISPARK-ATTINY-167/Makefile
index 278ea9213..9ff585ff0 100644
--- a/demos/AVR/RT-DIGISPARK-ATTINY-167/Makefile
+++ b/demos/AVR/RT-DIGISPARK-ATTINY-167/Makefile
@@ -83,7 +83,10 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../..
+CHIBIOS  := ../../..
+CONFDIR  := ./cfg
+BUILDDIR := ./build
+DEPDIR   := ./.dep
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
@@ -106,7 +109,7 @@ CSRC =  $(ALLCSRC) \
 CPPSRC = $(ALLCPPSRC)
 
 # Header files here.
-INCDIR =  $(ALLINC)
+INCDIR = $(CONFDIR) $(ALLINC)
 
 #
 # Project, sources and paths.
diff --git a/demos/AVR/RT-DIGISPARK-ATTINY-167/chconf.h b/demos/AVR/RT-DIGISPARK-ATTINY-167/cfg/chconf.h
similarity index 100%
rename from demos/AVR/RT-DIGISPARK-ATTINY-167/chconf.h
rename to demos/AVR/RT-DIGISPARK-ATTINY-167/cfg/chconf.h
diff --git a/demos/AVR/RT-DIGISPARK-ATTINY-167/halconf.h b/demos/AVR/RT-DIGISPARK-ATTINY-167/cfg/halconf.h
similarity index 100%
rename from demos/AVR/RT-DIGISPARK-ATTINY-167/halconf.h
rename to demos/AVR/RT-DIGISPARK-ATTINY-167/cfg/halconf.h
diff --git a/demos/AVR/RT-DIGISPARK-ATTINY-167/mcuconf.h b/demos/AVR/RT-DIGISPARK-ATTINY-167/cfg/mcuconf.h
similarity index 100%
rename from demos/AVR/RT-DIGISPARK-ATTINY-167/mcuconf.h
rename to demos/AVR/RT-DIGISPARK-ATTINY-167/cfg/mcuconf.h
diff --git a/demos/AVR/RT-MT-DB-X4/Makefile b/demos/AVR/RT-MT-DB-X4/Makefile
index 7bd4f988d..ca7a0c825 100644
--- a/demos/AVR/RT-MT-DB-X4/Makefile
+++ b/demos/AVR/RT-MT-DB-X4/Makefile
@@ -83,7 +83,10 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../..
+CHIBIOS  := ../../..
+CONFDIR  := ./cfg
+BUILDDIR := ./build
+DEPDIR   := ./.dep
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
@@ -106,7 +109,7 @@ CSRC =  $(ALLCSRC) \
 CPPSRC = $(ALLCPPSRC)
 
 # Header files here.
-INCDIR =  $(ALLINC)
+INCDIR = $(CONFDIR) $(ALLINC)
 
 #
 # Project, sources and paths.
diff --git a/demos/AVR/RT-MT-DB-X4/chconf.h b/demos/AVR/RT-MT-DB-X4/cfg/chconf.h
similarity index 100%
rename from demos/AVR/RT-MT-DB-X4/chconf.h
rename to demos/AVR/RT-MT-DB-X4/cfg/chconf.h
diff --git a/demos/AVR/RT-MT-DB-X4/halconf.h b/demos/AVR/RT-MT-DB-X4/cfg/halconf.h
similarity index 100%
rename from demos/AVR/RT-MT-DB-X4/halconf.h
rename to demos/AVR/RT-MT-DB-X4/cfg/halconf.h
diff --git a/demos/AVR/RT-MT-DB-X4/mcuconf.h b/demos/AVR/RT-MT-DB-X4/cfg/mcuconf.h
similarity index 100%
rename from demos/AVR/RT-MT-DB-X4/mcuconf.h
rename to demos/AVR/RT-MT-DB-X4/cfg/mcuconf.h
diff --git a/demos/AVR/RT-PRO-MICRO/Makefile b/demos/AVR/RT-PRO-MICRO/Makefile
index 954d72351..c3064896e 100644
--- a/demos/AVR/RT-PRO-MICRO/Makefile
+++ b/demos/AVR/RT-PRO-MICRO/Makefile
@@ -83,7 +83,10 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../..
+CHIBIOS  := ../../..
+CONFDIR  := ./cfg
+BUILDDIR := ./build
+DEPDIR   := ./.dep
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
@@ -107,7 +110,7 @@ CSRC =  $(ALLCSRC)  \
 CPPSRC = $(ALLCPPSRC)
 
 # Header files here.
-INCDIR =  $(ALLINC)
+INCDIR = $(CONFDIR) $(ALLINC)
 
 #
 # Project, sources and paths.
diff --git a/demos/AVR/RT-PRO-MICRO/chconf.h b/demos/AVR/RT-PRO-MICRO/cfg/chconf.h
similarity index 100%
rename from demos/AVR/RT-PRO-MICRO/chconf.h
rename to demos/AVR/RT-PRO-MICRO/cfg/chconf.h
diff --git a/demos/AVR/RT-PRO-MICRO/halconf.h b/demos/AVR/RT-PRO-MICRO/cfg/halconf.h
similarity index 100%
rename from demos/AVR/RT-PRO-MICRO/halconf.h
rename to demos/AVR/RT-PRO-MICRO/cfg/halconf.h
diff --git a/demos/AVR/RT-PRO-MICRO/mcuconf.h b/demos/AVR/RT-PRO-MICRO/cfg/mcuconf.h
similarity index 100%
rename from demos/AVR/RT-PRO-MICRO/mcuconf.h
rename to demos/AVR/RT-PRO-MICRO/cfg/mcuconf.h
diff --git a/demos/AVR/RT-TEENSY2-USB/Makefile b/demos/AVR/RT-TEENSY2-USB/Makefile
index 6571b58ec..016a6e947 100644
--- a/demos/AVR/RT-TEENSY2-USB/Makefile
+++ b/demos/AVR/RT-TEENSY2-USB/Makefile
@@ -83,7 +83,10 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../..
+CHIBIOS  := ../../..
+CONFDIR  := ./cfg
+BUILDDIR := ./build
+DEPDIR   := ./.dep
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
diff --git a/demos/AVR/RT-TEENSY2-USB/chconf.h b/demos/AVR/RT-TEENSY2-USB/cfg/chconf.h
similarity index 100%
rename from demos/AVR/RT-TEENSY2-USB/chconf.h
rename to demos/AVR/RT-TEENSY2-USB/cfg/chconf.h
diff --git a/demos/AVR/RT-TEENSY2-USB/halconf.h b/demos/AVR/RT-TEENSY2-USB/cfg/halconf.h
similarity index 100%
rename from demos/AVR/RT-TEENSY2-USB/halconf.h
rename to demos/AVR/RT-TEENSY2-USB/cfg/halconf.h
diff --git a/demos/AVR/RT-TEENSY2-USB/mcuconf.h b/demos/AVR/RT-TEENSY2-USB/cfg/mcuconf.h
similarity index 100%
rename from demos/AVR/RT-TEENSY2-USB/mcuconf.h
rename to demos/AVR/RT-TEENSY2-USB/cfg/mcuconf.h
diff --git a/demos/AVR/TEST-SUITE-NIL/Makefile b/demos/AVR/TEST-SUITE-NIL/Makefile
index aa2f929c8..e0acdb0a3 100644
--- a/demos/AVR/TEST-SUITE-NIL/Makefile
+++ b/demos/AVR/TEST-SUITE-NIL/Makefile
@@ -84,6 +84,9 @@ PROJECT = ch
 
 # Imported source files and paths
 CHIBIOS = ../../..
+CHIBIOS  := ../../..
+CONFDIR  := ./cfg
+BUILDDIR := ./build
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
@@ -110,7 +113,7 @@ CSRC =  $(ALLCSRC) \
 # List C++ sources file here.
 CPPSRC = $(ALLCPPSRC)
 
-INCDIR = $(ALLINC) $(TESTINC)
+INCDIR = $(CONFDIR) $(ALLINC) $(TESTINC)
 
 #
 # Project, sources and paths.
diff --git a/demos/AVR/TEST-SUITE-NIL/chconf.h b/demos/AVR/TEST-SUITE-NIL/cfg/chconf.h
similarity index 100%
rename from demos/AVR/TEST-SUITE-NIL/chconf.h
rename to demos/AVR/TEST-SUITE-NIL/cfg/chconf.h
diff --git a/demos/AVR/TEST-SUITE-NIL/halconf.h b/demos/AVR/TEST-SUITE-NIL/cfg/halconf.h
similarity index 100%
rename from demos/AVR/TEST-SUITE-NIL/halconf.h
rename to demos/AVR/TEST-SUITE-NIL/cfg/halconf.h
diff --git a/demos/AVR/TEST-SUITE-NIL/mcuconf.h b/demos/AVR/TEST-SUITE-NIL/cfg/mcuconf.h
similarity index 100%
rename from demos/AVR/TEST-SUITE-NIL/mcuconf.h
rename to demos/AVR/TEST-SUITE-NIL/cfg/mcuconf.h
diff --git a/demos/AVR/TEST-SUITE-OSLIB/Makefile b/demos/AVR/TEST-SUITE-OSLIB/Makefile
index 57ba822bc..6dd1402a7 100644
--- a/demos/AVR/TEST-SUITE-OSLIB/Makefile
+++ b/demos/AVR/TEST-SUITE-OSLIB/Makefile
@@ -84,6 +84,10 @@ PROJECT = ch
 
 # Imported source files and paths
 CHIBIOS = ../../..
+CHIBIOS  := ../../..
+CONFDIR  := ./cfg
+BUILDDIR := ./build
+DEPDIR   := ./.dep
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
@@ -110,7 +114,7 @@ CSRC =  $(ALLCSRC) \
 # List C++ sources file here.
 CPPSRC = $(ALLCPPSRC)
 
-INCDIR = $(ALLINC) $(TESTINC)
+INCDIR = $(CONFDIR) $(ALLINC) $(TESTINC)
 
 #
 # Project, sources and paths.
diff --git a/demos/AVR/TEST-SUITE-OSLIB/chconf.h b/demos/AVR/TEST-SUITE-OSLIB/cfg/chconf.h
similarity index 100%
rename from demos/AVR/TEST-SUITE-OSLIB/chconf.h
rename to demos/AVR/TEST-SUITE-OSLIB/cfg/chconf.h
diff --git a/demos/AVR/TEST-SUITE-OSLIB/halconf.h b/demos/AVR/TEST-SUITE-OSLIB/cfg/halconf.h
similarity index 100%
rename from demos/AVR/TEST-SUITE-OSLIB/halconf.h
rename to demos/AVR/TEST-SUITE-OSLIB/cfg/halconf.h
diff --git a/demos/AVR/TEST-SUITE-OSLIB/mcuconf.h b/demos/AVR/TEST-SUITE-OSLIB/cfg/mcuconf.h
similarity index 100%
rename from demos/AVR/TEST-SUITE-OSLIB/mcuconf.h
rename to demos/AVR/TEST-SUITE-OSLIB/cfg/mcuconf.h
diff --git a/demos/AVR/TEST-SUITE-RT/Makefile b/demos/AVR/TEST-SUITE-RT/Makefile
index 905b2c0f6..9167f58d8 100644
--- a/demos/AVR/TEST-SUITE-RT/Makefile
+++ b/demos/AVR/TEST-SUITE-RT/Makefile
@@ -84,6 +84,10 @@ PROJECT = ch
 
 # Imported source files and paths
 CHIBIOS = ../../..
+CHIBIOS  := ../../..
+CONFDIR  := ./cfg
+BUILDDIR := ./build
+DEPDIR   := ./.dep
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
@@ -110,7 +114,7 @@ CSRC =  $(ALLCSRC) \
 # List C++ sources file here.
 CPPSRC = $(ALLCPPSRC)
 
-INCDIR = $(ALLINC) $(TESTINC)
+INCDIR = $(CONFDIR) $(ALLINC) $(TESTINC)
 
 #
 # Project, sources and paths.
diff --git a/demos/AVR/TEST-SUITE-RT/chconf.h b/demos/AVR/TEST-SUITE-RT/cfg/chconf.h
similarity index 100%
rename from demos/AVR/TEST-SUITE-RT/chconf.h
rename to demos/AVR/TEST-SUITE-RT/cfg/chconf.h
diff --git a/demos/AVR/TEST-SUITE-RT/halconf.h b/demos/AVR/TEST-SUITE-RT/cfg/halconf.h
similarity index 100%
rename from demos/AVR/TEST-SUITE-RT/halconf.h
rename to demos/AVR/TEST-SUITE-RT/cfg/halconf.h
diff --git a/demos/AVR/TEST-SUITE-RT/mcuconf.h b/demos/AVR/TEST-SUITE-RT/cfg/mcuconf.h
similarity index 100%
rename from demos/AVR/TEST-SUITE-RT/mcuconf.h
rename to demos/AVR/TEST-SUITE-RT/cfg/mcuconf.h