diff --git a/src/net/crystalyx/bukkit/simplyperms/SimplyPrevents.java b/src/net/crystalyx/bukkit/simplyperms/SimplyPrevents.java
index ae1895c..140d9bc 100755
--- a/src/net/crystalyx/bukkit/simplyperms/SimplyPrevents.java
+++ b/src/net/crystalyx/bukkit/simplyperms/SimplyPrevents.java
@@ -28,6 +28,9 @@ public abstract class SimplyPrevents implements Listener {
 		"bucket.Waterbucket",
 		"build.Breakblock",
 		"build.Placeblock",
+		"chat.Chat",
+		"chat.CapsLock",
+		"chat.Flood",
 		"craft.Brew",
 		"craft.Chest",
 		"craft.Dispenser",
@@ -51,8 +54,6 @@ public abstract class SimplyPrevents implements Listener {
 		"projectile.Egg",
 		"projectile.Potion",
 		"projectile.Snowball",
-		"spam.CapsLock",
-		"spam.Flood",
 		"vehicle.Collision",
 		"vehicle.Destroy",
 		"vehicle.Enter",
diff --git a/src/net/crystalyx/bukkit/simplyperms/preventions/spam/CapsLock.java b/src/net/crystalyx/bukkit/simplyperms/preventions/chat/CapsLock.java
similarity index 93%
rename from src/net/crystalyx/bukkit/simplyperms/preventions/spam/CapsLock.java
rename to src/net/crystalyx/bukkit/simplyperms/preventions/chat/CapsLock.java
index e39e9d8..2e46e0c 100644
--- a/src/net/crystalyx/bukkit/simplyperms/preventions/spam/CapsLock.java
+++ b/src/net/crystalyx/bukkit/simplyperms/preventions/chat/CapsLock.java
@@ -1,4 +1,4 @@
-package net.crystalyx.bukkit.simplyperms.preventions.spam;
+package net.crystalyx.bukkit.simplyperms.preventions.chat;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
diff --git a/src/net/crystalyx/bukkit/simplyperms/preventions/Chat.java b/src/net/crystalyx/bukkit/simplyperms/preventions/chat/Chat.java
similarity index 90%
rename from src/net/crystalyx/bukkit/simplyperms/preventions/Chat.java
rename to src/net/crystalyx/bukkit/simplyperms/preventions/chat/Chat.java
index 7f20b4c..86fd306 100644
--- a/src/net/crystalyx/bukkit/simplyperms/preventions/Chat.java
+++ b/src/net/crystalyx/bukkit/simplyperms/preventions/chat/Chat.java
@@ -1,4 +1,4 @@
-package net.crystalyx.bukkit.simplyperms.preventions;
+package net.crystalyx.bukkit.simplyperms.preventions.chat;
 
 import net.crystalyx.bukkit.simplyperms.SimplyPlugin;
 import net.crystalyx.bukkit.simplyperms.SimplyPrevents;
diff --git a/src/net/crystalyx/bukkit/simplyperms/preventions/spam/Flood.java b/src/net/crystalyx/bukkit/simplyperms/preventions/chat/Flood.java
similarity index 94%
rename from src/net/crystalyx/bukkit/simplyperms/preventions/spam/Flood.java
rename to src/net/crystalyx/bukkit/simplyperms/preventions/chat/Flood.java
index 432b93e..dd3ae53 100644
--- a/src/net/crystalyx/bukkit/simplyperms/preventions/spam/Flood.java
+++ b/src/net/crystalyx/bukkit/simplyperms/preventions/chat/Flood.java
@@ -1,4 +1,4 @@
-package net.crystalyx.bukkit.simplyperms.preventions.spam;
+package net.crystalyx.bukkit.simplyperms.preventions.chat;
 
 import java.util.HashMap;
 
diff --git a/src/plugin.yml b/src/plugin.yml
index 2a8181a..2790c14 100644
--- a/src/plugin.yml
+++ b/src/plugin.yml
@@ -132,12 +132,12 @@ permissions:
       permissions.allow.item: true
       permissions.allow.monster: true
       permissions.allow.sneak: true
-      permissions.allow.vehicle: true
       permissions.allow.build: true
       permissions.allow.craft: true
       permissions.allow.interact: true
       permissions.allow.loot: true
       permissions.allow.projectile: true
+      permissions.allow.vehicle: true
   permissions.allow.bow:
     description: Allows the player to shoot bows
   permissions.allow.changesign: