diff --git a/TRRandomizerCore/Randomizers/TR1/BaseTR1Randomizer.cs b/TRRandomizerCore/Randomizers/TR1/Classic/BaseTR1Randomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR1/BaseTR1Randomizer.cs
rename to TRRandomizerCore/Randomizers/TR1/Classic/BaseTR1Randomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR1/TR1AudioRandomizer.cs b/TRRandomizerCore/Randomizers/TR1/Classic/TR1AudioRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR1/TR1AudioRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR1/Classic/TR1AudioRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR1/TR1EnemyRandomizer.cs b/TRRandomizerCore/Randomizers/TR1/Classic/TR1EnemyRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR1/TR1EnemyRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR1/Classic/TR1EnemyRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR1/TR1EnvironmentRandomizer.cs b/TRRandomizerCore/Randomizers/TR1/Classic/TR1EnvironmentRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR1/TR1EnvironmentRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR1/Classic/TR1EnvironmentRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR1/TR1GameStringRandomizer.cs b/TRRandomizerCore/Randomizers/TR1/Classic/TR1GameStringRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR1/TR1GameStringRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR1/Classic/TR1GameStringRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR1/TR1HealthRandomizer.cs b/TRRandomizerCore/Randomizers/TR1/Classic/TR1HealthRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR1/TR1HealthRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR1/Classic/TR1HealthRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR1/TR1ItemRandomizer.cs b/TRRandomizerCore/Randomizers/TR1/Classic/TR1ItemRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR1/TR1ItemRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR1/Classic/TR1ItemRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR1/TR1NightModeRandomizer.cs b/TRRandomizerCore/Randomizers/TR1/Classic/TR1NightModeRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR1/TR1NightModeRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR1/Classic/TR1NightModeRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR1/TR1OutfitRandomizer.cs b/TRRandomizerCore/Randomizers/TR1/Classic/TR1OutfitRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR1/TR1OutfitRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR1/Classic/TR1OutfitRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR1/TR1SecretRandomizer.cs b/TRRandomizerCore/Randomizers/TR1/Classic/TR1SecretRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR1/TR1SecretRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR1/Classic/TR1SecretRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR1/TR1SecretRewardRandomizer.cs b/TRRandomizerCore/Randomizers/TR1/Classic/TR1SecretRewardRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR1/TR1SecretRewardRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR1/Classic/TR1SecretRewardRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR1/TR1StartPositionRandomizer.cs b/TRRandomizerCore/Randomizers/TR1/Classic/TR1StartPositionRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR1/TR1StartPositionRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR1/Classic/TR1StartPositionRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR1/TR1TextureRandomizer.cs b/TRRandomizerCore/Randomizers/TR1/Classic/TR1TextureRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR1/TR1TextureRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR1/Classic/TR1TextureRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR1R/BaseTR1RRandomizer.cs b/TRRandomizerCore/Randomizers/TR1/Remastered/BaseTR1RRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR1R/BaseTR1RRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR1/Remastered/BaseTR1RRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR1R/TR1RAudioRandomizer.cs b/TRRandomizerCore/Randomizers/TR1/Remastered/TR1RAudioRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR1R/TR1RAudioRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR1/Remastered/TR1RAudioRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR1R/TR1REnvironmentRandomizer.cs b/TRRandomizerCore/Randomizers/TR1/Remastered/TR1REnvironmentRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR1R/TR1REnvironmentRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR1/Remastered/TR1REnvironmentRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR1R/TR1RItemRandomizer.cs b/TRRandomizerCore/Randomizers/TR1/Remastered/TR1RItemRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR1R/TR1RItemRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR1/Remastered/TR1RItemRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR1R/TR1RStartPositionRandomizer.cs b/TRRandomizerCore/Randomizers/TR1/Remastered/TR1RStartPositionRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR1R/TR1RStartPositionRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR1/Remastered/TR1RStartPositionRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR2/BaseTR2Randomizer.cs b/TRRandomizerCore/Randomizers/TR2/Classic/BaseTR2Randomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR2/BaseTR2Randomizer.cs
rename to TRRandomizerCore/Randomizers/TR2/Classic/BaseTR2Randomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR2/TR2AudioRandomizer.cs b/TRRandomizerCore/Randomizers/TR2/Classic/TR2AudioRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR2/TR2AudioRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR2/Classic/TR2AudioRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR2/TR2EnemyRandomizer.cs b/TRRandomizerCore/Randomizers/TR2/Classic/TR2EnemyRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR2/TR2EnemyRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR2/Classic/TR2EnemyRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR2/TR2EnvironmentRandomizer.cs b/TRRandomizerCore/Randomizers/TR2/Classic/TR2EnvironmentRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR2/TR2EnvironmentRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR2/Classic/TR2EnvironmentRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR2/TR2GameStringRandomizer.cs b/TRRandomizerCore/Randomizers/TR2/Classic/TR2GameStringRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR2/TR2GameStringRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR2/Classic/TR2GameStringRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR2/TR2ItemRandomizer.cs b/TRRandomizerCore/Randomizers/TR2/Classic/TR2ItemRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR2/TR2ItemRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR2/Classic/TR2ItemRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR2/TR2NightModeRandomizer.cs b/TRRandomizerCore/Randomizers/TR2/Classic/TR2NightModeRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR2/TR2NightModeRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR2/Classic/TR2NightModeRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR2/TR2OutfitRandomizer.cs b/TRRandomizerCore/Randomizers/TR2/Classic/TR2OutfitRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR2/TR2OutfitRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR2/Classic/TR2OutfitRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR2/TR2SecretRandomizer.cs b/TRRandomizerCore/Randomizers/TR2/Classic/TR2SecretRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR2/TR2SecretRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR2/Classic/TR2SecretRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR2/TR2StartPositionRandomizer.cs b/TRRandomizerCore/Randomizers/TR2/Classic/TR2StartPositionRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR2/TR2StartPositionRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR2/Classic/TR2StartPositionRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR2/TR2TextureRandomizer.cs b/TRRandomizerCore/Randomizers/TR2/Classic/TR2TextureRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR2/TR2TextureRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR2/Classic/TR2TextureRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR2R/BaseTR2RRandomizer.cs b/TRRandomizerCore/Randomizers/TR2/Remastered/BaseTR2RRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR2R/BaseTR2RRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR2/Remastered/BaseTR2RRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR2R/TR2RAudioRandomizer.cs b/TRRandomizerCore/Randomizers/TR2/Remastered/TR2RAudioRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR2R/TR2RAudioRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR2/Remastered/TR2RAudioRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR2R/TR2REnvironmentRandomizer.cs b/TRRandomizerCore/Randomizers/TR2/Remastered/TR2REnvironmentRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR2R/TR2REnvironmentRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR2/Remastered/TR2REnvironmentRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR2R/TR2RItemRandomizer.cs b/TRRandomizerCore/Randomizers/TR2/Remastered/TR2RItemRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR2R/TR2RItemRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR2/Remastered/TR2RItemRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR2R/TR2RStartPositionRandomizer.cs b/TRRandomizerCore/Randomizers/TR2/Remastered/TR2RStartPositionRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR2R/TR2RStartPositionRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR2/Remastered/TR2RStartPositionRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR3/BaseTR3Randomizer.cs b/TRRandomizerCore/Randomizers/TR3/Classic/BaseTR3Randomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR3/BaseTR3Randomizer.cs
rename to TRRandomizerCore/Randomizers/TR3/Classic/BaseTR3Randomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR3/TR3AudioRandomizer.cs b/TRRandomizerCore/Randomizers/TR3/Classic/TR3AudioRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR3/TR3AudioRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR3/Classic/TR3AudioRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR3/TR3EnemyRandomizer.cs b/TRRandomizerCore/Randomizers/TR3/Classic/TR3EnemyRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR3/TR3EnemyRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR3/Classic/TR3EnemyRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR3/TR3EnvironmentRandomizer.cs b/TRRandomizerCore/Randomizers/TR3/Classic/TR3EnvironmentRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR3/TR3EnvironmentRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR3/Classic/TR3EnvironmentRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR3/TR3GameStringRandomizer.cs b/TRRandomizerCore/Randomizers/TR3/Classic/TR3GameStringRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR3/TR3GameStringRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR3/Classic/TR3GameStringRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR3/TR3ItemRandomizer.cs b/TRRandomizerCore/Randomizers/TR3/Classic/TR3ItemRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR3/TR3ItemRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR3/Classic/TR3ItemRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR3/TR3NightModeRandomizer.cs b/TRRandomizerCore/Randomizers/TR3/Classic/TR3NightModeRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR3/TR3NightModeRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR3/Classic/TR3NightModeRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR3/TR3OutfitRandomizer.cs b/TRRandomizerCore/Randomizers/TR3/Classic/TR3OutfitRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR3/TR3OutfitRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR3/Classic/TR3OutfitRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR3/TR3SecretRandomizer.cs b/TRRandomizerCore/Randomizers/TR3/Classic/TR3SecretRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR3/TR3SecretRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR3/Classic/TR3SecretRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR3/TR3SecretRewardRandomizer.cs b/TRRandomizerCore/Randomizers/TR3/Classic/TR3SecretRewardRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR3/TR3SecretRewardRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR3/Classic/TR3SecretRewardRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR3/TR3StartPositionRandomizer.cs b/TRRandomizerCore/Randomizers/TR3/Classic/TR3StartPositionRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR3/TR3StartPositionRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR3/Classic/TR3StartPositionRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR3/TR3TextureRandomizer.cs b/TRRandomizerCore/Randomizers/TR3/Classic/TR3TextureRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR3/TR3TextureRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR3/Classic/TR3TextureRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR3/TR3VfxRandomizer.cs b/TRRandomizerCore/Randomizers/TR3/Classic/TR3VfxRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR3/TR3VfxRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR3/Classic/TR3VfxRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR3/TR3WeatherRandomizer.cs b/TRRandomizerCore/Randomizers/TR3/Classic/TR3WeatherRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR3/TR3WeatherRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR3/Classic/TR3WeatherRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR3R/BaseTR3RRandomizer.cs b/TRRandomizerCore/Randomizers/TR3/Remastered/BaseTR3RRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR3R/BaseTR3RRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR3/Remastered/BaseTR3RRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR3R/TR3RAudioRandomizer.cs b/TRRandomizerCore/Randomizers/TR3/Remastered/TR3RAudioRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR3R/TR3RAudioRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR3/Remastered/TR3RAudioRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR3R/TR3REnvironmentRandomizer.cs b/TRRandomizerCore/Randomizers/TR3/Remastered/TR3REnvironmentRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR3R/TR3REnvironmentRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR3/Remastered/TR3REnvironmentRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR3R/TR3RItemRandomizer.cs b/TRRandomizerCore/Randomizers/TR3/Remastered/TR3RItemRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR3R/TR3RItemRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR3/Remastered/TR3RItemRandomizer.cs
diff --git a/TRRandomizerCore/Randomizers/TR3R/TR3RStartPositionRandomizer.cs b/TRRandomizerCore/Randomizers/TR3/Remastered/TR3RStartPositionRandomizer.cs
similarity index 100%
rename from TRRandomizerCore/Randomizers/TR3R/TR3RStartPositionRandomizer.cs
rename to TRRandomizerCore/Randomizers/TR3/Remastered/TR3RStartPositionRandomizer.cs