diff --git a/docs/DEVELOPER_API.md b/docs/DEVELOPER_API.md
index de51d95b..71e769e4 100644
--- a/docs/DEVELOPER_API.md
+++ b/docs/DEVELOPER_API.md
@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    modImplementation("de.florianmichael:ViaFabricPlus:x.x.x") // Get the latest version from releases
+    modImplementation("com.viaversion:viafabricplus:x.x.x") // Get the latest version from releases
 }
 ```
 
@@ -54,8 +54,8 @@ dependencies {
 
 <dependencies>
     <dependency>
-        <groupId>de.florianmichael</groupId>
-        <artifactId>ViaFabricPlus</artifactId>
+        <groupId>com.viaversion</groupId>
+        <artifactId>viafabricplus</artifactId>
         <version>x.x.x</version> <!-- Get the latest version from releases -->
     </dependency>
 </dependencies>
diff --git a/gradle.properties b/gradle.properties
index 808ccaf3..2d814774 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx8G
 org.gradle.parallel=true
 
 # Project Details
-maven_group=de.florianmichael
+maven_group=com.viaversion
 maven_name=ViaFabricPlus
 maven_version=4.0.0
 maven_description=Fabric mod to connect to EVERY Minecraft server version (Release, Beta, Alpha, Classic, Snapshots, Bedrock) with QoL fixes to the gameplay
diff --git a/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java b/src/main/java/com/viaversion/viafabricplus/ViaFabricPlus.java
similarity index 90%
rename from src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java
rename to src/main/java/com/viaversion/viafabricplus/ViaFabricPlus.java
index c4603f7b..6c57ca41 100644
--- a/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java
+++ b/src/main/java/com/viaversion/viafabricplus/ViaFabricPlus.java
@@ -17,14 +17,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus;
+package com.viaversion.viafabricplus;
 
-import de.florianmichael.viafabricplus.event.PostGameLoadCallback;
-import de.florianmichael.viafabricplus.fixes.ClientsideFixes;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.save.SaveManager;
-import de.florianmichael.viafabricplus.settings.SettingsManager;
-import de.florianmichael.viafabricplus.util.ClassLoaderPriorityUtil;
+import com.viaversion.viafabricplus.event.PostGameLoadCallback;
+import com.viaversion.viafabricplus.fixes.ClientsideFixes;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.save.SaveManager;
+import com.viaversion.viafabricplus.settings.SettingsManager;
+import com.viaversion.viafabricplus.util.ClassLoaderPriorityUtil;
 import net.fabricmc.loader.api.FabricLoader;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/src/main/java/de/florianmichael/viafabricplus/event/ChangeProtocolVersionCallback.java b/src/main/java/com/viaversion/viafabricplus/event/ChangeProtocolVersionCallback.java
similarity index 97%
rename from src/main/java/de/florianmichael/viafabricplus/event/ChangeProtocolVersionCallback.java
rename to src/main/java/com/viaversion/viafabricplus/event/ChangeProtocolVersionCallback.java
index 3c45e76b..d980ba6f 100644
--- a/src/main/java/de/florianmichael/viafabricplus/event/ChangeProtocolVersionCallback.java
+++ b/src/main/java/com/viaversion/viafabricplus/event/ChangeProtocolVersionCallback.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.event;
+package com.viaversion.viafabricplus.event;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.fabricmc.fabric.api.event.Event;
diff --git a/src/main/java/de/florianmichael/viafabricplus/event/LoadCallback.java b/src/main/java/com/viaversion/viafabricplus/event/LoadCallback.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/event/LoadCallback.java
rename to src/main/java/com/viaversion/viafabricplus/event/LoadCallback.java
index 02ab791d..768b23ba 100644
--- a/src/main/java/de/florianmichael/viafabricplus/event/LoadCallback.java
+++ b/src/main/java/com/viaversion/viafabricplus/event/LoadCallback.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.event;
+package com.viaversion.viafabricplus.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
diff --git a/src/main/java/de/florianmichael/viafabricplus/event/LoadClassicProtocolExtensionCallback.java b/src/main/java/com/viaversion/viafabricplus/event/LoadClassicProtocolExtensionCallback.java
similarity index 97%
rename from src/main/java/de/florianmichael/viafabricplus/event/LoadClassicProtocolExtensionCallback.java
rename to src/main/java/com/viaversion/viafabricplus/event/LoadClassicProtocolExtensionCallback.java
index 0d0498ed..194f178b 100644
--- a/src/main/java/de/florianmichael/viafabricplus/event/LoadClassicProtocolExtensionCallback.java
+++ b/src/main/java/com/viaversion/viafabricplus/event/LoadClassicProtocolExtensionCallback.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.event;
+package com.viaversion.viafabricplus.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
diff --git a/src/main/java/de/florianmichael/viafabricplus/event/LoadSaveFilesCallback.java b/src/main/java/com/viaversion/viafabricplus/event/LoadSaveFilesCallback.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/event/LoadSaveFilesCallback.java
rename to src/main/java/com/viaversion/viafabricplus/event/LoadSaveFilesCallback.java
index 6cc8ffde..2b7f4ffd 100644
--- a/src/main/java/de/florianmichael/viafabricplus/event/LoadSaveFilesCallback.java
+++ b/src/main/java/com/viaversion/viafabricplus/event/LoadSaveFilesCallback.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.event;
+package com.viaversion.viafabricplus.event;
 
-import de.florianmichael.viafabricplus.save.AbstractSave;
-import de.florianmichael.viafabricplus.save.SaveManager;
+import com.viaversion.viafabricplus.save.AbstractSave;
+import com.viaversion.viafabricplus.save.SaveManager;
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/event/PostGameLoadCallback.java b/src/main/java/com/viaversion/viafabricplus/event/PostGameLoadCallback.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/event/PostGameLoadCallback.java
rename to src/main/java/com/viaversion/viafabricplus/event/PostGameLoadCallback.java
index 28d5c021..150cf3de 100644
--- a/src/main/java/de/florianmichael/viafabricplus/event/PostGameLoadCallback.java
+++ b/src/main/java/com/viaversion/viafabricplus/event/PostGameLoadCallback.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.event;
+package com.viaversion.viafabricplus.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
diff --git a/src/main/java/de/florianmichael/viafabricplus/event/PostViaVersionLoadCallback.java b/src/main/java/com/viaversion/viafabricplus/event/PostViaVersionLoadCallback.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/event/PostViaVersionLoadCallback.java
rename to src/main/java/com/viaversion/viafabricplus/event/PostViaVersionLoadCallback.java
index 51e6a234..6ab68cb9 100644
--- a/src/main/java/de/florianmichael/viafabricplus/event/PostViaVersionLoadCallback.java
+++ b/src/main/java/com/viaversion/viafabricplus/event/PostViaVersionLoadCallback.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.event;
+package com.viaversion.viafabricplus.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
diff --git a/src/main/java/de/florianmichael/viafabricplus/event/RegisterSettingsCallback.java b/src/main/java/com/viaversion/viafabricplus/event/RegisterSettingsCallback.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/event/RegisterSettingsCallback.java
rename to src/main/java/com/viaversion/viafabricplus/event/RegisterSettingsCallback.java
index 89052e43..63e9720a 100644
--- a/src/main/java/de/florianmichael/viafabricplus/event/RegisterSettingsCallback.java
+++ b/src/main/java/com/viaversion/viafabricplus/event/RegisterSettingsCallback.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.event;
+package com.viaversion.viafabricplus.event;
 
-import de.florianmichael.viafabricplus.settings.SettingsManager;
+import com.viaversion.viafabricplus.settings.SettingsManager;
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/ClientsideFixes.java b/src/main/java/com/viaversion/viafabricplus/fixes/ClientsideFixes.java
similarity index 87%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/ClientsideFixes.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/ClientsideFixes.java
index 5e53a8f6..ad42da53 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/ClientsideFixes.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/ClientsideFixes.java
@@ -17,25 +17,25 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes;
+package com.viaversion.viafabricplus.fixes;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.event.ChangeProtocolVersionCallback;
-import de.florianmichael.viafabricplus.event.PostGameLoadCallback;
-import de.florianmichael.viafabricplus.fixes.data.EntityDimensionDiff;
-import de.florianmichael.viafabricplus.fixes.data.ResourcePackHeaderDiff;
-import de.florianmichael.viafabricplus.fixes.data.recipe.Recipes1_11_2;
-import de.florianmichael.viafabricplus.fixes.versioned.EnchantmentAttributesEmulation1_20_6;
-import de.florianmichael.viafabricplus.fixes.versioned.classic.CPEAdditions;
-import de.florianmichael.viafabricplus.fixes.versioned.classic.GridItemSelectionScreen;
-import de.florianmichael.viafabricplus.fixes.versioned.visual.ArmorHudEmulation1_8;
-import de.florianmichael.viafabricplus.fixes.versioned.visual.FootStepParticle1_12_2;
-import de.florianmichael.viafabricplus.fixes.versioned.visual.UnicodeFontFix1_12_2;
-import de.florianmichael.viafabricplus.injection.access.IClientConnection;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.settings.impl.BedrockSettings;
-import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
-import de.florianmichael.viafabricplus.util.DataCustomPayload;
+import com.viaversion.viafabricplus.event.ChangeProtocolVersionCallback;
+import com.viaversion.viafabricplus.event.PostGameLoadCallback;
+import com.viaversion.viafabricplus.fixes.data.EntityDimensionDiff;
+import com.viaversion.viafabricplus.fixes.data.ResourcePackHeaderDiff;
+import com.viaversion.viafabricplus.fixes.data.recipe.Recipes1_11_2;
+import com.viaversion.viafabricplus.fixes.versioned.EnchantmentAttributesEmulation1_20_6;
+import com.viaversion.viafabricplus.fixes.versioned.classic.CPEAdditions;
+import com.viaversion.viafabricplus.fixes.versioned.classic.GridItemSelectionScreen;
+import com.viaversion.viafabricplus.fixes.versioned.visual.ArmorHudEmulation1_8;
+import com.viaversion.viafabricplus.fixes.versioned.visual.FootStepParticle1_12_2;
+import com.viaversion.viafabricplus.fixes.versioned.visual.UnicodeFontFix1_12_2;
+import com.viaversion.viafabricplus.injection.access.IClientConnection;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.settings.impl.BedrockSettings;
+import com.viaversion.viafabricplus.settings.impl.VisualSettings;
+import com.viaversion.viafabricplus.util.DataCustomPayload;
 import net.minecraft.block.*;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/data/EntityDimensionDiff.java b/src/main/java/com/viaversion/viafabricplus/fixes/data/EntityDimensionDiff.java
similarity index 98%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/data/EntityDimensionDiff.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/data/EntityDimensionDiff.java
index d5a6e2e8..17bdffe2 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/data/EntityDimensionDiff.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/data/EntityDimensionDiff.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.data;
+package com.viaversion.viafabricplus.fixes.data;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.event.ChangeProtocolVersionCallback;
+import com.viaversion.viafabricplus.event.ChangeProtocolVersionCallback;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.entity.EntityAttachmentType;
 import net.minecraft.entity.EntityAttachments;
@@ -30,7 +30,7 @@ import net.raphimc.vialegacy.api.LegacyProtocolVersion;
 
 import java.util.Map;
 
-import static de.florianmichael.viafabricplus.util.MapUtil.linkedHashMap;
+import static com.viaversion.viafabricplus.util.MapUtil.linkedHashMap;
 
 /**
  * Data dump for entity dimension changes between versions.
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/data/ItemRegistryDiff.java b/src/main/java/com/viaversion/viafabricplus/fixes/data/ItemRegistryDiff.java
similarity index 99%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/data/ItemRegistryDiff.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/data/ItemRegistryDiff.java
index c688a8d3..1985bd9d 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/data/ItemRegistryDiff.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/data/ItemRegistryDiff.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.data;
+package com.viaversion.viafabricplus.fixes.data;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.injection.access.IClientConnection;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.injection.access.IClientConnection;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.item.Item;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/data/RenderableGlyphDiff.java b/src/main/java/com/viaversion/viafabricplus/fixes/data/RenderableGlyphDiff.java
similarity index 99%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/data/RenderableGlyphDiff.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/data/RenderableGlyphDiff.java
index 12000cbf..6987b459 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/data/RenderableGlyphDiff.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/data/RenderableGlyphDiff.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.data;
+package com.viaversion.viafabricplus.fixes.data;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.ints.IntConsumer;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/data/ResourcePackHeaderDiff.java b/src/main/java/com/viaversion/viafabricplus/fixes/data/ResourcePackHeaderDiff.java
similarity index 97%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/data/ResourcePackHeaderDiff.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/data/ResourcePackHeaderDiff.java
index 762f9d8b..0cbce1db 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/data/ResourcePackHeaderDiff.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/data/ResourcePackHeaderDiff.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.data;
+package com.viaversion.viafabricplus.fixes.data;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.GameVersion;
 import net.minecraft.SaveVersion;
 import net.minecraft.SharedConstants;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/data/recipe/AddBannerPatternRecipe.java b/src/main/java/com/viaversion/viafabricplus/fixes/data/recipe/AddBannerPatternRecipe.java
similarity index 98%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/data/recipe/AddBannerPatternRecipe.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/data/recipe/AddBannerPatternRecipe.java
index 4c40d815..d23bb3f1 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/data/recipe/AddBannerPatternRecipe.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/data/recipe/AddBannerPatternRecipe.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.data.recipe;
+package com.viaversion.viafabricplus.fixes.data.recipe;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.entity.BannerPattern;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.BannerPatternsComponent;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/data/recipe/BannerPattern_1_13_2.java b/src/main/java/com/viaversion/viafabricplus/fixes/data/recipe/BannerPattern_1_13_2.java
similarity index 98%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/data/recipe/BannerPattern_1_13_2.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/data/recipe/BannerPattern_1_13_2.java
index f1504247..52c33e5c 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/data/recipe/BannerPattern_1_13_2.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/data/recipe/BannerPattern_1_13_2.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.data.recipe;
+package com.viaversion.viafabricplus.fixes.data.recipe;
 
 import net.minecraft.block.Blocks;
 import net.minecraft.block.entity.BannerPattern;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/data/recipe/RecipeInfo.java b/src/main/java/com/viaversion/viafabricplus/fixes/data/recipe/RecipeInfo.java
similarity index 99%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/data/recipe/RecipeInfo.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/data/recipe/RecipeInfo.java
index 7df263de..ade69950 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/data/recipe/RecipeInfo.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/data/recipe/RecipeInfo.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.data.recipe;
+package com.viaversion.viafabricplus.fixes.data.recipe;
 
 import net.minecraft.item.ItemConvertible;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/data/recipe/RecipeManager1_11_2.java b/src/main/java/com/viaversion/viafabricplus/fixes/data/recipe/RecipeManager1_11_2.java
similarity index 98%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/data/recipe/RecipeManager1_11_2.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/data/recipe/RecipeManager1_11_2.java
index d0cd025a..0e1f5040 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/data/recipe/RecipeManager1_11_2.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/data/recipe/RecipeManager1_11_2.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.data.recipe;
+package com.viaversion.viafabricplus.fixes.data.recipe;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/data/recipe/Recipes1_11_2.java b/src/main/java/com/viaversion/viafabricplus/fixes/data/recipe/Recipes1_11_2.java
similarity index 99%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/data/recipe/Recipes1_11_2.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/data/recipe/Recipes1_11_2.java
index 8db1b15a..2de0ae8a 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/data/recipe/Recipes1_11_2.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/data/recipe/Recipes1_11_2.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.data.recipe;
+package com.viaversion.viafabricplus.fixes.data.recipe;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.Blocks;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/data/recipe/ShulkerBoxColoringRecipe.java b/src/main/java/com/viaversion/viafabricplus/fixes/data/recipe/ShulkerBoxColoringRecipe.java
similarity index 98%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/data/recipe/ShulkerBoxColoringRecipe.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/data/recipe/ShulkerBoxColoringRecipe.java
index 3ea5a4d3..1d73f424 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/data/recipe/ShulkerBoxColoringRecipe.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/data/recipe/ShulkerBoxColoringRecipe.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.data.recipe;
+package com.viaversion.viafabricplus.fixes.data.recipe;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.ShulkerBoxBlock;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/ActionResultException1_12_2.java b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/ActionResultException1_12_2.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/versioned/ActionResultException1_12_2.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/versioned/ActionResultException1_12_2.java
index 8eefb2b4..0cfe8f2b 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/ActionResultException1_12_2.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/ActionResultException1_12_2.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.versioned;
+package com.viaversion.viafabricplus.fixes.versioned;
 
 import net.minecraft.util.ActionResult;
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/ClientPlayerInteractionManager1_18_2.java b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/ClientPlayerInteractionManager1_18_2.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/versioned/ClientPlayerInteractionManager1_18_2.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/versioned/ClientPlayerInteractionManager1_18_2.java
index 27ed5c0f..70c8429b 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/ClientPlayerInteractionManager1_18_2.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/ClientPlayerInteractionManager1_18_2.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.versioned;
+package com.viaversion.viafabricplus.fixes.versioned;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/EnchantmentAttributesEmulation1_20_6.java b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/EnchantmentAttributesEmulation1_20_6.java
similarity index 97%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/versioned/EnchantmentAttributesEmulation1_20_6.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/versioned/EnchantmentAttributesEmulation1_20_6.java
index 467d304b..c995bb3d 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/EnchantmentAttributesEmulation1_20_6.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/EnchantmentAttributesEmulation1_20_6.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.versioned;
+package com.viaversion.viafabricplus.fixes.versioned;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentHelper;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/Enchantments1_14_4.java b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/Enchantments1_14_4.java
similarity index 98%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/versioned/Enchantments1_14_4.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/versioned/Enchantments1_14_4.java
index f266ae4f..5653904d 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/Enchantments1_14_4.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/Enchantments1_14_4.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.versioned;
+package com.viaversion.viafabricplus.fixes.versioned;
 
 import com.viaversion.viaversion.util.Key;
 import net.minecraft.enchantment.Enchantment;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/ItemPick1_21_3.java b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/ItemPick1_21_3.java
similarity index 97%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/versioned/ItemPick1_21_3.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/versioned/ItemPick1_21_3.java
index 868f1897..419846a0 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/ItemPick1_21_3.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/ItemPick1_21_3.java
@@ -17,13 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.versioned;
+package com.viaversion.viafabricplus.fixes.versioned;
 
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.protocols.v1_21_2to1_21_4.Protocol1_21_2To1_21_4;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ServerboundPackets1_21_2;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/KeyPairResponse1_19_0.java b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/KeyPairResponse1_19_0.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/versioned/KeyPairResponse1_19_0.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/versioned/KeyPairResponse1_19_0.java
index adc29d07..55a9cc76 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/KeyPairResponse1_19_0.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/KeyPairResponse1_19_0.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.versioned;
+package com.viaversion.viafabricplus.fixes.versioned;
 
 import com.mojang.authlib.yggdrasil.response.KeyPairResponse;
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/PendingUpdateManager1_18_2.java b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/PendingUpdateManager1_18_2.java
similarity index 97%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/versioned/PendingUpdateManager1_18_2.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/versioned/PendingUpdateManager1_18_2.java
index b9dde1ed..8cd21f4c 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/PendingUpdateManager1_18_2.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/PendingUpdateManager1_18_2.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.versioned;
+package com.viaversion.viafabricplus.fixes.versioned;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.client.network.ClientPlayerEntity;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/CPEAdditions.java b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/classic/CPEAdditions.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/CPEAdditions.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/versioned/classic/CPEAdditions.java
index 44eee33c..58caf828 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/CPEAdditions.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/classic/CPEAdditions.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.versioned.classic;
+package com.viaversion.viafabricplus.fixes.versioned.classic;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import io.netty.buffer.ByteBuf;
 import net.lenni0451.reflect.Enums;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/GridItemSelectionScreen.java b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/classic/GridItemSelectionScreen.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/GridItemSelectionScreen.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/versioned/classic/GridItemSelectionScreen.java
index 5787bce4..d810e55c 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/GridItemSelectionScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/classic/GridItemSelectionScreen.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.versioned.classic;
+package com.viaversion.viafabricplus.fixes.versioned.classic;
 
-import de.florianmichael.viafabricplus.fixes.data.ItemRegistryDiff;
-import de.florianmichael.viafabricplus.screen.VFPScreen;
+import com.viaversion.viafabricplus.fixes.data.ItemRegistryDiff;
+import com.viaversion.viafabricplus.screen.VFPScreen;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/WorldHeightSupport.java b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/classic/WorldHeightSupport.java
similarity index 99%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/WorldHeightSupport.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/versioned/classic/WorldHeightSupport.java
index e1384631..c8e26dfa 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/WorldHeightSupport.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/classic/WorldHeightSupport.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.versioned.classic;
+package com.viaversion.viafabricplus.fixes.versioned.classic;
 
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viaversion.api.Via;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/command/ListExtensionsCommand.java b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/classic/command/ListExtensionsCommand.java
similarity index 89%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/command/ListExtensionsCommand.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/versioned/classic/command/ListExtensionsCommand.java
index 68cb756d..d5b13c8a 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/command/ListExtensionsCommand.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/classic/command/ListExtensionsCommand.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.versioned.classic.command;
+package com.viaversion.viafabricplus.fixes.versioned.classic.command;
 
 import com.viaversion.viaversion.api.command.ViaCommandSender;
-import de.florianmichael.viafabricplus.injection.access.IExtensionProtocolMetadataStorage;
-import de.florianmichael.viafabricplus.protocoltranslator.impl.command.VFPViaSubCommand;
+import com.viaversion.viafabricplus.injection.access.IExtensionProtocolMetadataStorage;
+import com.viaversion.viafabricplus.protocoltranslator.impl.command.VFPViaSubCommand;
 import net.minecraft.util.Formatting;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
 import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.storage.ExtensionProtocolMetadataStorage;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/command/SetTimeCommand.java b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/classic/command/SetTimeCommand.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/command/SetTimeCommand.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/versioned/classic/command/SetTimeCommand.java
index 7996f0c8..566f5181 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/command/SetTimeCommand.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/classic/command/SetTimeCommand.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.versioned.classic.command;
+package com.viaversion.viafabricplus.fixes.versioned.classic.command;
 
 import com.viaversion.viaversion.api.command.ViaCommandSender;
-import de.florianmichael.viafabricplus.protocoltranslator.impl.command.VFPViaSubCommand;
+import com.viaversion.viafabricplus.protocoltranslator.impl.command.VFPViaSubCommand;
 import net.minecraft.util.Formatting;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
 import net.raphimc.vialegacy.protocol.alpha.a1_0_16_2toa1_0_17_1_0_17_4.storage.TimeLockStorage;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/ArmorHudEmulation1_8.java b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/visual/ArmorHudEmulation1_8.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/ArmorHudEmulation1_8.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/versioned/visual/ArmorHudEmulation1_8.java
index 59052ad7..7cbe8331 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/ArmorHudEmulation1_8.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/visual/ArmorHudEmulation1_8.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.versioned.visual;
+package com.viaversion.viafabricplus.fixes.versioned.visual;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
@@ -25,9 +25,9 @@ import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.protocols.v1_8to1_9.Protocol1_8To1_9;
 import com.viaversion.viaversion.protocols.v1_8to1_9.data.ArmorTypes1_8;
 import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_9;
-import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
+import com.viaversion.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.settings.impl.VisualSettings;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/BoatModel1_8.java b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/visual/BoatModel1_8.java
similarity index 97%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/BoatModel1_8.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/versioned/visual/BoatModel1_8.java
index 773f51f1..aeacdb5c 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/BoatModel1_8.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/visual/BoatModel1_8.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.versioned.visual;
+package com.viaversion.viafabricplus.fixes.versioned.visual;
 
 import net.minecraft.client.model.*;
 import net.minecraft.client.render.entity.model.EntityModel;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/BoatRenderer1_8.java b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/visual/BoatRenderer1_8.java
similarity index 97%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/BoatRenderer1_8.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/versioned/visual/BoatRenderer1_8.java
index 9002ad2c..e1c9bc4a 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/BoatRenderer1_8.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/visual/BoatRenderer1_8.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.versioned.visual;
+package com.viaversion.viafabricplus.fixes.versioned.visual;
 
 import net.minecraft.client.render.OverlayTexture;
 import net.minecraft.client.render.RenderLayer;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/BuiltinEmptyGlyph1_12_2.java b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/visual/BuiltinEmptyGlyph1_12_2.java
similarity index 90%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/BuiltinEmptyGlyph1_12_2.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/versioned/visual/BuiltinEmptyGlyph1_12_2.java
index 4daa3f63..7d7ed2f5 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/BuiltinEmptyGlyph1_12_2.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/visual/BuiltinEmptyGlyph1_12_2.java
@@ -17,8 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.versioned.visual;
+package com.viaversion.viafabricplus.fixes.versioned.visual;
 
+import com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.MixinFontStorage;
 import net.minecraft.client.font.BakedGlyph;
 import net.minecraft.client.font.Glyph;
 import net.minecraft.client.font.RenderableGlyph;
@@ -27,7 +28,7 @@ import java.util.function.Function;
 
 /**
  * Implementation of a blank glyph for 1.12.2 and lower since those versions don't draw a white rectangle for empty
- * glyphs but instead just skip them. See {@link de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.MixinFontStorage} for more information.
+ * glyphs but instead just skip them. See {@link MixinFontStorage} for more information.
  */
 public enum BuiltinEmptyGlyph1_12_2 implements Glyph {
     INSTANCE;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/EntityRidingOffsetsPre1_20_2.java b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/visual/EntityRidingOffsetsPre1_20_2.java
similarity index 98%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/EntityRidingOffsetsPre1_20_2.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/versioned/visual/EntityRidingOffsetsPre1_20_2.java
index 8cdfb3ea..9de0ce4c 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/EntityRidingOffsetsPre1_20_2.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/visual/EntityRidingOffsetsPre1_20_2.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.versioned.visual;
+package com.viaversion.viafabricplus.fixes.versioned.visual;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityDimensions;
 import net.minecraft.entity.EntityPose;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/FootStepParticle1_12_2.java b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/visual/FootStepParticle1_12_2.java
similarity index 97%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/FootStepParticle1_12_2.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/versioned/visual/FootStepParticle1_12_2.java
index e95af586..9e9b6cfd 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/FootStepParticle1_12_2.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/visual/FootStepParticle1_12_2.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.versioned.visual;
+package com.viaversion.viafabricplus.fixes.versioned.visual;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry;
 import net.fabricmc.fabric.api.particle.v1.FabricParticleTypes;
 import net.minecraft.client.particle.*;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/UnicodeFontFix1_12_2.java b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/visual/UnicodeFontFix1_12_2.java
similarity index 90%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/UnicodeFontFix1_12_2.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/versioned/visual/UnicodeFontFix1_12_2.java
index 67b5dec5..7a2cea12 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/UnicodeFontFix1_12_2.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/versioned/visual/UnicodeFontFix1_12_2.java
@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.versioned.visual;
+package com.viaversion.viafabricplus.fixes.versioned.visual;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.event.ChangeProtocolVersionCallback;
-import de.florianmichael.viafabricplus.protocoltranslator.util.LanguageUtil;
-import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
+import com.viaversion.viafabricplus.event.ChangeProtocolVersionCallback;
+import com.viaversion.viafabricplus.protocoltranslator.util.LanguageUtil;
+import com.viaversion.viafabricplus.settings.impl.VisualSettings;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.option.SimpleOption;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/viaversion/BedrockJoinGameTracker.java b/src/main/java/com/viaversion/viafabricplus/fixes/viaversion/BedrockJoinGameTracker.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/viaversion/BedrockJoinGameTracker.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/viaversion/BedrockJoinGameTracker.java
index 67e40e8a..ccf6f10e 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/viaversion/BedrockJoinGameTracker.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/viaversion/BedrockJoinGameTracker.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.viaversion;
+package com.viaversion.viafabricplus.fixes.viaversion;
 
 import com.viaversion.viaversion.api.connection.StorableObject;
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/viaversion/TeleportTracker1_7_6_10.java b/src/main/java/com/viaversion/viafabricplus/fixes/viaversion/TeleportTracker1_7_6_10.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/viaversion/TeleportTracker1_7_6_10.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/viaversion/TeleportTracker1_7_6_10.java
index 72f27476..cc7a22ee 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/viaversion/TeleportTracker1_7_6_10.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/viaversion/TeleportTracker1_7_6_10.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.viaversion;
+package com.viaversion.viafabricplus.fixes.viaversion;
 
 import com.viaversion.viaversion.api.connection.StorableObject;
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/viaversion/ViaFabricPlusProtocol.java b/src/main/java/com/viaversion/viafabricplus/fixes/viaversion/ViaFabricPlusProtocol.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/viaversion/ViaFabricPlusProtocol.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/viaversion/ViaFabricPlusProtocol.java
index 195b87b1..e52871a3 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/viaversion/ViaFabricPlusProtocol.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/viaversion/ViaFabricPlusProtocol.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.viaversion;
+package com.viaversion.viafabricplus.fixes.viaversion;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.AbstractSimpleProtocol;
@@ -29,9 +29,8 @@ import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.protocols.v1_21_2to1_21_4.packet.ServerboundPackets1_21_4;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPackets1_21_2;
-import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ServerboundPackets1_21_2;
 import com.viaversion.viaversion.util.Key;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.network.packet.BrandCustomPayload;
 import net.minecraft.network.packet.CustomPayload;
 import net.minecraft.network.packet.s2c.custom.DebugGameTestAddMarkerCustomPayload;
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/viaversion/WolfHealthTracker1_14_4.java b/src/main/java/com/viaversion/viafabricplus/fixes/viaversion/WolfHealthTracker1_14_4.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/fixes/viaversion/WolfHealthTracker1_14_4.java
rename to src/main/java/com/viaversion/viafabricplus/fixes/viaversion/WolfHealthTracker1_14_4.java
index b7b36797..5740f744 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/viaversion/WolfHealthTracker1_14_4.java
+++ b/src/main/java/com/viaversion/viafabricplus/fixes/viaversion/WolfHealthTracker1_14_4.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.fixes.viaversion;
+package com.viaversion.viafabricplus.fixes.viaversion;
 
 import com.viaversion.viaversion.api.connection.StorableObject;
 import it.unimi.dsi.fastutil.ints.Int2FloatMap;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/ViaFabricPlusMixinPlugin.java b/src/main/java/com/viaversion/viafabricplus/injection/ViaFabricPlusMixinPlugin.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/injection/ViaFabricPlusMixinPlugin.java
rename to src/main/java/com/viaversion/viafabricplus/injection/ViaFabricPlusMixinPlugin.java
index 5a7ea7b2..38204244 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/ViaFabricPlusMixinPlugin.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/ViaFabricPlusMixinPlugin.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection;
+package com.viaversion.viafabricplus.injection;
 
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.metadata.ModMetadata;
@@ -31,7 +31,7 @@ import java.util.Set;
 
 public class ViaFabricPlusMixinPlugin implements IMixinConfigPlugin {
 
-    public static final String INJECTOR_PACKAGE = "de.florianmichael.viafabricplus.injection.mixin.";
+    public static final String INJECTOR_PACKAGE = "com.viaversion.viafabricplus.injection.mixin.";
 
     private static final String COMPAT_PACKAGE = "compat.";
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/access/IChunkTracker.java b/src/main/java/com/viaversion/viafabricplus/injection/access/IChunkTracker.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/access/IChunkTracker.java
rename to src/main/java/com/viaversion/viafabricplus/injection/access/IChunkTracker.java
index b999d3db..ac06168b 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/access/IChunkTracker.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/access/IChunkTracker.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.access;
+package com.viaversion.viafabricplus.injection.access;
 
 public interface IChunkTracker {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/access/IClientConnection.java b/src/main/java/com/viaversion/viafabricplus/injection/access/IClientConnection.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/access/IClientConnection.java
rename to src/main/java/com/viaversion/viafabricplus/injection/access/IClientConnection.java
index f69a696c..e89ec5b9 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/access/IClientConnection.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/access/IClientConnection.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.access;
+package com.viaversion.viafabricplus.injection.access;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/access/IClientPlayerInteractionManager.java b/src/main/java/com/viaversion/viafabricplus/injection/access/IClientPlayerInteractionManager.java
similarity index 87%
rename from src/main/java/de/florianmichael/viafabricplus/injection/access/IClientPlayerInteractionManager.java
rename to src/main/java/com/viaversion/viafabricplus/injection/access/IClientPlayerInteractionManager.java
index a731893f..707369e9 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/access/IClientPlayerInteractionManager.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/access/IClientPlayerInteractionManager.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.access;
+package com.viaversion.viafabricplus.injection.access;
 
-import de.florianmichael.viafabricplus.fixes.versioned.ClientPlayerInteractionManager1_18_2;
+import com.viaversion.viafabricplus.fixes.versioned.ClientPlayerInteractionManager1_18_2;
 
 public interface IClientPlayerInteractionManager {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/access/IConfirmScreen.java b/src/main/java/com/viaversion/viafabricplus/injection/access/IConfirmScreen.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/access/IConfirmScreen.java
rename to src/main/java/com/viaversion/viafabricplus/injection/access/IConfirmScreen.java
index 955549bc..e470c3af 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/access/IConfirmScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/access/IConfirmScreen.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.access;
+package com.viaversion.viafabricplus.injection.access;
 
 import net.minecraft.text.Text;
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/access/IDownloadingTerrainScreen.java b/src/main/java/com/viaversion/viafabricplus/injection/access/IDownloadingTerrainScreen.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/access/IDownloadingTerrainScreen.java
rename to src/main/java/com/viaversion/viafabricplus/injection/access/IDownloadingTerrainScreen.java
index b836b760..54e8014b 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/access/IDownloadingTerrainScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/access/IDownloadingTerrainScreen.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.access;
+package com.viaversion.viafabricplus.injection.access;
 
 public interface IDownloadingTerrainScreen {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/access/IEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/access/IEntity.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/access/IEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/access/IEntity.java
index 2d536e97..05164924 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/access/IEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/access/IEntity.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.access;
+package com.viaversion.viafabricplus.injection.access;
 
 public interface IEntity {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/access/IExtensionProtocolMetadataStorage.java b/src/main/java/com/viaversion/viafabricplus/injection/access/IExtensionProtocolMetadataStorage.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/access/IExtensionProtocolMetadataStorage.java
rename to src/main/java/com/viaversion/viafabricplus/injection/access/IExtensionProtocolMetadataStorage.java
index 0b24ae2a..cb4d9988 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/access/IExtensionProtocolMetadataStorage.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/access/IExtensionProtocolMetadataStorage.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.access;
+package com.viaversion.viafabricplus.injection.access;
 
 import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.data.ClassicProtocolExtension;
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/access/ILegacyKeySignatureStorage.java b/src/main/java/com/viaversion/viafabricplus/injection/access/ILegacyKeySignatureStorage.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/access/ILegacyKeySignatureStorage.java
rename to src/main/java/com/viaversion/viafabricplus/injection/access/ILegacyKeySignatureStorage.java
index a49f2aa1..c0037fd4 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/access/ILegacyKeySignatureStorage.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/access/ILegacyKeySignatureStorage.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.access;
+package com.viaversion.viafabricplus.injection.access;
 
 public interface ILegacyKeySignatureStorage {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/access/IMouseKeyboard.java b/src/main/java/com/viaversion/viafabricplus/injection/access/IMouseKeyboard.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/access/IMouseKeyboard.java
rename to src/main/java/com/viaversion/viafabricplus/injection/access/IMouseKeyboard.java
index b69cedec..4a99628b 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/access/IMouseKeyboard.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/access/IMouseKeyboard.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.access;
+package com.viaversion.viafabricplus.injection.access;
 
 import java.util.Queue;
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/access/IMultiValueDebugSampleLogImpl.java b/src/main/java/com/viaversion/viafabricplus/injection/access/IMultiValueDebugSampleLogImpl.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/access/IMultiValueDebugSampleLogImpl.java
rename to src/main/java/com/viaversion/viafabricplus/injection/access/IMultiValueDebugSampleLogImpl.java
index 67b03d67..fdb37497 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/access/IMultiValueDebugSampleLogImpl.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/access/IMultiValueDebugSampleLogImpl.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.access;
+package com.viaversion.viafabricplus.injection.access;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/access/IPlayerListEntry.java b/src/main/java/com/viaversion/viafabricplus/injection/access/IPlayerListEntry.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/access/IPlayerListEntry.java
rename to src/main/java/com/viaversion/viafabricplus/injection/access/IPlayerListEntry.java
index 27ea0693..2de21c46 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/access/IPlayerListEntry.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/access/IPlayerListEntry.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.access;
+package com.viaversion.viafabricplus.injection.access;
 
 public interface IPlayerListEntry {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/access/IPlayerListHud.java b/src/main/java/com/viaversion/viafabricplus/injection/access/IPlayerListHud.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/access/IPlayerListHud.java
rename to src/main/java/com/viaversion/viafabricplus/injection/access/IPlayerListHud.java
index 5920feb5..57718581 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/access/IPlayerListHud.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/access/IPlayerListHud.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.access;
+package com.viaversion.viafabricplus.injection.access;
 
 public interface IPlayerListHud {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/access/IRakSessionCodec.java b/src/main/java/com/viaversion/viafabricplus/injection/access/IRakSessionCodec.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/access/IRakSessionCodec.java
rename to src/main/java/com/viaversion/viafabricplus/injection/access/IRakSessionCodec.java
index a7bde4b6..3f548600 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/access/IRakSessionCodec.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/access/IRakSessionCodec.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.access;
+package com.viaversion.viafabricplus.injection.access;
 
 public interface IRakSessionCodec {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/access/IScreenHandler.java b/src/main/java/com/viaversion/viafabricplus/injection/access/IScreenHandler.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/access/IScreenHandler.java
rename to src/main/java/com/viaversion/viafabricplus/injection/access/IScreenHandler.java
index cae05b20..5bd258d2 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/access/IScreenHandler.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/access/IScreenHandler.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.access;
+package com.viaversion.viafabricplus.injection.access;
 
 public interface IScreenHandler {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/access/IServerInfo.java b/src/main/java/com/viaversion/viafabricplus/injection/access/IServerInfo.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/access/IServerInfo.java
rename to src/main/java/com/viaversion/viafabricplus/injection/access/IServerInfo.java
index 8fbb3abc..69d3e502 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/access/IServerInfo.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/access/IServerInfo.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.access;
+package com.viaversion.viafabricplus.injection.access;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/access/ITextFieldWidget.java b/src/main/java/com/viaversion/viafabricplus/injection/access/ITextFieldWidget.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/access/ITextFieldWidget.java
rename to src/main/java/com/viaversion/viafabricplus/injection/access/ITextFieldWidget.java
index b41e7b3f..f9f5b5da 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/access/ITextFieldWidget.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/access/ITextFieldWidget.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.access;
+package com.viaversion.viafabricplus.injection.access;
 
 public interface ITextFieldWidget {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinMain.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/MixinMain.java
similarity index 89%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinMain.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/base/MixinMain.java
index 9b91f2de..79a36384 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinMain.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/MixinMain.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.base;
+package com.viaversion.viafabricplus.injection.mixin.base;
 
-import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.event.LoadCallback;
+import com.viaversion.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.event.LoadCallback;
 import net.minecraft.client.main.Main;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/connect/MixinClientConnection.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/connect/MixinClientConnection.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/connect/MixinClientConnection.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/base/connect/MixinClientConnection.java
index 4a8724ec..36ed8949 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/connect/MixinClientConnection.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/connect/MixinClientConnection.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.base.connect;
+package com.viaversion.viafabricplus.injection.mixin.base.connect;
 
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
@@ -25,10 +25,10 @@ import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.injection.access.IClientConnection;
-import de.florianmichael.viafabricplus.injection.access.IMultiValueDebugSampleLogImpl;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.protocoltranslator.netty.ViaFabricPlusVLLegacyPipeline;
+import com.viaversion.viafabricplus.injection.access.IClientConnection;
+import com.viaversion.viafabricplus.injection.access.IMultiValueDebugSampleLogImpl;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.netty.ViaFabricPlusVLLegacyPipeline;
 import io.netty.bootstrap.AbstractBootstrap;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.*;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/connect/MixinClientConnection_1.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/connect/MixinClientConnection_1.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/connect/MixinClientConnection_1.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/base/connect/MixinClientConnection_1.java
index ac7b01d6..ed10b6a4 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/connect/MixinClientConnection_1.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/connect/MixinClientConnection_1.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.base.connect;
+package com.viaversion.viafabricplus.injection.mixin.base.connect;
 
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import io.netty.channel.Channel;
 import net.minecraft.network.ClientConnection;
 import org.spongepowered.asm.mixin.Final;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/connect/MixinClientLoginNetworkHandler.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/connect/MixinClientLoginNetworkHandler.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/connect/MixinClientLoginNetworkHandler.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/base/connect/MixinClientLoginNetworkHandler.java
index bc905444..207bc799 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/connect/MixinClientLoginNetworkHandler.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/connect/MixinClientLoginNetworkHandler.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.base.connect;
+package com.viaversion.viafabricplus.injection.mixin.base.connect;
 
-import de.florianmichael.viafabricplus.injection.access.IClientConnection;
+import com.viaversion.viafabricplus.injection.access.IClientConnection;
 import net.minecraft.client.network.ClientLoginNetworkHandler;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.text.Text;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/connect/MixinConnectScreen_1.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/connect/MixinConnectScreen_1.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/connect/MixinConnectScreen_1.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/base/connect/MixinConnectScreen_1.java
index ffe03ca7..7d81fff1 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/connect/MixinConnectScreen_1.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/connect/MixinConnectScreen_1.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.base.connect;
+package com.viaversion.viafabricplus.injection.mixin.base.connect;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/connect/MixinGameOptions.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/connect/MixinGameOptions.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/connect/MixinGameOptions.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/base/connect/MixinGameOptions.java
index f827f5f6..fcc1fb44 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/connect/MixinGameOptions.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/connect/MixinGameOptions.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.base.connect;
+package com.viaversion.viafabricplus.injection.mixin.base.connect;
 
-import de.florianmichael.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.ViaFabricPlus;
 import net.minecraft.client.option.GameOptions;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinAddServerScreen.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinAddServerScreen.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinAddServerScreen.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinAddServerScreen.java
index 9d94038c..508fad56 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinAddServerScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinAddServerScreen.java
@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.base.integration;
+package com.viaversion.viafabricplus.injection.mixin.base.integration;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.injection.access.IServerInfo;
-import de.florianmichael.viafabricplus.screen.base.PerServerVersionScreen;
-import de.florianmichael.viafabricplus.settings.impl.GeneralSettings;
+import com.viaversion.viafabricplus.injection.access.IServerInfo;
+import com.viaversion.viafabricplus.screen.base.PerServerVersionScreen;
+import com.viaversion.viafabricplus.settings.impl.GeneralSettings;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.multiplayer.AddServerScreen;
 import net.minecraft.client.gui.widget.ButtonWidget;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinChunkTracker.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinChunkTracker.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinChunkTracker.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinChunkTracker.java
index c3a6d2d2..537dee6c 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinChunkTracker.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinChunkTracker.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.base.integration;
+package com.viaversion.viafabricplus.injection.mixin.base.integration;
 
-import de.florianmichael.viafabricplus.injection.access.IChunkTracker;
+import com.viaversion.viafabricplus.injection.access.IChunkTracker;
 import net.raphimc.viabedrock.api.chunk.BedrockChunk;
 import net.raphimc.viabedrock.protocol.storage.ChunkTracker;
 import org.spongepowered.asm.mixin.Final;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinClientConnection.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinClientConnection.java
similarity index 90%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinClientConnection.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinClientConnection.java
index 40995b3c..40a79018 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinClientConnection.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinClientConnection.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.base.integration;
+package com.viaversion.viafabricplus.injection.mixin.base.integration;
 
-import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.settings.impl.DebugSettings;
+import com.viaversion.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.settings.impl.DebugSettings;
 import io.netty.channel.ChannelHandlerContext;
 import net.minecraft.network.ClientConnection;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinConfirmScreen.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinConfirmScreen.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinConfirmScreen.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinConfirmScreen.java
index 823e5cd8..e1eb5e30 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinConfirmScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinConfirmScreen.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.base.integration;
+package com.viaversion.viafabricplus.injection.mixin.base.integration;
 
-import de.florianmichael.viafabricplus.injection.access.IConfirmScreen;
+import com.viaversion.viafabricplus.injection.access.IConfirmScreen;
 import net.minecraft.client.gui.screen.ConfirmScreen;
 import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.*;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinConnectScreen_1.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinConnectScreen_1.java
similarity index 88%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinConnectScreen_1.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinConnectScreen_1.java
index 443918f2..f780f32b 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinConnectScreen_1.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinConnectScreen_1.java
@@ -17,18 +17,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.base.integration;
+package com.viaversion.viafabricplus.injection.mixin.base.integration;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import de.florianmichael.classic4j.model.classicube.account.CCAccount;
-import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.injection.access.IServerInfo;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.protocoltranslator.impl.provider.vialegacy.ViaFabricPlusClassicMPPassProvider;
-import de.florianmichael.viafabricplus.protocoltranslator.util.ProtocolVersionDetector;
-import de.florianmichael.viafabricplus.settings.impl.AuthenticationSettings;
+import com.viaversion.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.injection.access.IServerInfo;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.impl.provider.vialegacy.ViaFabricPlusClassicMPPassProvider;
+import com.viaversion.viafabricplus.protocoltranslator.util.ProtocolVersionDetector;
+import com.viaversion.viafabricplus.settings.impl.AuthenticationSettings;
 import io.netty.channel.ChannelFuture;
 import net.minecraft.client.gui.screen.multiplayer.ConnectScreen;
 import net.minecraft.client.network.ServerInfo;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinDebugHud.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinDebugHud.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinDebugHud.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinDebugHud.java
index c8373877..bd0725d5 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinDebugHud.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinDebugHud.java
@@ -17,17 +17,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.base.integration;
+package com.viaversion.viafabricplus.injection.mixin.base.integration;
 
 import com.viaversion.viaversion.api.connection.ProtocolInfo;
 import com.viaversion.viaversion.api.connection.UserConnection;
-import de.florianmichael.viafabricplus.fixes.viaversion.BedrockJoinGameTracker;
-import de.florianmichael.viafabricplus.injection.ViaFabricPlusMixinPlugin;
-import de.florianmichael.viafabricplus.injection.access.IChunkTracker;
-import de.florianmichael.viafabricplus.injection.access.IRakSessionCodec;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.settings.impl.GeneralSettings;
-import de.florianmichael.viafabricplus.util.ChatUtil;
+import com.viaversion.viafabricplus.fixes.viaversion.BedrockJoinGameTracker;
+import com.viaversion.viafabricplus.injection.ViaFabricPlusMixinPlugin;
+import com.viaversion.viafabricplus.injection.access.IChunkTracker;
+import com.viaversion.viafabricplus.injection.access.IRakSessionCodec;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.settings.impl.GeneralSettings;
+import com.viaversion.viafabricplus.util.ChatUtil;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.hud.DebugHud;
 import net.minecraft.util.Formatting;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinDirectConnectScreen.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinDirectConnectScreen.java
similarity index 90%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinDirectConnectScreen.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinDirectConnectScreen.java
index db9e2ce4..09d6c95c 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinDirectConnectScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinDirectConnectScreen.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.base.integration;
+package com.viaversion.viafabricplus.injection.mixin.base.integration;
 
-import de.florianmichael.viafabricplus.screen.base.ProtocolSelectionScreen;
-import de.florianmichael.viafabricplus.settings.impl.GeneralSettings;
+import com.viaversion.viafabricplus.screen.base.ProtocolSelectionScreen;
+import com.viaversion.viafabricplus.settings.impl.GeneralSettings;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.multiplayer.DirectConnectScreen;
 import net.minecraft.client.gui.widget.ButtonWidget;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinDownloadingTerrainScreen.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinDownloadingTerrainScreen.java
similarity index 90%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinDownloadingTerrainScreen.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinDownloadingTerrainScreen.java
index 600acc66..f1eeb21c 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinDownloadingTerrainScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinDownloadingTerrainScreen.java
@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.base.integration;
+package com.viaversion.viafabricplus.injection.mixin.base.integration;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.settings.impl.GeneralSettings;
-import de.florianmichael.viafabricplus.util.ChatUtil;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.settings.impl.GeneralSettings;
+import com.viaversion.viafabricplus.util.ChatUtil;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.DownloadingTerrainScreen;
 import net.minecraft.client.gui.screen.Screen;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinMinecraftClient.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinMinecraftClient.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinMinecraftClient.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinMinecraftClient.java
index aa92963c..23c4fb6c 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinMinecraftClient.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinMinecraftClient.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.base.integration;
+package com.viaversion.viafabricplus.injection.mixin.base.integration;
 
 import com.llamalad7.mixinextras.sugar.Local;
-import de.florianmichael.viafabricplus.event.PostGameLoadCallback;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.event.PostGameLoadCallback;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.RunArgs;
 import net.minecraft.network.ClientConnection;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinMultiplayerScreen.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinMultiplayerScreen.java
similarity index 88%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinMultiplayerScreen.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinMultiplayerScreen.java
index c7aa6667..5e651fab 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinMultiplayerScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinMultiplayerScreen.java
@@ -17,17 +17,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.base.integration;
+package com.viaversion.viafabricplus.injection.mixin.base.integration;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.fixes.ClientsideFixes;
-import de.florianmichael.viafabricplus.injection.access.IServerInfo;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.screen.base.ProtocolSelectionScreen;
-import de.florianmichael.viafabricplus.settings.impl.GeneralSettings;
+import com.viaversion.viafabricplus.fixes.ClientsideFixes;
+import com.viaversion.viafabricplus.injection.access.IServerInfo;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.screen.base.ProtocolSelectionScreen;
+import com.viaversion.viafabricplus.settings.impl.GeneralSettings;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
 import net.minecraft.client.gui.widget.ButtonWidget;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinMultiplayerServerListPinger_1.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinMultiplayerServerListPinger_1.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinMultiplayerServerListPinger_1.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinMultiplayerServerListPinger_1.java
index dc37d6ee..556dd9ea 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinMultiplayerServerListPinger_1.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinMultiplayerServerListPinger_1.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.base.integration;
+package com.viaversion.viafabricplus.injection.mixin.base.integration;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.injection.access.IClientConnection;
-import de.florianmichael.viafabricplus.injection.access.IServerInfo;
+import com.viaversion.viafabricplus.injection.access.IClientConnection;
+import com.viaversion.viafabricplus.injection.access.IServerInfo;
 import net.minecraft.SharedConstants;
 import net.minecraft.client.network.ServerInfo;
 import net.minecraft.network.ClientConnection;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinMultiplayerServerListWidget_ServerEntry.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinMultiplayerServerListWidget_ServerEntry.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinMultiplayerServerListWidget_ServerEntry.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinMultiplayerServerListWidget_ServerEntry.java
index e273c8c2..dad2312f 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinMultiplayerServerListWidget_ServerEntry.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinMultiplayerServerListWidget_ServerEntry.java
@@ -17,15 +17,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.base.integration;
+package com.viaversion.viafabricplus.injection.mixin.base.integration;
 
 import com.google.common.collect.Lists;
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.injection.access.IServerInfo;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.settings.impl.GeneralSettings;
-import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
+import com.viaversion.viafabricplus.injection.access.IServerInfo;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.settings.impl.GeneralSettings;
+import com.viaversion.viafabricplus.settings.impl.VisualSettings;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinRakSessionCodec.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinRakSessionCodec.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinRakSessionCodec.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinRakSessionCodec.java
index ab8d6dd1..aabfa247 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinRakSessionCodec.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/integration/MixinRakSessionCodec.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.base.integration;
+package com.viaversion.viafabricplus.injection.mixin.base.integration;
 
-import de.florianmichael.viafabricplus.injection.access.IRakSessionCodec;
+import com.viaversion.viafabricplus.injection.access.IRakSessionCodec;
 import io.netty.util.collection.IntObjectMap;
 import org.cloudburstmc.netty.channel.raknet.packet.EncapsulatedPacket;
 import org.cloudburstmc.netty.channel.raknet.packet.RakDatagramPacket;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/perserverversion/MixinMultiValueDebugSampleLogImpl.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/perserverversion/MixinMultiValueDebugSampleLogImpl.java
similarity index 90%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/perserverversion/MixinMultiValueDebugSampleLogImpl.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/base/perserverversion/MixinMultiValueDebugSampleLogImpl.java
index 2fefb12b..3dee0b06 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/perserverversion/MixinMultiValueDebugSampleLogImpl.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/perserverversion/MixinMultiValueDebugSampleLogImpl.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.base.perserverversion;
+package com.viaversion.viafabricplus.injection.mixin.base.perserverversion;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.injection.access.IMultiValueDebugSampleLogImpl;
+import com.viaversion.viafabricplus.injection.access.IMultiValueDebugSampleLogImpl;
 import net.minecraft.util.profiler.MultiValueDebugSampleLogImpl;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/perserverversion/MixinMultiplayerScreen.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/perserverversion/MixinMultiplayerScreen.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/perserverversion/MixinMultiplayerScreen.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/base/perserverversion/MixinMultiplayerScreen.java
index 3fba8f19..bd556855 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/perserverversion/MixinMultiplayerScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/perserverversion/MixinMultiplayerScreen.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.base.perserverversion;
+package com.viaversion.viafabricplus.injection.mixin.base.perserverversion;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import de.florianmichael.viafabricplus.injection.access.IServerInfo;
+import com.viaversion.viafabricplus.injection.access.IServerInfo;
 import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
 import net.minecraft.client.network.ServerInfo;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/perserverversion/MixinMultiplayerServerListPinger.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/perserverversion/MixinMultiplayerServerListPinger.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/perserverversion/MixinMultiplayerServerListPinger.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/base/perserverversion/MixinMultiplayerServerListPinger.java
index 3efbeec7..65c17b09 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/perserverversion/MixinMultiplayerServerListPinger.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/perserverversion/MixinMultiplayerServerListPinger.java
@@ -17,14 +17,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.base.perserverversion;
+package com.viaversion.viafabricplus.injection.mixin.base.perserverversion;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
-import de.florianmichael.viafabricplus.fixes.ClientsideFixes;
-import de.florianmichael.viafabricplus.injection.access.IMultiValueDebugSampleLogImpl;
-import de.florianmichael.viafabricplus.injection.access.IServerInfo;
+import com.viaversion.viafabricplus.fixes.ClientsideFixes;
+import com.viaversion.viafabricplus.injection.access.IMultiValueDebugSampleLogImpl;
+import com.viaversion.viafabricplus.injection.access.IServerInfo;
 import net.minecraft.client.network.MultiplayerServerListPinger;
 import net.minecraft.client.network.ServerAddress;
 import net.minecraft.client.network.ServerInfo;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/perserverversion/MixinServerInfo.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/perserverversion/MixinServerInfo.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/perserverversion/MixinServerInfo.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/base/perserverversion/MixinServerInfo.java
index 6bf7db8b..d918b3ff 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/perserverversion/MixinServerInfo.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/base/perserverversion/MixinServerInfo.java
@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.base.perserverversion;
+package com.viaversion.viafabricplus.injection.mixin.base.perserverversion;
 
 import com.llamalad7.mixinextras.sugar.Local;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.injection.access.IServerInfo;
-import de.florianmichael.viafabricplus.save.impl.SettingsSave;
+import com.viaversion.viafabricplus.injection.access.IServerInfo;
+import com.viaversion.viafabricplus.save.impl.SettingsSave;
 import net.minecraft.client.network.ServerInfo;
 import net.minecraft.nbt.NbtCompound;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/classic4j/MixinCCAuthenticationResponse.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/compat/classic4j/MixinCCAuthenticationResponse.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/classic4j/MixinCCAuthenticationResponse.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/compat/classic4j/MixinCCAuthenticationResponse.java
index 17aeeb37..730dc1fc 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/classic4j/MixinCCAuthenticationResponse.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/compat/classic4j/MixinCCAuthenticationResponse.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.compat.classic4j;
+package com.viaversion.viafabricplus.injection.mixin.compat.classic4j;
 
 import de.florianmichael.classic4j.model.classicube.CCAuthenticationResponse;
 import de.florianmichael.classic4j.model.classicube.CCError;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/classic4j/MixinTextFieldWidget.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/compat/classic4j/MixinTextFieldWidget.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/classic4j/MixinTextFieldWidget.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/compat/classic4j/MixinTextFieldWidget.java
index 083164ac..c991e25c 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/classic4j/MixinTextFieldWidget.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/compat/classic4j/MixinTextFieldWidget.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.compat.classic4j;
+package com.viaversion.viafabricplus.injection.mixin.compat.classic4j;
 
-import de.florianmichael.viafabricplus.injection.access.ITextFieldWidget;
+import com.viaversion.viafabricplus.injection.access.ITextFieldWidget;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.util.StringHelper;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/fabricapi/MixinClientRegistrySyncHandler.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/compat/fabricapi/MixinClientRegistrySyncHandler.java
similarity index 90%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/fabricapi/MixinClientRegistrySyncHandler.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/compat/fabricapi/MixinClientRegistrySyncHandler.java
index c5b37b84..eb9ae537 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/fabricapi/MixinClientRegistrySyncHandler.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/compat/fabricapi/MixinClientRegistrySyncHandler.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.compat.fabricapi;
+package com.viaversion.viafabricplus.injection.mixin.compat.fabricapi;
 
-import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.settings.impl.DebugSettings;
+import com.viaversion.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.settings.impl.DebugSettings;
 import net.fabricmc.fabric.impl.client.registry.sync.ClientRegistrySyncHandler;
 import net.fabricmc.fabric.impl.registry.sync.packet.RegistryPacketHandler;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/fabricapi/MixinRegistrySyncManager.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/compat/fabricapi/MixinRegistrySyncManager.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/fabricapi/MixinRegistrySyncManager.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/compat/fabricapi/MixinRegistrySyncManager.java
index 16e5f703..546c1723 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/fabricapi/MixinRegistrySyncManager.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/compat/fabricapi/MixinRegistrySyncManager.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.compat.fabricapi;
+package com.viaversion.viafabricplus.injection.mixin.compat.fabricapi;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import de.florianmichael.viafabricplus.fixes.versioned.visual.FootStepParticle1_12_2;
+import com.viaversion.viafabricplus.fixes.versioned.visual.FootStepParticle1_12_2;
 import net.fabricmc.fabric.impl.registry.sync.RegistrySyncManager;
 import net.minecraft.registry.Registry;
 import net.minecraft.util.Identifier;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/ipnext/MixinAutoRefillHandler_ItemSlotMonitor.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/compat/ipnext/MixinAutoRefillHandler_ItemSlotMonitor.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/ipnext/MixinAutoRefillHandler_ItemSlotMonitor.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/compat/ipnext/MixinAutoRefillHandler_ItemSlotMonitor.java
index 6b1c986f..1663fa13 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/ipnext/MixinAutoRefillHandler_ItemSlotMonitor.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/compat/ipnext/MixinAutoRefillHandler_ItemSlotMonitor.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.compat.ipnext;
+package com.viaversion.viafabricplus.injection.mixin.compat.ipnext;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.Shadow;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/lithium/MixinEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/compat/lithium/MixinEntity.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/lithium/MixinEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/compat/lithium/MixinEntity.java
index 7d93e28f..cc3ea15e 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/lithium/MixinEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/compat/lithium/MixinEntity.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.compat.lithium;
+package com.viaversion.viafabricplus.injection.mixin.compat.lithium;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.entity.Entity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/minecraftauth/MixinClasses.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/compat/minecraftauth/MixinClasses.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/minecraftauth/MixinClasses.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/compat/minecraftauth/MixinClasses.java
index 5593bc44..a797519b 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/minecraftauth/MixinClasses.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/compat/minecraftauth/MixinClasses.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.compat.minecraftauth;
+package com.viaversion.viafabricplus.injection.mixin.compat.minecraftauth;
 
 import io.jsonwebtoken.lang.Classes;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/minecraftauth/MixinDefaultJwtParserBuilder.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/compat/minecraftauth/MixinDefaultJwtParserBuilder.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/minecraftauth/MixinDefaultJwtParserBuilder.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/compat/minecraftauth/MixinDefaultJwtParserBuilder.java
index b845623f..d683fccc 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/compat/minecraftauth/MixinDefaultJwtParserBuilder.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/compat/minecraftauth/MixinDefaultJwtParserBuilder.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.compat.minecraftauth;
+package com.viaversion.viafabricplus.injection.mixin.compat.minecraftauth;
 
 import io.jsonwebtoken.gson.io.GsonDeserializer;
 import io.jsonwebtoken.impl.DefaultJwtParserBuilder;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/authlib/MixinKeyPairResponse.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/authlib/MixinKeyPairResponse.java
similarity index 90%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/authlib/MixinKeyPairResponse.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/authlib/MixinKeyPairResponse.java
index ab6cf959..89c1bf8c 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/authlib/MixinKeyPairResponse.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/authlib/MixinKeyPairResponse.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.authlib;
+package com.viaversion.viafabricplus.injection.mixin.fixes.authlib;
 
 import com.mojang.authlib.yggdrasil.response.KeyPairResponse;
-import de.florianmichael.viafabricplus.injection.access.ILegacyKeySignatureStorage;
+import com.viaversion.viafabricplus.injection.access.ILegacyKeySignatureStorage;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/authlib/MixinYggdrasilUserApiService.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/authlib/MixinYggdrasilUserApiService.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/authlib/MixinYggdrasilUserApiService.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/authlib/MixinYggdrasilUserApiService.java
index ce1aa870..6b10c8e7 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/authlib/MixinYggdrasilUserApiService.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/authlib/MixinYggdrasilUserApiService.java
@@ -17,14 +17,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.authlib;
+package com.viaversion.viafabricplus.injection.mixin.fixes.authlib;
 
 import com.mojang.authlib.minecraft.client.MinecraftClient;
 import com.mojang.authlib.yggdrasil.YggdrasilUserApiService;
 import com.mojang.authlib.yggdrasil.response.KeyPairResponse;
-import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.fixes.versioned.KeyPairResponse1_19_0;
-import de.florianmichael.viafabricplus.injection.access.ILegacyKeySignatureStorage;
+import com.viaversion.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.fixes.versioned.KeyPairResponse1_19_0;
+import com.viaversion.viafabricplus.injection.access.ILegacyKeySignatureStorage;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinAllowedAddressResolver.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinAllowedAddressResolver.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinAllowedAddressResolver.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinAllowedAddressResolver.java
index 0ef81aef..a117c36e 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinAllowedAddressResolver.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinAllowedAddressResolver.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.network.Address;
 import net.minecraft.client.network.AddressResolver;
 import net.minecraft.client.network.AllowedAddressResolver;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinBuiltChunk.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinBuiltChunk.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinBuiltChunk.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinBuiltChunk.java
index ecf8d3e7..51c77172 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinBuiltChunk.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinBuiltChunk.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 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/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinCamera.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinCamera.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinCamera.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinCamera.java
index f7590ffd..a6b33ce1 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinCamera.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinCamera.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
 
-import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
+import com.viaversion.viafabricplus.settings.impl.VisualSettings;
 import net.minecraft.client.render.Camera;
 import net.minecraft.entity.Entity;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinChatInputSuggestor.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinChatInputSuggestor.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinChatInputSuggestor.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinChatInputSuggestor.java
index d0915eca..115cf4c6 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinChatInputSuggestor.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinChatInputSuggestor.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
 
-import de.florianmichael.viafabricplus.settings.impl.DebugSettings;
+import com.viaversion.viafabricplus.settings.impl.DebugSettings;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ChatInputSuggestor;
 import net.minecraft.client.gui.widget.TextFieldWidget;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinClientCommandSource.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinClientCommandSource.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinClientCommandSource.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinClientCommandSource.java
index c568b4e6..e2f294ea 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinClientCommandSource.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinClientCommandSource.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
 
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.network.ClientCommandSource;
 import net.raphimc.viabedrock.api.BedrockProtocolVersion;
 import org.spongepowered.asm.mixin.Final;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinClientWorld.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinClientWorld.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinClientWorld.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinClientWorld.java
index 11e3adf7..c84f043a 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinClientWorld.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinClientWorld.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
 
-import de.florianmichael.viafabricplus.fixes.versioned.PendingUpdateManager1_18_2;
-import de.florianmichael.viafabricplus.injection.access.IEntity;
-import de.florianmichael.viafabricplus.settings.impl.DebugSettings;
+import com.viaversion.viafabricplus.fixes.versioned.PendingUpdateManager1_18_2;
+import com.viaversion.viafabricplus.injection.access.IEntity;
+import com.viaversion.viafabricplus.settings.impl.DebugSettings;
 import net.minecraft.client.network.PendingUpdateManager;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.Entity;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinFlowableFluid.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinFlowableFluid.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinFlowableFluid.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinFlowableFluid.java
index e836fd8a..6a49d103 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinFlowableFluid.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinFlowableFluid.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.protocoltranslator.impl.ViaFabricPlusMappingDataLoader;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.impl.ViaFabricPlusMappingDataLoader;
 import net.minecraft.block.*;
 import net.minecraft.fluid.FlowableFluid;
 import net.minecraft.util.math.BlockPos;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinFontStorage.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinFontStorage.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinFontStorage.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinFontStorage.java
index 581e5400..9766b0ed 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinFontStorage.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinFontStorage.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
 
-import de.florianmichael.viafabricplus.fixes.data.RenderableGlyphDiff;
-import de.florianmichael.viafabricplus.fixes.versioned.visual.BuiltinEmptyGlyph1_12_2;
-import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
+import com.viaversion.viafabricplus.fixes.data.RenderableGlyphDiff;
+import com.viaversion.viafabricplus.fixes.versioned.visual.BuiltinEmptyGlyph1_12_2;
+import com.viaversion.viafabricplus.settings.impl.VisualSettings;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.*;
 import net.minecraft.util.Identifier;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinGameOptions.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinGameOptions.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinGameOptions.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinGameOptions.java
index ba0e9334..68d960ac 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinGameOptions.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinGameOptions.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.option.GameOptions;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinGameRenderer.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinGameRenderer.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinGameRenderer.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinGameRenderer.java
index fa8dfbb5..9e0b6e33 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinGameRenderer.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinGameRenderer.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.GameRenderer;
 import net.minecraft.entity.Entity;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinKeyboard.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinKeyboard.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinKeyboard.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinKeyboard.java
index b92dce78..078684f2 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinKeyboard.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinKeyboard.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
 
-import de.florianmichael.viafabricplus.injection.access.IMouseKeyboard;
-import de.florianmichael.viafabricplus.settings.impl.DebugSettings;
+import com.viaversion.viafabricplus.injection.access.IMouseKeyboard;
+import com.viaversion.viafabricplus.settings.impl.DebugSettings;
 import net.minecraft.client.Keyboard;
 import net.minecraft.client.MinecraftClient;
 import org.spongepowered.asm.mixin.Final;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinLanguageManager.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinLanguageManager.java
similarity index 86%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinLanguageManager.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinLanguageManager.java
index bd50f2d4..82649137 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinLanguageManager.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinLanguageManager.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
 
-import de.florianmichael.viafabricplus.fixes.versioned.visual.UnicodeFontFix1_12_2;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.fixes.versioned.visual.UnicodeFontFix1_12_2;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.resource.language.LanguageManager;
 import net.minecraft.resource.ResourceManager;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinMinecraftClient.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinMinecraftClient.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinMinecraftClient.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinMinecraftClient.java
index c17dcc5a..629ce69b 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinMinecraftClient.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinMinecraftClient.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
@@ -26,10 +26,10 @@ 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 de.florianmichael.viafabricplus.fixes.versioned.ItemPick1_21_3;
-import de.florianmichael.viafabricplus.injection.access.IMouseKeyboard;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.settings.impl.DebugSettings;
+import com.viaversion.viafabricplus.fixes.versioned.ItemPick1_21_3;
+import com.viaversion.viafabricplus.injection.access.IMouseKeyboard;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.settings.impl.DebugSettings;
 import net.minecraft.client.Keyboard;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.Mouse;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinMouse.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinMouse.java
similarity index 89%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinMouse.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinMouse.java
index 6e2990e8..f63b1607 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinMouse.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinMouse.java
@@ -17,15 +17,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.injection.access.IMouseKeyboard;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.protocoltranslator.util.MathUtil;
-import de.florianmichael.viafabricplus.settings.impl.DebugSettings;
+import com.viaversion.viafabricplus.injection.access.IMouseKeyboard;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.util.MathUtil;
+import com.viaversion.viafabricplus.settings.impl.DebugSettings;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.Mouse;
 import net.minecraft.client.option.SimpleOption;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinPlayerListEntry.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinPlayerListEntry.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinPlayerListEntry.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinPlayerListEntry.java
index 0bf166fa..357f85be 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinPlayerListEntry.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinPlayerListEntry.java
@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
 
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.yggdrasil.ProfileResult;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.PlayerListEntry;
 import net.minecraft.client.texture.PlayerSkinProvider;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinPlayerPublicKey_PublicKeyData.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinPlayerPublicKey_PublicKeyData.java
similarity index 90%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinPlayerPublicKey_PublicKeyData.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinPlayerPublicKey_PublicKeyData.java
index c9ebd3c3..c4f5730e 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinPlayerPublicKey_PublicKeyData.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinPlayerPublicKey_PublicKeyData.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
 
-import de.florianmichael.viafabricplus.injection.access.ILegacyKeySignatureStorage;
+import com.viaversion.viafabricplus.injection.access.ILegacyKeySignatureStorage;
 import net.minecraft.network.encryption.PlayerPublicKey;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinProfileKeysImpl.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinProfileKeysImpl.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinProfileKeysImpl.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinProfileKeysImpl.java
index a0460db8..fd00b057 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinProfileKeysImpl.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinProfileKeysImpl.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
 
 import com.mojang.authlib.yggdrasil.response.KeyPairResponse;
-import de.florianmichael.viafabricplus.injection.access.ILegacyKeySignatureStorage;
+import com.viaversion.viafabricplus.injection.access.ILegacyKeySignatureStorage;
 import net.minecraft.client.session.ProfileKeysImpl;
 import net.minecraft.network.encryption.PlayerPublicKey;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinRedirectResolver.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinRedirectResolver.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinRedirectResolver.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinRedirectResolver.java
index 88dbb9d0..39143b3b 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinRedirectResolver.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinRedirectResolver.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
 
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.network.RedirectResolver;
 import net.minecraft.client.network.ServerAddress;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinServerAddress.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinServerAddress.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinServerAddress.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinServerAddress.java
index 5891c53d..ca41bb86 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinServerAddress.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinServerAddress.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.network.AllowedAddressResolver;
 import net.minecraft.client.network.ServerAddress;
 import org.spongepowered.asm.mixin.Final;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinServerResourcePackLoader_4.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinServerResourcePackLoader_4.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinServerResourcePackLoader_4.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinServerResourcePackLoader_4.java
index 7d041bbc..ae350494 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinServerResourcePackLoader_4.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinServerResourcePackLoader_4.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.fixes.data.ResourcePackHeaderDiff;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.fixes.data.ResourcePackHeaderDiff;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.GameVersion;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinStaticSound.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinStaticSound.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinStaticSound.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinStaticSound.java
index ae451bb5..6e420307 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinStaticSound.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinStaticSound.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
 
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.sound.StaticSound;
 import net.raphimc.viaaprilfools.api.AprilFoolsProtocolVersion;
 import org.spongepowered.asm.mixin.Final;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinStatusEffectInstance.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinStatusEffectInstance.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinStatusEffectInstance.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinStatusEffectInstance.java
index 51d2715e..704bbed6 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinStatusEffectInstance.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinStatusEffectInstance.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.util.math.MathHelper;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinStringHelper.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinStringHelper.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinStringHelper.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinStringHelper.java
index ba607531..2af28d16 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinStringHelper.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinStringHelper.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import de.florianmichael.viafabricplus.fixes.ClientsideFixes;
+import com.viaversion.viafabricplus.fixes.ClientsideFixes;
 import net.minecraft.util.StringHelper;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinTextRenderer.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinTextRenderer.java
similarity index 97%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinTextRenderer.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinTextRenderer.java
index 7c3f75a4..e05af142 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinTextRenderer.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinTextRenderer.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
 
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.render.VertexConsumerProvider;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinTextRenderer_Drawer.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinTextRenderer_Drawer.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinTextRenderer_Drawer.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinTextRenderer_Drawer.java
index 7681da22..6728fc8f 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinTextRenderer_Drawer.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinTextRenderer_Drawer.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.font.TextRenderer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinWeatherRendering.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinWeatherRendering.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinWeatherRendering.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinWeatherRendering.java
index 9f984d8d..3d2e06ac 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinWeatherRendering.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/MixinWeatherRendering.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft;
 
-import de.florianmichael.viafabricplus.fixes.versioned.classic.CPEAdditions;
+import com.viaversion.viafabricplus.fixes.versioned.classic.CPEAdditions;
 import net.minecraft.client.render.WeatherRendering;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractBlock.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractBlock.java
index fb690761..d9c04073 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractBlock.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.AbstractBlock;
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.player.PlayerEntity;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractBlock_AbstractBlockState.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractBlock_AbstractBlockState.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractBlock_AbstractBlockState.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractBlock_AbstractBlockState.java
index 76b3999a..464f4392 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractBlock_AbstractBlockState.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractBlock_AbstractBlockState.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.*;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.BlockView;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractRailBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractRailBlock.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractRailBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractRailBlock.java
index 992f96fe..f3574190 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractRailBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractRailBlock.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.AbstractRailBlock;
 import net.minecraft.block.Block;
 import net.minecraft.util.shape.VoxelShape;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractSignBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractSignBlock.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractSignBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractSignBlock.java
index 846515e3..4dc38092 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractSignBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAbstractSignBlock.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.AbstractSignBlock;
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.player.PlayerEntity;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAnvilBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAnvilBlock.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAnvilBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAnvilBlock.java
index 5b8e91f3..d200a20c 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAnvilBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinAnvilBlock.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.injection.ViaFabricPlusMixinPlugin;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.injection.ViaFabricPlusMixinPlugin;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.*;
 import net.minecraft.state.property.EnumProperty;
 import net.minecraft.util.math.BlockPos;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBedBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBedBlock.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBedBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBedBlock.java
index 0e815ba8..67857701 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBedBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBedBlock.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.injection.ViaFabricPlusMixinPlugin;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.injection.ViaFabricPlusMixinPlugin;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.*;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.math.BlockPos;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBrewingStandBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBrewingStandBlock.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBrewingStandBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBrewingStandBlock.java
index be30cee2..ac8966af 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBrewingStandBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinBrewingStandBlock.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.BrewingStandBlock;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinCarpetBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinCarpetBlock.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinCarpetBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinCarpetBlock.java
index 0cc6ab02..0807b838 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinCarpetBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinCarpetBlock.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.CarpetBlock;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinCauldronBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinCauldronBlock.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinCauldronBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinCauldronBlock.java
index 813eba06..976b3b18 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinCauldronBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinCauldronBlock.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.injection.ViaFabricPlusMixinPlugin;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.injection.ViaFabricPlusMixinPlugin;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.*;
 import net.minecraft.block.cauldron.CauldronBehavior;
 import net.minecraft.util.function.BooleanBiFunction;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinChestBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinChestBlock.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinChestBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinChestBlock.java
index eda479f6..c6d43453 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinChestBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinChestBlock.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.AbstractChestBlock;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.ChestBlock;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinCropBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinCropBlock.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinCropBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinCropBlock.java
index 54d39400..e21d60f2 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinCropBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinCropBlock.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.Block;
 import net.minecraft.block.CropBlock;
 import net.minecraft.util.shape.VoxelShape;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinDecoratedPotBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinDecoratedPotBlock.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinDecoratedPotBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinDecoratedPotBlock.java
index aa8a630b..4f1fb932 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinDecoratedPotBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinDecoratedPotBlock.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.DecoratedPotBlock;
 import net.minecraft.entity.player.PlayerEntity;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinEndPortalBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinEndPortalBlock.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinEndPortalBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinEndPortalBlock.java
index c68c8f99..eb87e4cb 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinEndPortalBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinEndPortalBlock.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.*;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.shape.VoxelShape;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinEndPortalFrameBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinEndPortalFrameBlock.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinEndPortalFrameBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinEndPortalFrameBlock.java
index 65330afc..1acfcd3e 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinEndPortalFrameBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinEndPortalFrameBlock.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.EndPortalFrameBlock;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinEnderChestBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinEnderChestBlock.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinEnderChestBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinEnderChestBlock.java
index 79978a9c..1ed6390d 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinEnderChestBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinEnderChestBlock.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.BlockWithEntity;
 import net.minecraft.block.EnderChestBlock;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFarmlandBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFarmlandBlock.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFarmlandBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFarmlandBlock.java
index 5e5be2b8..e3dbbad3 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFarmlandBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFarmlandBlock.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.FarmlandBlock;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFenceBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFenceBlock.java
similarity index 97%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFenceBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFenceBlock.java
index 66ffdad0..907335c8 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFenceBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFenceBlock.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.*;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFenceGateBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFenceGateBlock.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFenceGateBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFenceGateBlock.java
index cd4f6836..18511904 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFenceGateBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFenceGateBlock.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.*;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.shape.VoxelShape;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFireBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFireBlock.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFireBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFireBlock.java
index 65614fce..cb16a1e0 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFireBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFireBlock.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.FireBlock;
 import net.minecraft.block.ShapeContext;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFlowerPotBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFlowerPotBlock.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFlowerPotBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFlowerPotBlock.java
index 071864f3..4bd2669b 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFlowerPotBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFlowerPotBlock.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.FlowerPotBlock;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFlowerbedBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFlowerbedBlock.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFlowerbedBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFlowerbedBlock.java
index 8eb00d84..8a22bd38 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFlowerbedBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinFlowerbedBlock.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.FlowerbedBlock;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinHoneyBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinHoneyBlock.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinHoneyBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinHoneyBlock.java
index cd671fb9..0d5d1c43 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinHoneyBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinHoneyBlock.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.HoneyBlock;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinHopperBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinHopperBlock.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinHopperBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinHopperBlock.java
index 06608ade..8eb77fa0 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinHopperBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinHopperBlock.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.injection.ViaFabricPlusMixinPlugin;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.injection.ViaFabricPlusMixinPlugin;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.*;
 import net.minecraft.util.function.BooleanBiFunction;
 import net.minecraft.util.math.BlockPos;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinLadderBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinLadderBlock.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinLadderBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinLadderBlock.java
index d2cd079f..5670ccaf 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinLadderBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinLadderBlock.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.LadderBlock;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinLeavesBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinLeavesBlock.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinLeavesBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinLeavesBlock.java
index 6579a5dd..730bcacf 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinLeavesBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinLeavesBlock.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.LeavesBlock;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinLilyPadBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinLilyPadBlock.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinLilyPadBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinLilyPadBlock.java
index 6845e526..cc0768fd 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinLilyPadBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinLilyPadBlock.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.LilyPadBlock;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinNoteBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinNoteBlock.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinNoteBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinNoteBlock.java
index 4e6f0041..b9811c92 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinNoteBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinNoteBlock.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.NoteBlock;
 import net.minecraft.util.ActionResult;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinPaneBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinPaneBlock.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinPaneBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinPaneBlock.java
index da81dfc8..e1224472 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinPaneBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinPaneBlock.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.*;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.shape.VoxelShape;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinPistonBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinPistonBlock.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinPistonBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinPistonBlock.java
index cb284a33..5c34275f 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinPistonBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinPistonBlock.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.FacingBlock;
 import net.minecraft.block.PistonBlock;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinPistonHeadBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinPistonHeadBlock.java
similarity index 97%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinPistonHeadBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinPistonHeadBlock.java
index e2928500..34f19c75 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinPistonHeadBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinPistonHeadBlock.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.*;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.shape.VoxelShape;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinSnowBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinSnowBlock.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinSnowBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinSnowBlock.java
index 41334189..e453b6a1 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinSnowBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinSnowBlock.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.ShapeContext;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinSoulSandBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinSoulSandBlock.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinSoulSandBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinSoulSandBlock.java
index 2f87addf..ffa028e3 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinSoulSandBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinSoulSandBlock.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.SoulSandBlock;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinWallBlock.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinWallBlock.java
similarity index 98%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinWallBlock.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinWallBlock.java
index d0ba5619..7659dce2 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinWallBlock.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/block/MixinWallBlock.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.block;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.block;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 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/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAbstractBoatEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAbstractBoatEntity.java
similarity index 98%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAbstractBoatEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAbstractBoatEntity.java
index ad20e63a..5aa1a52c 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAbstractBoatEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAbstractBoatEntity.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.fixes.versioned.visual.EntityRidingOffsetsPre1_20_2;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.fixes.versioned.visual.EntityRidingOffsetsPre1_20_2;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAbstractClientPlayerEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAbstractClientPlayerEntity.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAbstractClientPlayerEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAbstractClientPlayerEntity.java
index 650482ae..1b16c38e 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAbstractClientPlayerEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAbstractClientPlayerEntity.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.mojang.authlib.GameProfile;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.math.BlockPos;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAbstractHorseEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAbstractHorseEntity.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAbstractHorseEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAbstractHorseEntity.java
index fd302a76..f5a05b0a 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAbstractHorseEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAbstractHorseEntity.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.entity.passive.AbstractHorseEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAnimalEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAnimalEntity.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAnimalEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAnimalEntity.java
index d4ea27b4..b1a41bc9 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAnimalEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAnimalEntity.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.entity.passive.AnimalEntity;
 import net.minecraft.util.ActionResult;
 import net.minecraft.world.World;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinArmadilloEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinArmadilloEntity.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinArmadilloEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinArmadilloEntity.java
index da543e06..cb59914e 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinArmadilloEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinArmadilloEntity.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 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/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAxolotlEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAxolotlEntity.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAxolotlEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAxolotlEntity.java
index 7330df37..0d646d2d 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAxolotlEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinAxolotlEntity.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.entity.passive.AxolotlEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinBeeEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinBeeEntity.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinBeeEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinBeeEntity.java
index da31ac61..0c238d17 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinBeeEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinBeeEntity.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.passive.AnimalEntity;
 import net.minecraft.entity.passive.BeeEntity;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinBipedEntityModel.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinBipedEntityModel.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinBipedEntityModel.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinBipedEntityModel.java
index 27543f66..dda785de 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinBipedEntityModel.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinBipedEntityModel.java
@@ -17,11 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
+import com.viaversion.viafabricplus.settings.impl.VisualSettings;
 import net.minecraft.client.model.ModelPart;
 import net.minecraft.client.render.entity.model.BipedEntityModel;
 import net.minecraft.client.render.entity.state.BipedEntityRenderState;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCamelEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCamelEntity.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCamelEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCamelEntity.java
index c2fc4051..d4c6a5af 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCamelEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCamelEntity.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.passive.AbstractHorseEntity;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCatEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCatEntity.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCatEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCatEntity.java
index 23e38aca..58c43524 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCatEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCatEntity.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.passive.CatEntity;
 import net.minecraft.entity.passive.TameableEntity;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinClientPlayerEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinClientPlayerEntity.java
similarity index 98%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinClientPlayerEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinClientPlayerEntity.java
index 2233b559..56da0526 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinClientPlayerEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinClientPlayerEntity.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
@@ -25,9 +25,9 @@ import com.mojang.authlib.GameProfile;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.api.type.Types;
-import de.florianmichael.viafabricplus.injection.access.IClientConnection;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.settings.impl.DebugSettings;
+import com.viaversion.viafabricplus.injection.access.IClientConnection;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.settings.impl.DebugSettings;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.input.Input;
 import net.minecraft.client.network.AbstractClientPlayerEntity;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCowEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCowEntity.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCowEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCowEntity.java
index 0ba511af..15779723 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCowEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCowEntity.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.passive.AnimalEntity;
 import net.minecraft.entity.passive.CowEntity;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCreeperEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCreeperEntity.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCreeperEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCreeperEntity.java
index a28daed0..e9607328 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCreeperEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinCreeperEntity.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.entity.mob.CreeperEntity;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntity.java
similarity index 97%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntity.java
index 3659d117..f8fb2c0f 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntity.java
@@ -17,13 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.fixes.versioned.visual.EntityRidingOffsetsPre1_20_2;
-import de.florianmichael.viafabricplus.injection.access.IEntity;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.settings.impl.DebugSettings;
+import com.viaversion.viafabricplus.fixes.versioned.visual.EntityRidingOffsetsPre1_20_2;
+import com.viaversion.viafabricplus.injection.access.IEntity;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.settings.impl.DebugSettings;
 import it.unimi.dsi.fastutil.objects.Object2DoubleMap;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.FenceGateBlock;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityIndex.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityIndex.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityIndex.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityIndex.java
index 78ba6eaf..813e9dc8 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityIndex.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityIndex.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 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/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityModels.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityModels.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityModels.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityModels.java
index a32930a9..7772e9ed 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityModels.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityModels.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.google.common.collect.ImmutableMap;
-import de.florianmichael.viafabricplus.fixes.versioned.visual.BoatModel1_8;
+import com.viaversion.viafabricplus.fixes.versioned.visual.BoatModel1_8;
 import net.minecraft.client.model.TexturedModelData;
 import net.minecraft.client.render.entity.model.EntityModelLayer;
 import net.minecraft.client.render.entity.model.EntityModels;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityRenderDispatcher.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityRenderDispatcher.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityRenderDispatcher.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityRenderDispatcher.java
index a0ec9b92..2a004665 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityRenderDispatcher.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityRenderDispatcher.java
@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.llamalad7.mixinextras.sugar.Local;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.fixes.versioned.visual.BoatRenderer1_8;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.fixes.versioned.visual.BoatRenderer1_8;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.render.entity.EntityRenderDispatcher;
 import net.minecraft.client.render.entity.EntityRenderer;
 import net.minecraft.client.render.entity.EntityRendererFactory;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinItemEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinItemEntity.java
similarity index 90%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinItemEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinItemEntity.java
index 03047ea1..d90ff568 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinItemEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinItemEntity.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.entity.ItemEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinLivingEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinLivingEntity.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinLivingEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinLivingEntity.java
index 524dcb6a..a243452f 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinLivingEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinLivingEntity.java
@@ -17,15 +17,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.fixes.versioned.EnchantmentAttributesEmulation1_20_6;
-import de.florianmichael.viafabricplus.fixes.versioned.visual.EntityRidingOffsetsPre1_20_2;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.settings.impl.DebugSettings;
-import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
+import com.viaversion.viafabricplus.fixes.versioned.EnchantmentAttributesEmulation1_20_6;
+import com.viaversion.viafabricplus.fixes.versioned.visual.EntityRidingOffsetsPre1_20_2;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.settings.impl.DebugSettings;
+import com.viaversion.viafabricplus.settings.impl.VisualSettings;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.TrapdoorBlock;
 import net.minecraft.entity.*;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinMobEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinMobEntity.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinMobEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinMobEntity.java
index 7a68bb24..7057d2e4 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinMobEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinMobEntity.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.entity.mob.MobEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.ActionResult;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinMooshroomEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinMooshroomEntity.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinMooshroomEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinMooshroomEntity.java
index f6bfc8ac..7224bb0d 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinMooshroomEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinMooshroomEntity.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.passive.AnimalEntity;
 import net.minecraft.entity.passive.CowEntity;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinOtherClientPlayerEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinOtherClientPlayerEntity.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinOtherClientPlayerEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinOtherClientPlayerEntity.java
index 14be1c28..42b6b077 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinOtherClientPlayerEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinOtherClientPlayerEntity.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.mojang.authlib.GameProfile;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.client.network.OtherClientPlayerEntity;
 import net.minecraft.client.world.ClientWorld;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPlayerEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPlayerEntity.java
similarity index 98%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPlayerEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPlayerEntity.java
index 05619810..af9603f9 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPlayerEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPlayerEntity.java
@@ -17,14 +17,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.llamalad7.mixinextras.sugar.Local;
 import com.llamalad7.mixinextras.sugar.ref.LocalFloatRef;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.settings.impl.VisualSettings;
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.*;
 import net.minecraft.entity.attribute.EntityAttributes;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPlayerEntityRenderer.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPlayerEntityRenderer.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPlayerEntityRenderer.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPlayerEntityRenderer.java
index 26752bb9..64b01a3c 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPlayerEntityRenderer.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPlayerEntityRenderer.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.render.entity.PlayerEntityRenderer;
 import net.minecraft.client.render.entity.state.PlayerEntityRenderState;
 import net.minecraft.entity.EntityPose;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinSkeletonHorseEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinSkeletonHorseEntity.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinSkeletonHorseEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinSkeletonHorseEntity.java
index 351b7cc7..2c41dfbc 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinSkeletonHorseEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinSkeletonHorseEntity.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.mob.SkeletonHorseEntity;
 import net.minecraft.entity.passive.AbstractHorseEntity;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinSquidEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinSquidEntity.java
similarity index 90%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinSquidEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinSquidEntity.java
index a990e5f8..789452ef 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinSquidEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinSquidEntity.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 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/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinVillagerClothingFeatureRenderer.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinVillagerClothingFeatureRenderer.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinVillagerClothingFeatureRenderer.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinVillagerClothingFeatureRenderer.java
index ac9636f0..5e8aa0a4 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinVillagerClothingFeatureRenderer.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinVillagerClothingFeatureRenderer.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
-import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
+import com.viaversion.viafabricplus.settings.impl.VisualSettings;
 import net.minecraft.client.render.entity.feature.VillagerClothingFeatureRenderer;
 import net.minecraft.village.VillagerData;
 import net.minecraft.village.VillagerProfession;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinWolfEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinWolfEntity.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinWolfEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinWolfEntity.java
index 7097bbef..f01bfe03 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinWolfEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinWolfEntity.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.fixes.viaversion.WolfHealthTracker1_14_4;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.fixes.viaversion.WolfHealthTracker1_14_4;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.FoodComponent;
 import net.minecraft.entity.EntityType;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinZombieVillagerEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinZombieVillagerEntity.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinZombieVillagerEntity.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinZombieVillagerEntity.java
index f9a760a6..c01b1c3f 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinZombieVillagerEntity.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinZombieVillagerEntity.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.entity;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.entity.mob.ZombieVillagerEntity;
 import net.minecraft.util.ActionResult;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinAxeItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinAxeItem.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinAxeItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinAxeItem.java
index 23f71b1f..1237718e 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinAxeItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinAxeItem.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.item;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.item.AxeItem;
 import net.minecraft.item.ItemUsageContext;
 import net.minecraft.util.ActionResult;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBlockItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBlockItem.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBlockItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBlockItem.java
index 3d64f8dd..2e9dec4a 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBlockItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBlockItem.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.item;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBowItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBowItem.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBowItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBowItem.java
index 6373ae8b..bf62edef 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBowItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBowItem.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.item;
 
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.BowItem;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBrushItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBrushItem.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBrushItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBrushItem.java
index 2c8240f9..62ffcc41 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBrushItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBrushItem.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.item;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.BrushItem;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBucketItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBucketItem.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBucketItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBucketItem.java
index 0824126a..853c67d4 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBucketItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBucketItem.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.item;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.BucketItem;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBundleItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBundleItem.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBundleItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBundleItem.java
index aeb7df01..69cb3446 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBundleItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBundleItem.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.item;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.item.BundleItem;
 import net.minecraft.util.ActionResult;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinDrawContext.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinDrawContext.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinDrawContext.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinDrawContext.java
index ff046241..b06d1c34 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinDrawContext.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinDrawContext.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.item;
 
-import de.florianmichael.viafabricplus.util.ItemUtil;
+import com.viaversion.viafabricplus.util.ItemUtil;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Formatting;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinEnderEyeItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinEnderEyeItem.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinEnderEyeItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinEnderEyeItem.java
index 6fba8036..a29f7d09 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinEnderEyeItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinEnderEyeItem.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.item;
 
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.EnderEyeItem;
 import net.minecraft.util.Hand;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinEnderPearlItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinEnderPearlItem.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinEnderPearlItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinEnderPearlItem.java
index e4f972d3..6b96760b 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinEnderPearlItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinEnderPearlItem.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.item;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.EnderPearlItem;
 import net.minecraft.util.ActionResult;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinEquippableComponent.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinEquippableComponent.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinEquippableComponent.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinEquippableComponent.java
index 410d5b3a..669f9268 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinEquippableComponent.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinEquippableComponent.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.item;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.component.type.EquippableComponent;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.player.PlayerEntity;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinFireChargeItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinFireChargeItem.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinFireChargeItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinFireChargeItem.java
index 07295503..1061234f 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinFireChargeItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinFireChargeItem.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.item;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.item.FireChargeItem;
 import net.minecraft.item.ItemUsageContext;
 import net.minecraft.util.ActionResult;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinFireworkRocketItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinFireworkRocketItem.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinFireworkRocketItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinFireworkRocketItem.java
index 663b40b7..f9da270a 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinFireworkRocketItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinFireworkRocketItem.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.item;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.FireworkRocketItem;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinFishingRodItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinFishingRodItem.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinFishingRodItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinFishingRodItem.java
index 617cf49b..14d1b69c 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinFishingRodItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinFishingRodItem.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.item;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.FishingRodItem;
 import net.minecraft.util.ActionResult;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinHeldItemRenderer.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinHeldItemRenderer.java
similarity index 97%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinHeldItemRenderer.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinHeldItemRenderer.java
index 8e099f88..fb9abf69 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinHeldItemRenderer.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinHeldItemRenderer.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.item;
 
-import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
+import com.viaversion.viafabricplus.settings.impl.VisualSettings;
 import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.item.HeldItemRenderer;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemCooldownManager.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemCooldownManager.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemCooldownManager.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemCooldownManager.java
index e33fe557..37b8aeab 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemCooldownManager.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemCooldownManager.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.item;
 
-import de.florianmichael.viafabricplus.settings.impl.DebugSettings;
+import com.viaversion.viafabricplus.settings.impl.DebugSettings;
 import net.minecraft.entity.player.ItemCooldownManager;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemGroup_EntriesImpl.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemGroup_EntriesImpl.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemGroup_EntriesImpl.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemGroup_EntriesImpl.java
index 37669774..097f8529 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemGroup_EntriesImpl.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemGroup_EntriesImpl.java
@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.item;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import de.florianmichael.viafabricplus.fixes.data.ItemRegistryDiff;
-import de.florianmichael.viafabricplus.settings.impl.GeneralSettings;
+import com.viaversion.viafabricplus.fixes.data.ItemRegistryDiff;
+import com.viaversion.viafabricplus.settings.impl.GeneralSettings;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemGroup;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemGroups.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemGroups.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemGroups.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemGroups.java
index 3836b2ad..9a395110 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemGroups.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemGroups.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.item;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.settings.impl.GeneralSettings;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.settings.impl.GeneralSettings;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemGroups;
 import net.minecraft.registry.RegistryWrapper;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemPlacementContext.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemPlacementContext.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemPlacementContext.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemPlacementContext.java
index 4f6a732e..9d06e693 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemPlacementContext.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemPlacementContext.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.item;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.protocoltranslator.impl.ViaFabricPlusMappingDataLoader;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.impl.ViaFabricPlusMappingDataLoader;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
 import net.minecraft.entity.player.PlayerEntity;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemRenderer.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemRenderer.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemRenderer.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemRenderer.java
index 555c3d7c..72b115f8 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemRenderer.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemRenderer.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.item;
 
-import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
+import com.viaversion.viafabricplus.settings.impl.VisualSettings;
 import net.minecraft.client.item.ItemModelManager;
 import net.minecraft.component.ComponentType;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemStack.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemStack.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemStack.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemStack.java
index 52ef9ee0..71149064 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemStack.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinItemStack.java
@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.item;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.fixes.versioned.Enchantments1_14_4;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.util.ItemUtil;
+import com.viaversion.viafabricplus.fixes.versioned.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 net.minecraft.component.type.ItemEnchantmentsComponent;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinKnowledgeBookItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinKnowledgeBookItem.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinKnowledgeBookItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinKnowledgeBookItem.java
index 964c1d26..748536f4 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinKnowledgeBookItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinKnowledgeBookItem.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.item;
 
 import com.llamalad7.mixinextras.sugar.Local;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.KnowledgeBookItem;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinLeadItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinLeadItem.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinLeadItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinLeadItem.java
index dfc18119..0231ef2c 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinLeadItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinLeadItem.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.item;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.item.ItemUsageContext;
 import net.minecraft.item.LeadItem;
 import net.minecraft.registry.tag.BlockTags;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinMilkBucketItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinMilkBucketItem.java
similarity index 100%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinMilkBucketItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinMilkBucketItem.java
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinShovelItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinShovelItem.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinShovelItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinShovelItem.java
index 1cbc03d5..b660e79a 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinShovelItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinShovelItem.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.item;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.item.ShovelItem;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinSwordItem.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinSwordItem.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinSwordItem.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinSwordItem.java
index e9c60690..2e150d68 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinSwordItem.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/item/MixinSwordItem.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.item;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.item;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.SwordItem;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinChatMessageC2SPacket.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinChatMessageC2SPacket.java
similarity index 90%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinChatMessageC2SPacket.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinChatMessageC2SPacket.java
index 91ceb47e..7498061d 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinChatMessageC2SPacket.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinChatMessageC2SPacket.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.network;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.network;
 
-import de.florianmichael.viafabricplus.fixes.ClientsideFixes;
+import com.viaversion.viafabricplus.fixes.ClientsideFixes;
 import net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.Constant;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientCommonNetworkHandler.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientCommonNetworkHandler.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientCommonNetworkHandler.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientCommonNetworkHandler.java
index 9610b0a5..b41ea20d 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientCommonNetworkHandler.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientCommonNetworkHandler.java
@@ -17,14 +17,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.network;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.network;
 
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.fixes.ClientsideFixes;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.settings.impl.DebugSettings;
-import de.florianmichael.viafabricplus.util.DataCustomPayload;
+import com.viaversion.viafabricplus.fixes.ClientsideFixes;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.settings.impl.DebugSettings;
+import com.viaversion.viafabricplus.util.DataCustomPayload;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientCommonNetworkHandler;
 import net.minecraft.network.ClientConnection;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientConfigurationNetworkHandler.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientConfigurationNetworkHandler.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientConfigurationNetworkHandler.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientConfigurationNetworkHandler.java
index e7c593ec..d92b03f1 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientConfigurationNetworkHandler.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientConfigurationNetworkHandler.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.network;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.network;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.util.ChatUtil;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.util.ChatUtil;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientCommonNetworkHandler;
 import net.minecraft.client.network.ClientConfigurationNetworkHandler;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientLoginNetworkHandler.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientLoginNetworkHandler.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientLoginNetworkHandler.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientLoginNetworkHandler.java
index b9dd1f62..f0cd9fb8 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientLoginNetworkHandler.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientLoginNetworkHandler.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.network;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.network;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.network.ClientLoginNetworkHandler;
 import net.minecraft.network.ClientConnection;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientPlayNetworkHandler.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientPlayNetworkHandler.java
similarity index 97%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientPlayNetworkHandler.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientPlayNetworkHandler.java
index 6d1e439c..1540d1e6 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientPlayNetworkHandler.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientPlayNetworkHandler.java
@@ -17,16 +17,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.network;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.network;
 
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.llamalad7.mixinextras.sugar.Local;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.fixes.ClientsideFixes;
-import de.florianmichael.viafabricplus.injection.access.IDownloadingTerrainScreen;
-import de.florianmichael.viafabricplus.injection.access.IPlayerListHud;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
+import com.viaversion.viafabricplus.fixes.ClientsideFixes;
+import com.viaversion.viafabricplus.injection.access.IDownloadingTerrainScreen;
+import com.viaversion.viafabricplus.injection.access.IPlayerListHud;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.settings.impl.VisualSettings;
 import net.minecraft.block.entity.SignBlockEntity;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.DownloadingTerrainScreen;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientPlayerInteractionManager.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientPlayerInteractionManager.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientPlayerInteractionManager.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientPlayerInteractionManager.java
index 793ae4c4..a6138ca2 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientPlayerInteractionManager.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientPlayerInteractionManager.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.network;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.network;
 
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.llamalad7.mixinextras.sugar.Local;
@@ -26,16 +26,16 @@ import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ServerboundPackets1_16_2;
 import com.viaversion.viaversion.protocols.v1_16_4to1_17.Protocol1_16_4To1_17;
-import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.fixes.versioned.ActionResultException1_12_2;
-import de.florianmichael.viafabricplus.fixes.versioned.ClientPlayerInteractionManager1_18_2;
-import de.florianmichael.viafabricplus.injection.access.IClientConnection;
-import de.florianmichael.viafabricplus.injection.access.IClientPlayerInteractionManager;
-import de.florianmichael.viafabricplus.injection.access.IScreenHandler;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.protocoltranslator.impl.provider.viaversion.ViaFabricPlusHandItemProvider;
-import de.florianmichael.viafabricplus.protocoltranslator.translator.ItemTranslator;
-import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
+import com.viaversion.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.fixes.versioned.ActionResultException1_12_2;
+import com.viaversion.viafabricplus.fixes.versioned.ClientPlayerInteractionManager1_18_2;
+import com.viaversion.viafabricplus.injection.access.IClientConnection;
+import com.viaversion.viafabricplus.injection.access.IClientPlayerInteractionManager;
+import com.viaversion.viafabricplus.injection.access.IScreenHandler;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.impl.provider.viaversion.ViaFabricPlusHandItemProvider;
+import com.viaversion.viafabricplus.protocoltranslator.translator.ItemTranslator;
+import com.viaversion.viafabricplus.settings.impl.VisualSettings;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.SnowBlock;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinMultiplayerServerListPinger.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinMultiplayerServerListPinger.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinMultiplayerServerListPinger.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinMultiplayerServerListPinger.java
index 6a322809..8c97b2ee 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinMultiplayerServerListPinger.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinMultiplayerServerListPinger.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.network;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.network;
 
 import net.minecraft.client.network.MultiplayerServerListPinger;
 import net.minecraft.client.network.ServerAddress;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinNetworkStateTransitionHandler.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinNetworkStateTransitionHandler.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinNetworkStateTransitionHandler.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinNetworkStateTransitionHandler.java
index 328d5fd5..8f236511 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinNetworkStateTransitionHandler.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinNetworkStateTransitionHandler.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.network;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.network;
 
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import io.netty.channel.ChannelConfig;
 import net.minecraft.network.handler.NetworkStateTransitionHandler;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinNetworkStateTransitions.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinNetworkStateTransitions.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinNetworkStateTransitions.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinNetworkStateTransitions.java
index 1e602a8b..a36c3953 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinNetworkStateTransitions.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinNetworkStateTransitions.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.network;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.network;
 
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import io.netty.channel.ChannelConfig;
 import net.minecraft.network.handler.NetworkStateTransitions;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinPlayerListEntry.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinPlayerListEntry.java
similarity index 85%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinPlayerListEntry.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinPlayerListEntry.java
index 68786dbe..034b1765 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinPlayerListEntry.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinPlayerListEntry.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.network;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.network;
 
-import de.florianmichael.viafabricplus.fixes.ClientsideFixes;
-import de.florianmichael.viafabricplus.injection.access.IPlayerListEntry;
+import com.viaversion.viafabricplus.fixes.ClientsideFixes;
+import com.viaversion.viafabricplus.injection.access.IPlayerListEntry;
 import net.minecraft.client.network.PlayerListEntry;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinRegistryEntryListCodec.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinRegistryEntryListCodec.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinRegistryEntryListCodec.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinRegistryEntryListCodec.java
index 6e611c18..e61cd4b2 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinRegistryEntryListCodec.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinRegistryEntryListCodec.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.network;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.network;
 
 import com.mojang.serialization.DataResult;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.registry.RegistryEntryLookup;
 import net.minecraft.registry.entry.RegistryEntryList;
 import net.minecraft.registry.entry.RegistryEntryListCodec;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinRegistryEntryList_Named.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinRegistryEntryList_Named.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinRegistryEntryList_Named.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinRegistryEntryList_Named.java
index 2cd303d6..3bcf3172 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinRegistryEntryList_Named.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinRegistryEntryList_Named.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.network;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.network;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.registry.entry.RegistryEntryList;
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinUpdatePlayerAbilitiesC2SPacket.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinUpdatePlayerAbilitiesC2SPacket.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinUpdatePlayerAbilitiesC2SPacket.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinUpdatePlayerAbilitiesC2SPacket.java
index 5c527619..53eef808 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinUpdatePlayerAbilitiesC2SPacket.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/network/MixinUpdatePlayerAbilitiesC2SPacket.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.network;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.network;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 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/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinAbstractCommandBlockScreen.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinAbstractCommandBlockScreen.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinAbstractCommandBlockScreen.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinAbstractCommandBlockScreen.java
index 775045dc..f25659e2 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinAbstractCommandBlockScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinAbstractCommandBlockScreen.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.screen;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 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/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinAbstractSignEditScreen.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinAbstractSignEditScreen.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinAbstractSignEditScreen.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinAbstractSignEditScreen.java
index 4e7f1af0..b6bd0a82 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinAbstractSignEditScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinAbstractSignEditScreen.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.screen;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.entity.SignBlockEntity;
 import net.minecraft.client.gui.screen.ingame.AbstractSignEditScreen;
 import org.spongepowered.asm.mixin.Final;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinBookEditScreen.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinBookEditScreen.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinBookEditScreen.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinBookEditScreen.java
index 892cf22b..1a5c07a4 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinBookEditScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinBookEditScreen.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.screen;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 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/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinChatScreen.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinChatScreen.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinChatScreen.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinChatScreen.java
index f74f1414..8a0ef77c 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinChatScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinChatScreen.java
@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.screen;
 
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
-import de.florianmichael.viafabricplus.fixes.ClientsideFixes;
-import de.florianmichael.viafabricplus.settings.impl.DebugSettings;
-import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
+import com.viaversion.viafabricplus.fixes.ClientsideFixes;
+import com.viaversion.viafabricplus.settings.impl.DebugSettings;
+import com.viaversion.viafabricplus.settings.impl.VisualSettings;
 import net.minecraft.client.gui.hud.ChatHud;
 import net.minecraft.client.gui.hud.MessageIndicator;
 import net.minecraft.client.gui.screen.ChatInputSuggestor;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCommandBlockScreen.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCommandBlockScreen.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCommandBlockScreen.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCommandBlockScreen.java
index 6eb636fb..b8a09ded 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCommandBlockScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCommandBlockScreen.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.screen;
 
-import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
+import com.viaversion.viafabricplus.settings.impl.VisualSettings;
 import net.minecraft.block.entity.CommandBlockBlockEntity;
 import net.minecraft.client.gui.screen.ingame.CommandBlockScreen;
 import net.minecraft.client.gui.widget.CyclingButtonWidget;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinConnectScreen_1.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinConnectScreen_1.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinConnectScreen_1.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinConnectScreen_1.java
index 2f10c9ef..c5b7a2b9 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinConnectScreen_1.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinConnectScreen_1.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.screen;
 
 import com.llamalad7.mixinextras.sugar.Local;
 import com.viaversion.viaversion.api.connection.UserConnection;
@@ -25,10 +25,10 @@ import com.viaversion.viaversion.api.minecraft.ProfileKey;
 import com.viaversion.viaversion.api.minecraft.signature.storage.ChatSession1_19_0;
 import com.viaversion.viaversion.api.minecraft.signature.storage.ChatSession1_19_1;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.injection.access.IClientConnection;
-import de.florianmichael.viafabricplus.injection.access.ILegacyKeySignatureStorage;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.injection.access.IClientConnection;
+import com.viaversion.viafabricplus.injection.access.ILegacyKeySignatureStorage;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ServerAddress;
 import net.minecraft.network.ClientConnection;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCreativeInventoryScreen.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCreativeInventoryScreen.java
similarity index 87%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCreativeInventoryScreen.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCreativeInventoryScreen.java
index 6e08d069..ae1d4f4f 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCreativeInventoryScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCreativeInventoryScreen.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.screen;
 
-import de.florianmichael.viafabricplus.fixes.versioned.classic.GridItemSelectionScreen;
-import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
+import com.viaversion.viafabricplus.fixes.versioned.classic.GridItemSelectionScreen;
+import com.viaversion.viafabricplus.settings.impl.VisualSettings;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinDownloadingTerrainScreen.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinDownloadingTerrainScreen.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinDownloadingTerrainScreen.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinDownloadingTerrainScreen.java
index ac693fa6..f5995d00 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinDownloadingTerrainScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinDownloadingTerrainScreen.java
@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.screen;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.injection.access.IDownloadingTerrainScreen;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
+import com.viaversion.viafabricplus.injection.access.IDownloadingTerrainScreen;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.settings.impl.VisualSettings;
 import net.minecraft.client.gui.screen.DownloadingTerrainScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.network.packet.c2s.common.KeepAliveC2SPacket;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameMenuScreen.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameMenuScreen.java
similarity index 97%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameMenuScreen.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameMenuScreen.java
index b70f5b85..269fa0a8 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameMenuScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameMenuScreen.java
@@ -17,14 +17,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.screen;
 
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.settings.impl.VisualSettings;
 import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.screen.GameMenuScreen;
 import net.minecraft.client.gui.screen.OpenToLanScreen;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameModeSelectionScreen.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameModeSelectionScreen.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameModeSelectionScreen.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameModeSelectionScreen.java
index f404ea39..36114859 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameModeSelectionScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameModeSelectionScreen.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.screen;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.gui.screen.GameModeSelectionScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.Text;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameModeSelectionScreen_GameModeSelection.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameModeSelectionScreen_GameModeSelection.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameModeSelectionScreen_GameModeSelection.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameModeSelectionScreen_GameModeSelection.java
index 893a8725..2014afa8 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameModeSelectionScreen_GameModeSelection.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinGameModeSelectionScreen_GameModeSelection.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.screen;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.GameModeSelectionScreen;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinJigsawBlockScreen.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinJigsawBlockScreen.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinJigsawBlockScreen.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinJigsawBlockScreen.java
index 83ae0e19..78ce0f60 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinJigsawBlockScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinJigsawBlockScreen.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.screen;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.settings.impl.VisualSettings;
 import net.minecraft.block.entity.JigsawBlockEntity;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinMouseOptionsScreen.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinMouseOptionsScreen.java
similarity index 90%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinMouseOptionsScreen.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinMouseOptionsScreen.java
index 6818112e..06bd0a8d 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinMouseOptionsScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinMouseOptionsScreen.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.screen;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.protocoltranslator.util.MathUtil;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.util.MathUtil;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.option.GameOptionsScreen;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinScreen.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinScreen.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinScreen.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinScreen.java
index 5397a1bc..22a39e45 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinScreen.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.screen;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.settings.impl.VisualSettings;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.Drawable;
 import net.minecraft.client.gui.Element;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinStructureBlockScreen_1.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinStructureBlockScreen_1.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinStructureBlockScreen_1.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinStructureBlockScreen_1.java
index 9cf9eb9c..79dd592d 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinStructureBlockScreen_1.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinStructureBlockScreen_1.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.screen;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.text.Text;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinChatHud.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinChatHud.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinChatHud.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinChatHud.java
index 04310e02..05d5fd17 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinChatHud.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinChatHud.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen.hud;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.screen.hud;
 
-import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
+import com.viaversion.viafabricplus.settings.impl.VisualSettings;
 import net.minecraft.client.gui.hud.ChatHud;
 import net.minecraft.client.gui.hud.MessageIndicator;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinInGameHud.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinInGameHud.java
similarity index 97%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinInGameHud.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinInGameHud.java
index b8ef66ed..7d4bc26e 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinInGameHud.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinInGameHud.java
@@ -17,14 +17,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen.hud;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.screen.hud;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
-import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
+import com.viaversion.viafabricplus.settings.impl.VisualSettings;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.hud.InGameHud;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinPlayerListHud.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinPlayerListHud.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinPlayerListHud.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinPlayerListHud.java
index 82f78c77..b771f359 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinPlayerListHud.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinPlayerListHud.java
@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen.hud;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.screen.hud;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import de.florianmichael.viafabricplus.injection.access.IPlayerListEntry;
-import de.florianmichael.viafabricplus.injection.access.IPlayerListHud;
-import de.florianmichael.viafabricplus.settings.impl.VisualSettings;
+import com.viaversion.viafabricplus.injection.access.IPlayerListEntry;
+import com.viaversion.viafabricplus.injection.access.IPlayerListHud;
+import com.viaversion.viafabricplus.settings.impl.VisualSettings;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.hud.PlayerListHud;
 import net.minecraft.client.network.PlayerListEntry;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinAbstractFurnaceScreenHandler.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinAbstractFurnaceScreenHandler.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinAbstractFurnaceScreenHandler.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinAbstractFurnaceScreenHandler.java
index 554e7f03..790081c1 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinAbstractFurnaceScreenHandler.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinAbstractFurnaceScreenHandler.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen.screenhandler;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.screen.screenhandler;
 
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.item.ItemStack;
 import net.minecraft.screen.AbstractFurnaceScreenHandler;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinBrewingStandScreenHandler_FuelSlot.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinBrewingStandScreenHandler_FuelSlot.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinBrewingStandScreenHandler_FuelSlot.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinBrewingStandScreenHandler_FuelSlot.java
index aca2e1fa..529028af 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinBrewingStandScreenHandler_FuelSlot.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinBrewingStandScreenHandler_FuelSlot.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen.screenhandler;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.screen.screenhandler;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.inventory.Inventory;
 import net.minecraft.screen.slot.Slot;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinCraftingScreenHandler.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinCraftingScreenHandler.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinCraftingScreenHandler.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinCraftingScreenHandler.java
index 14292efb..28a3b4d5 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinCraftingScreenHandler.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinCraftingScreenHandler.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen.screenhandler;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.screen.screenhandler;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.fixes.data.recipe.Recipes1_11_2;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.fixes.data.recipe.Recipes1_11_2;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.inventory.Inventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.screen.AbstractCraftingScreenHandler;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinMerchantScreenHandler.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinMerchantScreenHandler.java
similarity index 97%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinMerchantScreenHandler.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinMerchantScreenHandler.java
index 133e0e7e..259621ed 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinMerchantScreenHandler.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinMerchantScreenHandler.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen.screenhandler;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.screen.screenhandler;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.network.ClientPlayerInteractionManager;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinPlayerScreenHandler.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinPlayerScreenHandler.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinPlayerScreenHandler.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinPlayerScreenHandler.java
index df82af0b..54ca9d4d 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinPlayerScreenHandler.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinPlayerScreenHandler.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen.screenhandler;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.screen.screenhandler;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.fixes.data.recipe.Recipes1_11_2;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.fixes.data.recipe.Recipes1_11_2;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.inventory.Inventory;
 import net.minecraft.screen.AbstractCraftingScreenHandler;
 import net.minecraft.screen.PlayerScreenHandler;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinScreenHandler.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinScreenHandler.java
similarity index 89%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinScreenHandler.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinScreenHandler.java
index 1707e08f..7dbfeb1a 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinScreenHandler.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/minecraft/screen/screenhandler/MixinScreenHandler.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen.screenhandler;
+package com.viaversion.viafabricplus.injection.mixin.fixes.minecraft.screen.screenhandler;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.injection.access.IScreenHandler;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.injection.access.IScreenHandler;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.item.ItemStack;
 import net.minecraft.screen.ScreenHandler;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinClassicProtocolExtension.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/vialegacy/MixinClassicProtocolExtension.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinClassicProtocolExtension.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/vialegacy/MixinClassicProtocolExtension.java
index f09fe43e..84c91aee 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinClassicProtocolExtension.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/vialegacy/MixinClassicProtocolExtension.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.vialegacy;
+package com.viaversion.viafabricplus.injection.mixin.fixes.vialegacy;
 
-import de.florianmichael.viafabricplus.fixes.versioned.classic.CPEAdditions;
+import com.viaversion.viafabricplus.fixes.versioned.classic.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/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinClientboundPacketsc0_30cpe.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/vialegacy/MixinClientboundPacketsc0_30cpe.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinClientboundPacketsc0_30cpe.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/vialegacy/MixinClientboundPacketsc0_30cpe.java
index cbe9fbc0..77ec5543 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinClientboundPacketsc0_30cpe.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/vialegacy/MixinClientboundPacketsc0_30cpe.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.vialegacy;
+package com.viaversion.viafabricplus.injection.mixin.fixes.vialegacy;
 
-import de.florianmichael.viafabricplus.fixes.versioned.classic.CPEAdditions;
+import com.viaversion.viafabricplus.fixes.versioned.classic.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/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinProtocolc0_30cpeToc0_28_30.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/vialegacy/MixinProtocolc0_30cpeToc0_28_30.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinProtocolc0_30cpeToc0_28_30.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/vialegacy/MixinProtocolc0_30cpeToc0_28_30.java
index c683d3a1..a882a279 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinProtocolc0_30cpeToc0_28_30.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/vialegacy/MixinProtocolc0_30cpeToc0_28_30.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.vialegacy;
+package com.viaversion.viafabricplus.injection.mixin.fixes.vialegacy;
 
 import com.viaversion.viaversion.api.protocol.AbstractProtocol;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
@@ -25,7 +25,7 @@ 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 de.florianmichael.viafabricplus.fixes.versioned.classic.CPEAdditions;
+import com.viaversion.viafabricplus.fixes.versioned.classic.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/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinProtocolr1_7_6_10Tor1_8.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/vialegacy/MixinProtocolr1_7_6_10Tor1_8.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinProtocolr1_7_6_10Tor1_8.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/vialegacy/MixinProtocolr1_7_6_10Tor1_8.java
index 2b7fecb4..8d1edf49 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinProtocolr1_7_6_10Tor1_8.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/vialegacy/MixinProtocolr1_7_6_10Tor1_8.java
@@ -17,14 +17,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.vialegacy;
+package com.viaversion.viafabricplus.injection.mixin.fixes.vialegacy;
 
 import com.viaversion.viaversion.api.protocol.AbstractProtocol;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_8;
 import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ServerboundPackets1_8;
-import de.florianmichael.viafabricplus.fixes.viaversion.TeleportTracker1_7_6_10;
+import com.viaversion.viafabricplus.fixes.viaversion.TeleportTracker1_7_6_10;
 import net.raphimc.vialegacy.protocol.release.r1_7_2_5tor1_7_6_10.packet.ClientboundPackets1_7_2;
 import net.raphimc.vialegacy.protocol.release.r1_7_2_5tor1_7_6_10.packet.ServerboundPackets1_7_2;
 import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.Protocolr1_7_6_10Tor1_8;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinBlockItemPacketRewriter1_20_5.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinBlockItemPacketRewriter1_20_5.java
similarity index 97%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinBlockItemPacketRewriter1_20_5.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinBlockItemPacketRewriter1_20_5.java
index 0789372d..58b31d0f 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinBlockItemPacketRewriter1_20_5.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinBlockItemPacketRewriter1_20_5.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.HolderSet;
@@ -38,8 +38,8 @@ 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 de.florianmichael.viafabricplus.event.PostViaVersionLoadCallback;
-import de.florianmichael.viafabricplus.protocoltranslator.impl.ViaFabricPlusMappingDataLoader;
+import com.viaversion.viafabricplus.event.PostViaVersionLoadCallback;
+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/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinBlockItemPacketRewriter1_21_4.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinBlockItemPacketRewriter1_21_4.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinBlockItemPacketRewriter1_21_4.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinBlockItemPacketRewriter1_21_4.java
index e528a650..fea73b30 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinBlockItemPacketRewriter1_21_4.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinBlockItemPacketRewriter1_21_4.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.protocols.v1_21_2to1_21_4.rewriter.BlockItemPacketRewriter1_21_4;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinCommandBlockProvider.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinCommandBlockProvider.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinCommandBlockProvider.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinCommandBlockProvider.java
index 61bf80c5..f3e77363 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinCommandBlockProvider.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinCommandBlockProvider.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
 import com.viaversion.viaversion.protocols.v1_8to1_9.provider.CommandBlockProvider;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinCommonBoss.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinCommonBoss.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinCommonBoss.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinCommonBoss.java
index 16b48521..aa71d727 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinCommonBoss.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinCommonBoss.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
 import com.viaversion.viaversion.legacy.bossbar.CommonBoss;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_12.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_12.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_12.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_12.java
index 7f6881b7..0cc43ace 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_12.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_12.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_15.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_15.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_15.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_15.java
index de744677..d02a0fde 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_15.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_15.java
@@ -17,14 +17,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
 import com.viaversion.viaversion.protocols.v1_14_3to1_14_4.packet.ClientboundPackets1_14_4;
 import com.viaversion.viaversion.protocols.v1_14_4to1_15.Protocol1_14_4To1_15;
 import com.viaversion.viaversion.protocols.v1_14_4to1_15.rewriter.EntityPacketRewriter1_15;
 import com.viaversion.viaversion.rewriter.EntityRewriter;
 import com.viaversion.viaversion.rewriter.entitydata.EntityDataFilter;
-import de.florianmichael.viafabricplus.fixes.viaversion.WolfHealthTracker1_14_4;
+import com.viaversion.viafabricplus.fixes.viaversion.WolfHealthTracker1_14_4;
 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/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_17.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_17.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_17.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_17.java
index 23e0ef4c..1c35386a 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_17.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_17.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
@@ -25,7 +25,7 @@ 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 de.florianmichael.viafabricplus.fixes.versioned.classic.WorldHeightSupport;
+import com.viaversion.viafabricplus.fixes.versioned.classic.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/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_19_4.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_19_4.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_19_4.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_19_4.java
index 5ce18303..f722a041 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_19_4.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_19_4.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
 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/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_20_3.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_20_3.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_20_3.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_20_3.java
index 56917a34..a97c4265 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_20_3.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_20_3.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
 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/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_20_5.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_20_5.java
similarity index 98%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_20_5.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_20_5.java
index 343a4bda..80ba99af 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_20_5.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_20_5.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_9.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_9.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_9.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_9.java
index d6aae8c9..2a59a7f7 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_9.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPacketRewriter1_9.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
 import com.viaversion.viaversion.api.minecraft.entitydata.EntityData;
 import com.viaversion.viaversion.protocols.v1_8to1_9.Protocol1_8To1_9;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityTracker1_9.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityTracker1_9.java
similarity index 97%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityTracker1_9.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityTracker1_9.java
index fca38ffc..ff0f0633 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityTracker1_9.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityTracker1_9.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
 import com.viaversion.viaversion.api.minecraft.entitydata.EntityData;
 import com.viaversion.viaversion.protocols.v1_8to1_9.storage.EntityTracker1_9;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinInventoryTracker1_16.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinInventoryTracker1_16.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinInventoryTracker1_16.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinInventoryTracker1_16.java
index 1dad2d79..38ea67bc 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinInventoryTracker1_16.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinInventoryTracker1_16.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
 import com.viaversion.viaversion.protocols.v1_15_2to1_16.storage.InventoryTracker1_16;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinItemPacketRewriter1_14.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinItemPacketRewriter1_14.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinItemPacketRewriter1_14.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinItemPacketRewriter1_14.java
index 442f5121..826bd91a 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinItemPacketRewriter1_14.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinItemPacketRewriter1_14.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
 import com.llamalad7.mixinextras.sugar.Local;
 import com.viaversion.viaversion.api.minecraft.item.Item;
@@ -32,8 +32,8 @@ 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 de.florianmichael.viafabricplus.fixes.ClientsideFixes;
-import de.florianmichael.viafabricplus.protocoltranslator.translator.TextComponentTranslator;
+import com.viaversion.viafabricplus.fixes.ClientsideFixes;
+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/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinItemPacketRewriter1_17.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinItemPacketRewriter1_17.java
similarity index 97%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinItemPacketRewriter1_17.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinItemPacketRewriter1_17.java
index 6d29bdab..f0a29af7 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinItemPacketRewriter1_17.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinItemPacketRewriter1_17.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.minecraft.item.Item;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinItemPacketRewriter1_9.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinItemPacketRewriter1_9.java
similarity index 97%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinItemPacketRewriter1_9.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinItemPacketRewriter1_9.java
index 499953fe..2fe11408 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinItemPacketRewriter1_9.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinItemPacketRewriter1_9.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.nbt.tag.ListTag;
@@ -34,7 +34,7 @@ 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 de.florianmichael.viafabricplus.protocoltranslator.impl.ViaFabricPlusMappingDataLoader;
+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/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinMappingDataBase.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinMappingDataBase.java
similarity index 90%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinMappingDataBase.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinMappingDataBase.java
index a2338007..65a2952c 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinMappingDataBase.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinMappingDataBase.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
 import com.viaversion.viaversion.api.data.MappingDataBase;
-import de.florianmichael.viafabricplus.fixes.versioned.visual.FootStepParticle1_12_2;
+import com.viaversion.viafabricplus.fixes.versioned.visual.FootStepParticle1_12_2;
 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/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinNamedCompoundTagType.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinNamedCompoundTagType.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinNamedCompoundTagType.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinNamedCompoundTagType.java
index a406ba0e..33d85cc1 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinNamedCompoundTagType.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinNamedCompoundTagType.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
 import com.viaversion.nbt.limiter.TagLimiter;
 import com.viaversion.viaversion.api.type.types.misc.NamedCompoundTagType;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinParticleIdMappings1_13.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinParticleIdMappings1_13.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinParticleIdMappings1_13.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinParticleIdMappings1_13.java
index 8dadadc2..d74d88d4 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinParticleIdMappings1_13.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinParticleIdMappings1_13.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
 import com.viaversion.viaversion.protocols.v1_12_2to1_13.data.ParticleIdMappings1_13;
-import de.florianmichael.viafabricplus.fixes.versioned.visual.FootStepParticle1_12_2;
+import com.viaversion.viafabricplus.fixes.versioned.visual.FootStepParticle1_12_2;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinParticleMappings.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinParticleMappings.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinParticleMappings.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinParticleMappings.java
index ae50088d..5581ba42 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinParticleMappings.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinParticleMappings.java
@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
 import com.viaversion.viaversion.api.data.FullMappingsBase;
 import com.viaversion.viaversion.api.data.Mappings;
 import com.viaversion.viaversion.api.data.ParticleMappings;
-import de.florianmichael.viafabricplus.fixes.versioned.visual.FootStepParticle1_12_2;
+import com.viaversion.viafabricplus.fixes.versioned.visual.FootStepParticle1_12_2;
 import org.spongepowered.asm.mixin.Mixin;
 
 import java.util.List;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_10To1_11.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_10To1_11.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_10To1_11.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_10To1_11.java
index 4b15f952..a0103b79 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_10To1_11.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_10To1_11.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
-import de.florianmichael.viafabricplus.fixes.ClientsideFixes;
+import com.viaversion.viafabricplus.fixes.ClientsideFixes;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.Constant;
 import org.spongepowered.asm.mixin.injection.ModifyConstant;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_20To1_20_2.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_20To1_20_2.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_20To1_20_2.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_20To1_20_2.java
index 68513cdf..3911388a 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_20To1_20_2.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_20To1_20_2.java
@@ -17,13 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
 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 de.florianmichael.viafabricplus.settings.impl.DebugSettings;
+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/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_20_3To1_20_5.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_20_3To1_20_5.java
similarity index 97%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_20_3To1_20_5.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_20_3To1_20_5.java
index 351a7a14..50a60de2 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_20_3To1_20_5.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_20_3To1_20_5.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.protocol.AbstractProtocol;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinTagType.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinTagType.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinTagType.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinTagType.java
index 705aa0c6..69824eea 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinTagType.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinTagType.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
 import com.viaversion.nbt.limiter.TagLimiter;
 import com.viaversion.viaversion.api.type.types.misc.TagType;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinUserConnectionImpl.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinUserConnectionImpl.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinUserConnectionImpl.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinUserConnectionImpl.java
index 08ce9e75..32f1f82b 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinUserConnectionImpl.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinUserConnectionImpl.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
 import com.viaversion.viaversion.connection.UserConnectionImpl;
-import de.florianmichael.viafabricplus.protocoltranslator.util.NoPacketSendChannel;
+import com.viaversion.viafabricplus.protocoltranslator.util.NoPacketSendChannel;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
 import org.spongepowered.asm.mixin.Final;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPacketRewriter1_16_2.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPacketRewriter1_16_2.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPacketRewriter1_16_2.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPacketRewriter1_16_2.java
index 9853f8a3..7af9b601 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPacketRewriter1_16_2.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPacketRewriter1_16_2.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
 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/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPacketRewriter1_17.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPacketRewriter1_17.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPacketRewriter1_17.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPacketRewriter1_17.java
index 4c7dab0c..fded3daa 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPacketRewriter1_17.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPacketRewriter1_17.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
@@ -25,7 +25,7 @@ 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 de.florianmichael.viafabricplus.fixes.versioned.classic.WorldHeightSupport;
+import com.viaversion.viafabricplus.fixes.versioned.classic.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/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPacketRewriter1_19.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPacketRewriter1_19.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPacketRewriter1_19.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPacketRewriter1_19.java
index 3769d327..c8cab101 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPacketRewriter1_19.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPacketRewriter1_19.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
+package com.viaversion.viafabricplus.injection.mixin.fixes.viaversion;
 
 import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 import com.viaversion.viaversion.api.type.Types;
@@ -25,9 +25,9 @@ import com.viaversion.viaversion.protocols.v1_17_1to1_18.packet.ClientboundPacke
 import com.viaversion.viaversion.protocols.v1_18_2to1_19.Protocol1_18_2To1_19;
 import com.viaversion.viaversion.protocols.v1_18_2to1_19.packet.ClientboundPackets1_19;
 import com.viaversion.viaversion.protocols.v1_18_2to1_19.rewriter.WorldPacketRewriter1_19;
-import de.florianmichael.viafabricplus.fixes.ClientsideFixes;
-import de.florianmichael.viafabricplus.injection.access.IClientPlayerInteractionManager;
-import de.florianmichael.viafabricplus.protocoltranslator.translator.BlockStateTranslator;
+import com.viaversion.viafabricplus.fixes.ClientsideFixes;
+import com.viaversion.viafabricplus.injection.access.IClientPlayerInteractionManager;
+import com.viaversion.viafabricplus.protocoltranslator.translator.BlockStateTranslator;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/viabedrock/MixinJoinPackets.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/viabedrock/MixinJoinPackets.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/viabedrock/MixinJoinPackets.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/viabedrock/MixinJoinPackets.java
index a561ce06..5be1c9fa 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/viabedrock/MixinJoinPackets.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/viabedrock/MixinJoinPackets.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.viabedrock;
+package com.viaversion.viafabricplus.injection.mixin.viabedrock;
 
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.type.Type;
-import de.florianmichael.viafabricplus.fixes.viaversion.BedrockJoinGameTracker;
+import com.viaversion.viafabricplus.fixes.viaversion.BedrockJoinGameTracker;
 import net.raphimc.viabedrock.protocol.packet.JoinPackets;
 import net.raphimc.viabedrock.protocol.types.primitive.LongLEType;
 import net.raphimc.viabedrock.protocol.types.primitive.StringType;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/vialegacy/MixinExtensionProtocolMetadataStorage.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/vialegacy/MixinExtensionProtocolMetadataStorage.java
similarity index 89%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/vialegacy/MixinExtensionProtocolMetadataStorage.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/vialegacy/MixinExtensionProtocolMetadataStorage.java
index 1f4fa555..9d745215 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/vialegacy/MixinExtensionProtocolMetadataStorage.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/vialegacy/MixinExtensionProtocolMetadataStorage.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.vialegacy;
+package com.viaversion.viafabricplus.injection.mixin.vialegacy;
 
-import de.florianmichael.viafabricplus.event.LoadClassicProtocolExtensionCallback;
-import de.florianmichael.viafabricplus.injection.access.IExtensionProtocolMetadataStorage;
+import com.viaversion.viafabricplus.event.LoadClassicProtocolExtensionCallback;
+import com.viaversion.viafabricplus.injection.access.IExtensionProtocolMetadataStorage;
 import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.data.ClassicProtocolExtension;
 import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.storage.ExtensionProtocolMetadataStorage;
 import org.spongepowered.asm.mixin.Final;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/vialegacy/MixinViaLegacyConfig.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/vialegacy/MixinViaLegacyConfig.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/vialegacy/MixinViaLegacyConfig.java
rename to src/main/java/com/viaversion/viafabricplus/injection/mixin/vialegacy/MixinViaLegacyConfig.java
index 740fe3c1..100586df 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/vialegacy/MixinViaLegacyConfig.java
+++ b/src/main/java/com/viaversion/viafabricplus/injection/mixin/vialegacy/MixinViaLegacyConfig.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.injection.mixin.vialegacy;
+package com.viaversion.viafabricplus.injection.mixin.vialegacy;
 
-import de.florianmichael.viafabricplus.settings.impl.GeneralSettings;
+import com.viaversion.viafabricplus.settings.impl.GeneralSettings;
 import net.raphimc.vialegacy.ViaLegacyConfig;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/ProtocolTranslator.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/ProtocolTranslator.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/ProtocolTranslator.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/ProtocolTranslator.java
index 51bf195f..f69ab2eb 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/ProtocolTranslator.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/ProtocolTranslator.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator;
+package com.viaversion.viafabricplus.protocoltranslator;
 
 import com.mojang.authlib.GameProfile;
 import com.mojang.brigadier.arguments.StringArgumentType;
@@ -33,16 +33,16 @@ import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.api.protocol.version.VersionType;
 import com.viaversion.viaversion.connection.UserConnectionImpl;
 import com.viaversion.viaversion.protocol.ProtocolPipelineImpl;
-import de.florianmichael.viafabricplus.event.ChangeProtocolVersionCallback;
-import de.florianmichael.viafabricplus.fixes.viaversion.ViaFabricPlusProtocol;
-import de.florianmichael.viafabricplus.injection.access.IClientConnection;
-import de.florianmichael.viafabricplus.protocoltranslator.impl.command.ViaFabricPlusVLCommandHandler;
-import de.florianmichael.viafabricplus.protocoltranslator.impl.platform.ViaFabricPlusViaLegacyPlatformImpl;
-import de.florianmichael.viafabricplus.protocoltranslator.impl.platform.ViaFabricPlusViaVersionPlatformImpl;
-import de.florianmichael.viafabricplus.protocoltranslator.impl.viaversion.ViaFabricPlusVLInjector;
-import de.florianmichael.viafabricplus.protocoltranslator.impl.viaversion.ViaFabricPlusVLLoader;
-import de.florianmichael.viafabricplus.protocoltranslator.netty.ViaFabricPlusVLLegacyPipeline;
-import de.florianmichael.viafabricplus.protocoltranslator.util.NoPacketSendChannel;
+import com.viaversion.viafabricplus.event.ChangeProtocolVersionCallback;
+import com.viaversion.viafabricplus.fixes.viaversion.ViaFabricPlusProtocol;
+import com.viaversion.viafabricplus.injection.access.IClientConnection;
+import com.viaversion.viafabricplus.protocoltranslator.impl.command.ViaFabricPlusVLCommandHandler;
+import com.viaversion.viafabricplus.protocoltranslator.impl.platform.ViaFabricPlusViaLegacyPlatformImpl;
+import com.viaversion.viafabricplus.protocoltranslator.impl.platform.ViaFabricPlusViaVersionPlatformImpl;
+import com.viaversion.viafabricplus.protocoltranslator.impl.viaversion.ViaFabricPlusVLInjector;
+import com.viaversion.viafabricplus.protocoltranslator.impl.viaversion.ViaFabricPlusVLLoader;
+import com.viaversion.viafabricplus.protocoltranslator.netty.ViaFabricPlusVLLegacyPipeline;
+import com.viaversion.viafabricplus.protocoltranslator.util.NoPacketSendChannel;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelOption;
 import io.netty.util.AttributeKey;
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/ViaFabricPlusMappingDataLoader.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/ViaFabricPlusMappingDataLoader.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/ViaFabricPlusMappingDataLoader.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/ViaFabricPlusMappingDataLoader.java
index bdb1685b..57a2c5b0 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/ViaFabricPlusMappingDataLoader.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/ViaFabricPlusMappingDataLoader.java
@@ -17,13 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.impl;
+package com.viaversion.viafabricplus.protocoltranslator.impl;
 
 import com.viaversion.viaversion.api.data.MappingDataLoader;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.libs.gson.JsonObject;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.Block;
 import net.minecraft.registry.Registries;
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/command/VFPViaSubCommand.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/command/VFPViaSubCommand.java
similarity index 87%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/command/VFPViaSubCommand.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/command/VFPViaSubCommand.java
index f1962ff2..7279dea5 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/command/VFPViaSubCommand.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/command/VFPViaSubCommand.java
@@ -17,13 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.impl.command;
+package com.viaversion.viafabricplus.protocoltranslator.impl.command;
 
 import com.viaversion.viaversion.api.command.ViaCommandSender;
 import com.viaversion.viaversion.api.command.ViaSubCommand;
 import com.viaversion.viaversion.api.connection.UserConnection;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.util.ChatUtil;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.util.ChatUtil;
 
 public interface VFPViaSubCommand extends ViaSubCommand {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/command/ViaFabricPlusVLCommandHandler.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/command/ViaFabricPlusVLCommandHandler.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/command/ViaFabricPlusVLCommandHandler.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/command/ViaFabricPlusVLCommandHandler.java
index 9d6b3e63..c3068605 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/command/ViaFabricPlusVLCommandHandler.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/command/ViaFabricPlusVLCommandHandler.java
@@ -17,14 +17,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.impl.command;
+package com.viaversion.viafabricplus.protocoltranslator.impl.command;
 
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
-import de.florianmichael.viafabricplus.fixes.versioned.classic.command.ListExtensionsCommand;
-import de.florianmichael.viafabricplus.fixes.versioned.classic.command.SetTimeCommand;
+import com.viaversion.viafabricplus.fixes.versioned.classic.command.ListExtensionsCommand;
+import com.viaversion.viafabricplus.fixes.versioned.classic.command.SetTimeCommand;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.raphimc.vialoader.impl.viaversion.VLCommandHandler;
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/command/ViaFabricPlusViaCommandSender.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/command/ViaFabricPlusViaCommandSender.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/command/ViaFabricPlusViaCommandSender.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/command/ViaFabricPlusViaCommandSender.java
index ad1d6318..ed923d4d 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/command/ViaFabricPlusViaCommandSender.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/command/ViaFabricPlusViaCommandSender.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.impl.command;
+package com.viaversion.viafabricplus.protocoltranslator.impl.command;
 
 import com.viaversion.viaversion.api.command.ViaCommandSender;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/platform/ViaFabricPlusViaLegacyPlatformImpl.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/platform/ViaFabricPlusViaLegacyPlatformImpl.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/platform/ViaFabricPlusViaLegacyPlatformImpl.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/platform/ViaFabricPlusViaLegacyPlatformImpl.java
index 7f966e96..9c39065c 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/platform/ViaFabricPlusViaLegacyPlatformImpl.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/platform/ViaFabricPlusViaLegacyPlatformImpl.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.impl.platform;
+package com.viaversion.viafabricplus.protocoltranslator.impl.platform;
 
 import net.raphimc.vialoader.impl.platform.ViaLegacyPlatformImpl;
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/platform/ViaFabricPlusViaVersionPlatformImpl.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/platform/ViaFabricPlusViaVersionPlatformImpl.java
similarity index 89%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/platform/ViaFabricPlusViaVersionPlatformImpl.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/platform/ViaFabricPlusViaVersionPlatformImpl.java
index b08f6743..227e66bd 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/platform/ViaFabricPlusViaVersionPlatformImpl.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/platform/ViaFabricPlusViaVersionPlatformImpl.java
@@ -17,15 +17,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.impl.platform;
+package com.viaversion.viafabricplus.protocoltranslator.impl.platform;
 
 import com.viaversion.viaversion.configuration.AbstractViaConfig;
 import com.viaversion.viaversion.libs.gson.JsonArray;
 import com.viaversion.viaversion.libs.gson.JsonObject;
-import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.injection.ViaFabricPlusMixinPlugin;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.protocoltranslator.impl.viaversion.ViaFabricPlusVLViaConfig;
+import com.viaversion.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.injection.ViaFabricPlusMixinPlugin;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.impl.viaversion.ViaFabricPlusVLViaConfig;
 import net.fabricmc.loader.api.FabricLoader;
 import net.raphimc.vialoader.impl.platform.ViaVersionPlatformImpl;
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/viabedrock/ViaFabricPlusNettyPipelineProvider.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/viabedrock/ViaFabricPlusNettyPipelineProvider.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/viabedrock/ViaFabricPlusNettyPipelineProvider.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/viabedrock/ViaFabricPlusNettyPipelineProvider.java
index 6e877b39..2e6470d8 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/viabedrock/ViaFabricPlusNettyPipelineProvider.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/viabedrock/ViaFabricPlusNettyPipelineProvider.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.impl.provider.viabedrock;
+package com.viaversion.viafabricplus.protocoltranslator.impl.provider.viabedrock;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
-import de.florianmichael.viafabricplus.protocoltranslator.netty.ViaFabricPlusVLLegacyPipeline;
+import com.viaversion.viafabricplus.protocoltranslator.netty.ViaFabricPlusVLLegacyPipeline;
 import io.netty.channel.Channel;
 import net.raphimc.viabedrock.api.io.compression.ProtocolCompression;
 import net.raphimc.viabedrock.netty.AesEncryptionCodec;
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusAlphaInventoryProvider.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusAlphaInventoryProvider.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusAlphaInventoryProvider.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusAlphaInventoryProvider.java
index ff963250..3d292ec4 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusAlphaInventoryProvider.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusAlphaInventoryProvider.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.impl.provider.vialegacy;
+package com.viaversion.viafabricplus.protocoltranslator.impl.provider.vialegacy;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.item.Item;
-import de.florianmichael.viafabricplus.protocoltranslator.translator.ItemTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.translator.ItemTranslator;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusClassicMPPassProvider.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusClassicMPPassProvider.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusClassicMPPassProvider.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusClassicMPPassProvider.java
index 6b2cbc5c..f1401539 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusClassicMPPassProvider.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusClassicMPPassProvider.java
@@ -17,13 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.impl.provider.vialegacy;
+package com.viaversion.viafabricplus.protocoltranslator.impl.provider.vialegacy;
 
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import de.florianmichael.classic4j.BetaCraftHandler;
-import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.settings.impl.AuthenticationSettings;
+import com.viaversion.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.settings.impl.AuthenticationSettings;
 import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.provider.ClassicMPPassProvider;
 import net.raphimc.vialegacy.protocol.release.r1_2_4_5tor1_3_1_2.provider.OldAuthProvider;
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusClassicWorldHeightProvider.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusClassicWorldHeightProvider.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusClassicWorldHeightProvider.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusClassicWorldHeightProvider.java
index d639da10..0555a1b2 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusClassicWorldHeightProvider.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusClassicWorldHeightProvider.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.impl.provider.vialegacy;
+package com.viaversion.viafabricplus.protocoltranslator.impl.provider.vialegacy;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.provider.ClassicWorldHeightProvider;
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusEncryptionProvider.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusEncryptionProvider.java
similarity index 85%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusEncryptionProvider.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusEncryptionProvider.java
index 0195258e..323b0397 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusEncryptionProvider.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusEncryptionProvider.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.impl.provider.vialegacy;
+package com.viaversion.viafabricplus.protocoltranslator.impl.provider.vialegacy;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
-import de.florianmichael.viafabricplus.injection.access.IClientConnection;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.injection.access.IClientConnection;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.raphimc.vialegacy.protocol.release.r1_6_4tor1_7_2_5.provider.EncryptionProvider;
 
 public class ViaFabricPlusEncryptionProvider extends EncryptionProvider {
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusGameProfileFetcher.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusGameProfileFetcher.java
similarity index 97%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusGameProfileFetcher.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusGameProfileFetcher.java
index 91d433a4..b8f04726 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusGameProfileFetcher.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusGameProfileFetcher.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.impl.provider.vialegacy;
+package com.viaversion.viafabricplus.protocoltranslator.impl.provider.vialegacy;
 
 import com.mojang.authlib.GameProfileRepository;
 import com.mojang.authlib.HttpAuthenticationService;
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusOldAuthProvider.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusOldAuthProvider.java
similarity index 85%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusOldAuthProvider.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusOldAuthProvider.java
index 42b12e5d..d45f2f5f 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusOldAuthProvider.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/vialegacy/ViaFabricPlusOldAuthProvider.java
@@ -17,13 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.impl.provider.vialegacy;
+package com.viaversion.viafabricplus.protocoltranslator.impl.provider.vialegacy;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
-import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.settings.impl.AuthenticationSettings;
-import de.florianmichael.viafabricplus.util.ChatUtil;
+import com.viaversion.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.settings.impl.AuthenticationSettings;
+import com.viaversion.viafabricplus.util.ChatUtil;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.text.Text;
 import net.raphimc.vialegacy.protocol.release.r1_2_4_5tor1_3_1_2.provider.OldAuthProvider;
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusAckSequenceProvider.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusAckSequenceProvider.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusAckSequenceProvider.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusAckSequenceProvider.java
index a5f3a1ad..4ceff286 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusAckSequenceProvider.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusAckSequenceProvider.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.impl.provider.viaversion;
+package com.viaversion.viafabricplus.protocoltranslator.impl.provider.viaversion;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.protocols.v1_18_2to1_19.provider.AckSequenceProvider;
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusBaseVersionProvider.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusBaseVersionProvider.java
similarity index 90%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusBaseVersionProvider.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusBaseVersionProvider.java
index 72faaf8b..09137159 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusBaseVersionProvider.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusBaseVersionProvider.java
@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.impl.provider.viaversion;
+package com.viaversion.viafabricplus.protocoltranslator.impl.provider.viaversion;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.protocol.version.BaseVersionProvider;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 
 public class ViaFabricPlusBaseVersionProvider extends BaseVersionProvider {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusCommandArgumentsProvider.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusCommandArgumentsProvider.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusCommandArgumentsProvider.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusCommandArgumentsProvider.java
index cea2f698..a8bb0a8f 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusCommandArgumentsProvider.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusCommandArgumentsProvider.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.impl.provider.viaversion;
+package com.viaversion.viafabricplus.protocoltranslator.impl.provider.viaversion;
 
 import com.viaversion.viaversion.api.minecraft.signature.SignableCommandArgumentsProvider;
 import com.viaversion.viaversion.util.Pair;
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusHandItemProvider.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusHandItemProvider.java
similarity index 90%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusHandItemProvider.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusHandItemProvider.java
index 9d3c9dfc..66736405 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusHandItemProvider.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusHandItemProvider.java
@@ -17,13 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.impl.provider.viaversion;
+package com.viaversion.viafabricplus.protocoltranslator.impl.provider.viaversion;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.protocols.v1_8to1_9.provider.HandItemProvider;
-import de.florianmichael.viafabricplus.protocoltranslator.translator.ItemTranslator;
+import com.viaversion.viafabricplus.protocoltranslator.translator.ItemTranslator;
 import net.minecraft.item.ItemStack;
 
 public class ViaFabricPlusHandItemProvider extends HandItemProvider {
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusPickItemProvider.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusPickItemProvider.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusPickItemProvider.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusPickItemProvider.java
index 0b770c73..d023dbc5 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusPickItemProvider.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusPickItemProvider.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.impl.provider.viaversion;
+package com.viaversion.viafabricplus.protocoltranslator.impl.provider.viaversion;
 
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.connection.UserConnection;
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusPlayerAbilitiesProvider.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusPlayerAbilitiesProvider.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusPlayerAbilitiesProvider.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusPlayerAbilitiesProvider.java
index 2f205c89..fc31a160 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusPlayerAbilitiesProvider.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusPlayerAbilitiesProvider.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.impl.provider.viaversion;
+package com.viaversion.viafabricplus.protocoltranslator.impl.provider.viaversion;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.protocols.v1_15_2to1_16.provider.PlayerAbilitiesProvider;
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusPlayerLookTargetProvider.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusPlayerLookTargetProvider.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusPlayerLookTargetProvider.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusPlayerLookTargetProvider.java
index ef67e724..21eafbd0 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusPlayerLookTargetProvider.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/provider/viaversion/ViaFabricPlusPlayerLookTargetProvider.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.impl.provider.viaversion;
+package com.viaversion.viafabricplus.protocoltranslator.impl.provider.viaversion;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockPosition;
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/viaversion/ViaFabricPlusVLInjector.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/viaversion/ViaFabricPlusVLInjector.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/viaversion/ViaFabricPlusVLInjector.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/viaversion/ViaFabricPlusVLInjector.java
index 55d0d891..3a4951ee 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/viaversion/ViaFabricPlusVLInjector.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/viaversion/ViaFabricPlusVLInjector.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.impl.viaversion;
+package com.viaversion.viafabricplus.protocoltranslator.impl.viaversion;
 
 import net.raphimc.vialoader.impl.viaversion.VLInjector;
 import net.raphimc.vialoader.netty.VLLegacyPipeline;
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/viaversion/ViaFabricPlusVLLoader.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/viaversion/ViaFabricPlusVLLoader.java
similarity index 88%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/viaversion/ViaFabricPlusVLLoader.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/viaversion/ViaFabricPlusVLLoader.java
index aa04a8b9..edf09992 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/viaversion/ViaFabricPlusVLLoader.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/viaversion/ViaFabricPlusVLLoader.java
@@ -17,8 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.impl.viaversion;
+package com.viaversion.viafabricplus.protocoltranslator.impl.viaversion;
 
+import com.viaversion.viafabricplus.protocoltranslator.impl.provider.vialegacy.*;
+import com.viaversion.viafabricplus.protocoltranslator.impl.provider.viaversion.*;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.minecraft.signature.SignableCommandArgumentsProvider;
 import com.viaversion.viaversion.api.platform.providers.ViaProviders;
@@ -28,11 +30,9 @@ import com.viaversion.viaversion.protocols.v1_15_2to1_16.provider.PlayerAbilitie
 import com.viaversion.viaversion.protocols.v1_18_2to1_19.provider.AckSequenceProvider;
 import com.viaversion.viaversion.protocols.v1_21_2to1_21_4.provider.PickItemProvider;
 import com.viaversion.viaversion.protocols.v1_8to1_9.provider.HandItemProvider;
-import de.florianmichael.viafabricplus.event.PostViaVersionLoadCallback;
-import de.florianmichael.viafabricplus.protocoltranslator.impl.provider.viabedrock.ViaFabricPlusNettyPipelineProvider;
-import de.florianmichael.viafabricplus.protocoltranslator.impl.provider.vialegacy.*;
-import de.florianmichael.viafabricplus.protocoltranslator.impl.provider.viaversion.*;
-import de.florianmichael.viafabricplus.settings.impl.GeneralSettings;
+import com.viaversion.viafabricplus.event.PostViaVersionLoadCallback;
+import com.viaversion.viafabricplus.protocoltranslator.impl.provider.viabedrock.ViaFabricPlusNettyPipelineProvider;
+import com.viaversion.viafabricplus.settings.impl.GeneralSettings;
 import net.raphimc.viabedrock.protocol.provider.NettyPipelineProvider;
 import net.raphimc.vialegacy.protocol.alpha.a1_2_3_5_1_2_6tob1_0_1_1_1.provider.AlphaInventoryProvider;
 import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.provider.ClassicMPPassProvider;
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/viaversion/ViaFabricPlusVLViaConfig.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/viaversion/ViaFabricPlusVLViaConfig.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/viaversion/ViaFabricPlusVLViaConfig.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/viaversion/ViaFabricPlusVLViaConfig.java
index 2dc6d592..82d140f8 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/impl/viaversion/ViaFabricPlusVLViaConfig.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/impl/viaversion/ViaFabricPlusVLViaConfig.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.impl.viaversion;
+package com.viaversion.viafabricplus.protocoltranslator.impl.viaversion;
 
 import net.raphimc.vialoader.impl.viaversion.VLViaConfig;
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/netty/NoReadFlowControlHandler.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/netty/NoReadFlowControlHandler.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/netty/NoReadFlowControlHandler.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/netty/NoReadFlowControlHandler.java
index 2d1326cf..0e0b0789 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/netty/NoReadFlowControlHandler.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/netty/NoReadFlowControlHandler.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.netty;
+package com.viaversion.viafabricplus.protocoltranslator.netty;
 
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.flow.FlowControlHandler;
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/netty/ViaFabricPlusVLLegacyPipeline.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/netty/ViaFabricPlusVLLegacyPipeline.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/netty/ViaFabricPlusVLLegacyPipeline.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/netty/ViaFabricPlusVLLegacyPipeline.java
index 5b744176..be213461 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/netty/ViaFabricPlusVLLegacyPipeline.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/netty/ViaFabricPlusVLLegacyPipeline.java
@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.netty;
+package com.viaversion.viafabricplus.protocoltranslator.netty;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.fixes.viaversion.ViaFabricPlusProtocol;
+import com.viaversion.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.fixes.viaversion.ViaFabricPlusProtocol;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import net.minecraft.network.handler.HandlerNames;
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/netty/ViaFabricPlusViaDecoder.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/netty/ViaFabricPlusViaDecoder.java
similarity index 89%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/netty/ViaFabricPlusViaDecoder.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/netty/ViaFabricPlusViaDecoder.java
index cf92d04a..93e051ca 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/netty/ViaFabricPlusViaDecoder.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/netty/ViaFabricPlusViaDecoder.java
@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.netty;
+package com.viaversion.viafabricplus.protocoltranslator.netty;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
-import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.settings.impl.GeneralSettings;
-import de.florianmichael.viafabricplus.util.ChatUtil;
+import com.viaversion.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.settings.impl.GeneralSettings;
+import com.viaversion.viafabricplus.util.ChatUtil;
 import io.netty.channel.ChannelHandlerContext;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/translator/BlockStateTranslator.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/translator/BlockStateTranslator.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/translator/BlockStateTranslator.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/translator/BlockStateTranslator.java
index eff66187..aee2953d 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/translator/BlockStateTranslator.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/translator/BlockStateTranslator.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.translator;
+package com.viaversion.viafabricplus.protocoltranslator.translator;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockPosition;
@@ -27,8 +27,8 @@ import com.viaversion.viaversion.api.protocol.packet.State;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.protocols.v1_17_1to1_18.packet.ClientboundPackets1_18;
-import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/translator/ItemTranslator.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/translator/ItemTranslator.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/translator/ItemTranslator.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/translator/ItemTranslator.java
index 06a16191..1bbbf892 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/translator/ItemTranslator.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/translator/ItemTranslator.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.translator;
+package com.viaversion.viafabricplus.protocoltranslator.translator;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.item.Item;
@@ -30,9 +30,9 @@ import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.version.Types1_20_5;
 import com.viaversion.viaversion.protocols.v1_12to1_12_1.packet.ClientboundPackets1_12_1;
-import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.fixes.viaversion.ViaFabricPlusProtocol;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.fixes.viaversion.ViaFabricPlusProtocol;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import io.netty.buffer.Unpooled;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/translator/TextComponentTranslator.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/translator/TextComponentTranslator.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/translator/TextComponentTranslator.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/translator/TextComponentTranslator.java
index c26263d6..bef4be68 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/translator/TextComponentTranslator.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/translator/TextComponentTranslator.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.translator;
+package com.viaversion.viafabricplus.protocoltranslator.translator;
 
 import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viaversion.api.connection.UserConnection;
@@ -28,8 +28,8 @@ import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ClientboundPackets1_14;
-import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 
 public class TextComponentTranslator {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/util/LanguageUtil.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/util/LanguageUtil.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/util/LanguageUtil.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/util/LanguageUtil.java
index 26035475..d3dcaf1e 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/util/LanguageUtil.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/util/LanguageUtil.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.util;
+package com.viaversion.viafabricplus.protocoltranslator.util;
 
 import java.util.Map;
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/util/MathUtil.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/util/MathUtil.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/util/MathUtil.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/util/MathUtil.java
index d05d1e27..9cdba10d 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/util/MathUtil.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/util/MathUtil.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.util;
+package com.viaversion.viafabricplus.protocoltranslator.util;
 
 import it.unimi.dsi.fastutil.floats.FloatIntPair;
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/util/NoPacketSendChannel.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/util/NoPacketSendChannel.java
similarity index 88%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/util/NoPacketSendChannel.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/util/NoPacketSendChannel.java
index 6a5a3cfd..87e94f85 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/util/NoPacketSendChannel.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/util/NoPacketSendChannel.java
@@ -17,14 +17,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.protocoltranslator.util;
+package com.viaversion.viafabricplus.protocoltranslator.util;
 
 import io.netty.channel.local.LocalChannel;
 
 /**
  * This class can be used when creating dummy {@link com.viaversion.viaversion.api.connection.UserConnection} instances.
  * This class will prevent packets created by ViaVersion from being sent to the server. This is mainly used in the
- * translator system. See {@link de.florianmichael.viafabricplus.protocoltranslator.translator} for more information.
+ * translator system. See {@link com.viaversion.viafabricplus.protocoltranslator.translator} for more information.
  */
 public class NoPacketSendChannel extends LocalChannel {
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/util/ProtocolVersionDetector.java b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/util/ProtocolVersionDetector.java
similarity index 98%
rename from src/main/java/de/florianmichael/viafabricplus/protocoltranslator/util/ProtocolVersionDetector.java
rename to src/main/java/com/viaversion/viafabricplus/protocoltranslator/util/ProtocolVersionDetector.java
index d8d5b9f5..5424afe2 100644
--- a/src/main/java/de/florianmichael/viafabricplus/protocoltranslator/util/ProtocolVersionDetector.java
+++ b/src/main/java/com/viaversion/viafabricplus/protocoltranslator/util/ProtocolVersionDetector.java
@@ -16,7 +16,7 @@
  * 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 de.florianmichael.viafabricplus.protocoltranslator.util;
+package com.viaversion.viafabricplus.protocoltranslator.util;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.lenni0451.mcping.MCPing;
diff --git a/src/main/java/de/florianmichael/viafabricplus/save/AbstractSave.java b/src/main/java/com/viaversion/viafabricplus/save/AbstractSave.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/save/AbstractSave.java
rename to src/main/java/com/viaversion/viafabricplus/save/AbstractSave.java
index bc49a04f..4f5096f1 100644
--- a/src/main/java/de/florianmichael/viafabricplus/save/AbstractSave.java
+++ b/src/main/java/com/viaversion/viafabricplus/save/AbstractSave.java
@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.save;
+package com.viaversion.viafabricplus.save;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
-import de.florianmichael.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.ViaFabricPlus;
 
 import java.io.File;
 import java.io.FileReader;
diff --git a/src/main/java/de/florianmichael/viafabricplus/save/SaveManager.java b/src/main/java/com/viaversion/viafabricplus/save/SaveManager.java
similarity index 89%
rename from src/main/java/de/florianmichael/viafabricplus/save/SaveManager.java
rename to src/main/java/com/viaversion/viafabricplus/save/SaveManager.java
index 3f4cacb8..9e38eaf0 100644
--- a/src/main/java/de/florianmichael/viafabricplus/save/SaveManager.java
+++ b/src/main/java/com/viaversion/viafabricplus/save/SaveManager.java
@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.save;
+package com.viaversion.viafabricplus.save;
 
-import de.florianmichael.viafabricplus.event.LoadSaveFilesCallback;
-import de.florianmichael.viafabricplus.save.impl.AccountsSave;
-import de.florianmichael.viafabricplus.save.impl.SettingsSave;
-import de.florianmichael.viafabricplus.settings.SettingsManager;
+import com.viaversion.viafabricplus.event.LoadSaveFilesCallback;
+import com.viaversion.viafabricplus.save.impl.AccountsSave;
+import com.viaversion.viafabricplus.save.impl.SettingsSave;
+import com.viaversion.viafabricplus.settings.SettingsManager;
 import org.jetbrains.annotations.ApiStatus;
 
 import java.util.ArrayList;
diff --git a/src/main/java/de/florianmichael/viafabricplus/save/impl/AccountsSave.java b/src/main/java/com/viaversion/viafabricplus/save/impl/AccountsSave.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/save/impl/AccountsSave.java
rename to src/main/java/com/viaversion/viafabricplus/save/impl/AccountsSave.java
index c5cc67a4..20031b05 100644
--- a/src/main/java/de/florianmichael/viafabricplus/save/impl/AccountsSave.java
+++ b/src/main/java/com/viaversion/viafabricplus/save/impl/AccountsSave.java
@@ -17,13 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.save.impl;
+package com.viaversion.viafabricplus.save.impl;
 
 import com.google.gson.JsonObject;
 import de.florianmichael.classic4j.model.classicube.account.CCAccount;
-import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.save.AbstractSave;
-import de.florianmichael.viafabricplus.settings.impl.BedrockSettings;
+import com.viaversion.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.save.AbstractSave;
+import com.viaversion.viafabricplus.settings.impl.BedrockSettings;
 import net.raphimc.minecraftauth.MinecraftAuth;
 import net.raphimc.minecraftauth.step.bedrock.session.StepFullBedrockSession;
 import net.raphimc.minecraftauth.step.msa.StepMsaToken;
diff --git a/src/main/java/de/florianmichael/viafabricplus/save/impl/SettingsSave.java b/src/main/java/com/viaversion/viafabricplus/save/impl/SettingsSave.java
similarity index 87%
rename from src/main/java/de/florianmichael/viafabricplus/save/impl/SettingsSave.java
rename to src/main/java/com/viaversion/viafabricplus/save/impl/SettingsSave.java
index 095c3bc8..6777d675 100644
--- a/src/main/java/de/florianmichael/viafabricplus/save/impl/SettingsSave.java
+++ b/src/main/java/com/viaversion/viafabricplus/save/impl/SettingsSave.java
@@ -17,17 +17,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.save.impl;
+package com.viaversion.viafabricplus.save.impl;
 
 import com.google.gson.JsonObject;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.save.AbstractSave;
-import de.florianmichael.viafabricplus.settings.SettingsManager;
-import de.florianmichael.viafabricplus.settings.base.AbstractSetting;
-import de.florianmichael.viafabricplus.settings.base.SettingGroup;
-import de.florianmichael.viafabricplus.settings.impl.GeneralSettings;
-import de.florianmichael.viafabricplus.util.ChatUtil;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.save.AbstractSave;
+import com.viaversion.viafabricplus.settings.SettingsManager;
+import com.viaversion.viafabricplus.settings.base.AbstractSetting;
+import com.viaversion.viafabricplus.settings.base.SettingGroup;
+import com.viaversion.viafabricplus.settings.impl.GeneralSettings;
+import com.viaversion.viafabricplus.util.ChatUtil;
 import net.raphimc.viabedrock.api.BedrockProtocolVersion;
 
 public class SettingsSave extends AbstractSave {
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/VFPList.java b/src/main/java/com/viaversion/viafabricplus/screen/VFPList.java
similarity index 90%
rename from src/main/java/de/florianmichael/viafabricplus/screen/VFPList.java
rename to src/main/java/com/viaversion/viafabricplus/screen/VFPList.java
index 99aa68dc..9761b325 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/VFPList.java
+++ b/src/main/java/com/viaversion/viafabricplus/screen/VFPList.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.screen;
+package com.viaversion.viafabricplus.screen;
 
-import de.florianmichael.viafabricplus.screen.base.PerServerVersionScreen;
-import de.florianmichael.viafabricplus.screen.base.ProtocolSelectionScreen;
-import de.florianmichael.viafabricplus.settings.impl.GeneralSettings;
+import com.viaversion.viafabricplus.screen.base.PerServerVersionScreen;
+import com.viaversion.viafabricplus.screen.base.ProtocolSelectionScreen;
+import com.viaversion.viafabricplus.settings.impl.GeneralSettings;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.widget.AlwaysSelectedEntryListWidget;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/VFPListEntry.java b/src/main/java/com/viaversion/viafabricplus/screen/VFPListEntry.java
similarity index 99%
rename from src/main/java/de/florianmichael/viafabricplus/screen/VFPListEntry.java
rename to src/main/java/com/viaversion/viafabricplus/screen/VFPListEntry.java
index 8f9ead91..1a8065c4 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/VFPListEntry.java
+++ b/src/main/java/com/viaversion/viafabricplus/screen/VFPListEntry.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.screen;
+package com.viaversion.viafabricplus.screen;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/VFPScreen.java b/src/main/java/com/viaversion/viafabricplus/screen/VFPScreen.java
similarity index 98%
rename from src/main/java/de/florianmichael/viafabricplus/screen/VFPScreen.java
rename to src/main/java/com/viaversion/viafabricplus/screen/VFPScreen.java
index b5db489c..8964ddc5 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/VFPScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/screen/VFPScreen.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.screen;
+package com.viaversion.viafabricplus.screen;
 
-import de.florianmichael.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.ViaFabricPlus;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ConfirmLinkScreen;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/base/PerServerVersionScreen.java b/src/main/java/com/viaversion/viafabricplus/screen/base/PerServerVersionScreen.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/screen/base/PerServerVersionScreen.java
rename to src/main/java/com/viaversion/viafabricplus/screen/base/PerServerVersionScreen.java
index ddd1522f..a90a4b0a 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/base/PerServerVersionScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/screen/base/PerServerVersionScreen.java
@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.screen.base;
+package com.viaversion.viafabricplus.screen.base;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.screen.VFPList;
-import de.florianmichael.viafabricplus.screen.VFPListEntry;
-import de.florianmichael.viafabricplus.screen.VFPScreen;
+import com.viaversion.viafabricplus.screen.VFPList;
+import com.viaversion.viafabricplus.screen.VFPListEntry;
+import com.viaversion.viafabricplus.screen.VFPScreen;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/base/ProtocolSelectionScreen.java b/src/main/java/com/viaversion/viafabricplus/screen/base/ProtocolSelectionScreen.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/screen/base/ProtocolSelectionScreen.java
rename to src/main/java/com/viaversion/viafabricplus/screen/base/ProtocolSelectionScreen.java
index 0fdf2a2a..08d3d07a 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/base/ProtocolSelectionScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/screen/base/ProtocolSelectionScreen.java
@@ -17,14 +17,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.screen.base;
+package com.viaversion.viafabricplus.screen.base;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.screen.VFPList;
-import de.florianmichael.viafabricplus.screen.VFPListEntry;
-import de.florianmichael.viafabricplus.screen.VFPScreen;
-import de.florianmichael.viafabricplus.screen.settings.SettingsScreen;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.screen.VFPList;
+import com.viaversion.viafabricplus.screen.VFPListEntry;
+import com.viaversion.viafabricplus.screen.VFPScreen;
+import com.viaversion.viafabricplus.screen.settings.SettingsScreen;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/base/ReportIssuesScreen.java b/src/main/java/com/viaversion/viafabricplus/screen/base/ReportIssuesScreen.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/screen/base/ReportIssuesScreen.java
rename to src/main/java/com/viaversion/viafabricplus/screen/base/ReportIssuesScreen.java
index 0d263a02..8b7f4b1f 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/base/ReportIssuesScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/screen/base/ReportIssuesScreen.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.screen.base;
+package com.viaversion.viafabricplus.screen.base;
 
 import com.viaversion.viaversion.util.DumpUtil;
-import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.screen.VFPScreen;
+import com.viaversion.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.screen.VFPScreen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.text.Text;
 import net.minecraft.util.Util;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/base/ServerListScreen.java b/src/main/java/com/viaversion/viafabricplus/screen/base/ServerListScreen.java
similarity index 87%
rename from src/main/java/de/florianmichael/viafabricplus/screen/base/ServerListScreen.java
rename to src/main/java/com/viaversion/viafabricplus/screen/base/ServerListScreen.java
index 25bda849..7ab979d6 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/base/ServerListScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/screen/base/ServerListScreen.java
@@ -17,14 +17,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.screen.base;
+package com.viaversion.viafabricplus.screen.base;
 
-import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.screen.VFPScreen;
-import de.florianmichael.viafabricplus.screen.classic4j.BetaCraftScreen;
-import de.florianmichael.viafabricplus.screen.classic4j.ClassiCubeLoginScreen;
-import de.florianmichael.viafabricplus.screen.classic4j.ClassiCubeServerListScreen;
-import de.florianmichael.viafabricplus.screen.realms.BedrockRealmsScreen;
+import com.viaversion.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.screen.VFPScreen;
+import com.viaversion.viafabricplus.screen.classic4j.BetaCraftScreen;
+import com.viaversion.viafabricplus.screen.classic4j.ClassiCubeLoginScreen;
+import com.viaversion.viafabricplus.screen.classic4j.ClassiCubeServerListScreen;
+import com.viaversion.viafabricplus.screen.realms.BedrockRealmsScreen;
 import net.minecraft.client.gui.tooltip.Tooltip;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.text.Text;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/classic4j/BetaCraftScreen.java b/src/main/java/com/viaversion/viafabricplus/screen/classic4j/BetaCraftScreen.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/screen/classic4j/BetaCraftScreen.java
rename to src/main/java/com/viaversion/viafabricplus/screen/classic4j/BetaCraftScreen.java
index 782c77ae..fa57b562 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/classic4j/BetaCraftScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/screen/classic4j/BetaCraftScreen.java
@@ -17,17 +17,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.screen.classic4j;
+package com.viaversion.viafabricplus.screen.classic4j;
 
 import de.florianmichael.classic4j.BetaCraftHandler;
 import de.florianmichael.classic4j.model.betacraft.BCServerInfoSpec;
 import de.florianmichael.classic4j.model.betacraft.BCServerList;
 import de.florianmichael.classic4j.model.betacraft.BCVersionCategory;
-import de.florianmichael.viafabricplus.screen.VFPList;
-import de.florianmichael.viafabricplus.screen.VFPListEntry;
-import de.florianmichael.viafabricplus.screen.VFPScreen;
-import de.florianmichael.viafabricplus.screen.settings.TitleRenderer;
-import de.florianmichael.viafabricplus.util.ConnectionUtil;
+import com.viaversion.viafabricplus.screen.VFPList;
+import com.viaversion.viafabricplus.screen.VFPListEntry;
+import com.viaversion.viafabricplus.screen.VFPScreen;
+import com.viaversion.viafabricplus.screen.settings.TitleRenderer;
+import com.viaversion.viafabricplus.util.ConnectionUtil;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/classic4j/ClassiCubeLoginScreen.java b/src/main/java/com/viaversion/viafabricplus/screen/classic4j/ClassiCubeLoginScreen.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/screen/classic4j/ClassiCubeLoginScreen.java
rename to src/main/java/com/viaversion/viafabricplus/screen/classic4j/ClassiCubeLoginScreen.java
index b3f07d79..57ee25dd 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/classic4j/ClassiCubeLoginScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/screen/classic4j/ClassiCubeLoginScreen.java
@@ -17,15 +17,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.screen.classic4j;
+package com.viaversion.viafabricplus.screen.classic4j;
 
 import de.florianmichael.classic4j.ClassiCubeHandler;
 import de.florianmichael.classic4j.api.LoginProcessHandler;
 import de.florianmichael.classic4j.model.classicube.account.CCAccount;
-import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.injection.access.ITextFieldWidget;
-import de.florianmichael.viafabricplus.save.impl.AccountsSave;
-import de.florianmichael.viafabricplus.screen.VFPScreen;
+import com.viaversion.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.injection.access.ITextFieldWidget;
+import com.viaversion.viafabricplus.save.impl.AccountsSave;
+import com.viaversion.viafabricplus.screen.VFPScreen;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ConfirmLinkScreen;
 import net.minecraft.client.gui.widget.ButtonWidget;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/classic4j/ClassiCubeMFAScreen.java b/src/main/java/com/viaversion/viafabricplus/screen/classic4j/ClassiCubeMFAScreen.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/screen/classic4j/ClassiCubeMFAScreen.java
rename to src/main/java/com/viaversion/viafabricplus/screen/classic4j/ClassiCubeMFAScreen.java
index d4c26993..8dcaab5f 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/classic4j/ClassiCubeMFAScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/screen/classic4j/ClassiCubeMFAScreen.java
@@ -17,14 +17,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.screen.classic4j;
+package com.viaversion.viafabricplus.screen.classic4j;
 
 import de.florianmichael.classic4j.ClassiCubeHandler;
 import de.florianmichael.classic4j.api.LoginProcessHandler;
 import de.florianmichael.classic4j.model.classicube.account.CCAccount;
-import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.screen.VFPScreen;
-import de.florianmichael.viafabricplus.screen.base.ProtocolSelectionScreen;
+import com.viaversion.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.screen.VFPScreen;
+import com.viaversion.viafabricplus.screen.base.ProtocolSelectionScreen;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.TextFieldWidget;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/classic4j/ClassiCubeServerListScreen.java b/src/main/java/com/viaversion/viafabricplus/screen/classic4j/ClassiCubeServerListScreen.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/screen/classic4j/ClassiCubeServerListScreen.java
rename to src/main/java/com/viaversion/viafabricplus/screen/classic4j/ClassiCubeServerListScreen.java
index c92481be..2c98f03f 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/classic4j/ClassiCubeServerListScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/screen/classic4j/ClassiCubeServerListScreen.java
@@ -17,19 +17,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.screen.classic4j;
+package com.viaversion.viafabricplus.screen.classic4j;
 
 import de.florianmichael.classic4j.ClassiCubeHandler;
 import de.florianmichael.classic4j.api.LoginProcessHandler;
 import de.florianmichael.classic4j.model.classicube.account.CCAccount;
 import de.florianmichael.classic4j.model.classicube.server.CCServerInfo;
-import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.protocoltranslator.impl.provider.vialegacy.ViaFabricPlusClassicMPPassProvider;
-import de.florianmichael.viafabricplus.screen.VFPList;
-import de.florianmichael.viafabricplus.screen.VFPListEntry;
-import de.florianmichael.viafabricplus.screen.VFPScreen;
-import de.florianmichael.viafabricplus.settings.impl.AuthenticationSettings;
-import de.florianmichael.viafabricplus.util.ConnectionUtil;
+import com.viaversion.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.protocoltranslator.impl.provider.vialegacy.ViaFabricPlusClassicMPPassProvider;
+import com.viaversion.viafabricplus.screen.VFPList;
+import com.viaversion.viafabricplus.screen.VFPListEntry;
+import com.viaversion.viafabricplus.screen.VFPScreen;
+import com.viaversion.viafabricplus.settings.impl.AuthenticationSettings;
+import com.viaversion.viafabricplus.util.ConnectionUtil;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/realms/AcceptInvitationCodeScreen.java b/src/main/java/com/viaversion/viafabricplus/screen/realms/AcceptInvitationCodeScreen.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/screen/realms/AcceptInvitationCodeScreen.java
rename to src/main/java/com/viaversion/viafabricplus/screen/realms/AcceptInvitationCodeScreen.java
index 6b99ec4e..792ec37d 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/realms/AcceptInvitationCodeScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/screen/realms/AcceptInvitationCodeScreen.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.screen.realms;
+package com.viaversion.viafabricplus.screen.realms;
 
-import de.florianmichael.viafabricplus.screen.VFPScreen;
+import com.viaversion.viafabricplus.screen.VFPScreen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.text.Text;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/realms/BedrockRealmsScreen.java b/src/main/java/com/viaversion/viafabricplus/screen/realms/BedrockRealmsScreen.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/screen/realms/BedrockRealmsScreen.java
rename to src/main/java/com/viaversion/viafabricplus/screen/realms/BedrockRealmsScreen.java
index b28575fe..31b5f56d 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/realms/BedrockRealmsScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/screen/realms/BedrockRealmsScreen.java
@@ -17,13 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.screen.realms;
+package com.viaversion.viafabricplus.screen.realms;
 
-import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.screen.VFPList;
-import de.florianmichael.viafabricplus.screen.VFPListEntry;
-import de.florianmichael.viafabricplus.screen.VFPScreen;
-import de.florianmichael.viafabricplus.util.ConnectionUtil;
+import com.viaversion.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.screen.VFPList;
+import com.viaversion.viafabricplus.screen.VFPListEntry;
+import com.viaversion.viafabricplus.screen.VFPScreen;
+import com.viaversion.viafabricplus.util.ConnectionUtil;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/settings/BooleanSettingRenderer.java b/src/main/java/com/viaversion/viafabricplus/screen/settings/BooleanSettingRenderer.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/screen/settings/BooleanSettingRenderer.java
rename to src/main/java/com/viaversion/viafabricplus/screen/settings/BooleanSettingRenderer.java
index e9384092..08fa7767 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/settings/BooleanSettingRenderer.java
+++ b/src/main/java/com/viaversion/viafabricplus/screen/settings/BooleanSettingRenderer.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.screen.settings;
+package com.viaversion.viafabricplus.screen.settings;
 
-import de.florianmichael.viafabricplus.screen.VFPListEntry;
-import de.florianmichael.viafabricplus.settings.base.BooleanSetting;
+import com.viaversion.viafabricplus.screen.VFPListEntry;
+import com.viaversion.viafabricplus.settings.base.BooleanSetting;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/settings/ButtonSettingRenderer.java b/src/main/java/com/viaversion/viafabricplus/screen/settings/ButtonSettingRenderer.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/screen/settings/ButtonSettingRenderer.java
rename to src/main/java/com/viaversion/viafabricplus/screen/settings/ButtonSettingRenderer.java
index 8a8d24ba..593de193 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/settings/ButtonSettingRenderer.java
+++ b/src/main/java/com/viaversion/viafabricplus/screen/settings/ButtonSettingRenderer.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.screen.settings;
+package com.viaversion.viafabricplus.screen.settings;
 
-import de.florianmichael.viafabricplus.screen.VFPListEntry;
-import de.florianmichael.viafabricplus.settings.base.ButtonSetting;
+import com.viaversion.viafabricplus.screen.VFPListEntry;
+import com.viaversion.viafabricplus.settings.base.ButtonSetting;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/settings/ModeSettingRenderer.java b/src/main/java/com/viaversion/viafabricplus/screen/settings/ModeSettingRenderer.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/screen/settings/ModeSettingRenderer.java
rename to src/main/java/com/viaversion/viafabricplus/screen/settings/ModeSettingRenderer.java
index cd5540a8..1f70c25f 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/settings/ModeSettingRenderer.java
+++ b/src/main/java/com/viaversion/viafabricplus/screen/settings/ModeSettingRenderer.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.screen.settings;
+package com.viaversion.viafabricplus.screen.settings;
 
-import de.florianmichael.viafabricplus.screen.VFPListEntry;
-import de.florianmichael.viafabricplus.settings.base.ModeSetting;
+import com.viaversion.viafabricplus.screen.VFPListEntry;
+import com.viaversion.viafabricplus.settings.base.ModeSetting;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/settings/SettingsScreen.java b/src/main/java/com/viaversion/viafabricplus/screen/settings/SettingsScreen.java
similarity index 87%
rename from src/main/java/de/florianmichael/viafabricplus/screen/settings/SettingsScreen.java
rename to src/main/java/com/viaversion/viafabricplus/screen/settings/SettingsScreen.java
index c43ff740..1fa0bdbd 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/settings/SettingsScreen.java
+++ b/src/main/java/com/viaversion/viafabricplus/screen/settings/SettingsScreen.java
@@ -17,13 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.screen.settings;
+package com.viaversion.viafabricplus.screen.settings;
 
-import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.screen.VFPList;
-import de.florianmichael.viafabricplus.screen.VFPScreen;
-import de.florianmichael.viafabricplus.settings.base.AbstractSetting;
-import de.florianmichael.viafabricplus.settings.base.SettingGroup;
+import com.viaversion.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.screen.VFPList;
+import com.viaversion.viafabricplus.screen.VFPScreen;
+import com.viaversion.viafabricplus.settings.base.AbstractSetting;
+import com.viaversion.viafabricplus.settings.base.SettingGroup;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.text.Text;
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/settings/TitleRenderer.java b/src/main/java/com/viaversion/viafabricplus/screen/settings/TitleRenderer.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/screen/settings/TitleRenderer.java
rename to src/main/java/com/viaversion/viafabricplus/screen/settings/TitleRenderer.java
index dc950ad4..532ef7dc 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/settings/TitleRenderer.java
+++ b/src/main/java/com/viaversion/viafabricplus/screen/settings/TitleRenderer.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.screen.settings;
+package com.viaversion.viafabricplus.screen.settings;
 
-import de.florianmichael.viafabricplus.screen.VFPListEntry;
+import com.viaversion.viafabricplus.screen.VFPListEntry;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/settings/VersionedBooleanSettingRenderer.java b/src/main/java/com/viaversion/viafabricplus/screen/settings/VersionedBooleanSettingRenderer.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/screen/settings/VersionedBooleanSettingRenderer.java
rename to src/main/java/com/viaversion/viafabricplus/screen/settings/VersionedBooleanSettingRenderer.java
index d3560af2..a6cb9353 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/settings/VersionedBooleanSettingRenderer.java
+++ b/src/main/java/com/viaversion/viafabricplus/screen/settings/VersionedBooleanSettingRenderer.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.screen.settings;
+package com.viaversion.viafabricplus.screen.settings;
 
-import de.florianmichael.viafabricplus.screen.VFPListEntry;
-import de.florianmichael.viafabricplus.settings.base.VersionedBooleanSetting;
+import com.viaversion.viafabricplus.screen.VFPListEntry;
+import com.viaversion.viafabricplus.settings.base.VersionedBooleanSetting;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
diff --git a/src/main/java/de/florianmichael/viafabricplus/settings/SettingsManager.java b/src/main/java/com/viaversion/viafabricplus/settings/SettingsManager.java
similarity index 87%
rename from src/main/java/de/florianmichael/viafabricplus/settings/SettingsManager.java
rename to src/main/java/com/viaversion/viafabricplus/settings/SettingsManager.java
index b98bcfd2..f0a9905c 100644
--- a/src/main/java/de/florianmichael/viafabricplus/settings/SettingsManager.java
+++ b/src/main/java/com/viaversion/viafabricplus/settings/SettingsManager.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.settings;
+package com.viaversion.viafabricplus.settings;
 
-import de.florianmichael.viafabricplus.event.RegisterSettingsCallback;
-import de.florianmichael.viafabricplus.settings.base.SettingGroup;
-import de.florianmichael.viafabricplus.settings.impl.*;
+import com.viaversion.viafabricplus.event.RegisterSettingsCallback;
+import com.viaversion.viafabricplus.settings.base.SettingGroup;
+import com.viaversion.viafabricplus.settings.impl.*;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/java/de/florianmichael/viafabricplus/settings/base/AbstractSetting.java b/src/main/java/com/viaversion/viafabricplus/settings/base/AbstractSetting.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/settings/base/AbstractSetting.java
rename to src/main/java/com/viaversion/viafabricplus/settings/base/AbstractSetting.java
index c12c4fec..6fead540 100644
--- a/src/main/java/de/florianmichael/viafabricplus/settings/base/AbstractSetting.java
+++ b/src/main/java/com/viaversion/viafabricplus/settings/base/AbstractSetting.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.settings.base;
+package com.viaversion.viafabricplus.settings.base;
 
 import com.google.gson.JsonObject;
-import de.florianmichael.viafabricplus.screen.VFPListEntry;
-import de.florianmichael.viafabricplus.util.ChatUtil;
+import com.viaversion.viafabricplus.screen.VFPListEntry;
+import com.viaversion.viafabricplus.util.ChatUtil;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/settings/base/BooleanSetting.java b/src/main/java/com/viaversion/viafabricplus/settings/base/BooleanSetting.java
similarity index 88%
rename from src/main/java/de/florianmichael/viafabricplus/settings/base/BooleanSetting.java
rename to src/main/java/com/viaversion/viafabricplus/settings/base/BooleanSetting.java
index db934bca..f4d47d97 100644
--- a/src/main/java/de/florianmichael/viafabricplus/settings/base/BooleanSetting.java
+++ b/src/main/java/com/viaversion/viafabricplus/settings/base/BooleanSetting.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.settings.base;
+package com.viaversion.viafabricplus.settings.base;
 
 import com.google.gson.JsonObject;
-import de.florianmichael.viafabricplus.screen.VFPListEntry;
-import de.florianmichael.viafabricplus.screen.settings.BooleanSettingRenderer;
+import com.viaversion.viafabricplus.screen.VFPListEntry;
+import com.viaversion.viafabricplus.screen.settings.BooleanSettingRenderer;
 import net.minecraft.text.MutableText;
 
 public class BooleanSetting extends AbstractSetting<Boolean> {
diff --git a/src/main/java/de/florianmichael/viafabricplus/settings/base/ButtonSetting.java b/src/main/java/com/viaversion/viafabricplus/settings/base/ButtonSetting.java
similarity index 88%
rename from src/main/java/de/florianmichael/viafabricplus/settings/base/ButtonSetting.java
rename to src/main/java/com/viaversion/viafabricplus/settings/base/ButtonSetting.java
index c6851c12..b0de369f 100644
--- a/src/main/java/de/florianmichael/viafabricplus/settings/base/ButtonSetting.java
+++ b/src/main/java/com/viaversion/viafabricplus/settings/base/ButtonSetting.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.settings.base;
+package com.viaversion.viafabricplus.settings.base;
 
 import com.google.gson.JsonObject;
-import de.florianmichael.viafabricplus.screen.VFPListEntry;
-import de.florianmichael.viafabricplus.screen.settings.ButtonSettingRenderer;
+import com.viaversion.viafabricplus.screen.VFPListEntry;
+import com.viaversion.viafabricplus.screen.settings.ButtonSettingRenderer;
 import net.minecraft.text.MutableText;
 
 public class ButtonSetting extends AbstractSetting<Runnable> {
diff --git a/src/main/java/de/florianmichael/viafabricplus/settings/base/ModeSetting.java b/src/main/java/com/viaversion/viafabricplus/settings/base/ModeSetting.java
similarity index 90%
rename from src/main/java/de/florianmichael/viafabricplus/settings/base/ModeSetting.java
rename to src/main/java/com/viaversion/viafabricplus/settings/base/ModeSetting.java
index 499aeddc..fa177ae3 100644
--- a/src/main/java/de/florianmichael/viafabricplus/settings/base/ModeSetting.java
+++ b/src/main/java/com/viaversion/viafabricplus/settings/base/ModeSetting.java
@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.settings.base;
+package com.viaversion.viafabricplus.settings.base;
 
 import com.google.gson.JsonObject;
-import de.florianmichael.viafabricplus.screen.VFPListEntry;
-import de.florianmichael.viafabricplus.screen.settings.ModeSettingRenderer;
-import de.florianmichael.viafabricplus.util.ChatUtil;
+import com.viaversion.viafabricplus.screen.VFPListEntry;
+import com.viaversion.viafabricplus.screen.settings.ModeSettingRenderer;
+import com.viaversion.viafabricplus.util.ChatUtil;
 import net.minecraft.text.MutableText;
 
 import java.util.Arrays;
diff --git a/src/main/java/de/florianmichael/viafabricplus/settings/base/SettingGroup.java b/src/main/java/com/viaversion/viafabricplus/settings/base/SettingGroup.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/settings/base/SettingGroup.java
rename to src/main/java/com/viaversion/viafabricplus/settings/base/SettingGroup.java
index f20502ef..ec25d1fb 100644
--- a/src/main/java/de/florianmichael/viafabricplus/settings/base/SettingGroup.java
+++ b/src/main/java/com/viaversion/viafabricplus/settings/base/SettingGroup.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.settings.base;
+package com.viaversion.viafabricplus.settings.base;
 
 import net.minecraft.text.Text;
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/settings/base/VersionedBooleanSetting.java b/src/main/java/com/viaversion/viafabricplus/settings/base/VersionedBooleanSetting.java
similarity index 90%
rename from src/main/java/de/florianmichael/viafabricplus/settings/base/VersionedBooleanSetting.java
rename to src/main/java/com/viaversion/viafabricplus/settings/base/VersionedBooleanSetting.java
index c79e06ae..da00af8f 100644
--- a/src/main/java/de/florianmichael/viafabricplus/settings/base/VersionedBooleanSetting.java
+++ b/src/main/java/com/viaversion/viafabricplus/settings/base/VersionedBooleanSetting.java
@@ -17,13 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.settings.base;
+package com.viaversion.viafabricplus.settings.base;
 
 import com.google.gson.JsonObject;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
-import de.florianmichael.viafabricplus.screen.VFPListEntry;
-import de.florianmichael.viafabricplus.screen.settings.VersionedBooleanSettingRenderer;
+import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
+import com.viaversion.viafabricplus.screen.VFPListEntry;
+import com.viaversion.viafabricplus.screen.settings.VersionedBooleanSettingRenderer;
 import net.minecraft.text.MutableText;
 import net.raphimc.vialoader.util.VersionRange;
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/settings/impl/AuthenticationSettings.java b/src/main/java/com/viaversion/viafabricplus/settings/impl/AuthenticationSettings.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/settings/impl/AuthenticationSettings.java
rename to src/main/java/com/viaversion/viafabricplus/settings/impl/AuthenticationSettings.java
index 4fdf5a4d..1a385cdb 100644
--- a/src/main/java/de/florianmichael/viafabricplus/settings/impl/AuthenticationSettings.java
+++ b/src/main/java/com/viaversion/viafabricplus/settings/impl/AuthenticationSettings.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.settings.impl;
+package com.viaversion.viafabricplus.settings.impl;
 
-import de.florianmichael.viafabricplus.settings.base.BooleanSetting;
-import de.florianmichael.viafabricplus.settings.base.SettingGroup;
+import com.viaversion.viafabricplus.settings.base.BooleanSetting;
+import com.viaversion.viafabricplus.settings.base.SettingGroup;
 import net.minecraft.text.Text;
 
 public class AuthenticationSettings extends SettingGroup {
diff --git a/src/main/java/de/florianmichael/viafabricplus/settings/impl/BedrockSettings.java b/src/main/java/com/viaversion/viafabricplus/settings/impl/BedrockSettings.java
similarity index 91%
rename from src/main/java/de/florianmichael/viafabricplus/settings/impl/BedrockSettings.java
rename to src/main/java/com/viaversion/viafabricplus/settings/impl/BedrockSettings.java
index 7f3233ab..da4ce692 100644
--- a/src/main/java/de/florianmichael/viafabricplus/settings/impl/BedrockSettings.java
+++ b/src/main/java/com/viaversion/viafabricplus/settings/impl/BedrockSettings.java
@@ -17,15 +17,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.settings.impl;
+package com.viaversion.viafabricplus.settings.impl;
 
-import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.injection.access.IConfirmScreen;
-import de.florianmichael.viafabricplus.save.impl.AccountsSave;
-import de.florianmichael.viafabricplus.screen.VFPScreen;
-import de.florianmichael.viafabricplus.settings.base.BooleanSetting;
-import de.florianmichael.viafabricplus.settings.base.ButtonSetting;
-import de.florianmichael.viafabricplus.settings.base.SettingGroup;
+import com.viaversion.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.injection.access.IConfirmScreen;
+import com.viaversion.viafabricplus.save.impl.AccountsSave;
+import com.viaversion.viafabricplus.screen.VFPScreen;
+import com.viaversion.viafabricplus.settings.base.BooleanSetting;
+import com.viaversion.viafabricplus.settings.base.ButtonSetting;
+import com.viaversion.viafabricplus.settings.base.SettingGroup;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.ConfirmScreen;
 import net.minecraft.client.gui.screen.Screen;
diff --git a/src/main/java/de/florianmichael/viafabricplus/settings/impl/DebugSettings.java b/src/main/java/com/viaversion/viafabricplus/settings/impl/DebugSettings.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/settings/impl/DebugSettings.java
rename to src/main/java/com/viaversion/viafabricplus/settings/impl/DebugSettings.java
index 8b390bdd..164c275f 100644
--- a/src/main/java/de/florianmichael/viafabricplus/settings/impl/DebugSettings.java
+++ b/src/main/java/com/viaversion/viafabricplus/settings/impl/DebugSettings.java
@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.settings.impl;
+package com.viaversion.viafabricplus.settings.impl;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.settings.base.BooleanSetting;
-import de.florianmichael.viafabricplus.settings.base.SettingGroup;
-import de.florianmichael.viafabricplus.settings.base.VersionedBooleanSetting;
+import com.viaversion.viafabricplus.settings.base.BooleanSetting;
+import com.viaversion.viafabricplus.settings.base.SettingGroup;
+import com.viaversion.viafabricplus.settings.base.VersionedBooleanSetting;
 import net.minecraft.text.Text;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
 import net.raphimc.vialoader.util.VersionRange;
diff --git a/src/main/java/de/florianmichael/viafabricplus/settings/impl/GeneralSettings.java b/src/main/java/com/viaversion/viafabricplus/settings/impl/GeneralSettings.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/settings/impl/GeneralSettings.java
rename to src/main/java/com/viaversion/viafabricplus/settings/impl/GeneralSettings.java
index 4fd54c76..469cbcb2 100644
--- a/src/main/java/de/florianmichael/viafabricplus/settings/impl/GeneralSettings.java
+++ b/src/main/java/com/viaversion/viafabricplus/settings/impl/GeneralSettings.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.settings.impl;
+package com.viaversion.viafabricplus.settings.impl;
 
-import de.florianmichael.viafabricplus.settings.base.BooleanSetting;
-import de.florianmichael.viafabricplus.settings.base.ModeSetting;
-import de.florianmichael.viafabricplus.settings.base.SettingGroup;
+import com.viaversion.viafabricplus.settings.base.BooleanSetting;
+import com.viaversion.viafabricplus.settings.base.ModeSetting;
+import com.viaversion.viafabricplus.settings.base.SettingGroup;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
diff --git a/src/main/java/de/florianmichael/viafabricplus/settings/impl/VisualSettings.java b/src/main/java/com/viaversion/viafabricplus/settings/impl/VisualSettings.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/settings/impl/VisualSettings.java
rename to src/main/java/com/viaversion/viafabricplus/settings/impl/VisualSettings.java
index ae6c64d0..a1fe851b 100644
--- a/src/main/java/de/florianmichael/viafabricplus/settings/impl/VisualSettings.java
+++ b/src/main/java/com/viaversion/viafabricplus/settings/impl/VisualSettings.java
@@ -17,13 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.settings.impl;
+package com.viaversion.viafabricplus.settings.impl;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.settings.base.BooleanSetting;
-import de.florianmichael.viafabricplus.settings.base.ModeSetting;
-import de.florianmichael.viafabricplus.settings.base.SettingGroup;
-import de.florianmichael.viafabricplus.settings.base.VersionedBooleanSetting;
+import com.viaversion.viafabricplus.settings.base.BooleanSetting;
+import com.viaversion.viafabricplus.settings.base.ModeSetting;
+import com.viaversion.viafabricplus.settings.base.SettingGroup;
+import com.viaversion.viafabricplus.settings.base.VersionedBooleanSetting;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.FontStorage;
 import net.minecraft.text.Text;
diff --git a/src/main/java/de/florianmichael/viafabricplus/util/ChatUtil.java b/src/main/java/com/viaversion/viafabricplus/util/ChatUtil.java
similarity index 98%
rename from src/main/java/de/florianmichael/viafabricplus/util/ChatUtil.java
rename to src/main/java/com/viaversion/viafabricplus/util/ChatUtil.java
index 446f0390..7f78c8b5 100644
--- a/src/main/java/de/florianmichael/viafabricplus/util/ChatUtil.java
+++ b/src/main/java/com/viaversion/viafabricplus/util/ChatUtil.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.util;
+package com.viaversion.viafabricplus.util;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.text.Text;
diff --git a/src/main/java/de/florianmichael/viafabricplus/util/ClassLoaderPriorityUtil.java b/src/main/java/com/viaversion/viafabricplus/util/ClassLoaderPriorityUtil.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/util/ClassLoaderPriorityUtil.java
rename to src/main/java/com/viaversion/viafabricplus/util/ClassLoaderPriorityUtil.java
index d929ae63..f4cd09e1 100644
--- a/src/main/java/de/florianmichael/viafabricplus/util/ClassLoaderPriorityUtil.java
+++ b/src/main/java/com/viaversion/viafabricplus/util/ClassLoaderPriorityUtil.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.util;
+package com.viaversion.viafabricplus.util;
 
-import de.florianmichael.viafabricplus.ViaFabricPlus;
+import com.viaversion.viafabricplus.ViaFabricPlus;
 import net.lenni0451.reflect.ClassLoaders;
 import net.lenni0451.reflect.stream.RStream;
 import org.apache.logging.log4j.Logger;
diff --git a/src/main/java/de/florianmichael/viafabricplus/util/ConnectionUtil.java b/src/main/java/com/viaversion/viafabricplus/util/ConnectionUtil.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/util/ConnectionUtil.java
rename to src/main/java/com/viaversion/viafabricplus/util/ConnectionUtil.java
index 09d57b23..e025ab15 100644
--- a/src/main/java/de/florianmichael/viafabricplus/util/ConnectionUtil.java
+++ b/src/main/java/com/viaversion/viafabricplus/util/ConnectionUtil.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.util;
+package com.viaversion.viafabricplus.util;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import de.florianmichael.viafabricplus.injection.access.IServerInfo;
+import com.viaversion.viafabricplus.injection.access.IServerInfo;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.multiplayer.ConnectScreen;
 import net.minecraft.client.network.ServerAddress;
diff --git a/src/main/java/de/florianmichael/viafabricplus/util/DataCustomPayload.java b/src/main/java/com/viaversion/viafabricplus/util/DataCustomPayload.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/util/DataCustomPayload.java
rename to src/main/java/com/viaversion/viafabricplus/util/DataCustomPayload.java
index 1e218e41..d0055728 100644
--- a/src/main/java/de/florianmichael/viafabricplus/util/DataCustomPayload.java
+++ b/src/main/java/com/viaversion/viafabricplus/util/DataCustomPayload.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.util;
+package com.viaversion.viafabricplus.util;
 
-import de.florianmichael.viafabricplus.fixes.ClientsideFixes;
+import com.viaversion.viafabricplus.fixes.ClientsideFixes;
 import io.netty.buffer.Unpooled;
 import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 import net.minecraft.network.PacketByteBuf;
diff --git a/src/main/java/de/florianmichael/viafabricplus/util/ItemUtil.java b/src/main/java/com/viaversion/viafabricplus/util/ItemUtil.java
similarity index 98%
rename from src/main/java/de/florianmichael/viafabricplus/util/ItemUtil.java
rename to src/main/java/com/viaversion/viafabricplus/util/ItemUtil.java
index 82264bb2..ef02d7aa 100644
--- a/src/main/java/de/florianmichael/viafabricplus/util/ItemUtil.java
+++ b/src/main/java/com/viaversion/viafabricplus/util/ItemUtil.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.util;
+package com.viaversion.viafabricplus.util;
 
 import com.viaversion.viaversion.protocols.v1_10to1_11.Protocol1_10To1_11;
 import net.minecraft.component.DataComponentTypes;
diff --git a/src/main/java/de/florianmichael/viafabricplus/util/MapUtil.java b/src/main/java/com/viaversion/viafabricplus/util/MapUtil.java
similarity index 97%
rename from src/main/java/de/florianmichael/viafabricplus/util/MapUtil.java
rename to src/main/java/com/viaversion/viafabricplus/util/MapUtil.java
index 1ce95712..1de49fab 100644
--- a/src/main/java/de/florianmichael/viafabricplus/util/MapUtil.java
+++ b/src/main/java/com/viaversion/viafabricplus/util/MapUtil.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.util;
+package com.viaversion.viafabricplus.util;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/src/main/java/de/florianmichael/viafabricplus/util/ModMenuScreenFactory.java b/src/main/java/com/viaversion/viafabricplus/util/ModMenuScreenFactory.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/util/ModMenuScreenFactory.java
rename to src/main/java/com/viaversion/viafabricplus/util/ModMenuScreenFactory.java
index b2bfb2d5..0f9fc13a 100644
--- a/src/main/java/de/florianmichael/viafabricplus/util/ModMenuScreenFactory.java
+++ b/src/main/java/com/viaversion/viafabricplus/util/ModMenuScreenFactory.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.florianmichael.viafabricplus.util;
+package com.viaversion.viafabricplus.util;
 
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;
-import de.florianmichael.viafabricplus.screen.settings.SettingsScreen;
+import com.viaversion.viafabricplus.screen.settings.SettingsScreen;
 
 /**
  * Implementation of the ModMenu integration allowing users to open the settings screen from the mod menu.
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index d30587f7..fa2f7def 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -40,7 +40,7 @@
   "environment": "client",
   "entrypoints": {
     "modmenu": [
-      "de.florianmichael.viafabricplus.util.ModMenuScreenFactory"
+      "com.viaversion.viafabricplus.util.ModMenuScreenFactory"
     ]
   },
   "mixins": [
diff --git a/src/main/resources/viafabricplus.mixins.json b/src/main/resources/viafabricplus.mixins.json
index 6e0a37ca..b85dd8c5 100644
--- a/src/main/resources/viafabricplus.mixins.json
+++ b/src/main/resources/viafabricplus.mixins.json
@@ -1,9 +1,9 @@
 {
   "required": true,
   "minVersion": "0.8",
-  "package": "de.florianmichael.viafabricplus.injection.mixin",
+  "package": "com.viaversion.viafabricplus.injection.mixin",
   "compatibilityLevel": "JAVA_21",
-  "plugin": "de.florianmichael.viafabricplus.injection.ViaFabricPlusMixinPlugin",
+  "plugin": "com.viaversion.viafabricplus.injection.ViaFabricPlusMixinPlugin",
   "client": [
     "base.MixinMain",
     "base.connect.MixinClientConnection",