diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 1c212cabee..8ae62cf90b 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -583,30 +583,6 @@
     <Compile Include="Traits\World\WeatherOverlay.cs" />
     <Compile Include="Traits\World\ActorSpawnManager.cs" />
     <Compile Include="Traits\ActorSpawner.cs" />
-    <Compile Include="UpdateRules\Rules\ChangeIntensityToDuration.cs" />
-    <Compile Include="UpdateRules\Rules\AddShakeToBridge.cs" />
-    <Compile Include="UpdateRules\Rules\ChangeBuildableArea.cs" />
-    <Compile Include="UpdateRules\Rules\ChangeCanPowerDown.cs" />
-    <Compile Include="UpdateRules\Rules\DropPauseAnimationWhenDisabled.cs" />
-    <Compile Include="UpdateRules\Rules\IgnoreAbstractActors.cs" />
-    <Compile Include="UpdateRules\Rules\AddNukeLaunchAnimation.cs" />
-    <Compile Include="UpdateRules\Rules\CapturableChanges.cs" />
-    <Compile Include="UpdateRules\Rules\DecoupleSelfReloading.cs" />
-    <Compile Include="UpdateRules\Rules\MoveVisualBounds.cs" />
-    <Compile Include="UpdateRules\Rules\RemoveIDisable.cs" />
-    <Compile Include="UpdateRules\Rules\RemoveOutOfAmmo.cs" />
-    <Compile Include="UpdateRules\Rules\RemovePlayerPaletteTileset.cs" />
-    <Compile Include="UpdateRules\Rules\RenameWithTurreted.cs" />
-    <Compile Include="UpdateRules\Rules\ReplaceCanPowerDown.cs" />
-    <Compile Include="UpdateRules\Rules\ReplaceRequiresPower.cs" />
-    <Compile Include="UpdateRules\Rules\ReworkCheckboxes.cs" />
-    <Compile Include="UpdateRules\Rules\ScaleModHealth.cs" />
-    <Compile Include="UpdateRules\Rules\ScaleModHealthBy10.cs" />
-    <Compile Include="UpdateRules\Rules\ScaleModHealthBy100.cs" />
-    <Compile Include="UpdateRules\Rules\SplitGateFromBuilding.cs" />
-    <Compile Include="UpdateRules\Rules\RenameBurstDelay.cs" />
-    <Compile Include="UpdateRules\Rules\WarnAboutInfiltrateForTypes.cs" />
-    <Compile Include="UpdateRules\Rules\LegacyBetaWarning.cs" />
     <Compile Include="UtilityCommands\CheckYaml.cs" />
     <Compile Include="UtilityCommands\ConvertPngToShpCommand.cs" />
     <Compile Include="UtilityCommands\ConvertSpriteToPngCommand.cs" />
@@ -886,15 +862,36 @@
     <Compile Include="Widgets\Logic\DirectConnectLogic.cs" />
     <Compile Include="Traits\Conditions\ToggleConditionOnOrder.cs" />
     <Compile Include="Widgets\Logic\ServerListLogic.cs" />
-    <Compile Include="UpdateRules\UpdateRule.cs" />
     <Compile Include="UtilityCommands\UpdateModCommand.cs" />
+    <Compile Include="UtilityCommands\UpdateMapCommand.cs" />
+    <Compile Include="UpdateRules\UpdateRule.cs" />
     <Compile Include="UpdateRules\UpdatePath.cs" />
     <Compile Include="UpdateRules\UpdateUtils.cs" />
