diff --git a/src/main/java/com/comandante/creeper/spells/Effect.java b/src/main/java/com/comandante/creeper/Items/Effect.java
similarity index 98%
rename from src/main/java/com/comandante/creeper/spells/Effect.java
rename to src/main/java/com/comandante/creeper/Items/Effect.java
index fce40bdb488e3703e4f39db0209a1ebec04196d3..732f7d123189e8bb5acf002a859b8b4c624b559e 100644
--- a/src/main/java/com/comandante/creeper/spells/Effect.java
+++ b/src/main/java/com/comandante/creeper/Items/Effect.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.spells;
+package com.comandante.creeper.Items;
 
 
 import com.comandante.creeper.entity.CreeperEntity;
diff --git a/src/main/java/com/comandante/creeper/spells/EffectBuilder.java b/src/main/java/com/comandante/creeper/Items/EffectBuilder.java
similarity index 97%
rename from src/main/java/com/comandante/creeper/spells/EffectBuilder.java
rename to src/main/java/com/comandante/creeper/Items/EffectBuilder.java
index cf863b9653c7b1946f95517e2dafc1a9d17a3919..0a9c83f8d189a2553a1993ab8604ea89b2bc144d 100644
--- a/src/main/java/com/comandante/creeper/spells/EffectBuilder.java
+++ b/src/main/java/com/comandante/creeper/Items/EffectBuilder.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.spells;
+package com.comandante.creeper.Items;
 
 import com.comandante.creeper.stat.Stats;
 
diff --git a/src/main/java/com/comandante/creeper/spells/EffectSerializer.java b/src/main/java/com/comandante/creeper/Items/EffectSerializer.java
similarity index 89%
rename from src/main/java/com/comandante/creeper/spells/EffectSerializer.java
rename to src/main/java/com/comandante/creeper/Items/EffectSerializer.java
index 76f35028c9808cdbd330c0aa5eef92f4689f1965..fe5549a18129b642c026f045c4b10cb9383f7d6e 100644
--- a/src/main/java/com/comandante/creeper/spells/EffectSerializer.java
+++ b/src/main/java/com/comandante/creeper/Items/EffectSerializer.java
@@ -1,6 +1,5 @@
-package com.comandante.creeper.spells;
+package com.comandante.creeper.Items;
 
-import com.comandante.creeper.spells.Effect;
 import com.google.gson.GsonBuilder;
 import org.mapdb.Serializer;
 
diff --git a/src/main/java/com/comandante/creeper/spells/EffectsManager.java b/src/main/java/com/comandante/creeper/Items/EffectsManager.java
similarity index 99%
rename from src/main/java/com/comandante/creeper/spells/EffectsManager.java
rename to src/main/java/com/comandante/creeper/Items/EffectsManager.java
index a082ed6eb9b1ac06ee61693b6e923f41887ad45d..e8d6d0ae7dcf49cb081d22923116788938b48a41 100644
--- a/src/main/java/com/comandante/creeper/spells/EffectsManager.java
+++ b/src/main/java/com/comandante/creeper/Items/EffectsManager.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.spells;
+package com.comandante.creeper.Items;
 
 import com.comandante.creeper.managers.GameManager;
 import com.comandante.creeper.npc.Npc;
diff --git a/src/main/java/com/comandante/creeper/Items/Item.java b/src/main/java/com/comandante/creeper/Items/Item.java
index b326917ff59314aa40162eceda00417e6cca3f9e..13771c379770000b1500db2ab1e651931f3f1c3d 100644
--- a/src/main/java/com/comandante/creeper/Items/Item.java
+++ b/src/main/java/com/comandante/creeper/Items/Item.java
@@ -2,7 +2,6 @@ package com.comandante.creeper.Items;
 
 
 import com.comandante.creeper.player.Equipment;
-import com.comandante.creeper.spells.Effect;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/src/main/java/com/comandante/creeper/Items/ItemUseAction.java b/src/main/java/com/comandante/creeper/Items/ItemUseAction.java
index e30cb3254fd368808d8773407912e86c134271a8..e498e967642debd0b4a1fc291fa99745b0a86e55 100644
--- a/src/main/java/com/comandante/creeper/Items/ItemUseAction.java
+++ b/src/main/java/com/comandante/creeper/Items/ItemUseAction.java
@@ -2,7 +2,6 @@ package com.comandante.creeper.Items;
 
 import com.comandante.creeper.managers.GameManager;
 import com.comandante.creeper.player.Player;
