diff --git a/build.gradle b/build.gradle
index 2d3980bf..71a0acd4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ plugins {
     id "java-library"
 }
 
-group = "com.github.NerdHubMC"
+group = "io.github.onyxstudios"
 archivesBaseName = "Cardinal-Components-API"
 
 subprojects {
diff --git a/cardinal-components-chunk/src/main/java/nerdhub/cardinal/components/api/util/sync/ChunkSyncedComponent.java b/cardinal-components-chunk/src/main/java/nerdhub/cardinal/components/api/util/sync/ChunkSyncedComponent.java
index 378df891..4f3d2257 100644
--- a/cardinal-components-chunk/src/main/java/nerdhub/cardinal/components/api/util/sync/ChunkSyncedComponent.java
+++ b/cardinal-components-chunk/src/main/java/nerdhub/cardinal/components/api/util/sync/ChunkSyncedComponent.java
@@ -29,7 +29,7 @@
 import net.fabricmc.fabric.api.network.PacketContext;
 import net.fabricmc.fabric.api.network.ServerSidePacketRegistry;
 import net.fabricmc.fabric.api.server.PlayerStream;
-import net.minecraft.client.network.packet.CustomPayloadS2CPacket;
+import net.minecraft.network.packet.s2c.play.CustomPayloadS2CPacket;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.PacketByteBuf;
diff --git a/cardinal-components-entity/src/main/java/nerdhub/cardinal/components/api/util/sync/EntitySyncedComponent.java b/cardinal-components-entity/src/main/java/nerdhub/cardinal/components/api/util/sync/EntitySyncedComponent.java
index e2ba22d9..ba8da028 100644
--- a/cardinal-components-entity/src/main/java/nerdhub/cardinal/components/api/util/sync/EntitySyncedComponent.java
+++ b/cardinal-components-entity/src/main/java/nerdhub/cardinal/components/api/util/sync/EntitySyncedComponent.java
@@ -28,8 +28,8 @@
 import net.fabricmc.fabric.api.network.PacketContext;
 import net.fabricmc.fabric.api.network.ServerSidePacketRegistry;
 import net.fabricmc.fabric.api.server.PlayerStream;
-import net.minecraft.client.network.packet.CustomPayloadS2CPacket;
 import net.minecraft.entity.Entity;
+import net.minecraft.network.packet.s2c.play.CustomPayloadS2CPacket;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.PacketByteBuf;
diff --git a/cardinal-components-level/src/main/java/nerdhub/cardinal/components/api/util/sync/LevelSyncedComponent.java b/cardinal-components-level/src/main/java/nerdhub/cardinal/components/api/util/sync/LevelSyncedComponent.java
index ef393b63..0e89c5c2 100644
--- a/cardinal-components-level/src/main/java/nerdhub/cardinal/components/api/util/sync/LevelSyncedComponent.java
+++ b/cardinal-components-level/src/main/java/nerdhub/cardinal/components/api/util/sync/LevelSyncedComponent.java
@@ -28,7 +28,7 @@
 import net.fabricmc.fabric.api.network.PacketContext;
 import net.fabricmc.fabric.api.network.ServerSidePacketRegistry;
 import net.fabricmc.fabric.api.server.PlayerStream;
-import net.minecraft.client.network.packet.CustomPayloadS2CPacket;
+import net.minecraft.network.packet.s2c.play.CustomPayloadS2CPacket;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.Identifier;
diff --git a/cardinal-components-world/src/main/java/nerdhub/cardinal/components/api/util/sync/WorldSyncedComponent.java b/cardinal-components-world/src/main/java/nerdhub/cardinal/components/api/util/sync/WorldSyncedComponent.java
index dc1815d1..f1dd93b2 100644
--- a/cardinal-components-world/src/main/java/nerdhub/cardinal/components/api/util/sync/WorldSyncedComponent.java
+++ b/cardinal-components-world/src/main/java/nerdhub/cardinal/components/api/util/sync/WorldSyncedComponent.java
@@ -28,7 +28,7 @@
 import net.fabricmc.fabric.api.network.PacketContext;
 import net.fabricmc.fabric.api.network.ServerSidePacketRegistry;
 import net.fabricmc.fabric.api.server.PlayerStream;
-import net.minecraft.client.network.packet.CustomPayloadS2CPacket;
+import net.minecraft.network.packet.s2c.play.CustomPayloadS2CPacket;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.PacketByteBuf;
diff --git a/cardinal-components-world/src/main/java/nerdhub/cardinal/components/mixins/common/world/MixinServerWorld.java b/cardinal-components-world/src/main/java/nerdhub/cardinal/components/mixins/common/world/MixinServerWorld.java
index a4a2e051..3bf34e8f 100644
--- a/cardinal-components-world/src/main/java/nerdhub/cardinal/components/mixins/common/world/MixinServerWorld.java
+++ b/cardinal-components-world/src/main/java/nerdhub/cardinal/components/mixins/common/world/MixinServerWorld.java
@@ -26,7 +26,6 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.WorldGenerationProgressListener;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.util.profiler.Profiler;
 import net.minecraft.world.PersistentStateManager;
 import net.minecraft.world.WorldSaveHandler;
 import net.minecraft.world.dimension.DimensionType;
@@ -48,7 +47,7 @@ public abstract class MixinServerWorld extends MixinWorld {
     private static final String PERSISTENT_STATE_KEY = "cardinal_world_components";
 
     @Inject(at = @At("RETURN"), method = "<init>")
-    private void constructor(MinecraftServer server, Executor executor, WorldSaveHandler oldWorldSaveHandler, LevelProperties levelProperties, DimensionType dimensionType, Profiler profiler, WorldGenerationProgressListener worldGenerationProgressListener, CallbackInfo ci) {
+    private void constructor(MinecraftServer server, Executor workerExecutor, WorldSaveHandler worldSaveHandler, LevelProperties properties, DimensionType dimensionType, WorldGenerationProgressListener worldGenerationProgressListener, CallbackInfo ci) {
         PersistentStateManager persistentStateManager = this.getPersistentStateManager();
         persistentStateManager.getOrCreate(() -> new ComponentPersistentState(PERSISTENT_STATE_KEY, this.components), PERSISTENT_STATE_KEY);
     }
diff --git a/cardinal-components-world/src/main/java/nerdhub/cardinal/components/mixins/common/world/MixinWorld.java b/cardinal-components-world/src/main/java/nerdhub/cardinal/components/mixins/common/world/MixinWorld.java
index 28eb28aa..6661e422 100644
--- a/cardinal-components-world/src/main/java/nerdhub/cardinal/components/mixins/common/world/MixinWorld.java
+++ b/cardinal-components-world/src/main/java/nerdhub/cardinal/components/mixins/common/world/MixinWorld.java
@@ -44,6 +44,7 @@
 import java.util.Collections;
 import java.util.Set;
 import java.util.function.BiFunction;
+import java.util.function.Supplier;
 
 @Mixin(World.class)
 public abstract class MixinWorld implements ComponentProvider {
@@ -53,7 +54,7 @@ public abstract class MixinWorld implements ComponentProvider {
     protected ComponentContainer<?> components;
 
     @Inject(method = "<init>", at = @At("RETURN"))
-    private void initComponents(LevelProperties props, DimensionType dim, BiFunction<World, Dimension, ChunkManager> managerFactory, Profiler profiler, boolean client, CallbackInfo ci) {
+    private void initComponents(LevelProperties props, DimensionType dim, BiFunction<World, Dimension, ChunkManager> chunkManagerProvider, Supplier<Profiler> supplier, boolean isClient, CallbackInfo ci) {
         this.components = componentContainerFactory.create((World) (Object) this);
     }
 
diff --git a/gradle.properties b/gradle.properties
index ad9395db..8676a13b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,9 +2,9 @@
 org.gradle.jvmargs = -Xmx3G
 
 #see https://modmuss50.me/fabric.html
-minecraft_version=1.15.2
-yarn_mappings=7
-loader_version=0.7.6+build.179
+minecraft_version=20w06a
+yarn_mappings=15
+loader_version=0.7.8+build.184
 
 #Fabric api base
 fabric_base_version=0.1.2+b7f9825d95
@@ -18,7 +18,7 @@ fabric_renderer_registry_version=2.0.1+5a0f9a6095
 #Publishing
 mod_version = 2.3.0
 curseforge_id = 318449
-curseforge_versions = 1.15; 1.15.1
+curseforge_versions = 1.16-Snapshot
 changelog_url = https://github.com/OnyxStudios/Cardinal-Components-API/changelog.md
 release_type = release
 #api_package = nerdhub.cardinal.components.api