diff --git a/CAPI/cpp/API/include/API.h b/CAPI/cpp/API/include/API.h
index 2eeede3a..631d49d0 100644
--- a/CAPI/cpp/API/include/API.h
+++ b/CAPI/cpp/API/include/API.h
@@ -87,10 +87,7 @@ class IAPI
 
     // 
     virtual std::future<bool> InstallCollectorModule(const THUAI7::CollectorType type) = 0;
-    virtual std::future<bool> InstallArmorModule(const THUAI7::ArmorType type) = 0;
-    virtual std::future<bool> InstallShieldModule(const THUAI7::ShieldType type)=0;
-    virtual std::future<bool> InstallBuilderModule(const THUAI7::BuilderType type) = 0;
-    virtual std::future<bool> InstallBulletModule(const THUAI7::BulletType type) = 0;
+    virtual std::future<bool> InstallModule(const THUAI7::Module type) = 0;
     virtual std::future<bool> Attack(double angleInRadian) = 0;
     virtual std::future<bool> EndAllAction() = 0;
 
diff --git a/CAPI/cpp/API/include/structures.h b/CAPI/cpp/API/include/structures.h
index 6c4bbdd3..151559e3 100644
--- a/CAPI/cpp/API/include/structures.h
+++ b/CAPI/cpp/API/include/structures.h
@@ -18,189 +18,191 @@ namespace THUAI7
     // 游戏状态
     enum class GameState : unsigned char
     {
-        NullGameState = 0;
-        GameStart = 1;
-        GameRunning = 2;
-        GameEnd = 3;
+        NullGameState = 0,
+        GameStart = 1,
+        GameRunning = 2,
+        GameEnd = 3,
     };
     // 所有NullXXXType均为错误类型，其余为可能出现的正常类型
 
     // 位置标志
     enum class PlaceType : unsigned char
     {
-        NullPlaceType = 0;
-        Home = 1;
-        Space = 2;
-        Ruin = 3;
-        Shadow = 4;
-        Asteroid = 5;
-        Resource = 6;
-        Building = 7;
-        Wormhole = 8;
+        NullPlaceType = 0,
+        Home = 1,
+        Space = 2,
+        Ruin = 3,
+        Shadow = 4,
+        Asteroid = 5,
+        Resource = 6,
+        Building = 7,
+        Wormhole = 8,
     };
 
     // 形状标志
     enum class ShapeType : unsigned char
     {
-        NullShapeType = 0;
-        Circle = 1;
-        Square = 2;
+        NullShapeType = 0,
+        Circle = 1,
+        Square = 2,
     };
     
     enum class PlayerTeam : unsigned char
     {
-        NullTeam = 0;
-        Up = 1;
-        Down = 2;
-    }
+        NullTeam = 0,
+        Up = 1,
+        Down = 2,
+    };
 
     enum class ShipType : unsigned char
     {
-        NullShipType = 0;
-        CivilianShip = 1;
-        MilitaryShip = 2;
-        FlagShip = 3;  
-    }
+        NullShipType = 0,
+        CivilianShip = 1,
+        MilitaryShip = 2,
+        FlagShip = 3,  
+    };
 
     enum class ShipState : unsigned char
     {
-        NullStatus = 0;
-        Idle = 1;
-        Producing = 2;
-        Constructing = 3;
-        Recovering = 4;
-        Recycling = 5;
-        Attacking = 6;
-        Swinging = 7;
-        Stunned = 8;
-    }
+        NullStatus = 0,
+        Idle = 1,
+        Producing = 2,
+        Constructing = 3,
+        Recovering = 4,
+        Recycling = 5,
+        Attacking = 6,
+        Swinging = 7,
+        Stunned = 8,
+    };
+
    enum class ModuleType : unsigned char
     {
-        NullModuleType = 0;
-        Collector = 1;
-        Armor = 2;
-        Shield = 3;
-        Weapon = 4;
-        Builder = 5;
-    }
+        NullModuleType = 0,
+        Collector = 1,
+        Armor = 2,
+        Shield = 3,
+        Weapon = 4,
+        Builder = 5,
+    };
 
     enum class ModuleLevel : unsigned char
     {
-        NullModuleLevel = 0;
-        Basic = 1;        //laser
-        Advanced = 2;     //plasma
-        Ultimate = 3;     //shell
-        Missile = 4;
-        ElectricArc = 5;
-    }
+        NullModuleLevel = 0,
+        Basic = 1,        //laser
+        Advanced = 2,     //plasma
+        Ultimate = 3,     //shell
+        Missile = 4,
+        ElectricArc = 5,
+    };
+
     enum class BulletType : unsigned char
     {
-        NullBulletType = 0;
-        Laser = 1;
-        Plasma = 2;
-        Shell = 3;
-        Missile = 4;
-        ElectricArc = 5;
+        NullBulletType = 0,
+        Laser = 1,
+        Plasma = 2,
+        Shell = 3,
+        Missile = 4,
+        ElectricArc = 5,
     };
     enum class BuildingType : unsigned char
     {
-        NullBuildingType = 0;
-        Factory = 1;
-        Community = 2;
-        Fortress = 3;
-    }
+        NullBuildingType = 0,
+        Factory = 1,
+        Community = 2,
+        Fortress = 3,
+    };
 
     enum class MessageOfObj : unsigned char
     {
-        NullMessageOfObj = 0;
-        ShipMessage = 1;
-        BuildingMessage = 2;
-        BulletMessage = 3;
-        ResourceMessage = 4;
-        HomeMessage = 5;
-        MapMessage = 6;
+        NullMessageOfObj = 0,
+        ShipMessage = 1,
+        BuildingMessage = 2,
+        BulletMessage = 3,
+        ResourceMessage = 4,
+        HomeMessage = 5,
+        MapMessage = 6,
     };
 
     enum class NewsType : unsigned char
     {
-        NullNewsType = 0;
-        TextMessage = 1;
-        BinaryMessage = 2;
+        NullNewsType = 0,
+        TextMessage = 1,
+        BinaryMessage = 2,
     };
 
     struct Module
     {
-        ModuleType moduleType;
-        ModuleLevel moduleLevel;
+        ModuleType moduleType,
+        ModuleLevel moduleLevel,
     };
     struct Ship
     {
-        int32_t x;          // x坐标
-        int32_t y;          // y坐标
-        int32_t speed;      // 移动速度
-        int32_t hp;  // 血量
-        int32_t armor;   // 装甲
-        int32_t shield; //护盾
-        //PlaceType place; //所处位置
-        ShipState shipState; //船所处状态
-        ShipType shipType;
-        PlayerTeam team;    //船的阵营
-        std::shared_ptr<Module> module;     //模块   
+        int32_t x,          // x坐标
+        int32_t y,          // y坐标
+        int32_t speed,      // 移动速度
+        int32_t hp,  // 血量
+        int32_t armor,   // 装甲
+        int32_t shield, //护盾
+        //PlaceType place, //所处位置
+        ShipState shipState, //船所处状态
+        ShipType shipType,
+        PlayerTeam team,    //船的阵营
+        std::shared_ptr<Module> module,     //模块   
         int32_t shipID      //船的id
-        int64_t guid;       // 全局唯一ID
-        int32_t economy;    //船获得的经济
-        double facingDirection;         // 朝向
+        int64_t guid,       // 全局唯一ID
+        int32_t economy,    //船获得的经济
+        double facingDirection,         // 朝向
     };
 
     struct Home
     {
-        int32_t x;
-        int32_t y;
-        int32_t hp;
-        int32_t economy;
-        PlayerTeam team;
-        int64_t guid;
-    }
+        int32_t x,
+        int32_t y,
+        int32_t hp,
+        int32_t economy,
+        PlayerTeam team,
+        int64_t guid,
+    };
 
     struct Bullet
     {
-        BulletType bulletType;   // 子弹类型
-        int32_t x;               // x坐标
-        int32_t y;               // y坐标
-        double facingDirection;  // 朝向
-        int64_t guid;            // 全局唯一ID
-        double armorRate;       //装甲穿透
-        double shieldRate;      //护盾穿透
-        int32_t damage;         //伤害值
-        PlayerTeam team;         // 子弹所属队伍
-        // PlaceType place;         // 所处格子的类型
-        double bombRange;  // 炸弹爆炸范围
-        int32_t speed;     // 子弹速度
+        BulletType bulletType,   // 子弹类型
+        int32_t x,               // x坐标
+        int32_t y,               // y坐标
+        double facingDirection,  // 朝向
+        int64_t guid,            // 全局唯一ID
+        double armorRate,       //装甲穿透
+        double shieldRate,      //护盾穿透
+        int32_t damage,         //伤害值
+        PlayerTeam team,         // 子弹所属队伍
+        // PlaceType place,         // 所处格子的类型
+        double bombRange,  // 炸弹爆炸范围
+        int32_t speed,     // 子弹速度
     };
 
     // struct BombedBullet
     // {
