diff --git a/myapps/OLD/readme.md b/myapps/OLD/readme.md
new file mode 100644
index 0000000..f752699
--- /dev/null
+++ b/myapps/OLD/readme.md
@@ -0,0 +1,2 @@
+Uses standard HAL! Abandoned due to too many prerequisites.
+
diff --git a/myapps/practice/00-uart-tx/Makefile b/myapps/practice/00-uart-tx/Makefile
index 530f750..a6be206 100644
--- a/myapps/practice/00-uart-tx/Makefile
+++ b/myapps/practice/00-uart-tx/Makefile
@@ -103,6 +103,7 @@ LDFLAGS =  \
  -T $(LDSCRIPT) \
  --specs=nano.specs \
  -specs=nosys.specs -lc -lm \
+ -Wl,-Map=$(BUILD_DIR)/$(TARGET).map \
  -Wl,--gc-sections \
  -Wl,--print-memory-usage \
  -Wl,--no-warn-rwx-segments
diff --git a/myapps/template/Makefile b/myapps/template/Makefile
index 101c898..2783515 100644
--- a/myapps/template/Makefile
+++ b/myapps/template/Makefile
@@ -112,6 +112,7 @@ LDFLAGS =  \
  -T $(LDSCRIPT) \
  --specs=nano.specs \
  -specs=nosys.specs -lc -lm \
+ -Wl,-Map=$(BUILD_DIR)/$(TARGET).map \
  -Wl,--gc-sections \
  -Wl,--print-memory-usage \
  -Wl,--no-warn-rwx-segments
diff --git a/myapps/freertos-test/Makefile b/myapps/tests/freertos-test/Makefile
similarity index 99%
rename from myapps/freertos-test/Makefile
rename to myapps/tests/freertos-test/Makefile
index e35cf89..8392be7 100644
--- a/myapps/freertos-test/Makefile
+++ b/myapps/tests/freertos-test/Makefile
@@ -20,7 +20,7 @@ OPT = -Os
 #######################################
 # Build path
 BUILD_DIR = build
-VND_DIR = ../../vendor
+VND_DIR = ../../../vendor
 
 ######################################
 # source
diff --git a/myapps/freertos-test/freertos.mk b/myapps/tests/freertos-test/freertos.mk
similarity index 100%
rename from myapps/freertos-test/freertos.mk
rename to myapps/tests/freertos-test/freertos.mk
diff --git a/myapps/freertos-test/hal.mk b/myapps/tests/freertos-test/hal.mk
similarity index 100%
rename from myapps/freertos-test/hal.mk
rename to myapps/tests/freertos-test/hal.mk
diff --git a/myapps/freertos-test/src/inc/FreeRTOSConfig.h b/myapps/tests/freertos-test/src/inc/FreeRTOSConfig.h
similarity index 100%
rename from myapps/freertos-test/src/inc/FreeRTOSConfig.h
rename to myapps/tests/freertos-test/src/inc/FreeRTOSConfig.h
diff --git a/myapps/freertos-test/src/main.c b/myapps/tests/freertos-test/src/main.c
similarity index 100%
rename from myapps/freertos-test/src/main.c
rename to myapps/tests/freertos-test/src/main.c
diff --git a/myapps/ll-hal-test/Makefile b/myapps/tests/ll-hal-test/Makefile
similarity index 99%
rename from myapps/ll-hal-test/Makefile
rename to myapps/tests/ll-hal-test/Makefile
index 8b57569..530f750 100644
--- a/myapps/ll-hal-test/Makefile
+++ b/myapps/tests/ll-hal-test/Makefile
@@ -20,7 +20,7 @@ OPT = -Os
 #######################################
 # Build path
 BUILD_DIR = build
-VND_DIR = ../../vendor
+VND_DIR = ../../../vendor
 
 ######################################
 # source
diff --git a/myapps/ll-hal-test/hal.mk b/myapps/tests/ll-hal-test/hal.mk
similarity index 100%
rename from myapps/ll-hal-test/hal.mk
rename to myapps/tests/ll-hal-test/hal.mk
diff --git a/myapps/ll-hal-test/src/main.c b/myapps/tests/ll-hal-test/src/main.c
similarity index 100%
rename from myapps/ll-hal-test/src/main.c
rename to myapps/tests/ll-hal-test/src/main.c
diff --git a/myapps/printf-test/Makefile b/myapps/tests/printf-test/Makefile
similarity index 99%
rename from myapps/printf-test/Makefile
rename to myapps/tests/printf-test/Makefile
index 53a4d84..4623a16 100644
--- a/myapps/printf-test/Makefile
+++ b/myapps/tests/printf-test/Makefile
@@ -20,7 +20,7 @@ OPT = -Os
 #######################################
 # Build path
 BUILD_DIR = build
-VND_DIR = ../../vendor
+VND_DIR = ../../../vendor
 
 ######################################
 # source
diff --git a/myapps/printf-test/hal.mk b/myapps/tests/printf-test/hal.mk
similarity index 100%
rename from myapps/printf-test/hal.mk
rename to myapps/tests/printf-test/hal.mk
diff --git a/myapps/printf-test/src/main.c b/myapps/tests/printf-test/src/main.c
similarity index 100%
rename from myapps/printf-test/src/main.c
rename to myapps/tests/printf-test/src/main.c