diff --git a/platforms/nuttx/NuttX/CMakeLists.txt b/platforms/nuttx/NuttX/CMakeLists.txt
index 5ab6fa7f84..3f446cf308 100644
--- a/platforms/nuttx/NuttX/CMakeLists.txt
+++ b/platforms/nuttx/NuttX/CMakeLists.txt
@@ -50,7 +50,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/nuttx_copy.stamp
 	)
 
 set(NUTTX_DIR ${CMAKE_CURRENT_BINARY_DIR}/nuttx)
-set(NUTTX_CONFIG_DIR ${PX4_SOURCE_DIR}/nuttx-configs)
+set(NUTTX_CONFIG_DIR ${PX4_SOURCE_DIR}/platforms/nuttx/nuttx-configs)
 
 # copy apps to build directory
 file(RELATIVE_PATH CP_SRC ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/apps)
diff --git a/platforms/nuttx/NuttX/tools/new_nuttx_px_config.sh b/platforms/nuttx/NuttX/tools/new_nuttx_px_config.sh
index 8205823b26..1a24f337ce 100755
--- a/platforms/nuttx/NuttX/tools/new_nuttx_px_config.sh
+++ b/platforms/nuttx/NuttX/tools/new_nuttx_px_config.sh
@@ -60,8 +60,8 @@ fi
 if [ ! -f $BASEDIR/cmake/configs/nuttx_"$oldname"_default.cmake -a ! -f $BASEDIR/cmake/configs/nuttx_"$oldname"_bootloader.cmake ]; then
 	fatal "\"$oldname\" doesn't look like an existing board name (there is neither a $BASEDIR/cmake/configs/nuttx_"$oldname"_default.cmake nor a $BASEDIR/cmake/configs/nuttx_"$oldname"_bootloader.cmake)"
 fi
-if [ ! -d $BASEDIR/nuttx-configs/$oldname ]; then
-	fatal "\"$oldname\" doesn't look like an existing board name (no such directory $BASEDIR/nuttx-configs/$oldname)"
+if [ ! -d $BASEDIR/platforms/nuttx/nuttx-configs/$oldname ]; then
+	fatal "\"$oldname\" doesn't look like an existing board name (no such directory $BASEDIR/platforms/nuttx/nuttx-configs/$oldname)"
 fi
 
 # Does the new name look like a new name?
diff --git a/platforms/nuttx/cmake/px4_impl_os.cmake b/platforms/nuttx/cmake/px4_impl_os.cmake
index d4078f8c91..e3b2fba3c8 100644
--- a/platforms/nuttx/cmake/px4_impl_os.cmake
+++ b/platforms/nuttx/cmake/px4_impl_os.cmake
@@ -239,7 +239,7 @@ function(px4_os_prebuild_targets)
 	add_custom_target(${OUT} DEPENDS nuttx_context uorb_headers)
 
 	# parse nuttx config options for cmake
-	file(STRINGS ${PX4_SOURCE_DIR}/nuttx-configs/${BOARD}/nsh/defconfig ConfigContents)
+	file(STRINGS ${PX4_SOURCE_DIR}/platforms/nuttx/nuttx-configs/${BOARD}/nsh/defconfig ConfigContents)
 	foreach(NameAndValue ${ConfigContents})
 		# Strip leading spaces
 		string(REGEX REPLACE "^[ ]+" "" NameAndValue ${NameAndValue})
diff --git a/nuttx-configs/PX4_Config.mk b/platforms/nuttx/nuttx-configs/PX4_Config.mk
similarity index 100%
rename from nuttx-configs/PX4_Config.mk
rename to platforms/nuttx/nuttx-configs/PX4_Config.mk
diff --git a/nuttx-configs/PX4_Warnings.mk b/platforms/nuttx/nuttx-configs/PX4_Warnings.mk
similarity index 100%
rename from nuttx-configs/PX4_Warnings.mk
rename to platforms/nuttx/nuttx-configs/PX4_Warnings.mk
diff --git a/nuttx-configs/aerocore2/Kconfig b/platforms/nuttx/nuttx-configs/aerocore2/Kconfig
similarity index 100%
rename from nuttx-configs/aerocore2/Kconfig
rename to platforms/nuttx/nuttx-configs/aerocore2/Kconfig
diff --git a/nuttx-configs/aerocore2/include/board.h b/platforms/nuttx/nuttx-configs/aerocore2/include/board.h
similarity index 100%
rename from nuttx-configs/aerocore2/include/board.h
rename to platforms/nuttx/nuttx-configs/aerocore2/include/board.h
diff --git a/nuttx-configs/aerocore2/include/nsh_romfsimg.h b/platforms/nuttx/nuttx-configs/aerocore2/include/nsh_romfsimg.h
similarity index 100%
rename from nuttx-configs/aerocore2/include/nsh_romfsimg.h
rename to platforms/nuttx/nuttx-configs/aerocore2/include/nsh_romfsimg.h
diff --git a/nuttx-configs/aerocore2/nsh/Make.defs b/platforms/nuttx/nuttx-configs/aerocore2/nsh/Make.defs
similarity index 100%
rename from nuttx-configs/aerocore2/nsh/Make.defs
rename to platforms/nuttx/nuttx-configs/aerocore2/nsh/Make.defs
diff --git a/nuttx-configs/aerocore2/nsh/defconfig b/platforms/nuttx/nuttx-configs/aerocore2/nsh/defconfig
similarity index 100%
rename from nuttx-configs/aerocore2/nsh/defconfig
rename to platforms/nuttx/nuttx-configs/aerocore2/nsh/defconfig
diff --git a/nuttx-configs/aerocore2/scripts/ld.script b/platforms/nuttx/nuttx-configs/aerocore2/scripts/ld.script
similarity index 100%
rename from nuttx-configs/aerocore2/scripts/ld.script
rename to platforms/nuttx/nuttx-configs/aerocore2/scripts/ld.script
diff --git a/nuttx-configs/aerocore2/src/Makefile b/platforms/nuttx/nuttx-configs/aerocore2/src/Makefile
similarity index 100%
rename from nuttx-configs/aerocore2/src/Makefile
rename to platforms/nuttx/nuttx-configs/aerocore2/src/Makefile
diff --git a/nuttx-configs/aerocore2/src/empty.c b/platforms/nuttx/nuttx-configs/aerocore2/src/empty.c
similarity index 100%
rename from nuttx-configs/aerocore2/src/empty.c
rename to platforms/nuttx/nuttx-configs/aerocore2/src/empty.c
diff --git a/nuttx-configs/aerofc-v1/Kconfig b/platforms/nuttx/nuttx-configs/aerofc-v1/Kconfig
similarity index 100%
rename from nuttx-configs/aerofc-v1/Kconfig
rename to platforms/nuttx/nuttx-configs/aerofc-v1/Kconfig
diff --git a/nuttx-configs/aerofc-v1/include/board.h b/platforms/nuttx/nuttx-configs/aerofc-v1/include/board.h
similarity index 100%
rename from nuttx-configs/aerofc-v1/include/board.h
rename to platforms/nuttx/nuttx-configs/aerofc-v1/include/board.h
diff --git a/nuttx-configs/aerofc-v1/include/nsh_romfsimg.h b/platforms/nuttx/nuttx-configs/aerofc-v1/include/nsh_romfsimg.h
similarity index 100%
rename from nuttx-configs/aerofc-v1/include/nsh_romfsimg.h
rename to platforms/nuttx/nuttx-configs/aerofc-v1/include/nsh_romfsimg.h
diff --git a/nuttx-configs/aerofc-v1/nsh/Make.defs b/platforms/nuttx/nuttx-configs/aerofc-v1/nsh/Make.defs
similarity index 100%
rename from nuttx-configs/aerofc-v1/nsh/Make.defs
rename to platforms/nuttx/nuttx-configs/aerofc-v1/nsh/Make.defs
diff --git a/nuttx-configs/aerofc-v1/nsh/defconfig b/platforms/nuttx/nuttx-configs/aerofc-v1/nsh/defconfig
similarity index 100%
rename from nuttx-configs/aerofc-v1/nsh/defconfig
rename to platforms/nuttx/nuttx-configs/aerofc-v1/nsh/defconfig
diff --git a/nuttx-configs/aerofc-v1/scripts/ld.script b/platforms/nuttx/nuttx-configs/aerofc-v1/scripts/ld.script
similarity index 100%
rename from nuttx-configs/aerofc-v1/scripts/ld.script
rename to platforms/nuttx/nuttx-configs/aerofc-v1/scripts/ld.script
diff --git a/nuttx-configs/aerofc-v1/src/Makefile b/platforms/nuttx/nuttx-configs/aerofc-v1/src/Makefile
similarity index 100%
rename from nuttx-configs/aerofc-v1/src/Makefile
rename to platforms/nuttx/nuttx-configs/aerofc-v1/src/Makefile
diff --git a/nuttx-configs/aerofc-v1/src/empty.c b/platforms/nuttx/nuttx-configs/aerofc-v1/src/empty.c
similarity index 100%
rename from nuttx-configs/aerofc-v1/src/empty.c
rename to platforms/nuttx/nuttx-configs/aerofc-v1/src/empty.c
diff --git a/nuttx-configs/auav-x21/include/board.h b/platforms/nuttx/nuttx-configs/auav-x21/include/board.h
similarity index 100%
rename from nuttx-configs/auav-x21/include/board.h
rename to platforms/nuttx/nuttx-configs/auav-x21/include/board.h
diff --git a/nuttx-configs/auav-x21/include/nsh_romfsimg.h b/platforms/nuttx/nuttx-configs/auav-x21/include/nsh_romfsimg.h
similarity index 100%
rename from nuttx-configs/auav-x21/include/nsh_romfsimg.h
rename to platforms/nuttx/nuttx-configs/auav-x21/include/nsh_romfsimg.h
diff --git a/nuttx-configs/auav-x21/nsh/Make.defs b/platforms/nuttx/nuttx-configs/auav-x21/nsh/Make.defs
similarity index 100%
rename from nuttx-configs/auav-x21/nsh/Make.defs
rename to platforms/nuttx/nuttx-configs/auav-x21/nsh/Make.defs
diff --git a/nuttx-configs/auav-x21/nsh/defconfig b/platforms/nuttx/nuttx-configs/auav-x21/nsh/defconfig
similarity index 100%
rename from nuttx-configs/auav-x21/nsh/defconfig
rename to platforms/nuttx/nuttx-configs/auav-x21/nsh/defconfig
diff --git a/nuttx-configs/auav-x21/scripts/ld.script b/platforms/nuttx/nuttx-configs/auav-x21/scripts/ld.script
similarity index 100%
rename from nuttx-configs/auav-x21/scripts/ld.script
rename to platforms/nuttx/nuttx-configs/auav-x21/scripts/ld.script
diff --git a/nuttx-configs/auav-x21/src/Makefile b/platforms/nuttx/nuttx-configs/auav-x21/src/Makefile
similarity index 100%
rename from nuttx-configs/auav-x21/src/Makefile
rename to platforms/nuttx/nuttx-configs/auav-x21/src/Makefile
diff --git a/nuttx-configs/auav-x21/src/empty.c b/platforms/nuttx/nuttx-configs/auav-x21/src/empty.c
similarity index 100%
rename from nuttx-configs/auav-x21/src/empty.c
rename to platforms/nuttx/nuttx-configs/auav-x21/src/empty.c
diff --git a/nuttx-configs/crazyflie/include/board.h b/platforms/nuttx/nuttx-configs/crazyflie/include/board.h
similarity index 100%
rename from nuttx-configs/crazyflie/include/board.h
rename to platforms/nuttx/nuttx-configs/crazyflie/include/board.h
diff --git a/nuttx-configs/crazyflie/include/nsh_romfsimg.h b/platforms/nuttx/nuttx-configs/crazyflie/include/nsh_romfsimg.h
similarity index 100%
rename from nuttx-configs/crazyflie/include/nsh_romfsimg.h
rename to platforms/nuttx/nuttx-configs/crazyflie/include/nsh_romfsimg.h
diff --git a/nuttx-configs/crazyflie/nsh/Make.defs b/platforms/nuttx/nuttx-configs/crazyflie/nsh/Make.defs
similarity index 100%
rename from nuttx-configs/crazyflie/nsh/Make.defs
rename to platforms/nuttx/nuttx-configs/crazyflie/nsh/Make.defs
diff --git a/nuttx-configs/crazyflie/nsh/defconfig b/platforms/nuttx/nuttx-configs/crazyflie/nsh/defconfig
similarity index 100%
rename from nuttx-configs/crazyflie/nsh/defconfig
rename to platforms/nuttx/nuttx-configs/crazyflie/nsh/defconfig
diff --git a/nuttx-configs/crazyflie/scripts/ld.script b/platforms/nuttx/nuttx-configs/crazyflie/scripts/ld.script
similarity index 100%
rename from nuttx-configs/crazyflie/scripts/ld.script
rename to platforms/nuttx/nuttx-configs/crazyflie/scripts/ld.script
diff --git a/nuttx-configs/crazyflie/src/Makefile b/platforms/nuttx/nuttx-configs/crazyflie/src/Makefile
similarity index 100%
rename from nuttx-configs/crazyflie/src/Makefile
rename to platforms/nuttx/nuttx-configs/crazyflie/src/Makefile
diff --git a/nuttx-configs/crazyflie/src/empty.c b/platforms/nuttx/nuttx-configs/crazyflie/src/empty.c
similarity index 100%
rename from nuttx-configs/crazyflie/src/empty.c
rename to platforms/nuttx/nuttx-configs/crazyflie/src/empty.c
diff --git a/nuttx-configs/esc35-v1/Kconfig b/platforms/nuttx/nuttx-configs/esc35-v1/Kconfig
similarity index 100%
rename from nuttx-configs/esc35-v1/Kconfig
rename to platforms/nuttx/nuttx-configs/esc35-v1/Kconfig
diff --git a/nuttx-configs/esc35-v1/include/README.txt b/platforms/nuttx/nuttx-configs/esc35-v1/include/README.txt
similarity index 100%
rename from nuttx-configs/esc35-v1/include/README.txt
rename to platforms/nuttx/nuttx-configs/esc35-v1/include/README.txt
diff --git a/nuttx-configs/esc35-v1/include/board.h b/platforms/nuttx/nuttx-configs/esc35-v1/include/board.h
similarity index 100%
rename from nuttx-configs/esc35-v1/include/board.h
rename to platforms/nuttx/nuttx-configs/esc35-v1/include/board.h
diff --git a/nuttx-configs/esc35-v1/nsh/Make.defs b/platforms/nuttx/nuttx-configs/esc35-v1/nsh/Make.defs
similarity index 100%
rename from nuttx-configs/esc35-v1/nsh/Make.defs
rename to platforms/nuttx/nuttx-configs/esc35-v1/nsh/Make.defs
diff --git a/nuttx-configs/esc35-v1/nsh/defconfig b/platforms/nuttx/nuttx-configs/esc35-v1/nsh/defconfig
similarity index 100%
rename from nuttx-configs/esc35-v1/nsh/defconfig
rename to platforms/nuttx/nuttx-configs/esc35-v1/nsh/defconfig
diff --git a/nuttx-configs/esc35-v1/scripts/ld.script b/platforms/nuttx/nuttx-configs/esc35-v1/scripts/ld.script
similarity index 100%
rename from nuttx-configs/esc35-v1/scripts/ld.script
rename to platforms/nuttx/nuttx-configs/esc35-v1/scripts/ld.script
diff --git a/nuttx-configs/esc35-v1/src/Makefile b/platforms/nuttx/nuttx-configs/esc35-v1/src/Makefile
similarity index 100%
rename from nuttx-configs/esc35-v1/src/Makefile
rename to platforms/nuttx/nuttx-configs/esc35-v1/src/Makefile
diff --git a/nuttx-configs/esc35-v1/src/empty.c b/platforms/nuttx/nuttx-configs/esc35-v1/src/empty.c
similarity index 100%
rename from nuttx-configs/esc35-v1/src/empty.c
rename to platforms/nuttx/nuttx-configs/esc35-v1/src/empty.c
diff --git a/nuttx-configs/mindpx-v2/include/board.h b/platforms/nuttx/nuttx-configs/mindpx-v2/include/board.h
similarity index 100%
rename from nuttx-configs/mindpx-v2/include/board.h
rename to platforms/nuttx/nuttx-configs/mindpx-v2/include/board.h
diff --git a/nuttx-configs/mindpx-v2/include/nsh_romfsimg.h b/platforms/nuttx/nuttx-configs/mindpx-v2/include/nsh_romfsimg.h
similarity index 100%
rename from nuttx-configs/mindpx-v2/include/nsh_romfsimg.h
rename to platforms/nuttx/nuttx-configs/mindpx-v2/include/nsh_romfsimg.h
diff --git a/nuttx-configs/mindpx-v2/nsh/Make.defs b/platforms/nuttx/nuttx-configs/mindpx-v2/nsh/Make.defs
similarity index 100%
rename from nuttx-configs/mindpx-v2/nsh/Make.defs
rename to platforms/nuttx/nuttx-configs/mindpx-v2/nsh/Make.defs
diff --git a/nuttx-configs/mindpx-v2/nsh/defconfig b/platforms/nuttx/nuttx-configs/mindpx-v2/nsh/defconfig
similarity index 100%
rename from nuttx-configs/mindpx-v2/nsh/defconfig
rename to platforms/nuttx/nuttx-configs/mindpx-v2/nsh/defconfig
diff --git a/nuttx-configs/mindpx-v2/scripts/ld.script b/platforms/nuttx/nuttx-configs/mindpx-v2/scripts/ld.script
similarity index 100%
rename from nuttx-configs/mindpx-v2/scripts/ld.script
rename to platforms/nuttx/nuttx-configs/mindpx-v2/scripts/ld.script
diff --git a/nuttx-configs/mindpx-v2/src/Makefile b/platforms/nuttx/nuttx-configs/mindpx-v2/src/Makefile
similarity index 100%
rename from nuttx-configs/mindpx-v2/src/Makefile
rename to platforms/nuttx/nuttx-configs/mindpx-v2/src/Makefile
diff --git a/nuttx-configs/mindpx-v2/src/empty.c b/platforms/nuttx/nuttx-configs/mindpx-v2/src/empty.c
similarity index 100%
rename from nuttx-configs/mindpx-v2/src/empty.c
rename to platforms/nuttx/nuttx-configs/mindpx-v2/src/empty.c
diff --git a/nuttx-configs/nxphlite-v3/Kconfig b/platforms/nuttx/nuttx-configs/nxphlite-v3/Kconfig
similarity index 100%
rename from nuttx-configs/nxphlite-v3/Kconfig
rename to platforms/nuttx/nuttx-configs/nxphlite-v3/Kconfig
diff --git a/nuttx-configs/nxphlite-v3/include/board.h b/platforms/nuttx/nuttx-configs/nxphlite-v3/include/board.h
similarity index 100%
rename from nuttx-configs/nxphlite-v3/include/board.h
rename to platforms/nuttx/nuttx-configs/nxphlite-v3/include/board.h
diff --git a/nuttx-configs/nxphlite-v3/include/nsh_romfsimg.h b/platforms/nuttx/nuttx-configs/nxphlite-v3/include/nsh_romfsimg.h
similarity index 100%
rename from nuttx-configs/nxphlite-v3/include/nsh_romfsimg.h
rename to platforms/nuttx/nuttx-configs/nxphlite-v3/include/nsh_romfsimg.h
diff --git a/nuttx-configs/nxphlite-v3/nsh/Make.defs b/platforms/nuttx/nuttx-configs/nxphlite-v3/nsh/Make.defs
similarity index 100%
rename from nuttx-configs/nxphlite-v3/nsh/Make.defs
rename to platforms/nuttx/nuttx-configs/nxphlite-v3/nsh/Make.defs
diff --git a/nuttx-configs/nxphlite-v3/nsh/defconfig b/platforms/nuttx/nuttx-configs/nxphlite-v3/nsh/defconfig
similarity index 100%
rename from nuttx-configs/nxphlite-v3/nsh/defconfig
rename to platforms/nuttx/nuttx-configs/nxphlite-v3/nsh/defconfig
diff --git a/nuttx-configs/nxphlite-v3/scripts/ld.script b/platforms/nuttx/nuttx-configs/nxphlite-v3/scripts/ld.script
similarity index 100%
rename from nuttx-configs/nxphlite-v3/scripts/ld.script
rename to platforms/nuttx/nuttx-configs/nxphlite-v3/scripts/ld.script
diff --git a/nuttx-configs/nxphlite-v3/src/Makefile b/platforms/nuttx/nuttx-configs/nxphlite-v3/src/Makefile
similarity index 100%
rename from nuttx-configs/nxphlite-v3/src/Makefile
rename to platforms/nuttx/nuttx-configs/nxphlite-v3/src/Makefile
diff --git a/nuttx-configs/nxphlite-v3/src/empty.c b/platforms/nuttx/nuttx-configs/nxphlite-v3/src/empty.c
similarity index 100%
rename from nuttx-configs/nxphlite-v3/src/empty.c
rename to platforms/nuttx/nuttx-configs/nxphlite-v3/src/empty.c
diff --git a/nuttx-configs/px4-same70xplained-v1/Kconfig b/platforms/nuttx/nuttx-configs/px4-same70xplained-v1/Kconfig
similarity index 100%
rename from nuttx-configs/px4-same70xplained-v1/Kconfig
rename to platforms/nuttx/nuttx-configs/px4-same70xplained-v1/Kconfig
diff --git a/nuttx-configs/px4-same70xplained-v1/include/board.h b/platforms/nuttx/nuttx-configs/px4-same70xplained-v1/include/board.h
similarity index 100%
rename from nuttx-configs/px4-same70xplained-v1/include/board.h
rename to platforms/nuttx/nuttx-configs/px4-same70xplained-v1/include/board.h
diff --git a/nuttx-configs/px4-same70xplained-v1/include/nsh_romfsimg.h b/platforms/nuttx/nuttx-configs/px4-same70xplained-v1/include/nsh_romfsimg.h
similarity index 100%
rename from nuttx-configs/px4-same70xplained-v1/include/nsh_romfsimg.h
rename to platforms/nuttx/nuttx-configs/px4-same70xplained-v1/include/nsh_romfsimg.h
diff --git a/nuttx-configs/px4-same70xplained-v1/nsh/Make.defs b/platforms/nuttx/nuttx-configs/px4-same70xplained-v1/nsh/Make.defs
similarity index 100%
rename from nuttx-configs/px4-same70xplained-v1/nsh/Make.defs
rename to platforms/nuttx/nuttx-configs/px4-same70xplained-v1/nsh/Make.defs
diff --git a/nuttx-configs/px4-same70xplained-v1/nsh/defconfig b/platforms/nuttx/nuttx-configs/px4-same70xplained-v1/nsh/defconfig
similarity index 100%
rename from nuttx-configs/px4-same70xplained-v1/nsh/defconfig
rename to platforms/nuttx/nuttx-configs/px4-same70xplained-v1/nsh/defconfig
diff --git a/nuttx-configs/px4-same70xplained-v1/nsh/setenv.sh b/platforms/nuttx/nuttx-configs/px4-same70xplained-v1/nsh/setenv.sh
similarity index 100%
rename from nuttx-configs/px4-same70xplained-v1/nsh/setenv.sh
rename to platforms/nuttx/nuttx-configs/px4-same70xplained-v1/nsh/setenv.sh
diff --git a/nuttx-configs/px4-same70xplained-v1/scripts/flash-dtcm.ld b/platforms/nuttx/nuttx-configs/px4-same70xplained-v1/scripts/flash-dtcm.ld
similarity index 100%
rename from nuttx-configs/px4-same70xplained-v1/scripts/flash-dtcm.ld
rename to platforms/nuttx/nuttx-configs/px4-same70xplained-v1/scripts/flash-dtcm.ld
diff --git a/nuttx-configs/px4-same70xplained-v1/scripts/flash-sram.ld b/platforms/nuttx/nuttx-configs/px4-same70xplained-v1/scripts/flash-sram.ld
similarity index 100%
rename from nuttx-configs/px4-same70xplained-v1/scripts/flash-sram.ld
rename to platforms/nuttx/nuttx-configs/px4-same70xplained-v1/scripts/flash-sram.ld
diff --git a/nuttx-configs/px4-same70xplained-v1/scripts/gnu-elf.ld b/platforms/nuttx/nuttx-configs/px4-same70xplained-v1/scripts/gnu-elf.ld
similarity index 100%
rename from nuttx-configs/px4-same70xplained-v1/scripts/gnu-elf.ld
rename to platforms/nuttx/nuttx-configs/px4-same70xplained-v1/scripts/gnu-elf.ld
diff --git a/nuttx-configs/px4-same70xplained-v1/scripts/kernel-space.ld b/platforms/nuttx/nuttx-configs/px4-same70xplained-v1/scripts/kernel-space.ld
similarity index 100%
rename from nuttx-configs/px4-same70xplained-v1/scripts/kernel-space.ld
rename to platforms/nuttx/nuttx-configs/px4-same70xplained-v1/scripts/kernel-space.ld
diff --git a/nuttx-configs/px4-same70xplained-v1/scripts/ld.script b/platforms/nuttx/nuttx-configs/px4-same70xplained-v1/scripts/ld.script
similarity index 100%
rename from nuttx-configs/px4-same70xplained-v1/scripts/ld.script
rename to platforms/nuttx/nuttx-configs/px4-same70xplained-v1/scripts/ld.script
diff --git a/nuttx-configs/px4-same70xplained-v1/scripts/memory.ld b/platforms/nuttx/nuttx-configs/px4-same70xplained-v1/scripts/memory.ld
similarity index 100%
rename from nuttx-configs/px4-same70xplained-v1/scripts/memory.ld
rename to platforms/nuttx/nuttx-configs/px4-same70xplained-v1/scripts/memory.ld
diff --git a/nuttx-configs/px4-same70xplained-v1/scripts/user-space.ld b/platforms/nuttx/nuttx-configs/px4-same70xplained-v1/scripts/user-space.ld
similarity index 100%
rename from nuttx-configs/px4-same70xplained-v1/scripts/user-space.ld
rename to platforms/nuttx/nuttx-configs/px4-same70xplained-v1/scripts/user-space.ld
diff --git a/nuttx-configs/px4-same70xplained-v1/src/Makefile b/platforms/nuttx/nuttx-configs/px4-same70xplained-v1/src/Makefile
similarity index 100%
rename from nuttx-configs/px4-same70xplained-v1/src/Makefile
rename to platforms/nuttx/nuttx-configs/px4-same70xplained-v1/src/Makefile
diff --git a/nuttx-configs/px4-same70xplained-v1/src/empty.c b/platforms/nuttx/nuttx-configs/px4-same70xplained-v1/src/empty.c
similarity index 100%
rename from nuttx-configs/px4-same70xplained-v1/src/empty.c
rename to platforms/nuttx/nuttx-configs/px4-same70xplained-v1/src/empty.c
diff --git a/nuttx-configs/px4-stm32f4discovery/include/board.h b/platforms/nuttx/nuttx-configs/px4-stm32f4discovery/include/board.h
similarity index 100%
rename from nuttx-configs/px4-stm32f4discovery/include/board.h
rename to platforms/nuttx/nuttx-configs/px4-stm32f4discovery/include/board.h
diff --git a/nuttx-configs/px4-stm32f4discovery/include/nsh_romfsimg.h b/platforms/nuttx/nuttx-configs/px4-stm32f4discovery/include/nsh_romfsimg.h
similarity index 100%
rename from nuttx-configs/px4-stm32f4discovery/include/nsh_romfsimg.h
rename to platforms/nuttx/nuttx-configs/px4-stm32f4discovery/include/nsh_romfsimg.h
diff --git a/nuttx-configs/px4-stm32f4discovery/nsh/Make.defs b/platforms/nuttx/nuttx-configs/px4-stm32f4discovery/nsh/Make.defs
similarity index 100%
rename from nuttx-configs/px4-stm32f4discovery/nsh/Make.defs
rename to platforms/nuttx/nuttx-configs/px4-stm32f4discovery/nsh/Make.defs
diff --git a/nuttx-configs/px4-stm32f4discovery/nsh/defconfig b/platforms/nuttx/nuttx-configs/px4-stm32f4discovery/nsh/defconfig
similarity index 100%
rename from nuttx-configs/px4-stm32f4discovery/nsh/defconfig
rename to platforms/nuttx/nuttx-configs/px4-stm32f4discovery/nsh/defconfig
diff --git a/nuttx-configs/px4-stm32f4discovery/scripts/ld.script b/platforms/nuttx/nuttx-configs/px4-stm32f4discovery/scripts/ld.script
similarity index 100%
rename from nuttx-configs/px4-stm32f4discovery/scripts/ld.script
rename to platforms/nuttx/nuttx-configs/px4-stm32f4discovery/scripts/ld.script
diff --git a/nuttx-configs/px4-stm32f4discovery/src/Makefile b/platforms/nuttx/nuttx-configs/px4-stm32f4discovery/src/Makefile
similarity index 100%
rename from nuttx-configs/px4-stm32f4discovery/src/Makefile
rename to platforms/nuttx/nuttx-configs/px4-stm32f4discovery/src/Makefile
diff --git a/nuttx-configs/px4-stm32f4discovery/src/empty.c b/platforms/nuttx/nuttx-configs/px4-stm32f4discovery/src/empty.c
similarity index 100%
rename from nuttx-configs/px4-stm32f4discovery/src/empty.c
rename to platforms/nuttx/nuttx-configs/px4-stm32f4discovery/src/empty.c
diff --git a/nuttx-configs/px4cannode-v1/Kconfig b/platforms/nuttx/nuttx-configs/px4cannode-v1/Kconfig
similarity index 100%
rename from nuttx-configs/px4cannode-v1/Kconfig
rename to platforms/nuttx/nuttx-configs/px4cannode-v1/Kconfig
diff --git a/nuttx-configs/px4cannode-v1/include/README.txt b/platforms/nuttx/nuttx-configs/px4cannode-v1/include/README.txt
similarity index 100%
rename from nuttx-configs/px4cannode-v1/include/README.txt
rename to platforms/nuttx/nuttx-configs/px4cannode-v1/include/README.txt
diff --git a/nuttx-configs/px4cannode-v1/include/board.h b/platforms/nuttx/nuttx-configs/px4cannode-v1/include/board.h
similarity index 100%
rename from nuttx-configs/px4cannode-v1/include/board.h
rename to platforms/nuttx/nuttx-configs/px4cannode-v1/include/board.h
diff --git a/nuttx-configs/px4cannode-v1/nsh/Make.defs b/platforms/nuttx/nuttx-configs/px4cannode-v1/nsh/Make.defs
similarity index 100%
rename from nuttx-configs/px4cannode-v1/nsh/Make.defs
rename to platforms/nuttx/nuttx-configs/px4cannode-v1/nsh/Make.defs
diff --git a/nuttx-configs/px4cannode-v1/nsh/defconfig b/platforms/nuttx/nuttx-configs/px4cannode-v1/nsh/defconfig
similarity index 100%
rename from nuttx-configs/px4cannode-v1/nsh/defconfig
rename to platforms/nuttx/nuttx-configs/px4cannode-v1/nsh/defconfig
diff --git a/nuttx-configs/px4cannode-v1/nsh/defconfig.nonsh b/platforms/nuttx/nuttx-configs/px4cannode-v1/nsh/defconfig.nonsh
similarity index 100%
rename from nuttx-configs/px4cannode-v1/nsh/defconfig.nonsh
rename to platforms/nuttx/nuttx-configs/px4cannode-v1/nsh/defconfig.nonsh
diff --git a/nuttx-configs/px4cannode-v1/nsh/defconfig.nsh b/platforms/nuttx/nuttx-configs/px4cannode-v1/nsh/defconfig.nsh
similarity index 100%
rename from nuttx-configs/px4cannode-v1/nsh/defconfig.nsh
rename to platforms/nuttx/nuttx-configs/px4cannode-v1/nsh/defconfig.nsh
diff --git a/nuttx-configs/px4cannode-v1/scripts/ld.script b/platforms/nuttx/nuttx-configs/px4cannode-v1/scripts/ld.script
similarity index 100%
rename from nuttx-configs/px4cannode-v1/scripts/ld.script
rename to platforms/nuttx/nuttx-configs/px4cannode-v1/scripts/ld.script
diff --git a/nuttx-configs/px4cannode-v1/src/Makefile b/platforms/nuttx/nuttx-configs/px4cannode-v1/src/Makefile
similarity index 100%
rename from nuttx-configs/px4cannode-v1/src/Makefile
rename to platforms/nuttx/nuttx-configs/px4cannode-v1/src/Makefile
diff --git a/nuttx-configs/px4cannode-v1/src/empty.c b/platforms/nuttx/nuttx-configs/px4cannode-v1/src/empty.c
similarity index 100%
rename from nuttx-configs/px4cannode-v1/src/empty.c
rename to platforms/nuttx/nuttx-configs/px4cannode-v1/src/empty.c
diff --git a/nuttx-configs/px4esc-v1/Kconfig b/platforms/nuttx/nuttx-configs/px4esc-v1/Kconfig
similarity index 100%
rename from nuttx-configs/px4esc-v1/Kconfig
rename to platforms/nuttx/nuttx-configs/px4esc-v1/Kconfig
diff --git a/nuttx-configs/px4esc-v1/include/README.txt b/platforms/nuttx/nuttx-configs/px4esc-v1/include/README.txt
similarity index 100%
rename from nuttx-configs/px4esc-v1/include/README.txt
rename to platforms/nuttx/nuttx-configs/px4esc-v1/include/README.txt
diff --git a/nuttx-configs/px4esc-v1/include/board.h b/platforms/nuttx/nuttx-configs/px4esc-v1/include/board.h
similarity index 100%
rename from nuttx-configs/px4esc-v1/include/board.h
rename to platforms/nuttx/nuttx-configs/px4esc-v1/include/board.h
diff --git a/nuttx-configs/px4esc-v1/nsh/Make.defs b/platforms/nuttx/nuttx-configs/px4esc-v1/nsh/Make.defs
similarity index 100%
rename from nuttx-configs/px4esc-v1/nsh/Make.defs
rename to platforms/nuttx/nuttx-configs/px4esc-v1/nsh/Make.defs
diff --git a/nuttx-configs/px4esc-v1/nsh/defconfig b/platforms/nuttx/nuttx-configs/px4esc-v1/nsh/defconfig
similarity index 100%
rename from nuttx-configs/px4esc-v1/nsh/defconfig
rename to platforms/nuttx/nuttx-configs/px4esc-v1/nsh/defconfig
diff --git a/nuttx-configs/px4esc-v1/scripts/ld.script b/platforms/nuttx/nuttx-configs/px4esc-v1/scripts/ld.script
similarity index 100%
rename from nuttx-configs/px4esc-v1/scripts/ld.script
rename to platforms/nuttx/nuttx-configs/px4esc-v1/scripts/ld.script
diff --git a/nuttx-configs/px4esc-v1/src/Makefile b/platforms/nuttx/nuttx-configs/px4esc-v1/src/Makefile
similarity index 100%
rename from nuttx-configs/px4esc-v1/src/Makefile
rename to platforms/nuttx/nuttx-configs/px4esc-v1/src/Makefile
diff --git a/nuttx-configs/px4esc-v1/src/empty.c b/platforms/nuttx/nuttx-configs/px4esc-v1/src/empty.c
similarity index 100%
rename from nuttx-configs/px4esc-v1/src/empty.c
rename to platforms/nuttx/nuttx-configs/px4esc-v1/src/empty.c
diff --git a/nuttx-configs/px4flow-v2/Kconfig b/platforms/nuttx/nuttx-configs/px4flow-v2/Kconfig
similarity index 100%
rename from nuttx-configs/px4flow-v2/Kconfig
rename to platforms/nuttx/nuttx-configs/px4flow-v2/Kconfig
diff --git a/nuttx-configs/px4flow-v2/include/README.txt b/platforms/nuttx/nuttx-configs/px4flow-v2/include/README.txt
similarity index 100%
rename from nuttx-configs/px4flow-v2/include/README.txt
rename to platforms/nuttx/nuttx-configs/px4flow-v2/include/README.txt
diff --git a/nuttx-configs/px4flow-v2/include/board.h b/platforms/nuttx/nuttx-configs/px4flow-v2/include/board.h
similarity index 100%
rename from nuttx-configs/px4flow-v2/include/board.h
rename to platforms/nuttx/nuttx-configs/px4flow-v2/include/board.h
diff --git a/nuttx-configs/px4flow-v2/nsh/Make.defs b/platforms/nuttx/nuttx-configs/px4flow-v2/nsh/Make.defs
similarity index 100%
rename from nuttx-configs/px4flow-v2/nsh/Make.defs
rename to platforms/nuttx/nuttx-configs/px4flow-v2/nsh/Make.defs
diff --git a/nuttx-configs/px4flow-v2/nsh/defconfig b/platforms/nuttx/nuttx-configs/px4flow-v2/nsh/defconfig
similarity index 100%
rename from nuttx-configs/px4flow-v2/nsh/defconfig
rename to platforms/nuttx/nuttx-configs/px4flow-v2/nsh/defconfig
diff --git a/nuttx-configs/px4flow-v2/scripts/ld.script b/platforms/nuttx/nuttx-configs/px4flow-v2/scripts/ld.script
similarity index 100%
rename from nuttx-configs/px4flow-v2/scripts/ld.script
rename to platforms/nuttx/nuttx-configs/px4flow-v2/scripts/ld.script
diff --git a/nuttx-configs/px4flow-v2/src/Makefile b/platforms/nuttx/nuttx-configs/px4flow-v2/src/Makefile
similarity index 100%
rename from nuttx-configs/px4flow-v2/src/Makefile
rename to platforms/nuttx/nuttx-configs/px4flow-v2/src/Makefile
diff --git a/nuttx-configs/px4flow-v2/src/empty.c b/platforms/nuttx/nuttx-configs/px4flow-v2/src/empty.c
similarity index 100%
rename from nuttx-configs/px4flow-v2/src/empty.c
rename to platforms/nuttx/nuttx-configs/px4flow-v2/src/empty.c
diff --git a/nuttx-configs/px4fmu-v2/Kconfig b/platforms/nuttx/nuttx-configs/px4fmu-v2/Kconfig
similarity index 100%
rename from nuttx-configs/px4fmu-v2/Kconfig
rename to platforms/nuttx/nuttx-configs/px4fmu-v2/Kconfig
diff --git a/nuttx-configs/px4fmu-v2/include/board.h b/platforms/nuttx/nuttx-configs/px4fmu-v2/include/board.h
similarity index 100%
rename from nuttx-configs/px4fmu-v2/include/board.h
rename to platforms/nuttx/nuttx-configs/px4fmu-v2/include/board.h
diff --git a/nuttx-configs/px4fmu-v2/include/nsh_romfsimg.h b/platforms/nuttx/nuttx-configs/px4fmu-v2/include/nsh_romfsimg.h
similarity index 100%
rename from nuttx-configs/px4fmu-v2/include/nsh_romfsimg.h
rename to platforms/nuttx/nuttx-configs/px4fmu-v2/include/nsh_romfsimg.h
diff --git a/nuttx-configs/px4fmu-v2/nsh/Make.defs b/platforms/nuttx/nuttx-configs/px4fmu-v2/nsh/Make.defs
similarity index 100%
rename from nuttx-configs/px4fmu-v2/nsh/Make.defs
rename to platforms/nuttx/nuttx-configs/px4fmu-v2/nsh/Make.defs
diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/platforms/nuttx/nuttx-configs/px4fmu-v2/nsh/defconfig
similarity index 100%
rename from nuttx-configs/px4fmu-v2/nsh/defconfig
rename to platforms/nuttx/nuttx-configs/px4fmu-v2/nsh/defconfig
diff --git a/nuttx-configs/px4fmu-v2/scripts/ld.script b/platforms/nuttx/nuttx-configs/px4fmu-v2/scripts/ld.script
similarity index 100%
rename from nuttx-configs/px4fmu-v2/scripts/ld.script
rename to platforms/nuttx/nuttx-configs/px4fmu-v2/scripts/ld.script
diff --git a/nuttx-configs/px4fmu-v2/scripts/ld_full.script b/platforms/nuttx/nuttx-configs/px4fmu-v2/scripts/ld_full.script
similarity index 100%
rename from nuttx-configs/px4fmu-v2/scripts/ld_full.script
rename to platforms/nuttx/nuttx-configs/px4fmu-v2/scripts/ld_full.script
diff --git a/nuttx-configs/px4fmu-v2/src/Makefile b/platforms/nuttx/nuttx-configs/px4fmu-v2/src/Makefile
similarity index 100%
rename from nuttx-configs/px4fmu-v2/src/Makefile
rename to platforms/nuttx/nuttx-configs/px4fmu-v2/src/Makefile
diff --git a/nuttx-configs/px4fmu-v2/src/empty.c b/platforms/nuttx/nuttx-configs/px4fmu-v2/src/empty.c
similarity index 100%
rename from nuttx-configs/px4fmu-v2/src/empty.c
rename to platforms/nuttx/nuttx-configs/px4fmu-v2/src/empty.c
diff --git a/nuttx-configs/px4fmu-v4/include/board.h b/platforms/nuttx/nuttx-configs/px4fmu-v4/include/board.h
similarity index 100%
rename from nuttx-configs/px4fmu-v4/include/board.h
rename to platforms/nuttx/nuttx-configs/px4fmu-v4/include/board.h
diff --git a/nuttx-configs/px4fmu-v4/include/nsh_romfsimg.h b/platforms/nuttx/nuttx-configs/px4fmu-v4/include/nsh_romfsimg.h
similarity index 100%
rename from nuttx-configs/px4fmu-v4/include/nsh_romfsimg.h
rename to platforms/nuttx/nuttx-configs/px4fmu-v4/include/nsh_romfsimg.h
diff --git a/nuttx-configs/px4fmu-v4/nsh/Make.defs b/platforms/nuttx/nuttx-configs/px4fmu-v4/nsh/Make.defs
similarity index 100%
rename from nuttx-configs/px4fmu-v4/nsh/Make.defs
rename to platforms/nuttx/nuttx-configs/px4fmu-v4/nsh/Make.defs
diff --git a/nuttx-configs/px4fmu-v4/nsh/defconfig b/platforms/nuttx/nuttx-configs/px4fmu-v4/nsh/defconfig
similarity index 100%
rename from nuttx-configs/px4fmu-v4/nsh/defconfig
rename to platforms/nuttx/nuttx-configs/px4fmu-v4/nsh/defconfig
diff --git a/nuttx-configs/px4fmu-v4/scripts/ld.script b/platforms/nuttx/nuttx-configs/px4fmu-v4/scripts/ld.script
similarity index 100%
rename from nuttx-configs/px4fmu-v4/scripts/ld.script
rename to platforms/nuttx/nuttx-configs/px4fmu-v4/scripts/ld.script
diff --git a/nuttx-configs/px4fmu-v4/src/Makefile b/platforms/nuttx/nuttx-configs/px4fmu-v4/src/Makefile
similarity index 100%
rename from nuttx-configs/px4fmu-v4/src/Makefile
rename to platforms/nuttx/nuttx-configs/px4fmu-v4/src/Makefile
diff --git a/nuttx-configs/px4fmu-v4/src/empty.c b/platforms/nuttx/nuttx-configs/px4fmu-v4/src/empty.c
similarity index 100%
rename from nuttx-configs/px4fmu-v4/src/empty.c
rename to platforms/nuttx/nuttx-configs/px4fmu-v4/src/empty.c
diff --git a/nuttx-configs/px4fmu-v4pro/Kconfig b/platforms/nuttx/nuttx-configs/px4fmu-v4pro/Kconfig
similarity index 100%
rename from nuttx-configs/px4fmu-v4pro/Kconfig
rename to platforms/nuttx/nuttx-configs/px4fmu-v4pro/Kconfig
diff --git a/nuttx-configs/px4fmu-v4pro/include/board.h b/platforms/nuttx/nuttx-configs/px4fmu-v4pro/include/board.h
similarity index 100%
rename from nuttx-configs/px4fmu-v4pro/include/board.h
rename to platforms/nuttx/nuttx-configs/px4fmu-v4pro/include/board.h
diff --git a/nuttx-configs/px4fmu-v4pro/include/nsh_romfsimg.h b/platforms/nuttx/nuttx-configs/px4fmu-v4pro/include/nsh_romfsimg.h
similarity index 100%
rename from nuttx-configs/px4fmu-v4pro/include/nsh_romfsimg.h
rename to platforms/nuttx/nuttx-configs/px4fmu-v4pro/include/nsh_romfsimg.h
diff --git a/nuttx-configs/px4fmu-v4pro/nsh/Make.defs b/platforms/nuttx/nuttx-configs/px4fmu-v4pro/nsh/Make.defs
similarity index 100%
rename from nuttx-configs/px4fmu-v4pro/nsh/Make.defs
rename to platforms/nuttx/nuttx-configs/px4fmu-v4pro/nsh/Make.defs
diff --git a/nuttx-configs/px4fmu-v4pro/nsh/defconfig b/platforms/nuttx/nuttx-configs/px4fmu-v4pro/nsh/defconfig
similarity index 100%
rename from nuttx-configs/px4fmu-v4pro/nsh/defconfig
rename to platforms/nuttx/nuttx-configs/px4fmu-v4pro/nsh/defconfig
diff --git a/nuttx-configs/px4fmu-v4pro/scripts/ld.script b/platforms/nuttx/nuttx-configs/px4fmu-v4pro/scripts/ld.script
similarity index 100%
rename from nuttx-configs/px4fmu-v4pro/scripts/ld.script
rename to platforms/nuttx/nuttx-configs/px4fmu-v4pro/scripts/ld.script
diff --git a/nuttx-configs/px4fmu-v4pro/src/Makefile b/platforms/nuttx/nuttx-configs/px4fmu-v4pro/src/Makefile
similarity index 100%
rename from nuttx-configs/px4fmu-v4pro/src/Makefile
rename to platforms/nuttx/nuttx-configs/px4fmu-v4pro/src/Makefile
diff --git a/nuttx-configs/px4fmu-v4pro/src/empty.c b/platforms/nuttx/nuttx-configs/px4fmu-v4pro/src/empty.c
similarity index 100%
rename from nuttx-configs/px4fmu-v4pro/src/empty.c
rename to platforms/nuttx/nuttx-configs/px4fmu-v4pro/src/empty.c
diff --git a/nuttx-configs/px4fmu-v5/Kconfig b/platforms/nuttx/nuttx-configs/px4fmu-v5/Kconfig
similarity index 100%
rename from nuttx-configs/px4fmu-v5/Kconfig
rename to platforms/nuttx/nuttx-configs/px4fmu-v5/Kconfig
diff --git a/nuttx-configs/px4fmu-v5/include/board.h b/platforms/nuttx/nuttx-configs/px4fmu-v5/include/board.h
similarity index 100%
rename from nuttx-configs/px4fmu-v5/include/board.h
rename to platforms/nuttx/nuttx-configs/px4fmu-v5/include/board.h
diff --git a/nuttx-configs/px4fmu-v5/include/nsh_romfsimg.h b/platforms/nuttx/nuttx-configs/px4fmu-v5/include/nsh_romfsimg.h
similarity index 100%
rename from nuttx-configs/px4fmu-v5/include/nsh_romfsimg.h
rename to platforms/nuttx/nuttx-configs/px4fmu-v5/include/nsh_romfsimg.h
diff --git a/nuttx-configs/px4fmu-v5/nsh/Make.defs b/platforms/nuttx/nuttx-configs/px4fmu-v5/nsh/Make.defs
similarity index 100%
rename from nuttx-configs/px4fmu-v5/nsh/Make.defs
rename to platforms/nuttx/nuttx-configs/px4fmu-v5/nsh/Make.defs
diff --git a/nuttx-configs/px4fmu-v5/nsh/defconfig b/platforms/nuttx/nuttx-configs/px4fmu-v5/nsh/defconfig
similarity index 100%
rename from nuttx-configs/px4fmu-v5/nsh/defconfig
rename to platforms/nuttx/nuttx-configs/px4fmu-v5/nsh/defconfig
diff --git a/nuttx-configs/px4fmu-v5/scripts/ld.script b/platforms/nuttx/nuttx-configs/px4fmu-v5/scripts/ld.script
similarity index 100%
rename from nuttx-configs/px4fmu-v5/scripts/ld.script
rename to platforms/nuttx/nuttx-configs/px4fmu-v5/scripts/ld.script
diff --git a/nuttx-configs/px4fmu-v5/src/Makefile b/platforms/nuttx/nuttx-configs/px4fmu-v5/src/Makefile
similarity index 100%
rename from nuttx-configs/px4fmu-v5/src/Makefile
rename to platforms/nuttx/nuttx-configs/px4fmu-v5/src/Makefile
diff --git a/nuttx-configs/px4fmu-v5/src/empty.c b/platforms/nuttx/nuttx-configs/px4fmu-v5/src/empty.c
similarity index 100%
rename from nuttx-configs/px4fmu-v5/src/empty.c
rename to platforms/nuttx/nuttx-configs/px4fmu-v5/src/empty.c
diff --git a/nuttx-configs/px4io-v2/include/board.h b/platforms/nuttx/nuttx-configs/px4io-v2/include/board.h
similarity index 100%
rename from nuttx-configs/px4io-v2/include/board.h
rename to platforms/nuttx/nuttx-configs/px4io-v2/include/board.h
diff --git a/nuttx-configs/px4io-v2/nsh/Make.defs b/platforms/nuttx/nuttx-configs/px4io-v2/nsh/Make.defs
similarity index 100%
rename from nuttx-configs/px4io-v2/nsh/Make.defs
rename to platforms/nuttx/nuttx-configs/px4io-v2/nsh/Make.defs
diff --git a/nuttx-configs/px4io-v2/nsh/defconfig b/platforms/nuttx/nuttx-configs/px4io-v2/nsh/defconfig
similarity index 100%
rename from nuttx-configs/px4io-v2/nsh/defconfig
rename to platforms/nuttx/nuttx-configs/px4io-v2/nsh/defconfig
diff --git a/nuttx-configs/px4io-v2/scripts/ld.script b/platforms/nuttx/nuttx-configs/px4io-v2/scripts/ld.script
similarity index 100%
rename from nuttx-configs/px4io-v2/scripts/ld.script
rename to platforms/nuttx/nuttx-configs/px4io-v2/scripts/ld.script
diff --git a/nuttx-configs/px4io-v2/src/Makefile b/platforms/nuttx/nuttx-configs/px4io-v2/src/Makefile
similarity index 100%
rename from nuttx-configs/px4io-v2/src/Makefile
rename to platforms/nuttx/nuttx-configs/px4io-v2/src/Makefile
diff --git a/nuttx-configs/px4io-v2/src/empty.c b/platforms/nuttx/nuttx-configs/px4io-v2/src/empty.c
similarity index 100%
rename from nuttx-configs/px4io-v2/src/empty.c
rename to platforms/nuttx/nuttx-configs/px4io-v2/src/empty.c
diff --git a/nuttx-configs/px4nucleoF767ZI-v1/Kconfig b/platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/Kconfig
similarity index 100%
rename from nuttx-configs/px4nucleoF767ZI-v1/Kconfig
rename to platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/Kconfig
diff --git a/nuttx-configs/px4nucleoF767ZI-v1/include/board.h b/platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/include/board.h
similarity index 100%
rename from nuttx-configs/px4nucleoF767ZI-v1/include/board.h
rename to platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/include/board.h
diff --git a/nuttx-configs/px4nucleoF767ZI-v1/include/nsh_romfsimg.h b/platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/include/nsh_romfsimg.h
similarity index 100%
rename from nuttx-configs/px4nucleoF767ZI-v1/include/nsh_romfsimg.h
rename to platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/include/nsh_romfsimg.h
diff --git a/nuttx-configs/px4nucleoF767ZI-v1/nsh/Make.defs b/platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/nsh/Make.defs
similarity index 100%
rename from nuttx-configs/px4nucleoF767ZI-v1/nsh/Make.defs
rename to platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/nsh/Make.defs
diff --git a/nuttx-configs/px4nucleoF767ZI-v1/nsh/defconfig b/platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/nsh/defconfig
similarity index 100%
rename from nuttx-configs/px4nucleoF767ZI-v1/nsh/defconfig
rename to platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/nsh/defconfig
diff --git a/nuttx-configs/px4nucleoF767ZI-v1/scripts/ld.script b/platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/scripts/ld.script
similarity index 100%
rename from nuttx-configs/px4nucleoF767ZI-v1/scripts/ld.script
rename to platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/scripts/ld.script
diff --git a/nuttx-configs/px4nucleoF767ZI-v1/src/Makefile b/platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/src/Makefile
similarity index 100%
rename from nuttx-configs/px4nucleoF767ZI-v1/src/Makefile
rename to platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/src/Makefile
diff --git a/nuttx-configs/px4nucleoF767ZI-v1/src/empty.c b/platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/src/empty.c
similarity index 100%
rename from nuttx-configs/px4nucleoF767ZI-v1/src/empty.c
rename to platforms/nuttx/nuttx-configs/px4nucleoF767ZI-v1/src/empty.c
diff --git a/nuttx-configs/s2740vc-v1/Kconfig b/platforms/nuttx/nuttx-configs/s2740vc-v1/Kconfig
similarity index 100%
rename from nuttx-configs/s2740vc-v1/Kconfig
rename to platforms/nuttx/nuttx-configs/s2740vc-v1/Kconfig
diff --git a/nuttx-configs/s2740vc-v1/include/README.txt b/platforms/nuttx/nuttx-configs/s2740vc-v1/include/README.txt
similarity index 100%
rename from nuttx-configs/s2740vc-v1/include/README.txt
rename to platforms/nuttx/nuttx-configs/s2740vc-v1/include/README.txt
diff --git a/nuttx-configs/s2740vc-v1/include/board.h b/platforms/nuttx/nuttx-configs/s2740vc-v1/include/board.h
similarity index 100%
rename from nuttx-configs/s2740vc-v1/include/board.h
rename to platforms/nuttx/nuttx-configs/s2740vc-v1/include/board.h
diff --git a/nuttx-configs/s2740vc-v1/nsh/IMPORTANT_README.txt b/platforms/nuttx/nuttx-configs/s2740vc-v1/nsh/IMPORTANT_README.txt
similarity index 100%
rename from nuttx-configs/s2740vc-v1/nsh/IMPORTANT_README.txt
rename to platforms/nuttx/nuttx-configs/s2740vc-v1/nsh/IMPORTANT_README.txt
diff --git a/nuttx-configs/s2740vc-v1/nsh/Make.defs b/platforms/nuttx/nuttx-configs/s2740vc-v1/nsh/Make.defs
similarity index 100%
rename from nuttx-configs/s2740vc-v1/nsh/Make.defs
rename to platforms/nuttx/nuttx-configs/s2740vc-v1/nsh/Make.defs
diff --git a/nuttx-configs/s2740vc-v1/nsh/defconfig b/platforms/nuttx/nuttx-configs/s2740vc-v1/nsh/defconfig
similarity index 100%
rename from nuttx-configs/s2740vc-v1/nsh/defconfig
rename to platforms/nuttx/nuttx-configs/s2740vc-v1/nsh/defconfig
diff --git a/nuttx-configs/s2740vc-v1/scripts/ld.script b/platforms/nuttx/nuttx-configs/s2740vc-v1/scripts/ld.script
similarity index 100%
rename from nuttx-configs/s2740vc-v1/scripts/ld.script
rename to platforms/nuttx/nuttx-configs/s2740vc-v1/scripts/ld.script
diff --git a/nuttx-configs/s2740vc-v1/src/Makefile b/platforms/nuttx/nuttx-configs/s2740vc-v1/src/Makefile
similarity index 100%
rename from nuttx-configs/s2740vc-v1/src/Makefile
rename to platforms/nuttx/nuttx-configs/s2740vc-v1/src/Makefile
diff --git a/nuttx-configs/s2740vc-v1/src/empty.c b/platforms/nuttx/nuttx-configs/s2740vc-v1/src/empty.c
similarity index 100%
rename from nuttx-configs/s2740vc-v1/src/empty.c
rename to platforms/nuttx/nuttx-configs/s2740vc-v1/src/empty.c
diff --git a/nuttx-configs/tap-v1/include/board.h b/platforms/nuttx/nuttx-configs/tap-v1/include/board.h
similarity index 100%
rename from nuttx-configs/tap-v1/include/board.h
rename to platforms/nuttx/nuttx-configs/tap-v1/include/board.h
diff --git a/nuttx-configs/tap-v1/include/nsh_romfsimg.h b/platforms/nuttx/nuttx-configs/tap-v1/include/nsh_romfsimg.h
similarity index 100%
rename from nuttx-configs/tap-v1/include/nsh_romfsimg.h
rename to platforms/nuttx/nuttx-configs/tap-v1/include/nsh_romfsimg.h
diff --git a/nuttx-configs/tap-v1/nsh/Make.defs b/platforms/nuttx/nuttx-configs/tap-v1/nsh/Make.defs
similarity index 100%
rename from nuttx-configs/tap-v1/nsh/Make.defs
rename to platforms/nuttx/nuttx-configs/tap-v1/nsh/Make.defs
diff --git a/nuttx-configs/tap-v1/nsh/defconfig b/platforms/nuttx/nuttx-configs/tap-v1/nsh/defconfig
similarity index 100%
rename from nuttx-configs/tap-v1/nsh/defconfig
rename to platforms/nuttx/nuttx-configs/tap-v1/nsh/defconfig
diff --git a/nuttx-configs/tap-v1/scripts/ld.script b/platforms/nuttx/nuttx-configs/tap-v1/scripts/ld.script
similarity index 100%
rename from nuttx-configs/tap-v1/scripts/ld.script
rename to platforms/nuttx/nuttx-configs/tap-v1/scripts/ld.script
diff --git a/nuttx-configs/tap-v1/src/Makefile b/platforms/nuttx/nuttx-configs/tap-v1/src/Makefile
similarity index 100%
rename from nuttx-configs/tap-v1/src/Makefile
rename to platforms/nuttx/nuttx-configs/tap-v1/src/Makefile
diff --git a/nuttx-configs/tap-v1/src/empty.c b/platforms/nuttx/nuttx-configs/tap-v1/src/empty.c
similarity index 100%
rename from nuttx-configs/tap-v1/src/empty.c
rename to platforms/nuttx/nuttx-configs/tap-v1/src/empty.c
diff --git a/nuttx-configs/zubaxgnss-v1/Kconfig b/platforms/nuttx/nuttx-configs/zubaxgnss-v1/Kconfig
similarity index 100%
rename from nuttx-configs/zubaxgnss-v1/Kconfig
rename to platforms/nuttx/nuttx-configs/zubaxgnss-v1/Kconfig
diff --git a/nuttx-configs/zubaxgnss-v1/include/README.txt b/platforms/nuttx/nuttx-configs/zubaxgnss-v1/include/README.txt
similarity index 100%
rename from nuttx-configs/zubaxgnss-v1/include/README.txt
rename to platforms/nuttx/nuttx-configs/zubaxgnss-v1/include/README.txt
diff --git a/nuttx-configs/zubaxgnss-v1/include/board.h b/platforms/nuttx/nuttx-configs/zubaxgnss-v1/include/board.h
similarity index 100%
rename from nuttx-configs/zubaxgnss-v1/include/board.h
rename to platforms/nuttx/nuttx-configs/zubaxgnss-v1/include/board.h
diff --git a/nuttx-configs/zubaxgnss-v1/nsh/Make.defs b/platforms/nuttx/nuttx-configs/zubaxgnss-v1/nsh/Make.defs
similarity index 100%
rename from nuttx-configs/zubaxgnss-v1/nsh/Make.defs
rename to platforms/nuttx/nuttx-configs/zubaxgnss-v1/nsh/Make.defs
diff --git a/nuttx-configs/zubaxgnss-v1/nsh/defconfig b/platforms/nuttx/nuttx-configs/zubaxgnss-v1/nsh/defconfig
similarity index 100%
rename from nuttx-configs/zubaxgnss-v1/nsh/defconfig
rename to platforms/nuttx/nuttx-configs/zubaxgnss-v1/nsh/defconfig
diff --git a/nuttx-configs/zubaxgnss-v1/scripts/ld.script b/platforms/nuttx/nuttx-configs/zubaxgnss-v1/scripts/ld.script
similarity index 100%
rename from nuttx-configs/zubaxgnss-v1/scripts/ld.script
rename to platforms/nuttx/nuttx-configs/zubaxgnss-v1/scripts/ld.script
diff --git a/nuttx-configs/zubaxgnss-v1/src/Makefile b/platforms/nuttx/nuttx-configs/zubaxgnss-v1/src/Makefile
similarity index 100%
rename from nuttx-configs/zubaxgnss-v1/src/Makefile
rename to platforms/nuttx/nuttx-configs/zubaxgnss-v1/src/Makefile
diff --git a/nuttx-configs/zubaxgnss-v1/src/empty.c b/platforms/nuttx/nuttx-configs/zubaxgnss-v1/src/empty.c
similarity index 100%
rename from nuttx-configs/zubaxgnss-v1/src/empty.c
rename to platforms/nuttx/nuttx-configs/zubaxgnss-v1/src/empty.c