diff --git a/gisim/Status/__init__.py b/gisim/Status/__init__.py
index 7b685eb..f607534 100644
--- a/gisim/Status/__init__.py
+++ b/gisim/Status/__init__.py
@@ -3,10 +3,10 @@
 
 from gisim.classes.enums import CharPos, ElementType, PlayerID, StatusType
 from gisim.env import INF_INT
-from gisim.status.base import CharacterStatusEntity, CombatStatusEntity
-from gisim.status.character_status import *
-from gisim.status.combat_status import get_combat_status_entity
-from gisim.status.reaction_status import *
+from gisim.classes.status import CharacterStatusEntity, CombatStatusEntity
+from gisim.classes.status.character_status import *
+from gisim.classes.status.combat_status import get_combat_status_entity
+from gisim.classes.status.reaction_status import *
 
 
 def get_character_status_entity(
diff --git a/gisim/Status/character_status/RaidenShogun.py b/gisim/Status/character_status/RaidenShogun.py
index 0627fb1..84499b4 100644
--- a/gisim/Status/character_status/RaidenShogun.py
+++ b/gisim/Status/character_status/RaidenShogun.py
@@ -5,7 +5,7 @@
 from gisim.classes.enums import AttackType, StatusType
 from gisim.classes.message import DealDamageMsg
 from gisim.env import INF_INT
-from gisim.status import CharacterStatusEntity
+from gisim.classes.status import CharacterStatusEntity
 
 
 class ChakraDesiderata(CharacterStatusEntity):
diff --git a/gisim/Status/character_status/Razor.py b/gisim/Status/character_status/Razor.py
index af444ea..d35b04b 100644
--- a/gisim/Status/character_status/Razor.py
+++ b/gisim/Status/character_status/Razor.py
@@ -4,7 +4,7 @@
 from gisim.classes.enums import AttackType, ElementType, StatusType
 from gisim.classes.message import DealDamageMsg, RoundEndMsg
 from gisim.env import INF_INT
-from gisim.status import CharacterStatusEntity
+from gisim.classes.status import CharacterStatusEntity
 
 
 class TheWolfWithin(CharacterStatusEntity):
diff --git a/gisim/Status/character_status/Tighnari.py b/gisim/Status/character_status/Tighnari.py
index a556b46..3b08fa7 100644
--- a/gisim/Status/character_status/Tighnari.py
+++ b/gisim/Status/character_status/Tighnari.py
@@ -4,7 +4,7 @@
 from gisim.classes.enums import *
 from gisim.classes.message import DealDamageMsg, RoundEndMsg
 from gisim.env import INF_INT
-from gisim.status.base import CharacterStatusEntity
+from gisim.classes.status import CharacterStatusEntity
 
 
 class VijanaSuffusion(CharacterStatusEntity):
diff --git a/gisim/Status/character_status/elemental_infusion.py b/gisim/Status/character_status/elemental_infusion.py
index 2e24bdf..f5bf556 100644
--- a/gisim/Status/character_status/elemental_infusion.py
+++ b/gisim/Status/character_status/elemental_infusion.py
@@ -4,7 +4,7 @@
 from gisim.classes.enums import *
 from gisim.classes.message import DealDamageMsg, RoundEndMsg
 from gisim.env import INF_INT
-from gisim.status.base import CharacterStatusEntity
+from gisim.classes.status import CharacterStatusEntity
 
 
 class ElementalInfusion(CharacterStatusEntity):
diff --git a/gisim/Status/combat_status/Chongyun.py b/gisim/Status/combat_status/Chongyun.py
index 3560e2f..99085b8 100644
--- a/gisim/Status/combat_status/Chongyun.py
+++ b/gisim/Status/combat_status/Chongyun.py
@@ -1,7 +1,7 @@
 from queue import PriorityQueue
 
 from gisim.env import INF_INT
-from gisim.status import CombatStatusEntity
+from gisim.classes.status import CombatStatusEntity
 
 
 class ChonghuasFrostField(CombatStatusEntity):
diff --git a/gisim/Status/combat_status/Shield.py b/gisim/Status/combat_status/Shield.py
index e41542f..59dbc11 100644
--- a/gisim/Status/combat_status/Shield.py
+++ b/gisim/Status/combat_status/Shield.py
@@ -3,7 +3,7 @@
 
 from gisim.classes.message import DealDamageMsg
 from gisim.env import INF_INT
-from gisim.status import CombatStatusEntity
+from gisim.classes.status import CombatStatusEntity
 
 
 class Shield(CombatStatusEntity):
diff --git a/gisim/Status/combat_status/Xingqiu.py b/gisim/Status/combat_status/Xingqiu.py
index 03dff4c..409fe85 100644
--- a/gisim/Status/combat_status/Xingqiu.py
+++ b/gisim/Status/combat_status/Xingqiu.py
@@ -4,7 +4,7 @@
 from gisim.classes.enums import *
 from gisim.classes.message import AfterUsingSkillMsg, DealDamageMsg, RoundEndMsg
 from gisim.env import INF_INT
-from gisim.status.base import CombatStatusEntity
+from gisim.classes.status import CombatStatusEntity
 
 
 class RainSword(CombatStatusEntity):
diff --git a/gisim/Status/combat_status/__init__.py b/gisim/Status/combat_status/__init__.py
index 1bcf187..ac60190 100644
--- a/gisim/Status/combat_status/__init__.py
+++ b/gisim/Status/combat_status/__init__.py
@@ -1,6 +1,6 @@
 from gisim.classes.enums import PlayerID
 from gisim.env import INF_INT
-from gisim.status.base import CombatStatusEntity
+from gisim.classes.status import CombatStatusEntity
 
 from .Chongyun import *
 from .dendro_reaction import *
diff --git a/gisim/Status/combat_status/dendro_reaction.py b/gisim/Status/combat_status/dendro_reaction.py
index 84eb0dd..5bde58a 100644
--- a/gisim/Status/combat_status/dendro_reaction.py
+++ b/gisim/Status/combat_status/dendro_reaction.py
@@ -4,7 +4,7 @@
 from gisim.classes.enums import *
 from gisim.classes.message import DealDamageMsg
 from gisim.env import INF_INT
-from gisim.status.base import CombatStatusEntity
+from gisim.classes.status import CombatStatusEntity
 
 
 class DendroCore(CombatStatusEntity):
diff --git a/gisim/Status/reaction_status/frozen_effect.py b/gisim/Status/reaction_status/frozen_effect.py
index 63fa1a7..a3b29f2 100644
--- a/gisim/Status/reaction_status/frozen_effect.py
+++ b/gisim/Status/reaction_status/frozen_effect.py
@@ -3,7 +3,7 @@
 
 from gisim.classes.enums import *
 from gisim.classes.message import DealDamageMsg, RoundEndMsg
-from gisim.status.base import CharacterStatusEntity
+from gisim.classes.status import CharacterStatusEntity
 
 
 class FrozenEffect(CharacterStatusEntity):
diff --git a/gisim/cards/characters/Anemo/Venti.py b/gisim/cards/characters/Anemo/Venti.py
index c2460a3..fd60e40 100644
--- a/gisim/cards/characters/Anemo/Venti.py
+++ b/gisim/cards/characters/Anemo/Venti.py
@@ -7,7 +7,7 @@
 from gisim.classes.message import PayChangeCharacterCostMsg
 from gisim.classes.summon import AttackSummon
 from gisim.env import INF_INT
-from gisim.status import CombatStatusEntity
+from gisim.classes.status import CombatStatusEntity
 
 
 class DivineMarksmanship(GenericSkill):
diff --git a/gisim/cards/characters/Anemo/Xiao.py b/gisim/cards/characters/Anemo/Xiao.py
index cf913f4..e3a1b32 100644
--- a/gisim/cards/characters/Anemo/Xiao.py
+++ b/gisim/cards/characters/Anemo/Xiao.py
@@ -5,7 +5,7 @@
 from gisim.cards.characters.base import CharacterCard, CharacterSkill, GenericSkill
 from gisim.classes.enums import ElementType, Nation, SkillType, StatusType, WeaponType
 from gisim.classes.message import DealDamageMsg
-from gisim.status import CharacterStatusEntity
+from gisim.classes.status import CharacterStatusEntity
 
 
 class WhirlwindThrust(GenericSkill):
diff --git a/gisim/cards/characters/Cryo/Eula.py b/gisim/cards/characters/Cryo/Eula.py
index b8657fa..7428e52 100644
--- a/gisim/cards/characters/Cryo/Eula.py
+++ b/gisim/cards/characters/Cryo/Eula.py
@@ -6,7 +6,7 @@
 from gisim.classes.enums import ElementType, Nation, SkillType, StatusType, WeaponType
 from gisim.classes.message import DealDamageMsg
 from gisim.classes.summon import AttackSummon
-from gisim.status import CharacterStatusEntity
+from gisim.classes.status import CharacterStatusEntity
 
 
 class FavoniusBladeworkEdel(GenericSkill):
diff --git a/gisim/cards/characters/Electro/RaidenShogun.py b/gisim/cards/characters/Electro/RaidenShogun.py
index ff3fc02..cdae45e 100644
--- a/gisim/cards/characters/Electro/RaidenShogun.py
+++ b/gisim/cards/characters/Electro/RaidenShogun.py
@@ -2,6 +2,8 @@
 from queue import PriorityQueue
 from typing import TYPE_CHECKING, Dict, cast
 
+from classes.status import CharacterStatusEntity
+
 from gisim.cards.characters.base import CharacterCard, CharacterSkill, GenericSkill
 from gisim.classes.enums import (
     AttackType,
@@ -217,3 +219,5 @@ class RaidenShogun(CharacterCard):
         SecretArtMusouShinsetsu(),
         ChakraDesiderata(),
     ]
+
+
diff --git a/gisim/cards/characters/Pyro/Hutao.py b/gisim/cards/characters/Pyro/Hutao.py
index 7840829..8b12721 100644
--- a/gisim/cards/characters/Pyro/Hutao.py
+++ b/gisim/cards/characters/Pyro/Hutao.py
@@ -2,6 +2,8 @@
 from queue import PriorityQueue
 from typing import TYPE_CHECKING, Dict, List, cast
 
+from classes.status import CharacterStatusEntity
+
 from gisim.cards.characters.base import CharacterCard, CharacterSkill, GenericSkill
 from gisim.classes.enums import (
     AttackType,
@@ -11,7 +13,7 @@
     StatusType,
     WeaponType,
 )
-from gisim.classes.message import DealDamageMsg, HealHpMsg, UseSkillMsg
+from gisim.classes.message import DealDamageMsg, HealHpMsg, RoundEndMsg, UseSkillMsg
 from gisim.env import INF_INT
 
 if TYPE_CHECKING:
diff --git a/gisim/classes/status.py b/gisim/classes/status.py
index b285982..38b1e78 100644
--- a/gisim/classes/status.py
+++ b/gisim/classes/status.py
@@ -50,6 +50,7 @@ def encode(self):
 
 
 class ElementalInfusion(CharacterStatusEntity):
+    """元素附魔"""
     name: str
     element: ElementType
     description: str = "Convert physical damage into elemental damage"
diff --git a/gisim/player_area.py b/gisim/player_area.py
index c51a363..91787c6 100644
--- a/gisim/player_area.py
+++ b/gisim/player_area.py
@@ -36,7 +36,7 @@
 )
 
 # from gisim.classes.status import CharacterStatusEntity, get_character_status_entity
-from gisim.status import (
+from gisim.classes.status import (
     CharacterStatusEntity,
     CombatStatusEntity,
     get_character_status_entity,
@@ -47,7 +47,7 @@
     from gisim.classes.summon import Summon
     from gisim.classes.support import Support
     from gisim.game import Game
-    from gisim.status import CombatStatusEntity
+    from gisim.classes.status import CombatStatusEntity
 
 
 class BaseZone(ABC):
diff --git a/tests/generate_character_cards.py b/tools/generate_character_cards.py
similarity index 100%
rename from tests/generate_character_cards.py
rename to tools/generate_character_cards.py