diff --git a/targets/app/common/DLC/DLCGameRules.h b/targets/app/common/DLC/DLCGameRules.h
index 3be9a70ea..fa31ee680 100644
--- a/targets/app/common/DLC/DLCGameRules.h
+++ b/targets/app/common/DLC/DLCGameRules.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "DLCFile.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 
 class DLCGameRules : public DLCFile {
 public:
diff --git a/targets/app/common/DLC/DLCGameRulesHeader.h b/targets/app/common/DLC/DLCGameRulesHeader.h
index fa82416c7..cc1dc6468 100644
--- a/targets/app/common/DLC/DLCGameRulesHeader.h
+++ b/targets/app/common/DLC/DLCGameRulesHeader.h
@@ -4,7 +4,7 @@
 #include <string>
 
 #include "DLCGameRules.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 
 class StringTable;
 
diff --git a/targets/app/common/GameRules/ConsoleGameRules.h b/targets/app/common/GameRules/ConsoleGameRules.h
index 765acff99..a4c57d938 100644
--- a/targets/app/common/GameRules/ConsoleGameRules.h
+++ b/targets/app/common/GameRules/ConsoleGameRules.h
@@ -5,7 +5,7 @@
 #include "app/common/GameRules/LevelGeneration/BiomeOverride.h"
 #include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h"
 #include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "app/common/GameRules/LevelGeneration/StartFeature.h"
 #include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h"
 #include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
@@ -16,10 +16,10 @@
 #include "app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h"
-#include "app/common/GameRules/LevelRules/Rules/GameRule.h"
-#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h"
+#include "minecraft/world/level/GameRules/GameRule.h"
+#include "minecraft/world/level/GameRules/GameRulesInstance.h"
diff --git a/targets/app/common/GameRules/GameRuleManager.cpp b/targets/app/common/GameRules/GameRuleManager.cpp
index 29c31bf94..a090c4dcb 100644
--- a/targets/app/common/GameRules/GameRuleManager.cpp
+++ b/targets/app/common/GameRules/GameRuleManager.cpp
@@ -13,10 +13,10 @@
 #include "app/common/DLC/DLCManager.h"
 #include "app/common/DLC/DLCPack.h"
 #include "app/common/GameRules/LevelGeneration/ConsoleSchematicFile.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "app/common/GameRules/LevelGeneration/LevelGenerators.h"
 #include "app/common/GameRules/LevelRules/LevelRules.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
 #include "minecraft/locale/StringTable.h"
 #include "app/linux/LinuxGame.h"
diff --git a/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp b/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp
index 65ee363ff..2de23bbf0 100644
--- a/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp
+++ b/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp
@@ -4,9 +4,9 @@
 #include <cmath>
 
 #include "ConsoleSchematicFile.h"
-#include "LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "app/linux/LinuxGame.h"
 #include "util/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
diff --git a/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h b/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h
index af8cda3eb..b65aa9012 100644
--- a/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h
+++ b/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h
@@ -6,7 +6,7 @@
 
 #include "ConsoleSchematicFile.h"
 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/Vec3.h"
 
diff --git a/targets/app/common/GameRules/LevelGeneration/BiomeOverride.cpp b/targets/app/common/GameRules/LevelGeneration/BiomeOverride.cpp
index 67e046563..f6984daf0 100644
--- a/targets/app/common/GameRules/LevelGeneration/BiomeOverride.cpp
+++ b/targets/app/common/GameRules/LevelGeneration/BiomeOverride.cpp
@@ -1,7 +1,7 @@
 #include "BiomeOverride.h"
 
 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "app/linux/LinuxGame.h"
 #include "util/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
diff --git a/targets/app/common/GameRules/LevelGeneration/BiomeOverride.h b/targets/app/common/GameRules/LevelGeneration/BiomeOverride.h
index f91c49ad9..5dac30ab8 100644
--- a/targets/app/common/GameRules/LevelGeneration/BiomeOverride.h
+++ b/targets/app/common/GameRules/LevelGeneration/BiomeOverride.h
@@ -5,7 +5,7 @@
 #include <string>
 
 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 
 class BiomeOverride : public GameRuleDefinition {
 private:
diff --git a/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp
index 970df3176..15bd9823a 100644
--- a/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp
+++ b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp
@@ -10,7 +10,7 @@
 #include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
 #include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h"
 #include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "app/linux/LinuxGame.h"
 #include "util/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
diff --git a/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h
index 7b92ad912..12d82816f 100644
--- a/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h
+++ b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h
@@ -3,7 +3,7 @@
 #include <vector>
 
 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h"
 #include "minecraft/world/level/levelgen/structure/StructurePiece.h"
 
diff --git a/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h
index f8f1014a2..6634535dd 100644
--- a/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h
+++ b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 
 class ConsoleGenerateStructureAction : public GameRuleDefinition {
 public:
diff --git a/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp b/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp
index 76fc4aa4f..a7ff792f0 100644
--- a/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp
+++ b/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp
@@ -1,4 +1,4 @@
-#include "LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 
 #include <limits.h>
 #include <wchar.h>
@@ -16,7 +16,7 @@
 #include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h"
 #include "app/common/GameRules/LevelGeneration/ConsoleSchematicFile.h"
 #include "app/common/GameRules/LevelGeneration/StartFeature.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "minecraft/locale/StringTable.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Stubs/winapi_stubs.h"
diff --git a/targets/app/common/GameRules/LevelGeneration/LevelGenerators.cpp b/targets/app/common/GameRules/LevelGeneration/LevelGenerators.cpp
index 2fad35ae8..8d9576209 100644
--- a/targets/app/common/GameRules/LevelGeneration/LevelGenerators.cpp
+++ b/targets/app/common/GameRules/LevelGeneration/LevelGenerators.cpp
@@ -2,7 +2,7 @@
 
 #include <algorithm>
 
-#include "LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 
 LevelGenerators::LevelGenerators() {}
 
diff --git a/targets/app/common/GameRules/LevelGeneration/StartFeature.cpp b/targets/app/common/GameRules/LevelGeneration/StartFeature.cpp
index 313c04fda..d18b6a1d0 100644
--- a/targets/app/common/GameRules/LevelGeneration/StartFeature.cpp
+++ b/targets/app/common/GameRules/LevelGeneration/StartFeature.cpp
@@ -1,7 +1,7 @@
 #include "StartFeature.h"
 
 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "app/linux/LinuxGame.h"
 #include "util/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
diff --git a/targets/app/common/GameRules/LevelGeneration/StartFeature.h b/targets/app/common/GameRules/LevelGeneration/StartFeature.h
index 2adff6afa..cd0446609 100644
--- a/targets/app/common/GameRules/LevelGeneration/StartFeature.h
+++ b/targets/app/common/GameRules/LevelGeneration/StartFeature.h
@@ -4,7 +4,7 @@
 #include <string>
 
 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "minecraft/world/level/levelgen/structure/StructureFeature.h"
 
 class StartFeature : public GameRuleDefinition {
diff --git a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp
index 38e5e04ed..f778e2098 100644
--- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp
+++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp
@@ -2,7 +2,7 @@
 
 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "app/linux/LinuxGame.h"
 #include "util/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
diff --git a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp
index 2b4353df5..e564b421b 100644
--- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp
+++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp
@@ -2,7 +2,7 @@
 
 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "app/linux/LinuxGame.h"
 #include "util/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp
index 39e1261bf..47f31dba2 100644
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp
@@ -4,7 +4,7 @@
 #include <vector>
 
 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "app/linux/LinuxGame.h"
 #include "util/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h
index a98787675..ff4e002b5 100644
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h
@@ -3,7 +3,7 @@
 #include <memory>
 #include <string>
 
-#include "GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
 
 class ItemInstance;
diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp
index 72985794e..999de21a9 100644
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp
@@ -4,7 +4,7 @@
 
 #include "AddEnchantmentRuleDefinition.h"
 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "util/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/Container.h"
diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h
index aa3bae12c..5c412ffed 100644
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
 
 class Container;
diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp
index c7addda64..51df8ccc2 100644
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp
@@ -1,9 +1,9 @@
 #include "CollectItemRuleDefinition.h"
 
 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
-#include "app/common/GameRules/LevelRules/Rules/GameRule.h"
-#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRule.h"
+#include "minecraft/world/level/GameRules/GameRulesInstance.h"
 #include "app/linux/LinuxGame.h"
 #include "util/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h
index 5cc4f16aa..2e35806d6 100644
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h
@@ -3,9 +3,9 @@
 #include <memory>
 #include <string>
 
-#include "GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
-#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h"
+#include "minecraft/world/level/GameRules/GameRulesInstance.h"
 
 class Pos;
 class UseTileRuleDefinition;
diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp
index 70b001ab2..eab1737a4 100644
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp
@@ -5,8 +5,8 @@
 #include <utility>
 
 #include "app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
-#include "app/common/GameRules/LevelRules/Rules/GameRule.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRule.h"
 #include "app/linux/LinuxGame.h"
 #include "util/StringHelpers.h"
 #include "minecraft/network/Connection.h"
diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp
index d372101cf..a65ca3217 100644
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp
@@ -10,11 +10,11 @@
 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h"
-#include "app/common/GameRules/LevelRules/Rules/GameRule.h"
-#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h"
+#include "minecraft/world/level/GameRules/GameRule.h"
+#include "minecraft/world/level/GameRules/GameRulesInstance.h"
 #include "util/StringHelpers.h"
 
 CompoundGameRuleDefinition::CompoundGameRuleDefinition() {
diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h
index 675c85efc..9227ba184 100644
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h
@@ -2,9 +2,9 @@
 
 #include <vector>
 
-#include "GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
-#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h"
+#include "minecraft/world/level/GameRules/GameRulesInstance.h"
 
 class CompoundGameRuleDefinition : public GameRuleDefinition {
 protected:
diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp
index 911e8e61c..b5e3b8489 100644
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp
@@ -1,4 +1,4 @@
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 
 #include <assert.h>
 #include <wchar.h>
@@ -11,8 +11,8 @@
 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
-#include "app/common/GameRules/LevelRules/Rules/GameRule.h"
-#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h"
+#include "minecraft/world/level/GameRules/GameRule.h"
+#include "minecraft/world/level/GameRules/GameRulesInstance.h"
 #include "app/linux/LinuxGame.h"
 #include "util/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp
index d5aa85f23..80038ff79 100644
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp
@@ -3,7 +3,7 @@
 #include <wchar.h>
 
 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "app/linux/LinuxGame.h"
 #include "util/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h
index cad2bb6ed..2c90d7479 100644
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "minecraft/world/phys/AABB.h"
 
diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp
index 9d383bf54..f4a128cd0 100644
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp
@@ -6,7 +6,7 @@
 
 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "app/linux/LinuxGame.h"
 #include "util/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h
index af7dd2d33..eb25a6256 100644
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
 
 class AddItemRuleDefinition;
diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp
index 738f14b43..3cfd9e224 100644
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp
@@ -1,7 +1,7 @@
 #include "UseTileRuleDefinition.h"
 
 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "app/linux/LinuxGame.h"
 #include "util/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h
index 6abeb1081..998786837 100644
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h
@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include "GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "minecraft/Pos.h"
 
diff --git a/targets/app/common/GameRules/LevelRules/Rules/GameRule.cpp b/targets/app/common/GameRules/LevelRules/Rules/GameRule.cpp
index 4c933a1e3..8e4a5f28b 100644
--- a/targets/app/common/GameRules/LevelRules/Rules/GameRule.cpp
+++ b/targets/app/common/GameRules/LevelRules/Rules/GameRule.cpp
@@ -1,5 +1,5 @@
 
-#include "app/common/GameRules/LevelRules/Rules/GameRule.h"
+#include "minecraft/world/level/GameRules/GameRule.h"
 
 #include <wchar.h>
 
@@ -8,7 +8,7 @@
 #include <unordered_map>
 #include <utility>
 
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "app/linux/Stubs/winapi_stubs.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
diff --git a/targets/app/common/Network/GameNetworkManager.cpp b/targets/app/common/Network/GameNetworkManager.cpp
index b28291984..c40a706c6 100644
--- a/targets/app/common/Network/GameNetworkManager.cpp
+++ b/targets/app/common/Network/GameNetworkManager.cpp
@@ -16,7 +16,7 @@
 #include "minecraft/GameEnums.h"
 #include "app/common/Game.h"
 #include "app/common/GameRules/GameRuleManager.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "minecraft/network/platform/NetworkPlayerInterface.h"
 #include "app/common/Network/PlatformNetworkManagerStub.h"
 #include "app/common/UI/All Platforms/UIEnums.h"
diff --git a/targets/app/common/NetworkController.cpp b/targets/app/common/NetworkController.cpp
index e7ed1acbf..3d37c560a 100644
--- a/targets/app/common/NetworkController.cpp
+++ b/targets/app/common/NetworkController.cpp
@@ -4,6 +4,7 @@
 #include <cstring>
 #include <thread>
 
+#include "app/common/DLC/DLCPack.h"
 #include "app/common/Game.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "app/linux/LinuxGame.h"
diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp
index 5688fb328..b5fccce01 100644
--- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp	
+++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp	
@@ -12,7 +12,7 @@
 #include "minecraft/GameEnums.h"
 #include "app/common/DLC/DLCManager.h"
 #include "app/common/DLC/DLCPack.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "app/common/UI/All Platforms/UIStructs.h"
 #include "app/common/UI/Controls/UIControl_BitmapIcon.h"
diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp
index 3ec6865a4..98ff63caa 100644
--- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp	
+++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp	
@@ -11,7 +11,7 @@
 #include "minecraft/GameTypes.h"
 #include "minecraft/GameEnums.h"
 #include "app/common/DLC/DLCManager.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "minecraft/network/platform/SessionInfo.h"
 #include "app/common/UI/Controls/UIControl_Label.h"
diff --git a/targets/minecraft/client/multiplayer/ClientConnection.cpp b/targets/minecraft/client/multiplayer/ClientConnection.cpp
index e7a12ad97..0a3e79421 100644
--- a/targets/minecraft/client/multiplayer/ClientConnection.cpp
+++ b/targets/minecraft/client/multiplayer/ClientConnection.cpp
@@ -21,7 +21,7 @@
 #include "app/common/DLC/DLCManager.h"
 #include "app/common/DLC/DLCPack.h"
 #include "app/common/DLC/DLCSkinFile.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "minecraft/network/platform/NetworkPlayerInterface.h"
 #include "app/common/Network/Socket.h"
diff --git a/targets/minecraft/client/skins/DLCTexturePack.cpp b/targets/minecraft/client/skins/DLCTexturePack.cpp
index bc2447de8..369eb9668 100644
--- a/targets/minecraft/client/skins/DLCTexturePack.cpp
+++ b/targets/minecraft/client/skins/DLCTexturePack.cpp
@@ -22,7 +22,7 @@
 #include "app/common/DLC/DLCTextureFile.h"
 #include "app/common/DLC/DLCUIDataFile.h"
 #include "app/common/GameRules/GameRuleManager.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "minecraft/locale/StringTable.h"
 #include "app/common/UI/All Platforms/ArchiveFile.h"
 #include "app/linux/Linux_UIController.h"
diff --git a/targets/minecraft/server/MinecraftServer.cpp b/targets/minecraft/server/MinecraftServer.cpp
index 1d0509dfd..873bb2477 100644
--- a/targets/minecraft/server/MinecraftServer.cpp
+++ b/targets/minecraft/server/MinecraftServer.cpp
@@ -19,7 +19,7 @@
 #include "DispenserBootstrap.h"
 #include "minecraft/GameEnums.h"
 #include "app/common/GameRules/GameRuleManager.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "minecraft/network/platform/NetworkPlayerInterface.h"
 #include "PlayerList.h"
diff --git a/targets/minecraft/server/PlayerList.cpp b/targets/minecraft/server/PlayerList.cpp
index daea1f0a5..cc4868261 100644
--- a/targets/minecraft/server/PlayerList.cpp
+++ b/targets/minecraft/server/PlayerList.cpp
@@ -12,9 +12,9 @@
 
 #include "platform/profile/profile.h"
 #include "minecraft/GameEnums.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
-#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h"
+#include "minecraft/world/level/GameRules/GameRulesInstance.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "minecraft/network/platform/NetworkPlayerInterface.h"
 #include "app/common/Network/Socket.h"
diff --git a/targets/minecraft/server/level/ServerPlayer.cpp b/targets/minecraft/server/level/ServerPlayer.cpp
index c9fe80436..1281b502c 100644
--- a/targets/minecraft/server/level/ServerPlayer.cpp
+++ b/targets/minecraft/server/level/ServerPlayer.cpp
@@ -13,7 +13,7 @@
 #include "platform/input/input.h"
 #include "EntityTracker.h"
 #include "minecraft/Console_Debug_enum.h"
-#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h"
+#include "minecraft/world/level/GameRules/GameRulesInstance.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "minecraft/network/platform/NetworkPlayerInterface.h"
 #include "ServerLevel.h"
diff --git a/targets/minecraft/server/level/ServerPlayerGameMode.cpp b/targets/minecraft/server/level/ServerPlayerGameMode.cpp
index 300e3fca4..c1dcad91c 100644
--- a/targets/minecraft/server/level/ServerPlayerGameMode.cpp
+++ b/targets/minecraft/server/level/ServerPlayerGameMode.cpp
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h"
+#include "minecraft/world/level/GameRules/GameRulesInstance.h"
 #include "ServerLevel.h"
 #include "ServerPlayer.h"
 #include "minecraft/client/Minecraft.h"
diff --git a/targets/app/common/GameRules/LevelRules/Rules/GameRule.h b/targets/minecraft/world/level/GameRules/GameRule.h
similarity index 100%
rename from targets/app/common/GameRules/LevelRules/Rules/GameRule.h
rename to targets/minecraft/world/level/GameRules/GameRule.h
diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h b/targets/minecraft/world/level/GameRules/GameRuleDefinition.h
similarity index 97%
rename from targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h
rename to targets/minecraft/world/level/GameRules/GameRuleDefinition.h
index 19bb1271e..3f87bb51b 100644
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h
+++ b/targets/minecraft/world/level/GameRules/GameRuleDefinition.h
@@ -7,7 +7,7 @@
 #include <vector>
 
 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
-#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h"
+#include "minecraft/world/level/GameRules/GameRulesInstance.h"
 #include "minecraft/world/item/ItemInstance.h"
 
 class GameRule;
diff --git a/targets/app/common/GameRules/LevelRules/Rules/GameRulesInstance.h b/targets/minecraft/world/level/GameRules/GameRulesInstance.h
similarity index 93%
rename from targets/app/common/GameRules/LevelRules/Rules/GameRulesInstance.h
rename to targets/minecraft/world/level/GameRules/GameRulesInstance.h
index b3390636c..f278e3225 100644
--- a/targets/app/common/GameRules/LevelRules/Rules/GameRulesInstance.h
+++ b/targets/minecraft/world/level/GameRules/GameRulesInstance.h
@@ -2,7 +2,7 @@
 // using namespace std;
 #include <vector>
 
-#include "GameRule.h"
+#include "minecraft/world/level/GameRules/GameRule.h"
 
 class GameRuleDefinition;
 
diff --git a/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h b/targets/minecraft/world/level/GameRules/LevelGenerationOptions.h
similarity index 98%
rename from targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h
rename to targets/minecraft/world/level/GameRules/LevelGenerationOptions.h
index 10d3d501d..f39dc5794 100644
--- a/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h
+++ b/targets/minecraft/world/level/GameRules/LevelGenerationOptions.h
@@ -8,9 +8,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include "app/common/DLC/DLCPack.h"
 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "minecraft/locale/StringTable.h"
 #include "minecraft/world/level/levelgen/structure/StructureFeature.h"
 
diff --git a/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp b/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp
index cc9d7aeb0..45e17ba87 100644
--- a/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp
+++ b/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "platform/fs/fs.h"
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/chunk/ChunkSource.h"
diff --git a/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp b/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp
index d671e1aa0..f56d9c44f 100644
--- a/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp
+++ b/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp
@@ -6,7 +6,7 @@
 
 #include <cstdint>
 
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "util/Timer.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp
index d0c906150..1abccac72 100644
--- a/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp
@@ -7,7 +7,7 @@
 #include <algorithm>
 #include <cmath>
 
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp b/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp
index 4b532dffd..d228f701c 100644
--- a/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp
@@ -4,7 +4,7 @@
 
 #include <stdlib.h>
 
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/levelgen/feature/Feature.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/CaveFeature.cpp b/targets/minecraft/world/level/levelgen/feature/CaveFeature.cpp
index 4c81dcc9c..ddaef9032 100644
--- a/targets/minecraft/world/level/levelgen/feature/CaveFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/CaveFeature.cpp
@@ -7,7 +7,7 @@
 #include <numbers>
 #include <vector>
 
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/FlowerFeature.cpp b/targets/minecraft/world/level/levelgen/feature/FlowerFeature.cpp
index 56f96c109..d89fe6b1c 100644
--- a/targets/minecraft/world/level/levelgen/feature/FlowerFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/FlowerFeature.cpp
@@ -2,7 +2,7 @@
 #include "minecraft/util/Log.h"
 #include "FlowerFeature.h"
 
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/dimension/Dimension.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/LakeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/LakeFeature.cpp
index 4a83a4fd5..c67658f41 100644
--- a/targets/minecraft/world/level/levelgen/feature/LakeFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/LakeFeature.cpp
@@ -2,7 +2,7 @@
 #include "minecraft/util/Log.h"
 #include "LakeFeature.h"
 
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LightLayer.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp
index 439692288..214bde128 100644
--- a/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp
@@ -4,7 +4,7 @@
 
 #include <numbers>
 
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp b/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp
index b1e5a75d3..37349752a 100644
--- a/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp
@@ -4,7 +4,7 @@
 
 #include <numbers>
 
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/PineFeature.cpp b/targets/minecraft/world/level/levelgen/feature/PineFeature.cpp
index 68f36eda9..eb9d1fe87 100644
--- a/targets/minecraft/world/level/levelgen/feature/PineFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/PineFeature.cpp
@@ -4,7 +4,7 @@
 
 #include <stdlib.h>
 
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/LeafTile.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/ReedsFeature.cpp b/targets/minecraft/world/level/levelgen/feature/ReedsFeature.cpp
index bbe7132ad..490da93af 100644
--- a/targets/minecraft/world/level/levelgen/feature/ReedsFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/ReedsFeature.cpp
@@ -2,7 +2,7 @@
 #include "minecraft/util/Log.h"
 #include "ReedsFeature.h"
 
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/material/Material.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/SandFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SandFeature.cpp
index eaa4d1178..cb9d74b75 100644
--- a/targets/minecraft/world/level/levelgen/feature/SandFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/SandFeature.cpp
@@ -2,7 +2,7 @@
 #include "minecraft/util/Log.h"
 #include "SandFeature.h"
 
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/material/Material.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/SpringFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SpringFeature.cpp
index d72bf90b9..9ddb6aa2b 100644
--- a/targets/minecraft/world/level/levelgen/feature/SpringFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/SpringFeature.cpp
@@ -2,7 +2,7 @@
 #include "minecraft/util/Log.h"
 #include "SpringFeature.h"
 
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"
 
diff --git a/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp
index aa18a51c9..2bb1579fe 100644
--- a/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp
@@ -4,7 +4,7 @@
 
 #include <stdlib.h>
 
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/levelgen/feature/Feature.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp
index 5cb5b2359..72664fbc3 100644
--- a/targets/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp
@@ -4,7 +4,7 @@
 
 #include <stdlib.h>
 
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/material/Material.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp
index 2d40cc922..50bd605dd 100644
--- a/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp
@@ -4,7 +4,7 @@
 
 #include <stdlib.h>
 
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/Direction.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp b/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp
index c0e2b7a13..ce2517043 100644
--- a/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp
@@ -10,7 +10,7 @@
 #include <utility>
 
 #include "minecraft/GameEnums.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/level/levelgen/structure/MineShaftStart.h"
diff --git a/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp b/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp
index 8e56d4c20..039adbf3a 100644
--- a/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp
@@ -4,7 +4,7 @@
 #include <list>
 #include <unordered_map>
 
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "NetherBridgePieces.h"
 #include "java/Class.h"
 #include "java/Random.h"
diff --git a/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp b/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp
index 43ce8248e..078f0eb2a 100644
--- a/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp
@@ -4,7 +4,7 @@
 #include <list>
 #include <utility>
 
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "ScatteredFeaturePieces.h"
 #include "java/Class.h"
 #include "java/Random.h"
diff --git a/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp b/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp
index 57a74a67b..1716d3a3b 100644
--- a/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp
@@ -6,7 +6,7 @@
 #include <string>
 #include <vector>
 
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/Direction.h"
 #include "minecraft/Facing.h"
diff --git a/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp b/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp
index 5bbeedf0d..7eccbe1ce 100644
--- a/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp
@@ -11,7 +11,7 @@
 #include <vector>
 
 #include "minecraft/GameEnums.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "StrongholdPieces.h"
 #include "java/JavaMath.h"
 #include "java/Random.h"
diff --git a/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp b/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp
index aa6d0e78e..7809d2e75 100644
--- a/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp
@@ -7,7 +7,7 @@
 #include <vector>
 
 #include "minecraft/GameEnums.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "VillagePieces.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp
index c48d6c65a..693a08cde 100644
--- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp
+++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp
@@ -17,7 +17,7 @@
 #include "platform/PlatformTypes.h"
 #include "minecraft/GameEnums.h"
 #include "minecraft/BuildVer.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "app/linux/Stubs/winapi_stubs.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h"
 #include "java/File.h"
diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp
index 1048025a2..40c920a0d 100644
--- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp
+++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp
@@ -19,7 +19,7 @@
 #include "platform/PlatformTypes.h"
 #include "minecraft/GameEnums.h"
 #include "minecraft/BuildVer.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "app/linux/Stubs/winapi_stubs.h"
 #include "util/Timer.h"
 #include "util/StringHelpers.h"