diff --git a/app/src/main/java/org/vibecoders/moongazer/Assets.java b/app/src/main/java/org/vibecoders/moongazer/Assets.java
deleted file mode 100644
index 6c0e072..0000000
--- a/app/src/main/java/org/vibecoders/moongazer/Assets.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.vibecoders.moongazer;
-
-import org.slf4j.Logger;
-
-import com.badlogic.gdx.assets.AssetManager;
-import com.badlogic.gdx.graphics.Texture;
-
-public class Assets {
-    private static final AssetManager assetManager = new AssetManager();
-    private static final Logger log = org.slf4j.LoggerFactory.getLogger(Assets.class);
-
-    public static <T> T getAsset(String fileName, Class<T> type) {
-        return assetManager.get(fileName, type);
-    }
-
-    /**
-     * Loads assets required for the intro scene only.
-     * 
-     * This is used to load the logo before the main assets are loaded.
-     */
-    public static void loadIntroAndWait() {
-        assetManager.load("icons/logo.png", Texture.class);
-        waitUntilLoaded();
-    }
-
-    public static void loadAll() {
-        log.info("Loading all assets....");
-        log.warn("stub");
-    }
-
-    public static void waitUntilLoaded() {
-        assetManager.finishLoading();
-    }
-
-    public static AssetManager getAssetManager() {
-        return assetManager;
-    }
-
-    public static void dispose() {
-        assetManager.dispose();
-    }
-}
diff --git a/app/src/main/java/org/vibecoders/moongazer/Game.java b/app/src/main/java/org/vibecoders/moongazer/Game.java
index 89afd88..647e002 100644
--- a/app/src/main/java/org/vibecoders/moongazer/Game.java
+++ b/app/src/main/java/org/vibecoders/moongazer/Game.java
@@ -6,7 +6,8 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.vibecoders.moongazer.scene.*;
+import org.vibecoders.moongazer.managers.Assets;
+import org.vibecoders.moongazer.scenes.*;
 
 public class Game extends ApplicationAdapter {
     private static final Logger log = LoggerFactory.getLogger(Game.class);
diff --git a/app/src/main/java/org/vibecoders/moongazer/scene/Intro.java b/app/src/main/java/org/vibecoders/moongazer/scenes/Intro.java
similarity index 96%
rename from app/src/main/java/org/vibecoders/moongazer/scene/Intro.java
rename to app/src/main/java/org/vibecoders/moongazer/scenes/Intro.java
index 9fe69e4..b1b0e0b 100644
--- a/app/src/main/java/org/vibecoders/moongazer/scene/Intro.java
+++ b/app/src/main/java/org/vibecoders/moongazer/scenes/Intro.java
@@ -1,12 +1,12 @@
-package org.vibecoders.moongazer.scene;
+package org.vibecoders.moongazer.scenes;
 
 import static org.vibecoders.moongazer.Constants.*;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.vibecoders.moongazer.Assets;
 import org.vibecoders.moongazer.Game;
 import org.vibecoders.moongazer.State;
+import org.vibecoders.moongazer.managers.Assets;
 
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.Texture;
diff --git a/app/src/main/java/org/vibecoders/moongazer/scene/MainMenu.java b/app/src/main/java/org/vibecoders/moongazer/scenes/MainMenu.java
similarity index 90%
rename from app/src/main/java/org/vibecoders/moongazer/scene/MainMenu.java
rename to app/src/main/java/org/vibecoders/moongazer/scenes/MainMenu.java
index 4c62dbd..a875154 100644
--- a/app/src/main/java/org/vibecoders/moongazer/scene/MainMenu.java
+++ b/app/src/main/java/org/vibecoders/moongazer/scenes/MainMenu.java
@@ -1,4 +1,4 @@
-package org.vibecoders.moongazer.scene;
+package org.vibecoders.moongazer.scenes;
 
 import static org.vibecoders.moongazer.Constants.*;
 
diff --git a/app/src/main/java/org/vibecoders/moongazer/scene/Scene.java b/app/src/main/java/org/vibecoders/moongazer/scenes/Scene.java
similarity index 84%
rename from app/src/main/java/org/vibecoders/moongazer/scene/Scene.java
rename to app/src/main/java/org/vibecoders/moongazer/scenes/Scene.java
index adff9df..859faaa 100644
--- a/app/src/main/java/org/vibecoders/moongazer/scene/Scene.java
+++ b/app/src/main/java/org/vibecoders/moongazer/scenes/Scene.java
@@ -1,4 +1,4 @@
-package org.vibecoders.moongazer.scene;
+package org.vibecoders.moongazer.scenes;
 
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 
diff --git a/app/src/main/java/org/vibecoders/moongazer/scene/Transition.java b/app/src/main/java/org/vibecoders/moongazer/scenes/Transition.java
similarity index 97%
rename from app/src/main/java/org/vibecoders/moongazer/scene/Transition.java
rename to app/src/main/java/org/vibecoders/moongazer/scenes/Transition.java
index 8a072ca..8ad1e6f 100644
--- a/app/src/main/java/org/vibecoders/moongazer/scene/Transition.java
+++ b/app/src/main/java/org/vibecoders/moongazer/scenes/Transition.java
@@ -1,4 +1,4 @@
-package org.vibecoders.moongazer.scene;
+package org.vibecoders.moongazer.scenes;
 
 import org.slf4j.Logger;
 import org.vibecoders.moongazer.Game;