diff --git a/PKHeX.Core/Legality/Encounters/EncounterEgg.cs b/PKHeX.Core/Legality/Encounters/EncounterMisc/EncounterEgg.cs
similarity index 100%
rename from PKHeX.Core/Legality/Encounters/EncounterEgg.cs
rename to PKHeX.Core/Legality/Encounters/EncounterMisc/EncounterEgg.cs
diff --git a/PKHeX.Core/Legality/Encounters/EncounterInvalid.cs b/PKHeX.Core/Legality/Encounters/EncounterMisc/EncounterInvalid.cs
similarity index 100%
rename from PKHeX.Core/Legality/Encounters/EncounterInvalid.cs
rename to PKHeX.Core/Legality/Encounters/EncounterMisc/EncounterInvalid.cs
diff --git a/PKHeX.Core/Legality/Encounters/EncounterRejected.cs b/PKHeX.Core/Legality/Encounters/EncounterMisc/EncounterRejected.cs
similarity index 100%
rename from PKHeX.Core/Legality/Encounters/EncounterRejected.cs
rename to PKHeX.Core/Legality/Encounters/EncounterMisc/EncounterRejected.cs
diff --git a/PKHeX.Core/Legality/Encounters/EncounterSlot.cs b/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot.cs
similarity index 100%
rename from PKHeX.Core/Legality/Encounters/EncounterSlot.cs
rename to PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot.cs
diff --git a/PKHeX.Core/Legality/Encounters/EncounterSlot1.cs b/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot1.cs
similarity index 100%
rename from PKHeX.Core/Legality/Encounters/EncounterSlot1.cs
rename to PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot1.cs
diff --git a/PKHeX.Core/Legality/Encounters/EncounterSlot3Swarm.cs b/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot3Swarm.cs
similarity index 100%
rename from PKHeX.Core/Legality/Encounters/EncounterSlot3Swarm.cs
rename to PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot3Swarm.cs
diff --git a/PKHeX.Core/Legality/Encounters/EncounterSlotPermissions.cs b/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlotPermissions.cs
similarity index 100%
rename from PKHeX.Core/Legality/Encounters/EncounterSlotPermissions.cs
rename to PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlotPermissions.cs
diff --git a/PKHeX.Core/Legality/Encounters/EncounterGift8.cs b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterGift8.cs
similarity index 100%
rename from PKHeX.Core/Legality/Encounters/EncounterGift8.cs
rename to PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterGift8.cs
diff --git a/PKHeX.Core/Legality/Encounters/EncounterStatic.cs b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic.cs
similarity index 100%
rename from PKHeX.Core/Legality/Encounters/EncounterStatic.cs
rename to PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic.cs
diff --git a/PKHeX.Core/Legality/Encounters/EncounterStatic8.cs b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8.cs
similarity index 100%
rename from PKHeX.Core/Legality/Encounters/EncounterStatic8.cs
rename to PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8.cs
diff --git a/PKHeX.Core/Legality/Encounters/EncounterStatic8N.cs b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8N.cs
similarity index 100%
rename from PKHeX.Core/Legality/Encounters/EncounterStatic8N.cs
rename to PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8N.cs
diff --git a/PKHeX.Core/Legality/Encounters/EncounterStatic8NC.cs b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8NC.cs
similarity index 100%
rename from PKHeX.Core/Legality/Encounters/EncounterStatic8NC.cs
rename to PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8NC.cs
diff --git a/PKHeX.Core/Legality/Encounters/EncounterStatic8ND.cs b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8ND.cs
similarity index 100%
rename from PKHeX.Core/Legality/Encounters/EncounterStatic8ND.cs
rename to PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8ND.cs
diff --git a/PKHeX.Core/Legality/Encounters/EncounterStatic8Nest.cs b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8Nest.cs
similarity index 100%
rename from PKHeX.Core/Legality/Encounters/EncounterStatic8Nest.cs
rename to PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8Nest.cs
diff --git a/PKHeX.Core/Legality/Encounters/EncounterStatic8S.cs b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8S.cs
similarity index 100%
rename from PKHeX.Core/Legality/Encounters/EncounterStatic8S.cs
rename to PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8S.cs
diff --git a/PKHeX.Core/Legality/Encounters/EncounterStaticPID.cs b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStaticPID.cs
similarity index 100%
rename from PKHeX.Core/Legality/Encounters/EncounterStaticPID.cs
rename to PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStaticPID.cs
diff --git a/PKHeX.Core/Legality/Encounters/EncounterStaticShadow.cs b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStaticShadow.cs
similarity index 100%
rename from PKHeX.Core/Legality/Encounters/EncounterStaticShadow.cs
rename to PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStaticShadow.cs
diff --git a/PKHeX.Core/Legality/Encounters/EncounterStaticTyped.cs b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStaticTyped.cs
similarity index 100%
rename from PKHeX.Core/Legality/Encounters/EncounterStaticTyped.cs
rename to PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStaticTyped.cs
diff --git a/PKHeX.Core/Legality/Encounters/EncounterTrade.cs b/PKHeX.Core/Legality/Encounters/EncounterTrade/EncounterTrade.cs
similarity index 100%
rename from PKHeX.Core/Legality/Encounters/EncounterTrade.cs
rename to PKHeX.Core/Legality/Encounters/EncounterTrade/EncounterTrade.cs
diff --git a/PKHeX.Core/Legality/Encounters/EncounterTrade8.cs b/PKHeX.Core/Legality/Encounters/EncounterTrade/EncounterTrade8.cs
similarity index 100%
rename from PKHeX.Core/Legality/Encounters/EncounterTrade8.cs
rename to PKHeX.Core/Legality/Encounters/EncounterTrade/EncounterTrade8.cs
diff --git a/PKHeX.Core/Legality/Encounters/EncounterTradeCatchRate.cs b/PKHeX.Core/Legality/Encounters/EncounterTrade/EncounterTradeCatchRate.cs
similarity index 100%
rename from PKHeX.Core/Legality/Encounters/EncounterTradeCatchRate.cs
rename to PKHeX.Core/Legality/Encounters/EncounterTrade/EncounterTradeCatchRate.cs
diff --git a/PKHeX.Core/Legality/Encounters/EncounterTradePID.cs b/PKHeX.Core/Legality/Encounters/EncounterTrade/EncounterTradePID.cs
similarity index 100%
rename from PKHeX.Core/Legality/Encounters/EncounterTradePID.cs
rename to PKHeX.Core/Legality/Encounters/EncounterTrade/EncounterTradePID.cs