diff --git a/Changelog.txt b/Changelog.txt
index b228fcae3..f29e348be 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -15,7 +15,7 @@ Version 1.3.04-dev
  = Fixed Green Terra & Super Breaker awarding 4x drops at high levels.
  = Fixed summoned ocelots never changing skins.
  ! Changed MySQL to reload all player information on reconnection
- ! Move "fake" events to their own package - be sure to update these if you're using the API in your plugin
+ ! Changed event package structure - be sure to update these if you're using the API in your plugin
  
 Version 1.3.03
  + Added Ocelots to Taming XP tables
diff --git a/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java b/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java
index fc6f2d22c..9b8376ae7 100644
--- a/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java
@@ -12,7 +12,7 @@ import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.events.McMMOPlayerXpGainEvent;
+import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent;
 import com.gmail.nossr50.party.Party;
 import com.gmail.nossr50.Users;
 import com.gmail.nossr50.m;
diff --git a/src/main/java/com/gmail/nossr50/events/McMMOPlayerExperienceEvent.java b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java
similarity index 91%
rename from src/main/java/com/gmail/nossr50/events/McMMOPlayerExperienceEvent.java
rename to src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java
index d1672cbbf..fd594277b 100644
--- a/src/main/java/com/gmail/nossr50/events/McMMOPlayerExperienceEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.events;
+package com.gmail.nossr50.events.experience;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
diff --git a/src/main/java/com/gmail/nossr50/events/McMMOPlayerLevelUpEvent.java b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java
similarity index 92%
rename from src/main/java/com/gmail/nossr50/events/McMMOPlayerLevelUpEvent.java
rename to src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java
index 3c6fbc808..6c5dd19fc 100644
--- a/src/main/java/com/gmail/nossr50/events/McMMOPlayerLevelUpEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.events;
+package com.gmail.nossr50.events.experience;
 
 import org.bukkit.entity.Player;
 
diff --git a/src/main/java/com/gmail/nossr50/events/McMMOPlayerXpGainEvent.java b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java
similarity index 90%
rename from src/main/java/com/gmail/nossr50/events/McMMOPlayerXpGainEvent.java
rename to src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java
index ef0b30fc6..5c4e4745b 100644
--- a/src/main/java/com/gmail/nossr50/events/McMMOPlayerXpGainEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.events;
+package com.gmail.nossr50.events.experience;
 
 import org.bukkit.entity.Player;
 
diff --git a/src/main/java/com/gmail/nossr50/events/McMMOItemSpawnEvent.java b/src/main/java/com/gmail/nossr50/events/items/McMMOItemSpawnEvent.java
similarity index 97%
rename from src/main/java/com/gmail/nossr50/events/McMMOItemSpawnEvent.java
rename to src/main/java/com/gmail/nossr50/events/items/McMMOItemSpawnEvent.java
index c2b8cf84e..b3ed0d40d 100644
--- a/src/main/java/com/gmail/nossr50/events/McMMOItemSpawnEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/items/McMMOItemSpawnEvent.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.events;
+package com.gmail.nossr50.events.items;
 
 import org.bukkit.Location;
 import org.bukkit.event.Cancellable;
diff --git a/src/main/java/com/gmail/nossr50/events/McMMOPlayerRepairCheckEvent.java b/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerRepairCheckEvent.java
similarity index 93%
rename from src/main/java/com/gmail/nossr50/events/McMMOPlayerRepairCheckEvent.java
rename to src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerRepairCheckEvent.java
index d9084874b..18bcc3f07 100644
--- a/src/main/java/com/gmail/nossr50/events/McMMOPlayerRepairCheckEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerRepairCheckEvent.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.events;
+package com.gmail.nossr50.events.skills;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
diff --git a/src/main/java/com/gmail/nossr50/events/McMMOPlayerRepairEvent.java b/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerRepairEvent.java
similarity index 89%
rename from src/main/java/com/gmail/nossr50/events/McMMOPlayerRepairEvent.java
rename to src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerRepairEvent.java
index c97367469..283f83cc4 100644
--- a/src/main/java/com/gmail/nossr50/events/McMMOPlayerRepairEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerRepairEvent.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.events;
+package com.gmail.nossr50.events.skills;
 
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
diff --git a/src/main/java/com/gmail/nossr50/events/McMMOPlayerSkillEvent.java b/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java
similarity index 91%
rename from src/main/java/com/gmail/nossr50/events/McMMOPlayerSkillEvent.java
rename to src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java
index c56e38d50..8415f5fb0 100644
--- a/src/main/java/com/gmail/nossr50/events/McMMOPlayerSkillEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.events;
+package com.gmail.nossr50.events.skills;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
diff --git a/src/main/java/com/gmail/nossr50/listeners/mcSelfListener.java b/src/main/java/com/gmail/nossr50/listeners/mcSelfListener.java
index c2e951bfd..74939c8fe 100644
--- a/src/main/java/com/gmail/nossr50/listeners/mcSelfListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/mcSelfListener.java
@@ -3,7 +3,7 @@ package com.gmail.nossr50.listeners;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
-import com.gmail.nossr50.events.McMMOPlayerXpGainEvent;
+import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent;
 
 /**
  * Listener for listening to our own events, only really useful for catching errors
diff --git a/src/main/java/com/gmail/nossr50/m.java b/src/main/java/com/gmail/nossr50/m.java
index f5138daa5..d18f43c6e 100644
--- a/src/main/java/com/gmail/nossr50/m.java
+++ b/src/main/java/com/gmail/nossr50/m.java
@@ -13,9 +13,9 @@ import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.events.McMMOItemSpawnEvent;
 import com.gmail.nossr50.events.fake.FakeBlockBreakEvent;
 import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;
+import com.gmail.nossr50.events.items.McMMOItemSpawnEvent;
 
 public class m {
 
diff --git a/src/main/java/com/gmail/nossr50/skills/Repair.java b/src/main/java/com/gmail/nossr50/skills/Repair.java
index b4ef28f3e..bfba679fc 100644
--- a/src/main/java/com/gmail/nossr50/skills/Repair.java
+++ b/src/main/java/com/gmail/nossr50/skills/Repair.java
@@ -22,8 +22,8 @@ import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.spout.SpoutSounds;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.events.McMMOPlayerRepairCheckEvent;
-import com.gmail.nossr50.events.McMMOPlayerRepairEvent;
+import com.gmail.nossr50.events.skills.McMMOPlayerRepairCheckEvent;
+import com.gmail.nossr50.events.skills.McMMOPlayerRepairEvent;
 import com.gmail.nossr50.locale.mcLocale;
 
 public class Repair {
diff --git a/src/main/java/com/gmail/nossr50/skills/Skills.java b/src/main/java/com/gmail/nossr50/skills/Skills.java
index 4287b05fe..57c25ed18 100644
--- a/src/main/java/com/gmail/nossr50/skills/Skills.java
+++ b/src/main/java/com/gmail/nossr50/skills/Skills.java
@@ -20,7 +20,7 @@ import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.PlayerStat;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.datatypes.ToolType;
-import com.gmail.nossr50.events.McMMOPlayerLevelUpEvent;
+import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent;
 import com.gmail.nossr50.locale.mcLocale;
 
 public class Skills {