-    //     BulletType bulletType;
-    //     int32_t x;
-    //     int32_t y;
-    //     double facingDirection;
-    //     int64_t mappingID;
-    //     double bombRange;
+    //     BulletType bulletType,
+    //     int32_t x,
+    //     int32_t y,
+    //     double facingDirection,
+    //     int64_t mappingID,
+    //     double bombRange,
     // };
 
     struct GameMap
     {
-        std::map<std::pair<int32_t, int32_t>, std::pair<int32_t,PlayerTeam> factoryState;   
-        std::map<std::pair<int32_t, int32_t>, std::pair<int32_t,PlayerTeam> communityState;
-        std::map<std::pair<int32_t, int32_t>, std::pair<int32_t,PlayerTeam> fortressState;
-        std::map<std::pair<int32_t, int32_t>, std::pair<int32_t,PlayerTeam> HomeState;
-        std::map<std::pair<int32_t, int32_t>, int32_t> wormState; 
-        std::map<std::pair<int32_t, int32_t>, int32_t> resourceState;
+        std::map<std::pair<int32_t, int32_t>, std::pair<int32_t,PlayerTeam> factoryState,   
+        std::map<std::pair<int32_t, int32_t>, std::pair<int32_t,PlayerTeam> communityState,
+        std::map<std::pair<int32_t, int32_t>, std::pair<int32_t,PlayerTeam> fortressState,
+        std::map<std::pair<int32_t, int32_t>, std::pair<int32_t,PlayerTeam> HomeState,
+        std::map<std::pair<int32_t, int32_t>, int32_t> wormState, 
+        std::map<std::pair<int32_t, int32_t>, int32_t> resourceState,
     };
 
     struct GameInfo
     {
-        int32_t gameTime;
+        int32_t gameTime,
     };
 
 
