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 abcee0e0..cb166235 100644
--- a/src/com/massivecraft/factions/Board.java
+++ b/src/com/massivecraft/factions/Board.java
@@ -10,7 +10,7 @@ import java.util.Map.Entry;
 import java.util.TreeMap;
 
 import org.bukkit.ChatColor;
-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.struct.Relation;
 import com.massivecraft.factions.util.AsciiCompass;
diff --git a/src/com/massivecraft/factions/FPlayers.java b/src/com/massivecraft/factions/FPlayers.java
index a4e68f70..739f0d3a 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.Role;
 import com.massivecraft.factions.zcore.persist.PlayerEntityCollection;
 
diff --git a/src/com/massivecraft/factions/Factions.java b/src/com/massivecraft/factions/Factions.java
index dd166eb6..7fb9ea03 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.util.MiscUtil;
 import com.massivecraft.factions.zcore.persist.EntityCollection;
 import com.massivecraft.factions.zcore.util.TextUtil;
diff --git a/src/com/massivecraft/factions/P.java b/src/com/massivecraft/factions/P.java
index 6ef7f36e..a24267a3 100644
--- a/src/com/massivecraft/factions/P.java
+++ b/src/com/massivecraft/factions/P.java
@@ -37,8 +37,8 @@ import com.massivecraft.factions.util.MyLocationTypeAdapter;
 import com.massivecraft.factions.zcore.MPlugin;
 import com.massivecraft.factions.zcore.util.TextUtil;
 
-import com.google.gson.GsonBuilder;
-import com.google.gson.reflect.TypeToken;
+import org.bukkit.craftbukkit.libs.com.google.gson.GsonBuilder;
+import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken;
 
 
 public class P extends MPlugin
diff --git a/src/com/massivecraft/factions/util/MapFLocToStringSetTypeAdapter.java b/src/com/massivecraft/factions/util/MapFLocToStringSetTypeAdapter.java
index 2a1cbfc4..4da08843 100644
--- a/src/com/massivecraft/factions/util/MapFLocToStringSetTypeAdapter.java
+++ b/src/com/massivecraft/factions/util/MapFLocToStringSetTypeAdapter.java
@@ -9,15 +9,15 @@ import java.util.Set;
 import java.util.logging.Level;
 import java.util.Map.Entry;
 
-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.FLocation;
 import com.massivecraft.factions.P;
 
diff --git a/src/com/massivecraft/factions/util/MyLocationTypeAdapter.java b/src/com/massivecraft/factions/util/MyLocationTypeAdapter.java
index 04c29cb2..cd6176d6 100644
--- a/src/com/massivecraft/factions/util/MyLocationTypeAdapter.java
+++ b/src/com/massivecraft/factions/util/MyLocationTypeAdapter.java
@@ -5,13 +5,13 @@ import java.util.logging.Level;
 
 import com.massivecraft.factions.P;
 
-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 MyLocationTypeAdapter implements JsonDeserializer<LazyLocation>, JsonSerializer<LazyLocation>
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