diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/mixin/InGameHudMixin.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/mixin/InGameHudMixin.java
index ebf8a57..1fabb7d 100644
--- a/common/src/main/java/com/lukasabbe/bookshelfinspector/mixin/InGameHudMixin.java
+++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/mixin/InGameHudMixin.java
@@ -1,6 +1,5 @@
 package com.lukasabbe.bookshelfinspector.mixin;
 
-import com.lukasabbe.bookshelfinspector.Constants;
 import com.lukasabbe.bookshelfinspector.renderer.HudRenderer;
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
diff --git a/common/src/main/java/com/lukasabbe/bookshelfinspector/renderer/HudRenderer.java b/common/src/main/java/com/lukasabbe/bookshelfinspector/renderer/HudRenderer.java
index ee8728d..1ff0b37 100644
--- a/common/src/main/java/com/lukasabbe/bookshelfinspector/renderer/HudRenderer.java
+++ b/common/src/main/java/com/lukasabbe/bookshelfinspector/renderer/HudRenderer.java
@@ -1,10 +1,8 @@
 package com.lukasabbe.bookshelfinspector.renderer;
 
 import com.lukasabbe.bookshelfinspector.BookshelfInspectorClient;
-import com.lukasabbe.bookshelfinspector.Constants;
 import com.lukasabbe.bookshelfinspector.data.BookData;
 import com.lukasabbe.bookshelfinspector.util.RomanNumerals;
-import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
diff --git a/fabric/src/main/java/com/lukasabbe/bookshelfinspector/ModMenu.java b/fabric/src/main/java/com/lukasabbe/bookshelfinspector/config/ModMenu.java
similarity index 100%
rename from fabric/src/main/java/com/lukasabbe/bookshelfinspector/ModMenu.java
rename to fabric/src/main/java/com/lukasabbe/bookshelfinspector/config/ModMenu.java
diff --git a/gradle.properties b/gradle.properties
index c968281..ad21a74 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,7 +19,7 @@ parchment_minecraft=1.21.8
 parchment_version=2025.07.20
 
 # Fabric
-fabric_version=0.133.12+1.21.9
+fabric_version=0.133.13+1.21.9
 fabric_loader_version=0.17.2
 
 # NeoForge
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
index acf946a..dcb1bbb 100644
--- a/neoforge/build.gradle
+++ b/neoforge/build.gradle
@@ -48,4 +48,6 @@ dependencies {
     additionalRuntimeClasspath "org.yaml:snakeyaml:2.4"
 }
 
+sourceSets.main.resources { srcDir 'src/generated/resources' }
+
 sourceSets.main.resources { srcDir 'src/generated/resources' }
\ No newline at end of file
diff --git a/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorNeoForge.java b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorNeoForge.java
index baab42a..9e07a38 100644
--- a/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorNeoForge.java
+++ b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorNeoForge.java
@@ -1,11 +1,12 @@
 package com.lukasabbe.bookshelfinspector;
 
