diff --git a/src/hooks/useProject.ts b/src/hooks/useProject.ts
index f02a217..124521b 100644
--- a/src/hooks/useProject.ts
+++ b/src/hooks/useProject.ts
@@ -12,8 +12,7 @@ import { getProjectFile } from '../lib/midi';
 import {
   collectEffects,
   collectPads,
-  collectScenesAndPatterns,
-  collectScenesSettings,
+  collectProjectStructure,
   collectSettings,
   collectSounds,
   loadSoundsFromBackup,
@@ -71,8 +70,10 @@ function useProject(id?: number | string) {
           : await collectSounds(files);
         const settings = collectSettings(files);
         const pads = collectPads(files, sounds);
-        const scenes = collectScenesAndPatterns(files, device?.sku || backupSku || deviceSku);
-        const scenesSettings = collectScenesSettings(files);
+        const projectStructure = collectProjectStructure(
+          files,
+          device?.sku || backupSku || deviceSku,
+        );
         const effects = collectEffects(files);
 
         // @ts-expect-error wrong typing?
@@ -88,12 +89,14 @@ function useProject(id?: number | string) {
 
         return {
           pads,
-          scenes,
+          groupPatterns: projectStructure.groupPatterns,
+          scenes: projectStructure.scenes,
+          songPositions: projectStructure.songPositions,
           settings,
           sounds,
           effects,
           projectFile,
-          scenesSettings,
+          scenesSettings: projectStructure.scenesSettings,
         };
       } catch (error) {
         const message = error instanceof Error ? error.message : 'Failed to load project';