@@ -209,75 +211,75 @@ namespace THUAI7
     // 还没写完，后面待续
 
     inline std::map<GameState, std::string> gameStateDict{
-        {GameState::NullGameState, "NullGameState"},
-        {GameState::GameStart, "GameStart"},
-        {GameState::GameRunning, "GameRunning"},
-        {GameState::GameEnd, "GameEnd"},
+        {GameState::NullGameState, "NullGameState"};
+        {GameState::GameStart, "GameStart"};
+        {GameState::GameRunning, "GameRunning"};
+        {GameState::GameEnd, "GameEnd"};
     };
 
     inline std::map<ShipType, std::string> shipTypeDict{
-        {ShipType::NullShipType, "NullShipType"},
-        {ShipType::CivilianShip, "CivilianShip"},
-        {ShipType::MilitaryShip, "MilitaryShip"},
-        {ShipType::FlagShip, "FlagShip"},
+        {ShipType::NullShipType, "NullShipType"};
+        {ShipType::CivilianShip, "CivilianShip"};
+        {ShipType::MilitaryShip, "MilitaryShip"};
+        {ShipType::FlagShip, "FlagShip"};
     };
 
     inline std::map<ShipState, std::string> shipStateDict{
-        {ShipState::NullState, "NullState"},
-        {ShipState::Idle, "Idle"},
-        {ShipState::Producing, "Producing"},
-        {ShipState::Constructing, "Constructing"},
-        {ShipState::Recovering, "Recoverying"},
-        {ShipState::Recycling, "Recycling"},
-        {ShipState::Attacking, "Attacking"},
-        {ShipState::Swinging, "Swinging"},
-        {ShipState::Stunned, "Stunned"},
+        {ShipState::NullState, "NullState"};
+        {ShipState::Idle, "Idle"};
+        {ShipState::Producing, "Producing"};
+        {ShipState::Constructing, "Constructing"};
+        {ShipState::Recovering, "Recoverying"};
+        {ShipState::Recycling, "Recycling"};
+        {ShipState::Attacking, "Attacking"};
+        {ShipState::Swinging, "Swinging"};
+        {ShipState::Stunned, "Stunned"};
         };
 
     inline std::map<PlayerTeam, std::string> playerTeamDict{
-        {PlayerTeam::NullTeam, "NullTeam"},
-        {PlayerTeam::Up, "Up"},
-        {PlayerTeam::Down, "Down"},
+        {PlayerTeam::NullTeam, "NullTeam"};
+        {PlayerTeam::Up, "Up"};
+        {PlayerTeam::Down, "Down"};
     };
 
     inline std::map<PlaceType, std::string> placeTypeDict{
-        {PlaceType::NullPlaceType, "NullPlaceType"},
-        {PlaceType::Home, "Home"},
-        {PlaceType::Space, "Space"},
-        {PlaceType::Ruin, "Ruin"},
-        {PlaceType::Shadow, "Shadow"},
-        {PlaceType::Asteroid, "Asteroid"},
-        {PlaceType::Resource, "Resource"},
-        {PlaceType::Building, "Building"},
+        {PlaceType::NullPlaceType, "NullPlaceType"};
+        {PlaceType::Home, "Home"};
+        {PlaceType::Space, "Space"};
+        {PlaceType::Ruin, "Ruin"};
+        {PlaceType::Shadow, "Shadow"};
+        {PlaceType::Asteroid, "Asteroid"};
+        {PlaceType::Resource, "Resource"};
+        {PlaceType::Building, "Building"};
     };
 
     inline std::map<BulletType, std::string> bulletTypeDict{
-        {BulletType::NullBulletType, "NullBulletType"},
-        {BulletType::Laser, "Laser"},
-        {BulletType::Plasma, "Plasma"},
-        {BulletType::Shell, "Shell"},
-        {BulletType::Missile, "Missile"},
-        {BulletType::ElectricArc, "ElectricArc"},
-    }
+        {BulletType::NullBulletType, "NullBulletType"};
+        {BulletType::Laser, "Laser"};
+        {BulletType::Plasma, "Plasma"};
+        {BulletType::Shell, "Shell"};
+        {BulletType::Missile, "Missile"};
+        {BulletType::ElectricArc, "ElectricArc"};
+    };
 
     inline std::map<MessageOfObj, std::string> messageOfObjDict{
-        {MessageOfObj::NullMessageOfObj, "NullMessageOfObj"},
-        {MessageOfObj::ShipMessage, "ShipMessage"},
-        {MessageOfObj::BuildingMessage, "BuildingMessage"},
-        {MessageOfObj::BulletMessage, "BulletMessage"},
-        {MessageOfObj::ResourceMessage, "ResourceMessage"},
-        {MessageOfObj::HomeMessage, "HomeMessage"},
-        {MessageOfObj::MapMessage, "MapMessage"},
+        {MessageOfObj::NullMessageOfObj, "NullMessageOfObj"};
+        {MessageOfObj::ShipMessage, "ShipMessage"};
+        {MessageOfObj::BuildingMessage, "BuildingMessage"};
+        {MessageOfObj::BulletMessage, "BulletMessage"};
+        {MessageOfObj::ResourceMessage, "ResourceMessage"};
+        {MessageOfObj::HomeMessage, "HomeMessage"};
+        {MessageOfObj::MapMessage, "MapMessage"};
     };
     enum class MessageOfObj : unsigned char
     {
-        NullMessageOfObj = 0;
-        ShipMessage = 1;
-        BuildingMessage = 2;
-        BulletMessage = 3;
-        ResourceMessage = 4;
-        HomeMessage = 5;
-        MapMessage = 6;
+        NullMessageOfObj = 0,
+        ShipMessage = 1,
+        BuildingMessage = 2,
+        BulletMessage = 3,
+        ResourceMessage = 4,
+        HomeMessage = 5,
+        MapMessage = 6,
     };
 }  // namespace THUAI7