diff --git a/src/main/java/com/viaversion/viafabricplus/features/FeaturesLoading.java b/src/main/java/com/viaversion/viafabricplus/features/FeaturesLoading.java
index 1444fc05..53992cb0 100644
--- a/src/main/java/com/viaversion/viafabricplus/features/FeaturesLoading.java
+++ b/src/main/java/com/viaversion/viafabricplus/features/FeaturesLoading.java
@@ -23,14 +23,14 @@ package com.viaversion.viafabricplus.features;
 
 import com.viaversion.viafabricplus.api.events.LoadingCycleCallback;
 import com.viaversion.viafabricplus.base.Events;
+import com.viaversion.viafabricplus.base.sync_tasks.DataCustomPayload;
 import com.viaversion.viafabricplus.features.block.CollisionShapes;
-import com.viaversion.viafabricplus.features.cpe_extensions.CPEAdditions;
+import com.viaversion.viafabricplus.features.classic.cpe_extensions.CPEAdditions;
+import com.viaversion.viafabricplus.features.entity.EntityDimensionDiff;
+import com.viaversion.viafabricplus.features.entity.enchantment_attributes.EnchantmentAttributesEmulation1_20_6;
 import com.viaversion.viafabricplus.features.footstep_particle.FootStepParticle1_12_2;
 import com.viaversion.viafabricplus.features.networking.resource_pack_header.ResourcePackHeaderDiff;
 import com.viaversion.viafabricplus.features.recipe_emulation.Recipes1_11_2;
-import com.viaversion.viafabricplus.features.entity.EntityDimensionDiff;
-import com.viaversion.viafabricplus.features.entity.enchantment_attributes.EnchantmentAttributesEmulation1_20_6;
-import com.viaversion.viafabricplus.base.sync_tasks.DataCustomPayload;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.client.MinecraftClient;
 import net.raphimc.viaaprilfools.api.AprilFoolsProtocolVersion;
diff --git a/src/main/java/com/viaversion/viafabricplus/features/cpe_extensions/CPEAdditions.java b/src/main/java/com/viaversion/viafabricplus/features/classic/cpe_extensions/CPEAdditions.java
similarity index 97%
rename from src/main/java/com/viaversion/viafabricplus/features/cpe_extensions/CPEAdditions.java
rename to src/main/java/com/viaversion/viafabricplus/features/classic/cpe_extensions/CPEAdditions.java
index 86f9b3ea..455d150d 100644
--- a/src/main/java/com/viaversion/viafabricplus/features/cpe_extensions/CPEAdditions.java
+++ b/src/main/java/com/viaversion/viafabricplus/features/classic/cpe_extensions/CPEAdditions.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.features.cpe_extensions;
+package com.viaversion.viafabricplus.features.classic.cpe_extensions;
 
-import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import io.netty.buffer.ByteBuf;
 import net.lenni0451.reflect.Enums;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
diff --git a/src/main/java/com/viaversion/viafabricplus/features/classic_world_height/WorldHeightSupport.java b/src/main/java/com/viaversion/viafabricplus/features/classic/world_height/WorldHeightSupport.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/features/classic_world_height/WorldHeightSupport.java
rename to src/main/java/com/viaversion/viafabricplus/features/classic/world_height/WorldHeightSupport.java
index a5930aec..c9a62f0b 100644
--- a/src/main/java/com/viaversion/viafabricplus/features/classic_world_height/WorldHeightSupport.java
+++ b/src/main/java/com/viaversion/viafabricplus/features/classic/world_height/WorldHeightSupport.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.features.classic_world_height;
+package com.viaversion.viafabricplus.features.classic.world_height;
 
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viaversion.api.Via;
@@ -34,7 +34,6 @@ import net.raphimc.vialegacy.api.LegacyProtocolVersion;
 import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.model.ClassicLevel;
 import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.provider.ClassicWorldHeightProvider;
 import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.storage.ClassicLevelStorage;
-import org.jetbrains.annotations.ApiStatus;
 
 import java.util.ArrayList;
 import java.util.BitSet;
diff --git a/src/main/java/com/viaversion/viafabricplus/features/entity/metadata_handling/WolfHealthTracker1_14_4.java b/src/main/java/com/viaversion/viafabricplus/features/entity/metadata_handling/WolfHealthTracker1_14_4.java
index d1306176..90679f30 100644
--- a/src/main/java/com/viaversion/viafabricplus/features/entity/metadata_handling/WolfHealthTracker1_14_4.java
+++ b/src/main/java/com/viaversion/viafabricplus/features/entity/metadata_handling/WolfHealthTracker1_14_4.java
@@ -21,14 +21,20 @@
 
 package com.viaversion.viafabricplus.features.entity.metadata_handling;
 
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import com.viaversion.viaversion.api.connection.StorableObject;
 import it.unimi.dsi.fastutil.ints.Int2FloatMap;
 import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
