diff --git a/src/Game.ts b/src/Game.ts
index e776a97..3be306d 100644
--- a/src/Game.ts
+++ b/src/Game.ts
@@ -5,7 +5,7 @@ import {isDarkMode} from './settings/color-settings.ts';
 import {EmptyScene} from './scenes/EmptyScene.ts';
 import {TweakPane} from './settings/TweakPane.ts';
 import {Colors} from './utils/colors.ts';
-import {InstrumentScene, instrumentScenes} from './scenes/instrumentScenes.ts';
+import {InstrumentScene, instrumentScenes} from './scenes/instruments/instrumentScenes.ts';
 
 export class LarsenGame extends Phaser.Game {
   static isInitialized = false;
diff --git a/src/scenes/EmptyScene.ts b/src/scenes/EmptyScene.ts
index c47da77..2b41408 100644
--- a/src/scenes/EmptyScene.ts
+++ b/src/scenes/EmptyScene.ts
@@ -4,7 +4,7 @@ import {LoopTracksScene} from './LoopTracksScene.ts';
 import {Colors, colorToHex, PhaserColor, PhaserColors} from '../utils/colors.ts';
 import {FontFamily, FontSize} from '../utils/fonts.ts';
 import {EVENTS} from '../events.ts';
-import {InstrumentScene, instrumentScenes} from './instrumentScenes.ts';
+import {InstrumentScene, instrumentScenes} from './instruments/instrumentScenes.ts';
 import {LarsenGame} from '../Game.ts';
 
 export class EmptyScene extends Phaser.Scene {
diff --git a/src/scenes/LoopTracksScene.ts b/src/scenes/LoopTracksScene.ts
index 32f2fa2..34e88c2 100644
--- a/src/scenes/LoopTracksScene.ts
+++ b/src/scenes/LoopTracksScene.ts
@@ -3,7 +3,7 @@ import {Colors, colorToHex, HexaColor, hexToColor, PhaserColors} from '../utils/
 import {FontColor, FontFamily, FontSize} from '../utils/fonts.ts';
 import {EmptyScene} from './EmptyScene.ts';
 import {Loop} from '../Loop.ts';
-import {PadsScene} from './PadsScene.ts';
+import {PadsScene} from './instruments/PadsScene.ts';
 import {EVENTS} from '../events.ts';
 
 const controlIcons = {
diff --git a/src/scenes/DrumsScene.ts b/src/scenes/instruments/DrumsScene.ts
similarity index 90%
rename from src/scenes/DrumsScene.ts
rename to src/scenes/instruments/DrumsScene.ts
index 5de3454..1d48008 100644
--- a/src/scenes/DrumsScene.ts
+++ b/src/scenes/instruments/DrumsScene.ts
@@ -1,5 +1,5 @@
-import {Colors, HexaColor, hexToColor, PhaserColors} from '../utils/colors.ts';
-import {playSample, Sample} from '../samples/play-sample.ts';
+import {Colors, HexaColor, hexToColor, PhaserColors} from '../../utils/colors.ts';
+import {playSample, Sample} from '../../samples/play-sample.ts';
 import {PadsScene} from './PadsScene.ts';
 
 const padColors: Record<Sample, HexaColor> = {
diff --git a/src/scenes/ElectroScene.ts b/src/scenes/instruments/ElectroScene.ts
similarity index 95%
rename from src/scenes/ElectroScene.ts
rename to src/scenes/instruments/ElectroScene.ts
index de61849..57a59c2 100644
--- a/src/scenes/ElectroScene.ts
+++ b/src/scenes/instruments/ElectroScene.ts
@@ -1,5 +1,5 @@
-import {allFrequencies} from '../samples/synth-frequencies.ts';
-import {createAudioContext} from '../samples/sample-utils.ts';
+import {allFrequencies} from '../../samples/synth-frequencies.ts';
+import {createAudioContext} from '../../samples/sample-utils.ts';
 import {PianoScene} from './PianoScene.ts';
 import Phaser from 'phaser';
 import {PadsSceneSettings} from './PadsScene.ts';
diff --git a/src/scenes/GiberishScene.ts b/src/scenes/instruments/GiberishScene.ts
similarity index 95%
rename from src/scenes/GiberishScene.ts
rename to src/scenes/instruments/GiberishScene.ts
index 148fbb4..0f1d90c 100644
--- a/src/scenes/GiberishScene.ts
+++ b/src/scenes/instruments/GiberishScene.ts
@@ -1,7 +1,7 @@
-import {logger} from '../utils/logger.ts';
+import {logger} from '../../utils/logger.ts';
 import {PadsScene} from './PadsScene.ts';
 import Phaser from 'phaser';
-import {PhaserColors} from '../utils/colors.ts';
+import {PhaserColors} from '../../utils/colors.ts';
 
 declare const Freeverb: any, Bus2: any, Gibberish: any, Synth: any, Add: any, Sine: any, Sequencer: any;
 
diff --git a/src/scenes/PadsScene.ts b/src/scenes/instruments/PadsScene.ts
similarity index 94%
rename from src/scenes/PadsScene.ts
rename to src/scenes/instruments/PadsScene.ts
index f030552..a880a69 100644
--- a/src/scenes/PadsScene.ts
+++ b/src/scenes/instruments/PadsScene.ts
@@ -1,10 +1,10 @@
 import Phaser from 'phaser';
-import {LoopTracksScene} from './LoopTracksScene.ts';
-import {rotateArray} from '../utils/math.ts';
-import {colorToHex, PhaserColor, PhaserColors} from '../utils/colors.ts';
-import {FontColor, FontFamily, FontSize} from '../utils/fonts.ts';
-import {EVENTS} from '../events.ts';
-import {logger} from '../utils/logger.ts';
+import {LoopTracksScene} from '../LoopTracksScene.ts';
+import {rotateArray} from '../../utils/math.ts';
+import {colorToHex, PhaserColor, PhaserColors} from '../../utils/colors.ts';
+import {FontColor, FontFamily, FontSize} from '../../utils/fonts.ts';
+import {EVENTS} from '../../events.ts';
+import {logger} from '../../utils/logger.ts';
 
 type Pad = {
   instrument: number,
diff --git a/src/scenes/PianoScene.ts b/src/scenes/instruments/PianoScene.ts
similarity index 95%
rename from src/scenes/PianoScene.ts
rename to src/scenes/instruments/PianoScene.ts
index 6b53953..7542734 100644
--- a/src/scenes/PianoScene.ts
+++ b/src/scenes/instruments/PianoScene.ts
@@ -1,8 +1,8 @@
 import {PadsScene, PadsSceneSettings, PadText, Range, Setting} from './PadsScene.ts';
-import {allFrequencies} from '../samples/synth-frequencies.ts';
-import {createAudioContext} from '../samples/sample-utils.ts';
+import {allFrequencies} from '../../samples/synth-frequencies.ts';
+import {createAudioContext} from '../../samples/sample-utils.ts';
 import Phaser from 'phaser';
-import {PhaserColors} from '../utils/colors.ts';
+import {PhaserColors} from '../../utils/colors.ts';
 
 export class PianoScene extends PadsScene {
 
diff --git a/src/scenes/instrumentScenes.ts b/src/scenes/instruments/instrumentScenes.ts
similarity index 89%
rename from src/scenes/instrumentScenes.ts
rename to src/scenes/instruments/instrumentScenes.ts
index 7352111..3b31e75 100644
--- a/src/scenes/instrumentScenes.ts
+++ b/src/scenes/instruments/instrumentScenes.ts
@@ -1,10 +1,10 @@
 import Phaser from 'phaser';
-import {PhaserColor, PhaserColors} from '../utils/colors.ts';
+import {PhaserColor, PhaserColors} from '../../utils/colors.ts';
 import {GibberishScene} from './GiberishScene.ts';
 import {DrumsScene} from './DrumsScene.ts';
 import {ElectroScene} from './ElectroScene.ts';
 import {PianoScene} from './PianoScene.ts';
-import {ValueOf} from '../utils/types.ts';
+import {ValueOf} from '../../utils/types.ts';
 
 export const instrumentScenes = {
   synth: {
diff --git a/src/settings/TweakPane.ts b/src/settings/TweakPane.ts
index 691c32b..e39bf7c 100644
--- a/src/settings/TweakPane.ts
+++ b/src/settings/TweakPane.ts
@@ -5,7 +5,7 @@ import {LoopTracksScene} from '../scenes/LoopTracksScene.ts';
 import {logger} from '../utils/logger.ts';
 import {BindingApi} from '@tweakpane/core';
 import {EVENTS} from '../events.ts';
-import {PadsSceneSettings} from '../scenes/PadsScene.ts';
+import {PadsSceneSettings} from '../scenes/instruments/PadsScene.ts';
 
 type MinMax = { min: number; max: number; };