diff --git a/libraries/rtos/rtos/Mail.h b/core/mbed-rtos/rtos/Mail.h
similarity index 100%
rename from libraries/rtos/rtos/Mail.h
rename to core/mbed-rtos/rtos/Mail.h
diff --git a/libraries/rtos/rtos/MemoryPool.h b/core/mbed-rtos/rtos/MemoryPool.h
similarity index 100%
rename from libraries/rtos/rtos/MemoryPool.h
rename to core/mbed-rtos/rtos/MemoryPool.h
diff --git a/libraries/rtos/rtos/Mutex.cpp b/core/mbed-rtos/rtos/Mutex.cpp
similarity index 100%
rename from libraries/rtos/rtos/Mutex.cpp
rename to core/mbed-rtos/rtos/Mutex.cpp
diff --git a/libraries/rtos/rtos/Mutex.h b/core/mbed-rtos/rtos/Mutex.h
similarity index 100%
rename from libraries/rtos/rtos/Mutex.h
rename to core/mbed-rtos/rtos/Mutex.h
diff --git a/libraries/rtos/rtos/Queue.h b/core/mbed-rtos/rtos/Queue.h
similarity index 100%
rename from libraries/rtos/rtos/Queue.h
rename to core/mbed-rtos/rtos/Queue.h
diff --git a/libraries/rtos/rtos/RtosTimer.cpp b/core/mbed-rtos/rtos/RtosTimer.cpp
similarity index 100%
rename from libraries/rtos/rtos/RtosTimer.cpp
rename to core/mbed-rtos/rtos/RtosTimer.cpp
diff --git a/libraries/rtos/rtos/RtosTimer.h b/core/mbed-rtos/rtos/RtosTimer.h
similarity index 100%
rename from libraries/rtos/rtos/RtosTimer.h
rename to core/mbed-rtos/rtos/RtosTimer.h
diff --git a/libraries/rtos/rtos/Semaphore.cpp b/core/mbed-rtos/rtos/Semaphore.cpp
similarity index 100%
rename from libraries/rtos/rtos/Semaphore.cpp
rename to core/mbed-rtos/rtos/Semaphore.cpp
diff --git a/libraries/rtos/rtos/Semaphore.h b/core/mbed-rtos/rtos/Semaphore.h
similarity index 100%
rename from libraries/rtos/rtos/Semaphore.h
rename to core/mbed-rtos/rtos/Semaphore.h
diff --git a/libraries/rtos/rtos/Thread.cpp b/core/mbed-rtos/rtos/Thread.cpp
similarity index 100%
rename from libraries/rtos/rtos/Thread.cpp
rename to core/mbed-rtos/rtos/Thread.cpp
diff --git a/libraries/rtos/rtos/Thread.h b/core/mbed-rtos/rtos/Thread.h
similarity index 100%
rename from libraries/rtos/rtos/Thread.h
rename to core/mbed-rtos/rtos/Thread.h
diff --git a/libraries/rtos/rtos/rtos.h b/core/mbed-rtos/rtos/rtos.h
similarity index 100%
rename from libraries/rtos/rtos/rtos.h
rename to core/mbed-rtos/rtos/rtos.h
diff --git a/libraries/rtos/rtos/rtos_idle.c b/core/mbed-rtos/rtos/rtos_idle.c
similarity index 100%
rename from libraries/rtos/rtos/rtos_idle.c
rename to core/mbed-rtos/rtos/rtos_idle.c
diff --git a/libraries/rtos/rtos/rtos_idle.h b/core/mbed-rtos/rtos/rtos_idle.h
similarity index 100%
rename from libraries/rtos/rtos/rtos_idle.h
rename to core/mbed-rtos/rtos/rtos_idle.h
diff --git a/libraries/rtos/rtx/TARGET_ARM7/ARM7/TOOLCHAIN_GCC/HAL_CM0.S b/core/mbed-rtos/rtx/TARGET_ARM7/ARM7/TOOLCHAIN_GCC/HAL_CM0.S
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/ARM7/TOOLCHAIN_GCC/HAL_CM0.S
rename to core/mbed-rtos/rtx/TARGET_ARM7/ARM7/TOOLCHAIN_GCC/HAL_CM0.S
diff --git a/libraries/rtos/rtx/TARGET_ARM7/ARM7/TOOLCHAIN_GCC/SVC_Table.S b/core/mbed-rtos/rtx/TARGET_ARM7/ARM7/TOOLCHAIN_GCC/SVC_Table.S
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/ARM7/TOOLCHAIN_GCC/SVC_Table.S
rename to core/mbed-rtos/rtx/TARGET_ARM7/ARM7/TOOLCHAIN_GCC/SVC_Table.S
diff --git a/libraries/rtos/rtx/TARGET_ARM7/HAL_CM.c b/core/mbed-rtos/rtx/TARGET_ARM7/HAL_CM.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/HAL_CM.c
rename to core/mbed-rtos/rtx/TARGET_ARM7/HAL_CM.c
diff --git a/libraries/rtos/rtx/TARGET_ARM7/RTX_CM_lib.h b/core/mbed-rtos/rtx/TARGET_ARM7/RTX_CM_lib.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/RTX_CM_lib.h
rename to core/mbed-rtos/rtx/TARGET_ARM7/RTX_CM_lib.h
diff --git a/libraries/rtos/rtx/TARGET_ARM7/RTX_Conf.h b/core/mbed-rtos/rtx/TARGET_ARM7/RTX_Conf.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/RTX_Conf.h
rename to core/mbed-rtos/rtx/TARGET_ARM7/RTX_Conf.h
diff --git a/libraries/rtos/rtx/TARGET_ARM7/RTX_Conf_CM.c b/core/mbed-rtos/rtx/TARGET_ARM7/RTX_Conf_CM.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/RTX_Conf_CM.c
rename to core/mbed-rtos/rtx/TARGET_ARM7/RTX_Conf_CM.c
diff --git a/libraries/rtos/rtx/TARGET_ARM7/cmsis_os.h b/core/mbed-rtos/rtx/TARGET_ARM7/cmsis_os.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/cmsis_os.h
rename to core/mbed-rtos/rtx/TARGET_ARM7/cmsis_os.h
diff --git a/libraries/rtos/rtx/TARGET_ARM7/os_tcb.h b/core/mbed-rtos/rtx/TARGET_ARM7/os_tcb.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/os_tcb.h
rename to core/mbed-rtos/rtx/TARGET_ARM7/os_tcb.h
diff --git a/libraries/rtos/rtx/TARGET_ARM7/rt_CMSIS.c b/core/mbed-rtos/rtx/TARGET_ARM7/rt_CMSIS.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/rt_CMSIS.c
rename to core/mbed-rtos/rtx/TARGET_ARM7/rt_CMSIS.c
diff --git a/libraries/rtos/rtx/TARGET_ARM7/rt_Event.c b/core/mbed-rtos/rtx/TARGET_ARM7/rt_Event.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/rt_Event.c
rename to core/mbed-rtos/rtx/TARGET_ARM7/rt_Event.c
diff --git a/libraries/rtos/rtx/TARGET_ARM7/rt_Event.h b/core/mbed-rtos/rtx/TARGET_ARM7/rt_Event.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/rt_Event.h
rename to core/mbed-rtos/rtx/TARGET_ARM7/rt_Event.h
diff --git a/libraries/rtos/rtx/TARGET_ARM7/rt_HAL_CM.h b/core/mbed-rtos/rtx/TARGET_ARM7/rt_HAL_CM.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/rt_HAL_CM.h
rename to core/mbed-rtos/rtx/TARGET_ARM7/rt_HAL_CM.h
diff --git a/libraries/rtos/rtx/TARGET_ARM7/rt_List.c b/core/mbed-rtos/rtx/TARGET_ARM7/rt_List.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/rt_List.c
rename to core/mbed-rtos/rtx/TARGET_ARM7/rt_List.c
diff --git a/libraries/rtos/rtx/TARGET_ARM7/rt_List.h b/core/mbed-rtos/rtx/TARGET_ARM7/rt_List.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/rt_List.h
rename to core/mbed-rtos/rtx/TARGET_ARM7/rt_List.h
diff --git a/libraries/rtos/rtx/TARGET_ARM7/rt_Mailbox.c b/core/mbed-rtos/rtx/TARGET_ARM7/rt_Mailbox.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/rt_Mailbox.c
rename to core/mbed-rtos/rtx/TARGET_ARM7/rt_Mailbox.c
diff --git a/libraries/rtos/rtx/TARGET_ARM7/rt_Mailbox.h b/core/mbed-rtos/rtx/TARGET_ARM7/rt_Mailbox.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/rt_Mailbox.h
rename to core/mbed-rtos/rtx/TARGET_ARM7/rt_Mailbox.h
diff --git a/libraries/rtos/rtx/TARGET_ARM7/rt_MemBox.c b/core/mbed-rtos/rtx/TARGET_ARM7/rt_MemBox.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/rt_MemBox.c
rename to core/mbed-rtos/rtx/TARGET_ARM7/rt_MemBox.c
diff --git a/libraries/rtos/rtx/TARGET_ARM7/rt_MemBox.h b/core/mbed-rtos/rtx/TARGET_ARM7/rt_MemBox.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/rt_MemBox.h
rename to core/mbed-rtos/rtx/TARGET_ARM7/rt_MemBox.h
diff --git a/libraries/rtos/rtx/TARGET_ARM7/rt_Mutex.c b/core/mbed-rtos/rtx/TARGET_ARM7/rt_Mutex.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/rt_Mutex.c
rename to core/mbed-rtos/rtx/TARGET_ARM7/rt_Mutex.c
diff --git a/libraries/rtos/rtx/TARGET_ARM7/rt_Mutex.h b/core/mbed-rtos/rtx/TARGET_ARM7/rt_Mutex.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/rt_Mutex.h
rename to core/mbed-rtos/rtx/TARGET_ARM7/rt_Mutex.h
diff --git a/libraries/rtos/rtx/TARGET_ARM7/rt_Robin.c b/core/mbed-rtos/rtx/TARGET_ARM7/rt_Robin.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/rt_Robin.c
rename to core/mbed-rtos/rtx/TARGET_ARM7/rt_Robin.c
diff --git a/libraries/rtos/rtx/TARGET_ARM7/rt_Robin.h b/core/mbed-rtos/rtx/TARGET_ARM7/rt_Robin.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/rt_Robin.h
rename to core/mbed-rtos/rtx/TARGET_ARM7/rt_Robin.h
diff --git a/libraries/rtos/rtx/TARGET_ARM7/rt_Semaphore.c b/core/mbed-rtos/rtx/TARGET_ARM7/rt_Semaphore.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/rt_Semaphore.c
rename to core/mbed-rtos/rtx/TARGET_ARM7/rt_Semaphore.c
diff --git a/libraries/rtos/rtx/TARGET_ARM7/rt_Semaphore.h b/core/mbed-rtos/rtx/TARGET_ARM7/rt_Semaphore.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/rt_Semaphore.h
rename to core/mbed-rtos/rtx/TARGET_ARM7/rt_Semaphore.h
diff --git a/libraries/rtos/rtx/TARGET_ARM7/rt_System.c b/core/mbed-rtos/rtx/TARGET_ARM7/rt_System.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/rt_System.c
rename to core/mbed-rtos/rtx/TARGET_ARM7/rt_System.c
diff --git a/libraries/rtos/rtx/TARGET_ARM7/rt_System.h b/core/mbed-rtos/rtx/TARGET_ARM7/rt_System.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/rt_System.h
rename to core/mbed-rtos/rtx/TARGET_ARM7/rt_System.h
diff --git a/libraries/rtos/rtx/TARGET_ARM7/rt_Task.c b/core/mbed-rtos/rtx/TARGET_ARM7/rt_Task.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/rt_Task.c
rename to core/mbed-rtos/rtx/TARGET_ARM7/rt_Task.c
diff --git a/libraries/rtos/rtx/TARGET_ARM7/rt_Task.h b/core/mbed-rtos/rtx/TARGET_ARM7/rt_Task.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/rt_Task.h
rename to core/mbed-rtos/rtx/TARGET_ARM7/rt_Task.h
diff --git a/libraries/rtos/rtx/TARGET_ARM7/rt_Time.c b/core/mbed-rtos/rtx/TARGET_ARM7/rt_Time.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/rt_Time.c
rename to core/mbed-rtos/rtx/TARGET_ARM7/rt_Time.c
diff --git a/libraries/rtos/rtx/TARGET_ARM7/rt_Time.h b/core/mbed-rtos/rtx/TARGET_ARM7/rt_Time.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/rt_Time.h
rename to core/mbed-rtos/rtx/TARGET_ARM7/rt_Time.h
diff --git a/libraries/rtos/rtx/TARGET_ARM7/rt_TypeDef.h b/core/mbed-rtos/rtx/TARGET_ARM7/rt_TypeDef.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_ARM7/rt_TypeDef.h
rename to core/mbed-rtos/rtx/TARGET_ARM7/rt_TypeDef.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/HAL_CA.c b/core/mbed-rtos/rtx/TARGET_CORTEX_A/HAL_CA.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/HAL_CA.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/HAL_CA.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/RTX_CM_lib.h b/core/mbed-rtos/rtx/TARGET_CORTEX_A/RTX_CM_lib.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/RTX_CM_lib.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/RTX_CM_lib.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/RTX_Conf_CA.c b/core/mbed-rtos/rtx/TARGET_CORTEX_A/RTX_Conf_CA.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/RTX_Conf_CA.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/RTX_Conf_CA.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/RTX_Config.h b/core/mbed-rtos/rtx/TARGET_CORTEX_A/RTX_Config.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/RTX_Config.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/RTX_Config.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_ARM/HAL_CA9.c b/core/mbed-rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_ARM/HAL_CA9.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_ARM/HAL_CA9.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_ARM/HAL_CA9.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_ARM/SVC_Table.S b/core/mbed-rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_ARM/SVC_Table.S
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_ARM/SVC_Table.S
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_ARM/SVC_Table.S
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_GCC/HAL_CA9.S b/core/mbed-rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_GCC/HAL_CA9.S
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_GCC/HAL_CA9.S
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_GCC/HAL_CA9.S
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_GCC/SVC_Table.S b/core/mbed-rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_GCC/SVC_Table.S
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_GCC/SVC_Table.S
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_GCC/SVC_Table.S
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_IAR/HAL_CA9.c b/core/mbed-rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_IAR/HAL_CA9.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_IAR/HAL_CA9.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_IAR/HAL_CA9.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_IAR/HAL_CA9_asm.s b/core/mbed-rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_IAR/HAL_CA9_asm.s
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_IAR/HAL_CA9_asm.s
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_IAR/HAL_CA9_asm.s
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_IAR/SVC_Table.S b/core/mbed-rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_IAR/SVC_Table.S
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_IAR/SVC_Table.S
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_IAR/SVC_Table.S
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/cmsis_os.h b/core/mbed-rtos/rtx/TARGET_CORTEX_A/cmsis_os.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/cmsis_os.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/cmsis_os.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_CMSIS.c b/core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_CMSIS.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/rt_CMSIS.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_CMSIS.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_Event.c b/core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Event.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/rt_Event.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Event.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_Event.h b/core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Event.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/rt_Event.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Event.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_HAL_CA.h b/core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_HAL_CA.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/rt_HAL_CA.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_HAL_CA.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_HAL_CM.h b/core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_HAL_CM.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/rt_HAL_CM.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_HAL_CM.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_List.c b/core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_List.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/rt_List.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_List.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_List.h b/core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_List.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/rt_List.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_List.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_Mailbox.c b/core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Mailbox.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/rt_Mailbox.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Mailbox.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_Mailbox.h b/core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Mailbox.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/rt_Mailbox.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Mailbox.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_MemBox.c b/core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_MemBox.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/rt_MemBox.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_MemBox.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_MemBox.h b/core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_MemBox.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/rt_MemBox.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_MemBox.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_Memory.c b/core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Memory.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/rt_Memory.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Memory.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_Memory.h b/core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Memory.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/rt_Memory.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Memory.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_Mutex.c b/core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Mutex.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/rt_Mutex.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Mutex.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_Mutex.h b/core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Mutex.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/rt_Mutex.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Mutex.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_Robin.c b/core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Robin.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/rt_Robin.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Robin.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_Robin.h b/core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Robin.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/rt_Robin.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Robin.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_Semaphore.c b/core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Semaphore.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/rt_Semaphore.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Semaphore.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_Semaphore.h b/core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Semaphore.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/rt_Semaphore.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Semaphore.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_System.c b/core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_System.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/rt_System.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_System.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_System.h b/core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_System.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/rt_System.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_System.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_Task.c b/core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Task.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/rt_Task.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Task.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_Task.h b/core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Task.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/rt_Task.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Task.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_Time.c b/core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Time.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/rt_Time.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Time.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_Time.h b/core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Time.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/rt_Time.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Time.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_Timer.h b/core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Timer.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/rt_Timer.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_Timer.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_TypeDef.h b/core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_TypeDef.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_A/rt_TypeDef.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_A/rt_TypeDef.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/HAL_CM.c b/core/mbed-rtos/rtx/TARGET_CORTEX_M/HAL_CM.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/HAL_CM.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/HAL_CM.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/RTX_CM_lib.h b/core/mbed-rtos/rtx/TARGET_CORTEX_M/RTX_CM_lib.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/RTX_CM_lib.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/RTX_CM_lib.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/RTX_Conf.h b/core/mbed-rtos/rtx/TARGET_CORTEX_M/RTX_Conf.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/RTX_Conf.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/RTX_Conf.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/RTX_Conf_CM.c b/core/mbed-rtos/rtx/TARGET_CORTEX_M/RTX_Conf_CM.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/RTX_Conf_CM.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/RTX_Conf_CM.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_ARM/HAL_CM0.c b/core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_ARM/HAL_CM0.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_ARM/HAL_CM0.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_ARM/HAL_CM0.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_ARM/SVC_Table.S b/core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_ARM/SVC_Table.S
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_ARM/SVC_Table.S
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_ARM/SVC_Table.S
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_GCC/HAL_CM0.S b/core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_GCC/HAL_CM0.S
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_GCC/HAL_CM0.S
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_GCC/HAL_CM0.S
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_GCC/SVC_Table.S b/core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_GCC/SVC_Table.S
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_GCC/SVC_Table.S
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_GCC/SVC_Table.S
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_IAR/HAL_CM0.S b/core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_IAR/HAL_CM0.S
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_IAR/HAL_CM0.S
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_IAR/HAL_CM0.S
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_IAR/SVC_Table.S b/core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_IAR/SVC_Table.S
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_IAR/SVC_Table.S
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_IAR/SVC_Table.S
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_ARM/HAL_CM0.c b/core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_ARM/HAL_CM0.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_ARM/HAL_CM0.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_ARM/HAL_CM0.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_ARM/SVC_Table.S b/core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_ARM/SVC_Table.S
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_ARM/SVC_Table.S
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_ARM/SVC_Table.S
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_GCC/HAL_CM0.S b/core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_GCC/HAL_CM0.S
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_GCC/HAL_CM0.S
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_GCC/HAL_CM0.S
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_GCC/SVC_Table.S b/core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_GCC/SVC_Table.S
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_GCC/SVC_Table.S
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_GCC/SVC_Table.S
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_IAR/HAL_CM0.S b/core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_IAR/HAL_CM0.S
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_IAR/HAL_CM0.S
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_IAR/HAL_CM0.S
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_IAR/SVC_Table.S b/core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_IAR/SVC_Table.S
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_IAR/SVC_Table.S
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_IAR/SVC_Table.S
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_ARM/HAL_CM3.c b/core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_ARM/HAL_CM3.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_ARM/HAL_CM3.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_ARM/HAL_CM3.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_ARM/SVC_Table.S b/core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_ARM/SVC_Table.S
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_ARM/SVC_Table.S
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_ARM/SVC_Table.S
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_GCC/HAL_CM3.S b/core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_GCC/HAL_CM3.S
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_GCC/HAL_CM3.S
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_GCC/HAL_CM3.S
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_GCC/SVC_Table.S b/core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_GCC/SVC_Table.S
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_GCC/SVC_Table.S
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_GCC/SVC_Table.S
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_IAR/HAL_CM3.S b/core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_IAR/HAL_CM3.S
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_IAR/HAL_CM3.S
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_IAR/HAL_CM3.S
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_IAR/SVC_Table.S b/core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_IAR/SVC_Table.S
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_IAR/SVC_Table.S
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_IAR/SVC_Table.S
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_ARM/HAL_CM4.c b/core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_ARM/HAL_CM4.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_ARM/HAL_CM4.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_ARM/HAL_CM4.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_ARM/SVC_Table.S b/core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_ARM/SVC_Table.S
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_ARM/SVC_Table.S
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_ARM/SVC_Table.S
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_GCC/HAL_CM4.S b/core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_GCC/HAL_CM4.S
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_GCC/HAL_CM4.S
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_GCC/HAL_CM4.S
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_GCC/SVC_Table.S b/core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_GCC/SVC_Table.S
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_GCC/SVC_Table.S
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_GCC/SVC_Table.S
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_IAR/HAL_CM4.S b/core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_IAR/HAL_CM4.S
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_IAR/HAL_CM4.S
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_IAR/HAL_CM4.S
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_IAR/SVC_Table.S b/core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_IAR/SVC_Table.S
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_IAR/SVC_Table.S
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_IAR/SVC_Table.S
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/cmsis_os.h b/core/mbed-rtos/rtx/TARGET_CORTEX_M/cmsis_os.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/cmsis_os.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/cmsis_os.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/os_tcb.h b/core/mbed-rtos/rtx/TARGET_CORTEX_M/os_tcb.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/os_tcb.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/os_tcb.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/rt_CMSIS.c b/core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_CMSIS.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/rt_CMSIS.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_CMSIS.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/rt_Event.c b/core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Event.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/rt_Event.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Event.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/rt_Event.h b/core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Event.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/rt_Event.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Event.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/rt_HAL_CM.h b/core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_HAL_CM.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/rt_HAL_CM.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_HAL_CM.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/rt_List.c b/core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_List.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/rt_List.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_List.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/rt_List.h b/core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_List.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/rt_List.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_List.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/rt_Mailbox.c b/core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Mailbox.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/rt_Mailbox.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Mailbox.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/rt_Mailbox.h b/core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Mailbox.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/rt_Mailbox.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Mailbox.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/rt_MemBox.c b/core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_MemBox.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/rt_MemBox.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_MemBox.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/rt_MemBox.h b/core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_MemBox.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/rt_MemBox.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_MemBox.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/rt_Mutex.c b/core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Mutex.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/rt_Mutex.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Mutex.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/rt_Mutex.h b/core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Mutex.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/rt_Mutex.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Mutex.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/rt_Robin.c b/core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Robin.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/rt_Robin.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Robin.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/rt_Robin.h b/core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Robin.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/rt_Robin.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Robin.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/rt_Semaphore.c b/core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Semaphore.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/rt_Semaphore.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Semaphore.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/rt_Semaphore.h b/core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Semaphore.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/rt_Semaphore.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Semaphore.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/rt_System.c b/core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_System.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/rt_System.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_System.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/rt_System.h b/core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_System.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/rt_System.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_System.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/rt_Task.c b/core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Task.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/rt_Task.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Task.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/rt_Task.h b/core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Task.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/rt_Task.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Task.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/rt_Time.c b/core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Time.c
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/rt_Time.c
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Time.c
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/rt_Time.h b/core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Time.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/rt_Time.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_Time.h
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/rt_TypeDef.h b/core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_TypeDef.h
similarity index 100%
rename from libraries/rtos/rtx/TARGET_CORTEX_M/rt_TypeDef.h
rename to core/mbed-rtos/rtx/TARGET_CORTEX_M/rt_TypeDef.h