-import com.comandante.creeper.spells.Effect;
 
 import java.util.Set;
 
diff --git a/src/main/java/com/comandante/creeper/Items/use/DefaultApplyStatsAction.java b/src/main/java/com/comandante/creeper/Items/use/DefaultApplyStatsAction.java
index c92eddea35486b4d67540f97899c3ff53dba0dbe..10602c9f474c5e85503989c529ec177124a40443 100644
--- a/src/main/java/com/comandante/creeper/Items/use/DefaultApplyStatsAction.java
+++ b/src/main/java/com/comandante/creeper/Items/use/DefaultApplyStatsAction.java
@@ -1,12 +1,8 @@
 package com.comandante.creeper.Items.use;
 
-import com.comandante.creeper.Items.Item;
-import com.comandante.creeper.Items.ItemType;
-import com.comandante.creeper.Items.ItemUseAction;
-import com.comandante.creeper.Items.ItemUseHandler;
+import com.comandante.creeper.Items.*;
 import com.comandante.creeper.managers.GameManager;
 import com.comandante.creeper.player.Player;
-import com.comandante.creeper.spells.Effect;
 import com.comandante.creeper.stat.Stats;
 import org.apache.log4j.Logger;
 
diff --git a/src/main/java/com/comandante/creeper/Items/use/DirtyBombUseAction.java b/src/main/java/com/comandante/creeper/Items/use/DirtyBombUseAction.java
index e291a97940ea3409f38e622db3818d341f986f83..5e874e7f1665fb67b31096be354f4213ed0d8857 100644
--- a/src/main/java/com/comandante/creeper/Items/use/DirtyBombUseAction.java
+++ b/src/main/java/com/comandante/creeper/Items/use/DirtyBombUseAction.java
@@ -1,15 +1,11 @@
 package com.comandante.creeper.Items.use;
 
-import com.comandante.creeper.Items.Item;
-import com.comandante.creeper.Items.ItemType;
-import com.comandante.creeper.Items.ItemUseAction;
-import com.comandante.creeper.Items.ItemUseHandler;
+import com.comandante.creeper.Items.*;
 import com.comandante.creeper.managers.GameManager;
 import com.comandante.creeper.npc.Npc;
 import com.comandante.creeper.npc.NpcStatsChangeBuilder;
 import com.comandante.creeper.player.Player;
 import com.comandante.creeper.server.Color;
-import com.comandante.creeper.spells.Effect;
 import com.comandante.creeper.stat.StatsBuilder;
 import com.comandante.creeper.world.Room;
 
diff --git a/src/main/java/com/comandante/creeper/Items/use/LightningSpellBookUseAction.java b/src/main/java/com/comandante/creeper/Items/use/LightningSpellBookUseAction.java
index 3a79ea933ec29aeaf48034259cd1fcb76b80b5c4..35d261c37e5fe69cbf41fda351431810f5a799d5 100644
--- a/src/main/java/com/comandante/creeper/Items/use/LightningSpellBookUseAction.java
+++ b/src/main/java/com/comandante/creeper/Items/use/LightningSpellBookUseAction.java
@@ -1,11 +1,11 @@
 package com.comandante.creeper.Items.use;
 
+import com.comandante.creeper.Items.Effect;
 import com.comandante.creeper.Items.Item;
 import com.comandante.creeper.Items.ItemType;
 import com.comandante.creeper.Items.ItemUseAction;
 import com.comandante.creeper.managers.GameManager;
 import com.comandante.creeper.player.Player;
-import com.comandante.creeper.spells.Effect;
 import com.comandante.creeper.spells.LightningSpellRunnable;
 
 import java.util.Set;
diff --git a/src/main/java/com/comandante/creeper/Items/use/ResetAllEffectsUseAction.java b/src/main/java/com/comandante/creeper/Items/use/ResetAllEffectsUseAction.java
index bae77982e6a219e0a298dd44c76033b94bc41876..7becf179e4169709d3baf6c1293ead467d94e582 100644
--- a/src/main/java/com/comandante/creeper/Items/use/ResetAllEffectsUseAction.java
+++ b/src/main/java/com/comandante/creeper/Items/use/ResetAllEffectsUseAction.java
@@ -1,12 +1,8 @@
 package com.comandante.creeper.Items.use;
 
