diff --git a/src/test/java/net/minecraftforge/debug/PortalSpawnEventTest.java b/src/test/java/net/minecraftforge/debug/block/PortalSpawnEventTest.java
similarity index 97%
rename from src/test/java/net/minecraftforge/debug/PortalSpawnEventTest.java
rename to src/test/java/net/minecraftforge/debug/block/PortalSpawnEventTest.java
index 690ecb8265..09ff683756 100644
--- a/src/test/java/net/minecraftforge/debug/PortalSpawnEventTest.java
+++ b/src/test/java/net/minecraftforge/debug/block/PortalSpawnEventTest.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-package net.minecraftforge.debug;
+package net.minecraftforge.debug.block;
 
 import net.minecraft.init.Biomes;
 import net.minecraft.world.World;
diff --git a/src/test/java/net/minecraftforge/debug/LivingAttackEventTest.java b/src/test/java/net/minecraftforge/debug/entity/living/AttackEventTest.java
similarity index 89%
rename from src/test/java/net/minecraftforge/debug/LivingAttackEventTest.java
rename to src/test/java/net/minecraftforge/debug/entity/living/AttackEventTest.java
index 4a81b85e58..43092d0c1b 100644
--- a/src/test/java/net/minecraftforge/debug/LivingAttackEventTest.java
+++ b/src/test/java/net/minecraftforge/debug/entity/living/AttackEventTest.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-package net.minecraftforge.debug;
+package net.minecraftforge.debug.entity.living;
 
 import net.minecraft.util.DamageSource;
 import net.minecraftforge.event.entity.living.LivingAttackEvent;
