diff --git a/api/src/main/java/com/alttd/essentia/api/events/PlayerRemoveHomeEvent.java b/api/src/main/java/com/alttd/essentia/api/events/player/PlayerRemoveHomeEvent.java
similarity index 88%
rename from api/src/main/java/com/alttd/essentia/api/events/PlayerRemoveHomeEvent.java
rename to api/src/main/java/com/alttd/essentia/api/events/player/PlayerRemoveHomeEvent.java
index b8ca66a..6132477 100644
--- a/api/src/main/java/com/alttd/essentia/api/events/PlayerRemoveHomeEvent.java
+++ b/api/src/main/java/com/alttd/essentia/api/events/player/PlayerRemoveHomeEvent.java
@@ -1,5 +1,6 @@
-package com.alttd.essentia.api.events;
+package com.alttd.essentia.api.events.player;
 
+import com.alttd.essentia.api.events.EssentiaEvent;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
diff --git a/api/src/main/java/com/alttd/essentia/api/events/PlayerSetHomeEvent.java b/api/src/main/java/com/alttd/essentia/api/events/player/PlayerSetHomeEvent.java
similarity index 90%
rename from api/src/main/java/com/alttd/essentia/api/events/PlayerSetHomeEvent.java
rename to api/src/main/java/com/alttd/essentia/api/events/player/PlayerSetHomeEvent.java
index 2d8723c..c05d475 100644
--- a/api/src/main/java/com/alttd/essentia/api/events/PlayerSetHomeEvent.java
+++ b/api/src/main/java/com/alttd/essentia/api/events/player/PlayerSetHomeEvent.java
@@ -1,5 +1,6 @@
-package com.alttd.essentia.api.events;
+package com.alttd.essentia.api.events.player;
 
+import com.alttd.essentia.api.events.EssentiaEvent;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
diff --git a/api/src/main/java/com/alttd/essentia/api/events/PlayerTeleportBackEvent.java b/api/src/main/java/com/alttd/essentia/api/events/player/PlayerTeleportBackEvent.java
similarity index 89%
rename from api/src/main/java/com/alttd/essentia/api/events/PlayerTeleportBackEvent.java
rename to api/src/main/java/com/alttd/essentia/api/events/player/PlayerTeleportBackEvent.java
index 2a01cc4..32c7335 100644
--- a/api/src/main/java/com/alttd/essentia/api/events/PlayerTeleportBackEvent.java
+++ b/api/src/main/java/com/alttd/essentia/api/events/player/PlayerTeleportBackEvent.java
@@ -1,5 +1,6 @@
-package com.alttd.essentia.api.events;
+package com.alttd.essentia.api.events.player;
 
+import com.alttd.essentia.api.events.EssentiaEvent;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
diff --git a/api/src/main/java/com/alttd/essentia/api/events/PlayerTeleportHomeEvent.java b/api/src/main/java/com/alttd/essentia/api/events/player/PlayerTeleportHomeEvent.java
similarity index 90%
rename from api/src/main/java/com/alttd/essentia/api/events/PlayerTeleportHomeEvent.java
rename to api/src/main/java/com/alttd/essentia/api/events/player/PlayerTeleportHomeEvent.java
index 540b8be..aaf122b 100644
--- a/api/src/main/java/com/alttd/essentia/api/events/PlayerTeleportHomeEvent.java
+++ b/api/src/main/java/com/alttd/essentia/api/events/player/PlayerTeleportHomeEvent.java
@@ -1,5 +1,6 @@
-package com.alttd.essentia.api.events;
+package com.alttd.essentia.api.events.player;
 
+import com.alttd.essentia.api.events.EssentiaEvent;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
diff --git a/api/src/main/java/com/alttd/essentia/api/events/PlayerTeleportSpawnEvent.java b/api/src/main/java/com/alttd/essentia/api/events/player/PlayerTeleportSpawnEvent.java
similarity index 89%
rename from api/src/main/java/com/alttd/essentia/api/events/PlayerTeleportSpawnEvent.java
rename to api/src/main/java/com/alttd/essentia/api/events/player/PlayerTeleportSpawnEvent.java
index 1344641..f789bb7 100644
--- a/api/src/main/java/com/alttd/essentia/api/events/PlayerTeleportSpawnEvent.java
+++ b/api/src/main/java/com/alttd/essentia/api/events/player/PlayerTeleportSpawnEvent.java
@@ -1,5 +1,6 @@
-package com.alttd.essentia.api.events;
+package com.alttd.essentia.api.events.player;
 
+import com.alttd.essentia.api.events.EssentiaEvent;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;