15 files changed, 8 insertions, 8 deletions
diff --git a/os/common/ports/ARMCMx/cmsis_os/cmsis_os.c b/os/common/abstractions/cmsis_os/cmsis_os.c
index 04bebeb1d..04bebeb1d 100644
--- a/os/common/ports/ARMCMx/cmsis_os/cmsis_os.c
+++ b/os/common/abstractions/cmsis_os/cmsis_os.c
diff --git a/os/common/ports/ARMCMx/cmsis_os/cmsis_os.h b/os/common/abstractions/cmsis_os/cmsis_os.h
index 1c0998baf..1c0998baf 100644
--- a/os/common/ports/ARMCMx/cmsis_os/cmsis_os.h
+++ b/os/common/abstractions/cmsis_os/cmsis_os.h
diff --git a/os/common/abstractions/cmsis_os/cmsis_os.mk b/os/common/abstractions/cmsis_os/cmsis_os.mk
new file mode 100644
index 000000000..eb35bc574
--- /dev/null
+++ b/os/common/abstractions/cmsis_os/cmsis_os.mk
@@ -0,0 +1,4 @@
+# List of the ChibiOS/RT CMSIS RTOS wrapper.
+CMSISRTOSSRC = ${CHIBIOS}/os/common/abstractions/cmsis_os/cmsis_os.c
+ 
+CMSISRTOSINC = ${CHIBIOS}/os/common/abstractions/cmsis_os
diff --git a/os/common/ext/nasa-osal/include/common_types.h b/os/common/abstractions/nasa-osal/include/common_types.h
index 100a9c72e..100a9c72e 100644
--- a/os/common/ext/nasa-osal/include/common_types.h
+++ b/os/common/abstractions/nasa-osal/include/common_types.h
diff --git a/os/common/ext/nasa-osal/include/osapi-os-core.h b/os/common/abstractions/nasa-osal/include/osapi-os-core.h
index 8c9b13a78..8c9b13a78 100644
--- a/os/common/ext/nasa-osal/include/osapi-os-core.h
+++ b/os/common/abstractions/nasa-osal/include/osapi-os-core.h
diff --git a/os/common/ext/nasa-osal/include/osapi-os-filesys.h b/os/common/abstractions/nasa-osal/include/osapi-os-filesys.h
index c46800341..c46800341 100644
--- a/os/common/ext/nasa-osal/include/osapi-os-filesys.h
+++ b/os/common/abstractions/nasa-osal/include/osapi-os-filesys.h
diff --git a/os/common/ext/nasa-osal/include/osapi-os-loader.h b/os/common/abstractions/nasa-osal/include/osapi-os-loader.h
index 4f0b21b62..4f0b21b62 100644
--- a/os/common/ext/nasa-osal/include/osapi-os-loader.h
+++ b/os/common/abstractions/nasa-osal/include/osapi-os-loader.h
diff --git a/os/common/ext/nasa-osal/include/osapi-os-net.h b/os/common/abstractions/nasa-osal/include/osapi-os-net.h
index b8cc67d69..b8cc67d69 100644
--- a/os/common/ext/nasa-osal/include/osapi-os-net.h
+++ b/os/common/abstractions/nasa-osal/include/osapi-os-net.h
diff --git a/os/common/ext/nasa-osal/include/osapi-os-timer.h b/os/common/abstractions/nasa-osal/include/osapi-os-timer.h
index 8082c6227..8082c6227 100644
--- a/os/common/ext/nasa-osal/include/osapi-os-timer.h
+++ b/os/common/abstractions/nasa-osal/include/osapi-os-timer.h
diff --git a/os/common/ext/nasa-osal/include/osapi-version.h b/os/common/abstractions/nasa-osal/include/osapi-version.h
index 331e96c94..331e96c94 100644
--- a/os/common/ext/nasa-osal/include/osapi-version.h
+++ b/os/common/abstractions/nasa-osal/include/osapi-version.h
diff --git a/os/common/ext/nasa-osal/include/osapi.h b/os/common/abstractions/nasa-osal/include/osapi.h
index 46f6dc031..46f6dc031 100644
--- a/os/common/ext/nasa-osal/include/osapi.h
+++ b/os/common/abstractions/nasa-osal/include/osapi.h
diff --git a/os/common/abstractions/nasa-osal/nasa-osal.mk b/os/common/abstractions/nasa-osal/nasa-osal.mk
new file mode 100644
index 000000000..9562970a0
--- /dev/null
+++ b/os/common/abstractions/nasa-osal/nasa-osal.mk
@@ -0,0 +1,4 @@
+# NASAOSAL files.
+NASAOSALSRC = $(CHIBIOS)/os/common/abstractions/nasa-osal/src/osapi.c
+
+NASAOSALINC = $(CHIBIOS)/os/common/abstractions/nasa-osal/include
diff --git a/os/common/ext/nasa-osal/src/osapi.c b/os/common/abstractions/nasa-osal/src/osapi.c
index b69caea62..b69caea62 100644
--- a/os/common/ext/nasa-osal/src/osapi.c
+++ b/os/common/abstractions/nasa-osal/src/osapi.c
diff --git a/os/common/ext/nasa-osal/nasa-osal.mk b/os/common/ext/nasa-osal/nasa-osal.mk
deleted file mode 100644
index 23b994f87..000000000
--- a/os/common/ext/nasa-osal/nasa-osal.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# NASAOSAL files.
-NASAOSALSRC = $(CHIBIOS)/os/common/ext/nasa-osal/src/osapi.c
-
-NASAOSALINC = $(CHIBIOS)/os/common/ext/nasa-osal/include
diff --git a/os/common/ports/ARMCMx/cmsis_os/cmsis_os.mk b/os/common/ports/ARMCMx/cmsis_os/cmsis_os.mk
deleted file mode 100644
index f31566b76..000000000
--- a/os/common/ports/ARMCMx/cmsis_os/cmsis_os.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# List of the ChibiOS/RT CMSIS RTOS wrapper.
-CMSISRTOSSRC = ${CHIBIOS}/os/common/ports/ARMCMx/cmsis_os/cmsis_os.c
- 
-CMSISRTOSINC = ${CHIBIOS}/os/common/ports/ARMCMx/cmsis_os