diff --git a/src/main/java/emu/lunarcore/commands/PlayerCommands.java b/src/main/java/emu/lunarcore/commands/PlayerCommands.java
index 4da136d..825260a 100644
--- a/src/main/java/emu/lunarcore/commands/PlayerCommands.java
+++ b/src/main/java/emu/lunarcore/commands/PlayerCommands.java
@@ -11,7 +11,7 @@ import emu.lunarcore.data.excel.NpcMonsterExcel;
 import emu.lunarcore.data.excel.StageExcel;
 import emu.lunarcore.game.inventory.GameItem;
 import emu.lunarcore.game.player.Player;
-import emu.lunarcore.game.scene.EntityMonster;
+import emu.lunarcore.game.scene.entity.EntityMonster;
 import emu.lunarcore.util.Position;
 
 @SuppressWarnings("unused")
diff --git a/src/main/java/emu/lunarcore/data/config/PropInfo.java b/src/main/java/emu/lunarcore/data/config/PropInfo.java
index a7e368e..a575a74 100644
--- a/src/main/java/emu/lunarcore/data/config/PropInfo.java
+++ b/src/main/java/emu/lunarcore/data/config/PropInfo.java
@@ -1,6 +1,6 @@
 package emu.lunarcore.data.config;
 
-import emu.lunarcore.game.scene.PropState;
+import emu.lunarcore.game.scene.entity.PropState;
 import lombok.Getter;
 
 @Getter
diff --git a/src/main/java/emu/lunarcore/game/avatar/GameAvatar.java b/src/main/java/emu/lunarcore/game/avatar/GameAvatar.java
index ac588c8..04591b4 100644
--- a/src/main/java/emu/lunarcore/game/avatar/GameAvatar.java
+++ b/src/main/java/emu/lunarcore/game/avatar/GameAvatar.java
@@ -15,7 +15,7 @@ import emu.lunarcore.data.excel.AvatarExcel;
 import emu.lunarcore.game.inventory.GameItem;
 import emu.lunarcore.game.inventory.ItemMainType;
 import emu.lunarcore.game.player.Player;
-import emu.lunarcore.game.scene.GameEntity;
+import emu.lunarcore.game.scene.entity.GameEntity;
 import emu.lunarcore.proto.AvatarOuterClass.Avatar;
 import emu.lunarcore.proto.AvatarSkillTreeOuterClass.AvatarSkillTree;
 import emu.lunarcore.proto.AvatarTypeOuterClass.AvatarType;
diff --git a/src/main/java/emu/lunarcore/game/battle/Battle.java b/src/main/java/emu/lunarcore/game/battle/Battle.java
index 8b5bb12..7eb7683 100644
--- a/src/main/java/emu/lunarcore/game/battle/Battle.java
+++ b/src/main/java/emu/lunarcore/game/battle/Battle.java
@@ -9,7 +9,7 @@ import emu.lunarcore.data.excel.StageExcel;
 import emu.lunarcore.game.avatar.GameAvatar;
 import emu.lunarcore.game.player.Player;
 import emu.lunarcore.game.player.PlayerLineup;
-import emu.lunarcore.game.scene.EntityMonster;
+import emu.lunarcore.game.scene.entity.EntityMonster;
 import emu.lunarcore.proto.SceneBattleInfoOuterClass.SceneBattleInfo;
 import emu.lunarcore.proto.SceneMonsterOuterClass.SceneMonster;
 import emu.lunarcore.proto.SceneMonsterWaveOuterClass.SceneMonsterWave;
diff --git a/src/main/java/emu/lunarcore/game/battle/BattleService.java b/src/main/java/emu/lunarcore/game/battle/BattleService.java
index cb1ae2b..3fac317 100644
--- a/src/main/java/emu/lunarcore/game/battle/BattleService.java
+++ b/src/main/java/emu/lunarcore/game/battle/BattleService.java
@@ -8,9 +8,9 @@ import java.util.Objects;
 import emu.lunarcore.data.GameData;
 import emu.lunarcore.game.avatar.GameAvatar;
 import emu.lunarcore.game.player.Player;
