diff --git a/manifests/skyconnect_bootloader-uart-xmodem.yaml b/manifests/nabucasa/skyconnect_bootloader-uart-xmodem.yaml
similarity index 100%
rename from manifests/skyconnect_bootloader-uart-xmodem.yaml
rename to manifests/nabucasa/skyconnect_bootloader-uart-xmodem.yaml
diff --git a/manifests/skyconnect_firmware-eraser.yaml b/manifests/nabucasa/skyconnect_firmware-eraser.yaml
similarity index 100%
rename from manifests/skyconnect_firmware-eraser.yaml
rename to manifests/nabucasa/skyconnect_firmware-eraser.yaml
diff --git a/manifests/skyconnect_ncp-uart-hw.yaml b/manifests/nabucasa/skyconnect_ncp-uart-hw.yaml
similarity index 100%
rename from manifests/skyconnect_ncp-uart-hw.yaml
rename to manifests/nabucasa/skyconnect_ncp-uart-hw.yaml
diff --git a/manifests/skyconnect_ot-rcp.yaml b/manifests/nabucasa/skyconnect_ot-rcp.yaml
similarity index 100%
rename from manifests/skyconnect_ot-rcp.yaml
rename to manifests/nabucasa/skyconnect_ot-rcp.yaml
diff --git a/manifests/skyconnect_rcp-uart-802154.yaml b/manifests/nabucasa/skyconnect_rcp-uart-802154.yaml
similarity index 100%
rename from manifests/skyconnect_rcp-uart-802154.yaml
rename to manifests/nabucasa/skyconnect_rcp-uart-802154.yaml
diff --git a/manifests/slusb001a-lr2_zwave_ncp_serial_api_controller.yaml b/manifests/nabucasa/slusb001a-lr2_zwave_ncp_serial_api_controller.yaml
similarity index 100%
rename from manifests/slusb001a-lr2_zwave_ncp_serial_api_controller.yaml
rename to manifests/nabucasa/slusb001a-lr2_zwave_ncp_serial_api_controller.yaml
diff --git a/manifests/slusb001a-lr_zwave_ncp_serial_api_controller.yaml b/manifests/nabucasa/slusb001a-lr_zwave_ncp_serial_api_controller.yaml
similarity index 100%
rename from manifests/slusb001a-lr_zwave_ncp_serial_api_controller.yaml
rename to manifests/nabucasa/slusb001a-lr_zwave_ncp_serial_api_controller.yaml
diff --git a/manifests/slusb001a_zwave_ncp_serial_api_controller.yaml b/manifests/nabucasa/slusb001a_zwave_ncp_serial_api_controller.yaml
similarity index 100%
rename from manifests/slusb001a_zwave_ncp_serial_api_controller.yaml
rename to manifests/nabucasa/slusb001a_zwave_ncp_serial_api_controller.yaml
diff --git a/manifests/yellow_bootloader-uart-xmodem.yaml b/manifests/nabucasa/yellow_bootloader-uart-xmodem.yaml
similarity index 100%
rename from manifests/yellow_bootloader-uart-xmodem.yaml
rename to manifests/nabucasa/yellow_bootloader-uart-xmodem.yaml
diff --git a/manifests/yellow_ncp-uart-hw.yaml b/manifests/nabucasa/yellow_ncp-uart-hw.yaml
similarity index 100%
rename from manifests/yellow_ncp-uart-hw.yaml
rename to manifests/nabucasa/yellow_ncp-uart-hw.yaml
diff --git a/manifests/yellow_ot-rcp.yaml b/manifests/nabucasa/yellow_ot-rcp.yaml
similarity index 100%
rename from manifests/yellow_ot-rcp.yaml
rename to manifests/nabucasa/yellow_ot-rcp.yaml
diff --git a/manifests/yellow_rcp-uart-802154.yaml b/manifests/nabucasa/yellow_rcp-uart-802154.yaml
similarity index 100%
rename from manifests/yellow_rcp-uart-802154.yaml
rename to manifests/nabucasa/yellow_rcp-uart-802154.yaml