diff --git a/1.5/Defs/CultureDefs/FCP_NCR_CultureAndStyleDefs.xml b/1.5/Defs/CultureDefs/FCP_NCR_CultureAndStyleDefs.xml
index 84c0020..bab41e4 100644
--- a/1.5/Defs/CultureDefs/FCP_NCR_CultureAndStyleDefs.xml
+++ b/1.5/Defs/CultureDefs/FCP_NCR_CultureAndStyleDefs.xml
@@ -2,7 +2,7 @@
 <Defs>
 
     <CultureDef>
-        <defName>FCP_NCR_Californian</defName>
+        <defName>FCP_Culture_NCR_Californian</defName>
         <label>New Californian</label>
         <description>Culture of those in the New California Republic.</description>
         <pawnNameMaker>FCP_Western_Namer_Male</pawnNameMaker>
diff --git a/1.5/Defs/FactionDefs/FCP_NCR.xml b/1.5/Defs/FactionDefs/FCP_NCR.xml
index 29008f9..548a839 100644
--- a/1.5/Defs/FactionDefs/FCP_NCR.xml
+++ b/1.5/Defs/FactionDefs/FCP_NCR.xml
@@ -33,7 +33,7 @@
         <fixedName>New California Republic</fixedName>
         <settlementNameMaker>NamerSettlementOutlander</settlementNameMaker>
         <allowedCultures>
-            <li>FCP_NCR_Californian</li>
+            <li>FCP_Culture_NCR_Californian</li>
         </allowedCultures>
 
         <!--__________ Ideology __________-->
@@ -82,7 +82,7 @@
             </li>
         </backstoryFilters>
 
-        <!--__________ Kinds __________-->
+        <!--__________ Kind __________-->
 
         <caravanTraderKinds>
             <!-- <li>FCP_Caravan_Pre_War_Goods_Trader</li> -->
diff --git a/1.5/Defs/Ideology/Defs/IdeoSymbolDefs/IconAndColorDefs.xml b/1.5/Defs/Ideology/Defs/IdeoSymbolDefs/IconAndColorDefs.xml
index 903ff69..5acd5fd 100644
--- a/1.5/Defs/Ideology/Defs/IdeoSymbolDefs/IconAndColorDefs.xml
+++ b/1.5/Defs/Ideology/Defs/IdeoSymbolDefs/IconAndColorDefs.xml
@@ -5,7 +5,7 @@
         <defName>FCP_Icon_NCR</defName>
         <iconPath>World_Icon/NCR_Icon/FCP_NCR_World_Icon</iconPath>
         <cultures>
-            <li>FCP_NCR_Californian</li>
+            <li>FCP_Culture_NCR_Californian</li>
         </cultures>
     </IdeoIconDef>
 
diff --git a/1.5/Defs/Ideology/Defs/NCR_MemesAndPrecepts.xml b/1.5/Defs/Ideology/Defs/MemesPreceptsDefs/NCR_MemesAndPrecepts.xml
similarity index 100%
rename from 1.5/Defs/Ideology/Defs/NCR_MemesAndPrecepts.xml
rename to 1.5/Defs/Ideology/Defs/MemesPreceptsDefs/NCR_MemesAndPrecepts.xml
diff --git a/1.5/Defs/ThingDefs_Buildings/IdeoBuildingDefs.xml b/1.5/Defs/Ideology/Defs/ThingDefs_Buildings_Ideo/IdeoBuildingDefs.xml
similarity index 96%
rename from 1.5/Defs/ThingDefs_Buildings/IdeoBuildingDefs.xml
rename to 1.5/Defs/Ideology/Defs/ThingDefs_Buildings_Ideo/IdeoBuildingDefs.xml
index 5a62c6d..e4dfb26 100644
--- a/1.5/Defs/ThingDefs_Buildings/IdeoBuildingDefs.xml
+++ b/1.5/Defs/Ideology/Defs/ThingDefs_Buildings_Ideo/IdeoBuildingDefs.xml
@@ -31,7 +31,7 @@
             <StyleDominance>50</StyleDominance>
         </statBases>
         <terrainAffordanceNeeded>Medium</terrainAffordanceNeeded>
