diff --git a/testhal/AVR/multi/PAL/Makefile b/testhal/AVR/multi/PAL/Makefile
index 8e4fbfe87..2d54e41c1 100644
--- a/testhal/AVR/multi/PAL/Makefile
+++ b/testhal/AVR/multi/PAL/Makefile
@@ -5,31 +5,31 @@
 all:
 	@echo
 	@echo === Building for Arduino-Mega ======================================
-	@make --no-print-directory -f Makefile-arduino_mega all
+	@make --no-print-directory -f make/Makefile-arduino_mega.make all
 	@echo ====================================================================
 	@echo
 	@echo === Building for Arduino-Mini ======================================
-	@make --no-print-directory -f Makefile-arduino_mini all
+	@make --no-print-directory -f make/Makefile-arduino_mini.make all
 	@echo ====================================================================
 	@echo
 	@echo === Building for Arduino-Nano ======================================
-	@make --no-print-directory -f Makefile-arduino_nano all
+	@make --no-print-directory -f make/Makefile-arduino_nano.make all
 	@echo ====================================================================
 	@echo
 	@echo === Building for Arduino-Uno =======================================
-	@make --no-print-directory -f Makefile-arduino_uno all
+	@make --no-print-directory -f make/Makefile-arduino_uno.make all
 	@echo ====================================================================
 	@echo
 
 clean:
 	@echo
-	-@make --no-print-directory -f Makefile-arduino_mega clean
+	-@make --no-print-directory -f make/Makefile-arduino_mega.make clean
 	@echo
-	-@make --no-print-directory -f Makefile-arduino_mini clean
+	-@make --no-print-directory -f make/Makefile-arduino_mini.make clean
 	@echo
-	-@make --no-print-directory -f Makefile-arduino_nano clean
+	-@make --no-print-directory -f make/Makefile-arduino_nano.make clean
 	@echo