-    <Compile Include="UpdateRules\Rules\RemoveMobileOnRails.cs" />
-    <Compile Include="UpdateRules\Rules\AircraftCanHoverGeneralization.cs" />
-    <Compile Include="UpdateRules\Rules\ScaleDefaultModHealth.cs" />
-    <Compile Include="UpdateRules\Rules\ScaleSupportPowerSecondsToTicks.cs" />
-    <Compile Include="UtilityCommands\UpdateMapCommand.cs" />
+    <Compile Include="UpdateRules\Rules\20171014\LegacyBetaWarning.cs" />
+    <Compile Include="UpdateRules\Rules\20171014\RemoveMobileOnRails.cs" />
+    <Compile Include="UpdateRules\Rules\20171014\AircraftCanHoverGeneralization.cs" />
+    <Compile Include="UpdateRules\Rules\20171014\AddNukeLaunchAnimation.cs" />
+    <Compile Include="UpdateRules\Rules\20171014\RenameWithTurreted.cs" />
+    <Compile Include="UpdateRules\Rules\20171014\RemovePlayerPaletteTileset.cs" />
+    <Compile Include="UpdateRules\Rules\20171014\CapturableChanges.cs" />
+    <Compile Include="UpdateRules\Rules\20171014\DecoupleSelfReloading.cs" />
+    <Compile Include="UpdateRules\Rules\20171014\RemoveOutOfAmmo.cs" />
+    <Compile Include="UpdateRules\Rules\20171014\ChangeCanPowerDown.cs" />
+    <Compile Include="UpdateRules\Rules\20171014\ReplaceRequiresPower.cs" />
+    <Compile Include="UpdateRules\Rules\20171014\DropPauseAnimationWhenDisabled.cs" />
+    <Compile Include="UpdateRules\Rules\20171014\ChangeBuildableArea.cs" />
+    <Compile Include="UpdateRules\Rules\20171014\MoveVisualBounds.cs" />
+    <Compile Include="UpdateRules\Rules\20171014\ScaleModHealth.cs" />
+    <Compile Include="UpdateRules\Rules\20171014\ScaleModHealthBy10.cs" />
+    <Compile Include="UpdateRules\Rules\20171014\ScaleModHealthBy100.cs" />
+    <Compile Include="UpdateRules\Rules\20171014\ScaleDefaultModHealth.cs" />
+    <Compile Include="UpdateRules\Rules\20171014\ReworkCheckboxes.cs" />
+    <Compile Include="UpdateRules\Rules\20171014\SplitGateFromBuilding.cs" />
+    <Compile Include="UpdateRules\Rules\20171014\RemoveIDisable.cs" />
+    <Compile Include="UpdateRules\Rules\20171014\ReplaceCanPowerDown.cs" />
+    <Compile Include="UpdateRules\Rules\20171014\ScaleSupportPowerSecondsToTicks.cs" />
+    <Compile Include="UpdateRules\Rules\20171014\WarnAboutInfiltrateForTypes.cs" />
+    <Compile Include="UpdateRules\Rules\20171014\RenameBurstDelay.cs" />
     <Compile Include="UpdateRules\Rules\RemoveTerrainTypeIsWaterFlag.cs" />
     <Compile Include="UpdateRules\Rules\RemoveWeaponScanRadius.cs" />
     <Compile Include="UpdateRules\Rules\DefineSoundDefaults.cs" />
@@ -903,15 +900,18 @@
     <Compile Include="UpdateRules\Rules\RenameWormSpawner.cs" />
     <Compile Include="UpdateRules\Rules\RemoveWithReloadingSpriteTurret.cs" />
     <Compile Include="UpdateRules\Rules\RemovePaletteFromCurrentTileset.cs" />
-    <Compile Include="Traits\Player\PlayerResources.cs" />
-    <Compile Include="UtilityCommands\DumpSequenceSheetsCommand.cs" />
     <Compile Include="UpdateRules\Rules\DefineLocomotors.cs" />
     <Compile Include="UpdateRules\Rules\DefineOwnerLostAction.cs" />
     <Compile Include="UpdateRules\Rules\RenameEmitInfantryOnSell.cs" />
-    <Compile Include="Traits\Render\WithBuildingRepairDecoration.cs" />
     <Compile Include="UpdateRules\Rules\SplitRepairDecoration.cs" />
-    <Compile Include="ModCredits.cs" />
     <Compile Include="UpdateRules\Rules\MoveHackyAISupportPowerDecisions.cs" />
+    <Compile Include="UpdateRules\Rules\ChangeIntensityToDuration.cs" />
+    <Compile Include="UpdateRules\Rules\AddShakeToBridge.cs" />
+    <Compile Include="UpdateRules\Rules\IgnoreAbstractActors.cs" />
+    <Compile Include="Traits\Player\PlayerResources.cs" />
+    <Compile Include="UtilityCommands\DumpSequenceSheetsCommand.cs" />
+    <Compile Include="Traits\Render\WithBuildingRepairDecoration.cs" />
+    <Compile Include="ModCredits.cs" />
     <Compile Include="Lint\CheckUnknownTraitFields.cs" />
     <Compile Include="Lint\CheckUnknownWeaponFields.cs" />
   </ItemGroup>
diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/AddNukeLaunchAnimation.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20171014/AddNukeLaunchAnimation.cs
similarity index 100%
rename from OpenRA.Mods.Common/UpdateRules/Rules/AddNukeLaunchAnimation.cs
rename to OpenRA.Mods.Common/UpdateRules/Rules/20171014/AddNukeLaunchAnimation.cs
diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/AircraftCanHoverGeneralization.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20171014/AircraftCanHoverGeneralization.cs
similarity index 100%
rename from OpenRA.Mods.Common/UpdateRules/Rules/AircraftCanHoverGeneralization.cs
rename to OpenRA.Mods.Common/UpdateRules/Rules/20171014/AircraftCanHoverGeneralization.cs
diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/CapturableChanges.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20171014/CapturableChanges.cs
similarity index 100%
rename from OpenRA.Mods.Common/UpdateRules/Rules/CapturableChanges.cs
rename to OpenRA.Mods.Common/UpdateRules/Rules/20171014/CapturableChanges.cs
diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/ChangeBuildableArea.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20171014/ChangeBuildableArea.cs
similarity index 100%
rename from OpenRA.Mods.Common/UpdateRules/Rules/ChangeBuildableArea.cs
rename to OpenRA.Mods.Common/UpdateRules/Rules/20171014/ChangeBuildableArea.cs
diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/ChangeCanPowerDown.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20171014/ChangeCanPowerDown.cs
similarity index 100%
rename from OpenRA.Mods.Common/UpdateRules/Rules/ChangeCanPowerDown.cs
rename to OpenRA.Mods.Common/UpdateRules/Rules/20171014/ChangeCanPowerDown.cs
diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/DecoupleSelfReloading.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20171014/DecoupleSelfReloading.cs
similarity index 100%
rename from OpenRA.Mods.Common/UpdateRules/Rules/DecoupleSelfReloading.cs
rename to OpenRA.Mods.Common/UpdateRules/Rules/20171014/DecoupleSelfReloading.cs
diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/DropPauseAnimationWhenDisabled.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20171014/DropPauseAnimationWhenDisabled.cs
similarity index 100%
rename from OpenRA.Mods.Common/UpdateRules/Rules/DropPauseAnimationWhenDisabled.cs
rename to OpenRA.Mods.Common/UpdateRules/Rules/20171014/DropPauseAnimationWhenDisabled.cs
diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/LegacyBetaWarning.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20171014/LegacyBetaWarning.cs
similarity index 100%
rename from OpenRA.Mods.Common/UpdateRules/Rules/LegacyBetaWarning.cs
rename to OpenRA.Mods.Common/UpdateRules/Rules/20171014/LegacyBetaWarning.cs
diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/MoveVisualBounds.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20171014/MoveVisualBounds.cs
similarity index 100%
rename from OpenRA.Mods.Common/UpdateRules/Rules/MoveVisualBounds.cs
rename to OpenRA.Mods.Common/UpdateRules/Rules/20171014/MoveVisualBounds.cs
diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/RemoveIDisable.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20171014/RemoveIDisable.cs
similarity index 100%
rename from OpenRA.Mods.Common/UpdateRules/Rules/RemoveIDisable.cs
rename to OpenRA.Mods.Common/UpdateRules/Rules/20171014/RemoveIDisable.cs
diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/RemoveMobileOnRails.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20171014/RemoveMobileOnRails.cs
similarity index 100%
rename from OpenRA.Mods.Common/UpdateRules/Rules/RemoveMobileOnRails.cs
rename to OpenRA.Mods.Common/UpdateRules/Rules/20171014/RemoveMobileOnRails.cs
diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/RemoveOutOfAmmo.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20171014/RemoveOutOfAmmo.cs
similarity index 100%
rename from OpenRA.Mods.Common/UpdateRules/Rules/RemoveOutOfAmmo.cs
rename to OpenRA.Mods.Common/UpdateRules/Rules/20171014/RemoveOutOfAmmo.cs
diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/RemovePlayerPaletteTileset.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20171014/RemovePlayerPaletteTileset.cs
similarity index 100%
rename from OpenRA.Mods.Common/UpdateRules/Rules/RemovePlayerPaletteTileset.cs
rename to OpenRA.Mods.Common/UpdateRules/Rules/20171014/RemovePlayerPaletteTileset.cs
diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/RenameBurstDelay.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20171014/RenameBurstDelay.cs
similarity index 100%
rename from OpenRA.Mods.Common/UpdateRules/Rules/RenameBurstDelay.cs
rename to OpenRA.Mods.Common/UpdateRules/Rules/20171014/RenameBurstDelay.cs
diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/RenameWithTurreted.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20171014/RenameWithTurreted.cs
similarity index 100%
rename from OpenRA.Mods.Common/UpdateRules/Rules/RenameWithTurreted.cs
rename to OpenRA.Mods.Common/UpdateRules/Rules/20171014/RenameWithTurreted.cs
diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/ReplaceCanPowerDown.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20171014/ReplaceCanPowerDown.cs
similarity index 100%
rename from OpenRA.Mods.Common/UpdateRules/Rules/ReplaceCanPowerDown.cs
rename to OpenRA.Mods.Common/UpdateRules/Rules/20171014/ReplaceCanPowerDown.cs
diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/ReplaceRequiresPower.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20171014/ReplaceRequiresPower.cs
similarity index 100%
rename from OpenRA.Mods.Common/UpdateRules/Rules/ReplaceRequiresPower.cs
rename to OpenRA.Mods.Common/UpdateRules/Rules/20171014/ReplaceRequiresPower.cs
diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/ReworkCheckboxes.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20171014/ReworkCheckboxes.cs
similarity index 100%
rename from OpenRA.Mods.Common/UpdateRules/Rules/ReworkCheckboxes.cs
rename to OpenRA.Mods.Common/UpdateRules/Rules/20171014/ReworkCheckboxes.cs
diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/ScaleDefaultModHealth.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20171014/ScaleDefaultModHealth.cs
similarity index 100%
rename from OpenRA.Mods.Common/UpdateRules/Rules/ScaleDefaultModHealth.cs
rename to OpenRA.Mods.Common/UpdateRules/Rules/20171014/ScaleDefaultModHealth.cs
diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/ScaleModHealth.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20171014/ScaleModHealth.cs
similarity index 100%
rename from OpenRA.Mods.Common/UpdateRules/Rules/ScaleModHealth.cs
rename to OpenRA.Mods.Common/UpdateRules/Rules/20171014/ScaleModHealth.cs
diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/ScaleModHealthBy10.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20171014/ScaleModHealthBy10.cs
similarity index 100%
rename from OpenRA.Mods.Common/UpdateRules/Rules/ScaleModHealthBy10.cs
rename to OpenRA.Mods.Common/UpdateRules/Rules/20171014/ScaleModHealthBy10.cs
diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/ScaleModHealthBy100.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20171014/ScaleModHealthBy100.cs
similarity index 100%
rename from OpenRA.Mods.Common/UpdateRules/Rules/ScaleModHealthBy100.cs
rename to OpenRA.Mods.Common/UpdateRules/Rules/20171014/ScaleModHealthBy100.cs
diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/ScaleSupportPowerSecondsToTicks.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20171014/ScaleSupportPowerSecondsToTicks.cs
similarity index 100%
rename from OpenRA.Mods.Common/UpdateRules/Rules/ScaleSupportPowerSecondsToTicks.cs
rename to OpenRA.Mods.Common/UpdateRules/Rules/20171014/ScaleSupportPowerSecondsToTicks.cs
diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/SplitGateFromBuilding.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20171014/SplitGateFromBuilding.cs
similarity index 100%
rename from OpenRA.Mods.Common/UpdateRules/Rules/SplitGateFromBuilding.cs
rename to OpenRA.Mods.Common/UpdateRules/Rules/20171014/SplitGateFromBuilding.cs
diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/WarnAboutInfiltrateForTypes.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20171014/WarnAboutInfiltrateForTypes.cs
similarity index 100%
rename from OpenRA.Mods.Common/UpdateRules/Rules/WarnAboutInfiltrateForTypes.cs
rename to OpenRA.Mods.Common/UpdateRules/Rules/20171014/WarnAboutInfiltrateForTypes.cs