diff --git a/non_catalog_apps/air_arkanoid/application.fam b/base_pack/air_arkanoid/application.fam
similarity index 100%
rename from non_catalog_apps/air_arkanoid/application.fam
rename to base_pack/air_arkanoid/application.fam
diff --git a/non_catalog_apps/air_arkanoid/assets/sprites/logo_air.fxbm b/base_pack/air_arkanoid/assets/sprites/logo_air.fxbm
similarity index 100%
rename from non_catalog_apps/air_arkanoid/assets/sprites/logo_air.fxbm
rename to base_pack/air_arkanoid/assets/sprites/logo_air.fxbm
diff --git a/non_catalog_apps/air_arkanoid/assets/sprites/logo_arkanoid.fxbm b/base_pack/air_arkanoid/assets/sprites/logo_arkanoid.fxbm
similarity index 100%
rename from non_catalog_apps/air_arkanoid/assets/sprites/logo_arkanoid.fxbm
rename to base_pack/air_arkanoid/assets/sprites/logo_arkanoid.fxbm
diff --git a/non_catalog_apps/air_arkanoid/engine/LICENSE b/base_pack/air_arkanoid/engine/LICENSE
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/LICENSE
rename to base_pack/air_arkanoid/engine/LICENSE
diff --git a/non_catalog_apps/air_arkanoid/engine/README.md b/base_pack/air_arkanoid/engine/README.md
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/README.md
rename to base_pack/air_arkanoid/engine/README.md
diff --git a/non_catalog_apps/air_arkanoid/engine/canvas.c b/base_pack/air_arkanoid/engine/canvas.c
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/canvas.c
rename to base_pack/air_arkanoid/engine/canvas.c
diff --git a/non_catalog_apps/air_arkanoid/engine/canvas.h b/base_pack/air_arkanoid/engine/canvas.h
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/canvas.h
rename to base_pack/air_arkanoid/engine/canvas.h
diff --git a/non_catalog_apps/air_arkanoid/engine/clock_timer.c b/base_pack/air_arkanoid/engine/clock_timer.c
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/clock_timer.c
rename to base_pack/air_arkanoid/engine/clock_timer.c
diff --git a/non_catalog_apps/air_arkanoid/engine/clock_timer.h b/base_pack/air_arkanoid/engine/clock_timer.h
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/clock_timer.h
rename to base_pack/air_arkanoid/engine/clock_timer.h
diff --git a/non_catalog_apps/air_arkanoid/engine/engine.h b/base_pack/air_arkanoid/engine/engine.h
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/engine.h
rename to base_pack/air_arkanoid/engine/engine.h
diff --git a/non_catalog_apps/air_arkanoid/engine/entity.c b/base_pack/air_arkanoid/engine/entity.c
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/entity.c
rename to base_pack/air_arkanoid/engine/entity.c
diff --git a/non_catalog_apps/air_arkanoid/engine/entity.h b/base_pack/air_arkanoid/engine/entity.h
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/entity.h
rename to base_pack/air_arkanoid/engine/entity.h
diff --git a/non_catalog_apps/air_arkanoid/engine/entity_i.h b/base_pack/air_arkanoid/engine/entity_i.h
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/entity_i.h
rename to base_pack/air_arkanoid/engine/entity_i.h
diff --git a/non_catalog_apps/air_arkanoid/engine/game_engine.c b/base_pack/air_arkanoid/engine/game_engine.c
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/game_engine.c
rename to base_pack/air_arkanoid/engine/game_engine.c
diff --git a/non_catalog_apps/air_arkanoid/engine/game_engine.h b/base_pack/air_arkanoid/engine/game_engine.h
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/game_engine.h
rename to base_pack/air_arkanoid/engine/game_engine.h
diff --git a/non_catalog_apps/air_arkanoid/engine/game_manager.c b/base_pack/air_arkanoid/engine/game_manager.c
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/game_manager.c
rename to base_pack/air_arkanoid/engine/game_manager.c
diff --git a/non_catalog_apps/air_arkanoid/engine/game_manager.h b/base_pack/air_arkanoid/engine/game_manager.h
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/game_manager.h
rename to base_pack/air_arkanoid/engine/game_manager.h
diff --git a/non_catalog_apps/air_arkanoid/engine/game_manager_i.h b/base_pack/air_arkanoid/engine/game_manager_i.h
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/game_manager_i.h
rename to base_pack/air_arkanoid/engine/game_manager_i.h
diff --git a/non_catalog_apps/air_arkanoid/engine/level.c b/base_pack/air_arkanoid/engine/level.c
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/level.c
rename to base_pack/air_arkanoid/engine/level.c
diff --git a/non_catalog_apps/air_arkanoid/engine/level.h b/base_pack/air_arkanoid/engine/level.h
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/level.h
rename to base_pack/air_arkanoid/engine/level.h
diff --git a/non_catalog_apps/air_arkanoid/engine/level_i.h b/base_pack/air_arkanoid/engine/level_i.h
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/level_i.h
rename to base_pack/air_arkanoid/engine/level_i.h
diff --git a/non_catalog_apps/air_arkanoid/engine/main.c b/base_pack/air_arkanoid/engine/main.c
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/main.c
rename to base_pack/air_arkanoid/engine/main.c
diff --git a/non_catalog_apps/air_arkanoid/engine/scripts/sprite_builder.py b/base_pack/air_arkanoid/engine/scripts/sprite_builder.py
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/scripts/sprite_builder.py
rename to base_pack/air_arkanoid/engine/scripts/sprite_builder.py
diff --git a/non_catalog_apps/air_arkanoid/engine/sensors/ICM42688P/ICM42688P.c b/base_pack/air_arkanoid/engine/sensors/ICM42688P/ICM42688P.c
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/sensors/ICM42688P/ICM42688P.c
rename to base_pack/air_arkanoid/engine/sensors/ICM42688P/ICM42688P.c
diff --git a/non_catalog_apps/air_arkanoid/engine/sensors/ICM42688P/ICM42688P.h b/base_pack/air_arkanoid/engine/sensors/ICM42688P/ICM42688P.h
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/sensors/ICM42688P/ICM42688P.h
rename to base_pack/air_arkanoid/engine/sensors/ICM42688P/ICM42688P.h
diff --git a/non_catalog_apps/air_arkanoid/engine/sensors/ICM42688P/ICM42688P_regs.h b/base_pack/air_arkanoid/engine/sensors/ICM42688P/ICM42688P_regs.h
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/sensors/ICM42688P/ICM42688P_regs.h
rename to base_pack/air_arkanoid/engine/sensors/ICM42688P/ICM42688P_regs.h
diff --git a/non_catalog_apps/air_arkanoid/engine/sensors/imu.c b/base_pack/air_arkanoid/engine/sensors/imu.c
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/sensors/imu.c
rename to base_pack/air_arkanoid/engine/sensors/imu.c
diff --git a/non_catalog_apps/air_arkanoid/engine/sensors/imu.h b/base_pack/air_arkanoid/engine/sensors/imu.h
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/sensors/imu.h
rename to base_pack/air_arkanoid/engine/sensors/imu.h
diff --git a/non_catalog_apps/air_arkanoid/engine/sprite.c b/base_pack/air_arkanoid/engine/sprite.c
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/sprite.c
rename to base_pack/air_arkanoid/engine/sprite.c
diff --git a/non_catalog_apps/air_arkanoid/engine/sprite.h b/base_pack/air_arkanoid/engine/sprite.h
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/sprite.h
rename to base_pack/air_arkanoid/engine/sprite.h
diff --git a/non_catalog_apps/air_arkanoid/engine/vector.c b/base_pack/air_arkanoid/engine/vector.c
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/vector.c
rename to base_pack/air_arkanoid/engine/vector.c
diff --git a/non_catalog_apps/air_arkanoid/engine/vector.h b/base_pack/air_arkanoid/engine/vector.h
similarity index 100%
rename from non_catalog_apps/air_arkanoid/engine/vector.h
rename to base_pack/air_arkanoid/engine/vector.h
diff --git a/non_catalog_apps/air_arkanoid/fonts/fonts.c b/base_pack/air_arkanoid/fonts/fonts.c
similarity index 100%
rename from non_catalog_apps/air_arkanoid/fonts/fonts.c
rename to base_pack/air_arkanoid/fonts/fonts.c
diff --git a/non_catalog_apps/air_arkanoid/fonts/fonts.h b/base_pack/air_arkanoid/fonts/fonts.h
similarity index 100%
rename from non_catalog_apps/air_arkanoid/fonts/fonts.h
rename to base_pack/air_arkanoid/fonts/fonts.h
diff --git a/non_catalog_apps/air_arkanoid/game.c b/base_pack/air_arkanoid/game.c
similarity index 100%
rename from non_catalog_apps/air_arkanoid/game.c
rename to base_pack/air_arkanoid/game.c
diff --git a/non_catalog_apps/air_arkanoid/game.h b/base_pack/air_arkanoid/game.h
similarity index 100%
rename from non_catalog_apps/air_arkanoid/game.h
rename to base_pack/air_arkanoid/game.h
diff --git a/non_catalog_apps/air_arkanoid/game_settings.c b/base_pack/air_arkanoid/game_settings.c
similarity index 100%
rename from non_catalog_apps/air_arkanoid/game_settings.c
rename to base_pack/air_arkanoid/game_settings.c
diff --git a/non_catalog_apps/air_arkanoid/game_settings.h b/base_pack/air_arkanoid/game_settings.h
similarity index 100%
rename from non_catalog_apps/air_arkanoid/game_settings.h
rename to base_pack/air_arkanoid/game_settings.h
diff --git a/non_catalog_apps/air_arkanoid/icon.png b/base_pack/air_arkanoid/icon.png
similarity index 100%
rename from non_catalog_apps/air_arkanoid/icon.png
rename to base_pack/air_arkanoid/icon.png
diff --git a/non_catalog_apps/air_arkanoid/levels/level_game.c b/base_pack/air_arkanoid/levels/level_game.c
similarity index 100%
rename from non_catalog_apps/air_arkanoid/levels/level_game.c
rename to base_pack/air_arkanoid/levels/level_game.c
diff --git a/non_catalog_apps/air_arkanoid/levels/level_game.h b/base_pack/air_arkanoid/levels/level_game.h
similarity index 100%
rename from non_catalog_apps/air_arkanoid/levels/level_game.h
rename to base_pack/air_arkanoid/levels/level_game.h
diff --git a/non_catalog_apps/air_arkanoid/levels/level_menu.c b/base_pack/air_arkanoid/levels/level_menu.c
similarity index 100%
rename from non_catalog_apps/air_arkanoid/levels/level_menu.c
rename to base_pack/air_arkanoid/levels/level_menu.c
diff --git a/non_catalog_apps/air_arkanoid/levels/level_menu.h b/base_pack/air_arkanoid/levels/level_menu.h
similarity index 100%
rename from non_catalog_apps/air_arkanoid/levels/level_menu.h
rename to base_pack/air_arkanoid/levels/level_menu.h
diff --git a/non_catalog_apps/air_arkanoid/levels/level_message.c b/base_pack/air_arkanoid/levels/level_message.c
similarity index 100%
rename from non_catalog_apps/air_arkanoid/levels/level_message.c
rename to base_pack/air_arkanoid/levels/level_message.c
diff --git a/non_catalog_apps/air_arkanoid/levels/level_message.h b/base_pack/air_arkanoid/levels/level_message.h
similarity index 100%
rename from non_catalog_apps/air_arkanoid/levels/level_message.h
rename to base_pack/air_arkanoid/levels/level_message.h
diff --git a/non_catalog_apps/air_arkanoid/levels/level_settings.c b/base_pack/air_arkanoid/levels/level_settings.c
similarity index 100%
rename from non_catalog_apps/air_arkanoid/levels/level_settings.c
rename to base_pack/air_arkanoid/levels/level_settings.c
diff --git a/non_catalog_apps/air_arkanoid/levels/level_settings.h b/base_pack/air_arkanoid/levels/level_settings.h
similarity index 100%
rename from non_catalog_apps/air_arkanoid/levels/level_settings.h
rename to base_pack/air_arkanoid/levels/level_settings.h
diff --git a/non_catalog_apps/air_arkanoid/sprites/logo_air.png b/base_pack/air_arkanoid/sprites/logo_air.png
similarity index 100%
rename from non_catalog_apps/air_arkanoid/sprites/logo_air.png
rename to base_pack/air_arkanoid/sprites/logo_air.png
diff --git a/non_catalog_apps/air_arkanoid/sprites/logo_arkanoid.png b/base_pack/air_arkanoid/sprites/logo_arkanoid.png
similarity index 100%
rename from non_catalog_apps/air_arkanoid/sprites/logo_arkanoid.png
rename to base_pack/air_arkanoid/sprites/logo_arkanoid.png
diff --git a/non_catalog_apps/air_mouse_ofw/air_mouse_app.c b/base_pack/air_mouse_ofw/air_mouse_app.c
similarity index 100%
rename from non_catalog_apps/air_mouse_ofw/air_mouse_app.c
rename to base_pack/air_mouse_ofw/air_mouse_app.c
diff --git a/non_catalog_apps/air_mouse_ofw/airmouse_10x10.png b/base_pack/air_mouse_ofw/airmouse_10x10.png
similarity index 100%
rename from non_catalog_apps/air_mouse_ofw/airmouse_10x10.png
rename to base_pack/air_mouse_ofw/airmouse_10x10.png
diff --git a/non_catalog_apps/air_mouse_ofw/application.fam b/base_pack/air_mouse_ofw/application.fam
similarity index 100%
rename from non_catalog_apps/air_mouse_ofw/application.fam
rename to base_pack/air_mouse_ofw/application.fam
diff --git a/non_catalog_apps/air_mouse_ofw/assets/Ble_connected_15x15.png b/base_pack/air_mouse_ofw/assets/Ble_connected_15x15.png
similarity index 100%
rename from non_catalog_apps/air_mouse_ofw/assets/Ble_connected_15x15.png
rename to base_pack/air_mouse_ofw/assets/Ble_connected_15x15.png
diff --git a/non_catalog_apps/air_mouse_ofw/assets/Ble_disconnected_15x15.png b/base_pack/air_mouse_ofw/assets/Ble_disconnected_15x15.png
similarity index 100%
rename from non_catalog_apps/air_mouse_ofw/assets/Ble_disconnected_15x15.png
rename to base_pack/air_mouse_ofw/assets/Ble_disconnected_15x15.png
diff --git a/non_catalog_apps/air_mouse_ofw/assets/Circles_47x47.png b/base_pack/air_mouse_ofw/assets/Circles_47x47.png
similarity index 100%
rename from non_catalog_apps/air_mouse_ofw/assets/Circles_47x47.png
rename to base_pack/air_mouse_ofw/assets/Circles_47x47.png
diff --git a/non_catalog_apps/air_mouse_ofw/assets/Left_mouse_icon_9x9.png b/base_pack/air_mouse_ofw/assets/Left_mouse_icon_9x9.png
similarity index 100%
rename from non_catalog_apps/air_mouse_ofw/assets/Left_mouse_icon_9x9.png
rename to base_pack/air_mouse_ofw/assets/Left_mouse_icon_9x9.png
diff --git a/non_catalog_apps/air_mouse_ofw/assets/Pressed_Button_13x13.png b/base_pack/air_mouse_ofw/assets/Pressed_Button_13x13.png
similarity index 100%
rename from non_catalog_apps/air_mouse_ofw/assets/Pressed_Button_13x13.png
rename to base_pack/air_mouse_ofw/assets/Pressed_Button_13x13.png
diff --git a/non_catalog_apps/air_mouse_ofw/assets/Right_mouse_icon_9x9.png b/base_pack/air_mouse_ofw/assets/Right_mouse_icon_9x9.png
similarity index 100%
rename from non_catalog_apps/air_mouse_ofw/assets/Right_mouse_icon_9x9.png
rename to base_pack/air_mouse_ofw/assets/Right_mouse_icon_9x9.png
diff --git a/non_catalog_apps/air_mouse_ofw/assets/Scroll_icon_9x9.png b/base_pack/air_mouse_ofw/assets/Scroll_icon_9x9.png
similarity index 100%
rename from non_catalog_apps/air_mouse_ofw/assets/Scroll_icon_9x9.png
rename to base_pack/air_mouse_ofw/assets/Scroll_icon_9x9.png
diff --git a/non_catalog_apps/air_mouse_ofw/imu_mouse.c b/base_pack/air_mouse_ofw/imu_mouse.c
similarity index 100%
rename from non_catalog_apps/air_mouse_ofw/imu_mouse.c
rename to base_pack/air_mouse_ofw/imu_mouse.c
diff --git a/non_catalog_apps/air_mouse_ofw/imu_mouse.h b/base_pack/air_mouse_ofw/imu_mouse.h
similarity index 100%
rename from non_catalog_apps/air_mouse_ofw/imu_mouse.h
rename to base_pack/air_mouse_ofw/imu_mouse.h
diff --git a/non_catalog_apps/air_mouse_ofw/sensors/ICM42688P.c b/base_pack/air_mouse_ofw/sensors/ICM42688P.c
similarity index 100%
rename from non_catalog_apps/air_mouse_ofw/sensors/ICM42688P.c
rename to base_pack/air_mouse_ofw/sensors/ICM42688P.c
diff --git a/non_catalog_apps/air_mouse_ofw/sensors/ICM42688P.h b/base_pack/air_mouse_ofw/sensors/ICM42688P.h
similarity index 100%
rename from non_catalog_apps/air_mouse_ofw/sensors/ICM42688P.h
rename to base_pack/air_mouse_ofw/sensors/ICM42688P.h
diff --git a/non_catalog_apps/air_mouse_ofw/sensors/ICM42688P_regs.h b/base_pack/air_mouse_ofw/sensors/ICM42688P_regs.h
similarity index 100%
rename from non_catalog_apps/air_mouse_ofw/sensors/ICM42688P_regs.h
rename to base_pack/air_mouse_ofw/sensors/ICM42688P_regs.h
diff --git a/non_catalog_apps/air_mouse_ofw/views/air_mouse_view.c b/base_pack/air_mouse_ofw/views/air_mouse_view.c
similarity index 100%
rename from non_catalog_apps/air_mouse_ofw/views/air_mouse_view.c
rename to base_pack/air_mouse_ofw/views/air_mouse_view.c
diff --git a/non_catalog_apps/air_mouse_ofw/views/air_mouse_view.h b/base_pack/air_mouse_ofw/views/air_mouse_view.h
similarity index 100%
rename from non_catalog_apps/air_mouse_ofw/views/air_mouse_view.h
rename to base_pack/air_mouse_ofw/views/air_mouse_view.h
diff --git a/non_catalog_apps/video_game_module_tool/app.c b/base_pack/video_game_module_tool/app.c
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/app.c
rename to base_pack/video_game_module_tool/app.c
diff --git a/non_catalog_apps/video_game_module_tool/app_i.h b/base_pack/video_game_module_tool/app_i.h
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/app_i.h
rename to base_pack/video_game_module_tool/app_i.h
diff --git a/non_catalog_apps/video_game_module_tool/application.fam b/base_pack/video_game_module_tool/application.fam
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/application.fam
rename to base_pack/video_game_module_tool/application.fam
diff --git a/non_catalog_apps/video_game_module_tool/custom_event.h b/base_pack/video_game_module_tool/custom_event.h
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/custom_event.h
rename to base_pack/video_game_module_tool/custom_event.h
diff --git a/non_catalog_apps/video_game_module_tool/files/vgm-fw-0.1.0.uf2 b/base_pack/video_game_module_tool/files/vgm-fw-0.1.0.uf2
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/files/vgm-fw-0.1.0.uf2
rename to base_pack/video_game_module_tool/files/vgm-fw-0.1.0.uf2
diff --git a/non_catalog_apps/video_game_module_tool/flasher/board.c b/base_pack/video_game_module_tool/flasher/board.c
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/flasher/board.c
rename to base_pack/video_game_module_tool/flasher/board.c
diff --git a/non_catalog_apps/video_game_module_tool/flasher/board.h b/base_pack/video_game_module_tool/flasher/board.h
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/flasher/board.h
rename to base_pack/video_game_module_tool/flasher/board.h
diff --git a/non_catalog_apps/video_game_module_tool/flasher/flasher.c b/base_pack/video_game_module_tool/flasher/flasher.c
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/flasher/flasher.c
rename to base_pack/video_game_module_tool/flasher/flasher.c
diff --git a/non_catalog_apps/video_game_module_tool/flasher/flasher.h b/base_pack/video_game_module_tool/flasher/flasher.h
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/flasher/flasher.h
rename to base_pack/video_game_module_tool/flasher/flasher.h
diff --git a/non_catalog_apps/video_game_module_tool/flasher/rp2040.c b/base_pack/video_game_module_tool/flasher/rp2040.c
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/flasher/rp2040.c
rename to base_pack/video_game_module_tool/flasher/rp2040.c
diff --git a/non_catalog_apps/video_game_module_tool/flasher/rp2040.h b/base_pack/video_game_module_tool/flasher/rp2040.h
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/flasher/rp2040.h
rename to base_pack/video_game_module_tool/flasher/rp2040.h
diff --git a/non_catalog_apps/video_game_module_tool/flasher/swd.c b/base_pack/video_game_module_tool/flasher/swd.c
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/flasher/swd.c
rename to base_pack/video_game_module_tool/flasher/swd.c
diff --git a/non_catalog_apps/video_game_module_tool/flasher/swd.h b/base_pack/video_game_module_tool/flasher/swd.h
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/flasher/swd.h
rename to base_pack/video_game_module_tool/flasher/swd.h
diff --git a/non_catalog_apps/video_game_module_tool/flasher/target.c b/base_pack/video_game_module_tool/flasher/target.c
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/flasher/target.c
rename to base_pack/video_game_module_tool/flasher/target.c
diff --git a/non_catalog_apps/video_game_module_tool/flasher/target.h b/base_pack/video_game_module_tool/flasher/target.h
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/flasher/target.h
rename to base_pack/video_game_module_tool/flasher/target.h
diff --git a/non_catalog_apps/video_game_module_tool/flasher/uf2.c b/base_pack/video_game_module_tool/flasher/uf2.c
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/flasher/uf2.c
rename to base_pack/video_game_module_tool/flasher/uf2.c
diff --git a/non_catalog_apps/video_game_module_tool/flasher/uf2.h b/base_pack/video_game_module_tool/flasher/uf2.h
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/flasher/uf2.h
rename to base_pack/video_game_module_tool/flasher/uf2.h
diff --git a/non_catalog_apps/video_game_module_tool/icons/Checkmark_44x40.png b/base_pack/video_game_module_tool/icons/Checkmark_44x40.png
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/icons/Checkmark_44x40.png
rename to base_pack/video_game_module_tool/icons/Checkmark_44x40.png
diff --git a/non_catalog_apps/video_game_module_tool/icons/Flashing_module_70x30.png b/base_pack/video_game_module_tool/icons/Flashing_module_70x30.png
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/icons/Flashing_module_70x30.png
rename to base_pack/video_game_module_tool/icons/Flashing_module_70x30.png
diff --git a/non_catalog_apps/video_game_module_tool/icons/Module_60x26.png b/base_pack/video_game_module_tool/icons/Module_60x26.png
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/icons/Module_60x26.png
rename to base_pack/video_game_module_tool/icons/Module_60x26.png
diff --git a/non_catalog_apps/video_game_module_tool/icons/Update_module_56x52.png b/base_pack/video_game_module_tool/icons/Update_module_56x52.png
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/icons/Update_module_56x52.png
rename to base_pack/video_game_module_tool/icons/Update_module_56x52.png
diff --git a/non_catalog_apps/video_game_module_tool/icons/WarningDolphinFlip_45x42.png b/base_pack/video_game_module_tool/icons/WarningDolphinFlip_45x42.png
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/icons/WarningDolphinFlip_45x42.png
rename to base_pack/video_game_module_tool/icons/WarningDolphinFlip_45x42.png
diff --git a/non_catalog_apps/video_game_module_tool/scenes/scene.c b/base_pack/video_game_module_tool/scenes/scene.c
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/scenes/scene.c
rename to base_pack/video_game_module_tool/scenes/scene.c
diff --git a/non_catalog_apps/video_game_module_tool/scenes/scene.h b/base_pack/video_game_module_tool/scenes/scene.h
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/scenes/scene.h
rename to base_pack/video_game_module_tool/scenes/scene.h
diff --git a/non_catalog_apps/video_game_module_tool/scenes/scene_config.h b/base_pack/video_game_module_tool/scenes/scene_config.h
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/scenes/scene_config.h
rename to base_pack/video_game_module_tool/scenes/scene_config.h
diff --git a/non_catalog_apps/video_game_module_tool/scenes/scene_confirm.c b/base_pack/video_game_module_tool/scenes/scene_confirm.c
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/scenes/scene_confirm.c
rename to base_pack/video_game_module_tool/scenes/scene_confirm.c
diff --git a/non_catalog_apps/video_game_module_tool/scenes/scene_error.c b/base_pack/video_game_module_tool/scenes/scene_error.c
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/scenes/scene_error.c
rename to base_pack/video_game_module_tool/scenes/scene_error.c
diff --git a/non_catalog_apps/video_game_module_tool/scenes/scene_file_select.c b/base_pack/video_game_module_tool/scenes/scene_file_select.c
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/scenes/scene_file_select.c
rename to base_pack/video_game_module_tool/scenes/scene_file_select.c
diff --git a/non_catalog_apps/video_game_module_tool/scenes/scene_install.c b/base_pack/video_game_module_tool/scenes/scene_install.c
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/scenes/scene_install.c
rename to base_pack/video_game_module_tool/scenes/scene_install.c
diff --git a/non_catalog_apps/video_game_module_tool/scenes/scene_probe.c b/base_pack/video_game_module_tool/scenes/scene_probe.c
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/scenes/scene_probe.c
rename to base_pack/video_game_module_tool/scenes/scene_probe.c
diff --git a/non_catalog_apps/video_game_module_tool/scenes/scene_start.c b/base_pack/video_game_module_tool/scenes/scene_start.c
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/scenes/scene_start.c
rename to base_pack/video_game_module_tool/scenes/scene_start.c
diff --git a/non_catalog_apps/video_game_module_tool/scenes/scene_success.c b/base_pack/video_game_module_tool/scenes/scene_success.c
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/scenes/scene_success.c
rename to base_pack/video_game_module_tool/scenes/scene_success.c
diff --git a/non_catalog_apps/video_game_module_tool/vgm_tool.png b/base_pack/video_game_module_tool/vgm_tool.png
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/vgm_tool.png
rename to base_pack/video_game_module_tool/vgm_tool.png
diff --git a/non_catalog_apps/video_game_module_tool/views/progress.c b/base_pack/video_game_module_tool/views/progress.c
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/views/progress.c
rename to base_pack/video_game_module_tool/views/progress.c
diff --git a/non_catalog_apps/video_game_module_tool/views/progress.h b/base_pack/video_game_module_tool/views/progress.h
similarity index 100%
rename from non_catalog_apps/video_game_module_tool/views/progress.h
rename to base_pack/video_game_module_tool/views/progress.h