-import com.comandante.creeper.Items.Item;
-import com.comandante.creeper.Items.ItemType;
-import com.comandante.creeper.Items.ItemUseAction;
-import com.comandante.creeper.Items.ItemUseHandler;
+import com.comandante.creeper.Items.*;
 import com.comandante.creeper.managers.GameManager;
 import com.comandante.creeper.player.Player;
-import com.comandante.creeper.spells.Effect;
 
 import java.util.Set;
 
diff --git a/src/main/java/com/comandante/creeper/command/MovementCommand.java b/src/main/java/com/comandante/creeper/command/MovementCommand.java
index b8c024cf44cfa9f253df5c11a790ce99e067b2be..be5e29371f142ff69c27136f50f2b9d59bc58948 100644
--- a/src/main/java/com/comandante/creeper/command/MovementCommand.java
+++ b/src/main/java/com/comandante/creeper/command/MovementCommand.java
@@ -1,9 +1,9 @@
 package com.comandante.creeper.command;
 
+import com.comandante.creeper.Items.Effect;
 import com.comandante.creeper.managers.GameManager;
 import com.comandante.creeper.player.CoolDownType;
 import com.comandante.creeper.player.PlayerMovement;
-import com.comandante.creeper.spells.Effect;
 import com.comandante.creeper.world.RemoteExit;
 import com.comandante.creeper.world.Room;
 import com.google.common.base.Optional;
diff --git a/src/main/java/com/comandante/creeper/command/admin/TeleportCommand.java b/src/main/java/com/comandante/creeper/command/admin/TeleportCommand.java
index a0ba7ce2784cdc177f23ddcb4119a18cf2cb3f2f..d394cef79cbd8fb9a432bd40e0dd82cfe1ba14e8 100644
--- a/src/main/java/com/comandante/creeper/command/admin/TeleportCommand.java
+++ b/src/main/java/com/comandante/creeper/command/admin/TeleportCommand.java
@@ -1,6 +1,7 @@
 package com.comandante.creeper.command.admin;
 
 
+import com.comandante.creeper.Items.Effect;
 import com.comandante.creeper.command.Command;
 import com.comandante.creeper.managers.GameManager;
 import com.comandante.creeper.player.CoolDownType;
@@ -8,7 +9,6 @@ import com.comandante.creeper.player.Player;
 import com.comandante.creeper.player.PlayerMovement;
 import com.comandante.creeper.player.PlayerRole;
 import com.comandante.creeper.server.Color;
-import com.comandante.creeper.spells.Effect;
 import com.comandante.creeper.world.Room;
 import com.google.common.collect.Sets;
 import org.jboss.netty.channel.ChannelHandlerContext;
diff --git a/src/main/java/com/comandante/creeper/entity/EntityManager.java b/src/main/java/com/comandante/creeper/entity/EntityManager.java
index ff637721337ad9bb7d048efab38e0b07b9496984..e4824c8c025cd5aa97097d756abc8fa8bcf47355 100644
--- a/src/main/java/com/comandante/creeper/entity/EntityManager.java
+++ b/src/main/java/com/comandante/creeper/entity/EntityManager.java
@@ -1,5 +1,6 @@
 package com.comandante.creeper.entity;
 
+import com.comandante.creeper.Items.Effect;
 import com.comandante.creeper.Items.EffectSerializer;
 import com.comandante.creeper.Items.Item;
 import com.comandante.creeper.Items.ItemSerializer;
@@ -8,7 +9,6 @@ import com.comandante.creeper.managers.SentryManager;
 import com.comandante.creeper.npc.Npc;
 import com.comandante.creeper.player.Player;
 import com.comandante.creeper.player.PlayerManager;
-import com.comandante.creeper.spells.Effect;
 import com.comandante.creeper.world.Room;
 import com.comandante.creeper.world.RoomManager;
 import org.apache.log4j.Logger;