@@ -28,8 +28,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-@Mod(modid = LivingAttackEventTest.MODID, name = LivingAttackEventTest.NAME, version = "1.0.0", acceptableRemoteVersions = "*")
-public class LivingAttackEventTest
+@Mod(modid = AttackEventTest.MODID, name = AttackEventTest.NAME, version = "1.0.0", acceptableRemoteVersions = "*")
+public class AttackEventTest
 {
 
     public static final String MODID = "livingattackeventtest";
@@ -49,4 +49,4 @@ public class LivingAttackEventTest
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/net/minecraftforge/debug/EntityMobGriefingEventTest.java b/src/test/java/net/minecraftforge/debug/entity/living/MobGriefingEventTest.java
similarity index 95%
rename from src/test/java/net/minecraftforge/debug/EntityMobGriefingEventTest.java
rename to src/test/java/net/minecraftforge/debug/entity/living/MobGriefingEventTest.java
index ac4396035b..cb31a5d439 100644
--- a/src/test/java/net/minecraftforge/debug/EntityMobGriefingEventTest.java
+++ b/src/test/java/net/minecraftforge/debug/entity/living/MobGriefingEventTest.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-package net.minecraftforge.debug;
+package net.minecraftforge.debug.entity.living;
 
 import net.minecraftforge.event.entity.EntityMobGriefingEvent;
 import net.minecraftforge.fml.common.Mod;
@@ -26,7 +26,7 @@ import net.minecraftforge.fml.common.eventhandler.Event.Result;
 
 @Mod(modid = "entitymobgriefingeventtest", name = "EntityMobGriefingEventTest", version = "1.0", acceptableRemoteVersions = "*")
 @Mod.EventBusSubscriber
-public class EntityMobGriefingEventTest
+public class MobGriefingEventTest
 {
     private static final boolean ENABLED = false;
 
diff --git a/src/test/java/net/minecraftforge/debug/FluidPlaceBlockTest.java b/src/test/java/net/minecraftforge/debug/fluid/FluidPlaceBlockEventTest.java
similarity index 94%
rename from src/test/java/net/minecraftforge/debug/FluidPlaceBlockTest.java
rename to src/test/java/net/minecraftforge/debug/fluid/FluidPlaceBlockEventTest.java
index 9f2274c22a..a8c66b6664 100644
--- a/src/test/java/net/minecraftforge/debug/FluidPlaceBlockTest.java
+++ b/src/test/java/net/minecraftforge/debug/fluid/FluidPlaceBlockEventTest.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-package net.minecraftforge.debug;
+package net.minecraftforge.debug.fluid;
 
 import net.minecraft.block.BlockStone;
 import net.minecraft.init.Blocks;
@@ -37,7 +37,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
  *  - Prevent lava from setting surrounding blocks on fire.
  */
 @Mod(modid = "fluidplaceblocktest", name = "FluidPlaceBlockTest", version = "0.0.0", acceptableRemoteVersions = "*")
-public class FluidPlaceBlockTest
+public class FluidPlaceBlockEventTest
 {
     private static final boolean ENABLED = false;
 
@@ -45,7 +45,7 @@ public class FluidPlaceBlockTest
     public void preinit(FMLPreInitializationEvent event)
     {
         if (!ENABLED) return;
-        MinecraftForge.EVENT_BUS.register(FluidPlaceBlockTest.class);
+        MinecraftForge.EVENT_BUS.register(FluidPlaceBlockEventTest.class);
     }
 
     @SubscribeEvent @SuppressWarnings("unused")
diff --git a/src/test/java/net/minecraftforge/debug/GiveItemToPlayerTest.java b/src/test/java/net/minecraftforge/debug/gameplay/GiveItemToPlayerTest.java
similarity index 98%
rename from src/test/java/net/minecraftforge/debug/GiveItemToPlayerTest.java
rename to src/test/java/net/minecraftforge/debug/gameplay/GiveItemToPlayerTest.java
index 0bf0c55c31..5c7e3baee0 100644
--- a/src/test/java/net/minecraftforge/debug/GiveItemToPlayerTest.java
+++ b/src/test/java/net/minecraftforge/debug/gameplay/GiveItemToPlayerTest.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-package net.minecraftforge.debug;
+package net.minecraftforge.debug.gameplay;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumActionResult;
diff --git a/src/test/java/net/minecraftforge/debug/TrackingTargetTest.java b/src/test/java/net/minecraftforge/debug/network/TrackingTargetTest.java
similarity index 99%
rename from src/test/java/net/minecraftforge/debug/TrackingTargetTest.java
rename to src/test/java/net/minecraftforge/debug/network/TrackingTargetTest.java
index df6105a641..6beed78510 100644
--- a/src/test/java/net/minecraftforge/debug/TrackingTargetTest.java
+++ b/src/test/java/net/minecraftforge/debug/network/TrackingTargetTest.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-package net.minecraftforge.debug;
+package net.minecraftforge.debug.network;
 
 import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.item.EntityItemFrame;
diff --git a/src/test/java/net/minecraftforge/debug/ChunkWatchWorldTest.java b/src/test/java/net/minecraftforge/debug/world/ChunkWatchEventTest.java
similarity index 88%
rename from src/test/java/net/minecraftforge/debug/ChunkWatchWorldTest.java
rename to src/test/java/net/minecraftforge/debug/world/ChunkWatchEventTest.java
index 66d4f6ecaf..8406556d63 100644
--- a/src/test/java/net/minecraftforge/debug/ChunkWatchWorldTest.java
+++ b/src/test/java/net/minecraftforge/debug/world/ChunkWatchEventTest.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-package net.minecraftforge.debug;
+package net.minecraftforge.debug.world;
 
 import org.apache.logging.log4j.Logger;
 
@@ -27,8 +27,8 @@ import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
-@Mod(modid = ChunkWatchWorldTest.MODID, name = "Chunk Watch World Test", version = "1.0", acceptableRemoteVersions = "*")
-public class ChunkWatchWorldTest
+@Mod(modid = ChunkWatchEventTest.MODID, name = "Chunk Watch Event Test", version = "1.0", acceptableRemoteVersions = "*")
+public class ChunkWatchEventTest
 {
     public static final String MODID = "chunkwatchworldtest";
 
@@ -42,7 +42,7 @@ public class ChunkWatchWorldTest
 
         if (ENABLED)
         {
-            MinecraftForge.EVENT_BUS.register(ChunkWatchWorldTest.class);
+            MinecraftForge.EVENT_BUS.register(ChunkWatchEventTest.class);
         }
     }
 
diff --git a/src/test/java/net/minecraftforge/debug/CanSleepAtTest.java b/src/test/java/net/minecraftforge/debug/world/WorldProviderCanSleepAtTest.java
similarity index 90%
rename from src/test/java/net/minecraftforge/debug/CanSleepAtTest.java
rename to src/test/java/net/minecraftforge/debug/world/WorldProviderCanSleepAtTest.java
index 83c4530b35..29fd9efcd9 100644
--- a/src/test/java/net/minecraftforge/debug/CanSleepAtTest.java
+++ b/src/test/java/net/minecraftforge/debug/world/WorldProviderCanSleepAtTest.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-package net.minecraftforge.debug;
+package net.minecraftforge.debug.world;
 
 import org.apache.logging.log4j.Logger;
 import net.minecraft.entity.player.EntityPlayer;
@@ -29,8 +29,8 @@ import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventHandler;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 
-@Mod(modid = CanSleepAtTest.MODID, name = "CanSleepAtTest", version = "0.0.0", acceptableRemoteVersions = "*")
-public class CanSleepAtTest
+@Mod(modid = WorldProviderCanSleepAtTest.MODID, name = "Can Sleep At Test", version = "0.0.0", acceptableRemoteVersions = "*")
+public class WorldProviderCanSleepAtTest
 {
     public static final String MODID = "can_sleep_at_test";
     public static final boolean ENABLED = false;
@@ -56,7 +56,7 @@ public class CanSleepAtTest
         @Override
         public DimensionType getDimensionType()
         {
-            return CanSleepAtTest.dimType;
+            return WorldProviderCanSleepAtTest.dimType;
         }
 
         @Override