-	-@make --no-print-directory -f Makefile-arduino_uno clean
+	-@make --no-print-directory -f make/Makefile-arduino_uno.make clean
 	@echo
 
 #
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_mega/chconf.h b/testhal/AVR/multi/PAL/cfg/arduino_mega/chconf.h
similarity index 100%
rename from testhal/AVR/multi/PAL/cfg-arduino_mega/chconf.h
rename to testhal/AVR/multi/PAL/cfg/arduino_mega/chconf.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_mega/halconf.h b/testhal/AVR/multi/PAL/cfg/arduino_mega/halconf.h
similarity index 100%
rename from testhal/AVR/multi/PAL/cfg-arduino_mega/halconf.h
rename to testhal/AVR/multi/PAL/cfg/arduino_mega/halconf.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_mega/mcuconf.h b/testhal/AVR/multi/PAL/cfg/arduino_mega/mcuconf.h
similarity index 100%
rename from testhal/AVR/multi/PAL/cfg-arduino_mega/mcuconf.h
rename to testhal/AVR/multi/PAL/cfg/arduino_mega/mcuconf.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_mega/portab.c b/testhal/AVR/multi/PAL/cfg/arduino_mega/portab.c
similarity index 100%
rename from testhal/AVR/multi/PAL/cfg-arduino_mega/portab.c
rename to testhal/AVR/multi/PAL/cfg/arduino_mega/portab.c
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_mega/portab.h b/testhal/AVR/multi/PAL/cfg/arduino_mega/portab.h
similarity index 100%
rename from testhal/AVR/multi/PAL/cfg-arduino_mega/portab.h
rename to testhal/AVR/multi/PAL/cfg/arduino_mega/portab.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_mini/chconf.h b/testhal/AVR/multi/PAL/cfg/arduino_mini/chconf.h
similarity index 100%
rename from testhal/AVR/multi/PAL/cfg-arduino_mini/chconf.h
rename to testhal/AVR/multi/PAL/cfg/arduino_mini/chconf.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_mini/halconf.h b/testhal/AVR/multi/PAL/cfg/arduino_mini/halconf.h
similarity index 100%
rename from testhal/AVR/multi/PAL/cfg-arduino_mini/halconf.h
rename to testhal/AVR/multi/PAL/cfg/arduino_mini/halconf.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_mini/mcuconf.h b/testhal/AVR/multi/PAL/cfg/arduino_mini/mcuconf.h
similarity index 100%
rename from testhal/AVR/multi/PAL/cfg-arduino_mini/mcuconf.h
rename to testhal/AVR/multi/PAL/cfg/arduino_mini/mcuconf.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_mini/portab.c b/testhal/AVR/multi/PAL/cfg/arduino_mini/portab.c
similarity index 100%
rename from testhal/AVR/multi/PAL/cfg-arduino_mini/portab.c
rename to testhal/AVR/multi/PAL/cfg/arduino_mini/portab.c
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_mini/portab.h b/testhal/AVR/multi/PAL/cfg/arduino_mini/portab.h
similarity index 100%
rename from testhal/AVR/multi/PAL/cfg-arduino_mini/portab.h
rename to testhal/AVR/multi/PAL/cfg/arduino_mini/portab.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_nano/chconf.h b/testhal/AVR/multi/PAL/cfg/arduino_nano/chconf.h
similarity index 100%
rename from testhal/AVR/multi/PAL/cfg-arduino_nano/chconf.h
rename to testhal/AVR/multi/PAL/cfg/arduino_nano/chconf.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_nano/halconf.h b/testhal/AVR/multi/PAL/cfg/arduino_nano/halconf.h
similarity index 100%
rename from testhal/AVR/multi/PAL/cfg-arduino_nano/halconf.h
rename to testhal/AVR/multi/PAL/cfg/arduino_nano/halconf.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_nano/mcuconf.h b/testhal/AVR/multi/PAL/cfg/arduino_nano/mcuconf.h
similarity index 100%
rename from testhal/AVR/multi/PAL/cfg-arduino_nano/mcuconf.h
rename to testhal/AVR/multi/PAL/cfg/arduino_nano/mcuconf.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_nano/portab.c b/testhal/AVR/multi/PAL/cfg/arduino_nano/portab.c
similarity index 100%
rename from testhal/AVR/multi/PAL/cfg-arduino_nano/portab.c
rename to testhal/AVR/multi/PAL/cfg/arduino_nano/portab.c
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_nano/portab.h b/testhal/AVR/multi/PAL/cfg/arduino_nano/portab.h
similarity index 100%
rename from testhal/AVR/multi/PAL/cfg-arduino_nano/portab.h
rename to testhal/AVR/multi/PAL/cfg/arduino_nano/portab.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_uno/chconf.h b/testhal/AVR/multi/PAL/cfg/arduino_uno/chconf.h
similarity index 100%
rename from testhal/AVR/multi/PAL/cfg-arduino_uno/chconf.h
rename to testhal/AVR/multi/PAL/cfg/arduino_uno/chconf.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_uno/halconf.h b/testhal/AVR/multi/PAL/cfg/arduino_uno/halconf.h
similarity index 100%
rename from testhal/AVR/multi/PAL/cfg-arduino_uno/halconf.h
rename to testhal/AVR/multi/PAL/cfg/arduino_uno/halconf.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_uno/mcuconf.h b/testhal/AVR/multi/PAL/cfg/arduino_uno/mcuconf.h
similarity index 100%
rename from testhal/AVR/multi/PAL/cfg-arduino_uno/mcuconf.h
rename to testhal/AVR/multi/PAL/cfg/arduino_uno/mcuconf.h
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_uno/portab.c b/testhal/AVR/multi/PAL/cfg/arduino_uno/portab.c
similarity index 100%
rename from testhal/AVR/multi/PAL/cfg-arduino_uno/portab.c
rename to testhal/AVR/multi/PAL/cfg/arduino_uno/portab.c
diff --git a/testhal/AVR/multi/PAL/cfg-arduino_uno/portab.h b/testhal/AVR/multi/PAL/cfg/arduino_uno/portab.h
similarity index 100%
rename from testhal/AVR/multi/PAL/cfg-arduino_uno/portab.h
rename to testhal/AVR/multi/PAL/cfg/arduino_uno/portab.h
diff --git a/testhal/AVR/multi/PAL/Makefile-arduino_mega b/testhal/AVR/multi/PAL/make/Makefile-arduino_mega.make
similarity index 87%
rename from testhal/AVR/multi/PAL/Makefile-arduino_mega
rename to testhal/AVR/multi/PAL/make/Makefile-arduino_mega.make
index a3fc012a7..2f20664be 100644
--- a/testhal/AVR/multi/PAL/Makefile-arduino_mega
+++ b/testhal/AVR/multi/PAL/make/Makefile-arduino_mega.make
@@ -69,35 +69,33 @@ PROJECT = ch
 
 # Imported source files and paths
 CHIBIOS = ../../../..
-CONFDIR  := ./cfg-arduino_mega
-BUILDDIR := ./build-arduino_mega
-DEPDIR   := ./.dep-arduino_mega
+CONFDIR  := ./cfg/arduino_mega
+BUILDDIR := ./build/arduino_mega
+DEPDIR   := ./.dep/arduino_mega
+
+# Licensing files.
+include $(CHIBIOS)/os/license/license.mk
 
 # HAL-OSAL files (optional).
 include $(CHIBIOS)/os/hal/hal.mk
 include $(CHIBIOS)/os/hal/boards/ARDUINO_MEGA/board.mk
 include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ATMEGAxx/platform.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk
+
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk
 
 # List C source files here. (C dependencies are automatically generated.)
-CSRC =  $(KERNSRC)                      \
-        $(PORTSRC)                      \
-        $(OSALSRC)                      \
-        $(HALSRC)                       \
-        $(PLATFORMSRC)                  \
-        $(BOARDSRC)                     \
-        $(CHIBIOS)/os/various/evtimer.c \
+CSRC =  $(ALLCSRC)          \
+       $(CONFDIR)/portab.c  \
         main.c
 
 # List C++ sources file here.
-CPPSRC =
+CPPSRC = $(ALLCPPSRC)
 
-INCDIR =  $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \
-          $(HALINC) $(OSALINC) $(PLATFORMINC)         \
-          $(BOARDINC) $(CHIBIOS)/os/various $(CONFDIR)
+# Header files here.
+INCDIR = $(ALLINC) $(CONFDIR)
 
 #
 # Project, sources and paths.
diff --git a/testhal/AVR/multi/PAL/Makefile-arduino_mini b/testhal/AVR/multi/PAL/make/Makefile-arduino_mini.make
similarity index 87%
rename from testhal/AVR/multi/PAL/Makefile-arduino_mini
rename to testhal/AVR/multi/PAL/make/Makefile-arduino_mini.make
index 9dd318b7d..8f6a339e5 100644
--- a/testhal/AVR/multi/PAL/Makefile-arduino_mini
+++ b/testhal/AVR/multi/PAL/make/Makefile-arduino_mini.make
@@ -69,35 +69,33 @@ PROJECT = ch
 
 # Imported source files and paths
 CHIBIOS = ../../../..
-CONFDIR  := ./cfg-arduino_mini
-BUILDDIR := ./build-arduino_mini
-DEPDIR   := ./.dep-arduino_mini
+CONFDIR  := ./cfg/arduino_mini
+BUILDDIR := ./build/arduino_mini
+DEPDIR   := ./.dep/arduino_mini
+
+# Licensing files.
+include $(CHIBIOS)/os/license/license.mk
 
 # HAL-OSAL files (optional).
 include $(CHIBIOS)/os/hal/hal.mk
 include $(CHIBIOS)/os/hal/boards/ARDUINO_MINI/board.mk
 include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ATMEGAxx/platform.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk
+
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk
 
 # List C source files here. (C dependencies are automatically generated.)
-CSRC =  $(KERNSRC)                      \
-        $(PORTSRC)                      \
-        $(OSALSRC)                      \
-        $(HALSRC)                       \
-        $(PLATFORMSRC)                  \
-        $(BOARDSRC)                     \
-        $(CHIBIOS)/os/various/evtimer.c \
+CSRC =  $(ALLCSRC)          \
+       $(CONFDIR)/portab.c  \
         main.c
 
 # List C++ sources file here.
-CPPSRC =
+CPPSRC = $(ALLCPPSRC)
 
-INCDIR =  $(CHIBIOS)/os/license $(PORTINC) $(KERNINC)   \
-          $(HALINC) $(OSALINC) $(PLATFORMINC)           \
-          $(BOARDINC) $(CHIBIOS)/os/various $(CONFDIR)
+# Header files here.
+INCDIR = $(ALLINC) $(CONFDIR)
 
 #
 # Project, sources and paths.