diff --git a/src/main/java/com/comandante/creeper/managers/GameManager.java b/src/main/java/com/comandante/creeper/managers/GameManager.java
index 4dafb97e2c2abe850b4898b759c5a4e39532a457..da0c6ecb11b2b4ef58efaf0f1a923e2e23bfd75d 100644
--- a/src/main/java/com/comandante/creeper/managers/GameManager.java
+++ b/src/main/java/com/comandante/creeper/managers/GameManager.java
@@ -19,8 +19,6 @@ import com.comandante.creeper.server.Color;
 import com.comandante.creeper.server.GossipCache;
 import com.comandante.creeper.server.MultiLineInputManager;
 import com.comandante.creeper.spawner.NpcSpawner;
-import com.comandante.creeper.spells.Effect;
-import com.comandante.creeper.spells.EffectsManager;
 import com.comandante.creeper.spells.Spells;
 import com.comandante.creeper.stat.Stats;
 import com.comandante.creeper.stat.StatsBuilder;
diff --git a/src/main/java/com/comandante/creeper/npc/Npc.java b/src/main/java/com/comandante/creeper/npc/Npc.java
index a343305fa2024420d7b6fe99102cec8f57d7b21e..c5dd03de6c39929f54c6c246a2482fedfe6f9451 100644
--- a/src/main/java/com/comandante/creeper/npc/Npc.java
+++ b/src/main/java/com/comandante/creeper/npc/Npc.java
@@ -1,6 +1,7 @@
 package com.comandante.creeper.npc;
 
 
+import com.comandante.creeper.Items.Effect;
 import com.comandante.creeper.Items.Item;
 import com.comandante.creeper.Items.Loot;
 import com.comandante.creeper.Items.Rarity;
@@ -10,7 +11,6 @@ import com.comandante.creeper.managers.SentryManager;
 import com.comandante.creeper.player.*;
 import com.comandante.creeper.server.Color;
 import com.comandante.creeper.spawner.SpawnRule;
-import com.comandante.creeper.spells.Effect;
 import com.comandante.creeper.stat.Stats;
 import com.comandante.creeper.stat.StatsBuilder;
 import com.comandante.creeper.stat.StatsHelper;
diff --git a/src/main/java/com/comandante/creeper/player/Player.java b/src/main/java/com/comandante/creeper/player/Player.java
index a45eb9310e3dcab7d773a6e4bf477bbac4ea3e6a..80afbee2653a399e1f925727934ef48fa992bb31 100644
--- a/src/main/java/com/comandante/creeper/player/Player.java
+++ b/src/main/java/com/comandante/creeper/player/Player.java
@@ -3,6 +3,7 @@ package com.comandante.creeper.player;
 
 import com.codahale.metrics.Meter;
 import com.comandante.creeper.CreeperUtils;
+import com.comandante.creeper.Items.Effect;
 import com.comandante.creeper.Items.ForageManager;
 import com.comandante.creeper.Items.Item;
 import com.comandante.creeper.Items.ItemType;
@@ -14,7 +15,6 @@ import com.comandante.creeper.npc.Npc;
 import com.comandante.creeper.npc.NpcStatsChangeBuilder;
 import com.comandante.creeper.npc.Temperament;
 import com.comandante.creeper.server.Color;
-import com.comandante.creeper.spells.Effect;
 import com.comandante.creeper.stat.Stats;
 import com.comandante.creeper.stat.StatsBuilder;
 import com.comandante.creeper.stat.StatsHelper;
diff --git a/src/test/com/comandante/creeper/player/NpcTestHarness.java b/src/test/com/comandante/creeper/player/NpcTestHarness.java
index 1a4adc0da7804f91a233c4119ff62880feb17630..cc43842194b2133abdd43e07a2c4e110bfbe5e30 100644
--- a/src/test/com/comandante/creeper/player/NpcTestHarness.java
+++ b/src/test/com/comandante/creeper/player/NpcTestHarness.java
@@ -239,6 +239,9 @@ public class NpcTestHarness {
         int lightningSpellDamage = getLightningSpellDamage(4, 7, 4);
         System.out.println("Level 1 player with 7 intelligence vs 4 intelligence npc: " + lightningSpellDamage);
 
+        lightningSpellDamage = getLightningSpellDamage(5, 11, 6);
+        System.out.println("Level 1 player with 11 intelligence vs 6 intelligence npc: " + lightningSpellDamage);
+
         lightningSpellDamage = getLightningSpellDamage(5, 11, 6);
         System.out.println("Level 5 player with 11 intelligence vs 6 intelligence npc: " + lightningSpellDamage);
         lightningSpellDamage = getLightningSpellDamage(7, 14, 8);