diff --git a/src/com/bukkit/mcteam/factions/Board.java b/src/org/mcteam/factions/Board.java
similarity index 95%
rename from src/com/bukkit/mcteam/factions/Board.java
rename to src/org/mcteam/factions/Board.java
index 41e239ec..6c4cad00 100644
--- a/src/com/bukkit/mcteam/factions/Board.java
+++ b/src/org/mcteam/factions/Board.java
@@ -1,4 +1,4 @@
-package com.bukkit.mcteam.factions;
+package org.mcteam.factions;
 
 import java.io.*;
 import java.lang.reflect.Type;
@@ -11,15 +11,15 @@ import java.util.Map.Entry;
 import java.util.TreeMap;
 
 import org.bukkit.ChatColor;
+import org.mcteam.factions.gson.JsonArray;
+import org.mcteam.factions.gson.JsonElement;
+import org.mcteam.factions.gson.JsonObject;
+import org.mcteam.factions.gson.JsonParser;
+import org.mcteam.factions.gson.reflect.TypeToken;
+import org.mcteam.factions.util.AsciiCompass;
+import org.mcteam.factions.util.DiscUtil;
+import org.mcteam.factions.util.TextUtil;
 
-import com.bukkit.mcteam.factions.util.TextUtil;
-import com.bukkit.mcteam.gson.reflect.TypeToken;
-import com.bukkit.mcteam.gson.JsonArray;
-import com.bukkit.mcteam.gson.JsonElement;
-import com.bukkit.mcteam.gson.JsonObject;
-import com.bukkit.mcteam.gson.JsonParser;
-import com.bukkit.mcteam.util.AsciiCompass;
-import com.bukkit.mcteam.util.DiscUtil;
 
 public class Board {
 	private static transient File file = new File(Factions.instance.getDataFolder(), "board.json");
diff --git a/src/com/bukkit/mcteam/factions/Conf.java b/src/org/mcteam/factions/Conf.java
similarity index 97%
rename from src/com/bukkit/mcteam/factions/Conf.java
rename to src/org/mcteam/factions/Conf.java
index 3ad11b61..559e317f 100644
--- a/src/com/bukkit/mcteam/factions/Conf.java
+++ b/src/org/mcteam/factions/Conf.java
@@ -1,13 +1,13 @@
-package com.bukkit.mcteam.factions;
+package org.mcteam.factions;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
 import org.bukkit.*;
 import org.bukkit.entity.CreatureType;
+import org.mcteam.factions.gson.JsonParseException;
+import org.mcteam.factions.util.DiscUtil;
 
-import com.bukkit.mcteam.util.DiscUtil;
-import com.bukkit.mcteam.gson.JsonParseException;
 
 public class Conf {
 	public static transient File file = new File(Factions.instance.getDataFolder(), "conf.json");
diff --git a/src/com/bukkit/mcteam/factions/FLocation.java b/src/org/mcteam/factions/FLocation.java
similarity index 98%
rename from src/com/bukkit/mcteam/factions/FLocation.java
rename to src/org/mcteam/factions/FLocation.java
index 7a5e4f94..39585b4b 100644
--- a/src/com/bukkit/mcteam/factions/FLocation.java
+++ b/src/org/mcteam/factions/FLocation.java
@@ -1,4 +1,4 @@
-package com.bukkit.mcteam.factions;
+package org.mcteam.factions;
 
 import org.bukkit.Location;
 import org.bukkit.block.Block;
diff --git a/src/com/bukkit/mcteam/factions/FPlayer.java b/src/org/mcteam/factions/FPlayer.java
similarity index 98%
rename from src/com/bukkit/mcteam/factions/FPlayer.java
rename to src/org/mcteam/factions/FPlayer.java
index 120a01b1..76ac13e3 100644
--- a/src/com/bukkit/mcteam/factions/FPlayer.java
+++ b/src/org/mcteam/factions/FPlayer.java
@@ -1,4 +1,4 @@
-package com.bukkit.mcteam.factions;
+package org.mcteam.factions;
 
 import java.io.*;
 import java.lang.reflect.Type;
@@ -8,11 +8,11 @@ import java.util.Map.Entry;
 
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
+import org.mcteam.factions.gson.reflect.TypeToken;
+import org.mcteam.factions.struct.Relation;
+import org.mcteam.factions.struct.Role;
+import org.mcteam.factions.util.DiscUtil;
 
-import com.bukkit.mcteam.factions.struct.Relation;
-import com.bukkit.mcteam.factions.struct.Role;
-import com.bukkit.mcteam.gson.reflect.TypeToken;
-import com.bukkit.mcteam.util.DiscUtil;
 
 /**
  * Logged in players always have exactly one FPlayer instance.
diff --git a/src/com/bukkit/mcteam/factions/Faction.java b/src/org/mcteam/factions/Faction.java
similarity index 97%
rename from src/com/bukkit/mcteam/factions/Faction.java
rename to src/org/mcteam/factions/Faction.java
index 599f0155..783f1e7b 100644
--- a/src/com/bukkit/mcteam/factions/Faction.java
+++ b/src/org/mcteam/factions/Faction.java
@@ -1,4 +1,4 @@
-package com.bukkit.mcteam.factions;
+package org.mcteam.factions;
 
 import java.io.*;
 import java.lang.reflect.Type;
@@ -9,12 +9,11 @@ import java.util.logging.Level;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
+import org.mcteam.factions.gson.reflect.TypeToken;
+import org.mcteam.factions.struct.Relation;
+import org.mcteam.factions.struct.Role;
+import org.mcteam.factions.util.*;
 
-import com.bukkit.mcteam.factions.struct.Relation;
-import com.bukkit.mcteam.factions.struct.Role;
-import com.bukkit.mcteam.factions.util.*;
-import com.bukkit.mcteam.gson.reflect.TypeToken;
-import com.bukkit.mcteam.util.DiscUtil;
 
 public class Faction {
 	
diff --git a/src/com/bukkit/mcteam/factions/Factions.java b/src/org/mcteam/factions/Factions.java
similarity index 81%
rename from src/com/bukkit/mcteam/factions/Factions.java
rename to src/org/mcteam/factions/Factions.java
index e5de2221..a857238d 100644
--- a/src/com/bukkit/mcteam/factions/Factions.java
+++ b/src/org/mcteam/factions/Factions.java
@@ -1,4 +1,4 @@
-package com.bukkit.mcteam.factions;
+package org.mcteam.factions;
 
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
@@ -18,40 +18,40 @@ import org.bukkit.event.Event;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.mcteam.factions.commands.FBaseCommand;
+import org.mcteam.factions.commands.FCommandAdmin;
+import org.mcteam.factions.commands.FCommandBypass;
+import org.mcteam.factions.commands.FCommandChat;
+import org.mcteam.factions.commands.FCommandClaim;
+import org.mcteam.factions.commands.FCommandCreate;
+import org.mcteam.factions.commands.FCommandDeinvite;
+import org.mcteam.factions.commands.FCommandDescription;
+import org.mcteam.factions.commands.FCommandHelp;
+import org.mcteam.factions.commands.FCommandHome;
+import org.mcteam.factions.commands.FCommandInvite;
+import org.mcteam.factions.commands.FCommandJoin;
+import org.mcteam.factions.commands.FCommandKick;
+import org.mcteam.factions.commands.FCommandLeave;
+import org.mcteam.factions.commands.FCommandList;
+import org.mcteam.factions.commands.FCommandMap;
+import org.mcteam.factions.commands.FCommandMod;
+import org.mcteam.factions.commands.FCommandOpen;
+import org.mcteam.factions.commands.FCommandRelationAlly;
+import org.mcteam.factions.commands.FCommandRelationEnemy;
+import org.mcteam.factions.commands.FCommandRelationNeutral;
+import org.mcteam.factions.commands.FCommandSafeclaim;
+import org.mcteam.factions.commands.FCommandSethome;
+import org.mcteam.factions.commands.FCommandShow;
+import org.mcteam.factions.commands.FCommandTag;
+import org.mcteam.factions.commands.FCommandTitle;
+import org.mcteam.factions.commands.FCommandUnclaim;
+import org.mcteam.factions.commands.FCommandVersion;
+import org.mcteam.factions.gson.Gson;
+import org.mcteam.factions.gson.GsonBuilder;
+import org.mcteam.factions.listeners.FactionsBlockListener;
+import org.mcteam.factions.listeners.FactionsEntityListener;
+import org.mcteam.factions.listeners.FactionsPlayerListener;
 
-import com.bukkit.mcteam.factions.commands.FBaseCommand;
-import com.bukkit.mcteam.factions.commands.FCommandAdmin;
-import com.bukkit.mcteam.factions.commands.FCommandBypass;
-import com.bukkit.mcteam.factions.commands.FCommandChat;
-import com.bukkit.mcteam.factions.commands.FCommandClaim;
-import com.bukkit.mcteam.factions.commands.FCommandCreate;
-import com.bukkit.mcteam.factions.commands.FCommandDeinvite;
-import com.bukkit.mcteam.factions.commands.FCommandDescription;
-import com.bukkit.mcteam.factions.commands.FCommandHelp;
-import com.bukkit.mcteam.factions.commands.FCommandHome;
-import com.bukkit.mcteam.factions.commands.FCommandInvite;
-import com.bukkit.mcteam.factions.commands.FCommandJoin;
-import com.bukkit.mcteam.factions.commands.FCommandKick;
-import com.bukkit.mcteam.factions.commands.FCommandLeave;
-import com.bukkit.mcteam.factions.commands.FCommandList;
-import com.bukkit.mcteam.factions.commands.FCommandMap;
-import com.bukkit.mcteam.factions.commands.FCommandMod;
-import com.bukkit.mcteam.factions.commands.FCommandOpen;
-import com.bukkit.mcteam.factions.commands.FCommandRelationAlly;
-import com.bukkit.mcteam.factions.commands.FCommandRelationEnemy;
-import com.bukkit.mcteam.factions.commands.FCommandRelationNeutral;
-import com.bukkit.mcteam.factions.commands.FCommandSafeclaim;
-import com.bukkit.mcteam.factions.commands.FCommandSethome;
-import com.bukkit.mcteam.factions.commands.FCommandShow;
-import com.bukkit.mcteam.factions.commands.FCommandTag;
-import com.bukkit.mcteam.factions.commands.FCommandTitle;
-import com.bukkit.mcteam.factions.commands.FCommandUnclaim;
-import com.bukkit.mcteam.factions.commands.FCommandVersion;
-import com.bukkit.mcteam.factions.listeners.FactionsBlockListener;
-import com.bukkit.mcteam.factions.listeners.FactionsEntityListener;
-import com.bukkit.mcteam.factions.listeners.FactionsPlayerListener;
-import com.bukkit.mcteam.gson.Gson;
-import com.bukkit.mcteam.gson.GsonBuilder;
 
 import com.nijiko.permissions.PermissionHandler;
 import com.nijikokun.bukkit.Permissions.Permissions;
diff --git a/src/com/bukkit/mcteam/factions/MyLocationTypeAdapter.java b/src/org/mcteam/factions/MyLocationTypeAdapter.java
similarity index 84%
rename from src/com/bukkit/mcteam/factions/MyLocationTypeAdapter.java
rename to src/org/mcteam/factions/MyLocationTypeAdapter.java
index ebcc3f17..c9443bbb 100644
--- a/src/com/bukkit/mcteam/factions/MyLocationTypeAdapter.java
+++ b/src/org/mcteam/factions/MyLocationTypeAdapter.java
@@ -1,18 +1,18 @@
-package com.bukkit.mcteam.factions;
+package org.mcteam.factions;
 
 import java.lang.reflect.Type;
 import java.util.logging.Level;
 
 import org.bukkit.Location;
 import org.bukkit.World;
+import org.mcteam.factions.gson.JsonDeserializationContext;
+import org.mcteam.factions.gson.JsonDeserializer;
+import org.mcteam.factions.gson.JsonElement;
+import org.mcteam.factions.gson.JsonObject;
+import org.mcteam.factions.gson.JsonParseException;
+import org.mcteam.factions.gson.JsonSerializationContext;
+import org.mcteam.factions.gson.JsonSerializer;
 
-import com.bukkit.mcteam.gson.JsonDeserializationContext;
-import com.bukkit.mcteam.gson.JsonDeserializer;
-import com.bukkit.mcteam.gson.JsonElement;
-import com.bukkit.mcteam.gson.JsonObject;
-import com.bukkit.mcteam.gson.JsonParseException;
-import com.bukkit.mcteam.gson.JsonSerializationContext;
-import com.bukkit.mcteam.gson.JsonSerializer;
 
 public class MyLocationTypeAdapter implements JsonDeserializer<Location>, JsonSerializer<Location> {
 	private static final String WORLD = "world";
diff --git a/src/com/bukkit/mcteam/factions/SaveTask.java b/src/org/mcteam/factions/SaveTask.java
similarity index 80%
rename from src/com/bukkit/mcteam/factions/SaveTask.java
rename to src/org/mcteam/factions/SaveTask.java
index 21966417..58c62b89 100644
--- a/src/com/bukkit/mcteam/factions/SaveTask.java
+++ b/src/org/mcteam/factions/SaveTask.java
@@ -1,4 +1,4 @@
-package com.bukkit.mcteam.factions;
+package org.mcteam.factions;
 
 public class SaveTask implements Runnable {
 
diff --git a/src/com/bukkit/mcteam/factions/commands/FBaseCommand.java b/src/org/mcteam/factions/commands/FBaseCommand.java
similarity index 95%
rename from src/com/bukkit/mcteam/factions/commands/FBaseCommand.java
rename to src/org/mcteam/factions/commands/FBaseCommand.java
index 4fa6de0a..12654dd1 100644
--- a/src/com/bukkit/mcteam/factions/commands/FBaseCommand.java
+++ b/src/org/mcteam/factions/commands/FBaseCommand.java
@@ -1,17 +1,17 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.mcteam.factions.Conf;
+import org.mcteam.factions.FPlayer;
+import org.mcteam.factions.Faction;
+import org.mcteam.factions.Factions;
+import org.mcteam.factions.struct.Role;
+import org.mcteam.factions.util.TextUtil;
 
-import com.bukkit.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.FPlayer;
-import com.bukkit.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.Factions;
-import com.bukkit.mcteam.factions.struct.Role;
-import com.bukkit.mcteam.factions.util.TextUtil;
 
 public class FBaseCommand {
 	public List<String> aliases;
diff --git a/src/com/bukkit/mcteam/factions/commands/FCommandAdmin.java b/src/org/mcteam/factions/commands/FCommandAdmin.java
similarity index 85%
rename from src/com/bukkit/mcteam/factions/commands/FCommandAdmin.java
rename to src/org/mcteam/factions/commands/FCommandAdmin.java
index f993a780..b2b53f51 100644
--- a/src/com/bukkit/mcteam/factions/commands/FCommandAdmin.java
+++ b/src/org/mcteam/factions/commands/FCommandAdmin.java
@@ -1,9 +1,9 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
-import com.bukkit.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.FPlayer;
-import com.bukkit.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.struct.Role;
+import org.mcteam.factions.Conf;
+import org.mcteam.factions.FPlayer;
+import org.mcteam.factions.Faction;
+import org.mcteam.factions.struct.Role;
 
 public class FCommandAdmin extends FBaseCommand {
 	
diff --git a/src/com/bukkit/mcteam/factions/commands/FCommandBypass.java b/src/org/mcteam/factions/commands/FCommandBypass.java
similarity index 95%
rename from src/com/bukkit/mcteam/factions/commands/FCommandBypass.java
rename to src/org/mcteam/factions/commands/FCommandBypass.java
index 39a445c7..677b8e48 100644
--- a/src/com/bukkit/mcteam/factions/commands/FCommandBypass.java
+++ b/src/org/mcteam/factions/commands/FCommandBypass.java
@@ -1,4 +1,4 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
 import org.bukkit.command.CommandSender;
 
diff --git a/src/com/bukkit/mcteam/factions/commands/FCommandChat.java b/src/org/mcteam/factions/commands/FCommandChat.java
similarity index 91%
rename from src/com/bukkit/mcteam/factions/commands/FCommandChat.java
rename to src/org/mcteam/factions/commands/FCommandChat.java
index 97f670f2..a4364ee0 100644
--- a/src/com/bukkit/mcteam/factions/commands/FCommandChat.java
+++ b/src/org/mcteam/factions/commands/FCommandChat.java
@@ -1,4 +1,4 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
 public class FCommandChat extends FBaseCommand {
 	
diff --git a/src/com/bukkit/mcteam/factions/commands/FCommandClaim.java b/src/org/mcteam/factions/commands/FCommandClaim.java
similarity index 86%
rename from src/com/bukkit/mcteam/factions/commands/FCommandClaim.java
rename to src/org/mcteam/factions/commands/FCommandClaim.java
index e8bf788a..4aae73f6 100644
--- a/src/com/bukkit/mcteam/factions/commands/FCommandClaim.java
+++ b/src/org/mcteam/factions/commands/FCommandClaim.java
@@ -1,11 +1,11 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
-import com.bukkit.mcteam.factions.Board;
-import com.bukkit.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.FLocation;
-import com.bukkit.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.struct.Relation;
-import com.bukkit.mcteam.factions.struct.Role;
+import org.mcteam.factions.Board;
+import org.mcteam.factions.Conf;
+import org.mcteam.factions.FLocation;
+import org.mcteam.factions.Faction;
+import org.mcteam.factions.struct.Relation;
+import org.mcteam.factions.struct.Role;
 
 public class FCommandClaim extends FBaseCommand {
 	
diff --git a/src/com/bukkit/mcteam/factions/commands/FCommandCreate.java b/src/org/mcteam/factions/commands/FCommandCreate.java
similarity index 82%
rename from src/com/bukkit/mcteam/factions/commands/FCommandCreate.java
rename to src/org/mcteam/factions/commands/FCommandCreate.java
index 982dc17a..a91f1715 100644
--- a/src/com/bukkit/mcteam/factions/commands/FCommandCreate.java
+++ b/src/org/mcteam/factions/commands/FCommandCreate.java
@@ -1,14 +1,14 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
 import java.util.ArrayList;
 
 import org.bukkit.command.CommandSender;
+import org.mcteam.factions.Conf;
+import org.mcteam.factions.FPlayer;
+import org.mcteam.factions.Faction;
+import org.mcteam.factions.Factions;
+import org.mcteam.factions.struct.Role;
 
-import com.bukkit.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.FPlayer;
-import com.bukkit.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.Factions;
-import com.bukkit.mcteam.factions.struct.Role;
 
 public class FCommandCreate extends FBaseCommand {
 	
diff --git a/src/com/bukkit/mcteam/factions/commands/FCommandDeinvite.java b/src/org/mcteam/factions/commands/FCommandDeinvite.java
similarity index 82%
rename from src/com/bukkit/mcteam/factions/commands/FCommandDeinvite.java
rename to src/org/mcteam/factions/commands/FCommandDeinvite.java
index 96fff0b6..12648cdf 100644
--- a/src/com/bukkit/mcteam/factions/commands/FCommandDeinvite.java
+++ b/src/org/mcteam/factions/commands/FCommandDeinvite.java
@@ -1,9 +1,9 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
-import com.bukkit.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.FPlayer;
-import com.bukkit.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.struct.Role;
+import org.mcteam.factions.Conf;
+import org.mcteam.factions.FPlayer;
+import org.mcteam.factions.Faction;
+import org.mcteam.factions.struct.Role;
 
 public class FCommandDeinvite extends FBaseCommand {
 	
diff --git a/src/com/bukkit/mcteam/factions/commands/FCommandDescription.java b/src/org/mcteam/factions/commands/FCommandDescription.java
similarity index 76%
rename from src/com/bukkit/mcteam/factions/commands/FCommandDescription.java
rename to src/org/mcteam/factions/commands/FCommandDescription.java
index fde94041..bd10ade3 100644
--- a/src/com/bukkit/mcteam/factions/commands/FCommandDescription.java
+++ b/src/org/mcteam/factions/commands/FCommandDescription.java
@@ -1,9 +1,9 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
-import com.bukkit.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.FPlayer;
-import com.bukkit.mcteam.factions.struct.Role;
-import com.bukkit.mcteam.factions.util.TextUtil;
+import org.mcteam.factions.Conf;
+import org.mcteam.factions.FPlayer;
+import org.mcteam.factions.struct.Role;
+import org.mcteam.factions.util.TextUtil;
 
 public class FCommandDescription extends FBaseCommand {
 	
diff --git a/src/com/bukkit/mcteam/factions/commands/FCommandHelp.java b/src/org/mcteam/factions/commands/FCommandHelp.java
similarity index 98%
rename from src/com/bukkit/mcteam/factions/commands/FCommandHelp.java
rename to src/org/mcteam/factions/commands/FCommandHelp.java
index f957dc92..47dd8b66 100644
--- a/src/com/bukkit/mcteam/factions/commands/FCommandHelp.java
+++ b/src/org/mcteam/factions/commands/FCommandHelp.java
@@ -1,10 +1,10 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
 import java.util.ArrayList;
 
 import org.bukkit.command.CommandSender;
+import org.mcteam.factions.util.TextUtil;
 
-import com.bukkit.mcteam.factions.util.TextUtil;
 
 public class FCommandHelp extends FBaseCommand {
 	
diff --git a/src/com/bukkit/mcteam/factions/commands/FCommandHome.java b/src/org/mcteam/factions/commands/FCommandHome.java
similarity index 80%
rename from src/com/bukkit/mcteam/factions/commands/FCommandHome.java
rename to src/org/mcteam/factions/commands/FCommandHome.java
index f04c8801..be91911e 100644
--- a/src/com/bukkit/mcteam/factions/commands/FCommandHome.java
+++ b/src/org/mcteam/factions/commands/FCommandHome.java
@@ -1,8 +1,8 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
-import com.bukkit.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.struct.Role;
+import org.mcteam.factions.Conf;
+import org.mcteam.factions.Faction;
+import org.mcteam.factions.struct.Role;
 
 public class FCommandHome extends FBaseCommand {
 	
diff --git a/src/com/bukkit/mcteam/factions/commands/FCommandInvite.java b/src/org/mcteam/factions/commands/FCommandInvite.java
similarity index 82%
rename from src/com/bukkit/mcteam/factions/commands/FCommandInvite.java
rename to src/org/mcteam/factions/commands/FCommandInvite.java
index a5b0b569..27437bbe 100644
--- a/src/com/bukkit/mcteam/factions/commands/FCommandInvite.java
+++ b/src/org/mcteam/factions/commands/FCommandInvite.java
@@ -1,9 +1,9 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
-import com.bukkit.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.FPlayer;
-import com.bukkit.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.struct.Role;
+import org.mcteam.factions.Conf;
+import org.mcteam.factions.FPlayer;
+import org.mcteam.factions.Faction;
+import org.mcteam.factions.struct.Role;
 
 public class FCommandInvite extends FBaseCommand {
 	
diff --git a/src/com/bukkit/mcteam/factions/commands/FCommandJoin.java b/src/org/mcteam/factions/commands/FCommandJoin.java
similarity index 90%
rename from src/com/bukkit/mcteam/factions/commands/FCommandJoin.java
rename to src/org/mcteam/factions/commands/FCommandJoin.java
index 46742ac6..3ebe2500 100644
--- a/src/com/bukkit/mcteam/factions/commands/FCommandJoin.java
+++ b/src/org/mcteam/factions/commands/FCommandJoin.java
@@ -1,7 +1,7 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
-import com.bukkit.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.Faction;
+import org.mcteam.factions.Conf;
+import org.mcteam.factions.Faction;
 
 public class FCommandJoin extends FBaseCommand {
 	
diff --git a/src/com/bukkit/mcteam/factions/commands/FCommandKick.java b/src/org/mcteam/factions/commands/FCommandKick.java
similarity index 87%
rename from src/com/bukkit/mcteam/factions/commands/FCommandKick.java
rename to src/org/mcteam/factions/commands/FCommandKick.java
index 2271f4b0..c673ce97 100644
--- a/src/com/bukkit/mcteam/factions/commands/FCommandKick.java
+++ b/src/org/mcteam/factions/commands/FCommandKick.java
@@ -1,8 +1,8 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
-import com.bukkit.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.FPlayer;
-import com.bukkit.mcteam.factions.Faction;
+import org.mcteam.factions.Conf;
+import org.mcteam.factions.FPlayer;
+import org.mcteam.factions.Faction;
 
 public class FCommandKick extends FBaseCommand {
 	
diff --git a/src/com/bukkit/mcteam/factions/commands/FCommandLeave.java b/src/org/mcteam/factions/commands/FCommandLeave.java
similarity index 89%
rename from src/com/bukkit/mcteam/factions/commands/FCommandLeave.java
rename to src/org/mcteam/factions/commands/FCommandLeave.java
index 27cb4f59..cf4acada 100644
--- a/src/com/bukkit/mcteam/factions/commands/FCommandLeave.java
+++ b/src/org/mcteam/factions/commands/FCommandLeave.java
@@ -1,4 +1,4 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
 import org.bukkit.command.CommandSender;
 
diff --git a/src/com/bukkit/mcteam/factions/commands/FCommandList.java b/src/org/mcteam/factions/commands/FCommandList.java
similarity index 93%
rename from src/com/bukkit/mcteam/factions/commands/FCommandList.java
rename to src/org/mcteam/factions/commands/FCommandList.java
index 1864addc..96ec0198 100644
--- a/src/com/bukkit/mcteam/factions/commands/FCommandList.java
+++ b/src/org/mcteam/factions/commands/FCommandList.java
@@ -1,14 +1,14 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 
 import org.bukkit.command.CommandSender;
+import org.mcteam.factions.Conf;
+import org.mcteam.factions.Faction;
+import org.mcteam.factions.util.TextUtil;
 
-import com.bukkit.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.util.TextUtil;
 
 public class FCommandList extends FBaseCommand {
 	
diff --git a/src/com/bukkit/mcteam/factions/commands/FCommandMap.java b/src/org/mcteam/factions/commands/FCommandMap.java
similarity index 87%
rename from src/com/bukkit/mcteam/factions/commands/FCommandMap.java
rename to src/org/mcteam/factions/commands/FCommandMap.java
index 9699ae41..696c3abb 100644
--- a/src/com/bukkit/mcteam/factions/commands/FCommandMap.java
+++ b/src/org/mcteam/factions/commands/FCommandMap.java
@@ -1,9 +1,9 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
 import org.bukkit.command.CommandSender;
+import org.mcteam.factions.Board;
+import org.mcteam.factions.FLocation;
 
-import com.bukkit.mcteam.factions.Board;
-import com.bukkit.mcteam.factions.FLocation;
 
 public class FCommandMap extends FBaseCommand {
 	
diff --git a/src/com/bukkit/mcteam/factions/commands/FCommandMod.java b/src/org/mcteam/factions/commands/FCommandMod.java
similarity index 84%
rename from src/com/bukkit/mcteam/factions/commands/FCommandMod.java
rename to src/org/mcteam/factions/commands/FCommandMod.java
index 720a6862..b5aff16a 100644
--- a/src/com/bukkit/mcteam/factions/commands/FCommandMod.java
+++ b/src/org/mcteam/factions/commands/FCommandMod.java
@@ -1,9 +1,9 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
-import com.bukkit.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.FPlayer;
-import com.bukkit.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.struct.Role;
+import org.mcteam.factions.Conf;
+import org.mcteam.factions.FPlayer;
+import org.mcteam.factions.Faction;
+import org.mcteam.factions.struct.Role;
 
 public class FCommandMod extends FBaseCommand {
 	
diff --git a/src/com/bukkit/mcteam/factions/commands/FCommandOpen.java b/src/org/mcteam/factions/commands/FCommandOpen.java
similarity index 82%
rename from src/com/bukkit/mcteam/factions/commands/FCommandOpen.java
rename to src/org/mcteam/factions/commands/FCommandOpen.java
index b0ddc2b5..d07e75af 100644
--- a/src/com/bukkit/mcteam/factions/commands/FCommandOpen.java
+++ b/src/org/mcteam/factions/commands/FCommandOpen.java
@@ -1,8 +1,8 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
-import com.bukkit.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.struct.Role;
+import org.mcteam.factions.Conf;
+import org.mcteam.factions.Faction;
+import org.mcteam.factions.struct.Role;
 
 public class FCommandOpen extends FBaseCommand {
 	
diff --git a/src/com/bukkit/mcteam/factions/commands/FCommandRelationAlly.java b/src/org/mcteam/factions/commands/FCommandRelationAlly.java
similarity index 68%
rename from src/com/bukkit/mcteam/factions/commands/FCommandRelationAlly.java
rename to src/org/mcteam/factions/commands/FCommandRelationAlly.java
index 8e826f7c..8726e004 100644
--- a/src/com/bukkit/mcteam/factions/commands/FCommandRelationAlly.java
+++ b/src/org/mcteam/factions/commands/FCommandRelationAlly.java
@@ -1,6 +1,6 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
-import com.bukkit.mcteam.factions.struct.Relation;
+import org.mcteam.factions.struct.Relation;
 
 public class FCommandRelationAlly extends FRelationCommand {
 	
diff --git a/src/com/bukkit/mcteam/factions/commands/FCommandRelationEnemy.java b/src/org/mcteam/factions/commands/FCommandRelationEnemy.java
similarity index 68%
rename from src/com/bukkit/mcteam/factions/commands/FCommandRelationEnemy.java
rename to src/org/mcteam/factions/commands/FCommandRelationEnemy.java
index c4ca999e..03d99d72 100644
--- a/src/com/bukkit/mcteam/factions/commands/FCommandRelationEnemy.java
+++ b/src/org/mcteam/factions/commands/FCommandRelationEnemy.java
@@ -1,6 +1,6 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
-import com.bukkit.mcteam.factions.struct.Relation;
+import org.mcteam.factions.struct.Relation;
 
 public class FCommandRelationEnemy extends FRelationCommand {
 	
diff --git a/src/com/bukkit/mcteam/factions/commands/FCommandRelationNeutral.java b/src/org/mcteam/factions/commands/FCommandRelationNeutral.java
similarity index 69%
rename from src/com/bukkit/mcteam/factions/commands/FCommandRelationNeutral.java
rename to src/org/mcteam/factions/commands/FCommandRelationNeutral.java
index 4107181f..067dd6d3 100644
--- a/src/com/bukkit/mcteam/factions/commands/FCommandRelationNeutral.java
+++ b/src/org/mcteam/factions/commands/FCommandRelationNeutral.java
@@ -1,6 +1,6 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
-import com.bukkit.mcteam.factions.struct.Relation;
+import org.mcteam.factions.struct.Relation;
 
 public class FCommandRelationNeutral extends FRelationCommand {
 	
diff --git a/src/com/bukkit/mcteam/factions/commands/FCommandSafeclaim.java b/src/org/mcteam/factions/commands/FCommandSafeclaim.java
similarity index 71%
rename from src/com/bukkit/mcteam/factions/commands/FCommandSafeclaim.java
rename to src/org/mcteam/factions/commands/FCommandSafeclaim.java
index 101a06fe..3053903d 100644
--- a/src/com/bukkit/mcteam/factions/commands/FCommandSafeclaim.java
+++ b/src/org/mcteam/factions/commands/FCommandSafeclaim.java
@@ -1,11 +1,11 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
 import org.bukkit.command.CommandSender;
+import org.mcteam.factions.Board;
+import org.mcteam.factions.FLocation;
+import org.mcteam.factions.Faction;
+import org.mcteam.factions.Factions;
 
-import com.bukkit.mcteam.factions.Board;
-import com.bukkit.mcteam.factions.FLocation;
-import com.bukkit.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.Factions;
 
 public class FCommandSafeclaim extends FBaseCommand {
 	
diff --git a/src/com/bukkit/mcteam/factions/commands/FCommandSethome.java b/src/org/mcteam/factions/commands/FCommandSethome.java
similarity index 81%
rename from src/com/bukkit/mcteam/factions/commands/FCommandSethome.java
rename to src/org/mcteam/factions/commands/FCommandSethome.java
index f47c3a1b..814ff57b 100644
--- a/src/com/bukkit/mcteam/factions/commands/FCommandSethome.java
+++ b/src/org/mcteam/factions/commands/FCommandSethome.java
@@ -1,8 +1,8 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
-import com.bukkit.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.struct.Role;
+import org.mcteam.factions.Conf;
+import org.mcteam.factions.Faction;
+import org.mcteam.factions.struct.Role;
 
 public class FCommandSethome extends FBaseCommand {
 	
diff --git a/src/com/bukkit/mcteam/factions/commands/FCommandShow.java b/src/org/mcteam/factions/commands/FCommandShow.java
similarity index 90%
rename from src/com/bukkit/mcteam/factions/commands/FCommandShow.java
rename to src/org/mcteam/factions/commands/FCommandShow.java
index 8506006b..2d1ffde5 100644
--- a/src/com/bukkit/mcteam/factions/commands/FCommandShow.java
+++ b/src/org/mcteam/factions/commands/FCommandShow.java
@@ -1,15 +1,15 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
 import java.util.Collection;
 
 import org.bukkit.command.CommandSender;
+import org.mcteam.factions.Conf;
+import org.mcteam.factions.FPlayer;
+import org.mcteam.factions.Faction;
+import org.mcteam.factions.struct.Relation;
+import org.mcteam.factions.struct.Role;
+import org.mcteam.factions.util.TextUtil;
 
-import com.bukkit.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.FPlayer;
-import com.bukkit.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.struct.Relation;
-import com.bukkit.mcteam.factions.struct.Role;
-import com.bukkit.mcteam.factions.util.TextUtil;
 
 public class FCommandShow extends FBaseCommand {
 	
diff --git a/src/com/bukkit/mcteam/factions/commands/FCommandTag.java b/src/org/mcteam/factions/commands/FCommandTag.java
similarity index 85%
rename from src/com/bukkit/mcteam/factions/commands/FCommandTag.java
rename to src/org/mcteam/factions/commands/FCommandTag.java
index bc9e3035..0574fda7 100644
--- a/src/com/bukkit/mcteam/factions/commands/FCommandTag.java
+++ b/src/org/mcteam/factions/commands/FCommandTag.java
@@ -1,11 +1,12 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
 import java.util.ArrayList;
 
-import com.bukkit.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.struct.Role;
-import com.bukkit.mcteam.factions.util.TextUtil;
+import org.mcteam.factions.Conf;
+import org.mcteam.factions.Faction;
+import org.mcteam.factions.struct.Role;
+import org.mcteam.factions.util.TextUtil;
+
 
 public class FCommandTag extends FBaseCommand {
 	
diff --git a/src/com/bukkit/mcteam/factions/commands/FCommandTitle.java b/src/org/mcteam/factions/commands/FCommandTitle.java
similarity index 78%
rename from src/com/bukkit/mcteam/factions/commands/FCommandTitle.java
rename to src/org/mcteam/factions/commands/FCommandTitle.java
index b87a445c..ad013cbf 100644
--- a/src/com/bukkit/mcteam/factions/commands/FCommandTitle.java
+++ b/src/org/mcteam/factions/commands/FCommandTitle.java
@@ -1,9 +1,9 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
-import com.bukkit.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.FPlayer;
-import com.bukkit.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.util.TextUtil;
+import org.mcteam.factions.Conf;
+import org.mcteam.factions.FPlayer;
+import org.mcteam.factions.Faction;
+import org.mcteam.factions.util.TextUtil;
 
 public class FCommandTitle extends FBaseCommand {
 	
diff --git a/src/com/bukkit/mcteam/factions/commands/FCommandUnclaim.java b/src/org/mcteam/factions/commands/FCommandUnclaim.java
similarity index 76%
rename from src/com/bukkit/mcteam/factions/commands/FCommandUnclaim.java
rename to src/org/mcteam/factions/commands/FCommandUnclaim.java
index 649f2b0e..d4e5e84e 100644
--- a/src/com/bukkit/mcteam/factions/commands/FCommandUnclaim.java
+++ b/src/org/mcteam/factions/commands/FCommandUnclaim.java
@@ -1,11 +1,11 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
-import com.bukkit.mcteam.factions.Board;
-import com.bukkit.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.FLocation;
-import com.bukkit.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.Factions;
-import com.bukkit.mcteam.factions.struct.Role;
+import org.mcteam.factions.Board;
+import org.mcteam.factions.Conf;
+import org.mcteam.factions.FLocation;
+import org.mcteam.factions.Faction;
+import org.mcteam.factions.Factions;
+import org.mcteam.factions.struct.Role;
 
 public class FCommandUnclaim extends FBaseCommand {
 	
diff --git a/src/com/bukkit/mcteam/factions/commands/FCommandVersion.java b/src/org/mcteam/factions/commands/FCommandVersion.java
similarity index 83%
rename from src/com/bukkit/mcteam/factions/commands/FCommandVersion.java
rename to src/org/mcteam/factions/commands/FCommandVersion.java
index 80c198b9..d431ea04 100644
--- a/src/com/bukkit/mcteam/factions/commands/FCommandVersion.java
+++ b/src/org/mcteam/factions/commands/FCommandVersion.java
@@ -1,8 +1,8 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
 import org.bukkit.command.CommandSender;
+import org.mcteam.factions.Factions;
 
-import com.bukkit.mcteam.factions.Factions;
 
 public class FCommandVersion extends FBaseCommand {
 	
diff --git a/src/com/bukkit/mcteam/factions/commands/FRelationCommand.java b/src/org/mcteam/factions/commands/FRelationCommand.java
similarity index 87%
rename from src/com/bukkit/mcteam/factions/commands/FRelationCommand.java
rename to src/org/mcteam/factions/commands/FRelationCommand.java
index 3cc4412a..1be56863 100644
--- a/src/com/bukkit/mcteam/factions/commands/FRelationCommand.java
+++ b/src/org/mcteam/factions/commands/FRelationCommand.java
@@ -1,12 +1,12 @@
-package com.bukkit.mcteam.factions.commands;
+package org.mcteam.factions.commands;
 
 import org.bukkit.ChatColor;
+import org.mcteam.factions.Conf;
+import org.mcteam.factions.Faction;
+import org.mcteam.factions.Factions;
+import org.mcteam.factions.struct.Relation;
+import org.mcteam.factions.struct.Role;
 
-import com.bukkit.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.Factions;
-import com.bukkit.mcteam.factions.struct.Relation;
-import com.bukkit.mcteam.factions.struct.Role;
 
 public class FRelationCommand extends FBaseCommand {
 	
diff --git a/src/com/bukkit/mcteam/gson/AnonymousAndLocalClassExclusionStrategy.java b/src/org/mcteam/factions/gson/AnonymousAndLocalClassExclusionStrategy.java
similarity index 97%
rename from src/com/bukkit/mcteam/gson/AnonymousAndLocalClassExclusionStrategy.java
rename to src/org/mcteam/factions/gson/AnonymousAndLocalClassExclusionStrategy.java
index c12a45e4..2d4cd23a 100644
--- a/src/com/bukkit/mcteam/gson/AnonymousAndLocalClassExclusionStrategy.java
+++ b/src/org/mcteam/factions/gson/AnonymousAndLocalClassExclusionStrategy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 
 /**
diff --git a/src/com/bukkit/mcteam/gson/Cache.java b/src/org/mcteam/factions/gson/Cache.java
similarity index 97%
rename from src/com/bukkit/mcteam/gson/Cache.java
rename to src/org/mcteam/factions/gson/Cache.java
index 02ddd4f6..278bdd01 100644
--- a/src/com/bukkit/mcteam/gson/Cache.java
+++ b/src/org/mcteam/factions/gson/Cache.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 /**
  * Defines generic cache interface.
diff --git a/src/com/bukkit/mcteam/gson/CamelCaseSeparatorNamingPolicy.java b/src/org/mcteam/factions/gson/CamelCaseSeparatorNamingPolicy.java
similarity index 98%
rename from src/com/bukkit/mcteam/gson/CamelCaseSeparatorNamingPolicy.java
rename to src/org/mcteam/factions/gson/CamelCaseSeparatorNamingPolicy.java
index 21cebbec..91e3dd11 100644
--- a/src/com/bukkit/mcteam/gson/CamelCaseSeparatorNamingPolicy.java
+++ b/src/org/mcteam/factions/gson/CamelCaseSeparatorNamingPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
diff --git a/src/com/bukkit/mcteam/gson/CircularReferenceException.java b/src/org/mcteam/factions/gson/CircularReferenceException.java
similarity index 97%
rename from src/com/bukkit/mcteam/gson/CircularReferenceException.java
rename to src/org/mcteam/factions/gson/CircularReferenceException.java
index a79e2482..4a9a8c47 100644
--- a/src/com/bukkit/mcteam/gson/CircularReferenceException.java
+++ b/src/org/mcteam/factions/gson/CircularReferenceException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 /**
  * Exception class to indicate a circular reference error.
diff --git a/src/com/bukkit/mcteam/gson/CompositionFieldNamingPolicy.java b/src/org/mcteam/factions/gson/CompositionFieldNamingPolicy.java
similarity index 97%
rename from src/com/bukkit/mcteam/gson/CompositionFieldNamingPolicy.java
rename to src/org/mcteam/factions/gson/CompositionFieldNamingPolicy.java
index 0d9d1004..2be6712d 100644
--- a/src/com/bukkit/mcteam/gson/CompositionFieldNamingPolicy.java
+++ b/src/org/mcteam/factions/gson/CompositionFieldNamingPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
diff --git a/src/com/bukkit/mcteam/gson/DefaultTypeAdapters.java b/src/org/mcteam/factions/gson/DefaultTypeAdapters.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/DefaultTypeAdapters.java
rename to src/org/mcteam/factions/gson/DefaultTypeAdapters.java
index c2e9255a..19aa7dce 100644
--- a/src/com/bukkit/mcteam/gson/DefaultTypeAdapters.java
+++ b/src/org/mcteam/factions/gson/DefaultTypeAdapters.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
diff --git a/src/com/bukkit/mcteam/gson/DelegatingJsonElementVisitor.java b/src/org/mcteam/factions/gson/DelegatingJsonElementVisitor.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/DelegatingJsonElementVisitor.java
rename to src/org/mcteam/factions/gson/DelegatingJsonElementVisitor.java
index 567bb8a8..3c5bee1c 100644
--- a/src/com/bukkit/mcteam/gson/DelegatingJsonElementVisitor.java
+++ b/src/org/mcteam/factions/gson/DelegatingJsonElementVisitor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.io.IOException;
 
diff --git a/src/com/bukkit/mcteam/gson/DisjunctionExclusionStrategy.java b/src/org/mcteam/factions/gson/DisjunctionExclusionStrategy.java
similarity index 97%
rename from src/com/bukkit/mcteam/gson/DisjunctionExclusionStrategy.java
rename to src/org/mcteam/factions/gson/DisjunctionExclusionStrategy.java
index 9fe100c1..3284279f 100644
--- a/src/com/bukkit/mcteam/gson/DisjunctionExclusionStrategy.java
+++ b/src/org/mcteam/factions/gson/DisjunctionExclusionStrategy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.util.Collection;
 
diff --git a/src/com/bukkit/mcteam/gson/Escaper.java b/src/org/mcteam/factions/gson/Escaper.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/Escaper.java
rename to src/org/mcteam/factions/gson/Escaper.java
index bc510004..95b577f6 100644
--- a/src/com/bukkit/mcteam/gson/Escaper.java
+++ b/src/org/mcteam/factions/gson/Escaper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.io.IOException;
 import java.util.Collections;
diff --git a/src/com/bukkit/mcteam/gson/ExclusionStrategy.java b/src/org/mcteam/factions/gson/ExclusionStrategy.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/ExclusionStrategy.java
rename to src/org/mcteam/factions/gson/ExclusionStrategy.java
index 1a33e3b2..7a94b285 100644
--- a/src/com/bukkit/mcteam/gson/ExclusionStrategy.java
+++ b/src/org/mcteam/factions/gson/ExclusionStrategy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 /**
  * A strategy (or policy) definition that is used to decide whether or not a field or top-level
diff --git a/src/com/bukkit/mcteam/gson/ExposeAnnotationDeserializationExclusionStrategy.java b/src/org/mcteam/factions/gson/ExposeAnnotationDeserializationExclusionStrategy.java
similarity index 92%
rename from src/com/bukkit/mcteam/gson/ExposeAnnotationDeserializationExclusionStrategy.java
rename to src/org/mcteam/factions/gson/ExposeAnnotationDeserializationExclusionStrategy.java
index 1f6318ca..7e3b0fa0 100644
--- a/src/com/bukkit/mcteam/gson/ExposeAnnotationDeserializationExclusionStrategy.java
+++ b/src/org/mcteam/factions/gson/ExposeAnnotationDeserializationExclusionStrategy.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
-import com.bukkit.mcteam.gson.annotations.Expose;
+import org.mcteam.factions.gson.annotations.Expose;
 
 /**
  * Excludes fields that do not have the {@link Expose} annotation
diff --git a/src/com/bukkit/mcteam/gson/ExposeAnnotationSerializationExclusionStrategy.java b/src/org/mcteam/factions/gson/ExposeAnnotationSerializationExclusionStrategy.java
similarity index 92%
rename from src/com/bukkit/mcteam/gson/ExposeAnnotationSerializationExclusionStrategy.java
rename to src/org/mcteam/factions/gson/ExposeAnnotationSerializationExclusionStrategy.java
index 3346e621..2bb9032b 100644
--- a/src/com/bukkit/mcteam/gson/ExposeAnnotationSerializationExclusionStrategy.java
+++ b/src/org/mcteam/factions/gson/ExposeAnnotationSerializationExclusionStrategy.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
-import com.bukkit.mcteam.gson.annotations.Expose;
+import org.mcteam.factions.gson.annotations.Expose;
 
 /**
  * Excludes fields that do not have the {@link Expose} annotation
diff --git a/src/com/bukkit/mcteam/gson/FieldAttributes.java b/src/org/mcteam/factions/gson/FieldAttributes.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/FieldAttributes.java
rename to src/org/mcteam/factions/gson/FieldAttributes.java
index 9c059618..3f121906 100644
--- a/src/com/bukkit/mcteam/gson/FieldAttributes.java
+++ b/src/org/mcteam/factions/gson/FieldAttributes.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
diff --git a/src/com/bukkit/mcteam/gson/FieldNamingPolicy.java b/src/org/mcteam/factions/gson/FieldNamingPolicy.java
similarity index 93%
rename from src/com/bukkit/mcteam/gson/FieldNamingPolicy.java
rename to src/org/mcteam/factions/gson/FieldNamingPolicy.java
index 9cae648a..606c2f60 100644
--- a/src/com/bukkit/mcteam/gson/FieldNamingPolicy.java
+++ b/src/org/mcteam/factions/gson/FieldNamingPolicy.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 /**
  * An enumeration that defines a few standard naming conventions for JSON field names.
- * This enumeration should be used in conjunction with {@link com.bukkit.mcteam.gson.GsonBuilder}
- * to configure a {@link com.bukkit.mcteam.gson.Gson} instance to properly translate Java field
+ * This enumeration should be used in conjunction with {@link org.mcteam.factions.gson.GsonBuilder}
+ * to configure a {@link org.mcteam.factions.gson.Gson} instance to properly translate Java field
  * names into the desired JSON field names.
  *
  * @author Inderjeet Singh
diff --git a/src/com/bukkit/mcteam/gson/FieldNamingStrategy.java b/src/org/mcteam/factions/gson/FieldNamingStrategy.java
similarity index 97%
rename from src/com/bukkit/mcteam/gson/FieldNamingStrategy.java
rename to src/org/mcteam/factions/gson/FieldNamingStrategy.java
index f9f8acf7..9916b462 100644
--- a/src/com/bukkit/mcteam/gson/FieldNamingStrategy.java
+++ b/src/org/mcteam/factions/gson/FieldNamingStrategy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.Field;
 
diff --git a/src/com/bukkit/mcteam/gson/FieldNamingStrategy2.java b/src/org/mcteam/factions/gson/FieldNamingStrategy2.java
similarity index 97%
rename from src/com/bukkit/mcteam/gson/FieldNamingStrategy2.java
rename to src/org/mcteam/factions/gson/FieldNamingStrategy2.java
index 4017c0ea..c441b737 100644
--- a/src/com/bukkit/mcteam/gson/FieldNamingStrategy2.java
+++ b/src/org/mcteam/factions/gson/FieldNamingStrategy2.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 /**
  * The new mechanism for providing custom field naming in Gson.  This allows the client code
diff --git a/src/com/bukkit/mcteam/gson/FieldNamingStrategy2Adapter.java b/src/org/mcteam/factions/gson/FieldNamingStrategy2Adapter.java
similarity index 97%
rename from src/com/bukkit/mcteam/gson/FieldNamingStrategy2Adapter.java
rename to src/org/mcteam/factions/gson/FieldNamingStrategy2Adapter.java
index 8db4a5aa..4b3a781e 100644
--- a/src/com/bukkit/mcteam/gson/FieldNamingStrategy2Adapter.java
+++ b/src/org/mcteam/factions/gson/FieldNamingStrategy2Adapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 /**
  * Adapts the old "deprecated" {@link FieldNamingStrategy} to the new {@link FieldNamingStrategy2}
diff --git a/src/com/bukkit/mcteam/gson/GenericArrayTypeImpl.java b/src/org/mcteam/factions/gson/GenericArrayTypeImpl.java
similarity index 98%
rename from src/com/bukkit/mcteam/gson/GenericArrayTypeImpl.java
rename to src/org/mcteam/factions/gson/GenericArrayTypeImpl.java
index 94c6ded0..d9280f54 100644
--- a/src/com/bukkit/mcteam/gson/GenericArrayTypeImpl.java
+++ b/src/org/mcteam/factions/gson/GenericArrayTypeImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.Type;
diff --git a/src/com/bukkit/mcteam/gson/Gson.java b/src/org/mcteam/factions/gson/Gson.java
similarity index 95%
rename from src/com/bukkit/mcteam/gson/Gson.java
rename to src/org/mcteam/factions/gson/Gson.java
index c4609c02..6a08a3b8 100644
--- a/src/com/bukkit/mcteam/gson/Gson.java
+++ b/src/org/mcteam/factions/gson/Gson.java
@@ -14,13 +14,8 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
-import com.bukkit.mcteam.gson.stream.JsonReader;
-import com.bukkit.mcteam.gson.stream.JsonToken;
-import com.bukkit.mcteam.gson.stream.JsonWriter;
-import com.bukkit.mcteam.gson.stream.MalformedJsonException;
-import com.bukkit.mcteam.gson.JsonSerializationContextDefault;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
@@ -32,6 +27,12 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import org.mcteam.factions.gson.JsonSerializationContextDefault;
+import org.mcteam.factions.gson.stream.JsonReader;
+import org.mcteam.factions.gson.stream.JsonToken;
+import org.mcteam.factions.gson.stream.JsonWriter;
+import org.mcteam.factions.gson.stream.MalformedJsonException;
+
 /**
  * This is the main class for using Gson. Gson is typically used by first constructing a
  * Gson instance and then invoking {@link #toJson(Object)} or {@link #fromJson(String, Class)}
@@ -69,7 +70,7 @@ import java.util.Map;
  * <p>See the <a href="https://sites.google.com/site/gson/gson-user-guide">Gson User Guide</a>
  * for a more complete set of examples.</p>
  *
- * @see com.bukkit.mcteam.gson.reflect.TypeToken
+ * @see org.mcteam.factions.gson.reflect.TypeToken
  *
  * @author Inderjeet Singh
  * @author Joel Leitch
@@ -136,10 +137,10 @@ public final class Gson {
    *   ignores the millisecond portion of the date during serialization. You can change
    *   this by invoking {@link GsonBuilder#setDateFormat(int)} or
    *   {@link GsonBuilder#setDateFormat(String)}. </li>
-   *   <li>By default, Gson ignores the {@link com.bukkit.mcteam.gson.annotations.Expose} annotation.
+   *   <li>By default, Gson ignores the {@link org.mcteam.factions.gson.annotations.Expose} annotation.
    *   You can enable Gson to serialize/deserialize only those fields marked with this annotation
    *   through {@link GsonBuilder#excludeFieldsWithoutExposeAnnotation()}. </li>
-   *   <li>By default, Gson ignores the {@link com.bukkit.mcteam.gson.annotations.Since} annotation. You
+   *   <li>By default, Gson ignores the {@link org.mcteam.factions.gson.annotations.Since} annotation. You
    *   can enable Gson to use this annotation through {@link GsonBuilder#setVersion(double)}.</li>
    *   <li>The default field naming policy for the output Json is same as in Java. So, a Java class
    *   field <code>versionNumber</code> will be output as <code>&quot;versionNumber@quot;</code> in
@@ -217,7 +218,7 @@ public final class Gson {
    *
    * @param src the object for which JSON representation is to be created
    * @param typeOfSrc The specific genericized type of src. You can obtain
-   * this type by using the {@link com.bukkit.mcteam.gson.reflect.TypeToken} class. For example,
+   * this type by using the {@link org.mcteam.factions.gson.reflect.TypeToken} class. For example,
    * to get the type for {@code Collection<Foo>}, you should use:
    * <pre>
    * Type typeOfSrc = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.getType();
@@ -262,7 +263,7 @@ public final class Gson {
    *
    * @param src the object for which JSON representation is to be created
    * @param typeOfSrc The specific genericized type of src. You can obtain
-   * this type by using the {@link com.bukkit.mcteam.gson.reflect.TypeToken} class. For example,
+   * this type by using the {@link org.mcteam.factions.gson.reflect.TypeToken} class. For example,
    * to get the type for {@code Collection<Foo>}, you should use:
    * <pre>
    * Type typeOfSrc = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.getType();
@@ -308,7 +309,7 @@ public final class Gson {
    *
    * @param src the object for which JSON representation is to be created
    * @param typeOfSrc The specific genericized type of src. You can obtain
-   * this type by using the {@link com.bukkit.mcteam.gson.reflect.TypeToken} class. For example,
+   * this type by using the {@link org.mcteam.factions.gson.reflect.TypeToken} class. For example,
    * to get the type for {@code Collection<Foo>}, you should use:
    * <pre>
    * Type typeOfSrc = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.getType();
@@ -417,7 +418,7 @@ public final class Gson {
    * @param <T> the type of the desired object
    * @param json the string from which the object is to be deserialized
    * @param typeOfT The specific genericized type of src. You can obtain this type by using the
-   * {@link com.bukkit.mcteam.gson.reflect.TypeToken} class. For example, to get the type for
+   * {@link org.mcteam.factions.gson.reflect.TypeToken} class. For example, to get the type for
    * {@code Collection<Foo>}, you should use:
    * <pre>
    * Type typeOfT = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.getType();
@@ -470,7 +471,7 @@ public final class Gson {
    * @param <T> the type of the desired object
    * @param json the reader producing Json from which the object is to be deserialized
    * @param typeOfT The specific genericized type of src. You can obtain this type by using the
-   * {@link com.bukkit.mcteam.gson.reflect.TypeToken} class. For example, to get the type for
+   * {@link org.mcteam.factions.gson.reflect.TypeToken} class. For example, to get the type for
    * {@code Collection<Foo>}, you should use:
    * <pre>
    * Type typeOfT = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.getType();
@@ -549,7 +550,7 @@ public final class Gson {
    * @param json the root of the parse tree of {@link JsonElement}s from which the object is to
    * be deserialized
    * @param typeOfT The specific genericized type of src. You can obtain this type by using the
-   * {@link com.bukkit.mcteam.gson.reflect.TypeToken} class. For example, to get the type for
+   * {@link org.mcteam.factions.gson.reflect.TypeToken} class. For example, to get the type for
    * {@code Collection<Foo>}, you should use:
    * <pre>
    * Type typeOfT = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.getType();
diff --git a/src/com/bukkit/mcteam/gson/GsonBuilder.java b/src/org/mcteam/factions/gson/GsonBuilder.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/GsonBuilder.java
rename to src/org/mcteam/factions/gson/GsonBuilder.java
index 9d444fe9..12017b07 100644
--- a/src/com/bukkit/mcteam/gson/GsonBuilder.java
+++ b/src/org/mcteam/factions/gson/GsonBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.Type;
 import java.text.DateFormat;
@@ -24,7 +24,8 @@ import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 
-import com.bukkit.mcteam.gson.DefaultTypeAdapters.DefaultDateTypeAdapter;
+import org.mcteam.factions.gson.DefaultTypeAdapters.DefaultDateTypeAdapter;
+
 
 /**
  * <p>Use this builder to construct a {@link Gson} instance when you need to set configuration
@@ -156,7 +157,7 @@ public final class GsonBuilder {
 
   /**
    * Configures Gson to exclude all fields from consideration for serialization or deserialization
-   * that do not have the {@link com.bukkit.mcteam.gson.annotations.Expose} annotation.
+   * that do not have the {@link org.mcteam.factions.gson.annotations.Expose} annotation.
    *
    * @return a reference to this {@code GsonBuilder} object to fulfill the "Builder" pattern
    */
diff --git a/src/com/bukkit/mcteam/gson/InnerClassExclusionStrategy.java b/src/org/mcteam/factions/gson/InnerClassExclusionStrategy.java
similarity index 97%
rename from src/com/bukkit/mcteam/gson/InnerClassExclusionStrategy.java
rename to src/org/mcteam/factions/gson/InnerClassExclusionStrategy.java
index 2e80f5d2..0942f453 100644
--- a/src/com/bukkit/mcteam/gson/InnerClassExclusionStrategy.java
+++ b/src/org/mcteam/factions/gson/InnerClassExclusionStrategy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.Modifier;
 
diff --git a/src/com/bukkit/mcteam/gson/InstanceCreator.java b/src/org/mcteam/factions/gson/InstanceCreator.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/InstanceCreator.java
rename to src/org/mcteam/factions/gson/InstanceCreator.java
index 3729d67d..e1a127fb 100644
--- a/src/com/bukkit/mcteam/gson/InstanceCreator.java
+++ b/src/org/mcteam/factions/gson/InstanceCreator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.Type;
 
diff --git a/src/com/bukkit/mcteam/gson/JavaFieldNamingPolicy.java b/src/org/mcteam/factions/gson/JavaFieldNamingPolicy.java
similarity index 97%
rename from src/com/bukkit/mcteam/gson/JavaFieldNamingPolicy.java
rename to src/org/mcteam/factions/gson/JavaFieldNamingPolicy.java
index 4d528131..4e5136ee 100644
--- a/src/com/bukkit/mcteam/gson/JavaFieldNamingPolicy.java
+++ b/src/org/mcteam/factions/gson/JavaFieldNamingPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
diff --git a/src/com/bukkit/mcteam/gson/JsonArray.java b/src/org/mcteam/factions/gson/JsonArray.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/JsonArray.java
rename to src/org/mcteam/factions/gson/JsonArray.java
index 63767cfa..e9f04e08 100644
--- a/src/com/bukkit/mcteam/gson/JsonArray.java
+++ b/src/org/mcteam/factions/gson/JsonArray.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.io.IOException;
 import java.math.BigDecimal;
diff --git a/src/com/bukkit/mcteam/gson/JsonArrayDeserializationVisitor.java b/src/org/mcteam/factions/gson/JsonArrayDeserializationVisitor.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/JsonArrayDeserializationVisitor.java
rename to src/org/mcteam/factions/gson/JsonArrayDeserializationVisitor.java
index 7d47278d..e7630fc4 100644
--- a/src/com/bukkit/mcteam/gson/JsonArrayDeserializationVisitor.java
+++ b/src/org/mcteam/factions/gson/JsonArrayDeserializationVisitor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Type;
diff --git a/src/com/bukkit/mcteam/gson/JsonDeserializationContext.java b/src/org/mcteam/factions/gson/JsonDeserializationContext.java
similarity index 97%
rename from src/com/bukkit/mcteam/gson/JsonDeserializationContext.java
rename to src/org/mcteam/factions/gson/JsonDeserializationContext.java
index 497857b6..2e967152 100644
--- a/src/com/bukkit/mcteam/gson/JsonDeserializationContext.java
+++ b/src/org/mcteam/factions/gson/JsonDeserializationContext.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.Type;
 
diff --git a/src/com/bukkit/mcteam/gson/JsonDeserializationContextDefault.java b/src/org/mcteam/factions/gson/JsonDeserializationContextDefault.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/JsonDeserializationContextDefault.java
rename to src/org/mcteam/factions/gson/JsonDeserializationContextDefault.java
index 4499389f..206191c6 100644
--- a/src/com/bukkit/mcteam/gson/JsonDeserializationContextDefault.java
+++ b/src/org/mcteam/factions/gson/JsonDeserializationContextDefault.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.Type;
 
diff --git a/src/com/bukkit/mcteam/gson/JsonDeserializationVisitor.java b/src/org/mcteam/factions/gson/JsonDeserializationVisitor.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/JsonDeserializationVisitor.java
rename to src/org/mcteam/factions/gson/JsonDeserializationVisitor.java
index 27d7e191..dcec329c 100644
--- a/src/com/bukkit/mcteam/gson/JsonDeserializationVisitor.java
+++ b/src/org/mcteam/factions/gson/JsonDeserializationVisitor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.Type;
 
diff --git a/src/com/bukkit/mcteam/gson/JsonDeserializer.java b/src/org/mcteam/factions/gson/JsonDeserializer.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/JsonDeserializer.java
rename to src/org/mcteam/factions/gson/JsonDeserializer.java
index a1a51ede..7b60a830 100644
--- a/src/com/bukkit/mcteam/gson/JsonDeserializer.java
+++ b/src/org/mcteam/factions/gson/JsonDeserializer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.Type;
 
diff --git a/src/com/bukkit/mcteam/gson/JsonDeserializerExceptionWrapper.java b/src/org/mcteam/factions/gson/JsonDeserializerExceptionWrapper.java
similarity index 98%
rename from src/com/bukkit/mcteam/gson/JsonDeserializerExceptionWrapper.java
rename to src/org/mcteam/factions/gson/JsonDeserializerExceptionWrapper.java
index 020f68ce..9344c25a 100644
--- a/src/com/bukkit/mcteam/gson/JsonDeserializerExceptionWrapper.java
+++ b/src/org/mcteam/factions/gson/JsonDeserializerExceptionWrapper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.Type;
 
diff --git a/src/com/bukkit/mcteam/gson/JsonElement.java b/src/org/mcteam/factions/gson/JsonElement.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/JsonElement.java
rename to src/org/mcteam/factions/gson/JsonElement.java
index 2cc2c794..c7edbe09 100644
--- a/src/com/bukkit/mcteam/gson/JsonElement.java
+++ b/src/org/mcteam/factions/gson/JsonElement.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.io.IOException;
 import java.math.BigDecimal;
diff --git a/src/com/bukkit/mcteam/gson/JsonElementVisitor.java b/src/org/mcteam/factions/gson/JsonElementVisitor.java
similarity index 98%
rename from src/com/bukkit/mcteam/gson/JsonElementVisitor.java
rename to src/org/mcteam/factions/gson/JsonElementVisitor.java
index 4d093694..1dba675f 100644
--- a/src/com/bukkit/mcteam/gson/JsonElementVisitor.java
+++ b/src/org/mcteam/factions/gson/JsonElementVisitor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.io.IOException;
 
diff --git a/src/com/bukkit/mcteam/gson/JsonFieldNameValidator.java b/src/org/mcteam/factions/gson/JsonFieldNameValidator.java
similarity index 93%
rename from src/com/bukkit/mcteam/gson/JsonFieldNameValidator.java
rename to src/org/mcteam/factions/gson/JsonFieldNameValidator.java
index 38c3da7f..ae54e6e1 100644
--- a/src/com/bukkit/mcteam/gson/JsonFieldNameValidator.java
+++ b/src/org/mcteam/factions/gson/JsonFieldNameValidator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -23,7 +23,7 @@ import java.util.regex.Pattern;
  * This class can be used to check the validity of a JSON field name.
  *
  * <p>The primary use of this object is to ensure that any Java fields that use the
- * {@link com.bukkit.mcteam.gson.annotations.SerializedName} annotation is providing valid JSON
+ * {@link org.mcteam.factions.gson.annotations.SerializedName} annotation is providing valid JSON
  * field names.  This will make the code fail-fast rather than letting the invalid
  * field name propagate to the client and it fails to parse.</p>
  *
diff --git a/src/com/bukkit/mcteam/gson/JsonIOException.java b/src/org/mcteam/factions/gson/JsonIOException.java
similarity index 97%
rename from src/com/bukkit/mcteam/gson/JsonIOException.java
rename to src/org/mcteam/factions/gson/JsonIOException.java
index 07b3dcdc..f63e1b8f 100644
--- a/src/com/bukkit/mcteam/gson/JsonIOException.java
+++ b/src/org/mcteam/factions/gson/JsonIOException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 /**
  * This exception is raised when Gson was unable to read an input stream
diff --git a/src/com/bukkit/mcteam/gson/JsonNull.java b/src/org/mcteam/factions/gson/JsonNull.java
similarity index 98%
rename from src/com/bukkit/mcteam/gson/JsonNull.java
rename to src/org/mcteam/factions/gson/JsonNull.java
index 9671ad20..67ca1cc6 100644
--- a/src/com/bukkit/mcteam/gson/JsonNull.java
+++ b/src/org/mcteam/factions/gson/JsonNull.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.io.IOException;
 
diff --git a/src/com/bukkit/mcteam/gson/JsonObject.java b/src/org/mcteam/factions/gson/JsonObject.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/JsonObject.java
rename to src/org/mcteam/factions/gson/JsonObject.java
index ec8b1c02..a8ebf8f7 100644
--- a/src/com/bukkit/mcteam/gson/JsonObject.java
+++ b/src/org/mcteam/factions/gson/JsonObject.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.io.IOException;
 import java.util.LinkedHashMap;
diff --git a/src/com/bukkit/mcteam/gson/JsonObjectDeserializationVisitor.java b/src/org/mcteam/factions/gson/JsonObjectDeserializationVisitor.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/JsonObjectDeserializationVisitor.java
rename to src/org/mcteam/factions/gson/JsonObjectDeserializationVisitor.java
index 7702c936..5c456388 100644
--- a/src/com/bukkit/mcteam/gson/JsonObjectDeserializationVisitor.java
+++ b/src/org/mcteam/factions/gson/JsonObjectDeserializationVisitor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.Type;
 
diff --git a/src/com/bukkit/mcteam/gson/JsonParseException.java b/src/org/mcteam/factions/gson/JsonParseException.java
similarity index 98%
rename from src/com/bukkit/mcteam/gson/JsonParseException.java
rename to src/org/mcteam/factions/gson/JsonParseException.java
index b29c8258..a00cb722 100644
--- a/src/com/bukkit/mcteam/gson/JsonParseException.java
+++ b/src/org/mcteam/factions/gson/JsonParseException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 /**
  * This exception is raised if there is a serious issue that occurs during parsing of a Json
diff --git a/src/com/bukkit/mcteam/gson/JsonParser.java b/src/org/mcteam/factions/gson/JsonParser.java
similarity index 93%
rename from src/com/bukkit/mcteam/gson/JsonParser.java
rename to src/org/mcteam/factions/gson/JsonParser.java
index d541a2a9..f0c02957 100644
--- a/src/com/bukkit/mcteam/gson/JsonParser.java
+++ b/src/org/mcteam/factions/gson/JsonParser.java
@@ -13,16 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
-import com.bukkit.mcteam.gson.stream.JsonReader;
-import com.bukkit.mcteam.gson.stream.JsonToken;
-import com.bukkit.mcteam.gson.stream.MalformedJsonException;
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
 
+import org.mcteam.factions.gson.stream.JsonReader;
+import org.mcteam.factions.gson.stream.JsonToken;
+import org.mcteam.factions.gson.stream.MalformedJsonException;
+
 /**
  * A parser to parse Json into a parse tree of {@link JsonElement}s
  *
diff --git a/src/com/bukkit/mcteam/gson/JsonPrimitive.java b/src/org/mcteam/factions/gson/JsonPrimitive.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/JsonPrimitive.java
rename to src/org/mcteam/factions/gson/JsonPrimitive.java
index 0584bc3b..1b1864b0 100644
--- a/src/com/bukkit/mcteam/gson/JsonPrimitive.java
+++ b/src/org/mcteam/factions/gson/JsonPrimitive.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.io.IOException;
 import java.math.BigDecimal;
diff --git a/src/com/bukkit/mcteam/gson/JsonSerializationContext.java b/src/org/mcteam/factions/gson/JsonSerializationContext.java
similarity index 98%
rename from src/com/bukkit/mcteam/gson/JsonSerializationContext.java
rename to src/org/mcteam/factions/gson/JsonSerializationContext.java
index dfcb7178..3c60d7d1 100644
--- a/src/com/bukkit/mcteam/gson/JsonSerializationContext.java
+++ b/src/org/mcteam/factions/gson/JsonSerializationContext.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.Type;
 
diff --git a/src/com/bukkit/mcteam/gson/JsonSerializationContextDefault.java b/src/org/mcteam/factions/gson/JsonSerializationContextDefault.java
similarity index 98%
rename from src/com/bukkit/mcteam/gson/JsonSerializationContextDefault.java
rename to src/org/mcteam/factions/gson/JsonSerializationContextDefault.java
index 854c082b..736a8c51 100644
--- a/src/com/bukkit/mcteam/gson/JsonSerializationContextDefault.java
+++ b/src/org/mcteam/factions/gson/JsonSerializationContextDefault.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.Type;
 
diff --git a/src/com/bukkit/mcteam/gson/JsonSerializationVisitor.java b/src/org/mcteam/factions/gson/JsonSerializationVisitor.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/JsonSerializationVisitor.java
rename to src/org/mcteam/factions/gson/JsonSerializationVisitor.java
index c28f21b4..ba0f2eb6 100644
--- a/src/com/bukkit/mcteam/gson/JsonSerializationVisitor.java
+++ b/src/org/mcteam/factions/gson/JsonSerializationVisitor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Type;
diff --git a/src/com/bukkit/mcteam/gson/JsonSerializer.java b/src/org/mcteam/factions/gson/JsonSerializer.java
similarity index 95%
rename from src/com/bukkit/mcteam/gson/JsonSerializer.java
rename to src/org/mcteam/factions/gson/JsonSerializer.java
index 7d318af2..5940bfe5 100644
--- a/src/com/bukkit/mcteam/gson/JsonSerializer.java
+++ b/src/org/mcteam/factions/gson/JsonSerializer.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.Type;
 
 /**
  * Interface representing a custom serializer for Json. You should write a custom serializer, if
  * you are not happy with the default serialization done by Gson. You will also need to register
- * this serializer through {@link com.bukkit.mcteam.gson.GsonBuilder#registerTypeAdapter(Type, Object)}.
+ * this serializer through {@link org.mcteam.factions.gson.GsonBuilder#registerTypeAdapter(Type, Object)}.
  *
  * <p>Let us look at example where defining a serializer will be useful. The {@code Id} class
  * defined below has two fields: {@code clazz} and {@code value}.</p>
diff --git a/src/com/bukkit/mcteam/gson/JsonStreamParser.java b/src/org/mcteam/factions/gson/JsonStreamParser.java
similarity index 94%
rename from src/com/bukkit/mcteam/gson/JsonStreamParser.java
rename to src/org/mcteam/factions/gson/JsonStreamParser.java
index 26a6ff3c..84fd7e44 100644
--- a/src/com/bukkit/mcteam/gson/JsonStreamParser.java
+++ b/src/org/mcteam/factions/gson/JsonStreamParser.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -22,9 +22,10 @@ import java.io.StringReader;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import com.bukkit.mcteam.gson.stream.JsonReader;
-import com.bukkit.mcteam.gson.stream.JsonToken;
-import com.bukkit.mcteam.gson.stream.MalformedJsonException;
+import org.mcteam.factions.gson.stream.JsonReader;
+import org.mcteam.factions.gson.stream.JsonToken;
+import org.mcteam.factions.gson.stream.MalformedJsonException;
+
 
 /**
  * A streaming parser that allows reading of multiple {@link JsonElement}s from the specified reader
diff --git a/src/com/bukkit/mcteam/gson/JsonSyntaxException.java b/src/org/mcteam/factions/gson/JsonSyntaxException.java
similarity index 97%
rename from src/com/bukkit/mcteam/gson/JsonSyntaxException.java
rename to src/org/mcteam/factions/gson/JsonSyntaxException.java
index 1f405de3..accb9f30 100644
--- a/src/com/bukkit/mcteam/gson/JsonSyntaxException.java
+++ b/src/org/mcteam/factions/gson/JsonSyntaxException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 /**
  * This exception is raised when Gson attempts to read (or write) a malformed
diff --git a/src/com/bukkit/mcteam/gson/JsonTreeNavigator.java b/src/org/mcteam/factions/gson/JsonTreeNavigator.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/JsonTreeNavigator.java
rename to src/org/mcteam/factions/gson/JsonTreeNavigator.java
index 8bfe22f8..9656b6ac 100644
--- a/src/com/bukkit/mcteam/gson/JsonTreeNavigator.java
+++ b/src/org/mcteam/factions/gson/JsonTreeNavigator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.io.IOException;
 import java.util.Map;
diff --git a/src/com/bukkit/mcteam/gson/LongSerializationPolicy.java b/src/org/mcteam/factions/gson/LongSerializationPolicy.java
similarity index 98%
rename from src/com/bukkit/mcteam/gson/LongSerializationPolicy.java
rename to src/org/mcteam/factions/gson/LongSerializationPolicy.java
index 227241ec..bc8027ff 100644
--- a/src/com/bukkit/mcteam/gson/LongSerializationPolicy.java
+++ b/src/org/mcteam/factions/gson/LongSerializationPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 /**
  * Defines the expected format for a {@code long} or {@code Long} type when its serialized.
diff --git a/src/com/bukkit/mcteam/gson/LowerCamelCaseSeparatorNamingPolicy.java b/src/org/mcteam/factions/gson/LowerCamelCaseSeparatorNamingPolicy.java
similarity index 97%
rename from src/com/bukkit/mcteam/gson/LowerCamelCaseSeparatorNamingPolicy.java
rename to src/org/mcteam/factions/gson/LowerCamelCaseSeparatorNamingPolicy.java
index b067cbd2..0d8161a3 100644
--- a/src/com/bukkit/mcteam/gson/LowerCamelCaseSeparatorNamingPolicy.java
+++ b/src/org/mcteam/factions/gson/LowerCamelCaseSeparatorNamingPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 /**
  * A {@link FieldNamingStrategy2} that ensures the JSON field names consist of only
diff --git a/src/com/bukkit/mcteam/gson/LowerCaseNamingPolicy.java b/src/org/mcteam/factions/gson/LowerCaseNamingPolicy.java
similarity index 97%
rename from src/com/bukkit/mcteam/gson/LowerCaseNamingPolicy.java
rename to src/org/mcteam/factions/gson/LowerCaseNamingPolicy.java
index 2dcd52f5..c8e1f0dc 100644
--- a/src/com/bukkit/mcteam/gson/LowerCaseNamingPolicy.java
+++ b/src/org/mcteam/factions/gson/LowerCaseNamingPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
diff --git a/src/com/bukkit/mcteam/gson/LruCache.java b/src/org/mcteam/factions/gson/LruCache.java
similarity index 97%
rename from src/com/bukkit/mcteam/gson/LruCache.java
rename to src/org/mcteam/factions/gson/LruCache.java
index 7f503b38..4d6d2b0e 100644
--- a/src/com/bukkit/mcteam/gson/LruCache.java
+++ b/src/org/mcteam/factions/gson/LruCache.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/src/com/bukkit/mcteam/gson/MapAsArrayTypeAdapter.java b/src/org/mcteam/factions/gson/MapAsArrayTypeAdapter.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/MapAsArrayTypeAdapter.java
rename to src/org/mcteam/factions/gson/MapAsArrayTypeAdapter.java
index e6aa60e8..4fb91c97 100644
--- a/src/com/bukkit/mcteam/gson/MapAsArrayTypeAdapter.java
+++ b/src/org/mcteam/factions/gson/MapAsArrayTypeAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
diff --git a/src/com/bukkit/mcteam/gson/MappedObjectConstructor.java b/src/org/mcteam/factions/gson/MappedObjectConstructor.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/MappedObjectConstructor.java
rename to src/org/mcteam/factions/gson/MappedObjectConstructor.java
index 99459cf3..12296e33 100644
--- a/src/com/bukkit/mcteam/gson/MappedObjectConstructor.java
+++ b/src/org/mcteam/factions/gson/MappedObjectConstructor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Array;
diff --git a/src/com/bukkit/mcteam/gson/MemoryRefStack.java b/src/org/mcteam/factions/gson/MemoryRefStack.java
similarity index 98%
rename from src/com/bukkit/mcteam/gson/MemoryRefStack.java
rename to src/org/mcteam/factions/gson/MemoryRefStack.java
index d920780e..a79f1851 100644
--- a/src/com/bukkit/mcteam/gson/MemoryRefStack.java
+++ b/src/org/mcteam/factions/gson/MemoryRefStack.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.util.Stack;
 
diff --git a/src/com/bukkit/mcteam/gson/ModifierBasedExclusionStrategy.java b/src/org/mcteam/factions/gson/ModifierBasedExclusionStrategy.java
similarity index 97%
rename from src/com/bukkit/mcteam/gson/ModifierBasedExclusionStrategy.java
rename to src/org/mcteam/factions/gson/ModifierBasedExclusionStrategy.java
index 67ae7f91..89f7a7ba 100644
--- a/src/com/bukkit/mcteam/gson/ModifierBasedExclusionStrategy.java
+++ b/src/org/mcteam/factions/gson/ModifierBasedExclusionStrategy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/src/com/bukkit/mcteam/gson/ModifyFirstLetterNamingPolicy.java b/src/org/mcteam/factions/gson/ModifyFirstLetterNamingPolicy.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/ModifyFirstLetterNamingPolicy.java
rename to src/org/mcteam/factions/gson/ModifyFirstLetterNamingPolicy.java
index 63c3b956..31652b48 100644
--- a/src/com/bukkit/mcteam/gson/ModifyFirstLetterNamingPolicy.java
+++ b/src/org/mcteam/factions/gson/ModifyFirstLetterNamingPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
diff --git a/src/com/bukkit/mcteam/gson/NullExclusionStrategy.java b/src/org/mcteam/factions/gson/NullExclusionStrategy.java
similarity index 96%
rename from src/com/bukkit/mcteam/gson/NullExclusionStrategy.java
rename to src/org/mcteam/factions/gson/NullExclusionStrategy.java
index d1196b5d..eaea6261 100644
--- a/src/com/bukkit/mcteam/gson/NullExclusionStrategy.java
+++ b/src/org/mcteam/factions/gson/NullExclusionStrategy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 
 /**
diff --git a/src/com/bukkit/mcteam/gson/ObjectConstructor.java b/src/org/mcteam/factions/gson/ObjectConstructor.java
similarity index 97%
rename from src/com/bukkit/mcteam/gson/ObjectConstructor.java
rename to src/org/mcteam/factions/gson/ObjectConstructor.java
index 9d8b6b25..86fe8ca9 100644
--- a/src/com/bukkit/mcteam/gson/ObjectConstructor.java
+++ b/src/org/mcteam/factions/gson/ObjectConstructor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.Type;
 
diff --git a/src/com/bukkit/mcteam/gson/ObjectNavigator.java b/src/org/mcteam/factions/gson/ObjectNavigator.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/ObjectNavigator.java
rename to src/org/mcteam/factions/gson/ObjectNavigator.java
index 6c57eb27..0a59ea64 100644
--- a/src/com/bukkit/mcteam/gson/ObjectNavigator.java
+++ b/src/org/mcteam/factions/gson/ObjectNavigator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Field;
diff --git a/src/com/bukkit/mcteam/gson/ObjectNavigatorFactory.java b/src/org/mcteam/factions/gson/ObjectNavigatorFactory.java
similarity index 98%
rename from src/com/bukkit/mcteam/gson/ObjectNavigatorFactory.java
rename to src/org/mcteam/factions/gson/ObjectNavigatorFactory.java
index f95f3bf9..2d4b2be3 100644
--- a/src/com/bukkit/mcteam/gson/ObjectNavigatorFactory.java
+++ b/src/org/mcteam/factions/gson/ObjectNavigatorFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 /**
  * A factory class used to simplify {@link ObjectNavigator} creation.
diff --git a/src/com/bukkit/mcteam/gson/ObjectTypePair.java b/src/org/mcteam/factions/gson/ObjectTypePair.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/ObjectTypePair.java
rename to src/org/mcteam/factions/gson/ObjectTypePair.java
index c6954d96..811f1734 100644
--- a/src/com/bukkit/mcteam/gson/ObjectTypePair.java
+++ b/src/org/mcteam/factions/gson/ObjectTypePair.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.Type;
 
diff --git a/src/com/bukkit/mcteam/gson/Pair.java b/src/org/mcteam/factions/gson/Pair.java
similarity index 97%
rename from src/com/bukkit/mcteam/gson/Pair.java
rename to src/org/mcteam/factions/gson/Pair.java
index fa60ab81..d034a48c 100644
--- a/src/com/bukkit/mcteam/gson/Pair.java
+++ b/src/org/mcteam/factions/gson/Pair.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 /**
  * A simple object that holds onto a pair of object references, first and second.
diff --git a/src/com/bukkit/mcteam/gson/ParameterizedTypeHandlerMap.java b/src/org/mcteam/factions/gson/ParameterizedTypeHandlerMap.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/ParameterizedTypeHandlerMap.java
rename to src/org/mcteam/factions/gson/ParameterizedTypeHandlerMap.java
index ee2956f4..a631e9e6 100644
--- a/src/com/bukkit/mcteam/gson/ParameterizedTypeHandlerMap.java
+++ b/src/org/mcteam/factions/gson/ParameterizedTypeHandlerMap.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
diff --git a/src/com/bukkit/mcteam/gson/ParameterizedTypeImpl.java b/src/org/mcteam/factions/gson/ParameterizedTypeImpl.java
similarity index 98%
rename from src/com/bukkit/mcteam/gson/ParameterizedTypeImpl.java
rename to src/org/mcteam/factions/gson/ParameterizedTypeImpl.java
index 1ea72b74..13e64ff6 100644
--- a/src/com/bukkit/mcteam/gson/ParameterizedTypeImpl.java
+++ b/src/org/mcteam/factions/gson/ParameterizedTypeImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
diff --git a/src/com/bukkit/mcteam/gson/Preconditions.java b/src/org/mcteam/factions/gson/Preconditions.java
similarity index 97%
rename from src/com/bukkit/mcteam/gson/Preconditions.java
rename to src/org/mcteam/factions/gson/Preconditions.java
index d201ff89..6561a1d0 100644
--- a/src/com/bukkit/mcteam/gson/Preconditions.java
+++ b/src/org/mcteam/factions/gson/Preconditions.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 /**
  * A simple utility class used to check method Preconditions.
diff --git a/src/com/bukkit/mcteam/gson/Primitives.java b/src/org/mcteam/factions/gson/Primitives.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/Primitives.java
rename to src/org/mcteam/factions/gson/Primitives.java
index 0805cc39..dafdeeec 100644
--- a/src/com/bukkit/mcteam/gson/Primitives.java
+++ b/src/org/mcteam/factions/gson/Primitives.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/src/com/bukkit/mcteam/gson/RecursiveFieldNamingPolicy.java b/src/org/mcteam/factions/gson/RecursiveFieldNamingPolicy.java
similarity index 98%
rename from src/com/bukkit/mcteam/gson/RecursiveFieldNamingPolicy.java
rename to src/org/mcteam/factions/gson/RecursiveFieldNamingPolicy.java
index 85453123..e7c05637 100644
--- a/src/com/bukkit/mcteam/gson/RecursiveFieldNamingPolicy.java
+++ b/src/org/mcteam/factions/gson/RecursiveFieldNamingPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
diff --git a/src/com/bukkit/mcteam/gson/SerializedNameAnnotationInterceptingNamingPolicy.java b/src/org/mcteam/factions/gson/SerializedNameAnnotationInterceptingNamingPolicy.java
similarity index 89%
rename from src/com/bukkit/mcteam/gson/SerializedNameAnnotationInterceptingNamingPolicy.java
rename to src/org/mcteam/factions/gson/SerializedNameAnnotationInterceptingNamingPolicy.java
index 0024ccde..42da8201 100644
--- a/src/com/bukkit/mcteam/gson/SerializedNameAnnotationInterceptingNamingPolicy.java
+++ b/src/org/mcteam/factions/gson/SerializedNameAnnotationInterceptingNamingPolicy.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
-import com.bukkit.mcteam.gson.annotations.SerializedName;
+import org.mcteam.factions.gson.annotations.SerializedName;
 
 /**
  * A {@link FieldNamingStrategy2} that acts as a chain of responsibility.  If the
- * {@link com.bukkit.mcteam.gson.annotations.SerializedName} annotation is applied to a field then this
+ * {@link org.mcteam.factions.gson.annotations.SerializedName} annotation is applied to a field then this
  * strategy will translate the name to the {@code serializedName.value()}; otherwise it delegates
  * to the wrapped {@link FieldNamingStrategy2}.
  *
diff --git a/src/com/bukkit/mcteam/gson/Streams.java b/src/org/mcteam/factions/gson/Streams.java
similarity index 96%
rename from src/com/bukkit/mcteam/gson/Streams.java
rename to src/org/mcteam/factions/gson/Streams.java
index dacb78f0..a71feb4c 100644
--- a/src/com/bukkit/mcteam/gson/Streams.java
+++ b/src/org/mcteam/factions/gson/Streams.java
@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
-import com.bukkit.mcteam.gson.stream.JsonReader;
-import com.bukkit.mcteam.gson.stream.JsonWriter;
-import com.bukkit.mcteam.gson.stream.MalformedJsonException;
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Map;
 
+import org.mcteam.factions.gson.stream.JsonReader;
+import org.mcteam.factions.gson.stream.JsonWriter;
+import org.mcteam.factions.gson.stream.MalformedJsonException;
+
 /**
  * Reads and writes GSON parse trees over streams.
  */
diff --git a/src/com/bukkit/mcteam/gson/SyntheticFieldExclusionStrategy.java b/src/org/mcteam/factions/gson/SyntheticFieldExclusionStrategy.java
similarity index 97%
rename from src/com/bukkit/mcteam/gson/SyntheticFieldExclusionStrategy.java
rename to src/org/mcteam/factions/gson/SyntheticFieldExclusionStrategy.java
index d170ef5d..a988d097 100644
--- a/src/com/bukkit/mcteam/gson/SyntheticFieldExclusionStrategy.java
+++ b/src/org/mcteam/factions/gson/SyntheticFieldExclusionStrategy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 /**
  * A data object that stores attributes of a field.
diff --git a/src/com/bukkit/mcteam/gson/TypeAdapter.java b/src/org/mcteam/factions/gson/TypeAdapter.java
similarity index 96%
rename from src/com/bukkit/mcteam/gson/TypeAdapter.java
rename to src/org/mcteam/factions/gson/TypeAdapter.java
index 085d2c36..b5813ee5 100644
--- a/src/com/bukkit/mcteam/gson/TypeAdapter.java
+++ b/src/org/mcteam/factions/gson/TypeAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 /**
  * This class is responsible for adapting/converting an particular "from"
diff --git a/src/com/bukkit/mcteam/gson/TypeInfo.java b/src/org/mcteam/factions/gson/TypeInfo.java
similarity index 98%
rename from src/com/bukkit/mcteam/gson/TypeInfo.java
rename to src/org/mcteam/factions/gson/TypeInfo.java
index 06cb10c4..88e4fa8d 100644
--- a/src/com/bukkit/mcteam/gson/TypeInfo.java
+++ b/src/org/mcteam/factions/gson/TypeInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.Type;
 import java.util.Collection;
diff --git a/src/com/bukkit/mcteam/gson/TypeInfoArray.java b/src/org/mcteam/factions/gson/TypeInfoArray.java
similarity index 98%
rename from src/com/bukkit/mcteam/gson/TypeInfoArray.java
rename to src/org/mcteam/factions/gson/TypeInfoArray.java
index 63d51f13..2258d56a 100644
--- a/src/com/bukkit/mcteam/gson/TypeInfoArray.java
+++ b/src/org/mcteam/factions/gson/TypeInfoArray.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.Type;
diff --git a/src/com/bukkit/mcteam/gson/TypeInfoCollection.java b/src/org/mcteam/factions/gson/TypeInfoCollection.java
similarity index 97%
rename from src/com/bukkit/mcteam/gson/TypeInfoCollection.java
rename to src/org/mcteam/factions/gson/TypeInfoCollection.java
index 2b00e0e3..2d4e6c66 100644
--- a/src/com/bukkit/mcteam/gson/TypeInfoCollection.java
+++ b/src/org/mcteam/factions/gson/TypeInfoCollection.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
diff --git a/src/com/bukkit/mcteam/gson/TypeInfoFactory.java b/src/org/mcteam/factions/gson/TypeInfoFactory.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/TypeInfoFactory.java
rename to src/org/mcteam/factions/gson/TypeInfoFactory.java
index a4284321..95223202 100644
--- a/src/com/bukkit/mcteam/gson/TypeInfoFactory.java
+++ b/src/org/mcteam/factions/gson/TypeInfoFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.GenericArrayType;
diff --git a/src/com/bukkit/mcteam/gson/TypeInfoMap.java b/src/org/mcteam/factions/gson/TypeInfoMap.java
similarity index 98%
rename from src/com/bukkit/mcteam/gson/TypeInfoMap.java
rename to src/org/mcteam/factions/gson/TypeInfoMap.java
index 7c8cb032..4b134941 100644
--- a/src/com/bukkit/mcteam/gson/TypeInfoMap.java
+++ b/src/org/mcteam/factions/gson/TypeInfoMap.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
diff --git a/src/com/bukkit/mcteam/gson/TypeUtils.java b/src/org/mcteam/factions/gson/TypeUtils.java
similarity index 98%
rename from src/com/bukkit/mcteam/gson/TypeUtils.java
rename to src/org/mcteam/factions/gson/TypeUtils.java
index cb0b525f..54598c4f 100644
--- a/src/com/bukkit/mcteam/gson/TypeUtils.java
+++ b/src/org/mcteam/factions/gson/TypeUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.GenericArrayType;
diff --git a/src/com/bukkit/mcteam/gson/UpperCamelCaseSeparatorNamingPolicy.java b/src/org/mcteam/factions/gson/UpperCamelCaseSeparatorNamingPolicy.java
similarity index 97%
rename from src/com/bukkit/mcteam/gson/UpperCamelCaseSeparatorNamingPolicy.java
rename to src/org/mcteam/factions/gson/UpperCamelCaseSeparatorNamingPolicy.java
index eb307ef4..70b09b66 100644
--- a/src/com/bukkit/mcteam/gson/UpperCamelCaseSeparatorNamingPolicy.java
+++ b/src/org/mcteam/factions/gson/UpperCamelCaseSeparatorNamingPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 /**
  * A {@link FieldNamingStrategy2} that ensures the JSON field names consist of mixed
diff --git a/src/com/bukkit/mcteam/gson/UpperCaseNamingPolicy.java b/src/org/mcteam/factions/gson/UpperCaseNamingPolicy.java
similarity index 97%
rename from src/com/bukkit/mcteam/gson/UpperCaseNamingPolicy.java
rename to src/org/mcteam/factions/gson/UpperCaseNamingPolicy.java
index dbc399ad..6546883c 100644
--- a/src/com/bukkit/mcteam/gson/UpperCaseNamingPolicy.java
+++ b/src/org/mcteam/factions/gson/UpperCaseNamingPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
diff --git a/src/com/bukkit/mcteam/gson/VersionConstants.java b/src/org/mcteam/factions/gson/VersionConstants.java
similarity index 96%
rename from src/com/bukkit/mcteam/gson/VersionConstants.java
rename to src/org/mcteam/factions/gson/VersionConstants.java
index 93221cdf..4173db01 100644
--- a/src/com/bukkit/mcteam/gson/VersionConstants.java
+++ b/src/org/mcteam/factions/gson/VersionConstants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
 /**
  * Class contain all constants for versioning support.
diff --git a/src/com/bukkit/mcteam/gson/VersionExclusionStrategy.java b/src/org/mcteam/factions/gson/VersionExclusionStrategy.java
similarity index 93%
rename from src/com/bukkit/mcteam/gson/VersionExclusionStrategy.java
rename to src/org/mcteam/factions/gson/VersionExclusionStrategy.java
index d4bb5da3..29c7bb9f 100644
--- a/src/com/bukkit/mcteam/gson/VersionExclusionStrategy.java
+++ b/src/org/mcteam/factions/gson/VersionExclusionStrategy.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson;
+package org.mcteam.factions.gson;
 
-import com.bukkit.mcteam.gson.annotations.Since;
-import com.bukkit.mcteam.gson.annotations.Until;
+import org.mcteam.factions.gson.annotations.Since;
+import org.mcteam.factions.gson.annotations.Until;
 
 /**
  * This strategy will exclude any files and/or class that are passed the
diff --git a/src/com/bukkit/mcteam/gson/annotations/Expose.java b/src/org/mcteam/factions/gson/annotations/Expose.java
similarity index 91%
rename from src/com/bukkit/mcteam/gson/annotations/Expose.java
rename to src/org/mcteam/factions/gson/annotations/Expose.java
index 30f1462e..0dea005e 100644
--- a/src/com/bukkit/mcteam/gson/annotations/Expose.java
+++ b/src/org/mcteam/factions/gson/annotations/Expose.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson.annotations;
+package org.mcteam.factions.gson.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -25,9 +25,9 @@ import java.lang.annotation.Target;
  * An annotation that indicates this member should be exposed for JSON
  * serialization or deserialization.
  *
- * <p>This annotation has no effect unless you build {@link com.bukkit.mcteam.gson.Gson}
- * with a {@link com.bukkit.mcteam.gson.GsonBuilder} and invoke
- * {@link com.bukkit.mcteam.gson.GsonBuilder#excludeFieldsWithoutExposeAnnotation()}
+ * <p>This annotation has no effect unless you build {@link org.mcteam.factions.gson.Gson}
+ * with a {@link org.mcteam.factions.gson.GsonBuilder} and invoke
+ * {@link org.mcteam.factions.gson.GsonBuilder#excludeFieldsWithoutExposeAnnotation()}
  * method.</p>
  *
  * <p>Here is an example of how this annotation is meant to be used:
diff --git a/src/com/bukkit/mcteam/gson/annotations/SerializedName.java b/src/org/mcteam/factions/gson/annotations/SerializedName.java
similarity index 86%
rename from src/com/bukkit/mcteam/gson/annotations/SerializedName.java
rename to src/org/mcteam/factions/gson/annotations/SerializedName.java
index ef5bc74b..1be64914 100644
--- a/src/com/bukkit/mcteam/gson/annotations/SerializedName.java
+++ b/src/org/mcteam/factions/gson/annotations/SerializedName.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson.annotations;
+package org.mcteam.factions.gson.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -25,10 +25,10 @@ import java.lang.annotation.Target;
  * An annotation that indicates this member should be serialized to JSON with
  * the provided name value as its field name.
  *
- * <p>This annotation will override any {@link com.bukkit.mcteam.gson.FieldNamingPolicy}, including
- * the default field naming policy, that may have been set on the {@link com.bukkit.mcteam.gson.Gson}
+ * <p>This annotation will override any {@link org.mcteam.factions.gson.FieldNamingPolicy}, including
+ * the default field naming policy, that may have been set on the {@link org.mcteam.factions.gson.Gson}
  * instance.  A different naming policy can set using the {@code GsonBuilder} class.  See
- * {@link com.bukkit.mcteam.gson.GsonBuilder#setFieldNamingPolicy(com.bukkit.mcteam.gson.FieldNamingPolicy)}
+ * {@link org.mcteam.factions.gson.GsonBuilder#setFieldNamingPolicy(org.mcteam.factions.gson.FieldNamingPolicy)}
  * for more information.</p>
  *
  * <p>Here is an example of how this annotation is meant to be used:</p>
@@ -58,7 +58,7 @@ import java.lang.annotation.Target;
  *
  * <p>NOTE: The value you specify in this annotation must be a valid JSON field name.</p>
  *
- * @see com.bukkit.mcteam.gson.FieldNamingPolicy
+ * @see org.mcteam.factions.gson.FieldNamingPolicy
  *
  * @author Inderjeet Singh
  * @author Joel Leitch
diff --git a/src/com/bukkit/mcteam/gson/annotations/Since.java b/src/org/mcteam/factions/gson/annotations/Since.java
similarity index 87%
rename from src/com/bukkit/mcteam/gson/annotations/Since.java
rename to src/org/mcteam/factions/gson/annotations/Since.java
index db1d891e..7d4730c5 100644
--- a/src/com/bukkit/mcteam/gson/annotations/Since.java
+++ b/src/org/mcteam/factions/gson/annotations/Since.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson.annotations;
+package org.mcteam.factions.gson.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -26,9 +26,9 @@ import java.lang.annotation.Target;
  * This annotation is useful to manage versioning of your Json classes for a web-service.
  *
  * <p>
- * This annotation has no effect unless you build {@link com.bukkit.mcteam.gson.Gson} with a
- * {@link com.bukkit.mcteam.gson.GsonBuilder} and invoke
- * {@link com.bukkit.mcteam.gson.GsonBuilder#setVersion(double)} method.
+ * This annotation has no effect unless you build {@link org.mcteam.factions.gson.Gson} with a
+ * {@link org.mcteam.factions.gson.GsonBuilder} and invoke
+ * {@link org.mcteam.factions.gson.GsonBuilder#setVersion(double)} method.
  *
  * <p>Here is an example of how this annotation is meant to be used:</p>
  * <pre>
diff --git a/src/com/bukkit/mcteam/gson/annotations/Until.java b/src/org/mcteam/factions/gson/annotations/Until.java
similarity index 89%
rename from src/com/bukkit/mcteam/gson/annotations/Until.java
rename to src/org/mcteam/factions/gson/annotations/Until.java
index fa29047e..904a1ce6 100644
--- a/src/com/bukkit/mcteam/gson/annotations/Until.java
+++ b/src/org/mcteam/factions/gson/annotations/Until.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson.annotations;
+package org.mcteam.factions.gson.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -28,9 +28,9 @@ import java.lang.annotation.Target;
  * is useful to manage versioning of your JSON classes for a web-service.
  *
  * <p>
- * This annotation has no effect unless you build {@link com.bukkit.mcteam.gson.Gson} with a
- * {@link com.bukkit.mcteam.gson.GsonBuilder} and invoke
- * {@link com.bukkit.mcteam.gson.GsonBuilder#setVersion(double)} method.
+ * This annotation has no effect unless you build {@link org.mcteam.factions.gson.Gson} with a
+ * {@link org.mcteam.factions.gson.GsonBuilder} and invoke
+ * {@link org.mcteam.factions.gson.GsonBuilder#setVersion(double)} method.
  *
  * <p>Here is an example of how this annotation is meant to be used:</p>
  * <pre>
diff --git a/src/com/bukkit/mcteam/gson/annotations/package-info.java b/src/org/mcteam/factions/gson/annotations/package-info.java
similarity index 59%
rename from src/com/bukkit/mcteam/gson/annotations/package-info.java
rename to src/org/mcteam/factions/gson/annotations/package-info.java
index 010327d4..f5190215 100644
--- a/src/com/bukkit/mcteam/gson/annotations/package-info.java
+++ b/src/org/mcteam/factions/gson/annotations/package-info.java
@@ -1,6 +1,6 @@
 /**
- * This package provides annotations that can be used with {@link com.bukkit.mcteam.gson.Gson}.
+ * This package provides annotations that can be used with {@link org.mcteam.factions.gson.Gson}.
  * 
  * @author Inderjeet Singh, Joel Leitch
  */
-package com.bukkit.mcteam.gson.annotations;
\ No newline at end of file
+package org.mcteam.factions.gson.annotations;
\ No newline at end of file
diff --git a/src/com/bukkit/mcteam/gson/package-info.java b/src/org/mcteam/factions/gson/package-info.java
similarity index 93%
rename from src/com/bukkit/mcteam/gson/package-info.java
rename to src/org/mcteam/factions/gson/package-info.java
index dd651cfe..f187694f 100644
--- a/src/com/bukkit/mcteam/gson/package-info.java
+++ b/src/org/mcteam/factions/gson/package-info.java
@@ -8,4 +8,4 @@
  *
  * @author Inderjeet Singh, Joel Leitch
  */
-package com.bukkit.mcteam.gson;
\ No newline at end of file
+package org.mcteam.factions.gson;
\ No newline at end of file
diff --git a/src/com/bukkit/mcteam/gson/reflect/TypeToken.java b/src/org/mcteam/factions/gson/reflect/TypeToken.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/reflect/TypeToken.java
rename to src/org/mcteam/factions/gson/reflect/TypeToken.java
index 6bac1a68..310f8cab 100644
--- a/src/com/bukkit/mcteam/gson/reflect/TypeToken.java
+++ b/src/org/mcteam/factions/gson/reflect/TypeToken.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson.reflect;
+package org.mcteam.factions.gson.reflect;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.GenericArrayType;
diff --git a/src/com/bukkit/mcteam/gson/reflect/package-info.java b/src/org/mcteam/factions/gson/reflect/package-info.java
similarity index 77%
rename from src/com/bukkit/mcteam/gson/reflect/package-info.java
rename to src/org/mcteam/factions/gson/reflect/package-info.java
index a02e6c95..5e2f1539 100644
--- a/src/com/bukkit/mcteam/gson/reflect/package-info.java
+++ b/src/org/mcteam/factions/gson/reflect/package-info.java
@@ -3,4 +3,4 @@
  *  
  * @author Inderjeet Singh, Joel Leitch
  */
-package com.bukkit.mcteam.gson.reflect;
\ No newline at end of file
+package org.mcteam.factions.gson.reflect;
\ No newline at end of file
diff --git a/src/com/bukkit/mcteam/gson/stream/JsonReader.java b/src/org/mcteam/factions/gson/stream/JsonReader.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/stream/JsonReader.java
rename to src/org/mcteam/factions/gson/stream/JsonReader.java
index 0b260b97..5f79cbea 100644
--- a/src/com/bukkit/mcteam/gson/stream/JsonReader.java
+++ b/src/org/mcteam/factions/gson/stream/JsonReader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson.stream;
+package org.mcteam.factions.gson.stream;
 
 import java.io.Closeable;
 import java.io.EOFException;
diff --git a/src/com/bukkit/mcteam/gson/stream/JsonScope.java b/src/org/mcteam/factions/gson/stream/JsonScope.java
similarity index 97%
rename from src/com/bukkit/mcteam/gson/stream/JsonScope.java
rename to src/org/mcteam/factions/gson/stream/JsonScope.java
index 5743a905..504856ca 100644
--- a/src/com/bukkit/mcteam/gson/stream/JsonScope.java
+++ b/src/org/mcteam/factions/gson/stream/JsonScope.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson.stream;
+package org.mcteam.factions.gson.stream;
 
 /**
  * Lexical scoping elements within a JSON reader or writer.
diff --git a/src/com/bukkit/mcteam/gson/stream/JsonToken.java b/src/org/mcteam/factions/gson/stream/JsonToken.java
similarity index 98%
rename from src/com/bukkit/mcteam/gson/stream/JsonToken.java
rename to src/org/mcteam/factions/gson/stream/JsonToken.java
index 7a8ad5c2..2b717ee8 100644
--- a/src/com/bukkit/mcteam/gson/stream/JsonToken.java
+++ b/src/org/mcteam/factions/gson/stream/JsonToken.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson.stream;
+package org.mcteam.factions.gson.stream;
 
 /**
  * A structure, name or value type in a JSON-encoded string.
diff --git a/src/com/bukkit/mcteam/gson/stream/JsonWriter.java b/src/org/mcteam/factions/gson/stream/JsonWriter.java
similarity index 99%
rename from src/com/bukkit/mcteam/gson/stream/JsonWriter.java
rename to src/org/mcteam/factions/gson/stream/JsonWriter.java
index 9d9f27ef..ff865131 100644
--- a/src/com/bukkit/mcteam/gson/stream/JsonWriter.java
+++ b/src/org/mcteam/factions/gson/stream/JsonWriter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson.stream;
+package org.mcteam.factions.gson.stream;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/src/com/bukkit/mcteam/gson/stream/MalformedJsonException.java b/src/org/mcteam/factions/gson/stream/MalformedJsonException.java
similarity index 97%
rename from src/com/bukkit/mcteam/gson/stream/MalformedJsonException.java
rename to src/org/mcteam/factions/gson/stream/MalformedJsonException.java
index 822b8b65..b34fa2e8 100644
--- a/src/com/bukkit/mcteam/gson/stream/MalformedJsonException.java
+++ b/src/org/mcteam/factions/gson/stream/MalformedJsonException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bukkit.mcteam.gson.stream;
+package org.mcteam.factions.gson.stream;
 
 import java.io.IOException;
 
diff --git a/src/com/bukkit/mcteam/factions/listeners/FactionsBlockListener.java b/src/org/mcteam/factions/listeners/FactionsBlockListener.java
similarity index 86%
rename from src/com/bukkit/mcteam/factions/listeners/FactionsBlockListener.java
rename to src/org/mcteam/factions/listeners/FactionsBlockListener.java
index fe76e765..fc1c85fb 100644
--- a/src/com/bukkit/mcteam/factions/listeners/FactionsBlockListener.java
+++ b/src/org/mcteam/factions/listeners/FactionsBlockListener.java
@@ -1,4 +1,4 @@
-package com.bukkit.mcteam.factions.listeners;
+package org.mcteam.factions.listeners;
 
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
@@ -6,13 +6,13 @@ import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockDamageEvent;
 import org.bukkit.event.block.BlockListener;
 import org.bukkit.event.block.BlockPlaceEvent;
+import org.mcteam.factions.Board;
+import org.mcteam.factions.Conf;
+import org.mcteam.factions.FLocation;
+import org.mcteam.factions.FPlayer;
+import org.mcteam.factions.Faction;
+import org.mcteam.factions.Factions;
 
-import com.bukkit.mcteam.factions.Board;
-import com.bukkit.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.FLocation;
-import com.bukkit.mcteam.factions.FPlayer;
-import com.bukkit.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.Factions;
 
 public class FactionsBlockListener extends BlockListener {
 	
diff --git a/src/com/bukkit/mcteam/factions/listeners/FactionsEntityListener.java b/src/org/mcteam/factions/listeners/FactionsEntityListener.java
similarity index 94%
rename from src/com/bukkit/mcteam/factions/listeners/FactionsEntityListener.java
rename to src/org/mcteam/factions/listeners/FactionsEntityListener.java
index cbda20e3..74d199d0 100644
--- a/src/com/bukkit/mcteam/factions/listeners/FactionsEntityListener.java
+++ b/src/org/mcteam/factions/listeners/FactionsEntityListener.java
@@ -1,4 +1,4 @@
-package com.bukkit.mcteam.factions.listeners;
+package org.mcteam.factions.listeners;
 
 import java.text.MessageFormat;
 
@@ -15,14 +15,14 @@ import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.entity.EntityListener;
 import org.bukkit.event.entity.EntityTargetEvent;
+import org.mcteam.factions.Board;
+import org.mcteam.factions.Conf;
+import org.mcteam.factions.FLocation;
+import org.mcteam.factions.FPlayer;
+import org.mcteam.factions.Faction;
+import org.mcteam.factions.struct.Relation;
+import org.mcteam.factions.util.EntityUtil;
 
-import com.bukkit.mcteam.factions.Board;
-import com.bukkit.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.FLocation;
-import com.bukkit.mcteam.factions.FPlayer;
-import com.bukkit.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.struct.Relation;
-import com.bukkit.mcteam.util.EntityUtil;
 
 public class FactionsEntityListener extends EntityListener {
 	
diff --git a/src/com/bukkit/mcteam/factions/listeners/FactionsPlayerListener.java b/src/org/mcteam/factions/listeners/FactionsPlayerListener.java
similarity index 95%
rename from src/com/bukkit/mcteam/factions/listeners/FactionsPlayerListener.java
rename to src/org/mcteam/factions/listeners/FactionsPlayerListener.java
index 32d72cf9..0f1bbef8 100644
--- a/src/com/bukkit/mcteam/factions/listeners/FactionsPlayerListener.java
+++ b/src/org/mcteam/factions/listeners/FactionsPlayerListener.java
@@ -1,4 +1,4 @@
-package com.bukkit.mcteam.factions.listeners;
+package org.mcteam.factions.listeners;
 
 import java.util.List;
 import java.util.logging.Logger;
@@ -18,14 +18,14 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerListener;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
+import org.mcteam.factions.Board;
+import org.mcteam.factions.Conf;
+import org.mcteam.factions.FLocation;
+import org.mcteam.factions.FPlayer;
+import org.mcteam.factions.Faction;
+import org.mcteam.factions.Factions;
+import org.mcteam.factions.util.TextUtil;
 
-import com.bukkit.mcteam.factions.Board;
-import com.bukkit.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.FLocation;
-import com.bukkit.mcteam.factions.FPlayer;
-import com.bukkit.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.Factions;
-import com.bukkit.mcteam.factions.util.TextUtil;
 
 
 public class FactionsPlayerListener extends PlayerListener{
diff --git a/src/com/bukkit/mcteam/factions/struct/Relation.java b/src/org/mcteam/factions/struct/Relation.java
similarity index 89%
rename from src/com/bukkit/mcteam/factions/struct/Relation.java
rename to src/org/mcteam/factions/struct/Relation.java
index 8b231b18..17565050 100644
--- a/src/com/bukkit/mcteam/factions/struct/Relation.java
+++ b/src/org/mcteam/factions/struct/Relation.java
@@ -1,8 +1,8 @@
-package com.bukkit.mcteam.factions.struct;
+package org.mcteam.factions.struct;
 
 import org.bukkit.ChatColor;
+import org.mcteam.factions.Conf;
 
-import com.bukkit.mcteam.factions.Conf;
 
 public enum Relation {
 	MEMBER(3, "member"),
diff --git a/src/com/bukkit/mcteam/factions/struct/Role.java b/src/org/mcteam/factions/struct/Role.java
similarity index 86%
rename from src/com/bukkit/mcteam/factions/struct/Role.java
rename to src/org/mcteam/factions/struct/Role.java
index e73a7039..ab219247 100644
--- a/src/com/bukkit/mcteam/factions/struct/Role.java
+++ b/src/org/mcteam/factions/struct/Role.java
@@ -1,6 +1,6 @@
-package com.bukkit.mcteam.factions.struct;
+package org.mcteam.factions.struct;
 
-import com.bukkit.mcteam.factions.Conf;
+import org.mcteam.factions.Conf;
 
 public enum Role {
 	ADMIN(2, "admin"),
diff --git a/src/com/bukkit/mcteam/util/AsciiCompass.java b/src/org/mcteam/factions/util/AsciiCompass.java
similarity index 98%
rename from src/com/bukkit/mcteam/util/AsciiCompass.java
rename to src/org/mcteam/factions/util/AsciiCompass.java
index cead2e76..82b7f798 100644
--- a/src/com/bukkit/mcteam/util/AsciiCompass.java
+++ b/src/org/mcteam/factions/util/AsciiCompass.java
@@ -1,4 +1,4 @@
-package com.bukkit.mcteam.util;
+package org.mcteam.factions.util;
 
 import java.util.*;
 
diff --git a/src/com/bukkit/mcteam/util/DiscUtil.java b/src/org/mcteam/factions/util/DiscUtil.java
similarity index 95%
rename from src/com/bukkit/mcteam/util/DiscUtil.java
rename to src/org/mcteam/factions/util/DiscUtil.java
index 62088a04..4744238f 100644
--- a/src/com/bukkit/mcteam/util/DiscUtil.java
+++ b/src/org/mcteam/factions/util/DiscUtil.java
@@ -1,4 +1,4 @@
-package com.bukkit.mcteam.util;
+package org.mcteam.factions.util;
 
 import java.io.*;
 
diff --git a/src/com/bukkit/mcteam/util/EntityUtil.java b/src/org/mcteam/factions/util/EntityUtil.java
similarity index 92%
rename from src/com/bukkit/mcteam/util/EntityUtil.java
rename to src/org/mcteam/factions/util/EntityUtil.java
index 7f05fa33..d2e94d23 100644
--- a/src/com/bukkit/mcteam/util/EntityUtil.java
+++ b/src/org/mcteam/factions/util/EntityUtil.java
@@ -1,4 +1,4 @@
-package com.bukkit.mcteam.util;
+package org.mcteam.factions.util;
 
 import org.bukkit.entity.Creature;
 import org.bukkit.entity.CreatureType;
diff --git a/src/com/bukkit/mcteam/factions/util/TextUtil.java b/src/org/mcteam/factions/util/TextUtil.java
similarity index 96%
rename from src/com/bukkit/mcteam/factions/util/TextUtil.java
rename to src/org/mcteam/factions/util/TextUtil.java
index f5ae4a51..0f8885e6 100644
--- a/src/com/bukkit/mcteam/factions/util/TextUtil.java
+++ b/src/org/mcteam/factions/util/TextUtil.java
@@ -1,9 +1,9 @@
-package com.bukkit.mcteam.factions.util;
+package org.mcteam.factions.util;
 import java.util.*;
 
 import org.bukkit.Material;
+import org.mcteam.factions.Conf;
 
-import com.bukkit.mcteam.factions.Conf;
 
 public class TextUtil {
 	public static String titleize(String str) {