diff --git a/build.gradle b/build.gradle
index 503a797..1abf58d 100755
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.4-SNAPSHOT'
+	id 'fabric-loom' version '1.6-SNAPSHOT'
 	id 'maven-publish'
 }
 
diff --git a/gradle.properties b/gradle.properties
index 34ee77e..b87d4b4 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,9 +4,9 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.19.2
-yarn_mappings=1.19.2+build.28
-loader_version=0.14.23
+minecraft_version=1.21
+yarn_mappings=1.21+build.9
+loader_version=0.15.11
 
 # Mod Properties
 mod_version=1.0.4
@@ -14,4 +14,4 @@ maven_group=modchest
 archives_base_name=reservermod
 
 # Dependencies
-fabric_version=0.76.1+1.19.2
+fabric_version=0.100.7+1.21
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1af9e09..a80b22c 100755
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/client/java/modchest/REServerModClient.java b/old-src/client/java/modchest/REServerModClient.java
similarity index 100%
rename from src/client/java/modchest/REServerModClient.java
rename to old-src/client/java/modchest/REServerModClient.java
diff --git a/src/client/java/modchest/mixin/client/DeathScreen.java b/old-src/client/java/modchest/mixin/client/DeathScreen.java
similarity index 100%
rename from src/client/java/modchest/mixin/client/DeathScreen.java
rename to old-src/client/java/modchest/mixin/client/DeathScreen.java
diff --git a/src/client/java/modchest/mixin/client/SleepingChatScreen.java b/old-src/client/java/modchest/mixin/client/SleepingChatScreen.java
similarity index 100%
rename from src/client/java/modchest/mixin/client/SleepingChatScreen.java
rename to old-src/client/java/modchest/mixin/client/SleepingChatScreen.java
diff --git a/src/client/java/modchest/networking/modNetworkingClient.java b/old-src/client/java/modchest/networking/modNetworkingClient.java
similarity index 100%
rename from src/client/java/modchest/networking/modNetworkingClient.java
rename to old-src/client/java/modchest/networking/modNetworkingClient.java
diff --git a/src/client/java/modchest/networking/packet/respawnRequestS2CPacket.java b/old-src/client/java/modchest/networking/packet/respawnRequestS2CPacket.java
similarity index 100%
rename from src/client/java/modchest/networking/packet/respawnRequestS2CPacket.java
rename to old-src/client/java/modchest/networking/packet/respawnRequestS2CPacket.java
diff --git a/src/client/resources/reservermod.client.mixins.json b/old-src/client/resources/reservermod.client.mixins.json
similarity index 100%
rename from src/client/resources/reservermod.client.mixins.json
rename to old-src/client/resources/reservermod.client.mixins.json
diff --git a/src/documentation/Development b/old-src/documentation/Development
similarity index 100%
rename from src/documentation/Development
rename to old-src/documentation/Development
diff --git a/src/documentation/Documentation b/old-src/documentation/Documentation
similarity index 100%
rename from src/documentation/Documentation
rename to old-src/documentation/Documentation
diff --git a/src/documentation/Features b/old-src/documentation/Features
similarity index 100%
rename from src/documentation/Features
rename to old-src/documentation/Features
diff --git a/remappedSrc/modchest/REServerMod.java b/old-src/main/java/modchest/REServerMod.java
old mode 100644
new mode 100755
similarity index 100%
rename from remappedSrc/modchest/REServerMod.java
rename to old-src/main/java/modchest/REServerMod.java
diff --git a/remappedSrc/modchest/REServerModDataGenerator.java b/old-src/main/java/modchest/REServerModDataGenerator.java
old mode 100644
new mode 100755
similarity index 100%
rename from remappedSrc/modchest/REServerModDataGenerator.java
rename to old-src/main/java/modchest/REServerModDataGenerator.java
diff --git a/src/main/java/modchest/block/custom/steeringWheelBlock.java b/old-src/main/java/modchest/block/custom/steeringWheelBlock.java
similarity index 100%
rename from src/main/java/modchest/block/custom/steeringWheelBlock.java
rename to old-src/main/java/modchest/block/custom/steeringWheelBlock.java
diff --git a/remappedSrc/modchest/block/entity/ImplementedInventory.java b/old-src/main/java/modchest/block/entity/ImplementedInventory.java
old mode 100644
new mode 100755
similarity index 100%
rename from remappedSrc/modchest/block/entity/ImplementedInventory.java
rename to old-src/main/java/modchest/block/entity/ImplementedInventory.java
diff --git a/src/main/java/modchest/block/entity/modBlockEntities.java b/old-src/main/java/modchest/block/entity/modBlockEntities.java
similarity index 100%
rename from src/main/java/modchest/block/entity/modBlockEntities.java
rename to old-src/main/java/modchest/block/entity/modBlockEntities.java
diff --git a/remappedSrc/modchest/block/entity/steeringWheelEntity.java b/old-src/main/java/modchest/block/entity/steeringWheelEntity.java
old mode 100644
new mode 100755
similarity index 100%
rename from remappedSrc/modchest/block/entity/steeringWheelEntity.java
rename to old-src/main/java/modchest/block/entity/steeringWheelEntity.java
diff --git a/src/main/java/modchest/block/modBlocks.java b/old-src/main/java/modchest/block/modBlocks.java
similarity index 100%
rename from src/main/java/modchest/block/modBlocks.java
rename to old-src/main/java/modchest/block/modBlocks.java
diff --git a/remappedSrc/modchest/data/ModLootTableGenerator.java b/old-src/main/java/modchest/data/ModLootTableGenerator.java
old mode 100644
new mode 100755
similarity index 100%
rename from remappedSrc/modchest/data/ModLootTableGenerator.java
rename to old-src/main/java/modchest/data/ModLootTableGenerator.java
diff --git a/remappedSrc/modchest/data/ModModelProvider.java b/old-src/main/java/modchest/data/ModModelProvider.java
old mode 100644
new mode 100755
similarity index 100%
rename from remappedSrc/modchest/data/ModModelProvider.java
rename to old-src/main/java/modchest/data/ModModelProvider.java
diff --git a/remappedSrc/modchest/data/ModRecipeGenerator.java b/old-src/main/java/modchest/data/ModRecipeGenerator.java
old mode 100644
new mode 100755
similarity index 100%
rename from remappedSrc/modchest/data/ModRecipeGenerator.java
rename to old-src/main/java/modchest/data/ModRecipeGenerator.java
diff --git a/remappedSrc/modchest/data/ModWorldGenerator.java b/old-src/main/java/modchest/data/ModWorldGenerator.java
old mode 100644
new mode 100755
similarity index 100%
rename from remappedSrc/modchest/data/ModWorldGenerator.java
rename to old-src/main/java/modchest/data/ModWorldGenerator.java
diff --git a/src/main/java/modchest/event/playerAfterRespawnEvent.java b/old-src/main/java/modchest/event/playerAfterRespawnEvent.java
similarity index 100%
rename from src/main/java/modchest/event/playerAfterRespawnEvent.java
rename to old-src/main/java/modchest/event/playerAfterRespawnEvent.java
diff --git a/remappedSrc/modchest/item/custom/piratesCoinItem.java b/old-src/main/java/modchest/item/custom/piratesCoinItem.java
old mode 100644
new mode 100755
similarity index 100%
rename from remappedSrc/modchest/item/custom/piratesCoinItem.java
rename to old-src/main/java/modchest/item/custom/piratesCoinItem.java
diff --git a/remappedSrc/modchest/item/modItemGroup.java b/old-src/main/java/modchest/item/modItemGroup.java
old mode 100644
new mode 100755
similarity index 100%
rename from remappedSrc/modchest/item/modItemGroup.java
rename to old-src/main/java/modchest/item/modItemGroup.java
diff --git a/src/main/java/modchest/item/modItems.java b/old-src/main/java/modchest/item/modItems.java
similarity index 100%
rename from src/main/java/modchest/item/modItems.java
rename to old-src/main/java/modchest/item/modItems.java
diff --git a/remappedSrc/modchest/mixin/ServerPlayerEntityMixin.java b/old-src/main/java/modchest/mixin/ServerPlayerEntityMixin.java
old mode 100644
new mode 100755
similarity index 100%
rename from remappedSrc/modchest/mixin/ServerPlayerEntityMixin.java
rename to old-src/main/java/modchest/mixin/ServerPlayerEntityMixin.java
diff --git a/remappedSrc/modchest/mixin/bedBlock.java b/old-src/main/java/modchest/mixin/bedBlock.java
old mode 100644
new mode 100755
similarity index 100%
rename from remappedSrc/modchest/mixin/bedBlock.java
rename to old-src/main/java/modchest/mixin/bedBlock.java
diff --git a/remappedSrc/modchest/networking/modNetworkingServer.java b/old-src/main/java/modchest/networking/modNetworkingServer.java
old mode 100644
new mode 100755
similarity index 100%
rename from remappedSrc/modchest/networking/modNetworkingServer.java
rename to old-src/main/java/modchest/networking/modNetworkingServer.java
diff --git a/src/main/java/modchest/networking/packet/deathScreenMultiButtonsC2SPacket.java b/old-src/main/java/modchest/networking/packet/deathScreenMultiButtonsC2SPacket.java
similarity index 100%
rename from src/main/java/modchest/networking/packet/deathScreenMultiButtonsC2SPacket.java
rename to old-src/main/java/modchest/networking/packet/deathScreenMultiButtonsC2SPacket.java
diff --git a/remappedSrc/modchest/networking/packet/setNewRespawnsC2SPacket.java b/old-src/main/java/modchest/networking/packet/setNewRespawnsC2SPacket.java
old mode 100644
new mode 100755
similarity index 100%
rename from remappedSrc/modchest/networking/packet/setNewRespawnsC2SPacket.java
rename to old-src/main/java/modchest/networking/packet/setNewRespawnsC2SPacket.java
diff --git a/remappedSrc/modchest/util/ServerPlayerEntityInterface.java b/old-src/main/java/modchest/util/ServerPlayerEntityInterface.java
old mode 100644
new mode 100755
similarity index 100%
rename from remappedSrc/modchest/util/ServerPlayerEntityInterface.java
rename to old-src/main/java/modchest/util/ServerPlayerEntityInterface.java
diff --git a/remappedSrc/modchest/util/initializer.java b/old-src/main/java/modchest/util/initializer.java
old mode 100644
new mode 100755
similarity index 100%
rename from remappedSrc/modchest/util/initializer.java
rename to old-src/main/java/modchest/util/initializer.java
diff --git a/src/main/java/modchest/util/setAndGetMultiButtonsSpawn.java b/old-src/main/java/modchest/util/setAndGetMultiButtonsSpawn.java
similarity index 100%
rename from src/main/java/modchest/util/setAndGetMultiButtonsSpawn.java
rename to old-src/main/java/modchest/util/setAndGetMultiButtonsSpawn.java
diff --git a/src/main/resources/assets/modchest/blockstates/steering_wheel.json b/old-src/main/resources/assets/modchest/blockstates/steering_wheel.json
similarity index 100%
rename from src/main/resources/assets/modchest/blockstates/steering_wheel.json
rename to old-src/main/resources/assets/modchest/blockstates/steering_wheel.json
diff --git a/src/main/resources/assets/modchest/icon.png b/old-src/main/resources/assets/modchest/icon.png
similarity index 100%
rename from src/main/resources/assets/modchest/icon.png
rename to old-src/main/resources/assets/modchest/icon.png
diff --git a/src/main/resources/assets/modchest/icon.png.old b/old-src/main/resources/assets/modchest/icon.png.old
similarity index 100%
rename from src/main/resources/assets/modchest/icon.png.old
rename to old-src/main/resources/assets/modchest/icon.png.old
diff --git a/src/main/resources/assets/modchest/lang/de_de.json b/old-src/main/resources/assets/modchest/lang/de_de.json
similarity index 100%
rename from src/main/resources/assets/modchest/lang/de_de.json
rename to old-src/main/resources/assets/modchest/lang/de_de.json
diff --git a/src/main/resources/assets/modchest/lang/en_pt.json b/old-src/main/resources/assets/modchest/lang/en_pt.json
similarity index 100%
rename from src/main/resources/assets/modchest/lang/en_pt.json
rename to old-src/main/resources/assets/modchest/lang/en_pt.json
diff --git a/src/main/resources/assets/modchest/lang/en_us.json b/old-src/main/resources/assets/modchest/lang/en_us.json
similarity index 100%
rename from src/main/resources/assets/modchest/lang/en_us.json
rename to old-src/main/resources/assets/modchest/lang/en_us.json
diff --git a/src/main/resources/assets/modchest/models/block/steering_wheel.json b/old-src/main/resources/assets/modchest/models/block/steering_wheel.json
similarity index 100%
rename from src/main/resources/assets/modchest/models/block/steering_wheel.json
rename to old-src/main/resources/assets/modchest/models/block/steering_wheel.json
diff --git a/src/main/resources/assets/modchest/models/item/pirates_coin.json b/old-src/main/resources/assets/modchest/models/item/pirates_coin.json
similarity index 100%
rename from src/main/resources/assets/modchest/models/item/pirates_coin.json
rename to old-src/main/resources/assets/modchest/models/item/pirates_coin.json
diff --git a/src/main/resources/assets/modchest/models/item/shipblock.json b/old-src/main/resources/assets/modchest/models/item/shipblock.json
similarity index 100%
rename from src/main/resources/assets/modchest/models/item/shipblock.json
rename to old-src/main/resources/assets/modchest/models/item/shipblock.json
diff --git a/src/main/resources/assets/modchest/models/item/steering_wheel.json b/old-src/main/resources/assets/modchest/models/item/steering_wheel.json
similarity index 100%
rename from src/main/resources/assets/modchest/models/item/steering_wheel.json
rename to old-src/main/resources/assets/modchest/models/item/steering_wheel.json
diff --git a/src/main/resources/assets/modchest/textures/item/pirates_coin.png b/old-src/main/resources/assets/modchest/textures/item/pirates_coin.png
similarity index 100%
rename from src/main/resources/assets/modchest/textures/item/pirates_coin.png
rename to old-src/main/resources/assets/modchest/textures/item/pirates_coin.png
diff --git a/src/main/resources/data/icon.png b/old-src/main/resources/data/icon.png
similarity index 100%
rename from src/main/resources/data/icon.png
rename to old-src/main/resources/data/icon.png
diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json b/old-src/main/resources/data/minecraft/tags/blocks/mineable/axe.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/blocks/mineable/axe.json
rename to old-src/main/resources/data/minecraft/tags/blocks/mineable/axe.json
diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json b/old-src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json
rename to old-src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json
diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/old-src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
rename to old-src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json b/old-src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json
rename to old-src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json
diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json b/old-src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json
rename to old-src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json
diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/old-src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json
rename to old-src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json
diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json b/old-src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json
rename to old-src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json
diff --git a/src/main/resources/data/modchest/loot_tables/blocks/steering_wheel.json b/old-src/main/resources/data/modchest/loot_tables/blocks/steering_wheel.json
similarity index 100%
rename from src/main/resources/data/modchest/loot_tables/blocks/steering_wheel.json
rename to old-src/main/resources/data/modchest/loot_tables/blocks/steering_wheel.json
diff --git a/src/main/resources/data/modchest/recipes/pirates_coin.json b/old-src/main/resources/data/modchest/recipes/pirates_coin.json
similarity index 100%
rename from src/main/resources/data/modchest/recipes/pirates_coin.json
rename to old-src/main/resources/data/modchest/recipes/pirates_coin.json
diff --git a/src/main/resources/data/modchest/recipes/shipblock.json b/old-src/main/resources/data/modchest/recipes/shipblock.json
similarity index 100%
rename from src/main/resources/data/modchest/recipes/shipblock.json
rename to old-src/main/resources/data/modchest/recipes/shipblock.json
diff --git a/src/main/resources/data/modchest/recipes/steering_wheel.json b/old-src/main/resources/data/modchest/recipes/steering_wheel.json
similarity index 100%
rename from src/main/resources/data/modchest/recipes/steering_wheel.json
rename to old-src/main/resources/data/modchest/recipes/steering_wheel.json
diff --git a/src/main/resources/fabric.mod.json b/old-src/main/resources/fabric.mod.json
similarity index 100%
rename from src/main/resources/fabric.mod.json
rename to old-src/main/resources/fabric.mod.json
diff --git a/src/main/resources/reservermod.mixins.json b/old-src/main/resources/reservermod.mixins.json
similarity index 100%
rename from src/main/resources/reservermod.mixins.json
rename to old-src/main/resources/reservermod.mixins.json
diff --git a/src/main/java/modchest/REServerMod.java b/src/modchest/REServerMod.java
old mode 100755
new mode 100644
similarity index 100%
rename from src/main/java/modchest/REServerMod.java
rename to src/modchest/REServerMod.java
diff --git a/src/main/java/modchest/REServerModDataGenerator.java b/src/modchest/REServerModDataGenerator.java
old mode 100755
new mode 100644
similarity index 100%
rename from src/main/java/modchest/REServerModDataGenerator.java
rename to src/modchest/REServerModDataGenerator.java
diff --git a/remappedSrc/modchest/block/custom/steeringWheelBlock.java b/src/modchest/block/custom/steeringWheelBlock.java
similarity index 100%
rename from remappedSrc/modchest/block/custom/steeringWheelBlock.java
rename to src/modchest/block/custom/steeringWheelBlock.java
diff --git a/src/main/java/modchest/block/entity/ImplementedInventory.java b/src/modchest/block/entity/ImplementedInventory.java
old mode 100755
new mode 100644
similarity index 100%
rename from src/main/java/modchest/block/entity/ImplementedInventory.java
rename to src/modchest/block/entity/ImplementedInventory.java
diff --git a/remappedSrc/modchest/block/entity/modBlockEntities.java b/src/modchest/block/entity/modBlockEntities.java
similarity index 100%
rename from remappedSrc/modchest/block/entity/modBlockEntities.java
rename to src/modchest/block/entity/modBlockEntities.java
diff --git a/src/main/java/modchest/block/entity/steeringWheelEntity.java b/src/modchest/block/entity/steeringWheelEntity.java
old mode 100755
new mode 100644
similarity index 100%
rename from src/main/java/modchest/block/entity/steeringWheelEntity.java
rename to src/modchest/block/entity/steeringWheelEntity.java
diff --git a/remappedSrc/modchest/block/modBlocks.java b/src/modchest/block/modBlocks.java
similarity index 100%
rename from remappedSrc/modchest/block/modBlocks.java
rename to src/modchest/block/modBlocks.java
diff --git a/src/main/java/modchest/data/ModLootTableGenerator.java b/src/modchest/data/ModLootTableGenerator.java
old mode 100755
new mode 100644
similarity index 100%
rename from src/main/java/modchest/data/ModLootTableGenerator.java
rename to src/modchest/data/ModLootTableGenerator.java
diff --git a/src/main/java/modchest/data/ModModelProvider.java b/src/modchest/data/ModModelProvider.java
old mode 100755
new mode 100644
similarity index 100%
rename from src/main/java/modchest/data/ModModelProvider.java
rename to src/modchest/data/ModModelProvider.java
diff --git a/src/main/java/modchest/data/ModRecipeGenerator.java b/src/modchest/data/ModRecipeGenerator.java
old mode 100755
new mode 100644
similarity index 100%
rename from src/main/java/modchest/data/ModRecipeGenerator.java
rename to src/modchest/data/ModRecipeGenerator.java
diff --git a/src/main/java/modchest/data/ModWorldGenerator.java b/src/modchest/data/ModWorldGenerator.java
old mode 100755
new mode 100644
similarity index 100%
rename from src/main/java/modchest/data/ModWorldGenerator.java
rename to src/modchest/data/ModWorldGenerator.java
diff --git a/remappedSrc/modchest/event/playerAfterRespawnEvent.java b/src/modchest/event/playerAfterRespawnEvent.java
similarity index 100%
rename from remappedSrc/modchest/event/playerAfterRespawnEvent.java
rename to src/modchest/event/playerAfterRespawnEvent.java
diff --git a/src/main/java/modchest/item/custom/piratesCoinItem.java b/src/modchest/item/custom/piratesCoinItem.java
old mode 100755
new mode 100644
similarity index 100%
rename from src/main/java/modchest/item/custom/piratesCoinItem.java
rename to src/modchest/item/custom/piratesCoinItem.java
diff --git a/src/main/java/modchest/item/modItemGroup.java b/src/modchest/item/modItemGroup.java
old mode 100755
new mode 100644
similarity index 100%
rename from src/main/java/modchest/item/modItemGroup.java
rename to src/modchest/item/modItemGroup.java
diff --git a/remappedSrc/modchest/item/modItems.java b/src/modchest/item/modItems.java
similarity index 100%
rename from remappedSrc/modchest/item/modItems.java
rename to src/modchest/item/modItems.java
diff --git a/src/main/java/modchest/mixin/ServerPlayerEntityMixin.java b/src/modchest/mixin/ServerPlayerEntityMixin.java
old mode 100755
new mode 100644
similarity index 100%
rename from src/main/java/modchest/mixin/ServerPlayerEntityMixin.java
rename to src/modchest/mixin/ServerPlayerEntityMixin.java
diff --git a/src/main/java/modchest/mixin/bedBlock.java b/src/modchest/mixin/bedBlock.java
old mode 100755
new mode 100644
similarity index 100%
rename from src/main/java/modchest/mixin/bedBlock.java
rename to src/modchest/mixin/bedBlock.java
diff --git a/src/main/java/modchest/networking/modNetworkingServer.java b/src/modchest/networking/modNetworkingServer.java
old mode 100755
new mode 100644
similarity index 100%
rename from src/main/java/modchest/networking/modNetworkingServer.java
rename to src/modchest/networking/modNetworkingServer.java
diff --git a/remappedSrc/modchest/networking/packet/deathScreenMultiButtonsC2SPacket.java b/src/modchest/networking/packet/deathScreenMultiButtonsC2SPacket.java
similarity index 100%
rename from remappedSrc/modchest/networking/packet/deathScreenMultiButtonsC2SPacket.java
rename to src/modchest/networking/packet/deathScreenMultiButtonsC2SPacket.java
diff --git a/src/main/java/modchest/networking/packet/setNewRespawnsC2SPacket.java b/src/modchest/networking/packet/setNewRespawnsC2SPacket.java
old mode 100755
new mode 100644
similarity index 100%
rename from src/main/java/modchest/networking/packet/setNewRespawnsC2SPacket.java
rename to src/modchest/networking/packet/setNewRespawnsC2SPacket.java
diff --git a/src/main/java/modchest/util/ServerPlayerEntityInterface.java b/src/modchest/util/ServerPlayerEntityInterface.java
old mode 100755
new mode 100644
similarity index 100%
rename from src/main/java/modchest/util/ServerPlayerEntityInterface.java
rename to src/modchest/util/ServerPlayerEntityInterface.java
diff --git a/src/main/java/modchest/util/initializer.java b/src/modchest/util/initializer.java
old mode 100755
new mode 100644
similarity index 100%
rename from src/main/java/modchest/util/initializer.java
rename to src/modchest/util/initializer.java
diff --git a/remappedSrc/modchest/util/setAndGetMultiButtonsSpawn.java b/src/modchest/util/setAndGetMultiButtonsSpawn.java
similarity index 100%
rename from remappedSrc/modchest/util/setAndGetMultiButtonsSpawn.java
rename to src/modchest/util/setAndGetMultiButtonsSpawn.java