diff --git a/lib/bukkit.jar b/lib/bukkit.jar
deleted file mode 100644
index 46ac4ce8..00000000
Binary files a/lib/bukkit.jar and /dev/null differ
diff --git a/lib/craftbukkit.jar b/lib/craftbukkit.jar
new file mode 100644
index 00000000..5911ae80
Binary files /dev/null and b/lib/craftbukkit.jar differ
diff --git a/lib/gson.jar b/lib/gson.jar
deleted file mode 100644
index b85f091a..00000000
Binary files a/lib/gson.jar and /dev/null differ
diff --git a/src/com/massivecraft/factions/Board.java b/src/com/massivecraft/factions/Board.java
index c2839f62..b9b81412 100644
--- a/src/com/massivecraft/factions/Board.java
+++ b/src/com/massivecraft/factions/Board.java
@@ -13,7 +13,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 
-import com.google.gson.reflect.TypeToken;
+import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken;
 import com.massivecraft.factions.integration.LWCFeatures;
 import com.massivecraft.factions.iface.RelationParticipator;
 import com.massivecraft.factions.struct.TerritoryAccess;
diff --git a/src/com/massivecraft/factions/FPlayers.java b/src/com/massivecraft/factions/FPlayers.java
index 2929caa1..cb3fb0e1 100644
--- a/src/com/massivecraft/factions/FPlayers.java
+++ b/src/com/massivecraft/factions/FPlayers.java
@@ -6,7 +6,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentSkipListMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import com.google.gson.reflect.TypeToken;
+import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken;
 import com.massivecraft.factions.struct.Rel;
 import com.massivecraft.factions.zcore.persist.PlayerEntityCollection;
 
diff --git a/src/com/massivecraft/factions/Factions.java b/src/com/massivecraft/factions/Factions.java
index a652896d..7599d23b 100644
--- a/src/com/massivecraft/factions/Factions.java
+++ b/src/com/massivecraft/factions/Factions.java
@@ -9,7 +9,7 @@ import java.util.logging.Level;
 
 import org.bukkit.ChatColor;
 
-import com.google.gson.reflect.TypeToken;
+import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken;
 import com.massivecraft.factions.struct.FFlag;
 import com.massivecraft.factions.struct.FPerm;
 import com.massivecraft.factions.struct.Rel;
diff --git a/src/com/massivecraft/factions/P.java b/src/com/massivecraft/factions/P.java
index 9813f9b0..68e3b900 100644
--- a/src/com/massivecraft/factions/P.java
+++ b/src/com/massivecraft/factions/P.java
@@ -41,7 +41,7 @@ import com.massivecraft.factions.util.LazyLocation;
 import com.massivecraft.factions.zcore.MPlugin;
 import com.massivecraft.factions.zcore.util.TextUtil;
 
-import com.google.gson.GsonBuilder;
+import org.bukkit.craftbukkit.libs.com.google.gson.GsonBuilder;
 
 
 public class P extends MPlugin
diff --git a/src/com/massivecraft/factions/adapters/FFlagTypeAdapter.java b/src/com/massivecraft/factions/adapters/FFlagTypeAdapter.java
index 794971c9..d3bd70b4 100644
--- a/src/com/massivecraft/factions/adapters/FFlagTypeAdapter.java
+++ b/src/com/massivecraft/factions/adapters/FFlagTypeAdapter.java
@@ -2,10 +2,10 @@ package com.massivecraft.factions.adapters;
 
 import java.lang.reflect.Type;
 
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializationContext;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializer;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonElement;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException;
 import com.massivecraft.factions.struct.FFlag;
 
 public class FFlagTypeAdapter implements JsonDeserializer<FFlag>
diff --git a/src/com/massivecraft/factions/adapters/FPermTypeAdapter.java b/src/com/massivecraft/factions/adapters/FPermTypeAdapter.java
index d3571679..ac719c71 100644
--- a/src/com/massivecraft/factions/adapters/FPermTypeAdapter.java
+++ b/src/com/massivecraft/factions/adapters/FPermTypeAdapter.java
@@ -2,10 +2,10 @@ package com.massivecraft.factions.adapters;
 
 import java.lang.reflect.Type;
 
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializationContext;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializer;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonElement;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException;
 import com.massivecraft.factions.struct.FPerm;
 
 public class FPermTypeAdapter implements JsonDeserializer<FPerm>