diff --git a/testhal/AVR/multi/PAL/Makefile-arduino_nano b/testhal/AVR/multi/PAL/make/Makefile-arduino_nano.make
similarity index 87%
rename from testhal/AVR/multi/PAL/Makefile-arduino_nano
rename to testhal/AVR/multi/PAL/make/Makefile-arduino_nano.make
index 018b56918..8dd7079fd 100644
--- a/testhal/AVR/multi/PAL/Makefile-arduino_nano
+++ b/testhal/AVR/multi/PAL/make/Makefile-arduino_nano.make
@@ -69,9 +69,12 @@ PROJECT = ch
 
 # Imported source files and paths
 CHIBIOS = ../../../..
-CONFDIR  := ./cfg-arduino_nano
-BUILDDIR := ./build-arduino_nano
-DEPDIR   := ./.dep-arduino_nano
+CONFDIR  := ./cfg/arduino_nano
+BUILDDIR := ./build/arduino_nano
+DEPDIR   := ./.dep/arduino_nano
+
+# Licensing files.
+include $(CHIBIOS)/os/license/license.mk
 
 # HAL-OSAL files (optional).
 include $(CHIBIOS)/os/hal/hal.mk
@@ -83,21 +86,15 @@ include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk
 
 # List C source files here. (C dependencies are automatically generated.)
-CSRC =  $(KERNSRC)                      \
-        $(PORTSRC)                      \
-        $(OSALSRC)                      \
-        $(HALSRC)                       \
-        $(PLATFORMSRC)                  \
-        $(BOARDSRC)                     \
-        $(CHIBIOS)/os/various/evtimer.c \
+CSRC =  $(ALLCSRC)          \
+       $(CONFDIR)/portab.c  \
         main.c
 
 # List C++ sources file here.
-CPPSRC =
+CPPSRC = $(ALLCPPSRC)
 
-INCDIR =  $(CHIBIOS)/os/license $(PORTINC) $(KERNINC)  \
-          $(HALINC) $(OSALINC) $(PLATFORMINC)          \
-          $(BOARDINC) $(CHIBIOS)/os/various $(CONFDIR)
+# Header files here.
+INCDIR = $(ALLINC) $(CONFDIR)
 
 #
 # Project, sources and paths.
diff --git a/testhal/AVR/multi/PAL/Makefile-arduino_uno b/testhal/AVR/multi/PAL/make/Makefile-arduino_uno.make
similarity index 87%
rename from testhal/AVR/multi/PAL/Makefile-arduino_uno
rename to testhal/AVR/multi/PAL/make/Makefile-arduino_uno.make
index 2bc81e756..3a8faae93 100644
--- a/testhal/AVR/multi/PAL/Makefile-arduino_uno
+++ b/testhal/AVR/multi/PAL/make/Makefile-arduino_uno.make
@@ -69,35 +69,33 @@ PROJECT = ch
 
 # Imported source files and paths
 CHIBIOS = ../../../..
-CONFDIR  := ./cfg-arduino_uno
-BUILDDIR := ./build-arduino_uno
-DEPDIR   := ./.dep-arduino_uno
+CONFDIR  := ./cfg/arduino_uno
+BUILDDIR := ./build/arduino_uno
+DEPDIR   := ./.dep/arduino_uno
+
+# Licensing files.
+include $(CHIBIOS)/os/license/license.mk
 
 # HAL-OSAL files (optional).
 include $(CHIBIOS)/os/hal/hal.mk
 include $(CHIBIOS)/os/hal/boards/ARDUINO_UNO/board.mk
 include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ATMEGAxx/platform.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk
+
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk
 
 # List C source files here. (C dependencies are automatically generated.)
-CSRC =  $(KERNSRC)                      \
-        $(PORTSRC)                      \
-        $(OSALSRC)                      \
-        $(HALSRC)                       \
-        $(PLATFORMSRC)                  \
-        $(BOARDSRC)                     \
-        $(CHIBIOS)/os/various/evtimer.c \
+CSRC =  $(ALLCSRC)          \
+       $(CONFDIR)/portab.c  \
         main.c
 
 # List C++ sources file here.
-CPPSRC =
+CPPSRC = $(ALLCPPSRC)
 
-INCDIR =  $(CHIBIOS)/os/license $(PORTINC) $(KERNINC)  \
-          $(HALINC) $(OSALINC) $(PLATFORMINC)          \
-          $(BOARDINC) $(CHIBIOS)/os/various $(CONFDIR)
+# Header files here.
+INCDIR = $(ALLINC) $(CONFDIR)
 
 #
 # Project, sources and paths.