diff --git a/Assets/Scripts/Minigames/DivingForPictures/Bubbles.meta b/Assets/Scripts/Minigames/DivingForPictures/Bubbles.meta
new file mode 100644
index 00000000..1a87042a
--- /dev/null
+++ b/Assets/Scripts/Minigames/DivingForPictures/Bubbles.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 625b24c8ed0e4c41bce0893b2ed07a25
+timeCreated: 1758543705
\ No newline at end of file
diff --git a/Assets/Scripts/Minigames/DivingForPictures/Bubble.cs b/Assets/Scripts/Minigames/DivingForPictures/Bubbles/Bubble.cs
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/Bubble.cs
rename to Assets/Scripts/Minigames/DivingForPictures/Bubbles/Bubble.cs
diff --git a/Assets/Scripts/Minigames/DivingForPictures/Bubble.cs.meta b/Assets/Scripts/Minigames/DivingForPictures/Bubbles/Bubble.cs.meta
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/Bubble.cs.meta
rename to Assets/Scripts/Minigames/DivingForPictures/Bubbles/Bubble.cs.meta
diff --git a/Assets/Scripts/Minigames/DivingForPictures/BubblePool.cs b/Assets/Scripts/Minigames/DivingForPictures/Bubbles/BubblePool.cs
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/BubblePool.cs
rename to Assets/Scripts/Minigames/DivingForPictures/Bubbles/BubblePool.cs
diff --git a/Assets/Scripts/Minigames/DivingForPictures/BubblePool.cs.meta b/Assets/Scripts/Minigames/DivingForPictures/Bubbles/BubblePool.cs.meta
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/BubblePool.cs.meta
rename to Assets/Scripts/Minigames/DivingForPictures/Bubbles/BubblePool.cs.meta
diff --git a/Assets/Scripts/Minigames/DivingForPictures/BubbleSpawner.cs b/Assets/Scripts/Minigames/DivingForPictures/Bubbles/BubbleSpawner.cs
similarity index 98%
rename from Assets/Scripts/Minigames/DivingForPictures/BubbleSpawner.cs
rename to Assets/Scripts/Minigames/DivingForPictures/Bubbles/BubbleSpawner.cs
index d4859a84..65823896 100644
--- a/Assets/Scripts/Minigames/DivingForPictures/BubbleSpawner.cs
+++ b/Assets/Scripts/Minigames/DivingForPictures/Bubbles/BubbleSpawner.cs
@@ -145,7 +145,7 @@ namespace Minigames.DivingForPictures
             _isSurfacing = true;
             
             // Slow down all existing bubbles
