@@ -40,16 +40,17 @@
 
 - title: Core Tutorials
   docs:
-   - tutorials/core/getting_started
-   - tutorials/core/getting_started_embedded
-   - tutorials/core/getting_started_simulator
+   - tutorials/core/overview
+   - tutorials/core/first_application_linux
+   - tutorials/core/first_application_rtos
    - tutorials/core/programming_rcl_rclc
    - tutorials/core/microxrcedds_rmw_configuration
 
 - title: Advanced Tutorials
   docs:
    - tutorials/advanced/microros_nuttx_bsp
    - tutorials/advanced/tracing
+   - tutorials/advanced/zephyr_emulator
 
 - title: Demos
   docs:
@@ -59,9 +60,8 @@
    - tutorials/demos/fiware_demo
    - tutorials/demos/complete_demo
 
-- title: Advanced Tutorials with Nuttx
+- title: Nuttx-specific Tutorials
   docs:
-   - tutorials/advanced/nuttx/nuttx_getting_started
    - tutorials/advanced/nuttx/nsh_usb
    - tutorials/advanced/nuttx/nsh_uart
    - tutorials/advanced/nuttx/6lowpan_config
@@ -70,15 +70,7 @@
    - tutorials/advanced/nuttx/add_microros_config
    - tutorials/advanced/nuttx/microros_6lowpan_tutorial
 
-- title: Advanced Tutorials with FreeRTOS
+- title: Getting Started Tutorials with FreeRTOS and Zephyr
   docs:
     - tutorials/advanced/freertos/freertos_getting_started
-
-- title: Advanced Tutorials with Zephyr
-  docs:
     - tutorials/advanced/zephyr/zephyr_getting_started
-    - tutorials/advanced/zephyr/zephyr_emulator
-
-- title: Advanced Tutorials with Linux
-  docs:
-    - tutorials/advanced/linux/linux_getting_started
@@ -3,6 +3,8 @@ title: FreeRTOS Getting Started
 permalink: /docs/tutorials/advanced/freertos/freertos_getting_started/
 ---
 
+**Please note that this tutorial will soon be integrated with [First micro-ROS application on an RTOS](/docs/tutorials/core/first_application_rtos/)!**
+
 This tutorial aims to create a new micro-ROS application on **[Olimex STM32-E407](https://www.olimex.com/Products/ARM/ST/STM32-E407/open-source-hardware)** evaluation board with **[FreeRTOS RTOS](https://www.freertos.org/)**
 
 <div>
 
@@ -3,6 +3,8 @@ title: Zephyr Getting Started
 permalink: /docs/tutorials/advanced/zephyr/zephyr_getting_started/
 ---
 
+**Please note that this tutorial will soon be integrated with [First micro-ROS application on an RTOS](/docs/tutorials/core/first_application_rtos/)!**
+
 
 This tutorial aims to create a new micro-ROS application on **[Olimex STM32-E407](https://www.olimex.com/Products/ARM/ST/STM32-E407/open-source-hardware)** evaluation board with **[Zephyr RTOS](https://www.zephyrproject.org/)**
 
 
@@ -1,6 +1,6 @@
 ---
 title: Zephyr Emulator
-permalink: /docs/tutorials/advanced/zephyr/zephyr_emulator/
+permalink: /docs/tutorials/advanced/zephyr_emulator/
 ---
 
 This tutorial aims to create a new micro-ROS application on with **[Zephyr RTOS](https://www.zephyrproject.org/)** emulator (also known as [Native POSIX](https://docs.zephyrproject.org/latest/boards/posix/native_posix/doc/index.html)).
 
@@ -1,9 +1,10 @@
 ---
-title: Linux Getting Started
-permalink: /docs/tutorials/advanced/linux/linux_getting_started/
+title: First micro-ROS Application on Linux
+permalink: /docs/tutorials/core/first_application_linux/
 ---
 
-This tutorial aims to create a new micro-ROS application on Linux for testing purposes.
+This tutorial teaches you how to create a first micro-ROS application on Linux for testing purposes. In the follow-up tutorial [*First micro-ROS application on an RTOS*](/docs/tutorials/core/first_application_rtos/), you'll learn how to build and bring this application on a microcontroller running the RTOS NuttX, FreeRTOS, or Zephyr.
+
 
 ## Adding a new micro-ROS app