diff --git a/1.3/Defs/AutomataRaceSettings/AutomataWearSetting.xml b/1.3/Defs/AutomataRaceSettings/AutomataWearSetting.xml
index 30a11d8..1b90f8f 100644
--- a/1.3/Defs/AutomataRaceSettings/AutomataWearSetting.xml
+++ b/1.3/Defs/AutomataRaceSettings/AutomataWearSetting.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-  <!--<WearSetting.WearSettingDef>
-    <defName>PN_WearSetting</defName>
+  <WearSetting.WearSettingDef>
+    <defName>PN_WearSetting_OfficerModule</defName>
     <targetRace>Paniel_Race</targetRace>
     <wearSetting>
       <li MayRequire="Ludeon.RimWorld.Ideology">
         <wearList>
-          <li>PN_ApparelRoyalguardHat_Commander</li>
+          <li>PN_OfficerModule</li>
         </wearList>
         <condition>
 					<hediffDef>
@@ -16,5 +16,5 @@
         <cantReason>CantReasonHediff</cantReason>
       </li>
     </wearSetting>
-  </WearSetting.WearSettingDef>-->
+  </WearSetting.WearSettingDef>
 </Defs>
\ No newline at end of file
diff --git a/1.3/Defs/ReserchDefs/Reserch_ProjectDefs.xml b/1.3/Defs/ReserchDefs/Reserch_ProjectDefs.xml
index 71e1769..53add90 100644
--- a/1.3/Defs/ReserchDefs/Reserch_ProjectDefs.xml
+++ b/1.3/Defs/ReserchDefs/Reserch_ProjectDefs.xml
@@ -157,7 +157,7 @@
       <li>Gunsmithing</li>
     </prerequisites>
     <researchViewX>1.0</researchViewX>
-    <researchViewY>2.1</researchViewY>
+    <researchViewY>2.8</researchViewY>
   </ResearchProjectDef>
 
   <ResearchProjectDef>
@@ -172,7 +172,7 @@
       <li>GasOperation</li>
     </prerequisites>
     <researchViewX>2.0</researchViewX>
-    <researchViewY>2.8</researchViewY>
+    <researchViewY>3.5</researchViewY>
   </ResearchProjectDef>
 
   <ResearchProjectDef>
@@ -187,7 +187,7 @@
       <li>Mortars</li>
     </prerequisites>
     <researchViewX>2.0</researchViewX>
-    <researchViewY>3.5</researchViewY>
+    <researchViewY>4.2</researchViewY>
   </ResearchProjectDef>
 
   <ResearchProjectDef>
@@ -205,7 +205,7 @@
       <li>PNRP_BrainCasing</li>
     </hiddenPrerequisites>
     <researchViewX>5.0</researchViewX>
-    <researchViewY>3.5</researchViewY>
+    <researchViewY>4.2</researchViewY>
   </ResearchProjectDef>
 
   <ResearchProjectDef>
@@ -220,6 +220,6 @@
       <li>ChargedShot</li>
     </prerequisites>
     <researchViewX>5.0</researchViewX>
-    <researchViewY>2.1</researchViewY>
+    <researchViewY>2.8</researchViewY>
   </ResearchProjectDef>
 </Defs>
\ No newline at end of file
diff --git a/1.3/Defs/ThingDef/ThingDef_Apparel.xml b/1.3/Defs/ThingDef/ThingDef_Apparel.xml
index 028b550..7327a36 100644
--- a/1.3/Defs/ThingDef/ThingDef_Apparel.xml
+++ b/1.3/Defs/ThingDef/ThingDef_Apparel.xml
@@ -33,6 +33,9 @@
     <thingCategories Inherit="False">
       <li>PNHeadgear</li>
     </thingCategories>
+    <apparel>
+      <forceRenderUnderHair>true</forceRenderUnderHair>
+    </apparel>
   </ThingDef>
 
   <!--==================================== 기본옷 ====================================-->
@@ -892,6 +895,9 @@
     <thingCategories Inherit="False">
       <li>PNRoyalHeadgear</li>
     </thingCategories>