+import net.minecraft.entity.LivingEntity;
 
 public final class WolfHealthTracker1_14_4 implements StorableObject {
 
     private final Int2FloatMap healthDataMap = new Int2FloatOpenHashMap();
 
+    public static float getWolfHealth(final LivingEntity entity) {
+        ProtocolTranslator.getPlayNetworkUserConnection().get(WolfHealthTracker1_14_4.class).getWolfHealth(entity.getId(), entity.getHealth());
+    }
+
     public float getWolfHealth(final int entityId, final float fallback) {
         return this.healthDataMap.getOrDefault(entityId, fallback);
     }
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/bedrock/allow_new_lines/MixinTextRenderer.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/bedrock/allow_new_line/MixinTextRenderer.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/bedrock/allow_new_lines/MixinTextRenderer.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/bedrock/allow_new_line/MixinTextRenderer.java
index fb66395a..d1aa5ac8 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/bedrock/allow_new_lines/MixinTextRenderer.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/bedrock/allow_new_line/MixinTextRenderer.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.bedrock.allow_new_lines;
+package com.viaversion.viafabricplus.injection.mixin.features.bedrock.allow_new_line;
 
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.MinecraftClient;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/bedrock/chat_suggestions/MixinClientCommandSource.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/bedrock/remove_dummy_player_suggestions/MixinClientCommandSource.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/bedrock/chat_suggestions/MixinClientCommandSource.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/bedrock/remove_dummy_player_suggestions/MixinClientCommandSource.java
index cbafd3ad..8d57e33b 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/bedrock/chat_suggestions/MixinClientCommandSource.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/bedrock/remove_dummy_player_suggestions/MixinClientCommandSource.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.bedrock.chat_suggestions;
+package com.viaversion.viafabricplus.injection.mixin.features.bedrock.remove_dummy_player_suggestions;
 
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.network.ClientCommandSource;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interactions/MixinAbstractSignBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interaction/MixinAbstractSignBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interactions/MixinAbstractSignBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interaction/MixinAbstractSignBlock.java
index f8f519c8..074c19d9 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interactions/MixinAbstractSignBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interaction/MixinAbstractSignBlock.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.block.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.block.AbstractSignBlock;
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.player.PlayerEntity;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interactions/MixinDecoratedPotBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interaction/MixinDecoratedPotBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interactions/MixinDecoratedPotBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interaction/MixinDecoratedPotBlock.java
index 6ad23c3d..5f0c376c 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interactions/MixinDecoratedPotBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interaction/MixinDecoratedPotBlock.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.block.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.DecoratedPotBlock;
 import net.minecraft.entity.player.PlayerEntity;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interactions/MixinFenceBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interaction/MixinFenceBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interactions/MixinFenceBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interaction/MixinFenceBlock.java
index 53a37cbe..48a190f1 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interactions/MixinFenceBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interaction/MixinFenceBlock.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.block.interaction;
 
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
@@ -54,4 +54,4 @@ public abstract class MixinFenceBlock extends HorizontalConnectingBlock {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interactions/MixinFlowerPotBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interaction/MixinFlowerPotBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interactions/MixinFlowerPotBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interaction/MixinFlowerPotBlock.java
index adf383d1..558eb5a5 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interactions/MixinFlowerPotBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interaction/MixinFlowerPotBlock.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.block.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.FlowerPotBlock;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interactions/MixinNoteBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interaction/MixinNoteBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interactions/MixinNoteBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interaction/MixinNoteBlock.java
index 4a716ab2..774fc7cd 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interactions/MixinNoteBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/interaction/MixinNoteBlock.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.block.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.block.NoteBlock;
 import net.minecraft.util.ActionResult;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/mining_calculations/MixinAbstractBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/mining_calculation/MixinAbstractBlock.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/mining_calculations/MixinAbstractBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/mining_calculation/MixinAbstractBlock.java
index 99293630..4e0a89da 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/mining_calculations/MixinAbstractBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/mining_calculation/MixinAbstractBlock.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.mining_calculations;
+package com.viaversion.viafabricplus.injection.mixin.features.block.mining_calculation;
 
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.AbstractBlock;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/mining_calculations/MixinAbstractBlock_AbstractBlockState.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/mining_calculation/MixinAbstractBlock_AbstractBlockState.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/mining_calculations/MixinAbstractBlock_AbstractBlockState.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/mining_calculation/MixinAbstractBlock_AbstractBlockState.java
index 97871ec3..19c67349 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/mining_calculations/MixinAbstractBlock_AbstractBlockState.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/mining_calculation/MixinAbstractBlock_AbstractBlockState.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.mining_calculations;
+package com.viaversion.viafabricplus.injection.mixin.features.block.mining_calculation;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.block.*;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.BlockView;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinAbstractRailBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinAbstractRailBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinAbstractRailBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinAbstractRailBlock.java
index c057b7c6..662e8c1a 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinAbstractRailBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinAbstractRailBlock.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
+package com.viaversion.viafabricplus.injection.mixin.features.block.shape;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.block.AbstractRailBlock;
 import net.minecraft.block.Block;
 import net.minecraft.util.shape.VoxelShape;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinAnvilBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinAnvilBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinAnvilBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinAnvilBlock.java
index e2164877..b72b540d 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinAnvilBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinAnvilBlock.java
@@ -19,11 +19,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
+package com.viaversion.viafabricplus.injection.mixin.features.block.shape;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.injection.ViaFabricPlusMixinPlugin;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.block.*;
 import net.minecraft.state.property.EnumProperty;
 import net.minecraft.util.math.BlockPos;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinBedBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinBedBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinBedBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinBedBlock.java
index c309f8f5..aaf47fc4 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinBedBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinBedBlock.java
@@ -19,11 +19,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
+package com.viaversion.viafabricplus.injection.mixin.features.block.shape;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.injection.ViaFabricPlusMixinPlugin;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.block.*;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.shape.VoxelShape;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinBrewingStandBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinBrewingStandBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinBrewingStandBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinBrewingStandBlock.java
index 7fca11d5..0c87fee6 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinBrewingStandBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinBrewingStandBlock.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
+package com.viaversion.viafabricplus.injection.mixin.features.block.shape;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.BrewingStandBlock;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinCarpetBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinCarpetBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinCarpetBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinCarpetBlock.java
index a6284cf2..cf481fb4 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinCarpetBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinCarpetBlock.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
+package com.viaversion.viafabricplus.injection.mixin.features.block.shape;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.CarpetBlock;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinCauldronBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinCauldronBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinCauldronBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinCauldronBlock.java
index fec73133..28ef3915 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinCauldronBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinCauldronBlock.java
@@ -19,11 +19,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
+package com.viaversion.viafabricplus.injection.mixin.features.block.shape;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.injection.ViaFabricPlusMixinPlugin;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.block.*;
 import net.minecraft.block.cauldron.CauldronBehavior;
 import net.minecraft.util.function.BooleanBiFunction;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinChestBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinChestBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinChestBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinChestBlock.java
index 87031027..f9452dc7 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinChestBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinChestBlock.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
+package com.viaversion.viafabricplus.injection.mixin.features.block.shape;
 
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.AbstractChestBlock;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinCropBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinCropBlock.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinCropBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinCropBlock.java
index 0e3ea925..1d4ae25e 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinCropBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinCropBlock.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
+package com.viaversion.viafabricplus.injection.mixin.features.block.shape;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.block.Block;
 import net.minecraft.block.CropBlock;
 import net.minecraft.util.shape.VoxelShape;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinEndPortalBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinEndPortalBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinEndPortalBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinEndPortalBlock.java
index 9aa71d69..1608cdef 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinEndPortalBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinEndPortalBlock.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
+package com.viaversion.viafabricplus.injection.mixin.features.block.shape;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.block.*;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.shape.VoxelShape;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinEndPortalFrameBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinEndPortalFrameBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinEndPortalFrameBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinEndPortalFrameBlock.java
index 02103725..6475f327 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinEndPortalFrameBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinEndPortalFrameBlock.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
+package com.viaversion.viafabricplus.injection.mixin.features.block.shape;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.EndPortalFrameBlock;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinEnderChestBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinEnderChestBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinEnderChestBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinEnderChestBlock.java
index 210bf095..3270880d 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinEnderChestBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinEnderChestBlock.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
+package com.viaversion.viafabricplus.injection.mixin.features.block.shape;
 
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.BlockState;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinFarmlandBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinFarmlandBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinFarmlandBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinFarmlandBlock.java
index a1c761fa..64458bac 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinFarmlandBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinFarmlandBlock.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
+package com.viaversion.viafabricplus.injection.mixin.features.block.shape;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.FarmlandBlock;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinFenceBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinFenceBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinFenceBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinFenceBlock.java
index f8807c9b..a3d0c8a3 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinFenceBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinFenceBlock.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
+package com.viaversion.viafabricplus.injection.mixin.features.block.shape;
 
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.*;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinFenceGateBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinFenceGateBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinFenceGateBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinFenceGateBlock.java
index 2173d09b..6930fd4f 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinFenceGateBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinFenceGateBlock.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
+package com.viaversion.viafabricplus.injection.mixin.features.block.shape;
 
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.*;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinFireBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinFireBlock.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinFireBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinFireBlock.java
index 29c01d73..c75a4bb3 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinFireBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinFireBlock.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
+package com.viaversion.viafabricplus.injection.mixin.features.block.shape;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.FireBlock;
 import net.minecraft.block.ShapeContext;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinFlowerbedBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinFlowerbedBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinFlowerbedBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinFlowerbedBlock.java
index 5c6eecca..a61f3150 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinFlowerbedBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinFlowerbedBlock.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
+package com.viaversion.viafabricplus.injection.mixin.features.block.shape;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.FlowerbedBlock;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinHopperBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinHopperBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinHopperBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinHopperBlock.java
index ed40a0c7..03349a44 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinHopperBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinHopperBlock.java
@@ -19,11 +19,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
+package com.viaversion.viafabricplus.injection.mixin.features.block.shape;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.injection.ViaFabricPlusMixinPlugin;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.block.*;
 import net.minecraft.util.function.BooleanBiFunction;
 import net.minecraft.util.math.BlockPos;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinLadderBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinLadderBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinLadderBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinLadderBlock.java
index cfff603b..471661e5 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinLadderBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinLadderBlock.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
+package com.viaversion.viafabricplus.injection.mixin.features.block.shape;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.LadderBlock;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinLeavesBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinLeavesBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinLeavesBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinLeavesBlock.java
index f814232c..476db729 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinLeavesBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinLeavesBlock.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
+package com.viaversion.viafabricplus.injection.mixin.features.block.shape;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.LeavesBlock;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinLilyPadBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinLilyPadBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinLilyPadBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinLilyPadBlock.java
index 914e082d..e0b64dbc 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinLilyPadBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinLilyPadBlock.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
+package com.viaversion.viafabricplus.injection.mixin.features.block.shape;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.LilyPadBlock;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinPaneBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinPaneBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinPaneBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinPaneBlock.java
index 3cfd8d78..d5d01848 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinPaneBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinPaneBlock.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
+package com.viaversion.viafabricplus.injection.mixin.features.block.shape;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.block.*;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.shape.VoxelShape;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinPistonBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinPistonBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinPistonBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinPistonBlock.java
index 3eed7586..f3334b72 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinPistonBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinPistonBlock.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
+package com.viaversion.viafabricplus.injection.mixin.features.block.shape;
 
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.BlockState;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinPistonHeadBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinPistonHeadBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinPistonHeadBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinPistonHeadBlock.java
index c7327f60..a226a0fe 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinPistonHeadBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinPistonHeadBlock.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
+package com.viaversion.viafabricplus.injection.mixin.features.block.shape;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.block.*;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.shape.VoxelShape;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinSnowBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinSnowBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinSnowBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinSnowBlock.java
index 6d241968..dbb35b45 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinSnowBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinSnowBlock.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
+package com.viaversion.viafabricplus.injection.mixin.features.block.shape;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.ShapeContext;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinSoulSandBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinSoulSandBlock.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinSoulSandBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinSoulSandBlock.java
index 1951d7ae..825048bb 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinSoulSandBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinSoulSandBlock.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
+package com.viaversion.viafabricplus.injection.mixin.features.block.shape;
 
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
@@ -44,4 +44,4 @@ public abstract class MixinSoulSandBlock {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinWallBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinWallBlock.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinWallBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinWallBlock.java
index 5c6339aa..6cff3884 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/collision_shapes/MixinWallBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinWallBlock.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.block.collision_shapes;
+package com.viaversion.viafabricplus.injection.mixin.features.block.shape;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import net.minecraft.block.Block;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic_world_height/MixinBuiltChunk.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/border_chunk_rendering/MixinBuiltChunk.java
similarity index 95%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic_world_height/MixinBuiltChunk.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/border_chunk_rendering/MixinBuiltChunk.java
index e8f60265..c78121f6 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic_world_height/MixinBuiltChunk.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/border_chunk_rendering/MixinBuiltChunk.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.classic_world_height;
+package com.viaversion.viafabricplus.injection.mixin.features.border_chunk_rendering;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.client.render.chunk.ChunkBuilder;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/cpe_extensions/MixinClassicProtocolExtension.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic/cpe_extension/MixinClassicProtocolExtension.java
similarity index 93%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/cpe_extensions/MixinClassicProtocolExtension.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic/cpe_extension/MixinClassicProtocolExtension.java
index 4969e519..e499f6d7 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/cpe_extensions/MixinClassicProtocolExtension.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic/cpe_extension/MixinClassicProtocolExtension.java
@@ -19,9 +19,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.cpe_extensions;
+package com.viaversion.viafabricplus.injection.mixin.features.classic.cpe_extension;
 
-import com.viaversion.viafabricplus.features.cpe_extensions.CPEAdditions;
+import com.viaversion.viafabricplus.features.classic.cpe_extensions.CPEAdditions;
 import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.data.ClassicProtocolExtension;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/cpe_extensions/MixinClientboundPacketsc0_30cpe.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic/cpe_extension/MixinClientboundPacketsc0_30cpe.java
similarity index 91%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/cpe_extensions/MixinClientboundPacketsc0_30cpe.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic/cpe_extension/MixinClientboundPacketsc0_30cpe.java
index 9ae3a8f3..07b178b1 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/cpe_extensions/MixinClientboundPacketsc0_30cpe.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic/cpe_extension/MixinClientboundPacketsc0_30cpe.java
@@ -19,9 +19,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.cpe_extensions;
+package com.viaversion.viafabricplus.injection.mixin.features.classic.cpe_extension;
 
-import com.viaversion.viafabricplus.features.cpe_extensions.CPEAdditions;
+import com.viaversion.viafabricplus.features.classic.cpe_extensions.CPEAdditions;
 import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.packet.ClientboundPacketsc0_30cpe;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/cpe_extensions/MixinProtocolc0_30cpeToc0_28_30.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic/cpe_extension/MixinProtocolc0_30cpeToc0_28_30.java
similarity index 95%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/cpe_extensions/MixinProtocolc0_30cpeToc0_28_30.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic/cpe_extension/MixinProtocolc0_30cpeToc0_28_30.java
index c5934280..d7fdfe07 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/cpe_extensions/MixinProtocolc0_30cpeToc0_28_30.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic/cpe_extension/MixinProtocolc0_30cpeToc0_28_30.java
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.cpe_extensions;
+package com.viaversion.viafabricplus.injection.mixin.features.classic.cpe_extension;
 
+import com.viaversion.viafabricplus.features.classic.cpe_extensions.CPEAdditions;
 import com.viaversion.viaversion.api.protocol.AbstractProtocol;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.Protocol1_19_3To1_19_4;
 import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ClientboundPackets1_19_4;
-import com.viaversion.viafabricplus.features.cpe_extensions.CPEAdditions;
 import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.packet.ClientboundPacketsc0_28;
 import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.packet.ServerboundPacketsc0_28;
 import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.Protocolc0_30cpeToc0_28_30;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/cpe_extensions/MixinWeatherRendering.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic/cpe_extension/MixinWeatherRendering.java
similarity index 93%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/cpe_extensions/MixinWeatherRendering.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic/cpe_extension/MixinWeatherRendering.java
index db0699dd..2bd2c5a0 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/cpe_extensions/MixinWeatherRendering.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic/cpe_extension/MixinWeatherRendering.java
@@ -19,9 +19,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.cpe_extensions;
+package com.viaversion.viafabricplus.injection.mixin.features.classic.cpe_extension;
 
-import com.viaversion.viafabricplus.features.cpe_extensions.CPEAdditions;
+import com.viaversion.viafabricplus.features.classic.cpe_extensions.CPEAdditions;
 import net.minecraft.client.render.WeatherRendering;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic_world_height/MixinEntityPacketRewriter1_17.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic/world_height/MixinEntityPacketRewriter1_17.java
similarity index 96%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic_world_height/MixinEntityPacketRewriter1_17.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic/world_height/MixinEntityPacketRewriter1_17.java
index de8d56ce..9f8b4356 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic_world_height/MixinEntityPacketRewriter1_17.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic/world_height/MixinEntityPacketRewriter1_17.java
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.classic_world_height;
+package com.viaversion.viafabricplus.injection.mixin.features.classic.world_height;
 
+import com.viaversion.viafabricplus.features.classic.world_height.WorldHeightSupport;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
 import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ClientboundPackets1_16_2;
 import com.viaversion.viaversion.protocols.v1_16_4to1_17.Protocol1_16_4To1_17;
 import com.viaversion.viaversion.protocols.v1_16_4to1_17.rewriter.EntityPacketRewriter1_17;
-import com.viaversion.viafabricplus.features.classic_world_height.WorldHeightSupport;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic_world_height/MixinWorldPacketRewriter1_16_2.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic/world_height/MixinWorldPacketRewriter1_16_2.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic_world_height/MixinWorldPacketRewriter1_16_2.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic/world_height/MixinWorldPacketRewriter1_16_2.java
index 2fbdfe0b..e7b315b9 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic_world_height/MixinWorldPacketRewriter1_16_2.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic/world_height/MixinWorldPacketRewriter1_16_2.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.classic_world_height;
+package com.viaversion.viafabricplus.injection.mixin.features.classic.world_height;
 
 import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.rewriter.WorldPacketRewriter1_16_2;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic_world_height/MixinWorldPacketRewriter1_17.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic/world_height/MixinWorldPacketRewriter1_17.java
similarity index 96%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic_world_height/MixinWorldPacketRewriter1_17.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic/world_height/MixinWorldPacketRewriter1_17.java
index 618cdc7a..62bf40ea 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic_world_height/MixinWorldPacketRewriter1_17.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic/world_height/MixinWorldPacketRewriter1_17.java
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.classic_world_height;
+package com.viaversion.viafabricplus.injection.mixin.features.classic.world_height;
 
+import com.viaversion.viafabricplus.features.classic.world_height.WorldHeightSupport;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
 import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ClientboundPackets1_16_2;
 import com.viaversion.viaversion.protocols.v1_16_4to1_17.Protocol1_16_4To1_17;
 import com.viaversion.viaversion.protocols.v1_16_4to1_17.rewriter.WorldPacketRewriter1_17;
-import com.viaversion.viafabricplus.features.classic_world_height.WorldHeightSupport;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/allow_duplicated_uuids/MixinEntityIndex.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/allow_duplicated_uuid/MixinEntityIndex.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/allow_duplicated_uuids/MixinEntityIndex.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/allow_duplicated_uuid/MixinEntityIndex.java
index b48ca3ae..8929b4f0 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/allow_duplicated_uuids/MixinEntityIndex.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/allow_duplicated_uuid/MixinEntityIndex.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.entity.allow_duplicated_uuids;
+package com.viaversion.viafabricplus.injection.mixin.features.entity.allow_duplicated_uuid;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import net.minecraft.world.entity.EntityIndex;
 import net.minecraft.world.entity.EntityLike;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/MixinEntityPacketRewriter1_20_5.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/attribute/MixinEntityPacketRewriter1_20_5.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/MixinEntityPacketRewriter1_20_5.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/attribute/MixinEntityPacketRewriter1_20_5.java
index 39a8820c..b751679a 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/MixinEntityPacketRewriter1_20_5.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/attribute/MixinEntityPacketRewriter1_20_5.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.interaction;
+package com.viaversion.viafabricplus.injection.mixin.features.entity.attribute;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/enchantment_attributes/MixinLivingEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/attribute/MixinLivingEntity.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/enchantment_attributes/MixinLivingEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/attribute/MixinLivingEntity.java
index 58699c1a..0c12efb1 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/enchantment_attributes/MixinLivingEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/attribute/MixinLivingEntity.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.entity.enchantment_attributes;
+package com.viaversion.viafabricplus.injection.mixin.features.entity.attribute;
 
 import com.viaversion.viafabricplus.features.entity.enchantment_attributes.EnchantmentAttributesEmulation1_20_6;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
@@ -40,4 +40,4 @@ public abstract class MixinLivingEntity {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinAbstractBoatEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinAbstractBoatEntity.java
similarity index 94%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinAbstractBoatEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinAbstractBoatEntity.java
index f140563c..5280570c 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinAbstractBoatEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinAbstractBoatEntity.java
@@ -19,16 +19,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.entity.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.entity.interaction;
 
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.vehicle.AbstractBoatEntity;
-import net.minecraft.entity.vehicle.BoatEntity;
 import net.minecraft.entity.vehicle.VehicleEntity;
-import net.minecraft.item.Item;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.world.World;
@@ -36,8 +34,6 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
-import java.util.function.Supplier;
-
 @Mixin(AbstractBoatEntity.class)
 public abstract class MixinAbstractBoatEntity extends VehicleEntity {
 
@@ -54,4 +50,4 @@ public abstract class MixinAbstractBoatEntity extends VehicleEntity {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinAbstractHorseEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinAbstractHorseEntity.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinAbstractHorseEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinAbstractHorseEntity.java
index a9f0789a..a71d0508 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinAbstractHorseEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinAbstractHorseEntity.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.entity.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.entity.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.entity.passive.AbstractHorseEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinAnimalEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinAnimalEntity.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinAnimalEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinAnimalEntity.java
index bbbc8151..ef3a79e9 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinAnimalEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinAnimalEntity.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.entity.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.entity.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.entity.passive.AnimalEntity;
 import net.minecraft.util.ActionResult;
 import net.minecraft.world.World;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinArmadilloEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinArmadilloEntity.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinArmadilloEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinArmadilloEntity.java
index 96913d02..949e3178 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinArmadilloEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinArmadilloEntity.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.entity.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.entity.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.entity.passive.ArmadilloEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinAxolotlEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinAxolotlEntity.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinAxolotlEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinAxolotlEntity.java
index eaf3da74..ffc4c92f 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinAxolotlEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinAxolotlEntity.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.entity.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.entity.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.entity.passive.AxolotlEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinBeeEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinBeeEntity.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinBeeEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinBeeEntity.java
index a6602f99..8147aaee 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinBeeEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinBeeEntity.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.entity.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.entity.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.passive.AnimalEntity;
 import net.minecraft.entity.passive.BeeEntity;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinCatEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinCatEntity.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinCatEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinCatEntity.java
index 8defb9b3..756f7563 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinCatEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinCatEntity.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.entity.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.entity.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.passive.CatEntity;
 import net.minecraft.entity.passive.TameableEntity;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinCowEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinCowEntity.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinCowEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinCowEntity.java
index 6b3d9b71..12c5e15b 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinCowEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinCowEntity.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.entity.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.entity.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.passive.AnimalEntity;
 import net.minecraft.entity.passive.CowEntity;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinCreeperEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinCreeperEntity.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinCreeperEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinCreeperEntity.java
index 8a8d1cf5..8679b365 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinCreeperEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinCreeperEntity.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.entity.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.entity.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.entity.mob.CreeperEntity;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinMobEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinMobEntity.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinMobEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinMobEntity.java
index a5f9ca8a..cffcd49d 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinMobEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinMobEntity.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.entity.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.entity.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.entity.mob.MobEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.ActionResult;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinMooshroomEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinMooshroomEntity.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinMooshroomEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinMooshroomEntity.java
index d1b8c700..dd3e79f4 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinMooshroomEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinMooshroomEntity.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.entity.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.entity.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.passive.AnimalEntity;
 import net.minecraft.entity.passive.CowEntity;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinSquidEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinSquidEntity.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinSquidEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinSquidEntity.java
index 69635708..765cc3a3 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinSquidEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinSquidEntity.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.entity.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.entity.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.entity.passive.SquidEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinWolfEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinWolfEntity.java
similarity index 82%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinWolfEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinWolfEntity.java
index bab7466f..72f7b651 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinWolfEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinWolfEntity.java
@@ -19,11 +19,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.entity.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.entity.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.features.entity.metadata_handling.WolfHealthTracker1_14_4;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.FoodComponent;
 import net.minecraft.entity.EntityType;
@@ -41,10 +41,8 @@ import net.minecraft.util.Hand;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(WolfEntity.class)
@@ -68,7 +66,7 @@ public abstract class MixinWolfEntity extends TameableEntity implements Angerabl
             if (this.isTamed()) {
                 final FoodComponent foodComponent = itemStack.get(DataComponentTypes.FOOD);
                 if (foodComponent != null) {
-                    if (this.isBreedingItem(itemStack) && this.viaFabricPlus$getWolfHealth() < 20.0F) {
+                    if (this.isBreedingItem(itemStack) && WolfHealthTracker1_14_4.getWolfHealth(this) < 20.0F) {
                         if (!player.getAbilities().creativeMode) itemStack.decrement(1);
                         this.heal(foodComponent.nutrition());
                         cir.setReturnValue(ActionResult.SUCCESS);
@@ -93,19 +91,4 @@ public abstract class MixinWolfEntity extends TameableEntity implements Angerabl
         }
     }
 
-    @Redirect(method = "*", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/passive/WolfEntity;getHealth()F"))
-    private float fixWolfHealth(WolfEntity instance) {
-        if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_14_4)) {
-            return this.viaFabricPlus$getWolfHealth();
-        } else {
-            return instance.getHealth();
-        }
-    }
-
-    @Unique
-    private float viaFabricPlus$getWolfHealth() {
-        return ProtocolTranslator.getPlayNetworkUserConnection().get(WolfHealthTracker1_14_4.class).
-                getWolfHealth(this.getId(), this.getHealth());
-    }
-
 }
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinZombieVillagerEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinZombieVillagerEntity.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinZombieVillagerEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinZombieVillagerEntity.java
index c963780b..5a89d630 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinZombieVillagerEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interaction/MixinZombieVillagerEntity.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.entity.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.entity.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.entity.mob.ZombieVillagerEntity;
 import net.minecraft.util.ActionResult;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/metadata_handling/MixinWolfEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/metadata_handling/MixinWolfEntity.java
new file mode 100644
index 00000000..6290afa0
--- /dev/null
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/metadata_handling/MixinWolfEntity.java
@@ -0,0 +1,52 @@
+/*
+ * This file is part of ViaFabricPlus - https://github.com/ViaVersion/ViaFabricPlus
+ * Copyright (C) 2021-2024 the original authors
+ *                         - FlorianMichael/EnZaXD <florian.michael07@gmail.com>
+ *                         - RK_01/RaphiMC
+ * Copyright (C) 2023-2024 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.viaversion.viafabricplus.injection.mixin.features.entity.metadata_handling;
+
+import com.viaversion.viafabricplus.features.entity.metadata_handling.WolfHealthTracker1_14_4;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.mob.Angerable;
+import net.minecraft.entity.passive.TameableEntity;
+import net.minecraft.entity.passive.WolfEntity;
+import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(WolfEntity.class)
+public abstract class MixinWolfEntity extends TameableEntity implements Angerable {
+
+    protected MixinWolfEntity(EntityType<? extends TameableEntity> entityType, World world) {
+        super(entityType, world);
+    }
+
+    @Redirect(method = "*", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/passive/WolfEntity;getHealth()F"))
+    private float fixWolfHealth(WolfEntity instance) {
+        if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_14_4)) {
+            return WolfHealthTracker1_14_4.getWolfHealth(this);
+        } else {
+            return instance.getHealth();
+        }
+    }
+
+}
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/riding_offsets/MixinAbstractBoatEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/riding_offset/MixinAbstractBoatEntity.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/riding_offsets/MixinAbstractBoatEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/riding_offset/MixinAbstractBoatEntity.java
index c9e7b1f5..b2822064 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/riding_offsets/MixinAbstractBoatEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/riding_offset/MixinAbstractBoatEntity.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.entity.riding_offsets;
+package com.viaversion.viafabricplus.injection.mixin.features.entity.riding_offset;
 
 import com.viaversion.viafabricplus.features.entity.riding_offsets.EntityRidingOffsetsPre1_20_2;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
@@ -51,4 +51,4 @@ public abstract class MixinAbstractBoatEntity extends VehicleEntity {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/riding_offsets/MixinCamelEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/riding_offset/MixinCamelEntity.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/riding_offsets/MixinCamelEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/riding_offset/MixinCamelEntity.java
index 82af4c0a..5bf26151 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/riding_offsets/MixinCamelEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/riding_offset/MixinCamelEntity.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.entity.riding_offsets;
+package com.viaversion.viafabricplus.injection.mixin.features.entity.riding_offset;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.passive.AbstractHorseEntity;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/riding_offsets/MixinEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/riding_offset/MixinEntity.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/riding_offsets/MixinEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/riding_offset/MixinEntity.java
index 876e8fd2..0bd894ed 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/riding_offsets/MixinEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/riding_offset/MixinEntity.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.entity.riding_offsets;
+package com.viaversion.viafabricplus.injection.mixin.features.entity.riding_offset;
 
 import com.viaversion.viafabricplus.features.entity.riding_offsets.EntityRidingOffsetsPre1_20_2;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
@@ -56,4 +56,4 @@ public abstract class MixinEntity {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/riding_offsets/MixinLivingEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/riding_offset/MixinLivingEntity.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/riding_offsets/MixinLivingEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/riding_offset/MixinLivingEntity.java
index 3c1480f5..65c74a1b 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/riding_offsets/MixinLivingEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/riding_offset/MixinLivingEntity.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.entity.riding_offsets;
+package com.viaversion.viafabricplus.injection.mixin.features.entity.riding_offset;
 
 import com.viaversion.viafabricplus.features.entity.riding_offsets.EntityRidingOffsetsPre1_20_2;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
@@ -50,4 +50,4 @@ public abstract class MixinLivingEntity extends Entity {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/replace_boat_movement/MixinAbstractBoatEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/v1_8_boat/MixinAbstractBoatEntity.java
similarity index 96%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/replace_boat_movement/MixinAbstractBoatEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/v1_8_boat/MixinAbstractBoatEntity.java
index 4facb877..a0106f55 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/replace_boat_movement/MixinAbstractBoatEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/v1_8_boat/MixinAbstractBoatEntity.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.movement.replace_boat_movement;
+package com.viaversion.viafabricplus.injection.mixin.features.entity.v1_8_boat;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
@@ -46,7 +46,6 @@ import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
@@ -84,15 +83,6 @@ public abstract class MixinAbstractBoatEntity extends VehicleEntity {
         super(entityType, world);
     }
 
-    @Redirect(method = "updateVelocity", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;isSpaceEmpty(Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/Box;)Z"))
-    private boolean alwaysUpdatePosition(World instance, Entity entity, Box box) {
-        if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_20_5)) {
-            return true;
-        } else {
-            return instance.isSpaceEmpty(entity, box);
-        }
-    }
-
     @Inject(method = "pushAwayFrom", at = @At("HEAD"), cancellable = true)
     private void pushAwayFrom1_8(Entity entity, CallbackInfo ci) {
         if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_8)) {
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinAbstractClientPlayerEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/MixinAbstractClientPlayerEntity.java
similarity index 96%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinAbstractClientPlayerEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/MixinAbstractClientPlayerEntity.java
index f5b5d34b..36184b48 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/interactions/MixinAbstractClientPlayerEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/MixinAbstractClientPlayerEntity.java
@@ -19,11 +19,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.entity.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.interaction;
 
 import com.mojang.authlib.GameProfile;
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.math.BlockPos;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/attack_cooldown/MixinMinecraftClient.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/attack_cooldown/MixinMinecraftClient.java
new file mode 100644
index 00000000..82e00f16
--- /dev/null
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/attack_cooldown/MixinMinecraftClient.java
@@ -0,0 +1,58 @@
+/*
+ * This file is part of ViaFabricPlus - https://github.com/ViaVersion/ViaFabricPlus
+ * Copyright (C) 2021-2024 the original authors
+ *                         - FlorianMichael/EnZaXD <florian.michael07@gmail.com>
+ *                         - RK_01/RaphiMC
+ * Copyright (C) 2023-2024 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.viaversion.viafabricplus.injection.mixin.features.interaction.attack_cooldown;
+
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
+import net.minecraft.client.MinecraftClient;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(MinecraftClient.class)
+public abstract class MixinMinecraftClient {
+
+    @Shadow
+    protected int attackCooldown;
+
+    @Redirect(method = "tick", at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient;attackCooldown:I", ordinal = 1))
+    private int moveCooldownIncrement(MinecraftClient instance) {
+        if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_8)) {
+            return 0;
+        } else {
+            return attackCooldown;
+        }
+    }
+
+    @Inject(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;handleInputEvents()V", shift = At.Shift.BEFORE))
+    private void moveCooldownIncrement(CallbackInfo ci) {
+        if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_8)) {
+            if (this.attackCooldown > 0) {
+                --this.attackCooldown;
+            }
+        }
+    }
+
+}
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/merchant_emulation/MixinMerchantScreenHandler.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/container_clicking/MixinMerchantScreenHandler.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/merchant_emulation/MixinMerchantScreenHandler.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/container_clicking/MixinMerchantScreenHandler.java
index e6943996..291c2b6b 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/merchant_emulation/MixinMerchantScreenHandler.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/container_clicking/MixinMerchantScreenHandler.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.interaction.merchant_emulation;
+package com.viaversion.viafabricplus.injection.mixin.features.interaction.container_clicking;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.network.ClientPlayerInteractionManager;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/replace_block_item_use_logic/item_and_block_use_at_same_time/MixinMinecraftClient.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/replace_block_item_use_logic/MixinMinecraftClient.java
similarity index 96%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/replace_block_item_use_logic/item_and_block_use_at_same_time/MixinMinecraftClient.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/replace_block_item_use_logic/MixinMinecraftClient.java
index e3c1851f..39403410 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/replace_block_item_use_logic/item_and_block_use_at_same_time/MixinMinecraftClient.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/replace_block_item_use_logic/MixinMinecraftClient.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.interaction.replace_block_item_use_logic.item_and_block_use_at_same_time;
+package com.viaversion.viafabricplus.injection.mixin.features.interaction.replace_block_item_use_logic;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/attack_damage_changes/MixinItemPacketRewriter1_9.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/attack_damage/MixinItemPacketRewriter1_9.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/attack_damage_changes/MixinItemPacketRewriter1_9.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/attack_damage/MixinItemPacketRewriter1_9.java
index b19ca7f3..877ec7a8 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/attack_damage_changes/MixinItemPacketRewriter1_9.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/attack_damage/MixinItemPacketRewriter1_9.java
@@ -19,10 +19,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.item.attack_damage_changes;
+package com.viaversion.viafabricplus.injection.mixin.features.item.attack_damage;
 
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.nbt.tag.ListTag;
+import com.viaversion.viafabricplus.protocoltranslator.impl.ViaFabricPlusMappingDataLoader;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.minecraft.item.data.AttributeModifiers1_20_5;
 import com.viaversion.viaversion.api.type.Type;
@@ -36,7 +37,6 @@ import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ServerboundPackets1_
 import com.viaversion.viaversion.protocols.v1_8to1_9.rewriter.ItemPacketRewriter1_9;
 import com.viaversion.viaversion.rewriter.ItemRewriter;
 import com.viaversion.viaversion.util.Pair;
-import com.viaversion.viafabricplus.protocoltranslator.impl.ViaFabricPlusMappingDataLoader;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/attack_damage_changes/MixinItemStack.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/attack_damage/MixinItemStack.java
similarity index 78%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/attack_damage_changes/MixinItemStack.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/attack_damage/MixinItemStack.java
index 6b1fb7fa..b255b90d 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/attack_damage_changes/MixinItemStack.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/attack_damage/MixinItemStack.java
@@ -19,14 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.item.attack_damage_changes;
+package com.viaversion.viafabricplus.injection.mixin.features.item.attack_damage;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import com.viaversion.viafabricplus.features.item.tooltip_changes.Enchantments1_14_4;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
-import com.viaversion.viafabricplus.util.ItemUtil;
-import net.minecraft.component.ComponentType;
-import net.minecraft.component.DataComponentTypes;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.component.type.ItemEnchantmentsComponent;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentHelper;
@@ -35,27 +31,11 @@ import net.minecraft.entity.attribute.EntityAttribute;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.tooltip.TooltipAppender;
-import net.minecraft.item.tooltip.TooltipType;
-import net.minecraft.nbt.NbtCompound;
-import net.minecraft.nbt.NbtElement;
-import net.minecraft.nbt.NbtList;
-import net.minecraft.registry.RegistryKey;
-import net.minecraft.registry.RegistryKeys;
-import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.registry.entry.RegistryEntry;
-import net.minecraft.text.Text;
-import net.minecraft.util.math.MathHelper;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.Optional;
-import java.util.function.Consumer;
 
 @Mixin(ItemStack.class)
 public abstract class MixinItemStack {
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/protocol_level_value_fixes/MixinBlockItemPacketRewriter1_20_5.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/data_fix/MixinBlockItemPacketRewriter1_20_5.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/protocol_level_value_fixes/MixinBlockItemPacketRewriter1_20_5.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/data_fix/MixinBlockItemPacketRewriter1_20_5.java
index e7ec0694..8475b76c 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/protocol_level_value_fixes/MixinBlockItemPacketRewriter1_20_5.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/data_fix/MixinBlockItemPacketRewriter1_20_5.java
@@ -19,10 +19,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.item.protocol_level_value_fixes;
+package com.viaversion.viafabricplus.injection.mixin.features.item.data_fix;
 
 import com.viaversion.viafabricplus.api.events.LoadingCycleCallback;
 import com.viaversion.viafabricplus.base.Events;
+import com.viaversion.viafabricplus.protocoltranslator.impl.ViaFabricPlusMappingDataLoader;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.HolderSet;
 import com.viaversion.viaversion.api.minecraft.data.StructuredDataContainer;
@@ -42,7 +43,6 @@ import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.Protocol1_20_3To1_20_
 import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ServerboundPacket1_20_5;
 import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.rewriter.BlockItemPacketRewriter1_20_5;
 import com.viaversion.viaversion.rewriter.ItemRewriter;
-import com.viaversion.viafabricplus.protocoltranslator.impl.ViaFabricPlusMappingDataLoader;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinAxeItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinAxeItem.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinAxeItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinAxeItem.java
index 8e27c77f..055a8e72 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinAxeItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinAxeItem.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.item.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.item.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.item.AxeItem;
 import net.minecraft.item.ItemUsageContext;
 import net.minecraft.util.ActionResult;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinBlockItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinBlockItem.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinBlockItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinBlockItem.java
index 868830a4..b68fffdc 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinBlockItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinBlockItem.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.item.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.item.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinBowItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinBowItem.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinBowItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinBowItem.java
index 45604e36..700a883b 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinBowItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinBowItem.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.item.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.item.interaction;
 
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.entity.player.PlayerEntity;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinBrushItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinBrushItem.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinBrushItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinBrushItem.java
index abbeeeee..64ae8a5d 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinBrushItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinBrushItem.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.item.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.item.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.BrushItem;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinBucketItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinBucketItem.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinBucketItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinBucketItem.java
index d001d774..37508607 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinBucketItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinBucketItem.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.item.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.item.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.BucketItem;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinBundleItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinBundleItem.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinBundleItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinBundleItem.java
index 4cc7c041..f6ee9fda 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinBundleItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinBundleItem.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.item.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.item.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.item.BundleItem;
 import net.minecraft.util.ActionResult;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinEnderPearlItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinEnderPearlItem.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinEnderPearlItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinEnderPearlItem.java
index e6992a99..d5525d8a 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinEnderPearlItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinEnderPearlItem.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.item.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.item.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.EnderPearlItem;
 import net.minecraft.util.ActionResult;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinEquippableComponent.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinEquippableComponent.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinEquippableComponent.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinEquippableComponent.java
index 1ba31133..f4c5cd69 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinEquippableComponent.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinEquippableComponent.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.item.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.item.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.component.type.EquippableComponent;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.player.PlayerEntity;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinFireChargeItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinFireChargeItem.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinFireChargeItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinFireChargeItem.java
index 49262ffa..03540ad4 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinFireChargeItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinFireChargeItem.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.item.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.item.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.item.FireChargeItem;
 import net.minecraft.item.ItemUsageContext;
 import net.minecraft.util.ActionResult;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinFishingRodItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinFishingRodItem.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinFishingRodItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinFishingRodItem.java
index bd8bf652..d235efea 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinFishingRodItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinFishingRodItem.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.item.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.item.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.FishingRodItem;
 import net.minecraft.util.ActionResult;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinKnowledgeBookItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinKnowledgeBookItem.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinKnowledgeBookItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinKnowledgeBookItem.java
index ffa933ab..34329df4 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinKnowledgeBookItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinKnowledgeBookItem.java
@@ -19,11 +19,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.item.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.item.interaction;
 
 import com.llamalad7.mixinextras.sugar.Local;
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.KnowledgeBookItem;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinLeadItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinLeadItem.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinLeadItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinLeadItem.java
index 7114a527..c89c86d4 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinLeadItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinLeadItem.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.item.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.item.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.item.ItemUsageContext;
 import net.minecraft.item.LeadItem;
 import net.minecraft.registry.tag.BlockTags;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinShovelItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinShovelItem.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinShovelItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinShovelItem.java
index 5c2e9ccc..597e49aa 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interactions/MixinShovelItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/interaction/MixinShovelItem.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.item.interactions;
+package com.viaversion.viafabricplus.injection.mixin.features.item.interaction;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.item.ShovelItem;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/negative_items/MixinDrawContext.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/negative_item_count/MixinDrawContext.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/negative_items/MixinDrawContext.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/negative_item_count/MixinDrawContext.java
index 01f93a6e..f8ba8403 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/negative_items/MixinDrawContext.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/negative_item_count/MixinDrawContext.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.item.negative_items;
+package com.viaversion.viafabricplus.injection.mixin.features.item.negative_item_count;
 
 import com.viaversion.viafabricplus.features.item.negative_items.NegativeItemUtil;
 import net.minecraft.client.gui.DrawContext;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/gracefully_handle_enchantment_tooltips/MixinItemStack.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/v1_14_4_enchantment_tooltip/MixinItemStack.java
similarity index 92%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/gracefully_handle_enchantment_tooltips/MixinItemStack.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/v1_14_4_enchantment_tooltip/MixinItemStack.java
index 84da0964..4961e784 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/gracefully_handle_enchantment_tooltips/MixinItemStack.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/item/v1_14_4_enchantment_tooltip/MixinItemStack.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.item.gracefully_handle_enchantment_tooltips;
+package com.viaversion.viafabricplus.injection.mixin.features.item.v1_14_4_enchantment_tooltip;
 
 import com.viaversion.viafabricplus.features.item.tooltip_changes.Enchantments1_14_4;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
@@ -27,12 +27,7 @@ import com.viaversion.viafabricplus.util.ItemUtil;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.component.ComponentType;
 import net.minecraft.component.DataComponentTypes;
-import net.minecraft.component.type.ItemEnchantmentsComponent;
 import net.minecraft.enchantment.Enchantment;
-import net.minecraft.enchantment.EnchantmentHelper;
-import net.minecraft.enchantment.Enchantments;
-import net.minecraft.entity.attribute.EntityAttribute;
-import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.tooltip.TooltipAppender;
@@ -51,7 +46,6 @@ import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import java.util.Optional;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/triple_chests/MixinItemPacketRewriter1_14.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/large_container/MixinItemPacketRewriter1_14.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/triple_chests/MixinItemPacketRewriter1_14.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/large_container/MixinItemPacketRewriter1_14.java
index 587528b5..8c7098ae 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/triple_chests/MixinItemPacketRewriter1_14.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/large_container/MixinItemPacketRewriter1_14.java
@@ -19,10 +19,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.triple_chests;
+package com.viaversion.viafabricplus.injection.mixin.features.large_container;
 
 import com.llamalad7.mixinextras.sugar.Local;
 import com.viaversion.viafabricplus.base.sync_tasks.SyncTasks;
+import com.viaversion.viafabricplus.protocoltranslator.translator.TextComponentTranslator;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.type.Type;
@@ -35,7 +36,6 @@ import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ClientboundPacke
 import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ServerboundPackets1_14;
 import com.viaversion.viaversion.protocols.v1_13_2to1_14.rewriter.ItemPacketRewriter1_14;
 import com.viaversion.viaversion.rewriter.ItemRewriter;
-import com.viaversion.viafabricplus.protocoltranslator.translator.TextComponentTranslator;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.ingame.GenericContainerScreen;
 import net.minecraft.inventory.SimpleInventory;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/legacy_tab_completions/MixinAbstractCommandBlockScreen.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/legacy_tab_completion/MixinAbstractCommandBlockScreen.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/legacy_tab_completions/MixinAbstractCommandBlockScreen.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/legacy_tab_completion/MixinAbstractCommandBlockScreen.java
index 0993113c..863cbcbd 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/legacy_tab_completions/MixinAbstractCommandBlockScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/legacy_tab_completion/MixinAbstractCommandBlockScreen.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.legacy_tab_completions;
+package com.viaversion.viafabricplus.injection.mixin.features.legacy_tab_completion;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.client.gui.screen.ChatInputSuggestor;
 import net.minecraft.client.gui.screen.ingame.AbstractCommandBlockScreen;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/legacy_tab_completions/MixinChatInputSuggestor.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/legacy_tab_completion/MixinChatInputSuggestor.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/legacy_tab_completions/MixinChatInputSuggestor.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/legacy_tab_completion/MixinChatInputSuggestor.java
index ab5acc60..8e9906f5 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/legacy_tab_completions/MixinChatInputSuggestor.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/legacy_tab_completion/MixinChatInputSuggestor.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.legacy_tab_completions;
+package com.viaversion.viafabricplus.injection.mixin.features.legacy_tab_completion;
 
 import com.viaversion.viafabricplus.settings.impl.DebugSettings;
 import net.minecraft.client.gui.DrawContext;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/legacy_tab_completions/MixinChatScreen.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/legacy_tab_completion/MixinChatScreen.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/legacy_tab_completions/MixinChatScreen.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/legacy_tab_completion/MixinChatScreen.java
index ac329f46..e039ecdd 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/legacy_tab_completions/MixinChatScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/legacy_tab_completion/MixinChatScreen.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.legacy_tab_completions;
+package com.viaversion.viafabricplus.injection.mixin.features.legacy_tab_completion;
 
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.viaversion.viafabricplus.settings.impl.DebugSettings;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/allow_negative_amplifier/MixinStatusEffectInstance.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/limitation/allow_negative_amplifier/MixinStatusEffectInstance.java
similarity index 95%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/allow_negative_amplifier/MixinStatusEffectInstance.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/limitation/allow_negative_amplifier/MixinStatusEffectInstance.java
index 59b01abf..39bf315a 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/allow_negative_amplifier/MixinStatusEffectInstance.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/limitation/allow_negative_amplifier/MixinStatusEffectInstance.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.movement.allow_negative_amplifier;
+package com.viaversion.viafabricplus.injection.mixin.features.limitation.allow_negative_amplifier;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.util.math.MathHelper;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/book_edit_page_limitations/MixinBookEditScreen.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/limitation/book_edit/MixinBookEditScreen.java
similarity index 95%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/book_edit_page_limitations/MixinBookEditScreen.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/limitation/book_edit/MixinBookEditScreen.java
index 24f1b0bc..f61cf7d2 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/book_edit_page_limitations/MixinBookEditScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/limitation/book_edit/MixinBookEditScreen.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.book_edit_page_limitations;
+package com.viaversion.viafabricplus.injection.mixin.features.limitation.book_edit;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.client.gui.screen.ingame.BookEditScreen;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.Constant;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/collision/MixinAbstractBoatEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/collision/MixinAbstractBoatEntity.java
new file mode 100644
index 00000000..7ee035bc
--- /dev/null
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/collision/MixinAbstractBoatEntity.java
@@ -0,0 +1,46 @@
+/*
+ * This file is part of ViaFabricPlus - https://github.com/ViaVersion/ViaFabricPlus
+ * Copyright (C) 2021-2024 the original authors
+ *                         - FlorianMichael/EnZaXD <florian.michael07@gmail.com>
+ *                         - RK_01/RaphiMC
+ * Copyright (C) 2023-2024 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.viaversion.viafabricplus.injection.mixin.features.movement.collision;
+
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.vehicle.AbstractBoatEntity;
+import net.minecraft.util.math.Box;
+import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(AbstractBoatEntity.class)
+public abstract class MixinAbstractBoatEntity {
+
+    @Redirect(method = "updateVelocity", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;isSpaceEmpty(Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/Box;)Z"))
+    private boolean alwaysUpdatePosition(World instance, Entity entity, Box box) {
+        if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_20_5)) {
+            return true;
+        } else {
+            return instance.isSpaceEmpty(entity, box);
+        }
+    }
+
+}
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/elytra_movement/MixinClientPlayerEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/elytra/MixinClientPlayerEntity.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/elytra_movement/MixinClientPlayerEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/elytra/MixinClientPlayerEntity.java
index 2043434e..ee78704e 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/elytra_movement/MixinClientPlayerEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/elytra/MixinClientPlayerEntity.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.movement.elytra_movement;
+package com.viaversion.viafabricplus.injection.mixin.features.movement.elytra;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.mojang.authlib.GameProfile;
@@ -49,4 +49,4 @@ public abstract class MixinClientPlayerEntity extends AbstractClientPlayerEntity
         return ProtocolTranslator.getTargetVersion().newerThan(ProtocolVersion.v1_15_1) && original;
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/elytra_movement/MixinFireworkRocketItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/elytra/MixinFireworkRocketItem.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/elytra_movement/MixinFireworkRocketItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/elytra/MixinFireworkRocketItem.java
index f53b310d..7c704734 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/elytra_movement/MixinFireworkRocketItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/elytra/MixinFireworkRocketItem.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.movement.elytra_movement;
+package com.viaversion.viafabricplus.injection.mixin.features.movement.elytra;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.FireworkRocketItem;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/elytra_movement/MixinLivingEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/elytra/MixinLivingEntity.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/elytra_movement/MixinLivingEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/elytra/MixinLivingEntity.java
index 97833920..b8f1af71 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/elytra_movement/MixinLivingEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/elytra/MixinLivingEntity.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.movement.elytra_movement;
+package com.viaversion.viafabricplus.injection.mixin.features.movement.elytra;
 
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
@@ -61,4 +61,4 @@ public abstract class MixinLivingEntity extends Entity {
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/elytra_movement/MixinPlayerEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/elytra/MixinPlayerEntity.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/elytra_movement/MixinPlayerEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/elytra/MixinPlayerEntity.java
index fa66dacf..0223d3c8 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/elytra_movement/MixinPlayerEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/elytra/MixinPlayerEntity.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.movement.elytra_movement;
+package com.viaversion.viafabricplus.injection.mixin.features.movement.elytra;
 
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
@@ -56,4 +56,4 @@ public abstract class MixinPlayerEntity extends LivingEntity {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/slowdown_calculation_changes/MixinClientPlayerEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/slowdown_calculation/MixinClientPlayerEntity.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/slowdown_calculation_changes/MixinClientPlayerEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/slowdown_calculation/MixinClientPlayerEntity.java
index fdf16ff4..e33485e8 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/slowdown_calculation_changes/MixinClientPlayerEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/slowdown_calculation/MixinClientPlayerEntity.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.movement.slowdown_calculation_changes;
+package com.viaversion.viafabricplus.injection.mixin.features.movement.slowdown_calculation;
 
 import com.mojang.authlib.GameProfile;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
@@ -79,4 +79,4 @@ public abstract class MixinClientPlayerEntity extends AbstractClientPlayerEntity
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/slowdown_calculation_changes/MixinEnderEyeItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/slowdown_calculation/MixinEnderEyeItem.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/slowdown_calculation_changes/MixinEnderEyeItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/slowdown_calculation/MixinEnderEyeItem.java
index bb7b2e5e..e171f028 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/slowdown_calculation_changes/MixinEnderEyeItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/slowdown_calculation/MixinEnderEyeItem.java
@@ -19,11 +19,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.movement.slowdown_calculation_changes;
+package com.viaversion.viafabricplus.injection.mixin.features.movement.slowdown_calculation;
 
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.EnderEyeItem;
 import net.minecraft.util.Hand;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/sprinting_sneaking_condition_changes/MixinClientPlayerEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/sprinting_sneaking_condition/MixinClientPlayerEntity.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/sprinting_sneaking_condition_changes/MixinClientPlayerEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/sprinting_sneaking_condition/MixinClientPlayerEntity.java
index 3c30f215..e256271a 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/sprinting_sneaking_condition_changes/MixinClientPlayerEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/movement/sprinting_sneaking_condition/MixinClientPlayerEntity.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.movement.sprinting_sneaking_condition_changes;
+package com.viaversion.viafabricplus.injection.mixin.features.movement.sprinting_sneaking_condition;
 
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.mojang.authlib.GameProfile;
@@ -92,4 +92,4 @@ public abstract class MixinClientPlayerEntity extends AbstractClientPlayerEntity
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/always_set_highest_op_level/MixinClientPlayerEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/always_set_highest_op_level/MixinClientPlayerEntity.java
index d496b6e2..339b29ea 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/always_set_highest_op_level/MixinClientPlayerEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/always_set_highest_op_level/MixinClientPlayerEntity.java
@@ -43,4 +43,4 @@ public abstract class MixinClientPlayerEntity {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state_fixes/MixinClientConfigurationNetworkHandler.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state/MixinClientConfigurationNetworkHandler.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state_fixes/MixinClientConfigurationNetworkHandler.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state/MixinClientConfigurationNetworkHandler.java
index 1a051282..47788c81 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state_fixes/MixinClientConfigurationNetworkHandler.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state/MixinClientConfigurationNetworkHandler.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.networking.config_state_fixes;
+package com.viaversion.viafabricplus.injection.mixin.features.networking.config_state;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientCommonNetworkHandler;
 import net.minecraft.client.network.ClientConfigurationNetworkHandler;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state_fixes/MixinClientPlayNetworkHandler.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state/MixinClientPlayNetworkHandler.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state_fixes/MixinClientPlayNetworkHandler.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state/MixinClientPlayNetworkHandler.java
index c296080a..5c6c68cb 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state_fixes/MixinClientPlayNetworkHandler.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state/MixinClientPlayNetworkHandler.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.networking.config_state_fixes;
+package com.viaversion.viafabricplus.injection.mixin.features.networking.config_state;
 
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state_fixes/MixinNetworkStateTransitionHandler.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state/MixinNetworkStateTransitionHandler.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state_fixes/MixinNetworkStateTransitionHandler.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state/MixinNetworkStateTransitionHandler.java
index bf534cbd..8182ae63 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state_fixes/MixinNetworkStateTransitionHandler.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state/MixinNetworkStateTransitionHandler.java
@@ -19,11 +19,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.networking.config_state_fixes;
+package com.viaversion.viafabricplus.injection.mixin.features.networking.config_state;
 
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import io.netty.channel.ChannelConfig;
 import net.minecraft.network.handler.NetworkStateTransitionHandler;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state_fixes/MixinNetworkStateTransitions.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state/MixinNetworkStateTransitions.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state_fixes/MixinNetworkStateTransitions.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state/MixinNetworkStateTransitions.java
index eea3ceec..d775c3d7 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state_fixes/MixinNetworkStateTransitions.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state/MixinNetworkStateTransitions.java
@@ -19,11 +19,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.networking.config_state_fixes;
+package com.viaversion.viafabricplus.injection.mixin.features.networking.config_state;
 
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import io.netty.channel.ChannelConfig;
 import net.minecraft.network.handler.NetworkStateTransitions;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state_fixes/MixinProtocol1_20To1_20_2.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state/MixinProtocol1_20To1_20_2.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state_fixes/MixinProtocol1_20To1_20_2.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state/MixinProtocol1_20To1_20_2.java
index e2e3a445..508610d8 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state_fixes/MixinProtocol1_20To1_20_2.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/config_state/MixinProtocol1_20To1_20_2.java
@@ -19,13 +19,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.networking.config_state_fixes;
+package com.viaversion.viafabricplus.injection.mixin.features.networking.config_state;
 
+import com.viaversion.viafabricplus.settings.impl.DebugSettings;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ServerboundPackets1_19_4;
 import com.viaversion.viaversion.protocols.v1_20to1_20_2.Protocol1_20To1_20_2;
 import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ServerboundPackets1_20_2;
-import com.viaversion.viafabricplus.settings.impl.DebugSettings;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/downloading_terrain_handling/MixinClientPlayNetworkHandler.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/downloading_terrain/MixinClientPlayNetworkHandler.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/downloading_terrain_handling/MixinClientPlayNetworkHandler.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/downloading_terrain/MixinClientPlayNetworkHandler.java
index 89b486fc..9d4a81fa 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/downloading_terrain_handling/MixinClientPlayNetworkHandler.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/downloading_terrain/MixinClientPlayNetworkHandler.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.networking.downloading_terrain_handling;
+package com.viaversion.viafabricplus.injection.mixin.features.networking.downloading_terrain;
 
 import com.viaversion.viafabricplus.injection.access.networking.downloading_terrain_handling.IDownloadingTerrainScreen;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/downloading_terrain_handling/MixinDownloadingTerrainScreen.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/downloading_terrain/MixinDownloadingTerrainScreen.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/downloading_terrain_handling/MixinDownloadingTerrainScreen.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/downloading_terrain/MixinDownloadingTerrainScreen.java
index 5c6db52b..a2d246f8 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/downloading_terrain_handling/MixinDownloadingTerrainScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/downloading_terrain/MixinDownloadingTerrainScreen.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.networking.downloading_terrain_handling;
+package com.viaversion.viafabricplus.injection.mixin.features.networking.downloading_terrain;
 
 import com.viaversion.viafabricplus.injection.access.networking.downloading_terrain_handling.IDownloadingTerrainScreen;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signatures/MixinConnectScreen_1.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signature/MixinConnectScreen_1.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signatures/MixinConnectScreen_1.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signature/MixinConnectScreen_1.java
index d0571054..bfd3abad 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signatures/MixinConnectScreen_1.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signature/MixinConnectScreen_1.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.networking.legacy_chat_signatures;
+package com.viaversion.viafabricplus.injection.mixin.features.networking.legacy_chat_signature;
 
 import com.llamalad7.mixinextras.sugar.Local;
 import com.viaversion.viafabricplus.ViaFabricPlusImpl;
@@ -50,7 +50,7 @@ public abstract class MixinConnectScreen_1 {
 
     @Shadow
     @Final
-    private MinecraftClient field_33738;
+    MinecraftClient field_33738;
 
     @Inject(method = "run", at = @At(value = "INVOKE", target = "Lio/netty/channel/ChannelFuture;syncUninterruptibly()Lio/netty/channel/ChannelFuture;", remap = false, shift = At.Shift.AFTER))
     private void setupChatSessions(CallbackInfo ci, @Local ClientConnection clientConnection) {
@@ -78,4 +78,4 @@ public abstract class MixinConnectScreen_1 {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signatures/MixinKeyPairResponse.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signature/MixinKeyPairResponse.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signatures/MixinKeyPairResponse.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signature/MixinKeyPairResponse.java
index fc45089e..88279e84 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signatures/MixinKeyPairResponse.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signature/MixinKeyPairResponse.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.networking.legacy_chat_signatures;
+package com.viaversion.viafabricplus.injection.mixin.features.networking.legacy_chat_signature;
 
 import com.mojang.authlib.yggdrasil.response.KeyPairResponse;
 import com.viaversion.viafabricplus.injection.access.legacy_chat_signatures.ILegacyKeySignatureStorage;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signatures/MixinPlayerPublicKey_PublicKeyData.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signature/MixinPlayerPublicKey_PublicKeyData.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signatures/MixinPlayerPublicKey_PublicKeyData.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signature/MixinPlayerPublicKey_PublicKeyData.java
index d7c6262d..a319f74a 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signatures/MixinPlayerPublicKey_PublicKeyData.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signature/MixinPlayerPublicKey_PublicKeyData.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.networking.legacy_chat_signatures;
+package com.viaversion.viafabricplus.injection.mixin.features.networking.legacy_chat_signature;
 
 import com.viaversion.viafabricplus.injection.access.legacy_chat_signatures.ILegacyKeySignatureStorage;
 import net.minecraft.network.encryption.PlayerPublicKey;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signatures/MixinProfileKeysImpl.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signature/MixinProfileKeysImpl.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signatures/MixinProfileKeysImpl.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signature/MixinProfileKeysImpl.java
index 4f03a240..3922d0d8 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signatures/MixinProfileKeysImpl.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signature/MixinProfileKeysImpl.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.networking.legacy_chat_signatures;
+package com.viaversion.viafabricplus.injection.mixin.features.networking.legacy_chat_signature;
 
 import com.mojang.authlib.yggdrasil.response.KeyPairResponse;
 import com.viaversion.viafabricplus.injection.access.legacy_chat_signatures.ILegacyKeySignatureStorage;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signatures/MixinYggdrasilUserApiService.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signature/MixinYggdrasilUserApiService.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signatures/MixinYggdrasilUserApiService.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signature/MixinYggdrasilUserApiService.java
index bfd72706..629f0c85 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signatures/MixinYggdrasilUserApiService.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/legacy_chat_signature/MixinYggdrasilUserApiService.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.networking.legacy_chat_signatures;
+package com.viaversion.viafabricplus.injection.mixin.features.networking.legacy_chat_signature;
 
 import com.mojang.authlib.minecraft.client.MinecraftClient;
 import com.mojang.authlib.yggdrasil.YggdrasilUserApiService;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/open_inventory_packet/MixinMinecraftClient.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/open_inventory_packet/MixinMinecraftClient.java
similarity index 72%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/open_inventory_packet/MixinMinecraftClient.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/open_inventory_packet/MixinMinecraftClient.java
index 42ab08d5..79df3221 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/open_inventory_packet/MixinMinecraftClient.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/open_inventory_packet/MixinMinecraftClient.java
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.open_inventory_packet;
+package com.viaversion.viafabricplus.injection.mixin.features.networking.open_inventory_packet;
 
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.protocols.v1_11_1to1_12.Protocol1_11_1To1_12;
 import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ServerboundPackets1_9_3;
-import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;
 import org.jetbrains.annotations.Nullable;
@@ -34,7 +34,6 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(MinecraftClient.class)
@@ -44,9 +43,6 @@ public abstract class MixinMinecraftClient {
     @Nullable
     public ClientPlayerEntity player;
 
-    @Shadow
-    protected int attackCooldown;
-
     @Inject(method = "handleInputEvents", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/tutorial/TutorialManager;onInventoryOpened()V", shift = At.Shift.AFTER))
     private void sendOpenInventoryPacket(CallbackInfo ci) {
         if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_11_1)) {
@@ -56,22 +52,4 @@ public abstract class MixinMinecraftClient {
         }
     }
 
-    @Redirect(method = "tick", at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient;attackCooldown:I", ordinal = 1))
-    private int moveCooldownIncrement(MinecraftClient instance) {
-        if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_8)) {
-            return 0;
-        } else {
-            return attackCooldown;
-        }
-    }
-
-    @Inject(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;handleInputEvents()V", shift = At.Shift.BEFORE))
-    private void moveCooldownIncrement(CallbackInfo ci) {
-        if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_8)) {
-            if (this.attackCooldown > 0) {
-                --this.attackCooldown;
-            }
-        }
-    }
-
 }
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling_changes/MixinClientCommonNetworkHandler.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling/MixinClientCommonNetworkHandler.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling_changes/MixinClientCommonNetworkHandler.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling/MixinClientCommonNetworkHandler.java
index 1faf78e2..2991f407 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling_changes/MixinClientCommonNetworkHandler.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling/MixinClientCommonNetworkHandler.java
@@ -19,12 +19,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.networking.packet_handling_changes;
+package com.viaversion.viafabricplus.injection.mixin.features.networking.packet_handling;
 
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import com.viaversion.viafabricplus.settings.impl.DebugSettings;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientCommonNetworkHandler;
 import net.minecraft.network.ClientConnection;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling_changes/MixinClientLoginNetworkHandler.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling/MixinClientLoginNetworkHandler.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling_changes/MixinClientLoginNetworkHandler.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling/MixinClientLoginNetworkHandler.java
index 333aef10..ca95783e 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling_changes/MixinClientLoginNetworkHandler.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling/MixinClientLoginNetworkHandler.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.networking.packet_handling_changes;
+package com.viaversion.viafabricplus.injection.mixin.features.networking.packet_handling;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.client.network.ClientLoginNetworkHandler;
 import net.minecraft.network.ClientConnection;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling_changes/MixinClientPlayNetworkHandler.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling/MixinClientPlayNetworkHandler.java
similarity index 99%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling_changes/MixinClientPlayNetworkHandler.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling/MixinClientPlayNetworkHandler.java
index 92b3ca4f..922fea63 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling_changes/MixinClientPlayNetworkHandler.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling/MixinClientPlayNetworkHandler.java
@@ -19,12 +19,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.networking.packet_handling_changes;
+package com.viaversion.viafabricplus.injection.mixin.features.networking.packet_handling;
 
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.llamalad7.mixinextras.sugar.Local;
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.block.entity.SignBlockEntity;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.DownloadingTerrainScreen;
@@ -72,9 +72,6 @@ public abstract class MixinClientPlayNetworkHandler extends ClientCommonNetworkH
     @Shadow
     public abstract ClientConnection getConnection();
 
-    @Shadow
-    protected abstract boolean isSecureChatEnforced();
-
     @Shadow
     private ClientWorld world;
 
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling_changes/MixinEntityPacketRewriter1_19_4.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling/MixinEntityPacketRewriter1_19_4.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling_changes/MixinEntityPacketRewriter1_19_4.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling/MixinEntityPacketRewriter1_19_4.java
index 0a406cc6..474d4fec 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling_changes/MixinEntityPacketRewriter1_19_4.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling/MixinEntityPacketRewriter1_19_4.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.networking.packet_handling_changes;
+package com.viaversion.viafabricplus.injection.mixin.features.networking.packet_handling;
 
 import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.packet.ClientboundPackets1_19_3;
 import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.Protocol1_19_3To1_19_4;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling_changes/MixinEntityPacketRewriter1_20_3.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling/MixinEntityPacketRewriter1_20_3.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling_changes/MixinEntityPacketRewriter1_20_3.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling/MixinEntityPacketRewriter1_20_3.java
index 2af2b2d5..90a94916 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling_changes/MixinEntityPacketRewriter1_20_3.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/packet_handling/MixinEntityPacketRewriter1_20_3.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.networking.packet_handling_changes;
+package com.viaversion.viafabricplus.injection.mixin.features.networking.packet_handling;
 
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.rewriter.EntityPacketRewriter1_20_3;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/player_abilities/MixinUpdatePlayerAbilitiesC2SPacket.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/player_abilities/MixinUpdatePlayerAbilitiesC2SPacket.java
similarity index 96%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/player_abilities/MixinUpdatePlayerAbilitiesC2SPacket.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/player_abilities/MixinUpdatePlayerAbilitiesC2SPacket.java
index 1bee7d54..9ebd4ca2 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/player_abilities/MixinUpdatePlayerAbilitiesC2SPacket.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/player_abilities/MixinUpdatePlayerAbilitiesC2SPacket.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.player_abilities;
+package com.viaversion.viafabricplus.injection.mixin.features.networking.player_abilities;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.entity.player.PlayerAbilities;
 import net.minecraft.network.PacketByteBuf;
 import net.minecraft.network.packet.c2s.play.UpdatePlayerAbilitiesC2SPacket;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/registry_validations/MixinRegistryEntryListCodec.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/registry_validation/MixinRegistryEntryListCodec.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/registry_validations/MixinRegistryEntryListCodec.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/registry_validation/MixinRegistryEntryListCodec.java
index 23f7d1cd..0ef4c931 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/registry_validations/MixinRegistryEntryListCodec.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/registry_validation/MixinRegistryEntryListCodec.java
@@ -19,11 +19,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.networking.registry_validations;
+package com.viaversion.viafabricplus.injection.mixin.features.networking.registry_validation;
 
 import com.mojang.serialization.DataResult;
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.registry.RegistryEntryLookup;
 import net.minecraft.registry.entry.RegistryEntryList;
 import net.minecraft.registry.entry.RegistryEntryListCodec;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/registry_validations/MixinRegistryEntryList_Named.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/registry_validation/MixinRegistryEntryList_Named.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/registry_validations/MixinRegistryEntryList_Named.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/registry_validation/MixinRegistryEntryList_Named.java
index 7e97be7e..935023e6 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/registry_validations/MixinRegistryEntryList_Named.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/registry_validation/MixinRegistryEntryList_Named.java
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.networking.registry_validations;
+package com.viaversion.viafabricplus.injection.mixin.features.networking.registry_validation;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.registry.entry.RegistryEntryList;
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/remove_nbt_limitations/MixinNamedCompoundTagType.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/remove_nbt_limitation/MixinNamedCompoundTagType.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/remove_nbt_limitations/MixinNamedCompoundTagType.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/remove_nbt_limitation/MixinNamedCompoundTagType.java
index 6905a7f2..090fa0d5 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/remove_nbt_limitations/MixinNamedCompoundTagType.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/remove_nbt_limitation/MixinNamedCompoundTagType.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.networking.remove_nbt_limitations;
+package com.viaversion.viafabricplus.injection.mixin.features.networking.remove_nbt_limitation;
 
 import com.viaversion.nbt.limiter.TagLimiter;
 import com.viaversion.viaversion.api.type.types.misc.NamedCompoundTagType;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/remove_nbt_limitations/MixinTagType.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/remove_nbt_limitation/MixinTagType.java
similarity index 98%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/remove_nbt_limitations/MixinTagType.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/remove_nbt_limitation/MixinTagType.java
index 86920fe1..9e09ba1c 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/remove_nbt_limitations/MixinTagType.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/remove_nbt_limitation/MixinTagType.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.networking.remove_nbt_limitations;
+package com.viaversion.viafabricplus.injection.mixin.features.networking.remove_nbt_limitation;
 
 import com.viaversion.nbt.limiter.TagLimiter;
 import com.viaversion.viaversion.api.type.types.misc.TagType;
diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/legacy_skin_loading/MixinPlayerListEntry.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/skin_loading/MixinPlayerListEntry.java
similarity index 97%
rename from src/main/java/com/viaversion/viafabricplus/injection/mixin/features/legacy_skin_loading/MixinPlayerListEntry.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/features/skin_loading/MixinPlayerListEntry.java
index 9ca9fd9f..f570def2 100644
--- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/legacy_skin_loading/MixinPlayerListEntry.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/skin_loading/MixinPlayerListEntry.java
@@ -19,12 +19,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.legacy_skin_loading;
+package com.viaversion.viafabricplus.injection.mixin.features.skin_loading;
 
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.yggdrasil.ProfileResult;
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.PlayerListEntry;
 import net.minecraft.client.texture.PlayerSkinProvider;
diff --git a/src/main/resources/viafabricplus.mixins.json b/src/main/resources/viafabricplus.mixins.json
index e085362b..ac04bd8b 100644
--- a/src/main/resources/viafabricplus.mixins.json
+++ b/src/main/resources/viafabricplus.mixins.json
@@ -40,78 +40,79 @@
     "compat.minecraftauth.MixinClasses",
     "compat.minecraftauth.MixinDefaultJwtParserBuilder",
     "features.april_fools_8bit_sound.MixinStaticSound",
-    "features.bedrock.allow_new_lines.MixinTextRenderer",
-    "features.bedrock.chat_suggestions.MixinClientCommandSource",
+    "features.bedrock.allow_new_line.MixinTextRenderer",
     "features.bedrock.reach_around_raycast.MixinGameRenderer",
-    "features.block.collision_shapes.MixinAbstractRailBlock",
-    "features.block.collision_shapes.MixinAnvilBlock",
-    "features.block.collision_shapes.MixinBedBlock",
-    "features.block.collision_shapes.MixinBrewingStandBlock",
-    "features.block.collision_shapes.MixinCarpetBlock",
-    "features.block.collision_shapes.MixinCauldronBlock",
-    "features.block.collision_shapes.MixinChestBlock",
-    "features.block.collision_shapes.MixinCropBlock",
-    "features.block.collision_shapes.MixinEnderChestBlock",
-    "features.block.collision_shapes.MixinEndPortalBlock",
-    "features.block.collision_shapes.MixinEndPortalFrameBlock",
-    "features.block.collision_shapes.MixinFarmlandBlock",
-    "features.block.collision_shapes.MixinFenceBlock",
-    "features.block.collision_shapes.MixinFenceGateBlock",
-    "features.block.collision_shapes.MixinFireBlock",
-    "features.block.collision_shapes.MixinFlowerbedBlock",
-    "features.block.collision_shapes.MixinHopperBlock",
-    "features.block.collision_shapes.MixinLadderBlock",
-    "features.block.collision_shapes.MixinLeavesBlock",
-    "features.block.collision_shapes.MixinLilyPadBlock",
-    "features.block.collision_shapes.MixinPaneBlock",
-    "features.block.collision_shapes.MixinPistonBlock",
-    "features.block.collision_shapes.MixinPistonHeadBlock",
-    "features.block.collision_shapes.MixinSnowBlock",
-    "features.block.collision_shapes.MixinSoulSandBlock",
-    "features.block.collision_shapes.MixinWallBlock",
-    "features.block.interactions.MixinAbstractSignBlock",
-    "features.block.interactions.MixinDecoratedPotBlock",
-    "features.block.interactions.MixinFenceBlock",
-    "features.block.interactions.MixinFlowerPotBlock",
-    "features.block.interactions.MixinNoteBlock",
-    "features.block.mining_calculations.MixinAbstractBlock",
-    "features.block.mining_calculations.MixinAbstractBlock_AbstractBlockState",
-    "features.book_edit_page_limitations.MixinBookEditScreen",
-    "features.classic_world_height.MixinBuiltChunk",
-    "features.classic_world_height.MixinEntityPacketRewriter1_17",
-    "features.classic_world_height.MixinWorldPacketRewriter1_16_2",
-    "features.classic_world_height.MixinWorldPacketRewriter1_17",
-    "features.cpe_extensions.MixinClassicProtocolExtension",
-    "features.cpe_extensions.MixinClientboundPacketsc0_30cpe",
-    "features.cpe_extensions.MixinProtocolc0_30cpeToc0_28_30",
-    "features.cpe_extensions.MixinWeatherRendering",
-    "features.entity.allow_duplicated_uuids.MixinEntityIndex",
-    "features.entity.enchantment_attributes.MixinLivingEntity",
-    "features.entity.interactions.MixinAbstractBoatEntity",
-    "features.entity.interactions.MixinAbstractClientPlayerEntity",
-    "features.entity.interactions.MixinAbstractHorseEntity",
-    "features.entity.interactions.MixinAnimalEntity",
-    "features.entity.interactions.MixinArmadilloEntity",
-    "features.entity.interactions.MixinAxolotlEntity",
-    "features.entity.interactions.MixinBeeEntity",
-    "features.entity.interactions.MixinCatEntity",
-    "features.entity.interactions.MixinCowEntity",
-    "features.entity.interactions.MixinCreeperEntity",
-    "features.entity.interactions.MixinMobEntity",
-    "features.entity.interactions.MixinMooshroomEntity",
-    "features.entity.interactions.MixinSquidEntity",
-    "features.entity.interactions.MixinWolfEntity",
-    "features.entity.interactions.MixinZombieVillagerEntity",
+    "features.bedrock.remove_dummy_player_suggestions.MixinClientCommandSource",
+    "features.block.interaction.MixinAbstractSignBlock",
+    "features.block.interaction.MixinDecoratedPotBlock",
+    "features.block.interaction.MixinFenceBlock",
+    "features.block.interaction.MixinFlowerPotBlock",
+    "features.block.interaction.MixinNoteBlock",
+    "features.block.mining_calculation.MixinAbstractBlock",
+    "features.block.mining_calculation.MixinAbstractBlock_AbstractBlockState",
+    "features.block.shape.MixinAbstractRailBlock",
+    "features.block.shape.MixinAnvilBlock",
+    "features.block.shape.MixinBedBlock",
+    "features.block.shape.MixinBrewingStandBlock",
+    "features.block.shape.MixinCarpetBlock",
+    "features.block.shape.MixinCauldronBlock",
+    "features.block.shape.MixinChestBlock",
+    "features.block.shape.MixinCropBlock",
+    "features.block.shape.MixinEnderChestBlock",
+    "features.block.shape.MixinEndPortalBlock",
+    "features.block.shape.MixinEndPortalFrameBlock",
+    "features.block.shape.MixinFarmlandBlock",
+    "features.block.shape.MixinFenceBlock",
+    "features.block.shape.MixinFenceGateBlock",
+    "features.block.shape.MixinFireBlock",
+    "features.block.shape.MixinFlowerbedBlock",
+    "features.block.shape.MixinHopperBlock",
+    "features.block.shape.MixinLadderBlock",
+    "features.block.shape.MixinLeavesBlock",
+    "features.block.shape.MixinLilyPadBlock",
+    "features.block.shape.MixinPaneBlock",
+    "features.block.shape.MixinPistonBlock",
+    "features.block.shape.MixinPistonHeadBlock",
+    "features.block.shape.MixinSnowBlock",
+    "features.block.shape.MixinSoulSandBlock",
+    "features.block.shape.MixinWallBlock",
+    "features.border_chunk_rendering.MixinBuiltChunk",
+    "features.classic.cpe_extension.MixinClassicProtocolExtension",
+    "features.classic.cpe_extension.MixinClientboundPacketsc0_30cpe",
+    "features.classic.cpe_extension.MixinProtocolc0_30cpeToc0_28_30",
+    "features.classic.cpe_extension.MixinWeatherRendering",
+    "features.classic.world_height.MixinEntityPacketRewriter1_17",
+    "features.classic.world_height.MixinWorldPacketRewriter1_16_2",
+    "features.classic.world_height.MixinWorldPacketRewriter1_17",
+    "features.entity.allow_duplicated_uuid.MixinEntityIndex",
+    "features.entity.attribute.MixinEntityPacketRewriter1_20_5",
+    "features.entity.attribute.MixinLivingEntity",
+    "features.entity.interaction.MixinAbstractBoatEntity",
+    "features.entity.interaction.MixinAbstractHorseEntity",
+    "features.entity.interaction.MixinAnimalEntity",
+    "features.entity.interaction.MixinArmadilloEntity",
+    "features.entity.interaction.MixinAxolotlEntity",
+    "features.entity.interaction.MixinBeeEntity",
+    "features.entity.interaction.MixinCatEntity",
+    "features.entity.interaction.MixinCowEntity",
+    "features.entity.interaction.MixinCreeperEntity",
+    "features.entity.interaction.MixinMobEntity",
+    "features.entity.interaction.MixinMooshroomEntity",
+    "features.entity.interaction.MixinSquidEntity",
+    "features.entity.interaction.MixinWolfEntity",
+    "features.entity.interaction.MixinZombieVillagerEntity",
     "features.entity.metadata_handling.MixinCommonBoss",
     "features.entity.metadata_handling.MixinEntityPacketRewriter1_15",
     "features.entity.metadata_handling.MixinEntityPacketRewriter1_9",
     "features.entity.metadata_handling.MixinEntityTracker1_9",
+    "features.entity.metadata_handling.MixinWolfEntity",
     "features.entity.pose.MixinOtherClientPlayerEntity",
     "features.entity.pose.MixinPlayerEntity",
-    "features.entity.riding_offsets.MixinAbstractBoatEntity",
-    "features.entity.riding_offsets.MixinCamelEntity",
-    "features.entity.riding_offsets.MixinEntity",
-    "features.entity.riding_offsets.MixinLivingEntity",
+    "features.entity.riding_offset.MixinAbstractBoatEntity",
+    "features.entity.riding_offset.MixinCamelEntity",
+    "features.entity.riding_offset.MixinEntity",
+    "features.entity.riding_offset.MixinLivingEntity",
+    "features.entity.v1_8_boat.MixinAbstractBoatEntity",
     "features.entity.v1_8_boat.MixinEntityModels",
     "features.entity.v1_8_boat.MixinEntityRenderDispatcher",
     "features.execute_inputs_sync.MixinKeyboard",
@@ -121,47 +122,50 @@
     "features.footstep_particle.MixinParticleIdMappings1_13",
     "features.footstep_particle.MixinParticleMappings",
     "features.footstep_particle.MixinRegistrySyncManager",
-    "features.interaction.MixinEntityPacketRewriter1_20_5",
+    "features.interaction.MixinAbstractClientPlayerEntity",
+    "features.interaction.attack_cooldown.MixinMinecraftClient",
     "features.interaction.container_clicking.MixinAbstractFurnaceScreenHandler",
     "features.interaction.container_clicking.MixinClientPlayerInteractionManager",
     "features.interaction.container_clicking.MixinCraftingScreenHandler",
     "features.interaction.container_clicking.MixinItemPacketRewriter1_17",
+    "features.interaction.container_clicking.MixinMerchantScreenHandler",
     "features.interaction.container_clicking.MixinScreenHandler",
-    "features.interaction.merchant_emulation.MixinMerchantScreenHandler",
     "features.interaction.remove_fuel_slot.MixinBrewingStandScreenHandler_FuelSlot",
     "features.interaction.remove_offhand_slot.MixinPlayerScreenHandler",
     "features.interaction.replace_block_item_use_logic.MixinClientPlayerInteractionManager",
     "features.interaction.replace_block_item_use_logic.MixinItemPlacementContext",
-    "features.interaction.replace_block_item_use_logic.item_and_block_use_at_same_time.MixinMinecraftClient",
+    "features.interaction.replace_block_item_use_logic.MixinMinecraftClient",
     "features.interaction.v1_18_2_block_ack_emulation.MixinClientPlayerInteractionManager",
     "features.interaction.v1_18_2_block_ack_emulation.MixinWorldPacketRewriter1_19",
-    "features.item.attack_damage_changes.MixinItemPacketRewriter1_9",
-    "features.item.attack_damage_changes.MixinItemStack",
+    "features.item.attack_damage.MixinItemPacketRewriter1_9",
+    "features.item.attack_damage.MixinItemStack",
     "features.item.cooldown.MixinItemCooldownManager",
+    "features.item.data_fix.MixinBlockItemPacketRewriter1_20_5",
     "features.item.filter_creative_tabs.MixinItemGroup_EntriesImpl",
     "features.item.filter_creative_tabs.MixinItemGroups",
-    "features.item.gracefully_handle_enchantment_tooltips.MixinItemStack",
-    "features.item.interactions.MixinAxeItem",
-    "features.item.interactions.MixinBlockItem",
-    "features.item.interactions.MixinBowItem",
-    "features.item.interactions.MixinBrushItem",
-    "features.item.interactions.MixinBucketItem",
-    "features.item.interactions.MixinBundleItem",
-    "features.item.interactions.MixinEnderPearlItem",
-    "features.item.interactions.MixinEquippableComponent",
-    "features.item.interactions.MixinFireChargeItem",
-    "features.item.interactions.MixinFishingRodItem",
-    "features.item.interactions.MixinKnowledgeBookItem",
-    "features.item.interactions.MixinLeadItem",
-    "features.item.interactions.MixinShovelItem",
-    "features.item.negative_items.MixinDrawContext",
-    "features.item.protocol_level_value_fixes.MixinBlockItemPacketRewriter1_20_5",
+    "features.item.interaction.MixinAxeItem",
+    "features.item.interaction.MixinBlockItem",
+    "features.item.interaction.MixinBowItem",
+    "features.item.interaction.MixinBrushItem",
+    "features.item.interaction.MixinBucketItem",
+    "features.item.interaction.MixinBundleItem",
+    "features.item.interaction.MixinEnderPearlItem",
+    "features.item.interaction.MixinEquippableComponent",
+    "features.item.interaction.MixinFireChargeItem",
+    "features.item.interaction.MixinFishingRodItem",
+    "features.item.interaction.MixinKnowledgeBookItem",
+    "features.item.interaction.MixinLeadItem",
+    "features.item.interaction.MixinShovelItem",
+    "features.item.negative_item_count.MixinDrawContext",
     "features.item.sword_blocking.MixinBlockItemPacketRewriter1_21_4",
     "features.item.sword_blocking.MixinSwordItem",
-    "features.legacy_skin_loading.MixinPlayerListEntry",
-    "features.legacy_tab_completions.MixinAbstractCommandBlockScreen",
-    "features.legacy_tab_completions.MixinChatInputSuggestor",
-    "features.legacy_tab_completions.MixinChatScreen",
+    "features.item.v1_14_4_enchantment_tooltip.MixinItemStack",
+    "features.large_container.MixinItemPacketRewriter1_14",
+    "features.legacy_tab_completion.MixinAbstractCommandBlockScreen",
+    "features.legacy_tab_completion.MixinChatInputSuggestor",
+    "features.legacy_tab_completion.MixinChatScreen",
+    "features.limitation.allow_negative_amplifier.MixinStatusEffectInstance",
+    "features.limitation.book_edit.MixinBookEditScreen",
     "features.max_chat_length.MixinChatMessageC2SPacket",
     "features.max_chat_length.MixinChatScreen",
     "features.max_chat_length.MixinProtocol1_10To1_11",
@@ -169,10 +173,12 @@
     "features.mouse_sensitivity.MixinMouse",
     "features.mouse_sensitivity.MixinMouseOptionsScreen",
     "features.movement.MixinClientPlayerEntity",
-    "features.movement.allow_negative_amplifier.MixinStatusEffectInstance",
     "features.movement.change_honey_slowness.MixinHoneyBlock",
-    "features.movement.elytra_movement.MixinClientPlayerEntity",
-    "features.movement.elytra_movement.MixinFireworkRocketItem",
+    "features.movement.collision.MixinAbstractBoatEntity",
+    "features.movement.elytra.MixinClientPlayerEntity",
+    "features.movement.elytra.MixinFireworkRocketItem",
+    "features.movement.elytra.MixinLivingEntity",
+    "features.movement.elytra.MixinPlayerEntity",
     "features.movement.entity.MixinEntity",
     "features.movement.entity.MixinLivingEntity",
     "features.movement.entity.MixinPlayerEntity",
@@ -180,11 +186,10 @@
     "features.movement.handle_slowness_on_collision.MixinSoulSandBlock",
     "features.movement.jump.MixinClientPlayerEntity",
     "features.movement.remove_bed_bounce.MixinBedBlock",
-    "features.movement.replace_boat_movement.MixinAbstractBoatEntity",
     "features.movement.replace_boat_movement.MixinClientPlayerEntity",
-    "features.movement.slowdown_calculation_changes.MixinClientPlayerEntity",
-    "features.movement.slowdown_calculation_changes.MixinEnderEyeItem",
-    "features.movement.sprinting_sneaking_condition_changes.MixinClientPlayerEntity",
+    "features.movement.slowdown_calculation.MixinClientPlayerEntity",
+    "features.movement.slowdown_calculation.MixinEnderEyeItem",
+    "features.movement.sprinting_sneaking_condition.MixinClientPlayerEntity",
     "features.movement.v1_5_2_vehicle_movement.MixinClientPlayerEntity",
     "features.movement.water_movement.MixinClientPlayerEntity",
     "features.movement.water_movement.MixinEntity",
@@ -193,28 +198,30 @@
     "features.movement.water_movement.MixinLivingEntity",
     "features.movement.water_movement.MixinSkeletonHorseEntity",
     "features.networking.always_set_highest_op_level.MixinClientPlayerEntity",
-    "features.networking.config_state_fixes.MixinClientConfigurationNetworkHandler",
-    "features.networking.config_state_fixes.MixinClientPlayNetworkHandler",
-    "features.networking.config_state_fixes.MixinNetworkStateTransitionHandler",
-    "features.networking.config_state_fixes.MixinNetworkStateTransitions",
-    "features.networking.config_state_fixes.MixinProtocol1_20To1_20_2",
-    "features.networking.downloading_terrain_handling.MixinClientPlayNetworkHandler",
-    "features.networking.downloading_terrain_handling.MixinDownloadingTerrainScreen",
-    "features.networking.legacy_chat_signatures.MixinConnectScreen_1",
-    "features.networking.legacy_chat_signatures.MixinKeyPairResponse",
-    "features.networking.legacy_chat_signatures.MixinPlayerPublicKey_PublicKeyData",
-    "features.networking.legacy_chat_signatures.MixinProfileKeysImpl",
-    "features.networking.legacy_chat_signatures.MixinYggdrasilUserApiService",
-    "features.networking.packet_handling_changes.MixinClientCommonNetworkHandler",
-    "features.networking.packet_handling_changes.MixinClientLoginNetworkHandler",
-    "features.networking.packet_handling_changes.MixinClientPlayNetworkHandler",
-    "features.networking.packet_handling_changes.MixinEntityPacketRewriter1_19_4",
-    "features.networking.packet_handling_changes.MixinEntityPacketRewriter1_20_3",
-    "features.networking.registry_validations.MixinRegistryEntryList_Named",
-    "features.networking.registry_validations.MixinRegistryEntryListCodec",
+    "features.networking.config_state.MixinClientConfigurationNetworkHandler",
+    "features.networking.config_state.MixinClientPlayNetworkHandler",
+    "features.networking.config_state.MixinNetworkStateTransitionHandler",
+    "features.networking.config_state.MixinNetworkStateTransitions",
+    "features.networking.config_state.MixinProtocol1_20To1_20_2",
+    "features.networking.downloading_terrain.MixinClientPlayNetworkHandler",
+    "features.networking.downloading_terrain.MixinDownloadingTerrainScreen",
+    "features.networking.legacy_chat_signature.MixinConnectScreen_1",
+    "features.networking.legacy_chat_signature.MixinKeyPairResponse",
+    "features.networking.legacy_chat_signature.MixinPlayerPublicKey_PublicKeyData",
+    "features.networking.legacy_chat_signature.MixinProfileKeysImpl",
+    "features.networking.legacy_chat_signature.MixinYggdrasilUserApiService",
+    "features.networking.open_inventory_packet.MixinMinecraftClient",
+    "features.networking.packet_handling.MixinClientCommonNetworkHandler",
+    "features.networking.packet_handling.MixinClientLoginNetworkHandler",
+    "features.networking.packet_handling.MixinClientPlayNetworkHandler",
+    "features.networking.packet_handling.MixinEntityPacketRewriter1_19_4",
+    "features.networking.packet_handling.MixinEntityPacketRewriter1_20_3",
+    "features.networking.player_abilities.MixinUpdatePlayerAbilitiesC2SPacket",
+    "features.networking.registry_validation.MixinRegistryEntryList_Named",
+    "features.networking.registry_validation.MixinRegistryEntryListCodec",
     "features.networking.remove_legacy_pinger.MixinMultiplayerServerListPinger",
-    "features.networking.remove_nbt_limitations.MixinNamedCompoundTagType",
-    "features.networking.remove_nbt_limitations.MixinTagType",
+    "features.networking.remove_nbt_limitation.MixinNamedCompoundTagType",
+    "features.networking.remove_nbt_limitation.MixinTagType",
     "features.networking.remove_signed_commands.MixinClientPlayNetworkHandler",
     "features.networking.remove_signed_commands.MixinProtocol1_20_3To1_20_5",
     "features.networking.resource_pack_header.MixinServerResourcePackLoader_4",
@@ -223,17 +230,15 @@
     "features.networking.srv_resolving.MixinRedirectResolver",
     "features.networking.srv_resolving.MixinServerAddress",
     "features.networking.warn_feature_updates.MixinClientConfigurationNetworkHandler",
-    "features.open_inventory_packet.MixinMinecraftClient",
-    "features.player_abilities.MixinUpdatePlayerAbilitiesC2SPacket",
     "features.recipe_emulation.MixinCraftingScreenHandler",
     "features.recipe_emulation.MixinEntityPacketRewriter1_12",
     "features.recipe_emulation.MixinPlayerScreenHandler",
     "features.run_command_action_handling.MixinScreen",
     "features.sign_editor_reach.MixinAbstractSignEditScreen",
+    "features.skin_loading.MixinPlayerListEntry",
     "features.strike_through_offset.MixinTextRenderer_Drawer",
     "features.swinging.MixinInventoryTracker1_16",
     "features.swinging.MixinMinecraftClient",
-    "features.triple_chests.MixinItemPacketRewriter1_14",
     "features.world.always_tick_entities.MixinClientWorld",
     "features.world.always_tick_entities.MixinEntity",
     "features.world.disable_sequencing.MixinClientWorld",
@@ -241,9 +246,7 @@
     "features.world.item_picking.MixinMinecraftClient",
     "features.world.remove_server_view_distance.MixinGameOptions",
     "integration.viabedrock.MixinJoinPackets",
-    "integration.vialegacy.MixinViaLegacyConfig",
-    "features.movement.elytra_movement.MixinLivingEntity",
-    "features.movement.elytra_movement.MixinPlayerEntity"
+    "integration.vialegacy.MixinViaLegacyConfig"
   ],
   "injectors": {
     "defaultRequire": 1