diff --git a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelChangeEvent.java b/src/main/java/com/gmail/nossr50/events/experience/levels/McMMOPlayerLevelChangeEvent.java
similarity index 72%
rename from src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelChangeEvent.java
rename to src/main/java/com/gmail/nossr50/events/experience/levels/McMMOPlayerLevelChangeEvent.java
index 385dd95a1..79eecf4bd 100644
--- a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelChangeEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/experience/levels/McMMOPlayerLevelChangeEvent.java
@@ -1,8 +1,9 @@
-package com.gmail.nossr50.events.experience;
+package com.gmail.nossr50.events.experience.levels;
 
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.events.experience.McMMOPlayerExperienceEvent;
 
 /**
  * Called when a user levels change
diff --git a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelDownEvent.java b/src/main/java/com/gmail/nossr50/events/experience/levels/McMMOPlayerLevelDownEvent.java
similarity index 94%
rename from src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelDownEvent.java
rename to src/main/java/com/gmail/nossr50/events/experience/levels/McMMOPlayerLevelDownEvent.java
index 3f5198954..ea905774c 100644
--- a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelDownEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/experience/levels/McMMOPlayerLevelDownEvent.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.events.experience;
+package com.gmail.nossr50.events.experience.levels;
 
 import org.bukkit.entity.Player;
 
diff --git a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java b/src/main/java/com/gmail/nossr50/events/experience/levels/McMMOPlayerLevelUpEvent.java
similarity index 94%
rename from src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java
rename to src/main/java/com/gmail/nossr50/events/experience/levels/McMMOPlayerLevelUpEvent.java
index 2e3deb1d6..465c2934c 100644
--- a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/experience/levels/McMMOPlayerLevelUpEvent.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.events.experience;
+package com.gmail.nossr50.events.experience.levels;
 
 import org.bukkit.entity.Player;
 
diff --git a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpChangeEvent.java b/src/main/java/com/gmail/nossr50/events/experience/xp/McMMOPlayerXpChangeEvent.java
similarity index 70%
rename from src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpChangeEvent.java
rename to src/main/java/com/gmail/nossr50/events/experience/xp/McMMOPlayerXpChangeEvent.java
index f01c495e0..5c91aeb5d 100644
--- a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpChangeEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/experience/xp/McMMOPlayerXpChangeEvent.java
@@ -1,8 +1,9 @@
-package com.gmail.nossr50.events.experience;
+package com.gmail.nossr50.events.experience.xp;
 
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.events.experience.McMMOPlayerExperienceEvent;
 
 public abstract class McMMOPlayerXpChangeEvent extends McMMOPlayerExperienceEvent {
     public McMMOPlayerXpChangeEvent(Player player, SkillType skill) {
diff --git a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java b/src/main/java/com/gmail/nossr50/events/experience/xp/McMMOPlayerXpGainEvent.java
similarity index 95%
rename from src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java
rename to src/main/java/com/gmail/nossr50/events/experience/xp/McMMOPlayerXpGainEvent.java
index 58db0f271..1d268af23 100644
--- a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/experience/xp/McMMOPlayerXpGainEvent.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.events.experience;
+package com.gmail.nossr50.events.experience.xp;
 
 import org.bukkit.entity.Player;
 
diff --git a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpLossEvent.java b/src/main/java/com/gmail/nossr50/events/experience/xp/McMMOPlayerXpLossEvent.java
similarity index 92%
rename from src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpLossEvent.java
rename to src/main/java/com/gmail/nossr50/events/experience/xp/McMMOPlayerXpLossEvent.java
index 3b6d3668b..a55b5f285 100644
--- a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpLossEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/experience/xp/McMMOPlayerXpLossEvent.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.events.experience;
+package com.gmail.nossr50.events.experience.xp;
 
 import org.bukkit.entity.Player;
 
diff --git a/src/main/java/com/gmail/nossr50/listeners/SelfListener.java b/src/main/java/com/gmail/nossr50/listeners/SelfListener.java
index 52d51751d..c7c0b2efe 100644
--- a/src/main/java/com/gmail/nossr50/listeners/SelfListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/SelfListener.java
@@ -5,7 +5,7 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent;
+import com.gmail.nossr50.events.experience.levels.McMMOPlayerLevelUpEvent;
 
 public class SelfListener implements Listener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
diff --git a/src/main/java/com/gmail/nossr50/util/EventUtils.java b/src/main/java/com/gmail/nossr50/util/EventUtils.java
index e3bdbf49d..b6d0e030c 100644
--- a/src/main/java/com/gmail/nossr50/util/EventUtils.java
+++ b/src/main/java/com/gmail/nossr50/util/EventUtils.java
@@ -15,12 +15,12 @@ import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.AbilityType;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.events.experience.McMMOPlayerLevelChangeEvent;
-import com.gmail.nossr50.events.experience.McMMOPlayerLevelDownEvent;
-import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent;
-import com.gmail.nossr50.events.experience.McMMOPlayerXpChangeEvent;
-import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent;
-import com.gmail.nossr50.events.experience.McMMOPlayerXpLossEvent;
+import com.gmail.nossr50.events.experience.levels.McMMOPlayerLevelChangeEvent;
+import com.gmail.nossr50.events.experience.levels.McMMOPlayerLevelDownEvent;
+import com.gmail.nossr50.events.experience.levels.McMMOPlayerLevelUpEvent;
+import com.gmail.nossr50.events.experience.xp.McMMOPlayerXpChangeEvent;
+import com.gmail.nossr50.events.experience.xp.McMMOPlayerXpGainEvent;
+import com.gmail.nossr50.events.experience.xp.McMMOPlayerXpLossEvent;
 import com.gmail.nossr50.events.fake.FakeBlockBreakEvent;
 import com.gmail.nossr50.events.fake.FakeBlockDamageEvent;
 import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;