diff --git a/src/main/java/dev/micle/loginprotection/events/OnClientInputEventHandler.java b/src/main/java/dev/micle/loginprotection/events/client/OnClientInputEventHandler.java
old mode 100755
new mode 100644
similarity index 99%
rename from src/main/java/dev/micle/loginprotection/events/OnClientInputEventHandler.java
rename to src/main/java/dev/micle/loginprotection/events/client/OnClientInputEventHandler.java
index 34b5135..013a3d8
--- a/src/main/java/dev/micle/loginprotection/events/OnClientInputEventHandler.java
+++ b/src/main/java/dev/micle/loginprotection/events/client/OnClientInputEventHandler.java
@@ -1,4 +1,4 @@
-package dev.micle.loginprotection.events;
+package dev.micle.loginprotection.events.client;
 
 import dev.micle.loginprotection.LoginProtection;
 import dev.micle.loginprotection.data.ProtectedPlayer;
diff --git a/src/main/java/dev/micle/loginprotection/events/OnLivingSetAttackTargetEventHandler.java b/src/main/java/dev/micle/loginprotection/events/common/OnLivingSetAttackTargetEventHandler.java
similarity index 96%
rename from src/main/java/dev/micle/loginprotection/events/OnLivingSetAttackTargetEventHandler.java
rename to src/main/java/dev/micle/loginprotection/events/common/OnLivingSetAttackTargetEventHandler.java
index 23ed74f..8665116 100644
--- a/src/main/java/dev/micle/loginprotection/events/OnLivingSetAttackTargetEventHandler.java
+++ b/src/main/java/dev/micle/loginprotection/events/common/OnLivingSetAttackTargetEventHandler.java
@@ -1,4 +1,4 @@
-package dev.micle.loginprotection.events;
+package dev.micle.loginprotection.events.common;
 
 import dev.micle.loginprotection.data.ProtectedPlayer;
 import dev.micle.loginprotection.data.ProtectedPlayerManager;
diff --git a/src/main/java/dev/micle/loginprotection/events/OnPlayerDamageEventHandler.java b/src/main/java/dev/micle/loginprotection/events/common/OnPlayerDamageEventHandler.java
old mode 100755
new mode 100644
similarity index 94%
rename from src/main/java/dev/micle/loginprotection/events/OnPlayerDamageEventHandler.java
rename to src/main/java/dev/micle/loginprotection/events/common/OnPlayerDamageEventHandler.java
index ea882df..909a06f
--- a/src/main/java/dev/micle/loginprotection/events/OnPlayerDamageEventHandler.java
+++ b/src/main/java/dev/micle/loginprotection/events/common/OnPlayerDamageEventHandler.java
@@ -1,4 +1,4 @@
-package dev.micle.loginprotection.events;
+package dev.micle.loginprotection.events.common;
 
 import dev.micle.loginprotection.data.ProtectedPlayer;
 import dev.micle.loginprotection.data.ProtectedPlayerManager;
diff --git a/src/main/java/dev/micle/loginprotection/events/OnPlayerJoinEventHandler.java b/src/main/java/dev/micle/loginprotection/events/common/OnPlayerJoinEventHandler.java
old mode 100755
new mode 100644
similarity index 91%
rename from src/main/java/dev/micle/loginprotection/events/OnPlayerJoinEventHandler.java
rename to src/main/java/dev/micle/loginprotection/events/common/OnPlayerJoinEventHandler.java
index 6ef6f73..80a27fa
--- a/src/main/java/dev/micle/loginprotection/events/OnPlayerJoinEventHandler.java
+++ b/src/main/java/dev/micle/loginprotection/events/common/OnPlayerJoinEventHandler.java
@@ -1,4 +1,4 @@
-package dev.micle.loginprotection.events;
+package dev.micle.loginprotection.events.common;
 
 import dev.micle.loginprotection.data.ProtectedPlayerManager;
 import net.minecraft.world.entity.player.Player;
diff --git a/src/main/java/dev/micle/loginprotection/events/OnPlayerLeaveEventHandler.java b/src/main/java/dev/micle/loginprotection/events/common/OnPlayerLeaveEventHandler.java
old mode 100755
new mode 100644
similarity index 91%
rename from src/main/java/dev/micle/loginprotection/events/OnPlayerLeaveEventHandler.java
rename to src/main/java/dev/micle/loginprotection/events/common/OnPlayerLeaveEventHandler.java
index 65d8c69..7626d41
--- a/src/main/java/dev/micle/loginprotection/events/OnPlayerLeaveEventHandler.java
+++ b/src/main/java/dev/micle/loginprotection/events/common/OnPlayerLeaveEventHandler.java
@@ -1,4 +1,4 @@
-package dev.micle.loginprotection.events;
+package dev.micle.loginprotection.events.common;
 
 import dev.micle.loginprotection.data.ProtectedPlayerManager;
 import net.minecraft.world.entity.player.Player;
diff --git a/src/main/java/dev/micle/loginprotection/network/server/RequestLastInputTickPacket.java b/src/main/java/dev/micle/loginprotection/network/server/RequestLastInputTickPacket.java
index b1cc6c8..c8c0802 100644
--- a/src/main/java/dev/micle/loginprotection/network/server/RequestLastInputTickPacket.java
+++ b/src/main/java/dev/micle/loginprotection/network/server/RequestLastInputTickPacket.java
@@ -1,6 +1,6 @@
 package dev.micle.loginprotection.network.server;
 
-import dev.micle.loginprotection.events.OnClientInputEventHandler;
+import dev.micle.loginprotection.events.client.OnClientInputEventHandler;
 import dev.micle.loginprotection.network.NetworkManager;
 import dev.micle.loginprotection.network.client.LastInputTickPacket;
 import net.minecraft.network.FriendlyByteBuf;
diff --git a/src/main/java/dev/micle/loginprotection/proxy/Proxy.java b/src/main/java/dev/micle/loginprotection/proxy/Proxy.java
index fd9a743..d1d0440 100644
--- a/src/main/java/dev/micle/loginprotection/proxy/Proxy.java
+++ b/src/main/java/dev/micle/loginprotection/proxy/Proxy.java
@@ -3,7 +3,11 @@ package dev.micle.loginprotection.proxy;
 import dev.micle.loginprotection.LoginProtection;
 import dev.micle.loginprotection.data.ProtectedPlayer;
 import dev.micle.loginprotection.data.ProtectedPlayerManager;
-import dev.micle.loginprotection.events.*;
+import dev.micle.loginprotection.events.client.OnClientInputEventHandler;
+import dev.micle.loginprotection.events.common.OnLivingSetAttackTargetEventHandler;
+import dev.micle.loginprotection.events.common.OnPlayerDamageEventHandler;
+import dev.micle.loginprotection.events.common.OnPlayerJoinEventHandler;
+import dev.micle.loginprotection.events.common.OnPlayerLeaveEventHandler;
 import dev.micle.loginprotection.network.NetworkManager;
 import dev.micle.loginprotection.setup.Config;
 import net.minecraft.client.Minecraft;