+    <apparel>
+      <forceRenderUnderHair>true</forceRenderUnderHair>
+    </apparel>
   </ThingDef>
 
   <!--==================================== 티어C 근위대 ====================================-->
diff --git a/1.3/Defs/ThingDef/ThingDef_Module.xml b/1.3/Defs/ThingDef/ThingDef_Module.xml
index 45aa520..560a00b 100644
--- a/1.3/Defs/ThingDef/ThingDef_Module.xml
+++ b/1.3/Defs/ThingDef/ThingDef_Module.xml
@@ -9,7 +9,7 @@
   <ThingCategoryDef>
     <defName>PNApparelModule</defName>
     <label>PnL Module</label>
-    <parent>ApparelUtility</parent>
+    <parent>PNApparel</parent>
   </ThingCategoryDef>
 
   <ThingDef Name="PN_ApparelModuleBase" ParentName="ApparelNoQualityBase" Abstract="True">
@@ -76,7 +76,7 @@
     <label></label>
     <description></description>
     <statBases>
-      <WorkToMake>14000</WorkToMake>
+      <WorkToMake></WorkToMake>
     </statBases>
     <thingSetMakerTags>
 
@@ -85,7 +85,7 @@
 
     </costList>
     <recipeMaker>
-      <researchPrerequisite>ShieldBelt</researchPrerequisite>
+      <researchPrerequisite></researchPrerequisite>
       <skillRequirements>
         <Crafting>6</Crafting>
       </skillRequirements>
diff --git a/Content/Textures/UI/Abilities/PNOfficerCommand.png b/Content/Textures/UI/Abilities/PNOfficerCommand.png
new file mode 100644
index 0000000..3f9c04d
Binary files /dev/null and b/Content/Textures/UI/Abilities/PNOfficerCommand.png differ
diff --git a/Ideology/Defs/AbilityDefs.xml b/Ideology/Defs/Ideo_AbilityDefs.xml
similarity index 93%
rename from Ideology/Defs/AbilityDefs.xml
rename to Ideology/Defs/Ideo_AbilityDefs.xml
index b25f92c..2f17109 100644
--- a/Ideology/Defs/AbilityDefs.xml
+++ b/Ideology/Defs/Ideo_AbilityDefs.xml
@@ -10,8 +10,8 @@
     <jobDef>CastAbilityOnThing</jobDef>
     <targetRequired>False</targetRequired>
     <canUseAoeToGetTargets>False</canUseAoeToGetTargets>
-    <iconPath>UI/Abilities/CombatCommand</iconPath>
-    <warmupMoteSocialSymbol>UI/Abilities/CombatCommand</warmupMoteSocialSymbol>
+    <iconPath>UI/Abilities/PNOfficerCommand</iconPath>
+    <warmupMoteSocialSymbol>UI/Abilities/PNOfficerCommand</warmupMoteSocialSymbol>
     <stunTargetWhileCasting>True</stunTargetWhileCasting>
     <showPsycastEffects>False</showPsycastEffects>
     <displayGizmoWhileUndrafted>True</displayGizmoWhileUndrafted>
