diff --git a/DefInjected/BiomeDef/Biomes_Arid.xml b/DefInjected/BiomeDefs/Biomes_Arid.xml
similarity index 100%
rename from DefInjected/BiomeDef/Biomes_Arid.xml
rename to DefInjected/BiomeDefs/Biomes_Arid.xml
diff --git a/DefInjected/BiomeDef/Biomes_Cold.xml b/DefInjected/BiomeDefs/Biomes_Cold.xml
similarity index 100%
rename from DefInjected/BiomeDef/Biomes_Cold.xml
rename to DefInjected/BiomeDefs/Biomes_Cold.xml
diff --git a/DefInjected/BiomeDef/Biomes_Moderate.xml b/DefInjected/BiomeDefs/Biomes_Moderate.xml
similarity index 100%
rename from DefInjected/BiomeDef/Biomes_Moderate.xml
rename to DefInjected/BiomeDefs/Biomes_Moderate.xml
diff --git a/DefInjected/BodyDef/Bodies_Animal_Bird.xml b/DefInjected/BodyDefs/Bodies_Animal_Bird.xml
similarity index 100%
rename from DefInjected/BodyDef/Bodies_Animal_Bird.xml
rename to DefInjected/BodyDefs/Bodies_Animal_Bird.xml
diff --git a/DefInjected/BodyDef/Bodies_Animal_Insect.xml b/DefInjected/BodyDefs/Bodies_Animal_Insect.xml
similarity index 100%
rename from DefInjected/BodyDef/Bodies_Animal_Insect.xml
rename to DefInjected/BodyDefs/Bodies_Animal_Insect.xml
diff --git a/DefInjected/BodyDef/Bodies_Animal_Quadruped.xml b/DefInjected/BodyDefs/Bodies_Animal_Quadruped.xml
similarity index 100%
rename from DefInjected/BodyDef/Bodies_Animal_Quadruped.xml
rename to DefInjected/BodyDefs/Bodies_Animal_Quadruped.xml
diff --git a/DefInjected/BodyDef/Bodies_Animal_Snake.xml b/DefInjected/BodyDefs/Bodies_Animal_Snake.xml
similarity index 100%
rename from DefInjected/BodyDef/Bodies_Animal_Snake.xml
rename to DefInjected/BodyDefs/Bodies_Animal_Snake.xml
diff --git a/DefInjected/BodyDef/Bodies_Humanlike.xml b/DefInjected/BodyDefs/Bodies_Humanlike.xml
similarity index 100%
rename from DefInjected/BodyDef/Bodies_Humanlike.xml
rename to DefInjected/BodyDefs/Bodies_Humanlike.xml
diff --git a/DefInjected/BodyDef/Bodies_Mechanoid.xml b/DefInjected/BodyDefs/Bodies_Mechanoid.xml
similarity index 100%
rename from DefInjected/BodyDef/Bodies_Mechanoid.xml
rename to DefInjected/BodyDefs/Bodies_Mechanoid.xml
diff --git a/DefInjected/BodyPartDef/BodyParts_Animal.xml b/DefInjected/BodyPartDefs/BodyParts_Animal.xml
similarity index 100%
rename from DefInjected/BodyPartDef/BodyParts_Animal.xml
rename to DefInjected/BodyPartDefs/BodyParts_Animal.xml
diff --git a/DefInjected/BodyPartDef/BodyParts_General.xml b/DefInjected/BodyPartDefs/BodyParts_General.xml
similarity index 100%
rename from DefInjected/BodyPartDef/BodyParts_General.xml
rename to DefInjected/BodyPartDefs/BodyParts_General.xml
diff --git a/DefInjected/BodyPartDef/BodyParts_Humanoid.xml b/DefInjected/BodyPartDefs/BodyParts_Humanoid.xml
similarity index 100%
rename from DefInjected/BodyPartDef/BodyParts_Humanoid.xml
rename to DefInjected/BodyPartDefs/BodyParts_Humanoid.xml
diff --git a/DefInjected/BodyPartDef/BodyParts_Mechanoid.xml b/DefInjected/BodyPartDefs/BodyParts_Mechanoid.xml
similarity index 100%
rename from DefInjected/BodyPartDef/BodyParts_Mechanoid.xml
rename to DefInjected/BodyPartDefs/BodyParts_Mechanoid.xml
diff --git a/DefInjected/BodyPartDef/BodyParts_Organs.xml b/DefInjected/BodyPartDefs/BodyParts_Organs.xml
similarity index 100%
rename from DefInjected/BodyPartDef/BodyParts_Organs.xml
rename to DefInjected/BodyPartDefs/BodyParts_Organs.xml
diff --git a/DefInjected/BodyPartGroupDef/BodyPartGroups.xml b/DefInjected/BodyPartGroupDefs/BodyPartGroups.xml
similarity index 100%
rename from DefInjected/BodyPartGroupDef/BodyPartGroups.xml
rename to DefInjected/BodyPartGroupDefs/BodyPartGroups.xml
diff --git a/DefInjected/ConceptDef/Concepts_Alerts.xml b/DefInjected/ConceptDefs/Concepts_Alerts.xml
similarity index 100%
rename from DefInjected/ConceptDef/Concepts_Alerts.xml
rename to DefInjected/ConceptDefs/Concepts_Alerts.xml
diff --git a/DefInjected/ConceptDef/Concepts_Entry.xml b/DefInjected/ConceptDefs/Concepts_Entry.xml
similarity index 100%
rename from DefInjected/ConceptDef/Concepts_Entry.xml
rename to DefInjected/ConceptDefs/Concepts_Entry.xml
diff --git a/DefInjected/ConceptDef/Concepts_Noted.xml b/DefInjected/ConceptDefs/Concepts_Noted.xml
similarity index 100%
rename from DefInjected/ConceptDef/Concepts_Noted.xml
rename to DefInjected/ConceptDefs/Concepts_Noted.xml
diff --git a/DefInjected/ConceptDef/Concepts_TriggeredModal.xml b/DefInjected/ConceptDefs/Concepts_TriggeredModal.xml
similarity index 100%
rename from DefInjected/ConceptDef/Concepts_TriggeredModal.xml
rename to DefInjected/ConceptDefs/Concepts_TriggeredModal.xml
diff --git a/DefInjected/DamageDef/Damages_Healing.xml b/DefInjected/DamageDefs/Damages_Healing.xml
similarity index 100%
rename from DefInjected/DamageDef/Damages_Healing.xml
rename to DefInjected/DamageDefs/Damages_Healing.xml
diff --git a/DefInjected/DamageDef/Damages_InjuryGlobal.xml b/DefInjected/DamageDefs/Damages_InjuryGlobal.xml
similarity index 100%
rename from DefInjected/DamageDef/Damages_InjuryGlobal.xml
rename to DefInjected/DamageDefs/Damages_InjuryGlobal.xml
diff --git a/DefInjected/DamageDef/Damages_LocalInjury.xml b/DefInjected/DamageDefs/Damages_LocalInjury.xml
similarity index 100%
rename from DefInjected/DamageDef/Damages_LocalInjury.xml
rename to DefInjected/DamageDefs/Damages_LocalInjury.xml
diff --git a/DefInjected/DamageDef/Damages_Misc.xml b/DefInjected/DamageDefs/Damages_Misc.xml
similarity index 100%
rename from DefInjected/DamageDef/Damages_Misc.xml
rename to DefInjected/DamageDefs/Damages_Misc.xml
diff --git a/DefInjected/DesignationCategoryDef/DesignationCategories.xml b/DefInjected/DesignationCategoryDefs/DesignationCategories.xml
similarity index 100%
rename from DefInjected/DesignationCategoryDef/DesignationCategories.xml
rename to DefInjected/DesignationCategoryDefs/DesignationCategories.xml
diff --git a/DefInjected/DifficultyDef/Difficulties.xml b/DefInjected/DifficultyDefs/Difficulties.xml
similarity index 100%
rename from DefInjected/DifficultyDef/Difficulties.xml
rename to DefInjected/DifficultyDefs/Difficulties.xml
diff --git a/DefInjected/HairDef/HairsGeneral.xml b/DefInjected/HairDefs/HairsGeneral.xml
similarity index 100%
rename from DefInjected/HairDef/HairsGeneral.xml
rename to DefInjected/HairDefs/HairsGeneral.xml
diff --git a/DefInjected/HeDiffDef/Hediffs_AddedParts.xml b/DefInjected/HeDiffDefs/Hediffs_AddedParts.xml
similarity index 100%
rename from DefInjected/HeDiffDef/Hediffs_AddedParts.xml
rename to DefInjected/HeDiffDefs/Hediffs_AddedParts.xml
diff --git a/DefInjected/HeDiffDef/Hediffs_Chronic.xml b/DefInjected/HeDiffDefs/Hediffs_Chronic.xml
similarity index 100%
rename from DefInjected/HeDiffDef/Hediffs_Chronic.xml
rename to DefInjected/HeDiffDefs/Hediffs_Chronic.xml
diff --git a/DefInjected/HeDiffDef/Hediffs_Drugs.xml b/DefInjected/HeDiffDefs/Hediffs_Drugs.xml
similarity index 100%
rename from DefInjected/HeDiffDef/Hediffs_Drugs.xml
rename to DefInjected/HeDiffDefs/Hediffs_Drugs.xml
diff --git a/DefInjected/HeDiffDef/Hediffs_Execution.xml b/DefInjected/HeDiffDefs/Hediffs_Execution.xml
similarity index 100%
rename from DefInjected/HeDiffDef/Hediffs_Execution.xml
rename to DefInjected/HeDiffDefs/Hediffs_Execution.xml
diff --git a/DefInjected/HeDiffDef/Hediffs_GlobalAcute.xml b/DefInjected/HeDiffDefs/Hediffs_GlobalAcute.xml
similarity index 100%
rename from DefInjected/HeDiffDef/Hediffs_GlobalAcute.xml
rename to DefInjected/HeDiffDefs/Hediffs_GlobalAcute.xml
diff --git a/DefInjected/HeDiffDef/Hediffs_GlobalMisc.xml b/DefInjected/HeDiffDefs/Hediffs_GlobalMisc.xml
similarity index 100%
rename from DefInjected/HeDiffDef/Hediffs_GlobalMisc.xml
rename to DefInjected/HeDiffDefs/Hediffs_GlobalMisc.xml
diff --git a/DefInjected/HeDiffDef/Hediffs_Implants.xml b/DefInjected/HeDiffDefs/Hediffs_Implants.xml
similarity index 100%
rename from DefInjected/HeDiffDef/Hediffs_Implants.xml
rename to DefInjected/HeDiffDefs/Hediffs_Implants.xml
diff --git a/DefInjected/HeDiffDef/Hediffs_Infections.xml b/DefInjected/HeDiffDefs/Hediffs_Infections.xml
similarity index 100%
rename from DefInjected/HeDiffDef/Hediffs_Infections.xml
rename to DefInjected/HeDiffDefs/Hediffs_Infections.xml
diff --git a/DefInjected/HeDiffDef/Hediffs_Injuries.xml b/DefInjected/HeDiffDefs/Hediffs_Injuries.xml
similarity index 100%
rename from DefInjected/HeDiffDef/Hediffs_Injuries.xml
rename to DefInjected/HeDiffDefs/Hediffs_Injuries.xml
diff --git a/DefInjected/HeDiffDef/Hediffs_LocalMisc.xml b/DefInjected/HeDiffDefs/Hediffs_LocalMisc.xml
similarity index 100%
rename from DefInjected/HeDiffDef/Hediffs_LocalMisc.xml
rename to DefInjected/HeDiffDefs/Hediffs_LocalMisc.xml
diff --git a/DefInjected/HeDiffDef/Hediffs_Needs.xml b/DefInjected/HeDiffDefs/Hediffs_Needs.xml
similarity index 100%
rename from DefInjected/HeDiffDef/Hediffs_Needs.xml
rename to DefInjected/HeDiffDefs/Hediffs_Needs.xml
diff --git a/DefInjected/HeDiffDef/Hediffs_Temperature.xml b/DefInjected/HeDiffDefs/Hediffs_Temperature.xml
similarity index 100%
rename from DefInjected/HeDiffDef/Hediffs_Temperature.xml
rename to DefInjected/HeDiffDefs/Hediffs_Temperature.xml
diff --git a/DefInjected/HediffGiverSetDef/HediffGiverSets.xml b/DefInjected/HediffGiverSetDefs/HediffGiverSets.xml
similarity index 100%
rename from DefInjected/HediffGiverSetDef/HediffGiverSets.xml
rename to DefInjected/HediffGiverSetDefs/HediffGiverSets.xml
diff --git a/DefInjected/HistoryAutoRecorderDef/HistoryAutoRecorders.xml b/DefInjected/HistoryAutoRecorderDefs/HistoryAutoRecorders.xml
similarity index 100%
rename from DefInjected/HistoryAutoRecorderDef/HistoryAutoRecorders.xml
rename to DefInjected/HistoryAutoRecorderDefs/HistoryAutoRecorders.xml
diff --git a/DefInjected/HistoryAutoRecorderGroupDef/HistoryAutoRecorderGroups.xml b/DefInjected/HistoryAutoRecorderGroupDefs/HistoryAutoRecorderGroups.xml
similarity index 100%
rename from DefInjected/HistoryAutoRecorderGroupDef/HistoryAutoRecorderGroups.xml
rename to DefInjected/HistoryAutoRecorderGroupDefs/HistoryAutoRecorderGroups.xml
diff --git a/DefInjected/IncidentDef/Incidents_Bad_Misc.xml b/DefInjected/IncidentDefs/Incidents_Bad_Misc.xml
similarity index 100%
rename from DefInjected/IncidentDef/Incidents_Bad_Misc.xml
rename to DefInjected/IncidentDefs/Incidents_Bad_Misc.xml
diff --git a/DefInjected/IncidentDef/Incidents_Bad_ThreatsBig.xml b/DefInjected/IncidentDefs/Incidents_Bad_ThreatsBig.xml
similarity index 100%
rename from DefInjected/IncidentDef/Incidents_Bad_ThreatsBig.xml
rename to DefInjected/IncidentDefs/Incidents_Bad_ThreatsBig.xml
diff --git a/DefInjected/InteractionDef/Interactions_Animal.xml b/DefInjected/InteractionDefs/Interactions_Animal.xml
similarity index 100%
rename from DefInjected/InteractionDef/Interactions_Animal.xml
rename to DefInjected/InteractionDefs/Interactions_Animal.xml
diff --git a/DefInjected/InteractionDef/Interactions_Prisoner.xml b/DefInjected/InteractionDefs/Interactions_Prisoner.xml
similarity index 100%
rename from DefInjected/InteractionDef/Interactions_Prisoner.xml
rename to DefInjected/InteractionDefs/Interactions_Prisoner.xml
diff --git a/DefInjected/InteractionDef/Interactions_Romance.xml b/DefInjected/InteractionDefs/Interactions_Romance.xml
similarity index 100%
rename from DefInjected/InteractionDef/Interactions_Romance.xml
rename to DefInjected/InteractionDefs/Interactions_Romance.xml
diff --git a/DefInjected/InteractionDef/Interactions_Social.xml b/DefInjected/InteractionDefs/Interactions_Social.xml
similarity index 100%
rename from DefInjected/InteractionDef/Interactions_Social.xml
rename to DefInjected/InteractionDefs/Interactions_Social.xml
diff --git a/DefInjected/JobDef/Jobs_Animal.xml b/DefInjected/JobDefs/Jobs_Animal.xml
similarity index 100%
rename from DefInjected/JobDef/Jobs_Animal.xml
rename to DefInjected/JobDefs/Jobs_Animal.xml
diff --git a/DefInjected/JobDef/Jobs_Gatherings.xml b/DefInjected/JobDefs/Jobs_Gatherings.xml
similarity index 100%
rename from DefInjected/JobDef/Jobs_Gatherings.xml
rename to DefInjected/JobDefs/Jobs_Gatherings.xml
diff --git a/DefInjected/JobDef/Jobs_Joy.xml b/DefInjected/JobDefs/Jobs_Joy.xml
similarity index 100%
rename from DefInjected/JobDef/Jobs_Joy.xml
rename to DefInjected/JobDefs/Jobs_Joy.xml
diff --git a/DefInjected/JobDef/Jobs_Misc.xml b/DefInjected/JobDefs/Jobs_Misc.xml
similarity index 100%
rename from DefInjected/JobDef/Jobs_Misc.xml
rename to DefInjected/JobDefs/Jobs_Misc.xml
diff --git a/DefInjected/JobDef/Jobs_Work.xml b/DefInjected/JobDefs/Jobs_Work.xml
similarity index 100%
rename from DefInjected/JobDef/Jobs_Work.xml
rename to DefInjected/JobDefs/Jobs_Work.xml
diff --git a/DefInjected/JoyKindDef/JoyKinds.xml b/DefInjected/JoyKindDefs/JoyKinds.xml
similarity index 100%
rename from DefInjected/JoyKindDef/JoyKinds.xml
rename to DefInjected/JoyKindDefs/JoyKinds.xml
diff --git a/DefInjected/KeyBindingCategoryDef/KeyBindingCategories.xml b/DefInjected/KeyBindingCategoryDefs/KeyBindingCategories.xml
similarity index 100%
rename from DefInjected/KeyBindingCategoryDef/KeyBindingCategories.xml
rename to DefInjected/KeyBindingCategoryDefs/KeyBindingCategories.xml
diff --git a/DefInjected/KeyBindingDef/KeyBindings.xml b/DefInjected/KeyBindingDefs/KeyBindings.xml
similarity index 100%
rename from DefInjected/KeyBindingDef/KeyBindings.xml
rename to DefInjected/KeyBindingDefs/KeyBindings.xml
diff --git a/DefInjected/LifeStageDef/LifeStages.xml b/DefInjected/LifeStageDefs/LifeStages.xml
similarity index 100%
rename from DefInjected/LifeStageDef/LifeStages.xml
rename to DefInjected/LifeStageDefs/LifeStages.xml
diff --git a/DefInjected/MainTabDef/MainTabs.xml b/DefInjected/MainTabDefs/MainTabs.xml
similarity index 100%
rename from DefInjected/MainTabDef/MainTabs.xml
rename to DefInjected/MainTabDefs/MainTabs.xml
diff --git a/DefInjected/MapConditionDef/MapConditions_Misc.xml b/DefInjected/MapConditionDefs/MapConditions_Misc.xml
similarity index 100%
rename from DefInjected/MapConditionDef/MapConditions_Misc.xml
rename to DefInjected/MapConditionDefs/MapConditions_Misc.xml
diff --git a/DefInjected/MentalStateDef/MentalStates.xml b/DefInjected/MentalStateDefs/MentalStates.xml
similarity index 100%
rename from DefInjected/MentalStateDef/MentalStates.xml
rename to DefInjected/MentalStateDefs/MentalStates.xml
diff --git a/DefInjected/NeedDef/Needs.xml b/DefInjected/NeedDefs/Needs.xml
similarity index 100%
rename from DefInjected/NeedDef/Needs.xml
rename to DefInjected/NeedDefs/Needs.xml
diff --git a/DefInjected/PawnCapacityDef/PawnCapacity.xml b/DefInjected/PawnCapacityDefs/PawnCapacity.xml
similarity index 100%
rename from DefInjected/PawnCapacityDef/PawnCapacity.xml
rename to DefInjected/PawnCapacityDefs/PawnCapacity.xml
diff --git a/DefInjected/PawnRelationDef/PawnRelations_FamilyByBlood.xml b/DefInjected/PawnRelationDefs/PawnRelations_FamilyByBlood.xml
similarity index 100%
rename from DefInjected/PawnRelationDef/PawnRelations_FamilyByBlood.xml
rename to DefInjected/PawnRelationDefs/PawnRelations_FamilyByBlood.xml
diff --git a/DefInjected/PawnRelationDef/PawnRelations_FamilyByChoice.xml b/DefInjected/PawnRelationDefs/PawnRelations_FamilyByChoice.xml
similarity index 100%
rename from DefInjected/PawnRelationDef/PawnRelations_FamilyByChoice.xml
rename to DefInjected/PawnRelationDefs/PawnRelations_FamilyByChoice.xml
diff --git a/DefInjected/PawnRelationDef/PawnRelations_Misc.xml b/DefInjected/PawnRelationDefs/PawnRelations_Misc.xml
similarity index 100%
rename from DefInjected/PawnRelationDef/PawnRelations_Misc.xml
rename to DefInjected/PawnRelationDefs/PawnRelations_Misc.xml
diff --git a/DefInjected/RaidStrategyDef/RaidStrategies.xml b/DefInjected/RaidStrategyDefs/RaidStrategies.xml
similarity index 100%
rename from DefInjected/RaidStrategyDef/RaidStrategies.xml
rename to DefInjected/RaidStrategyDefs/RaidStrategies.xml
diff --git a/DefInjected/RecipeDef/Recipes_Butchery.xml b/DefInjected/RecipeDefs/Recipes_Butchery.xml
similarity index 100%
rename from DefInjected/RecipeDef/Recipes_Butchery.xml
rename to DefInjected/RecipeDefs/Recipes_Butchery.xml
diff --git a/DefInjected/RecipeDef/Recipes_Cremation.xml b/DefInjected/RecipeDefs/Recipes_Cremation.xml
similarity index 100%
rename from DefInjected/RecipeDef/Recipes_Cremation.xml
rename to DefInjected/RecipeDefs/Recipes_Cremation.xml
diff --git a/DefInjected/RecipeDef/Recipes_Drugs.xml b/DefInjected/RecipeDefs/Recipes_Drugs.xml
similarity index 100%
rename from DefInjected/RecipeDef/Recipes_Drugs.xml
rename to DefInjected/RecipeDefs/Recipes_Drugs.xml
diff --git a/DefInjected/RecipeDef/Recipes_Meals.xml b/DefInjected/RecipeDefs/Recipes_Meals.xml
similarity index 100%
rename from DefInjected/RecipeDef/Recipes_Meals.xml
rename to DefInjected/RecipeDefs/Recipes_Meals.xml
diff --git a/DefInjected/RecipeDef/Recipes_Production.xml b/DefInjected/RecipeDefs/Recipes_Production.xml
similarity index 100%
rename from DefInjected/RecipeDef/Recipes_Production.xml
rename to DefInjected/RecipeDefs/Recipes_Production.xml
diff --git a/DefInjected/RecipeDef/Recipes_Surgery.xml b/DefInjected/RecipeDefs/Recipes_Surgery.xml
similarity index 100%
rename from DefInjected/RecipeDef/Recipes_Surgery.xml
rename to DefInjected/RecipeDefs/Recipes_Surgery.xml
diff --git a/DefInjected/RecipeDef/Recipes_Surgery_Implants.xml b/DefInjected/RecipeDefs/Recipes_Surgery_Implants.xml
similarity index 100%
rename from DefInjected/RecipeDef/Recipes_Surgery_Implants.xml
rename to DefInjected/RecipeDefs/Recipes_Surgery_Implants.xml
diff --git a/DefInjected/RecipeDef/Recipes_Surgery_NewParts.xml b/DefInjected/RecipeDefs/Recipes_Surgery_NewParts.xml
similarity index 100%
rename from DefInjected/RecipeDef/Recipes_Surgery_NewParts.xml
rename to DefInjected/RecipeDefs/Recipes_Surgery_NewParts.xml
diff --git a/DefInjected/RecipeDef/Recipes_add.xml b/DefInjected/RecipeDefs/Recipes_add.xml
similarity index 100%
rename from DefInjected/RecipeDef/Recipes_add.xml
rename to DefInjected/RecipeDefs/Recipes_add.xml
diff --git a/DefInjected/RecordDef/Records_Misc.xml b/DefInjected/RecordDefs/Records_Misc.xml
similarity index 100%
rename from DefInjected/RecordDef/Records_Misc.xml
rename to DefInjected/RecordDefs/Records_Misc.xml
diff --git a/DefInjected/RecordDef/Records_Time.xml b/DefInjected/RecordDefs/Records_Time.xml
similarity index 100%
rename from DefInjected/RecordDef/Records_Time.xml
rename to DefInjected/RecordDefs/Records_Time.xml
diff --git a/DefInjected/ResearchProjectDef/ResearchProjects_Tier1_Misc.xml b/DefInjected/ResearchProjectDefs/ResearchProjects_Tier1_Misc.xml
similarity index 100%
rename from DefInjected/ResearchProjectDef/ResearchProjects_Tier1_Misc.xml
rename to DefInjected/ResearchProjectDefs/ResearchProjects_Tier1_Misc.xml
diff --git a/DefInjected/ResearchProjectDef/ResearchProjects_Tier2_Misc.xml b/DefInjected/ResearchProjectDefs/ResearchProjects_Tier2_Misc.xml
similarity index 100%
rename from DefInjected/ResearchProjectDef/ResearchProjects_Tier2_Misc.xml
rename to DefInjected/ResearchProjectDefs/ResearchProjects_Tier2_Misc.xml
diff --git a/DefInjected/ResearchProjectDef/ResearchProjects_Tier2_Ship.xml b/DefInjected/ResearchProjectDefs/ResearchProjects_Tier2_Ship.xml
similarity index 100%
rename from DefInjected/ResearchProjectDef/ResearchProjects_Tier2_Ship.xml
rename to DefInjected/ResearchProjectDefs/ResearchProjects_Tier2_Ship.xml
diff --git a/DefInjected/RoofDef/Roofs.xml b/DefInjected/RoofDefs/Roofs.xml
similarity index 100%
rename from DefInjected/RoofDef/Roofs.xml
rename to DefInjected/RoofDefs/Roofs.xml
diff --git a/DefInjected/RoomRoleDef/RoomRoles.xml b/DefInjected/RoomRoleDefs/RoomRoles.xml
similarity index 100%
rename from DefInjected/RoomRoleDef/RoomRoles.xml
rename to DefInjected/RoomRoleDefs/RoomRoles.xml
diff --git a/DefInjected/RoomStatDef/RoomStats.xml b/DefInjected/RoomStatDefs/RoomStats.xml
similarity index 100%
rename from DefInjected/RoomStatDef/RoomStats.xml
rename to DefInjected/RoomStatDefs/RoomStats.xml
diff --git a/DefInjected/RulePackDef/RulePacks_Art_DescriptionRoot.xml b/DefInjected/RulePackDefs/RulePacks_Art_DescriptionRoot.xml
similarity index 100%
rename from DefInjected/RulePackDef/RulePacks_Art_DescriptionRoot.xml
rename to DefInjected/RulePackDefs/RulePacks_Art_DescriptionRoot.xml
diff --git a/DefInjected/RulePackDef/RulePacks_InteractionsExtra.xml b/DefInjected/RulePackDefs/RulePacks_InteractionsExtra.xml
similarity index 100%
rename from DefInjected/RulePackDef/RulePacks_InteractionsExtra.xml
rename to DefInjected/RulePackDefs/RulePacks_InteractionsExtra.xml
diff --git a/DefInjected/RulePackDef/RulePacks_NameMaker_World.xml b/DefInjected/RulePackDefs/RulePacks_NameMaker_World.xml
similarity index 100%
rename from DefInjected/RulePackDef/RulePacks_NameMaker_World.xml
rename to DefInjected/RulePackDefs/RulePacks_NameMaker_World.xml
diff --git a/DefInjected/RulePackDef/RulePacks_NameMakers_Animals.xml b/DefInjected/RulePackDefs/RulePacks_NameMakers_Animals.xml
similarity index 100%
rename from DefInjected/RulePackDef/RulePacks_NameMakers_Animals.xml
rename to DefInjected/RulePackDefs/RulePacks_NameMakers_Animals.xml
diff --git a/DefInjected/RulePackDef/RulePacks_NameMakers_Factions.xml b/DefInjected/RulePackDefs/RulePacks_NameMakers_Factions.xml
similarity index 100%
rename from DefInjected/RulePackDef/RulePacks_NameMakers_Factions.xml
rename to DefInjected/RulePackDefs/RulePacks_NameMakers_Factions.xml
diff --git a/DefInjected/RulePackDef/RulePacks_NameMakers_People.xml b/DefInjected/RulePackDefs/RulePacks_NameMakers_People.xml
similarity index 100%
rename from DefInjected/RulePackDef/RulePacks_NameMakers_People.xml
rename to DefInjected/RulePackDefs/RulePacks_NameMakers_People.xml
diff --git a/DefInjected/RulePackDef/RulePacks_NameMakers_Traders.xml b/DefInjected/RulePackDefs/RulePacks_NameMakers_Traders.xml
similarity index 100%
rename from DefInjected/RulePackDef/RulePacks_NameMakers_Traders.xml
rename to DefInjected/RulePackDefs/RulePacks_NameMakers_Traders.xml
diff --git a/DefInjected/SkillDef/Skills.xml b/DefInjected/SkillDefs/Skills.xml
similarity index 100%
rename from DefInjected/SkillDef/Skills.xml
rename to DefInjected/SkillDefs/Skills.xml
diff --git a/DefInjected/SpecialThingFilterDef/SpecialThingFilters.xml b/DefInjected/SpecialThingFilterDefs/SpecialThingFilters.xml
similarity index 100%
rename from DefInjected/SpecialThingFilterDef/SpecialThingFilters.xml
rename to DefInjected/SpecialThingFilterDefs/SpecialThingFilters.xml
diff --git a/DefInjected/StatCategoryDef/StatCategories.xml b/DefInjected/StatCategoryDefs/StatCategories.xml
similarity index 100%
rename from DefInjected/StatCategoryDef/StatCategories.xml
rename to DefInjected/StatCategoryDefs/StatCategories.xml
diff --git a/DefInjected/StatDef/Stats_Apparel.xml b/DefInjected/StatDefs/Stats_Apparel.xml
similarity index 100%
rename from DefInjected/StatDef/Stats_Apparel.xml
rename to DefInjected/StatDefs/Stats_Apparel.xml
diff --git a/DefInjected/StatDef/Stats_Basics_General.xml b/DefInjected/StatDefs/Stats_Basics_General.xml
similarity index 100%
rename from DefInjected/StatDef/Stats_Basics_General.xml
rename to DefInjected/StatDefs/Stats_Basics_General.xml
diff --git a/DefInjected/StatDef/Stats_Basics_Special.xml b/DefInjected/StatDefs/Stats_Basics_Special.xml
similarity index 100%
rename from DefInjected/StatDef/Stats_Basics_Special.xml
rename to DefInjected/StatDefs/Stats_Basics_Special.xml
diff --git a/DefInjected/StatDef/Stats_Building_Special.xml b/DefInjected/StatDefs/Stats_Building_Special.xml
similarity index 100%
rename from DefInjected/StatDef/Stats_Building_Special.xml
rename to DefInjected/StatDefs/Stats_Building_Special.xml
diff --git a/DefInjected/StatDef/Stats_Pawns_Combat.xml b/DefInjected/StatDefs/Stats_Pawns_Combat.xml
similarity index 100%
rename from DefInjected/StatDef/Stats_Pawns_Combat.xml
rename to DefInjected/StatDefs/Stats_Pawns_Combat.xml
diff --git a/DefInjected/StatDef/Stats_Pawns_General.xml b/DefInjected/StatDefs/Stats_Pawns_General.xml
similarity index 100%
rename from DefInjected/StatDef/Stats_Pawns_General.xml
rename to DefInjected/StatDefs/Stats_Pawns_General.xml
diff --git a/DefInjected/StatDef/Stats_Pawns_Social.xml b/DefInjected/StatDefs/Stats_Pawns_Social.xml
similarity index 100%
rename from DefInjected/StatDef/Stats_Pawns_Social.xml
rename to DefInjected/StatDefs/Stats_Pawns_Social.xml
diff --git a/DefInjected/StatDef/Stats_Pawns_WorkGeneral.xml b/DefInjected/StatDefs/Stats_Pawns_WorkGeneral.xml
similarity index 100%
rename from DefInjected/StatDef/Stats_Pawns_WorkGeneral.xml
rename to DefInjected/StatDefs/Stats_Pawns_WorkGeneral.xml
diff --git a/DefInjected/StatDef/Stats_Pawns_WorkMedical.xml b/DefInjected/StatDefs/Stats_Pawns_WorkMedical.xml
similarity index 100%
rename from DefInjected/StatDef/Stats_Pawns_WorkMedical.xml
rename to DefInjected/StatDefs/Stats_Pawns_WorkMedical.xml
diff --git a/DefInjected/StatDef/Stats_Pawns_WorkRecipes.xml b/DefInjected/StatDefs/Stats_Pawns_WorkRecipes.xml
similarity index 100%
rename from DefInjected/StatDef/Stats_Pawns_WorkRecipes.xml
rename to DefInjected/StatDefs/Stats_Pawns_WorkRecipes.xml
diff --git a/DefInjected/StatDef/Stats_Weapons_Melee.xml b/DefInjected/StatDefs/Stats_Weapons_Melee.xml
similarity index 100%
rename from DefInjected/StatDef/Stats_Weapons_Melee.xml
rename to DefInjected/StatDefs/Stats_Weapons_Melee.xml
diff --git a/DefInjected/StatDef/Stats_Weapons_Ranged.xml b/DefInjected/StatDefs/Stats_Weapons_Ranged.xml
similarity index 100%
rename from DefInjected/StatDef/Stats_Weapons_Ranged.xml
rename to DefInjected/StatDefs/Stats_Weapons_Ranged.xml
diff --git a/DefInjected/StorytellerDef/Storytellers.xml b/DefInjected/StorytellerDefs/Storytellers.xml
similarity index 100%
rename from DefInjected/StorytellerDef/Storytellers.xml
rename to DefInjected/StorytellerDefs/Storytellers.xml
diff --git a/DefInjected/StuffCategoryDef/StuffCategories.xml b/DefInjected/StuffCategoryDefs/StuffCategories.xml
similarity index 100%
rename from DefInjected/StuffCategoryDef/StuffCategories.xml
rename to DefInjected/StuffCategoryDefs/StuffCategories.xml
diff --git a/DefInjected/TaleDef/Tales_NoPawn.xml b/DefInjected/TaleDefs/Tales_NoPawn.xml
similarity index 100%
rename from DefInjected/TaleDef/Tales_NoPawn.xml
rename to DefInjected/TaleDefs/Tales_NoPawn.xml
diff --git a/DefInjected/TerrainDef/Terrain_Floors.xml b/DefInjected/TerrainDefs/Terrain_Floors.xml
similarity index 100%
rename from DefInjected/TerrainDef/Terrain_Floors.xml
rename to DefInjected/TerrainDefs/Terrain_Floors.xml
diff --git a/DefInjected/TerrainDef/Terrain_FloorsStoneTile.xml b/DefInjected/TerrainDefs/Terrain_FloorsStoneTile.xml
similarity index 100%
rename from DefInjected/TerrainDef/Terrain_FloorsStoneTile.xml
rename to DefInjected/TerrainDefs/Terrain_FloorsStoneTile.xml
diff --git a/DefInjected/TerrainDef/Terrain_Natural.xml b/DefInjected/TerrainDefs/Terrain_Natural.xml
similarity index 100%
rename from DefInjected/TerrainDef/Terrain_Natural.xml
rename to DefInjected/TerrainDefs/Terrain_Natural.xml
diff --git a/DefInjected/TerrainDef/Terrain_Special.xml b/DefInjected/TerrainDefs/Terrain_Special.xml
similarity index 100%
rename from DefInjected/TerrainDef/Terrain_Special.xml
rename to DefInjected/TerrainDefs/Terrain_Special.xml
diff --git a/DefInjected/TerrainDef/Terrain_Water.xml b/DefInjected/TerrainDefs/Terrain_Water.xml
similarity index 100%
rename from DefInjected/TerrainDef/Terrain_Water.xml
rename to DefInjected/TerrainDefs/Terrain_Water.xml
diff --git a/DefInjected/TerrainDef/Terrain_add.xml b/DefInjected/TerrainDefs/Terrain_add.xml
similarity index 100%
rename from DefInjected/TerrainDef/Terrain_add.xml
rename to DefInjected/TerrainDefs/Terrain_add.xml
diff --git a/DefInjected/ThingCategoryDef/ThingCategories.xml b/DefInjected/ThingCategoryDefs/ThingCategories.xml
similarity index 100%
rename from DefInjected/ThingCategoryDef/ThingCategories.xml
rename to DefInjected/ThingCategoryDefs/ThingCategories.xml
diff --git a/DefInjected/ThoughtDef/Thoughts_Artifacts.xml b/DefInjected/ThoughtDefs/Thoughts_Artifacts.xml
similarity index 100%
rename from DefInjected/ThoughtDef/Thoughts_Artifacts.xml
rename to DefInjected/ThoughtDefs/Thoughts_Artifacts.xml
diff --git a/DefInjected/ThoughtDef/Thoughts_ConditionsDrugs.xml b/DefInjected/ThoughtDefs/Thoughts_ConditionsDrugs.xml
similarity index 100%
rename from DefInjected/ThoughtDef/Thoughts_ConditionsDrugs.xml
rename to DefInjected/ThoughtDefs/Thoughts_ConditionsDrugs.xml
diff --git a/DefInjected/ThoughtDef/Thoughts_ConditionsGeneral.xml b/DefInjected/ThoughtDefs/Thoughts_ConditionsGeneral.xml
similarity index 100%
rename from DefInjected/ThoughtDef/Thoughts_ConditionsGeneral.xml
rename to DefInjected/ThoughtDefs/Thoughts_ConditionsGeneral.xml
diff --git a/DefInjected/ThoughtDef/Thoughts_ConditionsSpecial.xml b/DefInjected/ThoughtDefs/Thoughts_ConditionsSpecial.xml
similarity index 100%
rename from DefInjected/ThoughtDef/Thoughts_ConditionsSpecial.xml
rename to DefInjected/ThoughtDefs/Thoughts_ConditionsSpecial.xml
diff --git a/DefInjected/ThoughtDef/Thoughts_Debug.xml b/DefInjected/ThoughtDefs/Thoughts_Debug.xml
similarity index 100%
rename from DefInjected/ThoughtDef/Thoughts_Debug.xml
rename to DefInjected/ThoughtDefs/Thoughts_Debug.xml
diff --git a/DefInjected/ThoughtDef/Thoughts_Implants.xml b/DefInjected/ThoughtDefs/Thoughts_Implants.xml
similarity index 100%
rename from DefInjected/ThoughtDef/Thoughts_Implants.xml
rename to DefInjected/ThoughtDefs/Thoughts_Implants.xml
diff --git a/DefInjected/ThoughtDef/Thoughts_Memories.xml b/DefInjected/ThoughtDefs/Thoughts_Memories.xml
similarity index 100%
rename from DefInjected/ThoughtDef/Thoughts_Memories.xml
rename to DefInjected/ThoughtDefs/Thoughts_Memories.xml
diff --git a/DefInjected/ThoughtDef/Thoughts_MentalState.xml b/DefInjected/ThoughtDefs/Thoughts_MentalState.xml
similarity index 100%
rename from DefInjected/ThoughtDef/Thoughts_MentalState.xml
rename to DefInjected/ThoughtDefs/Thoughts_MentalState.xml
diff --git a/DefInjected/ThoughtDef/Thoughts_Needs.xml b/DefInjected/ThoughtDefs/Thoughts_Needs.xml
similarity index 100%
rename from DefInjected/ThoughtDef/Thoughts_Needs.xml
rename to DefInjected/ThoughtDefs/Thoughts_Needs.xml
diff --git a/DefInjected/ThoughtDef/Thoughts_PsychicDrone.xml b/DefInjected/ThoughtDefs/Thoughts_PsychicDrone.xml
similarity index 100%
rename from DefInjected/ThoughtDef/Thoughts_PsychicDrone.xml
rename to DefInjected/ThoughtDefs/Thoughts_PsychicDrone.xml
diff --git a/DefInjected/ThoughtDef/Thoughts_RandomMood.xml b/DefInjected/ThoughtDefs/Thoughts_RandomMood.xml
similarity index 100%
rename from DefInjected/ThoughtDef/Thoughts_RandomMood.xml
rename to DefInjected/ThoughtDefs/Thoughts_RandomMood.xml
diff --git a/DefInjected/ThoughtDef/Thoughts_RoomStats.xml b/DefInjected/ThoughtDefs/Thoughts_RoomStats.xml
similarity index 100%
rename from DefInjected/ThoughtDef/Thoughts_RoomStats.xml
rename to DefInjected/ThoughtDefs/Thoughts_RoomStats.xml
diff --git a/DefInjected/ThoughtDef/Thoughts_Social.xml b/DefInjected/ThoughtDefs/Thoughts_Social.xml
similarity index 100%
rename from DefInjected/ThoughtDef/Thoughts_Social.xml
rename to DefInjected/ThoughtDefs/Thoughts_Social.xml
diff --git a/DefInjected/ThoughtDef/Thoughts_SocialConditional.xml b/DefInjected/ThoughtDefs/Thoughts_SocialConditional.xml
similarity index 100%
rename from DefInjected/ThoughtDef/Thoughts_SocialConditional.xml
rename to DefInjected/ThoughtDefs/Thoughts_SocialConditional.xml
diff --git a/DefInjected/ThoughtDef/Thoughts_SocialInteractions.xml b/DefInjected/ThoughtDefs/Thoughts_SocialInteractions.xml
similarity index 100%
rename from DefInjected/ThoughtDef/Thoughts_SocialInteractions.xml
rename to DefInjected/ThoughtDefs/Thoughts_SocialInteractions.xml
diff --git a/DefInjected/ThoughtDef/Thoughts_TraitsConditional.xml b/DefInjected/ThoughtDefs/Thoughts_TraitsConditional.xml
similarity index 100%
rename from DefInjected/ThoughtDef/Thoughts_TraitsConditional.xml
rename to DefInjected/ThoughtDefs/Thoughts_TraitsConditional.xml
diff --git a/DefInjected/ThoughtDef/Thoughts_TraitsPermanent.xml b/DefInjected/ThoughtDefs/Thoughts_TraitsPermanent.xml
similarity index 100%
rename from DefInjected/ThoughtDef/Thoughts_TraitsPermanent.xml
rename to DefInjected/ThoughtDefs/Thoughts_TraitsPermanent.xml
diff --git a/DefInjected/TimeAssignmentDef/TimeAssignments.xml b/DefInjected/TimeAssignmentDefs/TimeAssignments.xml
similarity index 100%
rename from DefInjected/TimeAssignmentDef/TimeAssignments.xml
rename to DefInjected/TimeAssignmentDefs/TimeAssignments.xml
diff --git a/DefInjected/TradeDialogSorterDef/TradeDialogSorters.xml b/DefInjected/TradeDialogSorterDefs/TradeDialogSorters.xml
similarity index 100%
rename from DefInjected/TradeDialogSorterDef/TradeDialogSorters.xml
rename to DefInjected/TradeDialogSorterDefs/TradeDialogSorters.xml
diff --git a/DefInjected/TraderKindDef/TraderKinds_Caravan_Neolithic.xml b/DefInjected/TraderKindDefs/TraderKinds_Caravan_Neolithic.xml
similarity index 100%
rename from DefInjected/TraderKindDef/TraderKinds_Caravan_Neolithic.xml
rename to DefInjected/TraderKindDefs/TraderKinds_Caravan_Neolithic.xml
diff --git a/DefInjected/TraderKindDef/TraderKinds_Caravan_Outlander.xml b/DefInjected/TraderKindDefs/TraderKinds_Caravan_Outlander.xml
similarity index 100%
rename from DefInjected/TraderKindDef/TraderKinds_Caravan_Outlander.xml
rename to DefInjected/TraderKindDefs/TraderKinds_Caravan_Outlander.xml
diff --git a/DefInjected/TraderKindDef/TraderKinds_Orbital_Misc.xml b/DefInjected/TraderKindDefs/TraderKinds_Orbital_Misc.xml
similarity index 100%
rename from DefInjected/TraderKindDef/TraderKinds_Orbital_Misc.xml
rename to DefInjected/TraderKindDefs/TraderKinds_Orbital_Misc.xml
diff --git a/DefInjected/TraderKindDef/TraderKinds_Visitor_Neolithic.xml b/DefInjected/TraderKindDefs/TraderKinds_Visitor_Neolithic.xml
similarity index 100%
rename from DefInjected/TraderKindDef/TraderKinds_Visitor_Neolithic.xml
rename to DefInjected/TraderKindDefs/TraderKinds_Visitor_Neolithic.xml
diff --git a/DefInjected/TraderKindDef/TraderKinds_Visitor_Outlander.xml b/DefInjected/TraderKindDefs/TraderKinds_Visitor_Outlander.xml
similarity index 100%
rename from DefInjected/TraderKindDef/TraderKinds_Visitor_Outlander.xml
rename to DefInjected/TraderKindDefs/TraderKinds_Visitor_Outlander.xml
diff --git a/DefInjected/TrainableDef/Trainables.xml b/DefInjected/TrainableDefs/Trainables.xml
similarity index 100%
rename from DefInjected/TrainableDef/Trainables.xml
rename to DefInjected/TrainableDefs/Trainables.xml
diff --git a/DefInjected/TraitDef/Traits_Singular.xml b/DefInjected/TraitDefs/Traits_Singular.xml
similarity index 100%
rename from DefInjected/TraitDef/Traits_Singular.xml
rename to DefInjected/TraitDefs/Traits_Singular.xml
diff --git a/DefInjected/TraitDef/Traits_Spectrum.xml b/DefInjected/TraitDefs/Traits_Spectrum.xml
similarity index 100%
rename from DefInjected/TraitDef/Traits_Spectrum.xml
rename to DefInjected/TraitDefs/Traits_Spectrum.xml
diff --git a/DefInjected/WeatherDef/Weathers.xml b/DefInjected/WeatherDefs/Weathers.xml
similarity index 100%
rename from DefInjected/WeatherDef/Weathers.xml
rename to DefInjected/WeatherDefs/Weathers.xml
diff --git a/DefInjected/WorkGiverDef/WorkGivers.xml b/DefInjected/WorkGiverDefs/WorkGivers.xml
similarity index 100%
rename from DefInjected/WorkGiverDef/WorkGivers.xml
rename to DefInjected/WorkGiverDefs/WorkGivers.xml
diff --git a/DefInjected/WorkTypeDef/WorkTypes.xml b/DefInjected/WorkTypeDefs/WorkTypes.xml
similarity index 100%
rename from DefInjected/WorkTypeDef/WorkTypes.xml
rename to DefInjected/WorkTypeDefs/WorkTypes.xml