Fixed the package structure

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");

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");

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;

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.

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 {
 	

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;

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";

src/org/mcteam/factions/SaveTask.java

@@ -1,4 +1,4 @@
-package com.bukkit.mcteam.factions;
+package org.mcteam.factions;
 
 public class SaveTask implements Runnable {
 

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;

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 org.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.FPlayer;
+import org.mcteam.factions.FPlayer;
-import com.bukkit.mcteam.factions.Faction;
+import org.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.struct.Role;
+import org.mcteam.factions.struct.Role;
 
 public class FCommandAdmin extends FBaseCommand {
 	

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;
 

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 {
 	

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 org.mcteam.factions.Board;
-import com.bukkit.mcteam.factions.Conf;
+import org.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.FLocation;
+import org.mcteam.factions.FLocation;
-import com.bukkit.mcteam.factions.Faction;
+import org.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.struct.Relation;
+import org.mcteam.factions.struct.Relation;
-import com.bukkit.mcteam.factions.struct.Role;
+import org.mcteam.factions.struct.Role;
 
 public class FCommandClaim extends FBaseCommand {
 	

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 {
 	

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 org.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.FPlayer;
+import org.mcteam.factions.FPlayer;
-import com.bukkit.mcteam.factions.Faction;
+import org.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.struct.Role;
+import org.mcteam.factions.struct.Role;
 
 public class FCommandDeinvite extends FBaseCommand {
 	

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 org.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.FPlayer;
+import org.mcteam.factions.FPlayer;
-import com.bukkit.mcteam.factions.struct.Role;
+import org.mcteam.factions.struct.Role;
-import com.bukkit.mcteam.factions.util.TextUtil;
+import org.mcteam.factions.util.TextUtil;
 
 public class FCommandDescription extends FBaseCommand {
 	

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 {
 	

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 org.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.Faction;
+import org.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.struct.Role;
+import org.mcteam.factions.struct.Role;
 
 public class FCommandHome extends FBaseCommand {
 	

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 org.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.FPlayer;
+import org.mcteam.factions.FPlayer;
-import com.bukkit.mcteam.factions.Faction;
+import org.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.struct.Role;
+import org.mcteam.factions.struct.Role;
 
 public class FCommandInvite extends FBaseCommand {
 	

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 org.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.Faction;
+import org.mcteam.factions.Faction;
 
 public class FCommandJoin extends FBaseCommand {
 	

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 org.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.FPlayer;
+import org.mcteam.factions.FPlayer;
-import com.bukkit.mcteam.factions.Faction;
+import org.mcteam.factions.Faction;
 
 public class FCommandKick extends FBaseCommand {
 	

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;
 

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 {
 	

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 {
 	

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 org.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.FPlayer;
+import org.mcteam.factions.FPlayer;
-import com.bukkit.mcteam.factions.Faction;
+import org.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.struct.Role;
+import org.mcteam.factions.struct.Role;
 
 public class FCommandMod extends FBaseCommand {
 	

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 org.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.Faction;
+import org.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.struct.Role;
+import org.mcteam.factions.struct.Role;
 
 public class FCommandOpen extends FBaseCommand {
 	

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 {
 	

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 {
 	

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 {
 	

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 {
 	

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 org.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.Faction;
+import org.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.struct.Role;
+import org.mcteam.factions.struct.Role;
 
 public class FCommandSethome extends FBaseCommand {
 	

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 {
 	

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 org.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.Faction;
+import org.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.struct.Role;
+import org.mcteam.factions.struct.Role;
-import com.bukkit.mcteam.factions.util.TextUtil;
+import org.mcteam.factions.util.TextUtil;
+
 
 public class FCommandTag extends FBaseCommand {
 	

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 org.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.FPlayer;
+import org.mcteam.factions.FPlayer;
-import com.bukkit.mcteam.factions.Faction;
+import org.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.util.TextUtil;
+import org.mcteam.factions.util.TextUtil;
 
 public class FCommandTitle extends FBaseCommand {
 	

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 org.mcteam.factions.Board;
-import com.bukkit.mcteam.factions.Conf;
+import org.mcteam.factions.Conf;
-import com.bukkit.mcteam.factions.FLocation;
+import org.mcteam.factions.FLocation;
-import com.bukkit.mcteam.factions.Faction;
+import org.mcteam.factions.Faction;
-import com.bukkit.mcteam.factions.Factions;
+import org.mcteam.factions.Factions;
-import com.bukkit.mcteam.factions.struct.Role;
+import org.mcteam.factions.struct.Role;
 
 public class FCommandUnclaim extends FBaseCommand {
 	

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 {
 	

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 {
 	

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;
 
 
 /**

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.

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;

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.

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;

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;

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;
 

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;
 

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;

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

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

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

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;

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}
+ * This enumeration should be used in conjunction with {@link org.mcteam.factions.gson.GsonBuilder}
- * to configure a {@link com.bukkit.mcteam.gson.Gson} instance to properly translate Java field
+ * 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

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;
 

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

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}

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;

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();

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
    */

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;
 

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;
 

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;

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;

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;

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;
 

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;
 

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;
 

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;
 

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;
 

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;

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;
 

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>
  *

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

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;
 

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;

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;
 

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

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
  *

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;

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;
 

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;
 

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;

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>

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 org.mcteam.factions.gson.stream.JsonReader;
-import com.bukkit.mcteam.gson.stream.JsonToken;
+import org.mcteam.factions.gson.stream.JsonToken;
-import com.bukkit.mcteam.gson.stream.MalformedJsonException;
+import org.mcteam.factions.gson.stream.MalformedJsonException;
+
 
 /**
  * A streaming parser that allows reading of multiple {@link JsonElement}s from the specified reader

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

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;

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.

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

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;

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;

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;

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;

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;
 

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;

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;

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;
 
 
 /**

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;
 

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;

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.

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;
 

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.

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;