diff --git a/FunGame.Core/Entity/Item/Item.cs b/FunGame.Core/Entity/Item/Item.cs
index 0dcb855..7533219 100644
--- a/FunGame.Core/Entity/Item/Item.cs
+++ b/FunGame.Core/Entity/Item/Item.cs
@@ -17,7 +17,7 @@ namespace Milimoe.FunGame.Core.Entity
         public bool Enable { get; set; }
         public Character? Character { get; set; } = null;
 
-        public override IEnumerator<IEnumerable> GetEnumerator()
+        public override IEnumerator<IBaseEntity> GetEnumerator()
         {
             return GetEnumerator();
         }
diff --git a/FunGame.Core/Entity/Item/PassiveItem.cs b/FunGame.Core/Entity/Item/PassiveItem.cs
index 204dc3f..5c79994 100644
--- a/FunGame.Core/Entity/Item/PassiveItem.cs
+++ b/FunGame.Core/Entity/Item/PassiveItem.cs
@@ -1,10 +1,10 @@
-using Milimoe.FunGame.Core.Interface.Entity;
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Milimoe.FunGame.Core.Interface.Entity;
 
 namespace Milimoe.FunGame.Core.Entity
 {
diff --git a/FunGame.Core/Interface/Entity/BaseEntity.cs b/FunGame.Core/Interface/Entity/Base/BaseEntity.cs
similarity index 89%
rename from FunGame.Core/Interface/Entity/BaseEntity.cs
rename to FunGame.Core/Interface/Entity/Base/BaseEntity.cs
index 5c691f2..c7b78ff 100644
--- a/FunGame.Core/Interface/Entity/BaseEntity.cs
+++ b/FunGame.Core/Interface/Entity/Base/BaseEntity.cs
@@ -14,7 +14,7 @@ namespace Milimoe.FunGame.Core.Interface.Entity
         public string Name { get; set; } = "";
 
         public abstract bool Equals(IBaseEntity? other);
-        public abstract IEnumerator<IEnumerable> GetEnumerator();
+        public abstract IEnumerator<IBaseEntity> GetEnumerator();
 
         IEnumerator IEnumerable.GetEnumerator()
         {
diff --git a/FunGame.Core/Interface/Entity/IBaseEntity.cs b/FunGame.Core/Interface/Entity/Base/IBaseEntity.cs
similarity index 94%
rename from FunGame.Core/Interface/Entity/IBaseEntity.cs
rename to FunGame.Core/Interface/Entity/Base/IBaseEntity.cs
index acd3b6f..d9d4f8d 100644
--- a/FunGame.Core/Interface/Entity/IBaseEntity.cs
+++ b/FunGame.Core/Interface/Entity/Base/IBaseEntity.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace Milimoe.FunGame.Core.Interface.Entity
 {
-    public interface IBaseEntity : IEquatable<IBaseEntity>, IEnumerable<IEnumerable>
+    public interface IBaseEntity : IEquatable<IBaseEntity>, IEnumerable<IBaseEntity>
     {
         public int Id { get; }
         public Guid Guid { get; }
diff --git a/FunGame.Core/Interface/Entity/IActiveEnable.cs b/FunGame.Core/Interface/Entity/Property/IActiveEnable.cs
similarity index 100%
rename from FunGame.Core/Interface/Entity/IActiveEnable.cs
rename to FunGame.Core/Interface/Entity/Property/IActiveEnable.cs
diff --git a/FunGame.Core/Interface/Entity/ICharacter.cs b/FunGame.Core/Interface/Entity/Typical/ICharacter.cs
similarity index 100%
rename from FunGame.Core/Interface/Entity/ICharacter.cs
rename to FunGame.Core/Interface/Entity/Typical/ICharacter.cs
diff --git a/FunGame.Core/Interface/Entity/IItem.cs b/FunGame.Core/Interface/Entity/Typical/IItem.cs
similarity index 100%
rename from FunGame.Core/Interface/Entity/IItem.cs
rename to FunGame.Core/Interface/Entity/Typical/IItem.cs