diff --git a/Ideology/Defs/Hediffs_Module.xml b/Ideology/Defs/Ideo_Hediffs_Module.xml
similarity index 100%
rename from Ideology/Defs/Hediffs_Module.xml
rename to Ideology/Defs/Ideo_Hediffs_Module.xml
diff --git a/Ideology/Defs/Ideo_Reserch_ProjectDefs.xml b/Ideology/Defs/Ideo_Reserch_ProjectDefs.xml
new file mode 100644
index 0000000..b7b4977
--- /dev/null
+++ b/Ideology/Defs/Ideo_Reserch_ProjectDefs.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+  <!--==================================== 모듈 ====================================-->
+
+  <ResearchProjectDef>
+    <defName>PNRP_TierB_Module</defName>
+    <label>spelcialization module</label>
+    <description>...</description>
+    <tab>PN_technology</tab>
+    <baseCost>1000</baseCost>
+    <techLevel>Industrial</techLevel>
+    <prerequisites>
+      <li>PNRP_TierB_Apparel</li>
+    </prerequisites>
+    <researchViewX>4.0</researchViewX>
+    <researchViewY>2.1</researchViewY>
+  </ResearchProjectDef>
+
+  <ResearchProjectDef>
+    <defName>PNRP_TierC_Module</defName>
+    <label>royal module</label>
+    <description>...</description>
+    <tab>PN_technology</tab>
+    <baseCost>3250</baseCost>
+    <techLevel>Spacer</techLevel>
+    <prerequisites>
+      <li>PNRP_TierC_Apparel</li>
+    </prerequisites>
+    <researchViewX>6.0</researchViewX>
+    <researchViewY>2.1</researchViewY>
+  </ResearchProjectDef>
+
+</Defs>
\ No newline at end of file
diff --git a/Ideology/Defs/ThingDef_Module.xml b/Ideology/Defs/Ideo_ThingDef_Module.xml
similarity index 60%
rename from Ideology/Defs/ThingDef_Module.xml
rename to Ideology/Defs/Ideo_ThingDef_Module.xml
index 40c5374..5085b2d 100644
--- a/Ideology/Defs/ThingDef_Module.xml
+++ b/Ideology/Defs/Ideo_ThingDef_Module.xml
@@ -1,14 +1,30 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
+
+  <!--==================================== 장교 모듈 ====================================-->
+
   <ThingDef ParentName="PN_ApparelModuleSpacer">
     <defName>PN_OfficerModule</defName>
     <label>officer module</label>
     <description>...</description>
+    <statBases>
+      <WorkToMake>14000</WorkToMake>
+    </statBases>
     <costList>
-      <ComponentSpacer>3</ComponentSpacer>
-      <Plasteel>80</Plasteel>
-      <Uranium>10</Uranium>
+      <ComponentSpacer>5</ComponentSpacer>
+      <PN_ComponentRoyal>2</PN_ComponentRoyal>
     </costList>
+    <recipeMaker>
+      <researchPrerequisite>PNRP_TierC_Module</researchPrerequisite>
+      <skillRequirements>
+        <Crafting>6</Crafting>
+      </skillRequirements>
+    </recipeMaker>
+    <apparel>
+      <tags>
+
+      </tags>
+    </apparel>
     <comps>
       <li Class="CompProperties_CauseHediff_Apparel">
         <hediff>PN_OfficerModuleHediff</hediff>
diff --git a/Royalty/Defs/Hediffs_BodyParts_Psychic.xml b/Royalty/Defs/Royal_Hediffs_BodyParts_Psychic.xml
similarity index 100%
rename from Royalty/Defs/Hediffs_BodyParts_Psychic.xml
rename to Royalty/Defs/Royal_Hediffs_BodyParts_Psychic.xml
diff --git a/Royalty/Defs/Hediffs_BodyParts_Vanilla.xml b/Royalty/Defs/Royal_Hediffs_BodyParts_Vanilla.xml
similarity index 100%
rename from Royalty/Defs/Hediffs_BodyParts_Vanilla.xml
rename to Royalty/Defs/Royal_Hediffs_BodyParts_Vanilla.xml
diff --git a/Royalty/Defs/Reserch_ProjectDefs.xml b/Royalty/Defs/Royal_Reserch_ProjectDefs.xml
similarity index 92%
rename from Royalty/Defs/Reserch_ProjectDefs.xml
rename to Royalty/Defs/Royal_Reserch_ProjectDefs.xml
index ac8b8e2..b5c216b 100644
--- a/Royalty/Defs/Reserch_ProjectDefs.xml
+++ b/Royalty/Defs/Royal_Reserch_ProjectDefs.xml
@@ -11,7 +11,7 @@
       <li>PNRP_Production</li>
     </prerequisites>
     <researchViewX>1.0</researchViewX>
-    <researchViewY>3.5</researchViewY>
+    <researchViewY>0.7</researchViewY>
     <tags>
       <li>PanielStart</li>
     </tags>
diff --git a/Royalty/Defs/ThingDef_Weapon.xml b/Royalty/Defs/Royal_ThingDef_Weapon.xml
similarity index 100%
rename from Royalty/Defs/ThingDef_Weapon.xml
rename to Royalty/Defs/Royal_ThingDef_Weapon.xml