diff --git a/internal_filesystem/apps_builtin/com.example.launcher/META-INF/MANIFEST.MF b/internal_filesystem/builtin/apps/com.example.launcher/META-INF/MANIFEST.MF
similarity index 100%
rename from internal_filesystem/apps_builtin/com.example.launcher/META-INF/MANIFEST.MF
rename to internal_filesystem/builtin/apps/com.example.launcher/META-INF/MANIFEST.MF
diff --git a/internal_filesystem/apps_builtin/com.example.launcher/assets/launcher.py b/internal_filesystem/builtin/apps/com.example.launcher/assets/launcher.py
similarity index 95%
rename from internal_filesystem/apps_builtin/com.example.launcher/assets/launcher.py
rename to internal_filesystem/builtin/apps/com.example.launcher/assets/launcher.py
index 68eeda39..4261f8e5 100644
--- a/internal_filesystem/apps_builtin/com.example.launcher/assets/launcher.py
+++ b/internal_filesystem/builtin/apps/com.example.launcher/assets/launcher.py
@@ -46,7 +46,7 @@ def load_icon(icon_path):
 
 # Check and collect subdirectories from existing directories
 apps_dir = "/apps"
-apps_dir_builtin = "/apps_builtin"
+apps_dir_builtin = "/builtin/apps"
 app_dirs = []
 seen_base_names = set()
 
@@ -71,9 +71,7 @@ for dir_path in [apps_dir, apps_dir_builtin]:
         pass
 
 # Should we skip 'Launcher' apps from the list here?
-for app_dir in app_dirs:
-    # Paths
-    app_dir_fullpath = f"{apps_dir}/{app_dir}"
+for app_dir_fullpath in app_dirs:
     app_name, main_script = parse_manifest(f"{app_dir_fullpath}/META-INF/MANIFEST.MF")
     # Create a container for each app (icon + label)
     app_cont = lv.obj(cont)
@@ -87,7 +85,7 @@ for app_dir in app_dirs:
         image.set_src(load_icon(icon_path))
     except Exception as e:
         print(f"Error loading icon {icon_path}: {e} - loading default icon")
-        icon_path = "/resources/default_icon_64x64.bin"
+        icon_path = "/builtin/resources/default_icon_64x64.bin"
         try:
             image.set_src(load_icon(icon_path))
         except Exception as e:
diff --git a/internal_filesystem/apps_builtin/com_example_appstore/META-INF/MANIFEST.MF b/internal_filesystem/builtin/apps/com_example_appstore/META-INF/MANIFEST.MF
similarity index 100%
rename from internal_filesystem/apps_builtin/com_example_appstore/META-INF/MANIFEST.MF
rename to internal_filesystem/builtin/apps/com_example_appstore/META-INF/MANIFEST.MF
diff --git a/internal_filesystem/apps_builtin/com_example_appstore/assets/appstore.py b/internal_filesystem/builtin/apps/com_example_appstore/assets/appstore.py
similarity index 100%
rename from internal_filesystem/apps_builtin/com_example_appstore/assets/appstore.py
rename to internal_filesystem/builtin/apps/com_example_appstore/assets/appstore.py
diff --git a/internal_filesystem/apps_builtin/com_example_appstore/res/mipmap_mdpi/icon_64x64.bin b/internal_filesystem/builtin/apps/com_example_appstore/res/mipmap_mdpi/icon_64x64.bin
similarity index 100%
rename from internal_filesystem/apps_builtin/com_example_appstore/res/mipmap_mdpi/icon_64x64.bin
rename to internal_filesystem/builtin/apps/com_example_appstore/res/mipmap_mdpi/icon_64x64.bin
diff --git a/internal_filesystem/apps_builtin/com_example_osupdate/META-INF/MANIFEST.MF b/internal_filesystem/builtin/apps/com_example_osupdate/META-INF/MANIFEST.MF
similarity index 100%
rename from internal_filesystem/apps_builtin/com_example_osupdate/META-INF/MANIFEST.MF
rename to internal_filesystem/builtin/apps/com_example_osupdate/META-INF/MANIFEST.MF
diff --git a/internal_filesystem/apps_builtin/com_example_osupdate/assets/osupdate.py b/internal_filesystem/builtin/apps/com_example_osupdate/assets/osupdate.py
similarity index 100%
rename from internal_filesystem/apps_builtin/com_example_osupdate/assets/osupdate.py
rename to internal_filesystem/builtin/apps/com_example_osupdate/assets/osupdate.py
diff --git a/internal_filesystem/apps_builtin/com_example_osupdate/res/mipmap_mdpi/icon_64x64.bin b/internal_filesystem/builtin/apps/com_example_osupdate/res/mipmap_mdpi/icon_64x64.bin
similarity index 100%
rename from internal_filesystem/apps_builtin/com_example_osupdate/res/mipmap_mdpi/icon_64x64.bin
rename to internal_filesystem/builtin/apps/com_example_osupdate/res/mipmap_mdpi/icon_64x64.bin
diff --git a/internal_filesystem/apps_builtin/com_example_wificonf/META-INF/MANIFEST.MF b/internal_filesystem/builtin/apps/com_example_wificonf/META-INF/MANIFEST.MF
similarity index 100%
rename from internal_filesystem/apps_builtin/com_example_wificonf/META-INF/MANIFEST.MF
rename to internal_filesystem/builtin/apps/com_example_wificonf/META-INF/MANIFEST.MF
diff --git a/internal_filesystem/apps_builtin/com_example_wificonf/assets/wificonf.py b/internal_filesystem/builtin/apps/com_example_wificonf/assets/wificonf.py
similarity index 100%
rename from internal_filesystem/apps_builtin/com_example_wificonf/assets/wificonf.py
rename to internal_filesystem/builtin/apps/com_example_wificonf/assets/wificonf.py
diff --git a/internal_filesystem/apps_builtin/com_example_wificonf/res/mipmap_mdpi/icon_64x64.bin b/internal_filesystem/builtin/apps/com_example_wificonf/res/mipmap_mdpi/icon_64x64.bin
similarity index 100%
rename from internal_filesystem/apps_builtin/com_example_wificonf/res/mipmap_mdpi/icon_64x64.bin
rename to internal_filesystem/builtin/apps/com_example_wificonf/res/mipmap_mdpi/icon_64x64.bin
diff --git a/internal_filesystem/main.py b/internal_filesystem/main.py
index e7bb54ea..992fcb2b 100644
--- a/internal_filesystem/main.py
+++ b/internal_filesystem/main.py
@@ -363,7 +363,7 @@ except Exception as e:
 # The launcher might have been updated from the builtin one, so check that:
 import uos
 custom_launcher = "/apps/com.example.launcher"
-builtin_launcher = "/apps_builtin/com.example.launcher"
+builtin_launcher = "/builtin/apps/com.example.launcher"
 try:
     stat = uos.stat(custom_launcher)
     start_app(custom_launcher, True)
diff --git a/internal_filesystem/resources/default_icon_64x64.bin b/internal_filesystem/resources/default_icon_64x64.bin
deleted file mode 100644
index 3ea6ad43..00000000
Binary files a/internal_filesystem/resources/default_icon_64x64.bin and /dev/null differ