-import emu.lunarcore.game.scene.EntityMonster;
-import emu.lunarcore.game.scene.EntityProp;
-import emu.lunarcore.game.scene.GameEntity;
+import emu.lunarcore.game.scene.entity.EntityMonster;
+import emu.lunarcore.game.scene.entity.EntityProp;
+import emu.lunarcore.game.scene.entity.GameEntity;
 import emu.lunarcore.proto.AvatarBattleInfoOuterClass.AvatarBattleInfo;
 import emu.lunarcore.proto.AvatarPropertyOuterClass.AvatarProperty;
 import emu.lunarcore.proto.BattleEndStatusOuterClass.BattleEndStatus;
diff --git a/src/main/java/emu/lunarcore/game/scene/Scene.java b/src/main/java/emu/lunarcore/game/scene/Scene.java
index da33c71..954a28b 100644
--- a/src/main/java/emu/lunarcore/game/scene/Scene.java
+++ b/src/main/java/emu/lunarcore/game/scene/Scene.java
@@ -11,6 +11,7 @@ import emu.lunarcore.data.excel.NpcMonsterExcel;
 import emu.lunarcore.data.excel.StageExcel;
 import emu.lunarcore.game.avatar.GameAvatar;
 import emu.lunarcore.game.player.PlayerLineup;
+import emu.lunarcore.game.scene.entity.*;
 import emu.lunarcore.game.player.Player;
 import emu.lunarcore.proto.SceneEntityGroupInfoOuterClass.SceneEntityGroupInfo;
 import emu.lunarcore.proto.SceneInfoOuterClass.SceneInfo;
diff --git a/src/main/java/emu/lunarcore/game/scene/EntityMonster.java b/src/main/java/emu/lunarcore/game/scene/entity/EntityMonster.java
similarity index 97%
rename from src/main/java/emu/lunarcore/game/scene/EntityMonster.java
rename to src/main/java/emu/lunarcore/game/scene/entity/EntityMonster.java
index 866394f..a54cb15 100644
--- a/src/main/java/emu/lunarcore/game/scene/EntityMonster.java
+++ b/src/main/java/emu/lunarcore/game/scene/entity/EntityMonster.java
@@ -1,4 +1,4 @@
-package emu.lunarcore.game.scene;
+package emu.lunarcore.game.scene.entity;
 
 import emu.lunarcore.data.excel.NpcMonsterExcel;
 import emu.lunarcore.data.excel.StageExcel;
diff --git a/src/main/java/emu/lunarcore/game/scene/EntityNpc.java b/src/main/java/emu/lunarcore/game/scene/entity/EntityNpc.java
similarity index 96%
rename from src/main/java/emu/lunarcore/game/scene/EntityNpc.java
rename to src/main/java/emu/lunarcore/game/scene/entity/EntityNpc.java
index 5c1549f..9bd19d7 100644
--- a/src/main/java/emu/lunarcore/game/scene/EntityNpc.java
+++ b/src/main/java/emu/lunarcore/game/scene/entity/EntityNpc.java
@@ -1,4 +1,4 @@
-package emu.lunarcore.game.scene;
+package emu.lunarcore.game.scene.entity;
 
 import emu.lunarcore.proto.MotionInfoOuterClass.MotionInfo;
 import emu.lunarcore.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
diff --git a/src/main/java/emu/lunarcore/game/scene/EntityProp.java b/src/main/java/emu/lunarcore/game/scene/entity/EntityProp.java
similarity index 97%
rename from src/main/java/emu/lunarcore/game/scene/EntityProp.java
rename to src/main/java/emu/lunarcore/game/scene/entity/EntityProp.java
index 4fee023..eea34d1 100644
--- a/src/main/java/emu/lunarcore/game/scene/EntityProp.java
+++ b/src/main/java/emu/lunarcore/game/scene/entity/EntityProp.java
@@ -1,4 +1,4 @@
-package emu.lunarcore.game.scene;
+package emu.lunarcore.game.scene.entity;
 
 import emu.lunarcore.data.excel.NpcMonsterExcel;
 import emu.lunarcore.data.excel.StageExcel;