-            Bubble[] activeBubbles = FindObjectsOfType<Bubble>();
+            Bubble[] activeBubbles = FindObjectsByType<Bubble>(FindObjectsSortMode.None);
             foreach (Bubble bubble in activeBubbles)
             {
                 bubble.speed *= surfacingSpeedFactor;
diff --git a/Assets/Scripts/Minigames/DivingForPictures/BubbleSpawner.cs.meta b/Assets/Scripts/Minigames/DivingForPictures/Bubbles/BubbleSpawner.cs.meta
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/BubbleSpawner.cs.meta
rename to Assets/Scripts/Minigames/DivingForPictures/Bubbles/BubbleSpawner.cs.meta
diff --git a/Assets/Scripts/Minigames/DivingForPictures/Monster.meta b/Assets/Scripts/Minigames/DivingForPictures/Monster.meta
new file mode 100644
index 00000000..be1887ad
--- /dev/null
+++ b/Assets/Scripts/Minigames/DivingForPictures/Monster.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 03f105b6ec1a4b63be259f257aad2cdb
+timeCreated: 1758543817
\ No newline at end of file
diff --git a/Assets/Scripts/Minigames/DivingForPictures/Monster.cs b/Assets/Scripts/Minigames/DivingForPictures/Monster/Monster.cs
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/Monster.cs
rename to Assets/Scripts/Minigames/DivingForPictures/Monster/Monster.cs
diff --git a/Assets/Scripts/Minigames/DivingForPictures/Monster.cs.meta b/Assets/Scripts/Minigames/DivingForPictures/Monster/Monster.cs.meta
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/Monster.cs.meta
rename to Assets/Scripts/Minigames/DivingForPictures/Monster/Monster.cs.meta
diff --git a/Assets/Scripts/Minigames/DivingForPictures/MonsterSpawnPoint.cs b/Assets/Scripts/Minigames/DivingForPictures/Monster/MonsterSpawnPoint.cs
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/MonsterSpawnPoint.cs
rename to Assets/Scripts/Minigames/DivingForPictures/Monster/MonsterSpawnPoint.cs
diff --git a/Assets/Scripts/Minigames/DivingForPictures/MonsterSpawnPoint.cs.meta b/Assets/Scripts/Minigames/DivingForPictures/Monster/MonsterSpawnPoint.cs.meta
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/MonsterSpawnPoint.cs.meta
rename to Assets/Scripts/Minigames/DivingForPictures/Monster/MonsterSpawnPoint.cs.meta
diff --git a/Assets/Scripts/Minigames/DivingForPictures/Obstacles.meta b/Assets/Scripts/Minigames/DivingForPictures/Obstacles.meta
new file mode 100644
index 00000000..61e0a3f1
--- /dev/null
+++ b/Assets/Scripts/Minigames/DivingForPictures/Obstacles.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: a48ab1197e3d4c6890be54c9102e4091
+timeCreated: 1758543716
\ No newline at end of file
diff --git a/Assets/Scripts/Minigames/DivingForPictures/FloatingObstacle.cs b/Assets/Scripts/Minigames/DivingForPictures/Obstacles/FloatingObstacle.cs
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/FloatingObstacle.cs
rename to Assets/Scripts/Minigames/DivingForPictures/Obstacles/FloatingObstacle.cs
diff --git a/Assets/Scripts/Minigames/DivingForPictures/FloatingObstacle.cs.meta b/Assets/Scripts/Minigames/DivingForPictures/Obstacles/FloatingObstacle.cs.meta
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/FloatingObstacle.cs.meta
rename to Assets/Scripts/Minigames/DivingForPictures/Obstacles/FloatingObstacle.cs.meta
diff --git a/Assets/Scripts/Minigames/DivingForPictures/ObstacleCollision.cs b/Assets/Scripts/Minigames/DivingForPictures/Obstacles/ObstacleCollision.cs
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/ObstacleCollision.cs
rename to Assets/Scripts/Minigames/DivingForPictures/Obstacles/ObstacleCollision.cs
diff --git a/Assets/Scripts/Minigames/DivingForPictures/ObstacleCollision.cs.meta b/Assets/Scripts/Minigames/DivingForPictures/Obstacles/ObstacleCollision.cs.meta
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/ObstacleCollision.cs.meta
rename to Assets/Scripts/Minigames/DivingForPictures/Obstacles/ObstacleCollision.cs.meta
diff --git a/Assets/Scripts/Minigames/DivingForPictures/ObstaclePool.cs b/Assets/Scripts/Minigames/DivingForPictures/Obstacles/ObstaclePool.cs
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/ObstaclePool.cs
rename to Assets/Scripts/Minigames/DivingForPictures/Obstacles/ObstaclePool.cs
diff --git a/Assets/Scripts/Minigames/DivingForPictures/ObstaclePool.cs.meta b/Assets/Scripts/Minigames/DivingForPictures/Obstacles/ObstaclePool.cs.meta
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/ObstaclePool.cs.meta
rename to Assets/Scripts/Minigames/DivingForPictures/Obstacles/ObstaclePool.cs.meta
diff --git a/Assets/Scripts/Minigames/DivingForPictures/ObstacleSpawner.cs b/Assets/Scripts/Minigames/DivingForPictures/Obstacles/ObstacleSpawner.cs
similarity index 97%
rename from Assets/Scripts/Minigames/DivingForPictures/ObstacleSpawner.cs
rename to Assets/Scripts/Minigames/DivingForPictures/Obstacles/ObstacleSpawner.cs
index 8c69ec38..d34adc04 100644
--- a/Assets/Scripts/Minigames/DivingForPictures/ObstacleSpawner.cs
+++ b/Assets/Scripts/Minigames/DivingForPictures/Obstacles/ObstacleSpawner.cs
@@ -29,13 +29,6 @@ namespace Minigames.DivingForPictures
         [Tooltip("Radius around spawn point to check for tile collisions")]
         [SerializeField] private float spawnCollisionRadius = 1f;
 
-        [Header("Spawn Position")]
-        [Tooltip("How far below screen to spawn obstacles")]
-        [SerializeField] private float spawnDistanceBelowScreen = 2f;
-
-        [Tooltip("Horizontal spawn range (distance from center)")]
-        [SerializeField] private float spawnRangeX = 8f;
-
         [Header("Obstacle Properties Randomization")]
         [Tooltip("Minimum movement speed for spawned obstacles")]
         [SerializeField] private float minMoveSpeed = 1f;
@@ -467,14 +460,6 @@ namespace Minigames.DivingForPictures
             spawnInterval = interval;
         }
 