+import com.lukasabbe.bookshelfinspector.util.EventHandler;
+import com.lukasabbe.bookshelfinspector.util.NetworkHandler;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.common.Mod;
 
 @Mod(value = Constants.MOD_ID)
 public class BookshelfInspectorNeoForge {
-
     public BookshelfInspectorNeoForge(IEventBus eventBus) {
         EventHandler.initServer();
         eventBus.addListener(NetworkHandler::registerPayloads);
diff --git a/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorNeoForgeClient.java b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorNeoForgeClient.java
index 0832287..c85a4ec 100644
--- a/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorNeoForgeClient.java
+++ b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/BookshelfInspectorNeoForgeClient.java
@@ -1,5 +1,7 @@
 package com.lukasabbe.bookshelfinspector;
 
+import com.lukasabbe.bookshelfinspector.config.ClothConfigGenerator;
+import com.lukasabbe.bookshelfinspector.util.EventHandler;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.ModLoadingContext;
diff --git a/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/ClothConfigGenerator.java b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/config/ClothConfigGenerator.java
similarity index 94%
rename from neoforge/src/main/java/com/lukasabbe/bookshelfinspector/ClothConfigGenerator.java
rename to neoforge/src/main/java/com/lukasabbe/bookshelfinspector/config/ClothConfigGenerator.java
index 0ca2df2..2b80e9d 100644
--- a/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/ClothConfigGenerator.java
+++ b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/config/ClothConfigGenerator.java
@@ -1,5 +1,6 @@
-package com.lukasabbe.bookshelfinspector;
+package com.lukasabbe.bookshelfinspector.config;
 
+import com.lukasabbe.bookshelfinspector.BookshelfInspectorClient;
 import me.shedaniel.clothconfig2.api.ConfigBuilder;
 import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
 import net.minecraft.client.gui.screens.Screen;
diff --git a/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/platform/NeoForgeEventHelper.java b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/platform/NeoForgeEventHelper.java
index 3bd0cc9..395e7ca 100644
--- a/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/platform/NeoForgeEventHelper.java
+++ b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/platform/NeoForgeEventHelper.java
@@ -1,6 +1,6 @@
 package com.lukasabbe.bookshelfinspector.platform;
 
-import com.lukasabbe.bookshelfinspector.EventHandler;
+import com.lukasabbe.bookshelfinspector.util.EventHandler;
 import com.lukasabbe.bookshelfinspector.platform.handlers.OnPlayerDisconnectEvent;
 import com.lukasabbe.bookshelfinspector.platform.handlers.OnPlayerJoinEvent;
 import com.lukasabbe.bookshelfinspector.platform.services.IEventHelper;
@@ -12,7 +12,5 @@ public class NeoForgeEventHelper implements IEventHelper {
     }
 
     @Override
-    public void registerOnPlayerDisconnect(OnPlayerDisconnectEvent event) {
-        EventHandler.playerDisconnectEvents.add(event);
-    }
+    public void registerOnPlayerDisconnect(OnPlayerDisconnectEvent event) { EventHandler.playerDisconnectEvents.add(event); }
 }
diff --git a/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/EventHandler.java b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/util/EventHandler.java
similarity index 88%
rename from neoforge/src/main/java/com/lukasabbe/bookshelfinspector/EventHandler.java
rename to neoforge/src/main/java/com/lukasabbe/bookshelfinspector/util/EventHandler.java
index a8da5dd..91605b8 100644
--- a/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/EventHandler.java
+++ b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/util/EventHandler.java
@@ -1,4 +1,4 @@
-package com.lukasabbe.bookshelfinspector;
+package com.lukasabbe.bookshelfinspector.util;
 
 import com.lukasabbe.bookshelfinspector.platform.handlers.OnPlayerDisconnectEvent;
 import com.lukasabbe.bookshelfinspector.platform.handlers.OnPlayerJoinEvent;
@@ -17,9 +17,7 @@ public class EventHandler {
     public static void initClient(){
         NeoForge.EVENT_BUS.addListener(EventHandler::onDisconnect);
     }
-    public static void initServer(){
-        NeoForge.EVENT_BUS.addListener(EventHandler::onJoin);
-    }
+    public static void initServer(){ NeoForge.EVENT_BUS.addListener(EventHandler::onJoin); }
 
     private static void onJoin(PlayerEvent.PlayerLoggedInEvent event){
         playerJoinEvents.forEach(onPlayerJoinEvent -> onPlayerJoinEvent.onPlayerJoin((ServerPlayer) event.getEntity(),event.getEntity().getServer()));
diff --git a/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/NetworkHandler.java b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/util/NetworkHandler.java
similarity index 88%
rename from neoforge/src/main/java/com/lukasabbe/bookshelfinspector/NetworkHandler.java
rename to neoforge/src/main/java/com/lukasabbe/bookshelfinspector/util/NetworkHandler.java
index 49458c2..f7462fb 100644
--- a/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/NetworkHandler.java
+++ b/neoforge/src/main/java/com/lukasabbe/bookshelfinspector/util/NetworkHandler.java
@@ -1,5 +1,7 @@
-package com.lukasabbe.bookshelfinspector;
+package com.lukasabbe.bookshelfinspector.util;
 
+import com.lukasabbe.bookshelfinspector.BookshelfInspector;
+import com.lukasabbe.bookshelfinspector.Constants;
 import com.lukasabbe.bookshelfinspector.network.packets.BookShelfInventoryPayload;
 import com.lukasabbe.bookshelfinspector.network.packets.BookShelfInventoryRequestPayload;
 import com.lukasabbe.bookshelfinspector.network.packets.LecternInventoryRequestPayload;
@@ -7,7 +9,6 @@ import com.lukasabbe.bookshelfinspector.network.packets.ModCheckPayload;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.server.level.ServerPlayer;
 import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.neoforge.network.event.RegisterConfigurationTasksEvent;
 import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
 import net.neoforged.neoforge.network.registration.PayloadRegistrar;
 
@@ -15,7 +16,7 @@ public class NetworkHandler {
 
     @SubscribeEvent
     public static void registerPayloads(final RegisterPayloadHandlersEvent event){
-        final PayloadRegistrar registrar = event.registrar("bookshelfinspector").optional();
+        final PayloadRegistrar registrar = event.registrar(Constants.MOD_ID).optional();
         registrar.playToClient(
                 BookShelfInventoryPayload.ID,
                 BookShelfInventoryPayload.CODEC,
diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
index 86a7eec..dac2060 100644
--- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml
+++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -10,4 +10,16 @@ credits="${credits}" #optional
 authors = "${mod_author}" #optional
 description = '''${description}''' #mandatory (Supports multiline text)
 [[mixins]]
-config = "${mod_id}.mixins.json"
\ No newline at end of file
+config = "${mod_id}.mixins.json"
+[[dependencies.${mod_id}]] #optional
+modId = "neoforge" #mandatory
+type = "required" #mandatory (Can be one of "required", "optional", "incompatible" or "discouraged")
+versionRange = "[${neoforge_version},)" #mandatory
+ordering = "NONE" # The order that this dependency should load in relation to your mod, required to be either 'BEFORE' or 'AFTER' if the dependency is not mandatory
+side = "BOTH" # Side this dependency is applied on - 'BOTH', 'CLIENT' or 'SERVER'
+[[dependencies.${mod_id}]]
+modId = "minecraft"
+type="required" #mandatory (Can be one of "required", "optional", "incompatible" or "discouraged")
+versionRange = "${minecraft_version_range}"
+ordering = "NONE"
+side = "BOTH"
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index a46a64d..f050bfa 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -8,21 +8,6 @@ pluginManagement {
             url = uri('https://maven.fabricmc.net')
         }
 
-        /*
-        exclusiveContent {
-            forRepository {
-                maven {
-                    name = 'Fabric'
-                    url = uri('https://maven.fabricmc.net')
-                }
-            }
-            filter {
-                includeGroup('net.fabricmc')
-                includeGroup('fabric-loom')
-            }
-        }*/
-
-
         exclusiveContent {
             forRepository {
                 maven {
@@ -56,6 +41,4 @@ plugins {
 rootProject.name = 'BookshelfInspectorMultiloader'
 include('common')
 include('fabric')
-include('neoforge')
-
-// include 'spigot'
\ No newline at end of file
+include('neoforge')
\ No newline at end of file