diff --git a/src/main/java/emu/lunarcore/game/scene/GameEntity.java b/src/main/java/emu/lunarcore/game/scene/entity/GameEntity.java
similarity index 89%
rename from src/main/java/emu/lunarcore/game/scene/GameEntity.java
rename to src/main/java/emu/lunarcore/game/scene/entity/GameEntity.java
index f9139d7..f8259af 100644
--- a/src/main/java/emu/lunarcore/game/scene/GameEntity.java
+++ b/src/main/java/emu/lunarcore/game/scene/entity/GameEntity.java
@@ -1,4 +1,4 @@
-package emu.lunarcore.game.scene;
+package emu.lunarcore.game.scene.entity;
 
 import emu.lunarcore.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
 
diff --git a/src/main/java/emu/lunarcore/game/scene/PropState.java b/src/main/java/emu/lunarcore/game/scene/entity/PropState.java
similarity index 95%
rename from src/main/java/emu/lunarcore/game/scene/PropState.java
rename to src/main/java/emu/lunarcore/game/scene/entity/PropState.java
index 57b5917..02371d1 100644
--- a/src/main/java/emu/lunarcore/game/scene/PropState.java
+++ b/src/main/java/emu/lunarcore/game/scene/entity/PropState.java
@@ -1,4 +1,4 @@
-package emu.lunarcore.game.scene;
+package emu.lunarcore.game.scene.entity;
 
 import lombok.Getter;
 
diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSceneCastSkillScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSceneCastSkillScRsp.java
index 80bd09b..812618d 100644
--- a/src/main/java/emu/lunarcore/server/packet/send/PacketSceneCastSkillScRsp.java
+++ b/src/main/java/emu/lunarcore/server/packet/send/PacketSceneCastSkillScRsp.java
@@ -3,8 +3,8 @@ package emu.lunarcore.server.packet.send;
 import emu.lunarcore.game.avatar.GameAvatar;
 import emu.lunarcore.game.battle.Battle;
 import emu.lunarcore.game.player.PlayerLineup;
+import emu.lunarcore.game.scene.entity.EntityMonster;
 import emu.lunarcore.game.player.Player;
-import emu.lunarcore.game.scene.EntityMonster;
 import emu.lunarcore.proto.SceneBattleInfoOuterClass.SceneBattleInfo;
 import emu.lunarcore.proto.SceneCastSkillScRspOuterClass.SceneCastSkillScRsp;
 import emu.lunarcore.proto.SceneMonsterOuterClass.SceneMonster;
diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSceneEntityUpdateScNotify.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSceneEntityUpdateScNotify.java
index f4dc7b5..3779fae 100644
--- a/src/main/java/emu/lunarcore/server/packet/send/PacketSceneEntityUpdateScNotify.java
+++ b/src/main/java/emu/lunarcore/server/packet/send/PacketSceneEntityUpdateScNotify.java
@@ -1,6 +1,6 @@
 package emu.lunarcore.server.packet.send;
 
-import emu.lunarcore.game.scene.GameEntity;
+import emu.lunarcore.game.scene.entity.GameEntity;
 import emu.lunarcore.proto.SceneEntityUpdateScNotifyOuterClass.SceneEntityUpdateScNotify;
 import emu.lunarcore.server.packet.BasePacket;
 import emu.lunarcore.server.packet.CmdId;
diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSceneGroupRefreshScNotify.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSceneGroupRefreshScNotify.java
index 98f03b9..7d69ffe 100644
--- a/src/main/java/emu/lunarcore/server/packet/send/PacketSceneGroupRefreshScNotify.java
+++ b/src/main/java/emu/lunarcore/server/packet/send/PacketSceneGroupRefreshScNotify.java
@@ -2,7 +2,7 @@ package emu.lunarcore.server.packet.send;
 
 import java.util.Collection;
 
-import emu.lunarcore.game.scene.GameEntity;
+import emu.lunarcore.game.scene.entity.GameEntity;
 import emu.lunarcore.proto.SceneEntityRefreshInfoOuterClass.SceneEntityRefreshInfo;
 import emu.lunarcore.proto.SceneGroupRefreshInfoOuterClass.SceneGroupRefreshInfo;
 import emu.lunarcore.proto.SceneGroupRefreshScNotifyOuterClass.SceneGroupRefreshScNotify;