-        /// <summary>
-        /// Public method to change spawn range at runtime
-        /// </summary>
-        public void SetSpawnRange(float range)
-        {
-            spawnRangeX = range;
-        }
-
         /// <summary>
         /// Public method to set speed range at runtime
         /// </summary>
diff --git a/Assets/Scripts/Minigames/DivingForPictures/ObstacleSpawner.cs.meta b/Assets/Scripts/Minigames/DivingForPictures/Obstacles/ObstacleSpawner.cs.meta
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/ObstacleSpawner.cs.meta
rename to Assets/Scripts/Minigames/DivingForPictures/Obstacles/ObstacleSpawner.cs.meta
diff --git a/Assets/Scripts/Minigames/DivingForPictures/Player.meta b/Assets/Scripts/Minigames/DivingForPictures/Player.meta
new file mode 100644
index 00000000..b2d75031
--- /dev/null
+++ b/Assets/Scripts/Minigames/DivingForPictures/Player.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f6ccbb338a48404cae0e954b63e8cd3b
+timeCreated: 1758543727
\ No newline at end of file
diff --git a/Assets/Scripts/Minigames/DivingForPictures/PlayerBlinkBehavior.cs b/Assets/Scripts/Minigames/DivingForPictures/Player/PlayerBlinkBehavior.cs
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/PlayerBlinkBehavior.cs
rename to Assets/Scripts/Minigames/DivingForPictures/Player/PlayerBlinkBehavior.cs
diff --git a/Assets/Scripts/Minigames/DivingForPictures/PlayerBlinkBehavior.cs.meta b/Assets/Scripts/Minigames/DivingForPictures/Player/PlayerBlinkBehavior.cs.meta
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/PlayerBlinkBehavior.cs.meta
rename to Assets/Scripts/Minigames/DivingForPictures/Player/PlayerBlinkBehavior.cs.meta
diff --git a/Assets/Scripts/Minigames/DivingForPictures/PlayerCollisionBehavior.cs b/Assets/Scripts/Minigames/DivingForPictures/Player/PlayerCollisionBehavior.cs
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/PlayerCollisionBehavior.cs
rename to Assets/Scripts/Minigames/DivingForPictures/Player/PlayerCollisionBehavior.cs
diff --git a/Assets/Scripts/Minigames/DivingForPictures/PlayerCollisionBehavior.cs.meta b/Assets/Scripts/Minigames/DivingForPictures/Player/PlayerCollisionBehavior.cs.meta
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/PlayerCollisionBehavior.cs.meta
rename to Assets/Scripts/Minigames/DivingForPictures/Player/PlayerCollisionBehavior.cs.meta
diff --git a/Assets/Scripts/Minigames/DivingForPictures/PlayerController.cs b/Assets/Scripts/Minigames/DivingForPictures/Player/PlayerController.cs
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/PlayerController.cs
rename to Assets/Scripts/Minigames/DivingForPictures/Player/PlayerController.cs
diff --git a/Assets/Scripts/Minigames/DivingForPictures/PlayerController.cs.meta b/Assets/Scripts/Minigames/DivingForPictures/Player/PlayerController.cs.meta
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/PlayerController.cs.meta
rename to Assets/Scripts/Minigames/DivingForPictures/Player/PlayerController.cs.meta
diff --git a/Assets/Scripts/Movement/RockFollower.cs b/Assets/Scripts/Minigames/DivingForPictures/Player/RockFollower.cs
similarity index 100%
rename from Assets/Scripts/Movement/RockFollower.cs
rename to Assets/Scripts/Minigames/DivingForPictures/Player/RockFollower.cs
diff --git a/Assets/Scripts/Movement/RockFollower.cs.meta b/Assets/Scripts/Minigames/DivingForPictures/Player/RockFollower.cs.meta
similarity index 100%
rename from Assets/Scripts/Movement/RockFollower.cs.meta
rename to Assets/Scripts/Minigames/DivingForPictures/Player/RockFollower.cs.meta
diff --git a/Assets/Scripts/Minigames/DivingForPictures/RopeBreaker.cs b/Assets/Scripts/Minigames/DivingForPictures/Player/RopeBreaker.cs
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/RopeBreaker.cs
rename to Assets/Scripts/Minigames/DivingForPictures/Player/RopeBreaker.cs
diff --git a/Assets/Scripts/Minigames/DivingForPictures/RopeBreaker.cs.meta b/Assets/Scripts/Minigames/DivingForPictures/Player/RopeBreaker.cs.meta
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/RopeBreaker.cs.meta
rename to Assets/Scripts/Minigames/DivingForPictures/Player/RopeBreaker.cs.meta
diff --git a/Assets/Scripts/Minigames/DivingForPictures/RopeEndPhysicsFollower.cs b/Assets/Scripts/Minigames/DivingForPictures/Player/RopeEndPhysicsFollower.cs
similarity index 99%
rename from Assets/Scripts/Minigames/DivingForPictures/RopeEndPhysicsFollower.cs
rename to Assets/Scripts/Minigames/DivingForPictures/Player/RopeEndPhysicsFollower.cs
index a9549101..b9ac81fa 100644
--- a/Assets/Scripts/Minigames/DivingForPictures/RopeEndPhysicsFollower.cs
+++ b/Assets/Scripts/Minigames/DivingForPictures/Player/RopeEndPhysicsFollower.cs
@@ -212,7 +212,7 @@ public class RopeEndPhysicsFollower : MonoBehaviour
         if (attachedRope == null)
         {
             // Find any rope that has this transform as an endpoint
-            Rope[] allRopes = FindObjectsOfType<Rope>();
+            Rope[] allRopes = FindObjectsByType<Rope>(FindObjectsSortMode.None);
             foreach (var rope in allRopes)
             {
                 if (rope.EndPoint == transform || rope.StartPoint == transform)
diff --git a/Assets/Scripts/Minigames/DivingForPictures/RopeEndPhysicsFollower.cs.meta b/Assets/Scripts/Minigames/DivingForPictures/Player/RopeEndPhysicsFollower.cs.meta
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/RopeEndPhysicsFollower.cs.meta
rename to Assets/Scripts/Minigames/DivingForPictures/Player/RopeEndPhysicsFollower.cs.meta
diff --git a/Assets/Scripts/Minigames/DivingForPictures/TileBumpCollision.cs b/Assets/Scripts/Minigames/DivingForPictures/Player/TileBumpCollision.cs
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/TileBumpCollision.cs
rename to Assets/Scripts/Minigames/DivingForPictures/Player/TileBumpCollision.cs
diff --git a/Assets/Scripts/Minigames/DivingForPictures/TileBumpCollision.cs.meta b/Assets/Scripts/Minigames/DivingForPictures/Player/TileBumpCollision.cs.meta
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/TileBumpCollision.cs.meta
rename to Assets/Scripts/Minigames/DivingForPictures/Player/TileBumpCollision.cs.meta
diff --git a/Assets/Scripts/Movement/WobbleBehavior.cs b/Assets/Scripts/Minigames/DivingForPictures/Player/WobbleBehavior.cs
similarity index 100%
rename from Assets/Scripts/Movement/WobbleBehavior.cs
rename to Assets/Scripts/Minigames/DivingForPictures/Player/WobbleBehavior.cs
diff --git a/Assets/Scripts/Movement/WobbleBehavior.cs.meta b/Assets/Scripts/Minigames/DivingForPictures/Player/WobbleBehavior.cs.meta
similarity index 100%
rename from Assets/Scripts/Movement/WobbleBehavior.cs.meta
rename to Assets/Scripts/Minigames/DivingForPictures/Player/WobbleBehavior.cs.meta
diff --git a/Assets/Scripts/Minigames/DivingForPictures/Tiles.meta b/Assets/Scripts/Minigames/DivingForPictures/Tiles.meta
new file mode 100644
index 00000000..a632f3e5
--- /dev/null
+++ b/Assets/Scripts/Minigames/DivingForPictures/Tiles.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: b3dbc161316c4b41a7555e9139539aee
+timeCreated: 1758543757
\ No newline at end of file
diff --git a/Assets/Scripts/Tile.cs b/Assets/Scripts/Minigames/DivingForPictures/Tiles/Tile.cs
similarity index 100%
rename from Assets/Scripts/Tile.cs
rename to Assets/Scripts/Minigames/DivingForPictures/Tiles/Tile.cs
diff --git a/Assets/Scripts/Tile.cs.meta b/Assets/Scripts/Minigames/DivingForPictures/Tiles/Tile.cs.meta
similarity index 100%
rename from Assets/Scripts/Tile.cs.meta
rename to Assets/Scripts/Minigames/DivingForPictures/Tiles/Tile.cs.meta
diff --git a/Assets/Scripts/Minigames/DivingForPictures/TrenchTilePool.cs b/Assets/Scripts/Minigames/DivingForPictures/Tiles/TrenchTilePool.cs
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/TrenchTilePool.cs
rename to Assets/Scripts/Minigames/DivingForPictures/Tiles/TrenchTilePool.cs
diff --git a/Assets/Scripts/Minigames/DivingForPictures/TrenchTilePool.cs.meta b/Assets/Scripts/Minigames/DivingForPictures/Tiles/TrenchTilePool.cs.meta
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/TrenchTilePool.cs.meta
rename to Assets/Scripts/Minigames/DivingForPictures/Tiles/TrenchTilePool.cs.meta
diff --git a/Assets/Scripts/Minigames/DivingForPictures/TrenchTileSpawner.cs b/Assets/Scripts/Minigames/DivingForPictures/Tiles/TrenchTileSpawner.cs
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/TrenchTileSpawner.cs
rename to Assets/Scripts/Minigames/DivingForPictures/Tiles/TrenchTileSpawner.cs
diff --git a/Assets/Scripts/Minigames/DivingForPictures/TrenchTileSpawner.cs.meta b/Assets/Scripts/Minigames/DivingForPictures/Tiles/TrenchTileSpawner.cs.meta
similarity index 100%
rename from Assets/Scripts/Minigames/DivingForPictures/TrenchTileSpawner.cs.meta
rename to Assets/Scripts/Minigames/DivingForPictures/Tiles/TrenchTileSpawner.cs.meta