-        <interactionCellOffset>(0,0, -2)</interactionCellOffset>
+        <interactionCellOffset>(0,0, -3)</interactionCellOffset>
         <costList>
             <BlocksMarble>800</BlocksMarble>
         </costList>
diff --git a/1.5/Defs/MiscDefs/FCP_NCR_TaxCollectors.xml b/1.5/Defs/Royalty/MiscDefs/FCP_NCR_TaxCollectors.xml
similarity index 100%
rename from 1.5/Defs/MiscDefs/FCP_NCR_TaxCollectors.xml
rename to 1.5/Defs/Royalty/MiscDefs/FCP_NCR_TaxCollectors.xml
diff --git a/1.5/Defs/ThingDefs_Misc/ThingDefs_Items_Permit_Crates.xml b/1.5/Defs/Royalty/MiscDefs/ThingDefs_Items_Permit_Crates.xml
similarity index 99%
rename from 1.5/Defs/ThingDefs_Misc/ThingDefs_Items_Permit_Crates.xml
rename to 1.5/Defs/Royalty/MiscDefs/ThingDefs_Items_Permit_Crates.xml
index e5a4b60..f5c0538 100644
--- a/1.5/Defs/ThingDefs_Misc/ThingDefs_Items_Permit_Crates.xml
+++ b/1.5/Defs/Royalty/MiscDefs/ThingDefs_Items_Permit_Crates.xml
@@ -179,7 +179,7 @@
                     </li>
                     <li>
                         <thingDef>FCP_Gun_NCR_Hunting_Rifle</thingDef>
-                        <countRange>0~2</countRange>
+                        <countRange>1~2</countRange>
                     </li>
                 </weightedDrops>
             </li>
diff --git a/1.5/Defs/ThingDefs_Misc/Permits_NCR.xml b/1.5/Defs/Royalty/Permits/Permits_NCR.xml
similarity index 100%
rename from 1.5/Defs/ThingDefs_Misc/Permits_NCR.xml
rename to 1.5/Defs/Royalty/Permits/Permits_NCR.xml
diff --git a/1.5/Defs/ThingDefs_Misc/Titles_NCR.xml b/1.5/Defs/Royalty/TitleDefs/Titles_NCR.xml
similarity index 100%
rename from 1.5/Defs/ThingDefs_Misc/Titles_NCR.xml
rename to 1.5/Defs/Royalty/TitleDefs/Titles_NCR.xml
diff --git a/1.5/Defs/ThingDefs_Misc/ThingDefs_Bullets.xml b/1.5/Defs/ThingDefs_Weapons/ThingDefs_Bullets.xml
similarity index 100%
rename from 1.5/Defs/ThingDefs_Misc/ThingDefs_Bullets.xml
rename to 1.5/Defs/ThingDefs_Weapons/ThingDefs_Bullets.xml
diff --git a/1.5/Defs/ThingDefs_Misc/ThingDefs_Weapons.xml b/1.5/Defs/ThingDefs_Weapons/ThingDefs_Weapons.xml
similarity index 100%
rename from 1.5/Defs/ThingDefs_Misc/ThingDefs_Weapons.xml
rename to 1.5/Defs/ThingDefs_Weapons/ThingDefs_Weapons.xml
diff --git a/1.5/Patches/NCR_AddTaxCollectorPatch.xml b/1.5/Patches/NCR_AddTaxCollectorPatch.xml
index e9360ac..558c8c8 100644
--- a/1.5/Patches/NCR_AddTaxCollectorPatch.xml
+++ b/1.5/Patches/NCR_AddTaxCollectorPatch.xml
@@ -9,7 +9,7 @@
                 <minDaysPassed>20</minDaysPassed>
                 <baseIncidentsPerYear>2</baseIncidentsPerYear>
                 <minSpacingDays>30</minSpacingDays>
-                <minWealth>20000</minWealth>
+                <minWealth>15000</minWealth>
                 <allowedTargetTags>
                     <li>Map_PlayerHome</li>
                 </allowedTargetTags>