diff --git a/entrypoint/fabric/src/main/java/band/kessoku/lib/entrypoint/KessokuEntrypointFabric.java b/entrypoint/fabric/src/main/java/band/kessoku/lib/entrypoint/KessokuEntrypointFabric.java
index 6ca92bdd..65ac9c02 100644
--- a/entrypoint/fabric/src/main/java/band/kessoku/lib/entrypoint/KessokuEntrypointFabric.java
+++ b/entrypoint/fabric/src/main/java/band/kessoku/lib/entrypoint/KessokuEntrypointFabric.java
@@ -27,22 +27,18 @@
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint;
 
-public class KessokuEntrypointFabric implements ModInitializer, ClientModInitializer, DedicatedServerModInitializer, PreLaunchEntrypoint {
-
+public final class KessokuEntrypointFabric implements ModInitializer, ClientModInitializer, DedicatedServerModInitializer, PreLaunchEntrypoint {
     @Override
     public void onInitialize() {
         ModUtils.getLogger().info(KessokuEntrypoint.MARKER, "KessokuLib-Entrypoint is loaded!");
-        FabricLoader.getInstance().invokeEntrypoints("kMain", KessokuModInitializer.class, KessokuModInitializer::onInitialize);
     }
 
     @Override
     public void onInitializeClient() {
-        FabricLoader.getInstance().invokeEntrypoints("kClient", KessokuClientModInitializer.class, KessokuClientModInitializer::onInitializeClient);
     }
 
     @Override
     public void onInitializeServer() {
-        FabricLoader.getInstance().invokeEntrypoints("kServer", KessokuDedicatedServerModInitializer.class, KessokuDedicatedServerModInitializer::onInitializeServer);
     }
 
     @Override
diff --git a/entrypoint/neo/src/main/java/band/kessoku/lib/entrypoint/KessokuEntrypointEntrypoint.java b/entrypoint/neo/src/main/java/band/kessoku/lib/entrypoint/KessokuEntrypointNeoforge.java
similarity index 89%
rename from entrypoint/neo/src/main/java/band/kessoku/lib/entrypoint/KessokuEntrypointEntrypoint.java
rename to entrypoint/neo/src/main/java/band/kessoku/lib/entrypoint/KessokuEntrypointNeoforge.java
index c18f0544..486fbcdf 100644
--- a/entrypoint/neo/src/main/java/band/kessoku/lib/entrypoint/KessokuEntrypointEntrypoint.java
+++ b/entrypoint/neo/src/main/java/band/kessoku/lib/entrypoint/KessokuEntrypointNeoforge.java
@@ -19,8 +19,8 @@
 import net.neoforged.fml.common.Mod;
 
 @Mod(KessokuEntrypoint.MOD_ID)
-public final class KessokuEntrypointEntrypoint {
-    public KessokuEntrypointEntrypoint(Dist dist) {
+public final class KessokuEntrypointNeoforge {
+    public KessokuEntrypointNeoforge() {
     }
 
     public static void init() {
diff --git a/entrypoint/neo/src/main/java/band/kessoku/lib/entrypoint/mixin/FMLLoaderMixin.java b/entrypoint/neo/src/main/java/band/kessoku/lib/entrypoint/mixin/neo/FMLLoaderMixin.java
similarity index 83%
rename from entrypoint/neo/src/main/java/band/kessoku/lib/entrypoint/mixin/FMLLoaderMixin.java
rename to entrypoint/neo/src/main/java/band/kessoku/lib/entrypoint/mixin/neo/FMLLoaderMixin.java
index a928507d..bbcbe757 100644
--- a/entrypoint/neo/src/main/java/band/kessoku/lib/entrypoint/mixin/FMLLoaderMixin.java
+++ b/entrypoint/neo/src/main/java/band/kessoku/lib/entrypoint/mixin/neo/FMLLoaderMixin.java
@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package band.kessoku.lib.entrypoint.mixin;
+package band.kessoku.lib.entrypoint.mixin.neo;
 
-import band.kessoku.lib.entrypoint.KessokuEntrypoint;
-import band.kessoku.lib.entrypoint.KessokuEntrypointEntrypoint;
+import band.kessoku.lib.entrypoint.KessokuEntrypointNeoforge;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -28,6 +27,6 @@
 public class FMLLoaderMixin {
     @Inject(method = "beforeStart", at = @At("HEAD"))
     private static void preLaunch(ModuleLayer gameLayer, CallbackInfo ci) {
-        KessokuEntrypointEntrypoint.init();
+        KessokuEntrypointNeoforge.init();
     }
 }
diff --git a/entrypoint/neo/src/main/resources/kessoku_entrypoint.mixins.json b/entrypoint/neo/src/main/resources/kessoku_entrypoint.mixins.json
index a6d688b0..3cd49adf 100644
--- a/entrypoint/neo/src/main/resources/kessoku_entrypoint.mixins.json
+++ b/entrypoint/neo/src/main/resources/kessoku_entrypoint.mixins.json
@@ -1,6 +1,6 @@
 {
   "required": true,
-  "package": "band.kessoku.lib.entrypoint.mixin",
+  "package": "band.kessoku.lib.entrypoint.mixin.neo",
   "compatibilityLevel": "JAVA_21",
   "mixins": [
     "FMLLoaderMixin"