diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 387afa5..4257e86 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -36,10 +36,12 @@ jobs:
         run: chmod +x ./gradlew
 
       - name: Build
-        run: ./gradlew build
+        run: ./gradlew chiseledBuildAndCollect
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
           name: Artifacts
-          path: build/
+          path: |
+            ./versions/**/build/libs/*fabric.jar
+            ./versions/**/build/libs/*neoforge.jar
diff --git a/README.md b/README.md
index 723caf0..8eebf9d 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ goal with this is to add on the coop experience I really enjoyed from Cooperativ
 
 - Enable/disable modules, allow option to disable the relay but not the syncing.
 - Maybe use a small database library for storage as it might be useful for other ideas.
-- Build system needs some work, shadowing is probably not done right, add sources to the artifacts.
+- Maybe add back the merged jars, add sources to the artifacts.
 - Add Discord commands to retrieve general information about the server, TPS, etc.
 
 ## Configuration
diff --git a/build.gradle b/build.gradle
index 6519eba..bc60006 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,73 +1,115 @@
 plugins {
-    id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
-    id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "com.gradleup.shadow" version "8.3.2" apply false
-
-    id "io.github.pacifistmc.forgix" version "1.2.9"
+    id "dev.architectury.loom" version "1.7-SNAPSHOT"
+    id "com.gradleup.shadow" version "8.3.2"
 }
 
-architectury {
-    minecraft = project.minecraft_version
-}
+def loader = property("loom.platform")
+def isFabric = loader == "fabric"
 
-allprojects {
-    group = project.maven_group
-    version = project.mod_version
+def minecraft_version = property("deps.minecraft")
+def mod_version = property("mod.version")
+
+base {
+    archivesName = property("mod.name") + "-" + mod_version + "-" + minecraft_version + "+" + loader
 }
 
-forgix {
-    group = project.maven_group
-    mergedJarName = "cooptweaks-${project.mod_version}-fabric-neoforge.jar"
-    outputDir = "build"
+repositories {
+    maven { url "https://maven.neoforged.net/releases" }
+}
 
-    if (findProject(":neoforge")) {
-        neoforge {
-            jarLocation = "build/libs/cooptweaks-neoforge-${project.mod_version}.jar"
+loom {
+    decompilers {
+        vineflower { // Adds names to lambdas - useful for mixins
+            options.put("mark-corresponding-synthetics", "1")
         }
     }
 
-    if (findProject(":fabric")) {
-        fabric {
-            jarLocation = "build/libs/cooptweaks-fabric-${project.mod_version}.jar"
-        }
+    runConfigs.all {
+        ideConfigGenerated true
+        vmArgs "-Dmixin.debug.export=true"
+        runDir = "../../run"
     }
 }
 
-subprojects {
-    apply plugin: "dev.architectury.loom"
-    apply plugin: "architectury-plugin"
-
-    base {
-        archivesName = "$project.archives_name-$project.name"
+configurations {
+    shadowBundle {
+        canBeResolved = true
+        canBeConsumed = false
     }
+}
 
-    repositories {
-        // Add repositories to retrieve artifacts from in here.
-        // You should only use this when depending on other mods because
-        // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
-        // See https://docs.gradle.org/current/userguide/declaring_repositories.html
-        // for more information about repositories.
+dependencies {
+    minecraft "net.minecraft:minecraft:${minecraft_version}"
+
+    mappings loom.layered {
+        it.mappings "net.fabricmc:yarn:${property("deps.yarn")}:v2"
+        it.mappings "dev.architectury:yarn-mappings-patch-neoforge:${property("deps.yarn_mappings_neoforge_patch")}"
     }
 
-    dependencies {
-        minecraft "net.minecraft:minecraft:$project.minecraft_version"
-        mappings loom.layered {
-            it.mappings("net.fabricmc:yarn:$project.yarn_mappings:v2")
-            it.mappings("dev.architectury:yarn-mappings-patch-neoforge:$project.yarn_mappings_patch_neoforge_version")
-        }
+    if (isFabric) {
+        modImplementation "net.fabricmc:fabric-loader:${property("deps.fabric_loader")}"
+        modImplementation "net.fabricmc.fabric-api:fabric-api:${property("deps.fabric_api")}"
+    } else {
+        neoForge "net.neoforged:neoforge:${property("deps.neoforge")}"
     }
 
-    java {
-        withSourcesJar()
+    modImplementation "dev.architectury:architectury-${loader}:${property("deps.architectury_api")}"
+
+    shadowBundle implementation("com.discord4j:discord4j-core:${property("deps.discord4j")}")
+}
+
+tasks.processResources {
+    def props = [
+            version  : mod_version,
+            minecraft: minecraft_version,
+    ]
 
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
+    filesMatching("fabric.mod.json") { expand(props) }
+    filesMatching("META-INF/neoforge.mods.toml") { expand(props) }
+    filesMatching("cooptweaks.mixins.json") { expand(props) }
+}
+
+tasks.register('buildAndCollect', Copy) {
+    group = 'build'
+    from(tasks.remapJar.archiveFile)
+    into(rootProject.layout.buildDirectory.file("libs/"))
+    dependsOn('build')
+}
+
+shadowJar {
+    configurations = [project.configurations.shadowBundle]
+    archiveClassifier = "dev-shadow"
+
+    relocate 'io.netty', 'shadow.io.netty'
+    relocate 'org.checkerframework', 'shadow.org.checkerframework'
+    relocate 'com.google', 'shadow.com.google'
+}
+
+remapJar {
+    dependsOn(shadowJar)
+    inputFile = tasks.shadowJar.archiveFile
+}
+
+afterEvaluate {
+    stonecutter {
+        stonecutter.const("fabric", loader == "fabric")
+        stonecutter.const("neoforge", loader == "neoforge")
     }
+}
 
-    tasks.withType(JavaCompile).configureEach {
-        it.options.release = 21
+if (stonecutter.current.isActive) {
+    rootProject.tasks.register("buildActive") {
+        group = "project"
+        dependsOn(tasks.named("build"))
     }
+}
+
+java {
+    withSourcesJar()
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
 
-    build.finalizedBy(mergeJars)
-    assemble.finalizedBy(mergeJars)
+tasks.withType(JavaCompile).configureEach {
+    it.options.release = 21
 }
diff --git a/common/build.gradle b/common/build.gradle
deleted file mode 100644
index b4dc581..0000000
--- a/common/build.gradle
+++ /dev/null
@@ -1,15 +0,0 @@
-architectury {
-    common project.enabled_platforms.split(",")
-}
-
-dependencies {
-    // We depend on Fabric Loader here to use the Fabric @Environment annotations,
-    // which get remapped to the correct annotations on each platform.
-    // Do NOT use other classes from Fabric Loader.
-    modImplementation "net.fabricmc:fabric-loader:$project.fabric_loader_version"
-
-    // Architectury API. This is optional, and you can comment it out if you don't need it.
-    modImplementation "dev.architectury:architectury:$project.architectury_api_version"
-
-    implementation "com.discord4j:discord4j-core:${project.discord4j_version}"
-}
diff --git a/fabric/build.gradle b/fabric/build.gradle
deleted file mode 100644
index 62ebd0a..0000000
--- a/fabric/build.gradle
+++ /dev/null
@@ -1,63 +0,0 @@
-plugins {
-    id "com.gradleup.shadow"
-}
-
-architectury {
-    platformSetupLoomIde()
-    fabric()
-}
-
-configurations {
-    common {
-        canBeResolved = true
-        canBeConsumed = false
-    }
-
-    compileClasspath.extendsFrom common
-    runtimeClasspath.extendsFrom common
-    developmentFabric.extendsFrom common
-
-    // Files in this configuration will be bundled into your mod using the Shadow plugin.
-    // Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files.
-    shadowBundle {
-        canBeResolved = true
-        canBeConsumed = false
-    }
-}
-
-dependencies {
-    modImplementation "net.fabricmc:fabric-loader:$project.fabric_loader_version"
-
-    // Fabric API.
-    modImplementation "net.fabricmc.fabric-api:fabric-api:$project.fabric_api_version"
-
-    // Architectury API.
-    modImplementation "dev.architectury:architectury-fabric:$project.architectury_api_version"
-
-    common(project(path: ":common", configuration: "namedElements")) { transitive false }
-    shadowBundle project(path: ":common", configuration: "transformProductionFabric")
-
-    shadowBundle implementation("com.discord4j:discord4j-core:${project.discord4j_version}")
-}
-
-processResources {
-    inputs.property "version", project.version
-
-    filesMatching("fabric.mod.json") {
-        expand version: project.version
-    }
-}
-
-shadowJar {
-    configurations = [project.configurations.shadowBundle]
-    archiveClassifier = "dev-shadow"
-
-    relocate 'io.netty', 'shadow.io.netty'
-    relocate 'org.checkerframework', 'shadow.org.checkerframework'
-    relocate 'com.google', 'shadow.com.google'
-}
-
-remapJar {
-    dependsOn(shadowJar)
-    inputFile = tasks.shadowJar.archiveFile
-}
diff --git a/gradle.properties b/gradle.properties
index 4477aaa..30796b0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,19 +3,23 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.parallel=true
 
 # Mod properties
-mod_version=0.3.0
-maven_group=com.cooptweaks
-archives_name=cooptweaks
-enabled_platforms=fabric,neoforge
-
-# Minecraft properties
-minecraft_version=1.21.1
-yarn_mappings=1.21+build.3
-yarn_mappings_patch_neoforge_version=1.21+build.4
+mod.id=cooptweaks
+mod.version=0.3.0
+mod.group=com.cooptweaks
+mod.name=CoopTweaks
 
 # Dependencies
-discord4j_version=3.2.6
-architectury_api_version=13.0.6
-fabric_loader_version=0.16.5
-fabric_api_version=0.105.0+1.21.1
-neoforge_version=21.1.61
+deps.minecraft=[VERSIONED]
+
+deps.yarn=[VERSIONED]
+deps.yarn_mappings_neoforge_patch=[VERSIONED]
+
+deps.architectury_api=[VERSIONED]
+
+deps.fabric_loader=[VERSIONED]
+deps.fabric_api=[VERSIONED]
+
+deps.neoforge=[VERSIONED]
+
+# External libraries
+deps.discord4j=3.2.6
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
deleted file mode 100644
index 621938d..0000000
--- a/neoforge/build.gradle
+++ /dev/null
@@ -1,67 +0,0 @@
-plugins {
-    id "com.gradleup.shadow"
-}
-
-architectury {
-    platformSetupLoomIde()
-    neoForge()
-}
-
-configurations {
-    common {
-        canBeResolved = true
-        canBeConsumed = false
-    }
-
-    compileClasspath.extendsFrom common
-    runtimeClasspath.extendsFrom common
-    developmentNeoForge.extendsFrom common
-
-    // Files in this configuration will be bundled into your mod using the Shadow plugin.
-    // Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files.
-    shadowBundle {
-        canBeResolved = true
-        canBeConsumed = false
-    }
-}
-
-repositories {
-    maven {
-        name = "NeoForged"
-        url = "https://maven.neoforged.net/releases"
-    }
-}
-
-dependencies {
-    neoForge "net.neoforged:neoforge:$project.neoforge_version"
-
-    // Architectury API.
-    modImplementation "dev.architectury:architectury-neoforge:$project.architectury_api_version"
-
-    common(project(path: ":common", configuration: "namedElements")) { transitive false }
-    shadowBundle project(path: ":common", configuration: "transformProductionNeoForge")
-
-    shadowBundle implementation("com.discord4j:discord4j-core:${project.discord4j_version}")
-}
-
-processResources {
-    inputs.property "version", project.version
-
-    filesMatching("META-INF/neoforge.mods.toml") {
-        expand version: project.version
-    }
-}
-
-shadowJar {
-    configurations = [project.configurations.shadowBundle]
-    archiveClassifier = "dev-shadow"
-
-    relocate 'io.netty', 'shadow.io.netty'
-    relocate 'org.checkerframework', 'shadow.org.checkerframework'
-    relocate 'com.google', 'shadow.com.google'
-}
-
-remapJar {
-    dependsOn(shadowJar)
-    inputFile = tasks.shadowJar.archiveFile
-}
diff --git a/neoforge/gradle.properties b/neoforge/gradle.properties
deleted file mode 100644
index 7da18ea..0000000
--- a/neoforge/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-loom.platform=neoforge
diff --git a/settings.gradle b/settings.gradle
index f889a24..2c73106 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,14 +1,25 @@
 pluginManagement {
     repositories {
-        maven { url "https://maven.fabricmc.net/" }
         maven { url "https://maven.architectury.dev/" }
+        maven { url "https://maven.fabricmc.net/" }
         maven { url "https://maven.neoforged.net/releases" }
         gradlePluginPortal()
     }
 }
 
-rootProject.name = "cooptweaks"
+plugins {
+    id "dev.kikugie.stonecutter" version "0.4.5"
+}
+
+stonecutter {
+    shared {
+        vers "1.21.1-fabric", "1.21.1"
+        vers "1.21.1-neoforge", "1.21.1"
+
+        vcsVersion "1.21.1-fabric"
+    }
+
+    create rootProject
+}
 
-include "common"
-include "fabric"
-include "neoforge"
+rootProject.name = "CoopTweaks"
diff --git a/common/src/main/java/com/cooptweaks/Advancements.java b/src/main/java/com/cooptweaks/Advancements.java
similarity index 100%
rename from common/src/main/java/com/cooptweaks/Advancements.java
rename to src/main/java/com/cooptweaks/Advancements.java
diff --git a/common/src/main/java/com/cooptweaks/Client.java b/src/main/java/com/cooptweaks/Client.java
similarity index 88%
rename from common/src/main/java/com/cooptweaks/Client.java
rename to src/main/java/com/cooptweaks/Client.java
index c2f12e9..7f94af6 100644
--- a/common/src/main/java/com/cooptweaks/Client.java
+++ b/src/main/java/com/cooptweaks/Client.java
@@ -5,12 +5,16 @@
 import dev.architectury.event.events.client.ClientScreenInputEvent;
 import dev.architectury.platform.Platform;
 import dev.architectury.registry.client.keymappings.KeyMappingRegistry;
-import net.fabricmc.api.EnvType;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.InputUtil;
 
+//? if fabric
+import net.fabricmc.api.EnvType;
+//? if neoforge
+/*import net.neoforged.api.distmarker.Dist;*/
+
 public class Client {
 	public static final KeyBinding LINK_ITEM_KEY = new KeyBinding(
 			"key.cooptweaks.link_item",
@@ -20,7 +24,10 @@ public class Client {
 	);
 
 	public static void init() {
+		//? if fabric
 		if (Platform.getEnv() != EnvType.CLIENT) {
+		//? if neoforge
+		/*if (Platform.getEnv() != Dist.CLIENT) {*/
 			return;
 		}
 
diff --git a/common/src/main/java/com/cooptweaks/Configuration.java b/src/main/java/com/cooptweaks/Configuration.java
similarity index 100%
rename from common/src/main/java/com/cooptweaks/Configuration.java
rename to src/main/java/com/cooptweaks/Configuration.java
diff --git a/common/src/main/java/com/cooptweaks/Dimension.java b/src/main/java/com/cooptweaks/Dimension.java
similarity index 100%
rename from common/src/main/java/com/cooptweaks/Dimension.java
rename to src/main/java/com/cooptweaks/Dimension.java
diff --git a/common/src/main/java/com/cooptweaks/Discord.java b/src/main/java/com/cooptweaks/Discord.java
similarity index 100%
rename from common/src/main/java/com/cooptweaks/Discord.java
rename to src/main/java/com/cooptweaks/Discord.java
diff --git a/common/src/main/java/com/cooptweaks/Main.java b/src/main/java/com/cooptweaks/Main.java
similarity index 100%
rename from common/src/main/java/com/cooptweaks/Main.java
rename to src/main/java/com/cooptweaks/Main.java
diff --git a/common/src/main/java/com/cooptweaks/commands/ServerCommand.java b/src/main/java/com/cooptweaks/commands/ServerCommand.java
similarity index 100%
rename from common/src/main/java/com/cooptweaks/commands/ServerCommand.java
rename to src/main/java/com/cooptweaks/commands/ServerCommand.java
diff --git a/common/src/main/java/com/cooptweaks/commands/SlashCommand.java b/src/main/java/com/cooptweaks/commands/SlashCommand.java
similarity index 100%
rename from common/src/main/java/com/cooptweaks/commands/SlashCommand.java
rename to src/main/java/com/cooptweaks/commands/SlashCommand.java
diff --git a/common/src/main/java/com/cooptweaks/commands/advancements/Progress.java b/src/main/java/com/cooptweaks/commands/advancements/Progress.java
similarity index 100%
rename from common/src/main/java/com/cooptweaks/commands/advancements/Progress.java
rename to src/main/java/com/cooptweaks/commands/advancements/Progress.java
diff --git a/common/src/main/java/com/cooptweaks/commands/discord/Status.java b/src/main/java/com/cooptweaks/commands/discord/Status.java
similarity index 100%
rename from common/src/main/java/com/cooptweaks/commands/discord/Status.java
rename to src/main/java/com/cooptweaks/commands/discord/Status.java
diff --git a/common/src/main/java/com/cooptweaks/commands/misc/LinkCommand.java b/src/main/java/com/cooptweaks/commands/misc/LinkCommand.java
similarity index 100%
rename from common/src/main/java/com/cooptweaks/commands/misc/LinkCommand.java
rename to src/main/java/com/cooptweaks/commands/misc/LinkCommand.java
diff --git a/common/src/main/java/com/cooptweaks/keybinds/misc/Link.java b/src/main/java/com/cooptweaks/keybinds/misc/Link.java
similarity index 87%
rename from common/src/main/java/com/cooptweaks/keybinds/misc/Link.java
rename to src/main/java/com/cooptweaks/keybinds/misc/Link.java
index 3a33add..1a61dd7 100644
--- a/common/src/main/java/com/cooptweaks/keybinds/misc/Link.java
+++ b/src/main/java/com/cooptweaks/keybinds/misc/Link.java
@@ -12,6 +12,7 @@
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
+import net.minecraft.util.Rarity;
 
 public class Link {
 	public static void sendPacket(MinecraftClient client) {
@@ -50,7 +51,14 @@ public static Text getHoverableText(ItemStack stack, Text playerName) {
 		text.append(playerName);
 		text.append(Text.literal(" linked "));
 
-		Formatting color = stack.getRarity().getFormatting();
+		Rarity rarity = stack.getRarity();
+
+		Formatting color = switch (rarity) {
+			case COMMON -> Formatting.DARK_GRAY;
+			case RARE -> Formatting.GOLD;
+			case EPIC -> Formatting.YELLOW;
+			default -> Formatting.GRAY;
+		};
 
 		MutableText item = stack.getName().copy()
 				.styled(style -> style.withColor(color)
diff --git a/fabric/src/main/java/com/cooptweaks/fabric/client/FabricClient.java b/src/main/java/com/cooptweaks/loaders/fabric/FabricClient.java
similarity index 55%
rename from fabric/src/main/java/com/cooptweaks/fabric/client/FabricClient.java
rename to src/main/java/com/cooptweaks/loaders/fabric/FabricClient.java
index ef02abc..ded8457 100644
--- a/fabric/src/main/java/com/cooptweaks/fabric/client/FabricClient.java
+++ b/src/main/java/com/cooptweaks/loaders/fabric/FabricClient.java
@@ -1,11 +1,13 @@
-package com.cooptweaks.fabric.client;
+//? if fabric {
+package com.cooptweaks.loaders.fabric;
 
 import com.cooptweaks.Client;
 import net.fabricmc.api.ClientModInitializer;
 
-public final class FabricClient implements ClientModInitializer {
+public class FabricClient implements ClientModInitializer {
 	@Override
 	public void onInitializeClient() {
 		Client.init();
 	}
 }
+//?}
diff --git a/fabric/src/main/java/com/cooptweaks/fabric/FabricMain.java b/src/main/java/com/cooptweaks/loaders/fabric/FabricMain.java
similarity index 53%
rename from fabric/src/main/java/com/cooptweaks/fabric/FabricMain.java
rename to src/main/java/com/cooptweaks/loaders/fabric/FabricMain.java
index 2a36a61..798330e 100644
--- a/fabric/src/main/java/com/cooptweaks/fabric/FabricMain.java
+++ b/src/main/java/com/cooptweaks/loaders/fabric/FabricMain.java
@@ -1,11 +1,13 @@
-package com.cooptweaks.fabric;
+//? if fabric {
+package com.cooptweaks.loaders.fabric;
 
 import com.cooptweaks.Main;
 import net.fabricmc.api.ModInitializer;
 
-public final class FabricMain implements ModInitializer {
+public class FabricMain implements ModInitializer {
 	@Override
 	public void onInitialize() {
 		Main.init();
 	}
 }
+//?}
diff --git a/neoforge/src/main/java/com/cooptweaks/neoforge/NeoForgeMain.java b/src/main/java/com/cooptweaks/loaders/neoforge/NeoForgeMain.java
similarity index 75%
rename from neoforge/src/main/java/com/cooptweaks/neoforge/NeoForgeMain.java
rename to src/main/java/com/cooptweaks/loaders/neoforge/NeoForgeMain.java
index 5082788..165ae2d 100644
--- a/neoforge/src/main/java/com/cooptweaks/neoforge/NeoForgeMain.java
+++ b/src/main/java/com/cooptweaks/loaders/neoforge/NeoForgeMain.java
@@ -1,4 +1,5 @@
-package com.cooptweaks.neoforge;
+//? if neoforge {
+/*package com.cooptweaks.loaders.neoforge;
 
 import com.cooptweaks.Client;
 import com.cooptweaks.Main;
@@ -11,3 +12,4 @@ public NeoForgeMain() {
 		Main.init();
 	}
 }
+*///?}
diff --git a/common/src/main/java/com/cooptweaks/mixins/PlayerAdvancementTrackerMixin.java b/src/main/java/com/cooptweaks/mixins/PlayerAdvancementTrackerMixin.java
similarity index 100%
rename from common/src/main/java/com/cooptweaks/mixins/PlayerAdvancementTrackerMixin.java
rename to src/main/java/com/cooptweaks/mixins/PlayerAdvancementTrackerMixin.java
diff --git a/common/src/main/java/com/cooptweaks/mixins/client/accessor/HandledScreenAccessor.java b/src/main/java/com/cooptweaks/mixins/client/accessor/HandledScreenAccessor.java
similarity index 78%
rename from common/src/main/java/com/cooptweaks/mixins/client/accessor/HandledScreenAccessor.java
rename to src/main/java/com/cooptweaks/mixins/client/accessor/HandledScreenAccessor.java
index e6b2602..c6a8e18 100644
--- a/common/src/main/java/com/cooptweaks/mixins/client/accessor/HandledScreenAccessor.java
+++ b/src/main/java/com/cooptweaks/mixins/client/accessor/HandledScreenAccessor.java
@@ -1,13 +1,10 @@
 package com.cooptweaks.mixins.client.accessor;
 
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.screen.slot.Slot;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-@Environment(EnvType.CLIENT)
 @Mixin(HandledScreen.class)
 public interface HandledScreenAccessor {
 	@Accessor("focusedSlot")
diff --git a/common/src/main/java/com/cooptweaks/packets/LinkPacket.java b/src/main/java/com/cooptweaks/packets/LinkPacket.java
similarity index 100%
rename from common/src/main/java/com/cooptweaks/packets/LinkPacket.java
rename to src/main/java/com/cooptweaks/packets/LinkPacket.java
diff --git a/common/src/main/java/com/cooptweaks/types/ConfigMap.java b/src/main/java/com/cooptweaks/types/ConfigMap.java
similarity index 100%
rename from common/src/main/java/com/cooptweaks/types/ConfigMap.java
rename to src/main/java/com/cooptweaks/types/ConfigMap.java
diff --git a/common/src/main/java/com/cooptweaks/types/Result.java b/src/main/java/com/cooptweaks/types/Result.java
similarity index 100%
rename from common/src/main/java/com/cooptweaks/types/Result.java
rename to src/main/java/com/cooptweaks/types/Result.java
diff --git a/common/src/main/java/com/cooptweaks/types/Value.java b/src/main/java/com/cooptweaks/types/Value.java
similarity index 100%
rename from common/src/main/java/com/cooptweaks/types/Value.java
rename to src/main/java/com/cooptweaks/types/Value.java
diff --git a/common/src/main/java/com/cooptweaks/utils/TimeSince.java b/src/main/java/com/cooptweaks/utils/TimeSince.java
similarity index 100%
rename from common/src/main/java/com/cooptweaks/utils/TimeSince.java
rename to src/main/java/com/cooptweaks/utils/TimeSince.java
diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml
similarity index 100%
rename from neoforge/src/main/resources/META-INF/neoforge.mods.toml
rename to src/main/resources/META-INF/neoforge.mods.toml
diff --git a/common/src/main/resources/assets/cooptweaks/lang/en_us.json b/src/main/resources/assets/cooptweaks/lang/en_us.json
similarity index 100%
rename from common/src/main/resources/assets/cooptweaks/lang/en_us.json
rename to src/main/resources/assets/cooptweaks/lang/en_us.json
diff --git a/common/src/main/resources/cooptweaks.mixins.json b/src/main/resources/cooptweaks.mixins.json
similarity index 100%
rename from common/src/main/resources/cooptweaks.mixins.json
rename to src/main/resources/cooptweaks.mixins.json
diff --git a/fabric/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
similarity index 85%
rename from fabric/src/main/resources/fabric.mod.json
rename to src/main/resources/fabric.mod.json
index 447f64b..f399e3e 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -14,10 +14,10 @@
   "environment": "*",
   "entrypoints": {
     "main": [
-      "com.cooptweaks.fabric.FabricMain"
+      "com.cooptweaks.loaders.fabric.FabricMain"
     ],
     "client": [
-      "com.cooptweaks.fabric.client.FabricClient"
+      "com.cooptweaks.loaders.fabric.FabricClient"
     ]
   },
   "mixins": [
diff --git a/stonecutter.gradle b/stonecutter.gradle
new file mode 100644
index 0000000..ae3289e
--- /dev/null
+++ b/stonecutter.gradle
@@ -0,0 +1,10 @@
+plugins {
+    id "dev.kikugie.stonecutter"
+}
+
+stonecutter.active "1.21.1-fabric" /* [SC] DO NOT EDIT */
+
+stonecutter.registerChiseled tasks.register("chiseledBuildAndCollect", stonecutter.chiseled) {
+    setGroup("project")
+    ofTask("buildAndCollect")
+}
diff --git a/versions/1.21.1-fabric/gradle.properties b/versions/1.21.1-fabric/gradle.properties
new file mode 100644
index 0000000..160ca4d
--- /dev/null
+++ b/versions/1.21.1-fabric/gradle.properties
@@ -0,0 +1,11 @@
+loom.platform=fabric
+
+deps.minecraft=1.21.1
+
+deps.yarn=1.21.1+build.3
+deps.yarn_mappings_neoforge_patch=1.21+build.4
+
+deps.architectury_api=13.0.8
+
+deps.fabric_loader=0.16.5
+deps.fabric_api=0.105.0+1.21.1
diff --git a/versions/1.21.1-neoforge/gradle.properties b/versions/1.21.1-neoforge/gradle.properties
new file mode 100644
index 0000000..7010bd3
--- /dev/null
+++ b/versions/1.21.1-neoforge/gradle.properties
@@ -0,0 +1,10 @@
+loom.platform=neoforge
+
+deps.minecraft=1.21.1
+
+deps.yarn=1.21.1+build.3
+deps.yarn_mappings_neoforge_patch=1.21+build.4
+
+deps.architectury_api=13.0.8
+
+deps.neoforge=21.1.66