diff --git a/src/com/massivecraft/factions/adapters/LocationTypeAdapter.java b/src/com/massivecraft/factions/adapters/LocationTypeAdapter.java
index b9c8cbe9..99dcb431 100644
--- a/src/com/massivecraft/factions/adapters/LocationTypeAdapter.java
+++ b/src/com/massivecraft/factions/adapters/LocationTypeAdapter.java
@@ -6,13 +6,13 @@ import java.util.logging.Level;
 import com.massivecraft.factions.P;
 import com.massivecraft.factions.util.LazyLocation;
 
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializationContext;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializer;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonElement;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonObject;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonSerializationContext;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonSerializer;
 
 
 public class LocationTypeAdapter implements JsonDeserializer<LazyLocation>, JsonSerializer<LazyLocation>
diff --git a/src/com/massivecraft/factions/adapters/RelTypeAdapter.java b/src/com/massivecraft/factions/adapters/RelTypeAdapter.java
index 068436ef..e1edcb76 100644
--- a/src/com/massivecraft/factions/adapters/RelTypeAdapter.java
+++ b/src/com/massivecraft/factions/adapters/RelTypeAdapter.java
@@ -2,10 +2,10 @@ package com.massivecraft.factions.adapters;
 
 import java.lang.reflect.Type;
 
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializationContext;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializer;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonElement;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException;
 import com.massivecraft.factions.struct.Rel;
 
 public class RelTypeAdapter implements JsonDeserializer<Rel>
diff --git a/src/com/massivecraft/factions/struct/TerritoryAccess.java b/src/com/massivecraft/factions/struct/TerritoryAccess.java
index 91c78aef..3f1256bb 100644
--- a/src/com/massivecraft/factions/struct/TerritoryAccess.java
+++ b/src/com/massivecraft/factions/struct/TerritoryAccess.java
@@ -13,15 +13,15 @@ import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.P;
 
-import com.google.gson.JsonArray;
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonPrimitive;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonArray;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializationContext;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonDeserializer;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonElement;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonObject;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonPrimitive;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonSerializationContext;
+import org.bukkit.craftbukkit.libs.com.google.gson.JsonSerializer;
 import com.massivecraft.factions.FPlayers;
 
 
diff --git a/src/com/massivecraft/factions/zcore/MPlugin.java b/src/com/massivecraft/factions/zcore/MPlugin.java
index 18c03280..e3a00fde 100644
--- a/src/com/massivecraft/factions/zcore/MPlugin.java
+++ b/src/com/massivecraft/factions/zcore/MPlugin.java
@@ -10,9 +10,9 @@ import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.reflect.TypeToken;
+import org.bukkit.craftbukkit.libs.com.google.gson.Gson;
+import org.bukkit.craftbukkit.libs.com.google.gson.GsonBuilder;
+import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken;
 import com.massivecraft.factions.zcore.persist.EM;
 import com.massivecraft.factions.zcore.persist.SaveTask;
 import com.massivecraft.factions.zcore.util.LibLoader;
diff --git a/src/com/massivecraft/factions/zcore/persist/EntityCollection.java b/src/com/massivecraft/factions/zcore/persist/EntityCollection.java
index c171886b..20d046ab 100644
--- a/src/com/massivecraft/factions/zcore/persist/EntityCollection.java
+++ b/src/com/massivecraft/factions/zcore/persist/EntityCollection.java
@@ -5,7 +5,7 @@ import java.lang.reflect.Type;
 import java.util.*;
 import java.util.Map.Entry;
 
-import com.google.gson.Gson;
+import org.bukkit.craftbukkit.libs.com.google.gson.Gson;
 import com.massivecraft.factions.zcore.util.DiscUtil;
 import com.massivecraft.factions.zcore.util.TextUtil;
 
diff --git a/src/com/massivecraft/factions/zcore/persist/PlayerEntityCollection.java b/src/com/massivecraft/factions/zcore/persist/PlayerEntityCollection.java
index 95d2df5e..41278225 100644
--- a/src/com/massivecraft/factions/zcore/persist/PlayerEntityCollection.java
+++ b/src/com/massivecraft/factions/zcore/persist/PlayerEntityCollection.java
@@ -9,7 +9,7 @@ import java.util.Set;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
-import com.google.gson.Gson;
+import org.bukkit.craftbukkit.libs.com.google.gson.Gson;
 
 /**
  * The PlayerEntityCollection is an EntityCollection with the extra features