diff --git a/PKHeX.Core/Game/Ability.cs b/PKHeX.Core/Game/Enums/Ability.cs
similarity index 100%
rename from PKHeX.Core/Game/Ability.cs
rename to PKHeX.Core/Game/Enums/Ability.cs
diff --git a/PKHeX.Core/Game/Ball.cs b/PKHeX.Core/Game/Enums/Ball.cs
similarity index 100%
rename from PKHeX.Core/Game/Ball.cs
rename to PKHeX.Core/Game/Enums/Ball.cs
diff --git a/PKHeX.Core/Game/GCVersion.cs b/PKHeX.Core/Game/Enums/GCVersion.cs
similarity index 100%
rename from PKHeX.Core/Game/GCVersion.cs
rename to PKHeX.Core/Game/Enums/GCVersion.cs
diff --git a/PKHeX.Core/Game/GameVersion.cs b/PKHeX.Core/Game/Enums/GameVersion.cs
similarity index 100%
rename from PKHeX.Core/Game/GameVersion.cs
rename to PKHeX.Core/Game/Enums/GameVersion.cs
diff --git a/PKHeX.Core/Game/Gender.cs b/PKHeX.Core/Game/Enums/Gender.cs
similarity index 100%
rename from PKHeX.Core/Game/Gender.cs
rename to PKHeX.Core/Game/Enums/Gender.cs
diff --git a/PKHeX.Core/Game/LanguageGC.cs b/PKHeX.Core/Game/Enums/LanguageGC.cs
similarity index 100%
rename from PKHeX.Core/Game/LanguageGC.cs
rename to PKHeX.Core/Game/Enums/LanguageGC.cs
diff --git a/PKHeX.Core/Game/LanguageID.cs b/PKHeX.Core/Game/Enums/LanguageID.cs
similarity index 100%
rename from PKHeX.Core/Game/LanguageID.cs
rename to PKHeX.Core/Game/Enums/LanguageID.cs
diff --git a/PKHeX.Core/Game/MoveType.cs b/PKHeX.Core/Game/Enums/MoveType.cs
similarity index 96%
rename from PKHeX.Core/Game/MoveType.cs
rename to PKHeX.Core/Game/Enums/MoveType.cs
index 783816b43..694382e3e 100644
--- a/PKHeX.Core/Game/MoveType.cs
+++ b/PKHeX.Core/Game/Enums/MoveType.cs
@@ -26,7 +26,7 @@ public enum MoveType : sbyte
         Fairy,
     }
 
-    public static partial class Extensions
+    public static class MoveTypeExtensions
     {
         public static MoveType GetMoveTypeGeneration(this MoveType type, int generation)
         {
diff --git a/PKHeX.Core/Game/Nature.cs b/PKHeX.Core/Game/Enums/Nature.cs
similarity index 100%
rename from PKHeX.Core/Game/Nature.cs
rename to PKHeX.Core/Game/Enums/Nature.cs
diff --git a/PKHeX.Core/Game/RegionID.cs b/PKHeX.Core/Game/Enums/RegionID.cs
similarity index 100%
rename from PKHeX.Core/Game/RegionID.cs
rename to PKHeX.Core/Game/Enums/RegionID.cs
diff --git a/PKHeX.Core/Game/Species.cs b/PKHeX.Core/Game/Enums/Species.cs
similarity index 100%
rename from PKHeX.Core/Game/Species.cs
rename to PKHeX.Core/Game/Enums/Species.cs
diff --git a/PKHeX.Core/Legality/Structures/IEncounterable.cs b/PKHeX.Core/Legality/Encounters/IEncounterable.cs
similarity index 100%
rename from PKHeX.Core/Legality/Structures/IEncounterable.cs
rename to PKHeX.Core/Legality/Encounters/IEncounterable.cs
diff --git a/PKHeX.Core/Game/GameData.cs b/PKHeX.Core/Legality/Moves/GameData.cs
similarity index 100%
rename from PKHeX.Core/Game/GameData.cs
rename to PKHeX.Core/Legality/Moves/GameData.cs
diff --git a/PKHeX.Core/Legality/Encounters/IRelearn.cs b/PKHeX.Core/Legality/Structures/IRelearn.cs
similarity index 100%
rename from PKHeX.Core/Legality/Encounters/IRelearn.cs
rename to PKHeX.Core/Legality/Structures/IRelearn.cs
diff --git a/PKHeX.Core/Legality/Encounters/LegalInfo.cs b/PKHeX.Core/Legality/Structures/LegalInfo.cs
similarity index 100%
rename from PKHeX.Core/Legality/Encounters/LegalInfo.cs
rename to PKHeX.Core/Legality/Structures/LegalInfo.cs