diff --git a/paper-server/nms-patches/CrashReport.patch b/paper-server/nms-patches/net/minecraft/CrashReport.patch
similarity index 100%
rename from paper-server/nms-patches/CrashReport.patch
rename to paper-server/nms-patches/net/minecraft/CrashReport.patch
diff --git a/paper-server/nms-patches/Advancement.patch b/paper-server/nms-patches/net/minecraft/advancements/Advancement.patch
similarity index 100%
rename from paper-server/nms-patches/Advancement.patch
rename to paper-server/nms-patches/net/minecraft/advancements/Advancement.patch
diff --git a/paper-server/nms-patches/Advancements.patch b/paper-server/nms-patches/net/minecraft/advancements/Advancements.patch
similarity index 100%
rename from paper-server/nms-patches/Advancements.patch
rename to paper-server/nms-patches/net/minecraft/advancements/Advancements.patch
diff --git a/paper-server/nms-patches/CommandDispatcher.patch b/paper-server/nms-patches/net/minecraft/commands/CommandDispatcher.patch
similarity index 100%
rename from paper-server/nms-patches/CommandDispatcher.patch
rename to paper-server/nms-patches/net/minecraft/commands/CommandDispatcher.patch
diff --git a/paper-server/nms-patches/CommandListenerWrapper.patch b/paper-server/nms-patches/net/minecraft/commands/CommandListenerWrapper.patch
similarity index 100%
rename from paper-server/nms-patches/CommandListenerWrapper.patch
rename to paper-server/nms-patches/net/minecraft/commands/CommandListenerWrapper.patch
diff --git a/paper-server/nms-patches/ICommandListener.patch b/paper-server/nms-patches/net/minecraft/commands/ICommandListener.patch
similarity index 100%
rename from paper-server/nms-patches/ICommandListener.patch
rename to paper-server/nms-patches/net/minecraft/commands/ICommandListener.patch
diff --git a/paper-server/nms-patches/ArgumentEntity.patch b/paper-server/nms-patches/net/minecraft/commands/arguments/ArgumentEntity.patch
similarity index 100%
rename from paper-server/nms-patches/ArgumentEntity.patch
rename to paper-server/nms-patches/net/minecraft/commands/arguments/ArgumentEntity.patch
diff --git a/paper-server/nms-patches/ArgumentBlock.patch b/paper-server/nms-patches/net/minecraft/commands/arguments/blocks/ArgumentBlock.patch
similarity index 100%
rename from paper-server/nms-patches/ArgumentBlock.patch
rename to paper-server/nms-patches/net/minecraft/commands/arguments/blocks/ArgumentBlock.patch
diff --git a/paper-server/nms-patches/ArgumentParserSelector.patch b/paper-server/nms-patches/net/minecraft/commands/arguments/selector/ArgumentParserSelector.patch
similarity index 100%
rename from paper-server/nms-patches/ArgumentParserSelector.patch
rename to paper-server/nms-patches/net/minecraft/commands/arguments/selector/ArgumentParserSelector.patch
diff --git a/paper-server/nms-patches/EntitySelector.patch b/paper-server/nms-patches/net/minecraft/commands/arguments/selector/EntitySelector.patch
similarity index 100%
rename from paper-server/nms-patches/EntitySelector.patch
rename to paper-server/nms-patches/net/minecraft/commands/arguments/selector/EntitySelector.patch
diff --git a/paper-server/nms-patches/DispenseBehaviorBoat.patch b/paper-server/nms-patches/net/minecraft/core/dispenser/DispenseBehaviorBoat.patch
similarity index 100%
rename from paper-server/nms-patches/DispenseBehaviorBoat.patch
rename to paper-server/nms-patches/net/minecraft/core/dispenser/DispenseBehaviorBoat.patch
diff --git a/paper-server/nms-patches/DispenseBehaviorItem.patch b/paper-server/nms-patches/net/minecraft/core/dispenser/DispenseBehaviorItem.patch
similarity index 100%
rename from paper-server/nms-patches/DispenseBehaviorItem.patch
rename to paper-server/nms-patches/net/minecraft/core/dispenser/DispenseBehaviorItem.patch
diff --git a/paper-server/nms-patches/DispenseBehaviorProjectile.patch b/paper-server/nms-patches/net/minecraft/core/dispenser/DispenseBehaviorProjectile.patch
similarity index 100%
rename from paper-server/nms-patches/DispenseBehaviorProjectile.patch
rename to paper-server/nms-patches/net/minecraft/core/dispenser/DispenseBehaviorProjectile.patch
diff --git a/paper-server/nms-patches/DispenseBehaviorShears.patch b/paper-server/nms-patches/net/minecraft/core/dispenser/DispenseBehaviorShears.patch
similarity index 100%
rename from paper-server/nms-patches/DispenseBehaviorShears.patch
rename to paper-server/nms-patches/net/minecraft/core/dispenser/DispenseBehaviorShears.patch
diff --git a/paper-server/nms-patches/DispenseBehaviorShulkerBox.patch b/paper-server/nms-patches/net/minecraft/core/dispenser/DispenseBehaviorShulkerBox.patch
similarity index 100%
rename from paper-server/nms-patches/DispenseBehaviorShulkerBox.patch
rename to paper-server/nms-patches/net/minecraft/core/dispenser/DispenseBehaviorShulkerBox.patch
diff --git a/paper-server/nms-patches/IDispenseBehavior.patch b/paper-server/nms-patches/net/minecraft/core/dispenser/IDispenseBehavior.patch
similarity index 100%
rename from paper-server/nms-patches/IDispenseBehavior.patch
rename to paper-server/nms-patches/net/minecraft/core/dispenser/IDispenseBehavior.patch
diff --git a/paper-server/nms-patches/NetworkManager.patch b/paper-server/nms-patches/net/minecraft/network/NetworkManager.patch
similarity index 100%
rename from paper-server/nms-patches/NetworkManager.patch
rename to paper-server/nms-patches/net/minecraft/network/NetworkManager.patch
diff --git a/paper-server/nms-patches/PacketDataSerializer.patch b/paper-server/nms-patches/net/minecraft/network/PacketDataSerializer.patch
similarity index 100%
rename from paper-server/nms-patches/PacketDataSerializer.patch
rename to paper-server/nms-patches/net/minecraft/network/PacketDataSerializer.patch
diff --git a/paper-server/nms-patches/ChatHexColor.patch b/paper-server/nms-patches/net/minecraft/network/chat/ChatHexColor.patch
similarity index 100%
rename from paper-server/nms-patches/ChatHexColor.patch
rename to paper-server/nms-patches/net/minecraft/network/chat/ChatHexColor.patch
diff --git a/paper-server/nms-patches/ChatModifier.patch b/paper-server/nms-patches/net/minecraft/network/chat/ChatModifier.patch
similarity index 100%
rename from paper-server/nms-patches/ChatModifier.patch
rename to paper-server/nms-patches/net/minecraft/network/chat/ChatModifier.patch
diff --git a/paper-server/nms-patches/IChatBaseComponent.patch b/paper-server/nms-patches/net/minecraft/network/chat/IChatBaseComponent.patch
similarity index 100%
rename from paper-server/nms-patches/IChatBaseComponent.patch
rename to paper-server/nms-patches/net/minecraft/network/chat/IChatBaseComponent.patch
diff --git a/paper-server/nms-patches/PlayerConnectionUtils.patch b/paper-server/nms-patches/net/minecraft/network/protocol/PlayerConnectionUtils.patch
similarity index 100%
rename from paper-server/nms-patches/PlayerConnectionUtils.patch
rename to paper-server/nms-patches/net/minecraft/network/protocol/PlayerConnectionUtils.patch
diff --git a/paper-server/nms-patches/PacketPlayInCloseWindow.patch b/paper-server/nms-patches/net/minecraft/network/protocol/game/PacketPlayInCloseWindow.patch
similarity index 100%
rename from paper-server/nms-patches/PacketPlayInCloseWindow.patch
rename to paper-server/nms-patches/net/minecraft/network/protocol/game/PacketPlayInCloseWindow.patch
diff --git a/paper-server/nms-patches/PacketPlayOutMultiBlockChange.patch b/paper-server/nms-patches/net/minecraft/network/protocol/game/PacketPlayOutMultiBlockChange.patch
similarity index 100%
rename from paper-server/nms-patches/PacketPlayOutMultiBlockChange.patch
rename to paper-server/nms-patches/net/minecraft/network/protocol/game/PacketPlayOutMultiBlockChange.patch
diff --git a/paper-server/nms-patches/PacketPlayOutWorldBorder.patch b/paper-server/nms-patches/net/minecraft/network/protocol/game/PacketPlayOutWorldBorder.patch
similarity index 100%
rename from paper-server/nms-patches/PacketPlayOutWorldBorder.patch
rename to paper-server/nms-patches/net/minecraft/network/protocol/game/PacketPlayOutWorldBorder.patch
diff --git a/paper-server/nms-patches/DataWatcher.patch b/paper-server/nms-patches/net/minecraft/network/syncher/DataWatcher.patch
similarity index 100%
rename from paper-server/nms-patches/DataWatcher.patch
rename to paper-server/nms-patches/net/minecraft/network/syncher/DataWatcher.patch
diff --git a/paper-server/nms-patches/AdvancementDataPlayer.patch b/paper-server/nms-patches/net/minecraft/server/AdvancementDataPlayer.patch
similarity index 100%
rename from paper-server/nms-patches/AdvancementDataPlayer.patch
rename to paper-server/nms-patches/net/minecraft/server/AdvancementDataPlayer.patch
diff --git a/paper-server/nms-patches/CustomFunctionData.patch b/paper-server/nms-patches/net/minecraft/server/CustomFunctionData.patch
similarity index 100%
rename from paper-server/nms-patches/CustomFunctionData.patch
rename to paper-server/nms-patches/net/minecraft/server/CustomFunctionData.patch
diff --git a/paper-server/nms-patches/DispenserRegistry.patch b/paper-server/nms-patches/net/minecraft/server/DispenserRegistry.patch
similarity index 100%
rename from paper-server/nms-patches/DispenserRegistry.patch
rename to paper-server/nms-patches/net/minecraft/server/DispenserRegistry.patch
diff --git a/paper-server/nms-patches/Main.patch b/paper-server/nms-patches/net/minecraft/server/Main.patch
similarity index 100%
rename from paper-server/nms-patches/Main.patch
rename to paper-server/nms-patches/net/minecraft/server/Main.patch
diff --git a/paper-server/nms-patches/MinecraftServer.patch b/paper-server/nms-patches/net/minecraft/server/MinecraftServer.patch
similarity index 100%
rename from paper-server/nms-patches/MinecraftServer.patch
rename to paper-server/nms-patches/net/minecraft/server/MinecraftServer.patch
diff --git a/paper-server/nms-patches/ScoreboardServer.patch b/paper-server/nms-patches/net/minecraft/server/ScoreboardServer.patch
similarity index 100%
rename from paper-server/nms-patches/ScoreboardServer.patch
rename to paper-server/nms-patches/net/minecraft/server/ScoreboardServer.patch
diff --git a/paper-server/nms-patches/BossBattleCustom.patch b/paper-server/nms-patches/net/minecraft/server/bossevents/BossBattleCustom.patch
similarity index 100%
rename from paper-server/nms-patches/BossBattleCustom.patch
rename to paper-server/nms-patches/net/minecraft/server/bossevents/BossBattleCustom.patch
diff --git a/paper-server/nms-patches/CommandEffect.patch b/paper-server/nms-patches/net/minecraft/server/commands/CommandEffect.patch
similarity index 100%
rename from paper-server/nms-patches/CommandEffect.patch
rename to paper-server/nms-patches/net/minecraft/server/commands/CommandEffect.patch
diff --git a/paper-server/nms-patches/CommandGamemode.patch b/paper-server/nms-patches/net/minecraft/server/commands/CommandGamemode.patch
similarity index 100%
rename from paper-server/nms-patches/CommandGamemode.patch
rename to paper-server/nms-patches/net/minecraft/server/commands/CommandGamemode.patch
diff --git a/paper-server/nms-patches/CommandGamerule.patch b/paper-server/nms-patches/net/minecraft/server/commands/CommandGamerule.patch
similarity index 100%
rename from paper-server/nms-patches/CommandGamerule.patch
rename to paper-server/nms-patches/net/minecraft/server/commands/CommandGamerule.patch
diff --git a/paper-server/nms-patches/CommandReload.patch b/paper-server/nms-patches/net/minecraft/server/commands/CommandReload.patch
similarity index 100%
rename from paper-server/nms-patches/CommandReload.patch
rename to paper-server/nms-patches/net/minecraft/server/commands/CommandReload.patch
diff --git a/paper-server/nms-patches/CommandSpreadPlayers.patch b/paper-server/nms-patches/net/minecraft/server/commands/CommandSpreadPlayers.patch
similarity index 100%
rename from paper-server/nms-patches/CommandSpreadPlayers.patch
rename to paper-server/nms-patches/net/minecraft/server/commands/CommandSpreadPlayers.patch
diff --git a/paper-server/nms-patches/CommandTeleport.patch b/paper-server/nms-patches/net/minecraft/server/commands/CommandTeleport.patch
similarity index 100%
rename from paper-server/nms-patches/CommandTeleport.patch
rename to paper-server/nms-patches/net/minecraft/server/commands/CommandTeleport.patch
diff --git a/paper-server/nms-patches/CommandTime.patch b/paper-server/nms-patches/net/minecraft/server/commands/CommandTime.patch
similarity index 100%
rename from paper-server/nms-patches/CommandTime.patch
rename to paper-server/nms-patches/net/minecraft/server/commands/CommandTime.patch
diff --git a/paper-server/nms-patches/DedicatedServer.patch b/paper-server/nms-patches/net/minecraft/server/dedicated/DedicatedServer.patch
similarity index 100%
rename from paper-server/nms-patches/DedicatedServer.patch
rename to paper-server/nms-patches/net/minecraft/server/dedicated/DedicatedServer.patch
diff --git a/paper-server/nms-patches/DedicatedServerProperties.patch b/paper-server/nms-patches/net/minecraft/server/dedicated/DedicatedServerProperties.patch
similarity index 100%
rename from paper-server/nms-patches/DedicatedServerProperties.patch
rename to paper-server/nms-patches/net/minecraft/server/dedicated/DedicatedServerProperties.patch
diff --git a/paper-server/nms-patches/DedicatedServerSettings.patch b/paper-server/nms-patches/net/minecraft/server/dedicated/DedicatedServerSettings.patch
similarity index 100%
rename from paper-server/nms-patches/DedicatedServerSettings.patch
rename to paper-server/nms-patches/net/minecraft/server/dedicated/DedicatedServerSettings.patch
diff --git a/paper-server/nms-patches/PropertyManager.patch b/paper-server/nms-patches/net/minecraft/server/dedicated/PropertyManager.patch
similarity index 100%
rename from paper-server/nms-patches/PropertyManager.patch
rename to paper-server/nms-patches/net/minecraft/server/dedicated/PropertyManager.patch
diff --git a/paper-server/nms-patches/ServerGUI.patch b/paper-server/nms-patches/net/minecraft/server/gui/ServerGUI.patch
similarity index 100%
rename from paper-server/nms-patches/ServerGUI.patch
rename to paper-server/nms-patches/net/minecraft/server/gui/ServerGUI.patch
diff --git a/paper-server/nms-patches/ChunkMapDistance.patch b/paper-server/nms-patches/net/minecraft/server/level/ChunkMapDistance.patch
similarity index 100%
rename from paper-server/nms-patches/ChunkMapDistance.patch
rename to paper-server/nms-patches/net/minecraft/server/level/ChunkMapDistance.patch
diff --git a/paper-server/nms-patches/ChunkProviderServer.patch b/paper-server/nms-patches/net/minecraft/server/level/ChunkProviderServer.patch
similarity index 100%
rename from paper-server/nms-patches/ChunkProviderServer.patch
rename to paper-server/nms-patches/net/minecraft/server/level/ChunkProviderServer.patch
diff --git a/paper-server/nms-patches/EntityPlayer.patch b/paper-server/nms-patches/net/minecraft/server/level/EntityPlayer.patch
similarity index 100%
rename from paper-server/nms-patches/EntityPlayer.patch
rename to paper-server/nms-patches/net/minecraft/server/level/EntityPlayer.patch
diff --git a/paper-server/nms-patches/EntityTrackerEntry.patch b/paper-server/nms-patches/net/minecraft/server/level/EntityTrackerEntry.patch
similarity index 100%
rename from paper-server/nms-patches/EntityTrackerEntry.patch
rename to paper-server/nms-patches/net/minecraft/server/level/EntityTrackerEntry.patch
diff --git a/paper-server/nms-patches/PlayerChunk.patch b/paper-server/nms-patches/net/minecraft/server/level/PlayerChunk.patch
similarity index 100%
rename from paper-server/nms-patches/PlayerChunk.patch
rename to paper-server/nms-patches/net/minecraft/server/level/PlayerChunk.patch
diff --git a/paper-server/nms-patches/PlayerChunkMap.patch b/paper-server/nms-patches/net/minecraft/server/level/PlayerChunkMap.patch
similarity index 100%
rename from paper-server/nms-patches/PlayerChunkMap.patch
rename to paper-server/nms-patches/net/minecraft/server/level/PlayerChunkMap.patch
diff --git a/paper-server/nms-patches/PlayerInteractManager.patch b/paper-server/nms-patches/net/minecraft/server/level/PlayerInteractManager.patch
similarity index 100%
rename from paper-server/nms-patches/PlayerInteractManager.patch
rename to paper-server/nms-patches/net/minecraft/server/level/PlayerInteractManager.patch
diff --git a/paper-server/nms-patches/RegionLimitedWorldAccess.patch b/paper-server/nms-patches/net/minecraft/server/level/RegionLimitedWorldAccess.patch
similarity index 100%
rename from paper-server/nms-patches/RegionLimitedWorldAccess.patch
rename to paper-server/nms-patches/net/minecraft/server/level/RegionLimitedWorldAccess.patch
diff --git a/paper-server/nms-patches/TicketType.patch b/paper-server/nms-patches/net/minecraft/server/level/TicketType.patch
similarity index 100%
rename from paper-server/nms-patches/TicketType.patch
rename to paper-server/nms-patches/net/minecraft/server/level/TicketType.patch
diff --git a/paper-server/nms-patches/WorldServer.patch b/paper-server/nms-patches/net/minecraft/server/level/WorldServer.patch
similarity index 100%
rename from paper-server/nms-patches/WorldServer.patch
rename to paper-server/nms-patches/net/minecraft/server/level/WorldServer.patch
diff --git a/paper-server/nms-patches/HandshakeListener.patch b/paper-server/nms-patches/net/minecraft/server/network/HandshakeListener.patch
similarity index 100%
rename from paper-server/nms-patches/HandshakeListener.patch
rename to paper-server/nms-patches/net/minecraft/server/network/HandshakeListener.patch
diff --git a/paper-server/nms-patches/LegacyPingHandler.patch b/paper-server/nms-patches/net/minecraft/server/network/LegacyPingHandler.patch
similarity index 100%
rename from paper-server/nms-patches/LegacyPingHandler.patch
rename to paper-server/nms-patches/net/minecraft/server/network/LegacyPingHandler.patch
diff --git a/paper-server/nms-patches/LoginListener.patch b/paper-server/nms-patches/net/minecraft/server/network/LoginListener.patch
similarity index 100%
rename from paper-server/nms-patches/LoginListener.patch
rename to paper-server/nms-patches/net/minecraft/server/network/LoginListener.patch
diff --git a/paper-server/nms-patches/PacketStatusListener.patch b/paper-server/nms-patches/net/minecraft/server/network/PacketStatusListener.patch
similarity index 100%
rename from paper-server/nms-patches/PacketStatusListener.patch
rename to paper-server/nms-patches/net/minecraft/server/network/PacketStatusListener.patch
diff --git a/paper-server/nms-patches/PlayerConnection.patch b/paper-server/nms-patches/net/minecraft/server/network/PlayerConnection.patch
similarity index 100%
rename from paper-server/nms-patches/PlayerConnection.patch
rename to paper-server/nms-patches/net/minecraft/server/network/PlayerConnection.patch
diff --git a/paper-server/nms-patches/ServerConnection.patch b/paper-server/nms-patches/net/minecraft/server/network/ServerConnection.patch
similarity index 100%
rename from paper-server/nms-patches/ServerConnection.patch
rename to paper-server/nms-patches/net/minecraft/server/network/ServerConnection.patch
diff --git a/paper-server/nms-patches/ExpirableListEntry.patch b/paper-server/nms-patches/net/minecraft/server/players/ExpirableListEntry.patch
similarity index 100%
rename from paper-server/nms-patches/ExpirableListEntry.patch
rename to paper-server/nms-patches/net/minecraft/server/players/ExpirableListEntry.patch
diff --git a/paper-server/nms-patches/JsonList.patch b/paper-server/nms-patches/net/minecraft/server/players/JsonList.patch
similarity index 100%
rename from paper-server/nms-patches/JsonList.patch
rename to paper-server/nms-patches/net/minecraft/server/players/JsonList.patch
diff --git a/paper-server/nms-patches/NameReferencingFileConverter.patch b/paper-server/nms-patches/net/minecraft/server/players/NameReferencingFileConverter.patch
similarity index 100%
rename from paper-server/nms-patches/NameReferencingFileConverter.patch
rename to paper-server/nms-patches/net/minecraft/server/players/NameReferencingFileConverter.patch
diff --git a/paper-server/nms-patches/PlayerList.patch b/paper-server/nms-patches/net/minecraft/server/players/PlayerList.patch
similarity index 100%
rename from paper-server/nms-patches/PlayerList.patch
rename to paper-server/nms-patches/net/minecraft/server/players/PlayerList.patch
diff --git a/paper-server/nms-patches/RemoteControlCommandListener.patch b/paper-server/nms-patches/net/minecraft/server/rcon/RemoteControlCommandListener.patch
similarity index 100%
rename from paper-server/nms-patches/RemoteControlCommandListener.patch
rename to paper-server/nms-patches/net/minecraft/server/rcon/RemoteControlCommandListener.patch
diff --git a/paper-server/nms-patches/RecipeBookServer.patch b/paper-server/nms-patches/net/minecraft/stats/RecipeBookServer.patch
similarity index 100%
rename from paper-server/nms-patches/RecipeBookServer.patch
rename to paper-server/nms-patches/net/minecraft/stats/RecipeBookServer.patch
diff --git a/paper-server/nms-patches/StatisticManager.patch b/paper-server/nms-patches/net/minecraft/stats/StatisticManager.patch
similarity index 100%
rename from paper-server/nms-patches/StatisticManager.patch
rename to paper-server/nms-patches/net/minecraft/stats/StatisticManager.patch
diff --git a/paper-server/nms-patches/DataConverterRegistry.patch b/paper-server/nms-patches/net/minecraft/util/datafix/DataConverterRegistry.patch
similarity index 100%
rename from paper-server/nms-patches/DataConverterRegistry.patch
rename to paper-server/nms-patches/net/minecraft/util/datafix/DataConverterRegistry.patch
diff --git a/paper-server/nms-patches/DataConverterFlatten.patch b/paper-server/nms-patches/net/minecraft/util/datafix/fixes/DataConverterFlatten.patch
similarity index 100%
rename from paper-server/nms-patches/DataConverterFlatten.patch
rename to paper-server/nms-patches/net/minecraft/util/datafix/fixes/DataConverterFlatten.patch
diff --git a/paper-server/nms-patches/DataConverterMap.patch b/paper-server/nms-patches/net/minecraft/util/datafix/fixes/DataConverterMap.patch
similarity index 100%
rename from paper-server/nms-patches/DataConverterMap.patch
rename to paper-server/nms-patches/net/minecraft/util/datafix/fixes/DataConverterMap.patch
diff --git a/paper-server/nms-patches/WorldUpgrader.patch b/paper-server/nms-patches/net/minecraft/util/worldupdate/WorldUpgrader.patch
similarity index 100%
rename from paper-server/nms-patches/WorldUpgrader.patch
rename to paper-server/nms-patches/net/minecraft/util/worldupdate/WorldUpgrader.patch
diff --git a/paper-server/nms-patches/ChestLock.patch b/paper-server/nms-patches/net/minecraft/world/ChestLock.patch
similarity index 100%
rename from paper-server/nms-patches/ChestLock.patch
rename to paper-server/nms-patches/net/minecraft/world/ChestLock.patch
diff --git a/paper-server/nms-patches/IInventory.patch b/paper-server/nms-patches/net/minecraft/world/IInventory.patch
similarity index 100%
rename from paper-server/nms-patches/IInventory.patch
rename to paper-server/nms-patches/net/minecraft/world/IInventory.patch
diff --git a/paper-server/nms-patches/InventoryLargeChest.patch b/paper-server/nms-patches/net/minecraft/world/InventoryLargeChest.patch
similarity index 100%
rename from paper-server/nms-patches/InventoryLargeChest.patch
rename to paper-server/nms-patches/net/minecraft/world/InventoryLargeChest.patch
diff --git a/paper-server/nms-patches/InventorySubcontainer.patch b/paper-server/nms-patches/net/minecraft/world/InventorySubcontainer.patch
similarity index 100%
rename from paper-server/nms-patches/InventorySubcontainer.patch
rename to paper-server/nms-patches/net/minecraft/world/InventorySubcontainer.patch
diff --git a/paper-server/nms-patches/DamageSource.patch b/paper-server/nms-patches/net/minecraft/world/damagesource/DamageSource.patch
similarity index 100%
rename from paper-server/nms-patches/DamageSource.patch
rename to paper-server/nms-patches/net/minecraft/world/damagesource/DamageSource.patch
diff --git a/paper-server/nms-patches/EntityDamageSourceIndirect.patch b/paper-server/nms-patches/net/minecraft/world/damagesource/EntityDamageSourceIndirect.patch
similarity index 100%
rename from paper-server/nms-patches/EntityDamageSourceIndirect.patch
rename to paper-server/nms-patches/net/minecraft/world/damagesource/EntityDamageSourceIndirect.patch
diff --git a/paper-server/nms-patches/MobEffectList.patch b/paper-server/nms-patches/net/minecraft/world/effect/MobEffectList.patch
similarity index 100%
rename from paper-server/nms-patches/MobEffectList.patch
rename to paper-server/nms-patches/net/minecraft/world/effect/MobEffectList.patch
diff --git a/paper-server/nms-patches/MobEffects.patch b/paper-server/nms-patches/net/minecraft/world/effect/MobEffects.patch
similarity index 100%
rename from paper-server/nms-patches/MobEffects.patch
rename to paper-server/nms-patches/net/minecraft/world/effect/MobEffects.patch
diff --git a/paper-server/nms-patches/Entity.patch b/paper-server/nms-patches/net/minecraft/world/entity/Entity.patch
similarity index 100%
rename from paper-server/nms-patches/Entity.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/Entity.patch
diff --git a/paper-server/nms-patches/EntityAgeable.patch b/paper-server/nms-patches/net/minecraft/world/entity/EntityAgeable.patch
similarity index 100%
rename from paper-server/nms-patches/EntityAgeable.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/EntityAgeable.patch
diff --git a/paper-server/nms-patches/EntityAreaEffectCloud.patch b/paper-server/nms-patches/net/minecraft/world/entity/EntityAreaEffectCloud.patch
similarity index 100%
rename from paper-server/nms-patches/EntityAreaEffectCloud.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/EntityAreaEffectCloud.patch
diff --git a/paper-server/nms-patches/EntityCreature.patch b/paper-server/nms-patches/net/minecraft/world/entity/EntityCreature.patch
similarity index 100%
rename from paper-server/nms-patches/EntityCreature.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/EntityCreature.patch
diff --git a/paper-server/nms-patches/EntityExperienceOrb.patch b/paper-server/nms-patches/net/minecraft/world/entity/EntityExperienceOrb.patch
similarity index 100%
rename from paper-server/nms-patches/EntityExperienceOrb.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/EntityExperienceOrb.patch
diff --git a/paper-server/nms-patches/EntityInsentient.patch b/paper-server/nms-patches/net/minecraft/world/entity/EntityInsentient.patch
similarity index 100%
rename from paper-server/nms-patches/EntityInsentient.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/EntityInsentient.patch
diff --git a/paper-server/nms-patches/EntityLightning.patch b/paper-server/nms-patches/net/minecraft/world/entity/EntityLightning.patch
similarity index 100%
rename from paper-server/nms-patches/EntityLightning.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/EntityLightning.patch
diff --git a/paper-server/nms-patches/EntityLiving.patch b/paper-server/nms-patches/net/minecraft/world/entity/EntityLiving.patch
similarity index 100%
rename from paper-server/nms-patches/EntityLiving.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/EntityLiving.patch
diff --git a/paper-server/nms-patches/EntityTypes.patch b/paper-server/nms-patches/net/minecraft/world/entity/EntityTypes.patch
similarity index 100%
rename from paper-server/nms-patches/EntityTypes.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/EntityTypes.patch
diff --git a/paper-server/nms-patches/IEntityAngerable.patch b/paper-server/nms-patches/net/minecraft/world/entity/IEntityAngerable.patch
similarity index 100%
rename from paper-server/nms-patches/IEntityAngerable.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/IEntityAngerable.patch
diff --git a/paper-server/nms-patches/IEntitySelector.patch b/paper-server/nms-patches/net/minecraft/world/entity/IEntitySelector.patch
similarity index 100%
rename from paper-server/nms-patches/IEntitySelector.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/IEntitySelector.patch
diff --git a/paper-server/nms-patches/SaddleStorage.patch b/paper-server/nms-patches/net/minecraft/world/entity/SaddleStorage.patch
similarity index 100%
rename from paper-server/nms-patches/SaddleStorage.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/SaddleStorage.patch
diff --git a/paper-server/nms-patches/AttributeRanged.patch b/paper-server/nms-patches/net/minecraft/world/entity/ai/attributes/AttributeRanged.patch
similarity index 100%
rename from paper-server/nms-patches/AttributeRanged.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/ai/attributes/AttributeRanged.patch
diff --git a/paper-server/nms-patches/BehaviorAttackTargetForget.patch b/paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorAttackTargetForget.patch
similarity index 100%
rename from paper-server/nms-patches/BehaviorAttackTargetForget.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorAttackTargetForget.patch
diff --git a/paper-server/nms-patches/BehaviorAttackTargetSet.patch b/paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorAttackTargetSet.patch
similarity index 100%
rename from paper-server/nms-patches/BehaviorAttackTargetSet.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorAttackTargetSet.patch
diff --git a/paper-server/nms-patches/BehaviorCareer.patch b/paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorCareer.patch
similarity index 100%
rename from paper-server/nms-patches/BehaviorCareer.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorCareer.patch
diff --git a/paper-server/nms-patches/BehaviorFarm.patch b/paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorFarm.patch
similarity index 100%
rename from paper-server/nms-patches/BehaviorFarm.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorFarm.patch
diff --git a/paper-server/nms-patches/BehaviorInteractDoor.patch b/paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorInteractDoor.patch
similarity index 100%
rename from paper-server/nms-patches/BehaviorInteractDoor.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorInteractDoor.patch
diff --git a/paper-server/nms-patches/BehaviorMakeLove.patch b/paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorMakeLove.patch
similarity index 100%
rename from paper-server/nms-patches/BehaviorMakeLove.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorMakeLove.patch
diff --git a/paper-server/nms-patches/BehaviorProfession.patch b/paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorProfession.patch
similarity index 100%
rename from paper-server/nms-patches/BehaviorProfession.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorProfession.patch
diff --git a/paper-server/nms-patches/BehaviorUtil.patch b/paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorUtil.patch
similarity index 100%
rename from paper-server/nms-patches/BehaviorUtil.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorUtil.patch
diff --git a/paper-server/nms-patches/BehaviorWorkComposter.patch b/paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorWorkComposter.patch
similarity index 100%
rename from paper-server/nms-patches/BehaviorWorkComposter.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorWorkComposter.patch
diff --git a/paper-server/nms-patches/PathfinderGoalBreakDoor.patch b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalBreakDoor.patch
similarity index 100%
rename from paper-server/nms-patches/PathfinderGoalBreakDoor.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalBreakDoor.patch
diff --git a/paper-server/nms-patches/PathfinderGoalEatTile.patch b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalEatTile.patch
similarity index 100%
rename from paper-server/nms-patches/PathfinderGoalEatTile.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalEatTile.patch
diff --git a/paper-server/nms-patches/PathfinderGoalFollowOwner.patch b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalFollowOwner.patch
similarity index 100%
rename from paper-server/nms-patches/PathfinderGoalFollowOwner.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalFollowOwner.patch
diff --git a/paper-server/nms-patches/PathfinderGoalPanic.patch b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalPanic.patch
similarity index 100%
rename from paper-server/nms-patches/PathfinderGoalPanic.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalPanic.patch
diff --git a/paper-server/nms-patches/PathfinderGoalRemoveBlock.patch b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalRemoveBlock.patch
similarity index 100%
rename from paper-server/nms-patches/PathfinderGoalRemoveBlock.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalRemoveBlock.patch
diff --git a/paper-server/nms-patches/PathfinderGoalSit.patch b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalSit.patch
similarity index 100%
rename from paper-server/nms-patches/PathfinderGoalSit.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalSit.patch
diff --git a/paper-server/nms-patches/PathfinderGoalTame.patch b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalTame.patch
similarity index 100%
rename from paper-server/nms-patches/PathfinderGoalTame.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalTame.patch
diff --git a/paper-server/nms-patches/PathfinderGoalTempt.patch b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalTempt.patch
similarity index 100%
rename from paper-server/nms-patches/PathfinderGoalTempt.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalTempt.patch
diff --git a/paper-server/nms-patches/PathfinderGoalDefendVillage.patch b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/target/PathfinderGoalDefendVillage.patch
similarity index 100%
rename from paper-server/nms-patches/PathfinderGoalDefendVillage.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/ai/goal/target/PathfinderGoalDefendVillage.patch
diff --git a/paper-server/nms-patches/PathfinderGoalHurtByTarget.patch b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/target/PathfinderGoalHurtByTarget.patch
similarity index 100%
rename from paper-server/nms-patches/PathfinderGoalHurtByTarget.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/ai/goal/target/PathfinderGoalHurtByTarget.patch
diff --git a/paper-server/nms-patches/PathfinderGoalNearestAttackableTarget.patch b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/target/PathfinderGoalNearestAttackableTarget.patch
similarity index 100%
rename from paper-server/nms-patches/PathfinderGoalNearestAttackableTarget.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/ai/goal/target/PathfinderGoalNearestAttackableTarget.patch
diff --git a/paper-server/nms-patches/PathfinderGoalOwnerHurtByTarget.patch b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/target/PathfinderGoalOwnerHurtByTarget.patch
similarity index 100%
rename from paper-server/nms-patches/PathfinderGoalOwnerHurtByTarget.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/ai/goal/target/PathfinderGoalOwnerHurtByTarget.patch
diff --git a/paper-server/nms-patches/PathfinderGoalOwnerHurtTarget.patch b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/target/PathfinderGoalOwnerHurtTarget.patch
similarity index 100%
rename from paper-server/nms-patches/PathfinderGoalOwnerHurtTarget.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/ai/goal/target/PathfinderGoalOwnerHurtTarget.patch
diff --git a/paper-server/nms-patches/PathfinderGoalTarget.patch b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/target/PathfinderGoalTarget.patch
similarity index 100%
rename from paper-server/nms-patches/PathfinderGoalTarget.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/ai/goal/target/PathfinderGoalTarget.patch
diff --git a/paper-server/nms-patches/VillageSiege.patch b/paper-server/nms-patches/net/minecraft/world/entity/ai/village/VillageSiege.patch
similarity index 100%
rename from paper-server/nms-patches/VillageSiege.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/ai/village/VillageSiege.patch
diff --git a/paper-server/nms-patches/EntityBat.patch b/paper-server/nms-patches/net/minecraft/world/entity/ambient/EntityBat.patch
similarity index 100%
rename from paper-server/nms-patches/EntityBat.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/ambient/EntityBat.patch
diff --git a/paper-server/nms-patches/EntityAnimal.patch b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityAnimal.patch
similarity index 100%
rename from paper-server/nms-patches/EntityAnimal.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/animal/EntityAnimal.patch
diff --git a/paper-server/nms-patches/EntityBee.patch b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityBee.patch
similarity index 100%
rename from paper-server/nms-patches/EntityBee.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/animal/EntityBee.patch
diff --git a/paper-server/nms-patches/EntityCat.patch b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityCat.patch
similarity index 100%
rename from paper-server/nms-patches/EntityCat.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/animal/EntityCat.patch
diff --git a/paper-server/nms-patches/EntityChicken.patch b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityChicken.patch
similarity index 100%
rename from paper-server/nms-patches/EntityChicken.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/animal/EntityChicken.patch
diff --git a/paper-server/nms-patches/EntityCow.patch b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityCow.patch
similarity index 100%
rename from paper-server/nms-patches/EntityCow.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/animal/EntityCow.patch
diff --git a/paper-server/nms-patches/EntityDolphin.patch b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityDolphin.patch
similarity index 100%
rename from paper-server/nms-patches/EntityDolphin.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/animal/EntityDolphin.patch
diff --git a/paper-server/nms-patches/EntityFish.patch b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityFish.patch
similarity index 100%
rename from paper-server/nms-patches/EntityFish.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/animal/EntityFish.patch
diff --git a/paper-server/nms-patches/EntityFox.patch b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityFox.patch
similarity index 100%
rename from paper-server/nms-patches/EntityFox.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/animal/EntityFox.patch
diff --git a/paper-server/nms-patches/EntityIronGolem.patch b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityIronGolem.patch
similarity index 100%
rename from paper-server/nms-patches/EntityIronGolem.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/animal/EntityIronGolem.patch
diff --git a/paper-server/nms-patches/EntityMushroomCow.patch b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityMushroomCow.patch
similarity index 100%
rename from paper-server/nms-patches/EntityMushroomCow.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/animal/EntityMushroomCow.patch
diff --git a/paper-server/nms-patches/EntityOcelot.patch b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityOcelot.patch
similarity index 100%
rename from paper-server/nms-patches/EntityOcelot.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/animal/EntityOcelot.patch
diff --git a/paper-server/nms-patches/EntityPanda.patch b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityPanda.patch
similarity index 100%
rename from paper-server/nms-patches/EntityPanda.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/animal/EntityPanda.patch
diff --git a/paper-server/nms-patches/EntityParrot.patch b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityParrot.patch
similarity index 100%
rename from paper-server/nms-patches/EntityParrot.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/animal/EntityParrot.patch
diff --git a/paper-server/nms-patches/EntityPig.patch b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityPig.patch
similarity index 100%
rename from paper-server/nms-patches/EntityPig.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/animal/EntityPig.patch
diff --git a/paper-server/nms-patches/EntityPufferFish.patch b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityPufferFish.patch
similarity index 100%
rename from paper-server/nms-patches/EntityPufferFish.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/animal/EntityPufferFish.patch
diff --git a/paper-server/nms-patches/EntityRabbit.patch b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityRabbit.patch
similarity index 100%
rename from paper-server/nms-patches/EntityRabbit.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/animal/EntityRabbit.patch
diff --git a/paper-server/nms-patches/EntitySheep.patch b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntitySheep.patch
similarity index 100%
rename from paper-server/nms-patches/EntitySheep.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/animal/EntitySheep.patch
diff --git a/paper-server/nms-patches/EntitySnowman.patch b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntitySnowman.patch
similarity index 100%
rename from paper-server/nms-patches/EntitySnowman.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/animal/EntitySnowman.patch
diff --git a/paper-server/nms-patches/EntityTurtle.patch b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityTurtle.patch
similarity index 100%
rename from paper-server/nms-patches/EntityTurtle.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/animal/EntityTurtle.patch
diff --git a/paper-server/nms-patches/EntityWolf.patch b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityWolf.patch
similarity index 100%
rename from paper-server/nms-patches/EntityWolf.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/animal/EntityWolf.patch
diff --git a/paper-server/nms-patches/EntityHorseAbstract.patch b/paper-server/nms-patches/net/minecraft/world/entity/animal/horse/EntityHorseAbstract.patch
similarity index 100%
rename from paper-server/nms-patches/EntityHorseAbstract.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/animal/horse/EntityHorseAbstract.patch
diff --git a/paper-server/nms-patches/EntityLlamaTrader.patch b/paper-server/nms-patches/net/minecraft/world/entity/animal/horse/EntityLlamaTrader.patch
similarity index 100%
rename from paper-server/nms-patches/EntityLlamaTrader.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/animal/horse/EntityLlamaTrader.patch
diff --git a/paper-server/nms-patches/PathfinderGoalHorseTrap.patch b/paper-server/nms-patches/net/minecraft/world/entity/animal/horse/PathfinderGoalHorseTrap.patch
similarity index 100%
rename from paper-server/nms-patches/PathfinderGoalHorseTrap.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/animal/horse/PathfinderGoalHorseTrap.patch
diff --git a/paper-server/nms-patches/EntityEnderCrystal.patch b/paper-server/nms-patches/net/minecraft/world/entity/boss/enderdragon/EntityEnderCrystal.patch
similarity index 100%
rename from paper-server/nms-patches/EntityEnderCrystal.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/boss/enderdragon/EntityEnderCrystal.patch
diff --git a/paper-server/nms-patches/EntityEnderDragon.patch b/paper-server/nms-patches/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.patch
similarity index 100%
rename from paper-server/nms-patches/EntityEnderDragon.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.patch
diff --git a/paper-server/nms-patches/DragonControllerManager.patch b/paper-server/nms-patches/net/minecraft/world/entity/boss/enderdragon/phases/DragonControllerManager.patch
similarity index 100%
rename from paper-server/nms-patches/DragonControllerManager.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/boss/enderdragon/phases/DragonControllerManager.patch
diff --git a/paper-server/nms-patches/EntityWither.patch b/paper-server/nms-patches/net/minecraft/world/entity/boss/wither/EntityWither.patch
similarity index 100%
rename from paper-server/nms-patches/EntityWither.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/boss/wither/EntityWither.patch
diff --git a/paper-server/nms-patches/EntityArmorStand.patch b/paper-server/nms-patches/net/minecraft/world/entity/decoration/EntityArmorStand.patch
similarity index 100%
rename from paper-server/nms-patches/EntityArmorStand.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/decoration/EntityArmorStand.patch
diff --git a/paper-server/nms-patches/EntityHanging.patch b/paper-server/nms-patches/net/minecraft/world/entity/decoration/EntityHanging.patch
similarity index 100%
rename from paper-server/nms-patches/EntityHanging.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/decoration/EntityHanging.patch
diff --git a/paper-server/nms-patches/EntityItemFrame.patch b/paper-server/nms-patches/net/minecraft/world/entity/decoration/EntityItemFrame.patch
similarity index 100%
rename from paper-server/nms-patches/EntityItemFrame.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/decoration/EntityItemFrame.patch
diff --git a/paper-server/nms-patches/EntityLeash.patch b/paper-server/nms-patches/net/minecraft/world/entity/decoration/EntityLeash.patch
similarity index 100%
rename from paper-server/nms-patches/EntityLeash.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/decoration/EntityLeash.patch
diff --git a/paper-server/nms-patches/EntityPainting.patch b/paper-server/nms-patches/net/minecraft/world/entity/decoration/EntityPainting.patch
similarity index 100%
rename from paper-server/nms-patches/EntityPainting.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/decoration/EntityPainting.patch
diff --git a/paper-server/nms-patches/EntityFallingBlock.patch b/paper-server/nms-patches/net/minecraft/world/entity/item/EntityFallingBlock.patch
similarity index 100%
rename from paper-server/nms-patches/EntityFallingBlock.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/item/EntityFallingBlock.patch
diff --git a/paper-server/nms-patches/EntityItem.patch b/paper-server/nms-patches/net/minecraft/world/entity/item/EntityItem.patch
similarity index 100%
rename from paper-server/nms-patches/EntityItem.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/item/EntityItem.patch
diff --git a/paper-server/nms-patches/EntityTNTPrimed.patch b/paper-server/nms-patches/net/minecraft/world/entity/item/EntityTNTPrimed.patch
similarity index 100%
rename from paper-server/nms-patches/EntityTNTPrimed.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/item/EntityTNTPrimed.patch
diff --git a/paper-server/nms-patches/EntityCaveSpider.patch b/paper-server/nms-patches/net/minecraft/world/entity/monster/EntityCaveSpider.patch
similarity index 100%
rename from paper-server/nms-patches/EntityCaveSpider.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/monster/EntityCaveSpider.patch
diff --git a/paper-server/nms-patches/EntityCreeper.patch b/paper-server/nms-patches/net/minecraft/world/entity/monster/EntityCreeper.patch
similarity index 100%
rename from paper-server/nms-patches/EntityCreeper.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/monster/EntityCreeper.patch
diff --git a/paper-server/nms-patches/EntityEnderman.patch b/paper-server/nms-patches/net/minecraft/world/entity/monster/EntityEnderman.patch
similarity index 100%
rename from paper-server/nms-patches/EntityEnderman.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/monster/EntityEnderman.patch
diff --git a/paper-server/nms-patches/EntityGhast.patch b/paper-server/nms-patches/net/minecraft/world/entity/monster/EntityGhast.patch
similarity index 100%
rename from paper-server/nms-patches/EntityGhast.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/monster/EntityGhast.patch
diff --git a/paper-server/nms-patches/EntityGuardianElder.patch b/paper-server/nms-patches/net/minecraft/world/entity/monster/EntityGuardianElder.patch
similarity index 100%
rename from paper-server/nms-patches/EntityGuardianElder.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/monster/EntityGuardianElder.patch
diff --git a/paper-server/nms-patches/EntityIllagerIllusioner.patch b/paper-server/nms-patches/net/minecraft/world/entity/monster/EntityIllagerIllusioner.patch
similarity index 100%
rename from paper-server/nms-patches/EntityIllagerIllusioner.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/monster/EntityIllagerIllusioner.patch
diff --git a/paper-server/nms-patches/EntityIllagerWizard.patch b/paper-server/nms-patches/net/minecraft/world/entity/monster/EntityIllagerWizard.patch
similarity index 100%
rename from paper-server/nms-patches/EntityIllagerWizard.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/monster/EntityIllagerWizard.patch
diff --git a/paper-server/nms-patches/EntityPhantom.patch b/paper-server/nms-patches/net/minecraft/world/entity/monster/EntityPhantom.patch
similarity index 100%
rename from paper-server/nms-patches/EntityPhantom.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/monster/EntityPhantom.patch
diff --git a/paper-server/nms-patches/EntityPigZombie.patch b/paper-server/nms-patches/net/minecraft/world/entity/monster/EntityPigZombie.patch
similarity index 100%
rename from paper-server/nms-patches/EntityPigZombie.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/monster/EntityPigZombie.patch
diff --git a/paper-server/nms-patches/EntityPillager.patch b/paper-server/nms-patches/net/minecraft/world/entity/monster/EntityPillager.patch
similarity index 100%
rename from paper-server/nms-patches/EntityPillager.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/monster/EntityPillager.patch
diff --git a/paper-server/nms-patches/EntityRavager.patch b/paper-server/nms-patches/net/minecraft/world/entity/monster/EntityRavager.patch
similarity index 100%
rename from paper-server/nms-patches/EntityRavager.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/monster/EntityRavager.patch
diff --git a/paper-server/nms-patches/EntityShulker.patch b/paper-server/nms-patches/net/minecraft/world/entity/monster/EntityShulker.patch
similarity index 100%
rename from paper-server/nms-patches/EntityShulker.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/monster/EntityShulker.patch
diff --git a/paper-server/nms-patches/EntitySilverfish.patch b/paper-server/nms-patches/net/minecraft/world/entity/monster/EntitySilverfish.patch
similarity index 100%
rename from paper-server/nms-patches/EntitySilverfish.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/monster/EntitySilverfish.patch
diff --git a/paper-server/nms-patches/EntitySkeletonAbstract.patch b/paper-server/nms-patches/net/minecraft/world/entity/monster/EntitySkeletonAbstract.patch
similarity index 100%
rename from paper-server/nms-patches/EntitySkeletonAbstract.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/monster/EntitySkeletonAbstract.patch
diff --git a/paper-server/nms-patches/EntitySkeletonWither.patch b/paper-server/nms-patches/net/minecraft/world/entity/monster/EntitySkeletonWither.patch
similarity index 100%
rename from paper-server/nms-patches/EntitySkeletonWither.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/monster/EntitySkeletonWither.patch
diff --git a/paper-server/nms-patches/EntitySlime.patch b/paper-server/nms-patches/net/minecraft/world/entity/monster/EntitySlime.patch
similarity index 100%
rename from paper-server/nms-patches/EntitySlime.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/monster/EntitySlime.patch
diff --git a/paper-server/nms-patches/EntitySpider.patch b/paper-server/nms-patches/net/minecraft/world/entity/monster/EntitySpider.patch
similarity index 100%
rename from paper-server/nms-patches/EntitySpider.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/monster/EntitySpider.patch
diff --git a/paper-server/nms-patches/EntityStrider.patch b/paper-server/nms-patches/net/minecraft/world/entity/monster/EntityStrider.patch
similarity index 100%
rename from paper-server/nms-patches/EntityStrider.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/monster/EntityStrider.patch
diff --git a/paper-server/nms-patches/EntityVex.patch b/paper-server/nms-patches/net/minecraft/world/entity/monster/EntityVex.patch
similarity index 100%
rename from paper-server/nms-patches/EntityVex.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/monster/EntityVex.patch
diff --git a/paper-server/nms-patches/EntityWitch.patch b/paper-server/nms-patches/net/minecraft/world/entity/monster/EntityWitch.patch
similarity index 100%
rename from paper-server/nms-patches/EntityWitch.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/monster/EntityWitch.patch
diff --git a/paper-server/nms-patches/EntityZombie.patch b/paper-server/nms-patches/net/minecraft/world/entity/monster/EntityZombie.patch
similarity index 100%
rename from paper-server/nms-patches/EntityZombie.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/monster/EntityZombie.patch
diff --git a/paper-server/nms-patches/EntityZombieHusk.patch b/paper-server/nms-patches/net/minecraft/world/entity/monster/EntityZombieHusk.patch
similarity index 100%
rename from paper-server/nms-patches/EntityZombieHusk.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/monster/EntityZombieHusk.patch
diff --git a/paper-server/nms-patches/EntityZombieVillager.patch b/paper-server/nms-patches/net/minecraft/world/entity/monster/EntityZombieVillager.patch
similarity index 100%
rename from paper-server/nms-patches/EntityZombieVillager.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/monster/EntityZombieVillager.patch
diff --git a/paper-server/nms-patches/EntityPiglinAbstract.patch b/paper-server/nms-patches/net/minecraft/world/entity/monster/piglin/EntityPiglinAbstract.patch
similarity index 100%
rename from paper-server/nms-patches/EntityPiglinAbstract.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/monster/piglin/EntityPiglinAbstract.patch
diff --git a/paper-server/nms-patches/PiglinAI.patch b/paper-server/nms-patches/net/minecraft/world/entity/monster/piglin/PiglinAI.patch
similarity index 100%
rename from paper-server/nms-patches/PiglinAI.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/monster/piglin/PiglinAI.patch
diff --git a/paper-server/nms-patches/EntityVillager.patch b/paper-server/nms-patches/net/minecraft/world/entity/npc/EntityVillager.patch
similarity index 100%
rename from paper-server/nms-patches/EntityVillager.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/npc/EntityVillager.patch
diff --git a/paper-server/nms-patches/EntityVillagerAbstract.patch b/paper-server/nms-patches/net/minecraft/world/entity/npc/EntityVillagerAbstract.patch
similarity index 100%
rename from paper-server/nms-patches/EntityVillagerAbstract.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/npc/EntityVillagerAbstract.patch
diff --git a/paper-server/nms-patches/EntityVillagerTrader.patch b/paper-server/nms-patches/net/minecraft/world/entity/npc/EntityVillagerTrader.patch
similarity index 100%
rename from paper-server/nms-patches/EntityVillagerTrader.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/npc/EntityVillagerTrader.patch
diff --git a/paper-server/nms-patches/MobSpawnerTrader.patch b/paper-server/nms-patches/net/minecraft/world/entity/npc/MobSpawnerTrader.patch
similarity index 100%
rename from paper-server/nms-patches/MobSpawnerTrader.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/npc/MobSpawnerTrader.patch
diff --git a/paper-server/nms-patches/EntityHuman.patch b/paper-server/nms-patches/net/minecraft/world/entity/player/EntityHuman.patch
similarity index 100%
rename from paper-server/nms-patches/EntityHuman.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/player/EntityHuman.patch
diff --git a/paper-server/nms-patches/PlayerInventory.patch b/paper-server/nms-patches/net/minecraft/world/entity/player/PlayerInventory.patch
similarity index 100%
rename from paper-server/nms-patches/PlayerInventory.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/player/PlayerInventory.patch
diff --git a/paper-server/nms-patches/EntityArrow.patch b/paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityArrow.patch
similarity index 100%
rename from paper-server/nms-patches/EntityArrow.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityArrow.patch
diff --git a/paper-server/nms-patches/EntityEgg.patch b/paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityEgg.patch
similarity index 100%
rename from paper-server/nms-patches/EntityEgg.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityEgg.patch
diff --git a/paper-server/nms-patches/EntityEnderPearl.patch b/paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityEnderPearl.patch
similarity index 100%
rename from paper-server/nms-patches/EntityEnderPearl.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityEnderPearl.patch
diff --git a/paper-server/nms-patches/EntityEnderSignal.patch b/paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityEnderSignal.patch
similarity index 100%
rename from paper-server/nms-patches/EntityEnderSignal.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityEnderSignal.patch
diff --git a/paper-server/nms-patches/EntityEvokerFangs.patch b/paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityEvokerFangs.patch
similarity index 100%
rename from paper-server/nms-patches/EntityEvokerFangs.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityEvokerFangs.patch
diff --git a/paper-server/nms-patches/EntityFireball.patch b/paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityFireball.patch
similarity index 100%
rename from paper-server/nms-patches/EntityFireball.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityFireball.patch
diff --git a/paper-server/nms-patches/EntityFireballFireball.patch b/paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityFireballFireball.patch
similarity index 100%
rename from paper-server/nms-patches/EntityFireballFireball.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityFireballFireball.patch
diff --git a/paper-server/nms-patches/EntityFireworks.patch b/paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityFireworks.patch
similarity index 100%
rename from paper-server/nms-patches/EntityFireworks.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityFireworks.patch
diff --git a/paper-server/nms-patches/EntityFishingHook.patch b/paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityFishingHook.patch
similarity index 100%
rename from paper-server/nms-patches/EntityFishingHook.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityFishingHook.patch
diff --git a/paper-server/nms-patches/EntityLargeFireball.patch b/paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityLargeFireball.patch
similarity index 100%
rename from paper-server/nms-patches/EntityLargeFireball.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityLargeFireball.patch
diff --git a/paper-server/nms-patches/EntityPotion.patch b/paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityPotion.patch
similarity index 100%
rename from paper-server/nms-patches/EntityPotion.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityPotion.patch
diff --git a/paper-server/nms-patches/EntityProjectileThrowable.patch b/paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityProjectileThrowable.patch
similarity index 100%
rename from paper-server/nms-patches/EntityProjectileThrowable.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityProjectileThrowable.patch
diff --git a/paper-server/nms-patches/EntityShulkerBullet.patch b/paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityShulkerBullet.patch
similarity index 100%
rename from paper-server/nms-patches/EntityShulkerBullet.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityShulkerBullet.patch
diff --git a/paper-server/nms-patches/EntitySmallFireball.patch b/paper-server/nms-patches/net/minecraft/world/entity/projectile/EntitySmallFireball.patch
similarity index 100%
rename from paper-server/nms-patches/EntitySmallFireball.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/projectile/EntitySmallFireball.patch
diff --git a/paper-server/nms-patches/EntitySpectralArrow.patch b/paper-server/nms-patches/net/minecraft/world/entity/projectile/EntitySpectralArrow.patch
similarity index 100%
rename from paper-server/nms-patches/EntitySpectralArrow.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/projectile/EntitySpectralArrow.patch
diff --git a/paper-server/nms-patches/EntityThrownExpBottle.patch b/paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityThrownExpBottle.patch
similarity index 100%
rename from paper-server/nms-patches/EntityThrownExpBottle.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityThrownExpBottle.patch
diff --git a/paper-server/nms-patches/EntityThrownTrident.patch b/paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityThrownTrident.patch
similarity index 100%
rename from paper-server/nms-patches/EntityThrownTrident.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityThrownTrident.patch
diff --git a/paper-server/nms-patches/EntityTippedArrow.patch b/paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityTippedArrow.patch
similarity index 100%
rename from paper-server/nms-patches/EntityTippedArrow.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityTippedArrow.patch
diff --git a/paper-server/nms-patches/EntityWitherSkull.patch b/paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityWitherSkull.patch
similarity index 100%
rename from paper-server/nms-patches/EntityWitherSkull.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityWitherSkull.patch
diff --git a/paper-server/nms-patches/IProjectile.patch b/paper-server/nms-patches/net/minecraft/world/entity/projectile/IProjectile.patch
similarity index 100%
rename from paper-server/nms-patches/IProjectile.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/projectile/IProjectile.patch
diff --git a/paper-server/nms-patches/EntityRaider.patch b/paper-server/nms-patches/net/minecraft/world/entity/raid/EntityRaider.patch
similarity index 100%
rename from paper-server/nms-patches/EntityRaider.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/raid/EntityRaider.patch
diff --git a/paper-server/nms-patches/PersistentRaid.patch b/paper-server/nms-patches/net/minecraft/world/entity/raid/PersistentRaid.patch
similarity index 100%
rename from paper-server/nms-patches/PersistentRaid.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/raid/PersistentRaid.patch
diff --git a/paper-server/nms-patches/Raid.patch b/paper-server/nms-patches/net/minecraft/world/entity/raid/Raid.patch
similarity index 100%
rename from paper-server/nms-patches/Raid.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/raid/Raid.patch
diff --git a/paper-server/nms-patches/EntityBoat.patch b/paper-server/nms-patches/net/minecraft/world/entity/vehicle/EntityBoat.patch
similarity index 100%
rename from paper-server/nms-patches/EntityBoat.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/vehicle/EntityBoat.patch
diff --git a/paper-server/nms-patches/EntityMinecartAbstract.patch b/paper-server/nms-patches/net/minecraft/world/entity/vehicle/EntityMinecartAbstract.patch
similarity index 100%
rename from paper-server/nms-patches/EntityMinecartAbstract.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/vehicle/EntityMinecartAbstract.patch
diff --git a/paper-server/nms-patches/EntityMinecartCommandBlock.patch b/paper-server/nms-patches/net/minecraft/world/entity/vehicle/EntityMinecartCommandBlock.patch
similarity index 100%
rename from paper-server/nms-patches/EntityMinecartCommandBlock.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/vehicle/EntityMinecartCommandBlock.patch
diff --git a/paper-server/nms-patches/EntityMinecartContainer.patch b/paper-server/nms-patches/net/minecraft/world/entity/vehicle/EntityMinecartContainer.patch
similarity index 100%
rename from paper-server/nms-patches/EntityMinecartContainer.patch
rename to paper-server/nms-patches/net/minecraft/world/entity/vehicle/EntityMinecartContainer.patch
diff --git a/paper-server/nms-patches/FoodMetaData.patch b/paper-server/nms-patches/net/minecraft/world/food/FoodMetaData.patch
similarity index 100%
rename from paper-server/nms-patches/FoodMetaData.patch
rename to paper-server/nms-patches/net/minecraft/world/food/FoodMetaData.patch
diff --git a/paper-server/nms-patches/Container.patch b/paper-server/nms-patches/net/minecraft/world/inventory/Container.patch
similarity index 100%
rename from paper-server/nms-patches/Container.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/Container.patch
diff --git a/paper-server/nms-patches/ContainerAccess.patch b/paper-server/nms-patches/net/minecraft/world/inventory/ContainerAccess.patch
similarity index 100%
rename from paper-server/nms-patches/ContainerAccess.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/ContainerAccess.patch
diff --git a/paper-server/nms-patches/ContainerAnvil.patch b/paper-server/nms-patches/net/minecraft/world/inventory/ContainerAnvil.patch
similarity index 100%
rename from paper-server/nms-patches/ContainerAnvil.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/ContainerAnvil.patch
diff --git a/paper-server/nms-patches/ContainerAnvilAbstract.patch b/paper-server/nms-patches/net/minecraft/world/inventory/ContainerAnvilAbstract.patch
similarity index 100%
rename from paper-server/nms-patches/ContainerAnvilAbstract.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/ContainerAnvilAbstract.patch
diff --git a/paper-server/nms-patches/ContainerBeacon.patch b/paper-server/nms-patches/net/minecraft/world/inventory/ContainerBeacon.patch
similarity index 100%
rename from paper-server/nms-patches/ContainerBeacon.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/ContainerBeacon.patch
diff --git a/paper-server/nms-patches/ContainerBrewingStand.patch b/paper-server/nms-patches/net/minecraft/world/inventory/ContainerBrewingStand.patch
similarity index 100%
rename from paper-server/nms-patches/ContainerBrewingStand.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/ContainerBrewingStand.patch
diff --git a/paper-server/nms-patches/ContainerCartography.patch b/paper-server/nms-patches/net/minecraft/world/inventory/ContainerCartography.patch
similarity index 100%
rename from paper-server/nms-patches/ContainerCartography.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/ContainerCartography.patch
diff --git a/paper-server/nms-patches/ContainerChest.patch b/paper-server/nms-patches/net/minecraft/world/inventory/ContainerChest.patch
similarity index 100%
rename from paper-server/nms-patches/ContainerChest.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/ContainerChest.patch
diff --git a/paper-server/nms-patches/ContainerDispenser.patch b/paper-server/nms-patches/net/minecraft/world/inventory/ContainerDispenser.patch
similarity index 100%
rename from paper-server/nms-patches/ContainerDispenser.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/ContainerDispenser.patch
diff --git a/paper-server/nms-patches/ContainerEnchantTable.patch b/paper-server/nms-patches/net/minecraft/world/inventory/ContainerEnchantTable.patch
similarity index 100%
rename from paper-server/nms-patches/ContainerEnchantTable.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/ContainerEnchantTable.patch
diff --git a/paper-server/nms-patches/ContainerFurnace.patch b/paper-server/nms-patches/net/minecraft/world/inventory/ContainerFurnace.patch
similarity index 100%
rename from paper-server/nms-patches/ContainerFurnace.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/ContainerFurnace.patch
diff --git a/paper-server/nms-patches/ContainerGrindstone.patch b/paper-server/nms-patches/net/minecraft/world/inventory/ContainerGrindstone.patch
similarity index 100%
rename from paper-server/nms-patches/ContainerGrindstone.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/ContainerGrindstone.patch
diff --git a/paper-server/nms-patches/ContainerHopper.patch b/paper-server/nms-patches/net/minecraft/world/inventory/ContainerHopper.patch
similarity index 100%
rename from paper-server/nms-patches/ContainerHopper.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/ContainerHopper.patch
diff --git a/paper-server/nms-patches/ContainerHorse.patch b/paper-server/nms-patches/net/minecraft/world/inventory/ContainerHorse.patch
similarity index 100%
rename from paper-server/nms-patches/ContainerHorse.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/ContainerHorse.patch
diff --git a/paper-server/nms-patches/ContainerLectern.patch b/paper-server/nms-patches/net/minecraft/world/inventory/ContainerLectern.patch
similarity index 100%
rename from paper-server/nms-patches/ContainerLectern.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/ContainerLectern.patch
diff --git a/paper-server/nms-patches/ContainerLoom.patch b/paper-server/nms-patches/net/minecraft/world/inventory/ContainerLoom.patch
similarity index 100%
rename from paper-server/nms-patches/ContainerLoom.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/ContainerLoom.patch
diff --git a/paper-server/nms-patches/ContainerMerchant.patch b/paper-server/nms-patches/net/minecraft/world/inventory/ContainerMerchant.patch
similarity index 100%
rename from paper-server/nms-patches/ContainerMerchant.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/ContainerMerchant.patch
diff --git a/paper-server/nms-patches/ContainerPlayer.patch b/paper-server/nms-patches/net/minecraft/world/inventory/ContainerPlayer.patch
similarity index 100%
rename from paper-server/nms-patches/ContainerPlayer.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/ContainerPlayer.patch
diff --git a/paper-server/nms-patches/ContainerShulkerBox.patch b/paper-server/nms-patches/net/minecraft/world/inventory/ContainerShulkerBox.patch
similarity index 100%
rename from paper-server/nms-patches/ContainerShulkerBox.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/ContainerShulkerBox.patch
diff --git a/paper-server/nms-patches/ContainerSmithing.patch b/paper-server/nms-patches/net/minecraft/world/inventory/ContainerSmithing.patch
similarity index 100%
rename from paper-server/nms-patches/ContainerSmithing.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/ContainerSmithing.patch
diff --git a/paper-server/nms-patches/ContainerStonecutter.patch b/paper-server/nms-patches/net/minecraft/world/inventory/ContainerStonecutter.patch
similarity index 100%
rename from paper-server/nms-patches/ContainerStonecutter.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/ContainerStonecutter.patch
diff --git a/paper-server/nms-patches/ContainerWorkbench.patch b/paper-server/nms-patches/net/minecraft/world/inventory/ContainerWorkbench.patch
similarity index 100%
rename from paper-server/nms-patches/ContainerWorkbench.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/ContainerWorkbench.patch
diff --git a/paper-server/nms-patches/Containers.patch b/paper-server/nms-patches/net/minecraft/world/inventory/Containers.patch
similarity index 100%
rename from paper-server/nms-patches/Containers.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/Containers.patch
diff --git a/paper-server/nms-patches/InventoryCraftResult.patch b/paper-server/nms-patches/net/minecraft/world/inventory/InventoryCraftResult.patch
similarity index 100%
rename from paper-server/nms-patches/InventoryCraftResult.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/InventoryCraftResult.patch
diff --git a/paper-server/nms-patches/InventoryCrafting.patch b/paper-server/nms-patches/net/minecraft/world/inventory/InventoryCrafting.patch
similarity index 100%
rename from paper-server/nms-patches/InventoryCrafting.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/InventoryCrafting.patch
diff --git a/paper-server/nms-patches/InventoryEnderChest.patch b/paper-server/nms-patches/net/minecraft/world/inventory/InventoryEnderChest.patch
similarity index 100%
rename from paper-server/nms-patches/InventoryEnderChest.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/InventoryEnderChest.patch
diff --git a/paper-server/nms-patches/InventoryMerchant.patch b/paper-server/nms-patches/net/minecraft/world/inventory/InventoryMerchant.patch
similarity index 100%
rename from paper-server/nms-patches/InventoryMerchant.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/InventoryMerchant.patch
diff --git a/paper-server/nms-patches/SlotFurnaceResult.patch b/paper-server/nms-patches/net/minecraft/world/inventory/SlotFurnaceResult.patch
similarity index 100%
rename from paper-server/nms-patches/SlotFurnaceResult.patch
rename to paper-server/nms-patches/net/minecraft/world/inventory/SlotFurnaceResult.patch
diff --git a/paper-server/nms-patches/ItemArmor.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemArmor.patch
similarity index 100%
rename from paper-server/nms-patches/ItemArmor.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemArmor.patch
diff --git a/paper-server/nms-patches/ItemArmorStand.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemArmorStand.patch
similarity index 100%
rename from paper-server/nms-patches/ItemArmorStand.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemArmorStand.patch
diff --git a/paper-server/nms-patches/ItemBlock.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemBlock.patch
similarity index 100%
rename from paper-server/nms-patches/ItemBlock.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemBlock.patch
diff --git a/paper-server/nms-patches/ItemBoat.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemBoat.patch
similarity index 100%
rename from paper-server/nms-patches/ItemBoat.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemBoat.patch
diff --git a/paper-server/nms-patches/ItemBoneMeal.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemBoneMeal.patch
similarity index 100%
rename from paper-server/nms-patches/ItemBoneMeal.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemBoneMeal.patch
diff --git a/paper-server/nms-patches/ItemBow.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemBow.patch
similarity index 100%
rename from paper-server/nms-patches/ItemBow.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemBow.patch
diff --git a/paper-server/nms-patches/ItemBucket.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemBucket.patch
similarity index 100%
rename from paper-server/nms-patches/ItemBucket.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemBucket.patch
diff --git a/paper-server/nms-patches/ItemChorusFruit.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemChorusFruit.patch
similarity index 100%
rename from paper-server/nms-patches/ItemChorusFruit.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemChorusFruit.patch
diff --git a/paper-server/nms-patches/ItemCrossbow.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemCrossbow.patch
similarity index 100%
rename from paper-server/nms-patches/ItemCrossbow.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemCrossbow.patch
diff --git a/paper-server/nms-patches/ItemDye.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemDye.patch
similarity index 100%
rename from paper-server/nms-patches/ItemDye.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemDye.patch
diff --git a/paper-server/nms-patches/ItemEgg.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemEgg.patch
similarity index 100%
rename from paper-server/nms-patches/ItemEgg.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemEgg.patch
diff --git a/paper-server/nms-patches/ItemEndCrystal.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemEndCrystal.patch
similarity index 100%
rename from paper-server/nms-patches/ItemEndCrystal.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemEndCrystal.patch
diff --git a/paper-server/nms-patches/ItemEnderEye.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemEnderEye.patch
similarity index 100%
rename from paper-server/nms-patches/ItemEnderEye.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemEnderEye.patch
diff --git a/paper-server/nms-patches/ItemEnderPearl.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemEnderPearl.patch
similarity index 100%
rename from paper-server/nms-patches/ItemEnderPearl.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemEnderPearl.patch
diff --git a/paper-server/nms-patches/ItemFireball.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemFireball.patch
similarity index 100%
rename from paper-server/nms-patches/ItemFireball.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemFireball.patch
diff --git a/paper-server/nms-patches/ItemFishingRod.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemFishingRod.patch
similarity index 100%
rename from paper-server/nms-patches/ItemFishingRod.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemFishingRod.patch
diff --git a/paper-server/nms-patches/ItemFlintAndSteel.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemFlintAndSteel.patch
similarity index 100%
rename from paper-server/nms-patches/ItemFlintAndSteel.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemFlintAndSteel.patch
diff --git a/paper-server/nms-patches/ItemHanging.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemHanging.patch
similarity index 100%
rename from paper-server/nms-patches/ItemHanging.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemHanging.patch
diff --git a/paper-server/nms-patches/ItemLeash.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemLeash.patch
similarity index 100%
rename from paper-server/nms-patches/ItemLeash.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemLeash.patch
diff --git a/paper-server/nms-patches/ItemMilkBucket.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemMilkBucket.patch
similarity index 100%
rename from paper-server/nms-patches/ItemMilkBucket.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemMilkBucket.patch
diff --git a/paper-server/nms-patches/ItemMinecart.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemMinecart.patch
similarity index 100%
rename from paper-server/nms-patches/ItemMinecart.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemMinecart.patch
diff --git a/paper-server/nms-patches/ItemMonsterEgg.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemMonsterEgg.patch
similarity index 100%
rename from paper-server/nms-patches/ItemMonsterEgg.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemMonsterEgg.patch
diff --git a/paper-server/nms-patches/ItemPotion.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemPotion.patch
similarity index 100%
rename from paper-server/nms-patches/ItemPotion.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemPotion.patch
diff --git a/paper-server/nms-patches/ItemRecord.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemRecord.patch
similarity index 100%
rename from paper-server/nms-patches/ItemRecord.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemRecord.patch
diff --git a/paper-server/nms-patches/ItemSign.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemSign.patch
similarity index 100%
rename from paper-server/nms-patches/ItemSign.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemSign.patch
diff --git a/paper-server/nms-patches/ItemSkullPlayer.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemSkullPlayer.patch
similarity index 100%
rename from paper-server/nms-patches/ItemSkullPlayer.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemSkullPlayer.patch
diff --git a/paper-server/nms-patches/ItemSnowball.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemSnowball.patch
similarity index 100%
rename from paper-server/nms-patches/ItemSnowball.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemSnowball.patch
diff --git a/paper-server/nms-patches/ItemStack.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemStack.patch
similarity index 100%
rename from paper-server/nms-patches/ItemStack.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemStack.patch
diff --git a/paper-server/nms-patches/ItemTrident.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemTrident.patch
similarity index 100%
rename from paper-server/nms-patches/ItemTrident.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemTrident.patch
diff --git a/paper-server/nms-patches/ItemWorldMap.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemWorldMap.patch
similarity index 100%
rename from paper-server/nms-patches/ItemWorldMap.patch
rename to paper-server/nms-patches/net/minecraft/world/item/ItemWorldMap.patch
diff --git a/paper-server/nms-patches/CraftingManager.patch b/paper-server/nms-patches/net/minecraft/world/item/crafting/CraftingManager.patch
similarity index 100%
rename from paper-server/nms-patches/CraftingManager.patch
rename to paper-server/nms-patches/net/minecraft/world/item/crafting/CraftingManager.patch
diff --git a/paper-server/nms-patches/FurnaceRecipe.patch b/paper-server/nms-patches/net/minecraft/world/item/crafting/FurnaceRecipe.patch
similarity index 100%
rename from paper-server/nms-patches/FurnaceRecipe.patch
rename to paper-server/nms-patches/net/minecraft/world/item/crafting/FurnaceRecipe.patch
diff --git a/paper-server/nms-patches/IRecipe.patch b/paper-server/nms-patches/net/minecraft/world/item/crafting/IRecipe.patch
similarity index 100%
rename from paper-server/nms-patches/IRecipe.patch
rename to paper-server/nms-patches/net/minecraft/world/item/crafting/IRecipe.patch
diff --git a/paper-server/nms-patches/IRecipeComplex.patch b/paper-server/nms-patches/net/minecraft/world/item/crafting/IRecipeComplex.patch
similarity index 100%
rename from paper-server/nms-patches/IRecipeComplex.patch
rename to paper-server/nms-patches/net/minecraft/world/item/crafting/IRecipeComplex.patch
diff --git a/paper-server/nms-patches/RecipeBlasting.patch b/paper-server/nms-patches/net/minecraft/world/item/crafting/RecipeBlasting.patch
similarity index 100%
rename from paper-server/nms-patches/RecipeBlasting.patch
rename to paper-server/nms-patches/net/minecraft/world/item/crafting/RecipeBlasting.patch
diff --git a/paper-server/nms-patches/RecipeCampfire.patch b/paper-server/nms-patches/net/minecraft/world/item/crafting/RecipeCampfire.patch
similarity index 100%
rename from paper-server/nms-patches/RecipeCampfire.patch
rename to paper-server/nms-patches/net/minecraft/world/item/crafting/RecipeCampfire.patch
diff --git a/paper-server/nms-patches/RecipeItemStack.patch b/paper-server/nms-patches/net/minecraft/world/item/crafting/RecipeItemStack.patch
similarity index 100%
rename from paper-server/nms-patches/RecipeItemStack.patch
rename to paper-server/nms-patches/net/minecraft/world/item/crafting/RecipeItemStack.patch
diff --git a/paper-server/nms-patches/RecipeSmithing.patch b/paper-server/nms-patches/net/minecraft/world/item/crafting/RecipeSmithing.patch
similarity index 100%
rename from paper-server/nms-patches/RecipeSmithing.patch
rename to paper-server/nms-patches/net/minecraft/world/item/crafting/RecipeSmithing.patch
diff --git a/paper-server/nms-patches/RecipeSmoking.patch b/paper-server/nms-patches/net/minecraft/world/item/crafting/RecipeSmoking.patch
similarity index 100%
rename from paper-server/nms-patches/RecipeSmoking.patch
rename to paper-server/nms-patches/net/minecraft/world/item/crafting/RecipeSmoking.patch
diff --git a/paper-server/nms-patches/RecipeStonecutting.patch b/paper-server/nms-patches/net/minecraft/world/item/crafting/RecipeStonecutting.patch
similarity index 100%
rename from paper-server/nms-patches/RecipeStonecutting.patch
rename to paper-server/nms-patches/net/minecraft/world/item/crafting/RecipeStonecutting.patch
diff --git a/paper-server/nms-patches/ShapedRecipes.patch b/paper-server/nms-patches/net/minecraft/world/item/crafting/ShapedRecipes.patch
similarity index 100%
rename from paper-server/nms-patches/ShapedRecipes.patch
rename to paper-server/nms-patches/net/minecraft/world/item/crafting/ShapedRecipes.patch
diff --git a/paper-server/nms-patches/ShapelessRecipes.patch b/paper-server/nms-patches/net/minecraft/world/item/crafting/ShapelessRecipes.patch
similarity index 100%
rename from paper-server/nms-patches/ShapelessRecipes.patch
rename to paper-server/nms-patches/net/minecraft/world/item/crafting/ShapelessRecipes.patch
diff --git a/paper-server/nms-patches/EnchantmentFrostWalker.patch b/paper-server/nms-patches/net/minecraft/world/item/enchantment/EnchantmentFrostWalker.patch
similarity index 100%
rename from paper-server/nms-patches/EnchantmentFrostWalker.patch
rename to paper-server/nms-patches/net/minecraft/world/item/enchantment/EnchantmentFrostWalker.patch
diff --git a/paper-server/nms-patches/EnchantmentWeaponDamage.patch b/paper-server/nms-patches/net/minecraft/world/item/enchantment/EnchantmentWeaponDamage.patch
similarity index 100%
rename from paper-server/nms-patches/EnchantmentWeaponDamage.patch
rename to paper-server/nms-patches/net/minecraft/world/item/enchantment/EnchantmentWeaponDamage.patch
diff --git a/paper-server/nms-patches/Enchantments.patch b/paper-server/nms-patches/net/minecraft/world/item/enchantment/Enchantments.patch
similarity index 100%
rename from paper-server/nms-patches/Enchantments.patch
rename to paper-server/nms-patches/net/minecraft/world/item/enchantment/Enchantments.patch
diff --git a/paper-server/nms-patches/IMerchant.patch b/paper-server/nms-patches/net/minecraft/world/item/trading/IMerchant.patch
similarity index 100%
rename from paper-server/nms-patches/IMerchant.patch
rename to paper-server/nms-patches/net/minecraft/world/item/trading/IMerchant.patch
diff --git a/paper-server/nms-patches/MerchantRecipe.patch b/paper-server/nms-patches/net/minecraft/world/item/trading/MerchantRecipe.patch
similarity index 100%
rename from paper-server/nms-patches/MerchantRecipe.patch
rename to paper-server/nms-patches/net/minecraft/world/item/trading/MerchantRecipe.patch
diff --git a/paper-server/nms-patches/CommandBlockListenerAbstract.patch b/paper-server/nms-patches/net/minecraft/world/level/CommandBlockListenerAbstract.patch
similarity index 100%
rename from paper-server/nms-patches/CommandBlockListenerAbstract.patch
rename to paper-server/nms-patches/net/minecraft/world/level/CommandBlockListenerAbstract.patch
diff --git a/paper-server/nms-patches/Explosion.patch b/paper-server/nms-patches/net/minecraft/world/level/Explosion.patch
similarity index 100%
rename from paper-server/nms-patches/Explosion.patch
rename to paper-server/nms-patches/net/minecraft/world/level/Explosion.patch
diff --git a/paper-server/nms-patches/GameRules.patch b/paper-server/nms-patches/net/minecraft/world/level/GameRules.patch
similarity index 100%
rename from paper-server/nms-patches/GameRules.patch
rename to paper-server/nms-patches/net/minecraft/world/level/GameRules.patch
diff --git a/paper-server/nms-patches/GeneratorAccess.patch b/paper-server/nms-patches/net/minecraft/world/level/GeneratorAccess.patch
similarity index 100%
rename from paper-server/nms-patches/GeneratorAccess.patch
rename to paper-server/nms-patches/net/minecraft/world/level/GeneratorAccess.patch
diff --git a/paper-server/nms-patches/IBlockAccess.patch b/paper-server/nms-patches/net/minecraft/world/level/IBlockAccess.patch
similarity index 100%
rename from paper-server/nms-patches/IBlockAccess.patch
rename to paper-server/nms-patches/net/minecraft/world/level/IBlockAccess.patch
diff --git a/paper-server/nms-patches/IWorldWriter.patch b/paper-server/nms-patches/net/minecraft/world/level/IWorldWriter.patch
similarity index 100%
rename from paper-server/nms-patches/IWorldWriter.patch
rename to paper-server/nms-patches/net/minecraft/world/level/IWorldWriter.patch
diff --git a/paper-server/nms-patches/MobSpawnerAbstract.patch b/paper-server/nms-patches/net/minecraft/world/level/MobSpawnerAbstract.patch
similarity index 100%
rename from paper-server/nms-patches/MobSpawnerAbstract.patch
rename to paper-server/nms-patches/net/minecraft/world/level/MobSpawnerAbstract.patch
diff --git a/paper-server/nms-patches/RayTrace.patch b/paper-server/nms-patches/net/minecraft/world/level/RayTrace.patch
similarity index 100%
rename from paper-server/nms-patches/RayTrace.patch
rename to paper-server/nms-patches/net/minecraft/world/level/RayTrace.patch
diff --git a/paper-server/nms-patches/SpawnerCreature.patch b/paper-server/nms-patches/net/minecraft/world/level/SpawnerCreature.patch
similarity index 100%
rename from paper-server/nms-patches/SpawnerCreature.patch
rename to paper-server/nms-patches/net/minecraft/world/level/SpawnerCreature.patch
diff --git a/paper-server/nms-patches/TickListServer.patch b/paper-server/nms-patches/net/minecraft/world/level/TickListServer.patch
similarity index 100%
rename from paper-server/nms-patches/TickListServer.patch
rename to paper-server/nms-patches/net/minecraft/world/level/TickListServer.patch
diff --git a/paper-server/nms-patches/World.patch b/paper-server/nms-patches/net/minecraft/world/level/World.patch
similarity index 100%
rename from paper-server/nms-patches/World.patch
rename to paper-server/nms-patches/net/minecraft/world/level/World.patch
diff --git a/paper-server/nms-patches/WorldAccess.patch b/paper-server/nms-patches/net/minecraft/world/level/WorldAccess.patch
similarity index 100%
rename from paper-server/nms-patches/WorldAccess.patch
rename to paper-server/nms-patches/net/minecraft/world/level/WorldAccess.patch
diff --git a/paper-server/nms-patches/Block.patch b/paper-server/nms-patches/net/minecraft/world/level/block/Block.patch
similarity index 100%
rename from paper-server/nms-patches/Block.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/Block.patch
diff --git a/paper-server/nms-patches/BlockBamboo.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockBamboo.patch
similarity index 100%
rename from paper-server/nms-patches/BlockBamboo.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockBamboo.patch
diff --git a/paper-server/nms-patches/BlockBambooSapling.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockBambooSapling.patch
similarity index 100%
rename from paper-server/nms-patches/BlockBambooSapling.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockBambooSapling.patch
diff --git a/paper-server/nms-patches/BlockBed.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockBed.patch
similarity index 100%
rename from paper-server/nms-patches/BlockBed.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockBed.patch
diff --git a/paper-server/nms-patches/BlockBeehive.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockBeehive.patch
similarity index 100%
rename from paper-server/nms-patches/BlockBeehive.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockBeehive.patch
diff --git a/paper-server/nms-patches/BlockButtonAbstract.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockButtonAbstract.patch
similarity index 100%
rename from paper-server/nms-patches/BlockButtonAbstract.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockButtonAbstract.patch
diff --git a/paper-server/nms-patches/BlockCactus.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockCactus.patch
similarity index 100%
rename from paper-server/nms-patches/BlockCactus.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockCactus.patch
diff --git a/paper-server/nms-patches/BlockCake.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockCake.patch
similarity index 100%
rename from paper-server/nms-patches/BlockCake.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockCake.patch
diff --git a/paper-server/nms-patches/BlockCampfire.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockCampfire.patch
similarity index 100%
rename from paper-server/nms-patches/BlockCampfire.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockCampfire.patch
diff --git a/paper-server/nms-patches/BlockCauldron.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockCauldron.patch
similarity index 100%
rename from paper-server/nms-patches/BlockCauldron.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockCauldron.patch
diff --git a/paper-server/nms-patches/BlockChest.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockChest.patch
similarity index 100%
rename from paper-server/nms-patches/BlockChest.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockChest.patch
diff --git a/paper-server/nms-patches/BlockChorusFlower.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockChorusFlower.patch
similarity index 100%
rename from paper-server/nms-patches/BlockChorusFlower.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockChorusFlower.patch
diff --git a/paper-server/nms-patches/BlockCocoa.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockCocoa.patch
similarity index 100%
rename from paper-server/nms-patches/BlockCocoa.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockCocoa.patch
diff --git a/paper-server/nms-patches/BlockCommand.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockCommand.patch
similarity index 100%
rename from paper-server/nms-patches/BlockCommand.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockCommand.patch
diff --git a/paper-server/nms-patches/BlockComposter.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockComposter.patch
similarity index 100%
rename from paper-server/nms-patches/BlockComposter.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockComposter.patch
diff --git a/paper-server/nms-patches/BlockConcretePowder.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockConcretePowder.patch
similarity index 100%
rename from paper-server/nms-patches/BlockConcretePowder.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockConcretePowder.patch
diff --git a/paper-server/nms-patches/BlockCoral.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockCoral.patch
similarity index 100%
rename from paper-server/nms-patches/BlockCoral.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockCoral.patch
diff --git a/paper-server/nms-patches/BlockCoralFan.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockCoralFan.patch
similarity index 100%
rename from paper-server/nms-patches/BlockCoralFan.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockCoralFan.patch
diff --git a/paper-server/nms-patches/BlockCoralFanWall.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockCoralFanWall.patch
similarity index 100%
rename from paper-server/nms-patches/BlockCoralFanWall.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockCoralFanWall.patch
diff --git a/paper-server/nms-patches/BlockCoralPlant.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockCoralPlant.patch
similarity index 100%
rename from paper-server/nms-patches/BlockCoralPlant.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockCoralPlant.patch
diff --git a/paper-server/nms-patches/BlockCrops.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockCrops.patch
similarity index 100%
rename from paper-server/nms-patches/BlockCrops.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockCrops.patch
diff --git a/paper-server/nms-patches/BlockDaylightDetector.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockDaylightDetector.patch
similarity index 100%
rename from paper-server/nms-patches/BlockDaylightDetector.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockDaylightDetector.patch
diff --git a/paper-server/nms-patches/BlockDiodeAbstract.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockDiodeAbstract.patch
similarity index 100%
rename from paper-server/nms-patches/BlockDiodeAbstract.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockDiodeAbstract.patch
diff --git a/paper-server/nms-patches/BlockDirtSnowSpreadable.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockDirtSnowSpreadable.patch
similarity index 100%
rename from paper-server/nms-patches/BlockDirtSnowSpreadable.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockDirtSnowSpreadable.patch
diff --git a/paper-server/nms-patches/BlockDispenser.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockDispenser.patch
similarity index 100%
rename from paper-server/nms-patches/BlockDispenser.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockDispenser.patch
diff --git a/paper-server/nms-patches/BlockDoor.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockDoor.patch
similarity index 100%
rename from paper-server/nms-patches/BlockDoor.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockDoor.patch
diff --git a/paper-server/nms-patches/BlockDragonEgg.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockDragonEgg.patch
similarity index 100%
rename from paper-server/nms-patches/BlockDragonEgg.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockDragonEgg.patch
diff --git a/paper-server/nms-patches/BlockDropper.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockDropper.patch
similarity index 100%
rename from paper-server/nms-patches/BlockDropper.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockDropper.patch
diff --git a/paper-server/nms-patches/BlockEnderPortal.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockEnderPortal.patch
similarity index 100%
rename from paper-server/nms-patches/BlockEnderPortal.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockEnderPortal.patch
diff --git a/paper-server/nms-patches/BlockFenceGate.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockFenceGate.patch
similarity index 100%
rename from paper-server/nms-patches/BlockFenceGate.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockFenceGate.patch
diff --git a/paper-server/nms-patches/BlockFire.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockFire.patch
similarity index 100%
rename from paper-server/nms-patches/BlockFire.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockFire.patch
diff --git a/paper-server/nms-patches/BlockFireAbstract.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockFireAbstract.patch
similarity index 100%
rename from paper-server/nms-patches/BlockFireAbstract.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockFireAbstract.patch
diff --git a/paper-server/nms-patches/BlockFluids.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockFluids.patch
similarity index 100%
rename from paper-server/nms-patches/BlockFluids.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockFluids.patch
diff --git a/paper-server/nms-patches/BlockFungi.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockFungi.patch
similarity index 100%
rename from paper-server/nms-patches/BlockFungi.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockFungi.patch
diff --git a/paper-server/nms-patches/BlockGrass.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockGrass.patch
similarity index 100%
rename from paper-server/nms-patches/BlockGrass.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockGrass.patch
diff --git a/paper-server/nms-patches/BlockGrassPath.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockGrassPath.patch
similarity index 100%
rename from paper-server/nms-patches/BlockGrassPath.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockGrassPath.patch
diff --git a/paper-server/nms-patches/BlockGrowingTop.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockGrowingTop.patch
similarity index 100%
rename from paper-server/nms-patches/BlockGrowingTop.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockGrowingTop.patch
diff --git a/paper-server/nms-patches/BlockIce.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockIce.patch
similarity index 100%
rename from paper-server/nms-patches/BlockIce.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockIce.patch
diff --git a/paper-server/nms-patches/BlockJukeBox.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockJukeBox.patch
similarity index 100%
rename from paper-server/nms-patches/BlockJukeBox.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockJukeBox.patch
diff --git a/paper-server/nms-patches/BlockLeaves.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockLeaves.patch
similarity index 100%
rename from paper-server/nms-patches/BlockLeaves.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockLeaves.patch
diff --git a/paper-server/nms-patches/BlockLectern.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockLectern.patch
similarity index 100%
rename from paper-server/nms-patches/BlockLectern.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockLectern.patch
diff --git a/paper-server/nms-patches/BlockLever.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockLever.patch
similarity index 100%
rename from paper-server/nms-patches/BlockLever.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockLever.patch
diff --git a/paper-server/nms-patches/BlockMagma.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockMagma.patch
similarity index 100%
rename from paper-server/nms-patches/BlockMagma.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockMagma.patch
diff --git a/paper-server/nms-patches/BlockMinecartDetector.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockMinecartDetector.patch
similarity index 100%
rename from paper-server/nms-patches/BlockMinecartDetector.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockMinecartDetector.patch
diff --git a/paper-server/nms-patches/BlockMobSpawner.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockMobSpawner.patch
similarity index 100%
rename from paper-server/nms-patches/BlockMobSpawner.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockMobSpawner.patch
diff --git a/paper-server/nms-patches/BlockMonsterEggs.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockMonsterEggs.patch
similarity index 100%
rename from paper-server/nms-patches/BlockMonsterEggs.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockMonsterEggs.patch
diff --git a/paper-server/nms-patches/BlockMushroom.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockMushroom.patch
similarity index 100%
rename from paper-server/nms-patches/BlockMushroom.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockMushroom.patch
diff --git a/paper-server/nms-patches/BlockNetherWart.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockNetherWart.patch
similarity index 100%
rename from paper-server/nms-patches/BlockNetherWart.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockNetherWart.patch
diff --git a/paper-server/nms-patches/BlockNote.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockNote.patch
similarity index 100%
rename from paper-server/nms-patches/BlockNote.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockNote.patch
diff --git a/paper-server/nms-patches/BlockObserver.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockObserver.patch
similarity index 100%
rename from paper-server/nms-patches/BlockObserver.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockObserver.patch
diff --git a/paper-server/nms-patches/BlockOre.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockOre.patch
similarity index 100%
rename from paper-server/nms-patches/BlockOre.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockOre.patch
diff --git a/paper-server/nms-patches/BlockPlant.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockPlant.patch
similarity index 100%
rename from paper-server/nms-patches/BlockPlant.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockPlant.patch
diff --git a/paper-server/nms-patches/BlockPortal.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockPortal.patch
similarity index 100%
rename from paper-server/nms-patches/BlockPortal.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockPortal.patch
diff --git a/paper-server/nms-patches/BlockPoweredRail.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockPoweredRail.patch
similarity index 100%
rename from paper-server/nms-patches/BlockPoweredRail.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockPoweredRail.patch
diff --git a/paper-server/nms-patches/BlockPressurePlateAbstract.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockPressurePlateAbstract.patch
similarity index 100%
rename from paper-server/nms-patches/BlockPressurePlateAbstract.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockPressurePlateAbstract.patch
diff --git a/paper-server/nms-patches/BlockPressurePlateBinary.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockPressurePlateBinary.patch
similarity index 100%
rename from paper-server/nms-patches/BlockPressurePlateBinary.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockPressurePlateBinary.patch
diff --git a/paper-server/nms-patches/BlockPressurePlateWeighted.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockPressurePlateWeighted.patch
similarity index 100%
rename from paper-server/nms-patches/BlockPressurePlateWeighted.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockPressurePlateWeighted.patch
diff --git a/paper-server/nms-patches/BlockPumpkinCarved.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockPumpkinCarved.patch
similarity index 100%
rename from paper-server/nms-patches/BlockPumpkinCarved.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockPumpkinCarved.patch
diff --git a/paper-server/nms-patches/BlockRedstoneComparator.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockRedstoneComparator.patch
similarity index 100%
rename from paper-server/nms-patches/BlockRedstoneComparator.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockRedstoneComparator.patch
diff --git a/paper-server/nms-patches/BlockRedstoneLamp.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockRedstoneLamp.patch
similarity index 100%
rename from paper-server/nms-patches/BlockRedstoneLamp.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockRedstoneLamp.patch
diff --git a/paper-server/nms-patches/BlockRedstoneOre.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockRedstoneOre.patch
similarity index 100%
rename from paper-server/nms-patches/BlockRedstoneOre.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockRedstoneOre.patch
diff --git a/paper-server/nms-patches/BlockRedstoneTorch.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockRedstoneTorch.patch
similarity index 100%
rename from paper-server/nms-patches/BlockRedstoneTorch.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockRedstoneTorch.patch
diff --git a/paper-server/nms-patches/BlockRedstoneWire.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockRedstoneWire.patch
similarity index 100%
rename from paper-server/nms-patches/BlockRedstoneWire.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockRedstoneWire.patch
diff --git a/paper-server/nms-patches/BlockReed.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockReed.patch
similarity index 100%
rename from paper-server/nms-patches/BlockReed.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockReed.patch
diff --git a/paper-server/nms-patches/BlockSapling.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockSapling.patch
similarity index 100%
rename from paper-server/nms-patches/BlockSapling.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockSapling.patch
diff --git a/paper-server/nms-patches/BlockScaffolding.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockScaffolding.patch
similarity index 100%
rename from paper-server/nms-patches/BlockScaffolding.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockScaffolding.patch
diff --git a/paper-server/nms-patches/BlockSnow.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockSnow.patch
similarity index 100%
rename from paper-server/nms-patches/BlockSnow.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockSnow.patch
diff --git a/paper-server/nms-patches/BlockSoil.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockSoil.patch
similarity index 100%
rename from paper-server/nms-patches/BlockSoil.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockSoil.patch
diff --git a/paper-server/nms-patches/BlockSponge.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockSponge.patch
similarity index 100%
rename from paper-server/nms-patches/BlockSponge.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockSponge.patch
diff --git a/paper-server/nms-patches/BlockStem.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockStem.patch
similarity index 100%
rename from paper-server/nms-patches/BlockStem.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockStem.patch
diff --git a/paper-server/nms-patches/BlockSweetBerryBush.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockSweetBerryBush.patch
similarity index 100%
rename from paper-server/nms-patches/BlockSweetBerryBush.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockSweetBerryBush.patch
diff --git a/paper-server/nms-patches/BlockTNT.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockTNT.patch
similarity index 100%
rename from paper-server/nms-patches/BlockTNT.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockTNT.patch
diff --git a/paper-server/nms-patches/BlockTallPlant.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockTallPlant.patch
similarity index 100%
rename from paper-server/nms-patches/BlockTallPlant.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockTallPlant.patch
diff --git a/paper-server/nms-patches/BlockTrapdoor.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockTrapdoor.patch
similarity index 100%
rename from paper-server/nms-patches/BlockTrapdoor.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockTrapdoor.patch
diff --git a/paper-server/nms-patches/BlockTripwire.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockTripwire.patch
similarity index 100%
rename from paper-server/nms-patches/BlockTripwire.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockTripwire.patch
diff --git a/paper-server/nms-patches/BlockTripwireHook.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockTripwireHook.patch
similarity index 100%
rename from paper-server/nms-patches/BlockTripwireHook.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockTripwireHook.patch
diff --git a/paper-server/nms-patches/BlockTurtleEgg.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockTurtleEgg.patch
similarity index 100%
rename from paper-server/nms-patches/BlockTurtleEgg.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockTurtleEgg.patch
diff --git a/paper-server/nms-patches/BlockVine.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockVine.patch
similarity index 100%
rename from paper-server/nms-patches/BlockVine.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockVine.patch
diff --git a/paper-server/nms-patches/BlockWaterLily.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockWaterLily.patch
similarity index 100%
rename from paper-server/nms-patches/BlockWaterLily.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockWaterLily.patch
diff --git a/paper-server/nms-patches/BlockWitherRose.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockWitherRose.patch
similarity index 100%
rename from paper-server/nms-patches/BlockWitherRose.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockWitherRose.patch
diff --git a/paper-server/nms-patches/BlockWitherSkull.patch b/paper-server/nms-patches/net/minecraft/world/level/block/BlockWitherSkull.patch
similarity index 100%
rename from paper-server/nms-patches/BlockWitherSkull.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/BlockWitherSkull.patch
diff --git a/paper-server/nms-patches/TileEntity.patch b/paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntity.patch
similarity index 100%
rename from paper-server/nms-patches/TileEntity.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntity.patch
diff --git a/paper-server/nms-patches/TileEntityBanner.patch b/paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityBanner.patch
similarity index 100%
rename from paper-server/nms-patches/TileEntityBanner.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityBanner.patch
diff --git a/paper-server/nms-patches/TileEntityBarrel.patch b/paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityBarrel.patch
similarity index 100%
rename from paper-server/nms-patches/TileEntityBarrel.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityBarrel.patch
diff --git a/paper-server/nms-patches/TileEntityBeacon.patch b/paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityBeacon.patch
similarity index 100%
rename from paper-server/nms-patches/TileEntityBeacon.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityBeacon.patch
diff --git a/paper-server/nms-patches/TileEntityBeehive.patch b/paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityBeehive.patch
similarity index 100%
rename from paper-server/nms-patches/TileEntityBeehive.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityBeehive.patch
diff --git a/paper-server/nms-patches/TileEntityBrewingStand.patch b/paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityBrewingStand.patch
similarity index 100%
rename from paper-server/nms-patches/TileEntityBrewingStand.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityBrewingStand.patch
diff --git a/paper-server/nms-patches/TileEntityCampfire.patch b/paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityCampfire.patch
similarity index 100%
rename from paper-server/nms-patches/TileEntityCampfire.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityCampfire.patch
diff --git a/paper-server/nms-patches/TileEntityChest.patch b/paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityChest.patch
similarity index 100%
rename from paper-server/nms-patches/TileEntityChest.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityChest.patch
diff --git a/paper-server/nms-patches/TileEntityCommand.patch b/paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityCommand.patch
similarity index 100%
rename from paper-server/nms-patches/TileEntityCommand.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityCommand.patch
diff --git a/paper-server/nms-patches/TileEntityConduit.patch b/paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityConduit.patch
similarity index 100%
rename from paper-server/nms-patches/TileEntityConduit.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityConduit.patch
diff --git a/paper-server/nms-patches/TileEntityContainer.patch b/paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityContainer.patch
similarity index 100%
rename from paper-server/nms-patches/TileEntityContainer.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityContainer.patch
diff --git a/paper-server/nms-patches/TileEntityDispenser.patch b/paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityDispenser.patch
similarity index 100%
rename from paper-server/nms-patches/TileEntityDispenser.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityDispenser.patch
diff --git a/paper-server/nms-patches/TileEntityEndGateway.patch b/paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityEndGateway.patch
similarity index 100%
rename from paper-server/nms-patches/TileEntityEndGateway.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityEndGateway.patch
diff --git a/paper-server/nms-patches/TileEntityFurnace.patch b/paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityFurnace.patch
similarity index 100%
rename from paper-server/nms-patches/TileEntityFurnace.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityFurnace.patch
diff --git a/paper-server/nms-patches/TileEntityHopper.patch b/paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityHopper.patch
similarity index 100%
rename from paper-server/nms-patches/TileEntityHopper.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityHopper.patch
diff --git a/paper-server/nms-patches/TileEntityLectern.patch b/paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityLectern.patch
similarity index 100%
rename from paper-server/nms-patches/TileEntityLectern.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityLectern.patch
diff --git a/paper-server/nms-patches/TileEntityShulkerBox.patch b/paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityShulkerBox.patch
similarity index 100%
rename from paper-server/nms-patches/TileEntityShulkerBox.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntityShulkerBox.patch
diff --git a/paper-server/nms-patches/TileEntitySign.patch b/paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntitySign.patch
similarity index 100%
rename from paper-server/nms-patches/TileEntitySign.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntitySign.patch
diff --git a/paper-server/nms-patches/WorldGenMegaTreeProvider.patch b/paper-server/nms-patches/net/minecraft/world/level/block/grower/WorldGenMegaTreeProvider.patch
similarity index 100%
rename from paper-server/nms-patches/WorldGenMegaTreeProvider.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/grower/WorldGenMegaTreeProvider.patch
diff --git a/paper-server/nms-patches/WorldGenTreeProvider.patch b/paper-server/nms-patches/net/minecraft/world/level/block/grower/WorldGenTreeProvider.patch
similarity index 100%
rename from paper-server/nms-patches/WorldGenTreeProvider.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/grower/WorldGenTreeProvider.patch
diff --git a/paper-server/nms-patches/BlockPiston.patch b/paper-server/nms-patches/net/minecraft/world/level/block/piston/BlockPiston.patch
similarity index 100%
rename from paper-server/nms-patches/BlockPiston.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/piston/BlockPiston.patch
diff --git a/paper-server/nms-patches/BlockStateInteger.patch b/paper-server/nms-patches/net/minecraft/world/level/block/state/properties/BlockStateInteger.patch
similarity index 100%
rename from paper-server/nms-patches/BlockStateInteger.patch
rename to paper-server/nms-patches/net/minecraft/world/level/block/state/properties/BlockStateInteger.patch
diff --git a/paper-server/nms-patches/WorldBorder.patch b/paper-server/nms-patches/net/minecraft/world/level/border/WorldBorder.patch
similarity index 100%
rename from paper-server/nms-patches/WorldBorder.patch
rename to paper-server/nms-patches/net/minecraft/world/level/border/WorldBorder.patch
diff --git a/paper-server/nms-patches/BiomeStorage.patch b/paper-server/nms-patches/net/minecraft/world/level/chunk/BiomeStorage.patch
similarity index 100%
rename from paper-server/nms-patches/BiomeStorage.patch
rename to paper-server/nms-patches/net/minecraft/world/level/chunk/BiomeStorage.patch
diff --git a/paper-server/nms-patches/Chunk.patch b/paper-server/nms-patches/net/minecraft/world/level/chunk/Chunk.patch
similarity index 100%
rename from paper-server/nms-patches/Chunk.patch
rename to paper-server/nms-patches/net/minecraft/world/level/chunk/Chunk.patch
diff --git a/paper-server/nms-patches/ChunkGenerator.patch b/paper-server/nms-patches/net/minecraft/world/level/chunk/ChunkGenerator.patch
similarity index 100%
rename from paper-server/nms-patches/ChunkGenerator.patch
rename to paper-server/nms-patches/net/minecraft/world/level/chunk/ChunkGenerator.patch
diff --git a/paper-server/nms-patches/ChunkStatus.patch b/paper-server/nms-patches/net/minecraft/world/level/chunk/ChunkStatus.patch
similarity index 100%
rename from paper-server/nms-patches/ChunkStatus.patch
rename to paper-server/nms-patches/net/minecraft/world/level/chunk/ChunkStatus.patch
diff --git a/paper-server/nms-patches/ChunkRegionLoader.patch b/paper-server/nms-patches/net/minecraft/world/level/chunk/storage/ChunkRegionLoader.patch
similarity index 100%
rename from paper-server/nms-patches/ChunkRegionLoader.patch
rename to paper-server/nms-patches/net/minecraft/world/level/chunk/storage/ChunkRegionLoader.patch
diff --git a/paper-server/nms-patches/IChunkLoader.patch b/paper-server/nms-patches/net/minecraft/world/level/chunk/storage/IChunkLoader.patch
similarity index 100%
rename from paper-server/nms-patches/IChunkLoader.patch
rename to paper-server/nms-patches/net/minecraft/world/level/chunk/storage/IChunkLoader.patch
diff --git a/paper-server/nms-patches/RegionFileCache.patch b/paper-server/nms-patches/net/minecraft/world/level/chunk/storage/RegionFileCache.patch
similarity index 100%
rename from paper-server/nms-patches/RegionFileCache.patch
rename to paper-server/nms-patches/net/minecraft/world/level/chunk/storage/RegionFileCache.patch
diff --git a/paper-server/nms-patches/ChunkGeneratorAbstract.patch b/paper-server/nms-patches/net/minecraft/world/level/levelgen/ChunkGeneratorAbstract.patch
similarity index 100%
rename from paper-server/nms-patches/ChunkGeneratorAbstract.patch
rename to paper-server/nms-patches/net/minecraft/world/level/levelgen/ChunkGeneratorAbstract.patch
diff --git a/paper-server/nms-patches/MobSpawnerPatrol.patch b/paper-server/nms-patches/net/minecraft/world/level/levelgen/MobSpawnerPatrol.patch
similarity index 100%
rename from paper-server/nms-patches/MobSpawnerPatrol.patch
rename to paper-server/nms-patches/net/minecraft/world/level/levelgen/MobSpawnerPatrol.patch
diff --git a/paper-server/nms-patches/MobSpawnerPhantom.patch b/paper-server/nms-patches/net/minecraft/world/level/levelgen/MobSpawnerPhantom.patch
similarity index 100%
rename from paper-server/nms-patches/MobSpawnerPhantom.patch
rename to paper-server/nms-patches/net/minecraft/world/level/levelgen/MobSpawnerPhantom.patch
diff --git a/paper-server/nms-patches/PersistentStructureLegacy.patch b/paper-server/nms-patches/net/minecraft/world/level/levelgen/structure/PersistentStructureLegacy.patch
similarity index 100%
rename from paper-server/nms-patches/PersistentStructureLegacy.patch
rename to paper-server/nms-patches/net/minecraft/world/level/levelgen/structure/PersistentStructureLegacy.patch
diff --git a/paper-server/nms-patches/WorldGenWitchHut.patch b/paper-server/nms-patches/net/minecraft/world/level/levelgen/structure/WorldGenWitchHut.patch
similarity index 100%
rename from paper-server/nms-patches/WorldGenWitchHut.patch
rename to paper-server/nms-patches/net/minecraft/world/level/levelgen/structure/WorldGenWitchHut.patch
diff --git a/paper-server/nms-patches/DefinedStructure.patch b/paper-server/nms-patches/net/minecraft/world/level/levelgen/structure/templatesystem/DefinedStructure.patch
similarity index 100%
rename from paper-server/nms-patches/DefinedStructure.patch
rename to paper-server/nms-patches/net/minecraft/world/level/levelgen/structure/templatesystem/DefinedStructure.patch
diff --git a/paper-server/nms-patches/DefinedStructureManager.patch b/paper-server/nms-patches/net/minecraft/world/level/levelgen/structure/templatesystem/DefinedStructureManager.patch
similarity index 100%
rename from paper-server/nms-patches/DefinedStructureManager.patch
rename to paper-server/nms-patches/net/minecraft/world/level/levelgen/structure/templatesystem/DefinedStructureManager.patch
diff --git a/paper-server/nms-patches/FluidTypeFlowing.patch b/paper-server/nms-patches/net/minecraft/world/level/material/FluidTypeFlowing.patch
similarity index 100%
rename from paper-server/nms-patches/FluidTypeFlowing.patch
rename to paper-server/nms-patches/net/minecraft/world/level/material/FluidTypeFlowing.patch
diff --git a/paper-server/nms-patches/FluidTypeLava.patch b/paper-server/nms-patches/net/minecraft/world/level/material/FluidTypeLava.patch
similarity index 100%
rename from paper-server/nms-patches/FluidTypeLava.patch
rename to paper-server/nms-patches/net/minecraft/world/level/material/FluidTypeLava.patch
diff --git a/paper-server/nms-patches/BlockPortalShape.patch b/paper-server/nms-patches/net/minecraft/world/level/portal/BlockPortalShape.patch
similarity index 100%
rename from paper-server/nms-patches/BlockPortalShape.patch
rename to paper-server/nms-patches/net/minecraft/world/level/portal/BlockPortalShape.patch
diff --git a/paper-server/nms-patches/PortalTravelAgent.patch b/paper-server/nms-patches/net/minecraft/world/level/portal/PortalTravelAgent.patch
similarity index 100%
rename from paper-server/nms-patches/PortalTravelAgent.patch
rename to paper-server/nms-patches/net/minecraft/world/level/portal/PortalTravelAgent.patch
diff --git a/paper-server/nms-patches/ShapeDetectorShape.patch b/paper-server/nms-patches/net/minecraft/world/level/portal/ShapeDetectorShape.patch
similarity index 100%
rename from paper-server/nms-patches/ShapeDetectorShape.patch
rename to paper-server/nms-patches/net/minecraft/world/level/portal/ShapeDetectorShape.patch
diff --git a/paper-server/nms-patches/WorldMap.patch b/paper-server/nms-patches/net/minecraft/world/level/saveddata/maps/WorldMap.patch
similarity index 100%
rename from paper-server/nms-patches/WorldMap.patch
rename to paper-server/nms-patches/net/minecraft/world/level/saveddata/maps/WorldMap.patch
diff --git a/paper-server/nms-patches/Convertable.patch b/paper-server/nms-patches/net/minecraft/world/level/storage/Convertable.patch
similarity index 100%
rename from paper-server/nms-patches/Convertable.patch
rename to paper-server/nms-patches/net/minecraft/world/level/storage/Convertable.patch
diff --git a/paper-server/nms-patches/WorldDataServer.patch b/paper-server/nms-patches/net/minecraft/world/level/storage/WorldDataServer.patch
similarity index 100%
rename from paper-server/nms-patches/WorldDataServer.patch
rename to paper-server/nms-patches/net/minecraft/world/level/storage/WorldDataServer.patch
diff --git a/paper-server/nms-patches/WorldNBTStorage.patch b/paper-server/nms-patches/net/minecraft/world/level/storage/WorldNBTStorage.patch
similarity index 100%
rename from paper-server/nms-patches/WorldNBTStorage.patch
rename to paper-server/nms-patches/net/minecraft/world/level/storage/WorldNBTStorage.patch
diff --git a/paper-server/nms-patches/LootTable.patch b/paper-server/nms-patches/net/minecraft/world/level/storage/loot/LootTable.patch
similarity index 100%
rename from paper-server/nms-patches/LootTable.patch
rename to paper-server/nms-patches/net/minecraft/world/level/storage/loot/LootTable.patch
diff --git a/paper-server/nms-patches/LootTableRegistry.patch b/paper-server/nms-patches/net/minecraft/world/level/storage/loot/LootTableRegistry.patch
similarity index 100%
rename from paper-server/nms-patches/LootTableRegistry.patch
rename to paper-server/nms-patches/net/minecraft/world/level/storage/loot/LootTableRegistry.patch
diff --git a/paper-server/nms-patches/LootEntryAbstract.patch b/paper-server/nms-patches/net/minecraft/world/level/storage/loot/entries/LootEntryAbstract.patch
similarity index 100%
rename from paper-server/nms-patches/LootEntryAbstract.patch
rename to paper-server/nms-patches/net/minecraft/world/level/storage/loot/entries/LootEntryAbstract.patch
diff --git a/paper-server/nms-patches/LootEnchantFunction.patch b/paper-server/nms-patches/net/minecraft/world/level/storage/loot/functions/LootEnchantFunction.patch
similarity index 100%
rename from paper-server/nms-patches/LootEnchantFunction.patch
rename to paper-server/nms-patches/net/minecraft/world/level/storage/loot/functions/LootEnchantFunction.patch
diff --git a/paper-server/nms-patches/LootContextParameters.patch b/paper-server/nms-patches/net/minecraft/world/level/storage/loot/parameters/LootContextParameters.patch
similarity index 100%
rename from paper-server/nms-patches/LootContextParameters.patch
rename to paper-server/nms-patches/net/minecraft/world/level/storage/loot/parameters/LootContextParameters.patch
diff --git a/paper-server/nms-patches/LootItemConditionRandomChanceWithLooting.patch b/paper-server/nms-patches/net/minecraft/world/level/storage/loot/predicates/LootItemConditionRandomChanceWithLooting.patch
similarity index 100%
rename from paper-server/nms-patches/LootItemConditionRandomChanceWithLooting.patch
rename to paper-server/nms-patches/net/minecraft/world/level/storage/loot/predicates/LootItemConditionRandomChanceWithLooting.patch
diff --git a/paper-server/nms-patches/LootItemConditionSurvivesExplosion.patch b/paper-server/nms-patches/net/minecraft/world/level/storage/loot/predicates/LootItemConditionSurvivesExplosion.patch
similarity index 100%
rename from paper-server/nms-patches/LootItemConditionSurvivesExplosion.patch
rename to paper-server/nms-patches/net/minecraft/world/level/storage/loot/predicates/LootItemConditionSurvivesExplosion.patch