diff --git a/build.gradle b/fabric/build.gradle
similarity index 75%
rename from build.gradle
rename to fabric/build.gradle
index e6afdb5..44d9bae 100644
--- a/build.gradle
+++ b/fabric/build.gradle
@@ -41,7 +41,21 @@ java {
 }
 
 jar {
-	from("LICENSE") {
+	from('../LICENSE') {
 		rename { "${it}_${project.base.archivesName.get()}"}
 	}
 }
+
+sourceSets {
+    main {
+        java {
+            srcDirs = ['../src/fabric']
+            resources {
+                srcDirs = ['../src']
+                include 'fabric.mod.json'
+                include 'fabric.mixins.json'
+                include 'assets/icon.png'
+            }
+        }
+    }
+}
diff --git a/gradle.properties b/fabric/gradle.properties
similarity index 100%
rename from gradle.properties
rename to fabric/gradle.properties
diff --git a/gradle/wrapper/gradle-wrapper.jar b/fabric/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from gradle/wrapper/gradle-wrapper.jar
rename to fabric/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/fabric/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from gradle/wrapper/gradle-wrapper.properties
rename to fabric/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew b/fabric/gradlew
similarity index 100%
rename from gradlew
rename to fabric/gradlew
diff --git a/gradlew.bat b/fabric/gradlew.bat
similarity index 100%
rename from gradlew.bat
rename to fabric/gradlew.bat
diff --git a/settings.gradle b/fabric/settings.gradle
similarity index 100%
rename from settings.gradle
rename to fabric/settings.gradle
diff --git a/src/main/resources/assets/flashii-extensions/icon.png b/src/assets/icon.png
similarity index 100%
rename from src/main/resources/assets/flashii-extensions/icon.png
rename to src/assets/icon.png
diff --git a/src/main/resources/flashii-extensions.mixins.json b/src/fabric.mixins.json
similarity index 100%
rename from src/main/resources/flashii-extensions.mixins.json
rename to src/fabric.mixins.json
diff --git a/src/main/resources/fabric.mod.json b/src/fabric.mod.json
similarity index 85%
rename from src/main/resources/fabric.mod.json
rename to src/fabric.mod.json
index 7c3d804..68f3e44 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/fabric.mod.json
@@ -12,10 +12,10 @@
 		"sources": "https://patchii.net/flashii/mcexts"
 	},
 	"license": "BSD-3-Clause-Clear",
-	"icon": "assets/flashii-extensions/icon.png",
+	"icon": "assets/icon.png",
 	"environment": "*",
 	"mixins": [
-		"flashii-extensions.mixins.json"
+		"fabric.mixins.json"
 	],
 	"depends": {
 		"fabricloader": ">=0.14.22",
diff --git a/src/main/java/net/flashii/mcexts/Config.java b/src/fabric/net/flashii/mcexts/Config.java
similarity index 100%
rename from src/main/java/net/flashii/mcexts/Config.java
rename to src/fabric/net/flashii/mcexts/Config.java
diff --git a/src/main/java/net/flashii/mcexts/HMAC.java b/src/fabric/net/flashii/mcexts/HMAC.java
similarity index 100%
rename from src/main/java/net/flashii/mcexts/HMAC.java
rename to src/fabric/net/flashii/mcexts/HMAC.java
diff --git a/src/main/java/net/flashii/mcexts/RNG.java b/src/fabric/net/flashii/mcexts/RNG.java
similarity index 100%
rename from src/main/java/net/flashii/mcexts/RNG.java
rename to src/fabric/net/flashii/mcexts/RNG.java
diff --git a/src/main/java/net/flashii/mcexts/RPC.java b/src/fabric/net/flashii/mcexts/RPC.java
similarity index 100%
rename from src/main/java/net/flashii/mcexts/RPC.java
rename to src/fabric/net/flashii/mcexts/RPC.java
diff --git a/src/main/java/net/flashii/mcexts/RPCPayload.java b/src/fabric/net/flashii/mcexts/RPCPayload.java
similarity index 100%
rename from src/main/java/net/flashii/mcexts/RPCPayload.java
rename to src/fabric/net/flashii/mcexts/RPCPayload.java
diff --git a/src/main/java/net/flashii/mcexts/RPCPayloadDeserialiser.java b/src/fabric/net/flashii/mcexts/RPCPayloadDeserialiser.java
similarity index 100%
rename from src/main/java/net/flashii/mcexts/RPCPayloadDeserialiser.java
rename to src/fabric/net/flashii/mcexts/RPCPayloadDeserialiser.java
diff --git a/src/main/java/net/flashii/mcexts/URLs.java b/src/fabric/net/flashii/mcexts/URLs.java
similarity index 100%
rename from src/main/java/net/flashii/mcexts/URLs.java
rename to src/fabric/net/flashii/mcexts/URLs.java
diff --git a/src/main/java/net/flashii/mcexts/mixin/EnvironmentMixin.java b/src/fabric/net/flashii/mcexts/mixin/EnvironmentMixin.java
similarity index 100%
rename from src/main/java/net/flashii/mcexts/mixin/EnvironmentMixin.java
rename to src/fabric/net/flashii/mcexts/mixin/EnvironmentMixin.java
diff --git a/src/main/java/net/flashii/mcexts/mixin/PlayerListHudMixin.java b/src/fabric/net/flashii/mcexts/mixin/PlayerListHudMixin.java
similarity index 100%
rename from src/main/java/net/flashii/mcexts/mixin/PlayerListHudMixin.java
rename to src/fabric/net/flashii/mcexts/mixin/PlayerListHudMixin.java
diff --git a/src/main/java/net/flashii/mcexts/mixin/PlayerManagerMixin.java b/src/fabric/net/flashii/mcexts/mixin/PlayerManagerMixin.java
similarity index 100%
rename from src/main/java/net/flashii/mcexts/mixin/PlayerManagerMixin.java
rename to src/fabric/net/flashii/mcexts/mixin/PlayerManagerMixin.java
diff --git a/src/main/java/net/flashii/mcexts/mixin/ServerMetadataMixin.java b/src/fabric/net/flashii/mcexts/mixin/ServerMetadataMixin.java
similarity index 100%
rename from src/main/java/net/flashii/mcexts/mixin/ServerMetadataMixin.java
rename to src/fabric/net/flashii/mcexts/mixin/ServerMetadataMixin.java
diff --git a/src/main/java/net/flashii/mcexts/mixin/TextureUrlCheckerMixin.java b/src/fabric/net/flashii/mcexts/mixin/TextureUrlCheckerMixin.java
similarity index 100%
rename from src/main/java/net/flashii/mcexts/mixin/TextureUrlCheckerMixin.java
rename to src/fabric/net/flashii/mcexts/mixin/TextureUrlCheckerMixin.java
diff --git a/src/main/java/net/flashii/mcexts/mixin/YggdrasilMinecraftSessionServiceMixin.java b/src/fabric/net/flashii/mcexts/mixin/YggdrasilMinecraftSessionServiceMixin.java
similarity index 100%
rename from src/main/java/net/flashii/mcexts/mixin/YggdrasilMinecraftSessionServiceMixin.java
rename to src/fabric/net/flashii/mcexts/mixin/YggdrasilMinecraftSessionServiceMixin.java