diff --git a/src/org/mcteam/factions/Board.java b/src/com/massivecraft/factions/Board.java similarity index 95% rename from src/org/mcteam/factions/Board.java rename to src/com/massivecraft/factions/Board.java index f36713e2..f7b70aa3 100644 --- a/src/org/mcteam/factions/Board.java +++ b/src/com/massivecraft/factions/Board.java @@ -1,4 +1,4 @@ -package org.mcteam.factions; +package com.massivecraft.factions; import java.io.*; import java.lang.reflect.Type; @@ -11,14 +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.massivecraft.factions.gson.JsonArray; +import com.massivecraft.factions.gson.JsonElement; +import com.massivecraft.factions.gson.JsonObject; +import com.massivecraft.factions.gson.JsonParser; +import com.massivecraft.factions.gson.reflect.TypeToken; +import com.massivecraft.factions.util.AsciiCompass; +import com.massivecraft.factions.util.DiscUtil; +import com.massivecraft.factions.util.TextUtil; public class Board { diff --git a/src/org/mcteam/factions/Conf.java b/src/com/massivecraft/factions/Conf.java similarity index 99% rename from src/org/mcteam/factions/Conf.java rename to src/com/massivecraft/factions/Conf.java index 604cecc4..70fb2cdc 100644 --- a/src/org/mcteam/factions/Conf.java +++ b/src/com/massivecraft/factions/Conf.java @@ -1,10 +1,11 @@ -package org.mcteam.factions; +package com.massivecraft.factions; import java.io.File; import java.util.*; import org.bukkit.*; import org.bukkit.entity.CreatureType; -import org.mcteam.factions.util.DiscUtil; + +import com.massivecraft.factions.util.DiscUtil; public class Conf { diff --git a/src/org/mcteam/factions/FLocation.java b/src/com/massivecraft/factions/FLocation.java similarity index 97% rename from src/org/mcteam/factions/FLocation.java rename to src/com/massivecraft/factions/FLocation.java index cf870c25..d144b52f 100644 --- a/src/org/mcteam/factions/FLocation.java +++ b/src/com/massivecraft/factions/FLocation.java @@ -1,11 +1,12 @@ -package org.mcteam.factions; +package com.massivecraft.factions; import java.util.HashSet; import org.bukkit.Location; import org.bukkit.block.Block; import org.bukkit.entity.Player; -import org.mcteam.factions.util.MiscUtil; + +import com.massivecraft.factions.util.MiscUtil; public class FLocation { diff --git a/src/org/mcteam/factions/FPlayer.java b/src/com/massivecraft/factions/FPlayer.java similarity index 98% rename from src/org/mcteam/factions/FPlayer.java rename to src/com/massivecraft/factions/FPlayer.java index 3b938618..0e177938 100644 --- a/src/org/mcteam/factions/FPlayer.java +++ b/src/com/massivecraft/factions/FPlayer.java @@ -1,4 +1,4 @@ -package org.mcteam.factions; +package com.massivecraft.factions; import java.io.*; import java.lang.reflect.Type; @@ -8,10 +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.massivecraft.factions.gson.reflect.TypeToken; +import com.massivecraft.factions.struct.Relation; +import com.massivecraft.factions.struct.Role; +import com.massivecraft.factions.util.DiscUtil; /** diff --git a/src/org/mcteam/factions/Faction.java b/src/com/massivecraft/factions/Faction.java similarity index 98% rename from src/org/mcteam/factions/Faction.java rename to src/com/massivecraft/factions/Faction.java index d6333fdd..61086e23 100644 --- a/src/org/mcteam/factions/Faction.java +++ b/src/com/massivecraft/factions/Faction.java @@ -1,4 +1,4 @@ -package org.mcteam.factions; +package com.massivecraft.factions; import java.io.*; import java.lang.reflect.Type; @@ -9,10 +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.massivecraft.factions.gson.reflect.TypeToken; +import com.massivecraft.factions.struct.Relation; +import com.massivecraft.factions.struct.Role; +import com.massivecraft.factions.util.*; public class Faction { diff --git a/src/org/mcteam/factions/Factions.java b/src/com/massivecraft/factions/Factions.java similarity index 97% rename from src/org/mcteam/factions/Factions.java rename to src/com/massivecraft/factions/Factions.java index 6e3c5882..516866df 100644 --- a/src/org/mcteam/factions/Factions.java +++ b/src/com/massivecraft/factions/Factions.java @@ -1,4 +1,4 @@ -package org.mcteam.factions; +package com.massivecraft.factions; import java.lang.reflect.Modifier; import java.util.ArrayList; @@ -19,14 +19,14 @@ import org.bukkit.event.player.PlayerChatEvent; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; -import org.mcteam.factions.commands.*; -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.massivecraft.factions.commands.*; +import com.massivecraft.factions.gson.Gson; +import com.massivecraft.factions.gson.GsonBuilder; +import com.massivecraft.factions.listeners.FactionsBlockListener; +import com.massivecraft.factions.listeners.FactionsEntityListener; +import com.massivecraft.factions.listeners.FactionsPlayerListener; import com.nijiko.permissions.PermissionHandler; import com.nijikokun.bukkit.Permissions.Permissions; diff --git a/src/org/mcteam/factions/MyLocationTypeAdapter.java b/src/com/massivecraft/factions/MyLocationTypeAdapter.java similarity index 82% rename from src/org/mcteam/factions/MyLocationTypeAdapter.java rename to src/com/massivecraft/factions/MyLocationTypeAdapter.java index c9443bbb..4b792372 100644 --- a/src/org/mcteam/factions/MyLocationTypeAdapter.java +++ b/src/com/massivecraft/factions/MyLocationTypeAdapter.java @@ -1,17 +1,18 @@ -package org.mcteam.factions; +package com.massivecraft.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.massivecraft.factions.gson.JsonDeserializationContext; +import com.massivecraft.factions.gson.JsonDeserializer; +import com.massivecraft.factions.gson.JsonElement; +import com.massivecraft.factions.gson.JsonObject; +import com.massivecraft.factions.gson.JsonParseException; +import com.massivecraft.factions.gson.JsonSerializationContext; +import com.massivecraft.factions.gson.JsonSerializer; public class MyLocationTypeAdapter implements JsonDeserializer, JsonSerializer { diff --git a/src/org/mcteam/factions/SaveTask.java b/src/com/massivecraft/factions/SaveTask.java similarity index 80% rename from src/org/mcteam/factions/SaveTask.java rename to src/com/massivecraft/factions/SaveTask.java index 58c62b89..38b1d5fc 100644 --- a/src/org/mcteam/factions/SaveTask.java +++ b/src/com/massivecraft/factions/SaveTask.java @@ -1,4 +1,4 @@ -package org.mcteam.factions; +package com.massivecraft.factions; public class SaveTask implements Runnable { diff --git a/src/org/mcteam/factions/commands/FBaseCommand.java b/src/com/massivecraft/factions/commands/FBaseCommand.java similarity index 95% rename from src/org/mcteam/factions/commands/FBaseCommand.java rename to src/com/massivecraft/factions/commands/FBaseCommand.java index 59f2e3b5..26217c76 100644 --- a/src/org/mcteam/factions/commands/FBaseCommand.java +++ b/src/com/massivecraft/factions/commands/FBaseCommand.java @@ -1,16 +1,17 @@ -package org.mcteam.factions.commands; +package com.massivecraft.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.massivecraft.factions.Conf; +import com.massivecraft.factions.FPlayer; +import com.massivecraft.factions.Faction; +import com.massivecraft.factions.Factions; +import com.massivecraft.factions.struct.Role; +import com.massivecraft.factions.util.TextUtil; public class FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandAdmin.java b/src/com/massivecraft/factions/commands/FCommandAdmin.java similarity index 86% rename from src/org/mcteam/factions/commands/FCommandAdmin.java rename to src/com/massivecraft/factions/commands/FCommandAdmin.java index 447575ae..c2451172 100644 --- a/src/org/mcteam/factions/commands/FCommandAdmin.java +++ b/src/com/massivecraft/factions/commands/FCommandAdmin.java @@ -1,9 +1,9 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; -import org.mcteam.factions.Conf; -import org.mcteam.factions.FPlayer; -import org.mcteam.factions.Faction; -import org.mcteam.factions.struct.Role; +import com.massivecraft.factions.Conf; +import com.massivecraft.factions.FPlayer; +import com.massivecraft.factions.Faction; +import com.massivecraft.factions.struct.Role; public class FCommandAdmin extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandAutoClaim.java b/src/com/massivecraft/factions/commands/FCommandAutoClaim.java similarity index 85% rename from src/org/mcteam/factions/commands/FCommandAutoClaim.java rename to src/com/massivecraft/factions/commands/FCommandAutoClaim.java index 23921c9c..b4045766 100644 --- a/src/org/mcteam/factions/commands/FCommandAutoClaim.java +++ b/src/com/massivecraft/factions/commands/FCommandAutoClaim.java @@ -1,9 +1,9 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; -import org.mcteam.factions.Conf; -import org.mcteam.factions.FLocation; -import org.mcteam.factions.Faction; -import org.mcteam.factions.struct.Role; +import com.massivecraft.factions.Conf; +import com.massivecraft.factions.FLocation; +import com.massivecraft.factions.Faction; +import com.massivecraft.factions.struct.Role; public class FCommandAutoClaim extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandAutoSafeclaim.java b/src/com/massivecraft/factions/commands/FCommandAutoSafeclaim.java similarity index 82% rename from src/org/mcteam/factions/commands/FCommandAutoSafeclaim.java rename to src/com/massivecraft/factions/commands/FCommandAutoSafeclaim.java index 78d8fda3..6125d7c0 100644 --- a/src/org/mcteam/factions/commands/FCommandAutoSafeclaim.java +++ b/src/com/massivecraft/factions/commands/FCommandAutoSafeclaim.java @@ -1,10 +1,11 @@ -package org.mcteam.factions.commands; +package com.massivecraft.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.massivecraft.factions.Board; +import com.massivecraft.factions.FLocation; +import com.massivecraft.factions.Faction; +import com.massivecraft.factions.Factions; public class FCommandAutoSafeclaim extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandAutoWarclaim.java b/src/com/massivecraft/factions/commands/FCommandAutoWarclaim.java similarity index 82% rename from src/org/mcteam/factions/commands/FCommandAutoWarclaim.java rename to src/com/massivecraft/factions/commands/FCommandAutoWarclaim.java index 6fa7abf3..4276866c 100644 --- a/src/org/mcteam/factions/commands/FCommandAutoWarclaim.java +++ b/src/com/massivecraft/factions/commands/FCommandAutoWarclaim.java @@ -1,10 +1,11 @@ -package org.mcteam.factions.commands; +package com.massivecraft.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.massivecraft.factions.Board; +import com.massivecraft.factions.FLocation; +import com.massivecraft.factions.Faction; +import com.massivecraft.factions.Factions; public class FCommandAutoWarclaim extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandBypass.java b/src/com/massivecraft/factions/commands/FCommandBypass.java similarity index 85% rename from src/org/mcteam/factions/commands/FCommandBypass.java rename to src/com/massivecraft/factions/commands/FCommandBypass.java index b0f0ccbd..f58c2da0 100644 --- a/src/org/mcteam/factions/commands/FCommandBypass.java +++ b/src/com/massivecraft/factions/commands/FCommandBypass.java @@ -1,8 +1,9 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; import org.bukkit.command.CommandSender; -import org.mcteam.factions.Conf; -import org.mcteam.factions.Factions; + +import com.massivecraft.factions.Conf; +import com.massivecraft.factions.Factions; public class FCommandBypass extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandChat.java b/src/com/massivecraft/factions/commands/FCommandChat.java similarity index 92% rename from src/org/mcteam/factions/commands/FCommandChat.java rename to src/com/massivecraft/factions/commands/FCommandChat.java index 9781090a..c7b2157a 100644 --- a/src/org/mcteam/factions/commands/FCommandChat.java +++ b/src/com/massivecraft/factions/commands/FCommandChat.java @@ -1,4 +1,4 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; public class FCommandChat extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandClaim.java b/src/com/massivecraft/factions/commands/FCommandClaim.java similarity index 88% rename from src/org/mcteam/factions/commands/FCommandClaim.java rename to src/com/massivecraft/factions/commands/FCommandClaim.java index 4ffb8781..6324fd65 100644 --- a/src/org/mcteam/factions/commands/FCommandClaim.java +++ b/src/com/massivecraft/factions/commands/FCommandClaim.java @@ -1,4 +1,4 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; public class FCommandClaim extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandCreate.java b/src/com/massivecraft/factions/commands/FCommandCreate.java similarity index 83% rename from src/org/mcteam/factions/commands/FCommandCreate.java rename to src/com/massivecraft/factions/commands/FCommandCreate.java index ea4e54cb..bd512e14 100644 --- a/src/org/mcteam/factions/commands/FCommandCreate.java +++ b/src/com/massivecraft/factions/commands/FCommandCreate.java @@ -1,13 +1,14 @@ -package org.mcteam.factions.commands; +package com.massivecraft.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.massivecraft.factions.Conf; +import com.massivecraft.factions.FPlayer; +import com.massivecraft.factions.Faction; +import com.massivecraft.factions.Factions; +import com.massivecraft.factions.struct.Role; public class FCommandCreate extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandDeinvite.java b/src/com/massivecraft/factions/commands/FCommandDeinvite.java similarity index 84% rename from src/org/mcteam/factions/commands/FCommandDeinvite.java rename to src/com/massivecraft/factions/commands/FCommandDeinvite.java index a8642706..a7e93df2 100644 --- a/src/org/mcteam/factions/commands/FCommandDeinvite.java +++ b/src/com/massivecraft/factions/commands/FCommandDeinvite.java @@ -1,9 +1,9 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; -import org.mcteam.factions.Conf; -import org.mcteam.factions.FPlayer; -import org.mcteam.factions.Faction; -import org.mcteam.factions.struct.Role; +import com.massivecraft.factions.Conf; +import com.massivecraft.factions.FPlayer; +import com.massivecraft.factions.Faction; +import com.massivecraft.factions.struct.Role; public class FCommandDeinvite extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandDescription.java b/src/com/massivecraft/factions/commands/FCommandDescription.java similarity index 78% rename from src/org/mcteam/factions/commands/FCommandDescription.java rename to src/com/massivecraft/factions/commands/FCommandDescription.java index ac1c6489..8040da19 100644 --- a/src/org/mcteam/factions/commands/FCommandDescription.java +++ b/src/com/massivecraft/factions/commands/FCommandDescription.java @@ -1,9 +1,9 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; -import org.mcteam.factions.Conf; -import org.mcteam.factions.FPlayer; -import org.mcteam.factions.struct.Role; -import org.mcteam.factions.util.TextUtil; +import com.massivecraft.factions.Conf; +import com.massivecraft.factions.FPlayer; +import com.massivecraft.factions.struct.Role; +import com.massivecraft.factions.util.TextUtil; public class FCommandDescription extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandDisband.java b/src/com/massivecraft/factions/commands/FCommandDisband.java similarity index 81% rename from src/org/mcteam/factions/commands/FCommandDisband.java rename to src/com/massivecraft/factions/commands/FCommandDisband.java index ace47a86..aff357cb 100644 --- a/src/org/mcteam/factions/commands/FCommandDisband.java +++ b/src/com/massivecraft/factions/commands/FCommandDisband.java @@ -1,8 +1,9 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; import org.bukkit.command.CommandSender; -import org.mcteam.factions.Faction; -import org.mcteam.factions.Factions; + +import com.massivecraft.factions.Faction; +import com.massivecraft.factions.Factions; public class FCommandDisband extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandHelp.java b/src/com/massivecraft/factions/commands/FCommandHelp.java similarity index 97% rename from src/org/mcteam/factions/commands/FCommandHelp.java rename to src/com/massivecraft/factions/commands/FCommandHelp.java index 4c8c5b48..0cca49f8 100644 --- a/src/org/mcteam/factions/commands/FCommandHelp.java +++ b/src/com/massivecraft/factions/commands/FCommandHelp.java @@ -1,10 +1,11 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; import java.util.ArrayList; import org.bukkit.command.CommandSender; -import org.mcteam.factions.Conf; -import org.mcteam.factions.util.TextUtil; + +import com.massivecraft.factions.Conf; +import com.massivecraft.factions.util.TextUtil; public class FCommandHelp extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandHome.java b/src/com/massivecraft/factions/commands/FCommandHome.java similarity index 85% rename from src/org/mcteam/factions/commands/FCommandHome.java rename to src/com/massivecraft/factions/commands/FCommandHome.java index 2f5d889f..84942a2c 100644 --- a/src/org/mcteam/factions/commands/FCommandHome.java +++ b/src/com/massivecraft/factions/commands/FCommandHome.java @@ -1,15 +1,16 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Player; -import org.mcteam.factions.Board; -import org.mcteam.factions.Conf; -import org.mcteam.factions.Faction; -import org.mcteam.factions.FLocation; -import org.mcteam.factions.FPlayer; -import org.mcteam.factions.struct.Relation; -import org.mcteam.factions.struct.Role; + +import com.massivecraft.factions.Board; +import com.massivecraft.factions.Conf; +import com.massivecraft.factions.FLocation; +import com.massivecraft.factions.FPlayer; +import com.massivecraft.factions.Faction; +import com.massivecraft.factions.struct.Relation; +import com.massivecraft.factions.struct.Role; public class FCommandHome extends FBaseCommand { @@ -48,7 +49,7 @@ public class FCommandHome extends FBaseCommand { return; } - if (!Conf.homesTeleportAllowedFromDifferentWorld && player.getWorld().getId() != myFaction.getHome().getWorld().getId()) { + if (!Conf.homesTeleportAllowedFromDifferentWorld && player.getWorld().getUID() != myFaction.getHome().getWorld().getUID()) { me.sendMessage("You cannot teleport to your faction home while in a different world."); return; } diff --git a/src/org/mcteam/factions/commands/FCommandInvite.java b/src/com/massivecraft/factions/commands/FCommandInvite.java similarity index 83% rename from src/org/mcteam/factions/commands/FCommandInvite.java rename to src/com/massivecraft/factions/commands/FCommandInvite.java index fe8ab908..ffd3a742 100644 --- a/src/org/mcteam/factions/commands/FCommandInvite.java +++ b/src/com/massivecraft/factions/commands/FCommandInvite.java @@ -1,9 +1,9 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; -import org.mcteam.factions.Conf; -import org.mcteam.factions.FPlayer; -import org.mcteam.factions.Faction; -import org.mcteam.factions.struct.Role; +import com.massivecraft.factions.Conf; +import com.massivecraft.factions.FPlayer; +import com.massivecraft.factions.Faction; +import com.massivecraft.factions.struct.Role; public class FCommandInvite extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandJoin.java b/src/com/massivecraft/factions/commands/FCommandJoin.java similarity index 91% rename from src/org/mcteam/factions/commands/FCommandJoin.java rename to src/com/massivecraft/factions/commands/FCommandJoin.java index 15fe2419..d984e20c 100644 --- a/src/org/mcteam/factions/commands/FCommandJoin.java +++ b/src/com/massivecraft/factions/commands/FCommandJoin.java @@ -1,7 +1,7 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; -import org.mcteam.factions.Conf; -import org.mcteam.factions.Faction; +import com.massivecraft.factions.Conf; +import com.massivecraft.factions.Faction; public class FCommandJoin extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandKick.java b/src/com/massivecraft/factions/commands/FCommandKick.java similarity index 91% rename from src/org/mcteam/factions/commands/FCommandKick.java rename to src/com/massivecraft/factions/commands/FCommandKick.java index f43aeef3..667f10cf 100644 --- a/src/org/mcteam/factions/commands/FCommandKick.java +++ b/src/com/massivecraft/factions/commands/FCommandKick.java @@ -1,9 +1,9 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; -import org.mcteam.factions.Conf; -import org.mcteam.factions.FPlayer; -import org.mcteam.factions.Faction; -import org.mcteam.factions.Factions; +import com.massivecraft.factions.Conf; +import com.massivecraft.factions.FPlayer; +import com.massivecraft.factions.Faction; +import com.massivecraft.factions.Factions; public class FCommandKick extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandLeave.java b/src/com/massivecraft/factions/commands/FCommandLeave.java similarity index 91% rename from src/org/mcteam/factions/commands/FCommandLeave.java rename to src/com/massivecraft/factions/commands/FCommandLeave.java index f55d6eea..306bb881 100644 --- a/src/org/mcteam/factions/commands/FCommandLeave.java +++ b/src/com/massivecraft/factions/commands/FCommandLeave.java @@ -1,4 +1,4 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; import org.bukkit.command.CommandSender; diff --git a/src/org/mcteam/factions/commands/FCommandList.java b/src/com/massivecraft/factions/commands/FCommandList.java similarity index 93% rename from src/org/mcteam/factions/commands/FCommandList.java rename to src/com/massivecraft/factions/commands/FCommandList.java index ccdef32a..98a62517 100644 --- a/src/org/mcteam/factions/commands/FCommandList.java +++ b/src/com/massivecraft/factions/commands/FCommandList.java @@ -1,13 +1,14 @@ -package org.mcteam.factions.commands; +package com.massivecraft.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.massivecraft.factions.Conf; +import com.massivecraft.factions.Faction; +import com.massivecraft.factions.util.TextUtil; public class FCommandList extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandLock.java b/src/com/massivecraft/factions/commands/FCommandLock.java similarity index 83% rename from src/org/mcteam/factions/commands/FCommandLock.java rename to src/com/massivecraft/factions/commands/FCommandLock.java index 518c772c..4b690a54 100644 --- a/src/org/mcteam/factions/commands/FCommandLock.java +++ b/src/com/massivecraft/factions/commands/FCommandLock.java @@ -1,7 +1,8 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; import org.bukkit.command.CommandSender; -import org.mcteam.factions.Factions; + +import com.massivecraft.factions.Factions; public class FCommandLock extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandMap.java b/src/com/massivecraft/factions/commands/FCommandMap.java similarity index 87% rename from src/org/mcteam/factions/commands/FCommandMap.java rename to src/com/massivecraft/factions/commands/FCommandMap.java index 7ca5fa97..6f567bed 100644 --- a/src/org/mcteam/factions/commands/FCommandMap.java +++ b/src/com/massivecraft/factions/commands/FCommandMap.java @@ -1,8 +1,9 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; import org.bukkit.command.CommandSender; -import org.mcteam.factions.Board; -import org.mcteam.factions.FLocation; + +import com.massivecraft.factions.Board; +import com.massivecraft.factions.FLocation; public class FCommandMap extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandMod.java b/src/com/massivecraft/factions/commands/FCommandMod.java similarity index 85% rename from src/org/mcteam/factions/commands/FCommandMod.java rename to src/com/massivecraft/factions/commands/FCommandMod.java index 76200c4a..44b26dce 100644 --- a/src/org/mcteam/factions/commands/FCommandMod.java +++ b/src/com/massivecraft/factions/commands/FCommandMod.java @@ -1,9 +1,9 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; -import org.mcteam.factions.Conf; -import org.mcteam.factions.FPlayer; -import org.mcteam.factions.Faction; -import org.mcteam.factions.struct.Role; +import com.massivecraft.factions.Conf; +import com.massivecraft.factions.FPlayer; +import com.massivecraft.factions.Faction; +import com.massivecraft.factions.struct.Role; public class FCommandMod extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandOpen.java b/src/com/massivecraft/factions/commands/FCommandOpen.java similarity index 84% rename from src/org/mcteam/factions/commands/FCommandOpen.java rename to src/com/massivecraft/factions/commands/FCommandOpen.java index 310d7616..782be865 100644 --- a/src/org/mcteam/factions/commands/FCommandOpen.java +++ b/src/com/massivecraft/factions/commands/FCommandOpen.java @@ -1,8 +1,8 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; -import org.mcteam.factions.Conf; -import org.mcteam.factions.Faction; -import org.mcteam.factions.struct.Role; +import com.massivecraft.factions.Conf; +import com.massivecraft.factions.Faction; +import com.massivecraft.factions.struct.Role; public class FCommandOpen extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandRelationAlly.java b/src/com/massivecraft/factions/commands/FCommandRelationAlly.java similarity index 74% rename from src/org/mcteam/factions/commands/FCommandRelationAlly.java rename to src/com/massivecraft/factions/commands/FCommandRelationAlly.java index 08e6a264..44331766 100644 --- a/src/org/mcteam/factions/commands/FCommandRelationAlly.java +++ b/src/com/massivecraft/factions/commands/FCommandRelationAlly.java @@ -1,6 +1,6 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; -import org.mcteam.factions.struct.Relation; +import com.massivecraft.factions.struct.Relation; public class FCommandRelationAlly extends FRelationCommand { diff --git a/src/org/mcteam/factions/commands/FCommandRelationEnemy.java b/src/com/massivecraft/factions/commands/FCommandRelationEnemy.java similarity index 75% rename from src/org/mcteam/factions/commands/FCommandRelationEnemy.java rename to src/com/massivecraft/factions/commands/FCommandRelationEnemy.java index 38f18b90..3504afa8 100644 --- a/src/org/mcteam/factions/commands/FCommandRelationEnemy.java +++ b/src/com/massivecraft/factions/commands/FCommandRelationEnemy.java @@ -1,6 +1,6 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; -import org.mcteam.factions.struct.Relation; +import com.massivecraft.factions.struct.Relation; public class FCommandRelationEnemy extends FRelationCommand { diff --git a/src/org/mcteam/factions/commands/FCommandRelationNeutral.java b/src/com/massivecraft/factions/commands/FCommandRelationNeutral.java similarity index 75% rename from src/org/mcteam/factions/commands/FCommandRelationNeutral.java rename to src/com/massivecraft/factions/commands/FCommandRelationNeutral.java index f5438023..e7edcf0c 100644 --- a/src/org/mcteam/factions/commands/FCommandRelationNeutral.java +++ b/src/com/massivecraft/factions/commands/FCommandRelationNeutral.java @@ -1,6 +1,6 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; -import org.mcteam.factions.struct.Relation; +import com.massivecraft.factions.struct.Relation; public class FCommandRelationNeutral extends FRelationCommand { diff --git a/src/org/mcteam/factions/commands/FCommandReload.java b/src/com/massivecraft/factions/commands/FCommandReload.java similarity index 85% rename from src/org/mcteam/factions/commands/FCommandReload.java rename to src/com/massivecraft/factions/commands/FCommandReload.java index 5111c9d5..e78cf511 100644 --- a/src/org/mcteam/factions/commands/FCommandReload.java +++ b/src/com/massivecraft/factions/commands/FCommandReload.java @@ -1,11 +1,12 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; import org.bukkit.command.CommandSender; -import org.mcteam.factions.Board; -import org.mcteam.factions.Conf; -import org.mcteam.factions.FPlayer; -import org.mcteam.factions.Faction; -import org.mcteam.factions.Factions; + +import com.massivecraft.factions.Board; +import com.massivecraft.factions.Conf; +import com.massivecraft.factions.FPlayer; +import com.massivecraft.factions.Faction; +import com.massivecraft.factions.Factions; public class FCommandReload extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandSafeclaim.java b/src/com/massivecraft/factions/commands/FCommandSafeclaim.java similarity index 84% rename from src/org/mcteam/factions/commands/FCommandSafeclaim.java rename to src/com/massivecraft/factions/commands/FCommandSafeclaim.java index 15ef3dc7..db949e5c 100644 --- a/src/org/mcteam/factions/commands/FCommandSafeclaim.java +++ b/src/com/massivecraft/factions/commands/FCommandSafeclaim.java @@ -1,10 +1,11 @@ -package org.mcteam.factions.commands; +package com.massivecraft.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.massivecraft.factions.Board; +import com.massivecraft.factions.FLocation; +import com.massivecraft.factions.Faction; +import com.massivecraft.factions.Factions; public class FCommandSafeclaim extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandSafeunclaimall.java b/src/com/massivecraft/factions/commands/FCommandSafeunclaimall.java similarity index 77% rename from src/org/mcteam/factions/commands/FCommandSafeunclaimall.java rename to src/com/massivecraft/factions/commands/FCommandSafeunclaimall.java index 960b2de9..2f977640 100644 --- a/src/org/mcteam/factions/commands/FCommandSafeunclaimall.java +++ b/src/com/massivecraft/factions/commands/FCommandSafeunclaimall.java @@ -1,9 +1,10 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; import org.bukkit.command.CommandSender; -import org.mcteam.factions.Board; -import org.mcteam.factions.Faction; -import org.mcteam.factions.Factions; + +import com.massivecraft.factions.Board; +import com.massivecraft.factions.Faction; +import com.massivecraft.factions.Factions; public class FCommandSafeunclaimall extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandSaveAll.java b/src/com/massivecraft/factions/commands/FCommandSaveAll.java similarity index 80% rename from src/org/mcteam/factions/commands/FCommandSaveAll.java rename to src/com/massivecraft/factions/commands/FCommandSaveAll.java index 7c7db378..aafc19ab 100644 --- a/src/org/mcteam/factions/commands/FCommandSaveAll.java +++ b/src/com/massivecraft/factions/commands/FCommandSaveAll.java @@ -1,7 +1,8 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; import org.bukkit.command.CommandSender; -import org.mcteam.factions.Factions; + +import com.massivecraft.factions.Factions; public class FCommandSaveAll extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandSethome.java b/src/com/massivecraft/factions/commands/FCommandSethome.java similarity index 84% rename from src/org/mcteam/factions/commands/FCommandSethome.java rename to src/com/massivecraft/factions/commands/FCommandSethome.java index 989bea32..cec3f8bb 100644 --- a/src/org/mcteam/factions/commands/FCommandSethome.java +++ b/src/com/massivecraft/factions/commands/FCommandSethome.java @@ -1,8 +1,8 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; -import org.mcteam.factions.Conf; -import org.mcteam.factions.Faction; -import org.mcteam.factions.struct.Role; +import com.massivecraft.factions.Conf; +import com.massivecraft.factions.Faction; +import com.massivecraft.factions.struct.Role; public class FCommandSethome extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandShow.java b/src/com/massivecraft/factions/commands/FCommandShow.java similarity index 92% rename from src/org/mcteam/factions/commands/FCommandShow.java rename to src/com/massivecraft/factions/commands/FCommandShow.java index 78110342..01926859 100644 --- a/src/org/mcteam/factions/commands/FCommandShow.java +++ b/src/com/massivecraft/factions/commands/FCommandShow.java @@ -1,14 +1,15 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; import java.util.Collection; 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.struct.Role; -import org.mcteam.factions.util.TextUtil; + +import com.massivecraft.factions.Conf; +import com.massivecraft.factions.FPlayer; +import com.massivecraft.factions.Faction; +import com.massivecraft.factions.struct.Role; +import com.massivecraft.factions.util.TextUtil; public class FCommandShow extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandTag.java b/src/com/massivecraft/factions/commands/FCommandTag.java similarity index 86% rename from src/org/mcteam/factions/commands/FCommandTag.java rename to src/com/massivecraft/factions/commands/FCommandTag.java index 759ffa1d..fa6fa353 100644 --- a/src/org/mcteam/factions/commands/FCommandTag.java +++ b/src/com/massivecraft/factions/commands/FCommandTag.java @@ -1,11 +1,11 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; import java.util.ArrayList; -import org.mcteam.factions.Conf; -import org.mcteam.factions.Faction; -import org.mcteam.factions.struct.Role; -import org.mcteam.factions.util.TextUtil; +import com.massivecraft.factions.Conf; +import com.massivecraft.factions.Faction; +import com.massivecraft.factions.struct.Role; +import com.massivecraft.factions.util.TextUtil; public class FCommandTag extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandTitle.java b/src/com/massivecraft/factions/commands/FCommandTitle.java similarity index 80% rename from src/org/mcteam/factions/commands/FCommandTitle.java rename to src/com/massivecraft/factions/commands/FCommandTitle.java index c8107521..c2b8d3a5 100644 --- a/src/org/mcteam/factions/commands/FCommandTitle.java +++ b/src/com/massivecraft/factions/commands/FCommandTitle.java @@ -1,9 +1,9 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; -import org.mcteam.factions.Conf; -import org.mcteam.factions.FPlayer; -import org.mcteam.factions.Faction; -import org.mcteam.factions.util.TextUtil; +import com.massivecraft.factions.Conf; +import com.massivecraft.factions.FPlayer; +import com.massivecraft.factions.Faction; +import com.massivecraft.factions.util.TextUtil; public class FCommandTitle extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandUnclaim.java b/src/com/massivecraft/factions/commands/FCommandUnclaim.java similarity index 84% rename from src/org/mcteam/factions/commands/FCommandUnclaim.java rename to src/com/massivecraft/factions/commands/FCommandUnclaim.java index 4399687c..1577856c 100644 --- a/src/org/mcteam/factions/commands/FCommandUnclaim.java +++ b/src/com/massivecraft/factions/commands/FCommandUnclaim.java @@ -1,11 +1,11 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; -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; +import com.massivecraft.factions.Board; +import com.massivecraft.factions.Conf; +import com.massivecraft.factions.FLocation; +import com.massivecraft.factions.Faction; +import com.massivecraft.factions.Factions; +import com.massivecraft.factions.struct.Role; public class FCommandUnclaim extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandUnclaimall.java b/src/com/massivecraft/factions/commands/FCommandUnclaimall.java similarity index 74% rename from src/org/mcteam/factions/commands/FCommandUnclaimall.java rename to src/com/massivecraft/factions/commands/FCommandUnclaimall.java index 3dec6bc3..d8a62757 100644 --- a/src/org/mcteam/factions/commands/FCommandUnclaimall.java +++ b/src/com/massivecraft/factions/commands/FCommandUnclaimall.java @@ -1,9 +1,9 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; -import org.mcteam.factions.Board; -import org.mcteam.factions.Conf; -import org.mcteam.factions.Faction; -import org.mcteam.factions.struct.Role; +import com.massivecraft.factions.Board; +import com.massivecraft.factions.Conf; +import com.massivecraft.factions.Faction; +import com.massivecraft.factions.struct.Role; public class FCommandUnclaimall extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandVersion.java b/src/com/massivecraft/factions/commands/FCommandVersion.java similarity index 83% rename from src/org/mcteam/factions/commands/FCommandVersion.java rename to src/com/massivecraft/factions/commands/FCommandVersion.java index 599a65e5..e38e3cd0 100644 --- a/src/org/mcteam/factions/commands/FCommandVersion.java +++ b/src/com/massivecraft/factions/commands/FCommandVersion.java @@ -1,7 +1,8 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; import org.bukkit.command.CommandSender; -import org.mcteam.factions.Factions; + +import com.massivecraft.factions.Factions; public class FCommandVersion extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandWarclaim.java b/src/com/massivecraft/factions/commands/FCommandWarclaim.java similarity index 84% rename from src/org/mcteam/factions/commands/FCommandWarclaim.java rename to src/com/massivecraft/factions/commands/FCommandWarclaim.java index 3e6b9024..9b036689 100644 --- a/src/org/mcteam/factions/commands/FCommandWarclaim.java +++ b/src/com/massivecraft/factions/commands/FCommandWarclaim.java @@ -1,10 +1,11 @@ -package org.mcteam.factions.commands; +package com.massivecraft.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.massivecraft.factions.Board; +import com.massivecraft.factions.FLocation; +import com.massivecraft.factions.Faction; +import com.massivecraft.factions.Factions; public class FCommandWarclaim extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandWarunclaimall.java b/src/com/massivecraft/factions/commands/FCommandWarunclaimall.java similarity index 77% rename from src/org/mcteam/factions/commands/FCommandWarunclaimall.java rename to src/com/massivecraft/factions/commands/FCommandWarunclaimall.java index 152e4038..ad38d203 100644 --- a/src/org/mcteam/factions/commands/FCommandWarunclaimall.java +++ b/src/com/massivecraft/factions/commands/FCommandWarunclaimall.java @@ -1,9 +1,10 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; import org.bukkit.command.CommandSender; -import org.mcteam.factions.Board; -import org.mcteam.factions.Faction; -import org.mcteam.factions.Factions; + +import com.massivecraft.factions.Board; +import com.massivecraft.factions.Faction; +import com.massivecraft.factions.Factions; public class FCommandWarunclaimall extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandWorldNoClaim.java b/src/com/massivecraft/factions/commands/FCommandWorldNoClaim.java similarity index 87% rename from src/org/mcteam/factions/commands/FCommandWorldNoClaim.java rename to src/com/massivecraft/factions/commands/FCommandWorldNoClaim.java index 4fba3e5d..abd27a5b 100644 --- a/src/org/mcteam/factions/commands/FCommandWorldNoClaim.java +++ b/src/com/massivecraft/factions/commands/FCommandWorldNoClaim.java @@ -1,8 +1,9 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; import org.bukkit.command.CommandSender; -import org.mcteam.factions.Conf; -import org.mcteam.factions.Factions; + +import com.massivecraft.factions.Conf; +import com.massivecraft.factions.Factions; public class FCommandWorldNoClaim extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FCommandWorldNoPowerLoss.java b/src/com/massivecraft/factions/commands/FCommandWorldNoPowerLoss.java similarity index 87% rename from src/org/mcteam/factions/commands/FCommandWorldNoPowerLoss.java rename to src/com/massivecraft/factions/commands/FCommandWorldNoPowerLoss.java index 53a46d2c..16acfcd1 100644 --- a/src/org/mcteam/factions/commands/FCommandWorldNoPowerLoss.java +++ b/src/com/massivecraft/factions/commands/FCommandWorldNoPowerLoss.java @@ -1,8 +1,9 @@ -package org.mcteam.factions.commands; +package com.massivecraft.factions.commands; import org.bukkit.command.CommandSender; -import org.mcteam.factions.Conf; -import org.mcteam.factions.Factions; + +import com.massivecraft.factions.Conf; +import com.massivecraft.factions.Factions; public class FCommandWorldNoPowerLoss extends FBaseCommand { diff --git a/src/org/mcteam/factions/commands/FRelationCommand.java b/src/com/massivecraft/factions/commands/FRelationCommand.java similarity index 88% rename from src/org/mcteam/factions/commands/FRelationCommand.java rename to src/com/massivecraft/factions/commands/FRelationCommand.java index ba317bf0..bf5dfeeb 100644 --- a/src/org/mcteam/factions/commands/FRelationCommand.java +++ b/src/com/massivecraft/factions/commands/FRelationCommand.java @@ -1,11 +1,12 @@ -package org.mcteam.factions.commands; +package com.massivecraft.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.massivecraft.factions.Conf; +import com.massivecraft.factions.Faction; +import com.massivecraft.factions.Factions; +import com.massivecraft.factions.struct.Relation; +import com.massivecraft.factions.struct.Role; public class FRelationCommand extends FBaseCommand { diff --git a/src/org/mcteam/factions/gson/AnonymousAndLocalClassExclusionStrategy.java b/src/com/massivecraft/factions/gson/AnonymousAndLocalClassExclusionStrategy.java similarity index 96% rename from src/org/mcteam/factions/gson/AnonymousAndLocalClassExclusionStrategy.java rename to src/com/massivecraft/factions/gson/AnonymousAndLocalClassExclusionStrategy.java index 77817e52..044db718 100644 --- a/src/org/mcteam/factions/gson/AnonymousAndLocalClassExclusionStrategy.java +++ b/src/com/massivecraft/factions/gson/AnonymousAndLocalClassExclusionStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.mcteam.factions.gson; +package com.massivecraft.factions.gson; /** * Strategy for excluding anonymous and local classes. diff --git a/src/org/mcteam/factions/gson/BaseMapTypeAdapter.java b/src/com/massivecraft/factions/gson/BaseMapTypeAdapter.java similarity index 97% rename from src/org/mcteam/factions/gson/BaseMapTypeAdapter.java rename to src/com/massivecraft/factions/gson/BaseMapTypeAdapter.java index bf0480fc..0503da1c 100644 --- a/src/org/mcteam/factions/gson/BaseMapTypeAdapter.java +++ b/src/com/massivecraft/factions/gson/BaseMapTypeAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.mcteam.factions.gson; +package com.massivecraft.factions.gson; import java.lang.reflect.Type; import java.util.Map; diff --git a/src/org/mcteam/factions/gson/Cache.java b/src/com/massivecraft/factions/gson/Cache.java similarity index 97% rename from src/org/mcteam/factions/gson/Cache.java rename to src/com/massivecraft/factions/gson/Cache.java index 9100abd3..5c23de78 100644 --- a/src/org/mcteam/factions/gson/Cache.java +++ b/src/com/massivecraft/factions/gson/Cache.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.mcteam.factions.gson; +package com.massivecraft.factions.gson; /** * Defines generic cache interface. diff --git a/src/org/mcteam/factions/gson/CamelCaseSeparatorNamingPolicy.java b/src/com/massivecraft/factions/gson/CamelCaseSeparatorNamingPolicy.java similarity index 95% rename from src/org/mcteam/factions/gson/CamelCaseSeparatorNamingPolicy.java rename to src/com/massivecraft/factions/gson/CamelCaseSeparatorNamingPolicy.java index d4d3b388..571504cb 100644 --- a/src/org/mcteam/factions/gson/CamelCaseSeparatorNamingPolicy.java +++ b/src/com/massivecraft/factions/gson/CamelCaseSeparatorNamingPolicy.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.mcteam.factions.gson; +package com.massivecraft.factions.gson; -import org.mcteam.factions.gson.internal.$Gson$Preconditions; +import com.massivecraft.factions.gson.internal.$Gson$Preconditions; import java.lang.annotation.Annotation; import java.lang.reflect.Type; diff --git a/src/org/mcteam/factions/gson/CircularReferenceException.java b/src/com/massivecraft/factions/gson/CircularReferenceException.java similarity index 97% rename from src/org/mcteam/factions/gson/CircularReferenceException.java rename to src/com/massivecraft/factions/gson/CircularReferenceException.java index 4a9a8c47..079efe32 100644 --- a/src/org/mcteam/factions/gson/CircularReferenceException.java +++ b/src/com/massivecraft/factions/gson/CircularReferenceException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.mcteam.factions.gson; +package com.massivecraft.factions.gson; /** * Exception class to indicate a circular reference error. diff --git a/src/org/mcteam/factions/gson/CompositionFieldNamingPolicy.java b/src/com/massivecraft/factions/gson/CompositionFieldNamingPolicy.java similarity index 97% rename from src/org/mcteam/factions/gson/CompositionFieldNamingPolicy.java rename to src/com/massivecraft/factions/gson/CompositionFieldNamingPolicy.java index 2be6712d..d9c26fef 100644 --- a/src/org/mcteam/factions/gson/CompositionFieldNamingPolicy.java +++ b/src/com/massivecraft/factions/gson/CompositionFieldNamingPolicy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.mcteam.factions.gson; +package com.massivecraft.factions.gson; import java.lang.annotation.Annotation; import java.lang.reflect.Type; diff --git a/src/org/mcteam/factions/gson/DefaultConstructorAllocator.java b/src/com/massivecraft/factions/gson/DefaultConstructorAllocator.java similarity index 98% rename from src/org/mcteam/factions/gson/DefaultConstructorAllocator.java rename to src/com/massivecraft/factions/gson/DefaultConstructorAllocator.java index 2ebf636e..67b40725 100644 --- a/src/org/mcteam/factions/gson/DefaultConstructorAllocator.java +++ b/src/com/massivecraft/factions/gson/DefaultConstructorAllocator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.mcteam.factions.gson; +package com.massivecraft.factions.gson; import java.lang.reflect.Constructor; diff --git a/src/org/mcteam/factions/gson/DefaultTypeAdapters.java b/src/com/massivecraft/factions/gson/DefaultTypeAdapters.java similarity index 99% rename from src/org/mcteam/factions/gson/DefaultTypeAdapters.java rename to src/com/massivecraft/factions/gson/DefaultTypeAdapters.java index d6020ef3..aec33a46 100644 --- a/src/org/mcteam/factions/gson/DefaultTypeAdapters.java +++ b/src/com/massivecraft/factions/gson/DefaultTypeAdapters.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package org.mcteam.factions.gson; +package com.massivecraft.factions.gson; + +import com.massivecraft.factions.gson.internal.$Gson$Types; -import org.mcteam.factions.gson.internal.$Gson$Types; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.math.BigDecimal; diff --git a/src/org/mcteam/factions/gson/DelegatingJsonElementVisitor.java b/src/com/massivecraft/factions/gson/DelegatingJsonElementVisitor.java similarity index 97% rename from src/org/mcteam/factions/gson/DelegatingJsonElementVisitor.java rename to src/com/massivecraft/factions/gson/DelegatingJsonElementVisitor.java index 1ad3ee0d..88e97781 100644 --- a/src/org/mcteam/factions/gson/DelegatingJsonElementVisitor.java +++ b/src/com/massivecraft/factions/gson/DelegatingJsonElementVisitor.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.mcteam.factions.gson; +package com.massivecraft.factions.gson; -import org.mcteam.factions.gson.internal.$Gson$Preconditions; +import com.massivecraft.factions.gson.internal.$Gson$Preconditions; import java.io.IOException; diff --git a/src/org/mcteam/factions/gson/DisjunctionExclusionStrategy.java b/src/com/massivecraft/factions/gson/DisjunctionExclusionStrategy.java similarity index 93% rename from src/org/mcteam/factions/gson/DisjunctionExclusionStrategy.java rename to src/com/massivecraft/factions/gson/DisjunctionExclusionStrategy.java index 3de98bf7..c6b18b57 100644 --- a/src/org/mcteam/factions/gson/DisjunctionExclusionStrategy.java +++ b/src/com/massivecraft/factions/gson/DisjunctionExclusionStrategy.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.mcteam.factions.gson; +package com.massivecraft.factions.gson; -import org.mcteam.factions.gson.internal.$Gson$Preconditions; +import com.massivecraft.factions.gson.internal.$Gson$Preconditions; import java.util.Collection; diff --git a/src/org/mcteam/factions/gson/Escaper.java b/src/com/massivecraft/factions/gson/Escaper.java similarity index 99% rename from src/org/mcteam/factions/gson/Escaper.java rename to src/com/massivecraft/factions/gson/Escaper.java index bd1a0d63..5130dd1c 100644 --- a/src/org/mcteam/factions/gson/Escaper.java +++ b/src/com/massivecraft/factions/gson/Escaper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.mcteam.factions.gson; +package com.massivecraft.factions.gson; import java.io.IOException; import java.util.Collections; diff --git a/src/org/mcteam/factions/gson/ExclusionStrategy.java b/src/com/massivecraft/factions/gson/ExclusionStrategy.java similarity index 99% rename from src/org/mcteam/factions/gson/ExclusionStrategy.java rename to src/com/massivecraft/factions/gson/ExclusionStrategy.java index a38b0438..3631e13e 100644 --- a/src/org/mcteam/factions/gson/ExclusionStrategy.java +++ b/src/com/massivecraft/factions/gson/ExclusionStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.mcteam.factions.gson; +package com.massivecraft.factions.gson; /** * A strategy (or policy) definition that is used to decide whether or not a field or top-level diff --git a/src/org/mcteam/factions/gson/ExposeAnnotationDeserializationExclusionStrategy.java b/src/com/massivecraft/factions/gson/ExposeAnnotationDeserializationExclusionStrategy.java similarity index 91% rename from src/org/mcteam/factions/gson/ExposeAnnotationDeserializationExclusionStrategy.java rename to src/com/massivecraft/factions/gson/ExposeAnnotationDeserializationExclusionStrategy.java index 420c37b4..e6a08eb0 100644 --- a/src/org/mcteam/factions/gson/ExposeAnnotationDeserializationExclusionStrategy.java +++ b/src/com/massivecraft/factions/gson/ExposeAnnotationDeserializationExclusionStrategy.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.mcteam.factions.gson; +package com.massivecraft.factions.gson; -import org.mcteam.factions.gson.annotations.Expose; +import com.massivecraft.factions.gson.annotations.Expose; /** * Excludes fields that do not have the {@link Expose} annotation diff --git a/src/org/mcteam/factions/gson/ExposeAnnotationSerializationExclusionStrategy.java b/src/com/massivecraft/factions/gson/ExposeAnnotationSerializationExclusionStrategy.java similarity index 91% rename from src/org/mcteam/factions/gson/ExposeAnnotationSerializationExclusionStrategy.java rename to src/com/massivecraft/factions/gson/ExposeAnnotationSerializationExclusionStrategy.java index 89137c14..d553bb4a 100644 --- a/src/org/mcteam/factions/gson/ExposeAnnotationSerializationExclusionStrategy.java +++ b/src/com/massivecraft/factions/gson/ExposeAnnotationSerializationExclusionStrategy.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.mcteam.factions.gson; +package com.massivecraft.factions.gson; -import org.mcteam.factions.gson.annotations.Expose; +import com.massivecraft.factions.gson.annotations.Expose; /** * Excludes fields that do not have the {@link Expose} annotation diff --git a/src/org/mcteam/factions/gson/FieldAttributes.java b/src/com/massivecraft/factions/gson/FieldAttributes.java similarity index 97% rename from src/org/mcteam/factions/gson/FieldAttributes.java rename to src/com/massivecraft/factions/gson/FieldAttributes.java index 1ecc27a1..e10caf68 100644 --- a/src/org/mcteam/factions/gson/FieldAttributes.java +++ b/src/com/massivecraft/factions/gson/FieldAttributes.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.mcteam.factions.gson; +package com.massivecraft.factions.gson; -import org.mcteam.factions.gson.internal.$Gson$Preconditions; -import org.mcteam.factions.gson.internal.$Gson$Types; +import com.massivecraft.factions.gson.internal.$Gson$Preconditions; +import com.massivecraft.factions.gson.internal.$Gson$Types; import java.lang.annotation.Annotation; import java.lang.reflect.Field; @@ -38,7 +38,7 @@ import java.util.Collections; */ public final class FieldAttributes { private static final String MAX_CACHE_PROPERTY_NAME = - "org.mcteam.factions.gson.annotation_cache_size_hint"; + "com.google.gson.annotation_cache_size_hint"; private static final Cache, String>, Collection> ANNOTATION_CACHE = new LruCache,String>, Collection>(getMaxCacheSize()); diff --git a/src/org/mcteam/factions/gson/FieldNamingPolicy.java b/src/com/massivecraft/factions/gson/FieldNamingPolicy.java similarity index 93% rename from src/org/mcteam/factions/gson/FieldNamingPolicy.java rename to src/com/massivecraft/factions/gson/FieldNamingPolicy.java index 606c2f60..093ecab1 100644 --- a/src/org/mcteam/factions/gson/FieldNamingPolicy.java +++ b/src/com/massivecraft/factions/gson/FieldNamingPolicy.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.mcteam.factions.gson; +package com.massivecraft.factions.gson; /** * An enumeration that defines a few standard naming conventions for JSON field names. - * 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 + * This enumeration should be used in conjunction with {@link com.massivecraft.factions.gson.GsonBuilder} + * to configure a {@link com.massivecraft.factions.gson.Gson} instance to properly translate Java field * names into the desired JSON field names. * * @author Inderjeet Singh diff --git a/src/org/mcteam/factions/gson/FieldNamingStrategy.java b/src/com/massivecraft/factions/gson/FieldNamingStrategy.java similarity index 96% rename from src/org/mcteam/factions/gson/FieldNamingStrategy.java rename to src/com/massivecraft/factions/gson/FieldNamingStrategy.java index 9916b462..029ab6eb 100644 --- a/src/org/mcteam/factions/gson/FieldNamingStrategy.java +++ b/src/com/massivecraft/factions/gson/FieldNamingStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.mcteam.factions.gson; +package com.massivecraft.factions.gson; import java.lang.reflect.Field; diff --git a/src/org/mcteam/factions/gson/FieldNamingStrategy2.java b/src/com/massivecraft/factions/gson/FieldNamingStrategy2.java similarity index 96% rename from src/org/mcteam/factions/gson/FieldNamingStrategy2.java rename to src/com/massivecraft/factions/gson/FieldNamingStrategy2.java index 4544ce48..1eb8b747 100644 --- a/src/org/mcteam/factions/gson/FieldNamingStrategy2.java +++ b/src/com/massivecraft/factions/gson/FieldNamingStrategy2.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.mcteam.factions.gson; +package com.massivecraft.factions.gson; /** * The new mechanism for providing custom field naming in Gson. This allows the client code diff --git a/src/org/mcteam/factions/gson/FieldNamingStrategy2Adapter.java b/src/com/massivecraft/factions/gson/FieldNamingStrategy2Adapter.java similarity index 91% rename from src/org/mcteam/factions/gson/FieldNamingStrategy2Adapter.java rename to src/com/massivecraft/factions/gson/FieldNamingStrategy2Adapter.java index 3a742d20..d0c29894 100644 --- a/src/org/mcteam/factions/gson/FieldNamingStrategy2Adapter.java +++ b/src/com/massivecraft/factions/gson/FieldNamingStrategy2Adapter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.mcteam.factions.gson; +package com.massivecraft.factions.gson; -import org.mcteam.factions.gson.internal.$Gson$Preconditions; +import com.massivecraft.factions.gson.internal.$Gson$Preconditions; /** * Adapts the old FieldNamingStrategy to the new {@link FieldNamingStrategy2} diff --git a/src/org/mcteam/factions/gson/Gson.java b/src/com/massivecraft/factions/gson/Gson.java similarity index 95% rename from src/org/mcteam/factions/gson/Gson.java rename to src/com/massivecraft/factions/gson/Gson.java index a72bd9e7..08ef8a3a 100644 --- a/src/org/mcteam/factions/gson/Gson.java +++ b/src/com/massivecraft/factions/gson/Gson.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.mcteam.factions.gson; +package com.massivecraft.factions.gson; + +import com.massivecraft.factions.gson.stream.JsonReader; +import com.massivecraft.factions.gson.stream.JsonToken; +import com.massivecraft.factions.gson.stream.JsonWriter; +import com.massivecraft.factions.gson.stream.MalformedJsonException; -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; import java.io.IOException; import java.io.Reader; import java.io.StringReader; @@ -68,7 +69,7 @@ import java.util.Map; *

See the Gson User Guide * for a more complete set of examples.

* - * @see org.mcteam.factions.gson.reflect.TypeToken + * @see com.massivecraft.factions.gson.reflect.TypeToken * * @author Inderjeet Singh * @author Joel Leitch @@ -130,10 +131,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)}. - *
  • By default, Gson ignores the {@link org.mcteam.factions.gson.annotations.Expose} annotation. + *
  • By default, Gson ignores the {@link com.massivecraft.factions.gson.annotations.Expose} annotation. * You can enable Gson to serialize/deserialize only those fields marked with this annotation * through {@link GsonBuilder#excludeFieldsWithoutExposeAnnotation()}.
    • - *
  • By default, Gson ignores the {@link org.mcteam.factions.gson.annotations.Since} annotation. You + *
  • By default, Gson ignores the {@link com.massivecraft.factions.gson.annotations.Since} annotation. You * can enable Gson to use this annotation through {@link GsonBuilder#setVersion(double)}.
    • *
  • The default field naming policy for the output Json is same as in Java. So, a Java class * field versionNumber will be output as "versionNumber@quot; in @@ -205,7 +206,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 org.mcteam.factions.gson.reflect.TypeToken} class. For example, + * this type by using the {@link com.massivecraft.factions.gson.reflect.TypeToken} class. For example, * to get the type for {@code Collection}, you should use: * 
        * Type typeOfSrc = new TypeToken<Collection<Foo>>(){}.getType();
@@ -248,7 +249,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 org.mcteam.factions.gson.reflect.TypeToken} class. For example,
+   * this type by using the {@link com.massivecraft.factions.gson.reflect.TypeToken} class. For example,
    * to get the type for {@code Collection}, you should use:
    * 
        * Type typeOfSrc = new TypeToken<Collection<Foo>>(){}.getType();
@@ -290,7 +291,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 org.mcteam.factions.gson.reflect.TypeToken} class. For example,
+   * this type by using the {@link com.massivecraft.factions.gson.reflect.TypeToken} class. For example,
    * to get the type for {@code Collection}, you should use:
    * 
        * Type typeOfSrc = new TypeToken<Collection<Foo>>(){}.getType();
@@ -399,7 +400,7 @@ public final class Gson {
    * @param  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 org.mcteam.factions.gson.reflect.TypeToken} class. For example, to get the type for
+   * {@link com.massivecraft.factions.gson.reflect.TypeToken} class. For example, to get the type for
    * {@code Collection}, you should use:
    * 
        * Type typeOfT = new TypeToken<Collection<Foo>>(){}.getType();
@@ -452,7 +453,7 @@ public final class Gson {
    * @param  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 org.mcteam.factions.gson.reflect.TypeToken} class. For example, to get the type for
+   * {@link com.massivecraft.factions.gson.reflect.TypeToken} class. For example, to get the type for
    * {@code Collection}, you should use:
    * 
        * Type typeOfT = new TypeToken<Collection<Foo>>(){}.getType();
@@ -531,7 +532,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 org.mcteam.factions.gson.reflect.TypeToken} class. For example, to get the type for
+   * {@link com.massivecraft.factions.gson.reflect.TypeToken} class. For example, to get the type for
    * {@code Collection}, you should use:
    * 
        * Type typeOfT = new TypeToken<Collection<Foo>>(){}.getType();
diff --git a/src/org/mcteam/factions/gson/GsonBuilder.java b/src/com/massivecraft/factions/gson/GsonBuilder.java
similarity index 99%
rename from src/org/mcteam/factions/gson/GsonBuilder.java
rename to src/com/massivecraft/factions/gson/GsonBuilder.java
index 966aa107..8d4e2ef9 100644
--- a/src/org/mcteam/factions/gson/GsonBuilder.java
+++ b/src/com/massivecraft/factions/gson/GsonBuilder.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
-import org.mcteam.factions.gson.DefaultTypeAdapters.DefaultDateTypeAdapter;
-import org.mcteam.factions.gson.internal.$Gson$Preconditions;
+import com.massivecraft.factions.gson.DefaultTypeAdapters.DefaultDateTypeAdapter;
+import com.massivecraft.factions.gson.internal.$Gson$Preconditions;
 
 import java.lang.reflect.Type;
 import java.sql.Timestamp;
@@ -174,7 +174,7 @@ public final class GsonBuilder {
 
   /**
    * Configures Gson to exclude all fields from consideration for serialization or deserialization
-   * that do not have the {@link org.mcteam.factions.gson.annotations.Expose} annotation.
+   * that do not have the {@link com.massivecraft.factions.gson.annotations.Expose} annotation.
    *
    * @return a reference to this {@code GsonBuilder} object to fulfill the "Builder" pattern
    */
diff --git a/src/org/mcteam/factions/gson/InnerClassExclusionStrategy.java b/src/com/massivecraft/factions/gson/InnerClassExclusionStrategy.java
similarity index 96%
rename from src/org/mcteam/factions/gson/InnerClassExclusionStrategy.java
rename to src/com/massivecraft/factions/gson/InnerClassExclusionStrategy.java
index 9be82909..08f2bb7e 100644
--- a/src/org/mcteam/factions/gson/InnerClassExclusionStrategy.java
+++ b/src/com/massivecraft/factions/gson/InnerClassExclusionStrategy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 import java.lang.reflect.Modifier;
 
diff --git a/src/org/mcteam/factions/gson/InstanceCreator.java b/src/com/massivecraft/factions/gson/InstanceCreator.java
similarity index 98%
rename from src/org/mcteam/factions/gson/InstanceCreator.java
rename to src/com/massivecraft/factions/gson/InstanceCreator.java
index e1a127fb..207c329d 100644
--- a/src/org/mcteam/factions/gson/InstanceCreator.java
+++ b/src/com/massivecraft/factions/gson/InstanceCreator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 import java.lang.reflect.Type;
 
diff --git a/src/org/mcteam/factions/gson/JavaFieldNamingPolicy.java b/src/com/massivecraft/factions/gson/JavaFieldNamingPolicy.java
similarity index 97%
rename from src/org/mcteam/factions/gson/JavaFieldNamingPolicy.java
rename to src/com/massivecraft/factions/gson/JavaFieldNamingPolicy.java
index 4e5136ee..5f783405 100644
--- a/src/org/mcteam/factions/gson/JavaFieldNamingPolicy.java
+++ b/src/com/massivecraft/factions/gson/JavaFieldNamingPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
diff --git a/src/org/mcteam/factions/gson/JsonArray.java b/src/com/massivecraft/factions/gson/JsonArray.java
similarity index 99%
rename from src/org/mcteam/factions/gson/JsonArray.java
rename to src/com/massivecraft/factions/gson/JsonArray.java
index f6fa7e58..c54bdc44 100644
--- a/src/org/mcteam/factions/gson/JsonArray.java
+++ b/src/com/massivecraft/factions/gson/JsonArray.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 import java.io.IOException;
 import java.math.BigDecimal;
diff --git a/src/org/mcteam/factions/gson/JsonArrayDeserializationVisitor.java b/src/com/massivecraft/factions/gson/JsonArrayDeserializationVisitor.java
similarity index 97%
rename from src/org/mcteam/factions/gson/JsonArrayDeserializationVisitor.java
rename to src/com/massivecraft/factions/gson/JsonArrayDeserializationVisitor.java
index c152412f..e0fc9342 100644
--- a/src/org/mcteam/factions/gson/JsonArrayDeserializationVisitor.java
+++ b/src/com/massivecraft/factions/gson/JsonArrayDeserializationVisitor.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
-import org.mcteam.factions.gson.internal.$Gson$Types;
+import com.massivecraft.factions.gson.internal.$Gson$Types;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Type;
diff --git a/src/org/mcteam/factions/gson/JsonDeserializationContext.java b/src/com/massivecraft/factions/gson/JsonDeserializationContext.java
similarity index 97%
rename from src/org/mcteam/factions/gson/JsonDeserializationContext.java
rename to src/com/massivecraft/factions/gson/JsonDeserializationContext.java
index 2e967152..f93bc616 100644
--- a/src/org/mcteam/factions/gson/JsonDeserializationContext.java
+++ b/src/com/massivecraft/factions/gson/JsonDeserializationContext.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 import java.lang.reflect.Type;
 
diff --git a/src/org/mcteam/factions/gson/JsonDeserializationContextDefault.java b/src/com/massivecraft/factions/gson/JsonDeserializationContextDefault.java
similarity index 96%
rename from src/org/mcteam/factions/gson/JsonDeserializationContextDefault.java
rename to src/com/massivecraft/factions/gson/JsonDeserializationContextDefault.java
index abc6d84a..78e5f3d3 100644
--- a/src/org/mcteam/factions/gson/JsonDeserializationContextDefault.java
+++ b/src/com/massivecraft/factions/gson/JsonDeserializationContextDefault.java
@@ -1,89 +1,89 @@
-/*
- * Copyright (C) 2008 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.mcteam.factions.gson;
-
-import java.lang.reflect.Type;
-
-/**
- * implementation of a deserialization context for Gson
- *
- * @author Inderjeet Singh
- */
-final class JsonDeserializationContextDefault implements JsonDeserializationContext {
-
-  private final ObjectNavigator objectNavigator;
-  private final FieldNamingStrategy2 fieldNamingPolicy;
-  private final ParameterizedTypeHandlerMap> deserializers;
-  private final MappedObjectConstructor objectConstructor;
-
-  JsonDeserializationContextDefault(ObjectNavigator objectNavigator,
-      FieldNamingStrategy2 fieldNamingPolicy,
-      ParameterizedTypeHandlerMap> deserializers,
-      MappedObjectConstructor objectConstructor) {
-    this.objectNavigator = objectNavigator;
-    this.fieldNamingPolicy = fieldNamingPolicy;
-    this.deserializers = deserializers;
-    this.objectConstructor = objectConstructor;
-  }
-
-  ObjectConstructor getObjectConstructor() {
-    return objectConstructor;
-  }
-
-  @SuppressWarnings("unchecked")
-  public  T deserialize(JsonElement json, Type typeOfT) throws JsonParseException {
-    if (json == null || json.isJsonNull()) {
-      return null;
-    } else if (json.isJsonArray()) {
-      return (T) fromJsonArray(typeOfT, json.getAsJsonArray(), this);
-    } else if (json.isJsonObject()) {
-      return (T) fromJsonObject(typeOfT, json.getAsJsonObject(), this);
-    } else if (json.isJsonPrimitive()) {
-      return (T) fromJsonPrimitive(typeOfT, json.getAsJsonPrimitive(), this);
-    } else {
-      throw new JsonParseException("Failed parsing JSON source: " + json + " to Json");
-    }
-  }
-
-  private  T fromJsonArray(Type arrayType, JsonArray jsonArray,
-      JsonDeserializationContext context) throws JsonParseException {
-    JsonArrayDeserializationVisitor visitor = new JsonArrayDeserializationVisitor(
-        jsonArray, arrayType, objectNavigator, fieldNamingPolicy,
-        objectConstructor, deserializers, context);
-    objectNavigator.accept(new ObjectTypePair(null, arrayType, true), visitor);
-    return visitor.getTarget();
-  }
-
-  private  T fromJsonObject(Type typeOfT, JsonObject jsonObject,
-      JsonDeserializationContext context) throws JsonParseException {
-    JsonObjectDeserializationVisitor visitor = new JsonObjectDeserializationVisitor(
-        jsonObject, typeOfT, objectNavigator, fieldNamingPolicy,
-        objectConstructor, deserializers, context);
-    objectNavigator.accept(new ObjectTypePair(null, typeOfT, true), visitor);
-    return visitor.getTarget();
-  }
-
-  @SuppressWarnings("unchecked")
-  private  T fromJsonPrimitive(Type typeOfT, JsonPrimitive json,
-      JsonDeserializationContext context) throws JsonParseException {
-    JsonObjectDeserializationVisitor visitor = new JsonObjectDeserializationVisitor(
-        json, typeOfT, objectNavigator, fieldNamingPolicy, objectConstructor, deserializers, context);
-    objectNavigator.accept(new ObjectTypePair(json.getAsObject(), typeOfT, true), visitor);
-    Object target = visitor.getTarget();
-    return (T) target;
-  }
-}
+/*
+ * Copyright (C) 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.massivecraft.factions.gson;
+
+import java.lang.reflect.Type;
+
+/**
+ * implementation of a deserialization context for Gson
+ *
+ * @author Inderjeet Singh
+ */
+final class JsonDeserializationContextDefault implements JsonDeserializationContext {
+
+  private final ObjectNavigator objectNavigator;
+  private final FieldNamingStrategy2 fieldNamingPolicy;
+  private final ParameterizedTypeHandlerMap> deserializers;
+  private final MappedObjectConstructor objectConstructor;
+
+  JsonDeserializationContextDefault(ObjectNavigator objectNavigator,
+      FieldNamingStrategy2 fieldNamingPolicy,
+      ParameterizedTypeHandlerMap> deserializers,
+      MappedObjectConstructor objectConstructor) {
+    this.objectNavigator = objectNavigator;
+    this.fieldNamingPolicy = fieldNamingPolicy;
+    this.deserializers = deserializers;
+    this.objectConstructor = objectConstructor;
+  }
+
+  ObjectConstructor getObjectConstructor() {
+    return objectConstructor;
+  }
+
+  @SuppressWarnings("unchecked")
+  public  T deserialize(JsonElement json, Type typeOfT) throws JsonParseException {
+    if (json == null || json.isJsonNull()) {
+      return null;
+    } else if (json.isJsonArray()) {
+      return (T) fromJsonArray(typeOfT, json.getAsJsonArray(), this);
+    } else if (json.isJsonObject()) {
+      return (T) fromJsonObject(typeOfT, json.getAsJsonObject(), this);
+    } else if (json.isJsonPrimitive()) {
+      return (T) fromJsonPrimitive(typeOfT, json.getAsJsonPrimitive(), this);
+    } else {
+      throw new JsonParseException("Failed parsing JSON source: " + json + " to Json");
+    }
+  }
+
+  private  T fromJsonArray(Type arrayType, JsonArray jsonArray,
+      JsonDeserializationContext context) throws JsonParseException {
+    JsonArrayDeserializationVisitor visitor = new JsonArrayDeserializationVisitor(
+        jsonArray, arrayType, objectNavigator, fieldNamingPolicy,
+        objectConstructor, deserializers, context);
+    objectNavigator.accept(new ObjectTypePair(null, arrayType, true), visitor);
+    return visitor.getTarget();
+  }
+
+  private  T fromJsonObject(Type typeOfT, JsonObject jsonObject,
+      JsonDeserializationContext context) throws JsonParseException {
+    JsonObjectDeserializationVisitor visitor = new JsonObjectDeserializationVisitor(
+        jsonObject, typeOfT, objectNavigator, fieldNamingPolicy,
+        objectConstructor, deserializers, context);
+    objectNavigator.accept(new ObjectTypePair(null, typeOfT, true), visitor);
+    return visitor.getTarget();
+  }
+
+  @SuppressWarnings("unchecked")
+  private  T fromJsonPrimitive(Type typeOfT, JsonPrimitive json,
+      JsonDeserializationContext context) throws JsonParseException {
+    JsonObjectDeserializationVisitor visitor = new JsonObjectDeserializationVisitor(
+        json, typeOfT, objectNavigator, fieldNamingPolicy, objectConstructor, deserializers, context);
+    objectNavigator.accept(new ObjectTypePair(json.getAsObject(), typeOfT, true), visitor);
+    Object target = visitor.getTarget();
+    return (T) target;
+  }
+}
diff --git a/src/org/mcteam/factions/gson/JsonDeserializationVisitor.java b/src/com/massivecraft/factions/gson/JsonDeserializationVisitor.java
similarity index 97%
rename from src/org/mcteam/factions/gson/JsonDeserializationVisitor.java
rename to src/com/massivecraft/factions/gson/JsonDeserializationVisitor.java
index 34b10b61..eea75cad 100644
--- a/src/org/mcteam/factions/gson/JsonDeserializationVisitor.java
+++ b/src/com/massivecraft/factions/gson/JsonDeserializationVisitor.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
-import org.mcteam.factions.gson.internal.$Gson$Preconditions;
+import com.massivecraft.factions.gson.internal.$Gson$Preconditions;
 
 import java.lang.reflect.Type;
 
diff --git a/src/org/mcteam/factions/gson/JsonDeserializer.java b/src/com/massivecraft/factions/gson/JsonDeserializer.java
similarity index 98%
rename from src/org/mcteam/factions/gson/JsonDeserializer.java
rename to src/com/massivecraft/factions/gson/JsonDeserializer.java
index 7b60a830..e8adf753 100644
--- a/src/org/mcteam/factions/gson/JsonDeserializer.java
+++ b/src/com/massivecraft/factions/gson/JsonDeserializer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 import java.lang.reflect.Type;
 
diff --git a/src/org/mcteam/factions/gson/JsonDeserializerExceptionWrapper.java b/src/com/massivecraft/factions/gson/JsonDeserializerExceptionWrapper.java
similarity index 95%
rename from src/org/mcteam/factions/gson/JsonDeserializerExceptionWrapper.java
rename to src/com/massivecraft/factions/gson/JsonDeserializerExceptionWrapper.java
index 524242f6..b00fa71b 100644
--- a/src/org/mcteam/factions/gson/JsonDeserializerExceptionWrapper.java
+++ b/src/com/massivecraft/factions/gson/JsonDeserializerExceptionWrapper.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
-import org.mcteam.factions.gson.internal.$Gson$Preconditions;
+import com.massivecraft.factions.gson.internal.$Gson$Preconditions;
 
 import java.lang.reflect.Type;
 
diff --git a/src/org/mcteam/factions/gson/JsonElement.java b/src/com/massivecraft/factions/gson/JsonElement.java
similarity index 99%
rename from src/org/mcteam/factions/gson/JsonElement.java
rename to src/com/massivecraft/factions/gson/JsonElement.java
index c7edbe09..eebba09f 100644
--- a/src/org/mcteam/factions/gson/JsonElement.java
+++ b/src/com/massivecraft/factions/gson/JsonElement.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 import java.io.IOException;
 import java.math.BigDecimal;
diff --git a/src/org/mcteam/factions/gson/JsonElementVisitor.java b/src/com/massivecraft/factions/gson/JsonElementVisitor.java
similarity index 95%
rename from src/org/mcteam/factions/gson/JsonElementVisitor.java
rename to src/com/massivecraft/factions/gson/JsonElementVisitor.java
index 1dba675f..e1f8d6fc 100644
--- a/src/org/mcteam/factions/gson/JsonElementVisitor.java
+++ b/src/com/massivecraft/factions/gson/JsonElementVisitor.java
@@ -1,47 +1,47 @@
-/*
- * Copyright (C) 2008 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.mcteam.factions.gson;
-
-import java.io.IOException;
-
-/**
- * Definition of a visitor for a JsonElement tree.
- * 
- * @author Inderjeet Singh
- */
-interface JsonElementVisitor {
-  void visitPrimitive(JsonPrimitive primitive) throws IOException;
-  void visitNull() throws IOException;
-
-  void startArray(JsonArray array) throws IOException;
-  void visitArrayMember(JsonArray parent, JsonPrimitive member, boolean isFirst) throws IOException;
-  void visitArrayMember(JsonArray parent, JsonArray member, boolean isFirst) throws IOException;
-  void visitArrayMember(JsonArray parent, JsonObject member, boolean isFirst) throws IOException;
-  void visitNullArrayMember(JsonArray parent, boolean isFirst) throws IOException;
-  void endArray(JsonArray array) throws IOException;
-  
-  void startObject(JsonObject object) throws IOException;
-  void visitObjectMember(JsonObject parent, String memberName, JsonPrimitive member, 
-      boolean isFirst) throws IOException;
-  void visitObjectMember(JsonObject parent, String memberName, JsonArray member, 
-      boolean isFirst) throws IOException;
-  void visitObjectMember(JsonObject parent, String memberName, JsonObject member, 
-      boolean isFirst) throws IOException;
-  void visitNullObjectMember(JsonObject parent, String memberName, 
-      boolean isFirst) throws IOException;
-  void endObject(JsonObject object) throws IOException;
+/*
+ * Copyright (C) 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.massivecraft.factions.gson;
+
+import java.io.IOException;
+
+/**
+ * Definition of a visitor for a JsonElement tree.
+ * 
+ * @author Inderjeet Singh
+ */
+interface JsonElementVisitor {
+  void visitPrimitive(JsonPrimitive primitive) throws IOException;
+  void visitNull() throws IOException;
+
+  void startArray(JsonArray array) throws IOException;
+  void visitArrayMember(JsonArray parent, JsonPrimitive member, boolean isFirst) throws IOException;
+  void visitArrayMember(JsonArray parent, JsonArray member, boolean isFirst) throws IOException;
+  void visitArrayMember(JsonArray parent, JsonObject member, boolean isFirst) throws IOException;
+  void visitNullArrayMember(JsonArray parent, boolean isFirst) throws IOException;
+  void endArray(JsonArray array) throws IOException;
+  
+  void startObject(JsonObject object) throws IOException;
+  void visitObjectMember(JsonObject parent, String memberName, JsonPrimitive member, 
+      boolean isFirst) throws IOException;
+  void visitObjectMember(JsonObject parent, String memberName, JsonArray member, 
+      boolean isFirst) throws IOException;
+  void visitObjectMember(JsonObject parent, String memberName, JsonObject member, 
+      boolean isFirst) throws IOException;
+  void visitNullObjectMember(JsonObject parent, String memberName, 
+      boolean isFirst) throws IOException;
+  void endObject(JsonObject object) throws IOException;
 }
\ No newline at end of file
diff --git a/src/org/mcteam/factions/gson/JsonIOException.java b/src/com/massivecraft/factions/gson/JsonIOException.java
similarity index 97%
rename from src/org/mcteam/factions/gson/JsonIOException.java
rename to src/com/massivecraft/factions/gson/JsonIOException.java
index f63e1b8f..c4637ddd 100644
--- a/src/org/mcteam/factions/gson/JsonIOException.java
+++ b/src/com/massivecraft/factions/gson/JsonIOException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 /**
  * This exception is raised when Gson was unable to read an input stream
diff --git a/src/org/mcteam/factions/gson/JsonNull.java b/src/com/massivecraft/factions/gson/JsonNull.java
similarity index 94%
rename from src/org/mcteam/factions/gson/JsonNull.java
rename to src/com/massivecraft/factions/gson/JsonNull.java
index 65424d47..86d61865 100644
--- a/src/org/mcteam/factions/gson/JsonNull.java
+++ b/src/com/massivecraft/factions/gson/JsonNull.java
@@ -1,72 +1,72 @@
-/*
- * Copyright (C) 2008 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.mcteam.factions.gson;
-
-import java.io.IOException;
-
-/**
- * A class representing a Json {@code null} value.
- *
- * @author Inderjeet Singh
- * @author Joel Leitch
- * @since 1.2
- */
-public final class JsonNull extends JsonElement {
-  private static final JsonNull INSTANCE = new JsonNull();
-
-  /**
-   * Creates a new JsonNull object.
-   */
-  public JsonNull() {
-    // Do nothing
-  }
-  
-  @Override
-  protected void toString(Appendable sb, Escaper escaper) throws IOException {
-    sb.append("null");
-  }
-  
-  /**
-   * All instances of JsonNull have the same hash code since they are indistinguishable
-   */
-  @Override
-  public int hashCode() {
-    return JsonNull.class.hashCode();
-  }
-  
-  /**
-   * All instances of JsonNull are the same
-   */
-  @Override
-  public boolean equals(Object other) {
-    return this == other || other instanceof JsonNull;
-  }
-  
-  /**
-   * Creation method used to return an instance of a {@link JsonNull}.  To reduce the memory
-   * footprint, a single object has been created for this class; therefore the same instance is
-   * being returned for each invocation of this method. This method is kept private since we 
-   * prefer the users to use {@link JsonNull#JsonNull()} which is similar to how other JsonElements
-   * are created. Note that all instances of JsonNull return true for {@link #equals(Object)} 
-   * when compared to each other.
-   *
-   * @return a instance of a {@link JsonNull}
-   */
-  static JsonNull createJsonNull() {
-    return INSTANCE;
-  }
-}
+/*
+ * Copyright (C) 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.massivecraft.factions.gson;
+
+import java.io.IOException;
+
+/**
+ * A class representing a Json {@code null} value.
+ *
+ * @author Inderjeet Singh
+ * @author Joel Leitch
+ * @since 1.2
+ */
+public final class JsonNull extends JsonElement {
+  private static final JsonNull INSTANCE = new JsonNull();
+
+  /**
+   * Creates a new JsonNull object.
+   */
+  public JsonNull() {
+    // Do nothing
+  }
+  
+  @Override
+  protected void toString(Appendable sb, Escaper escaper) throws IOException {
+    sb.append("null");
+  }
+  
+  /**
+   * All instances of JsonNull have the same hash code since they are indistinguishable
+   */
+  @Override
+  public int hashCode() {
+    return JsonNull.class.hashCode();
+  }
+  
+  /**
+   * All instances of JsonNull are the same
+   */
+  @Override
+  public boolean equals(Object other) {
+    return this == other || other instanceof JsonNull;
+  }
+  
+  /**
+   * Creation method used to return an instance of a {@link JsonNull}.  To reduce the memory
+   * footprint, a single object has been created for this class; therefore the same instance is
+   * being returned for each invocation of this method. This method is kept private since we 
+   * prefer the users to use {@link JsonNull#JsonNull()} which is similar to how other JsonElements
+   * are created. Note that all instances of JsonNull return true for {@link #equals(Object)} 
+   * when compared to each other.
+   *
+   * @return a instance of a {@link JsonNull}
+   */
+  static JsonNull createJsonNull() {
+    return INSTANCE;
+  }
+}
diff --git a/src/org/mcteam/factions/gson/JsonObject.java b/src/com/massivecraft/factions/gson/JsonObject.java
similarity index 98%
rename from src/org/mcteam/factions/gson/JsonObject.java
rename to src/com/massivecraft/factions/gson/JsonObject.java
index 87d7582d..28c99bf2 100644
--- a/src/org/mcteam/factions/gson/JsonObject.java
+++ b/src/com/massivecraft/factions/gson/JsonObject.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
-import org.mcteam.factions.gson.internal.$Gson$Preconditions;
+import com.massivecraft.factions.gson.internal.$Gson$Preconditions;
 
 import java.io.IOException;
 import java.util.LinkedHashMap;
diff --git a/src/org/mcteam/factions/gson/JsonObjectDeserializationVisitor.java b/src/com/massivecraft/factions/gson/JsonObjectDeserializationVisitor.java
similarity index 99%
rename from src/org/mcteam/factions/gson/JsonObjectDeserializationVisitor.java
rename to src/com/massivecraft/factions/gson/JsonObjectDeserializationVisitor.java
index 56347bd8..13323466 100644
--- a/src/org/mcteam/factions/gson/JsonObjectDeserializationVisitor.java
+++ b/src/com/massivecraft/factions/gson/JsonObjectDeserializationVisitor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 
 import java.lang.reflect.Type;
diff --git a/src/org/mcteam/factions/gson/JsonParseException.java b/src/com/massivecraft/factions/gson/JsonParseException.java
similarity index 98%
rename from src/org/mcteam/factions/gson/JsonParseException.java
rename to src/com/massivecraft/factions/gson/JsonParseException.java
index a00cb722..8edda527 100644
--- a/src/org/mcteam/factions/gson/JsonParseException.java
+++ b/src/com/massivecraft/factions/gson/JsonParseException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 /**
  * This exception is raised if there is a serious issue that occurs during parsing of a Json
diff --git a/src/org/mcteam/factions/gson/JsonParser.java b/src/com/massivecraft/factions/gson/JsonParser.java
similarity index 90%
rename from src/org/mcteam/factions/gson/JsonParser.java
rename to src/com/massivecraft/factions/gson/JsonParser.java
index 2447fa2a..d28df885 100644
--- a/src/org/mcteam/factions/gson/JsonParser.java
+++ b/src/com/massivecraft/factions/gson/JsonParser.java
@@ -1,97 +1,98 @@
-/*
- * Copyright (C) 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.mcteam.factions.gson;
-
-import org.mcteam.factions.gson.stream.JsonReader;
-import org.mcteam.factions.gson.stream.JsonToken;
-import org.mcteam.factions.gson.stream.MalformedJsonException;
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-
-/**
- * A parser to parse Json into a parse tree of {@link JsonElement}s
- *
- * @author Inderjeet Singh
- * @author Joel Leitch
- * @since 1.3
- */
-public final class JsonParser {
-
-  /**
-   * Parses the specified JSON string into a parse tree
-   *
-   * @param json JSON text
-   * @return a parse tree of {@link JsonElement}s corresponding to the specified JSON
-   * @throws JsonParseException if the specified text is not valid JSON
-   * @since 1.3
-   */
-  public JsonElement parse(String json) throws JsonSyntaxException {
-    return parse(new StringReader(json));
-  }
-
-  /**
-   * Parses the specified JSON string into a parse tree
-   *
-   * @param json JSON text
-   * @return a parse tree of {@link JsonElement}s corresponding to the specified JSON
-   * @throws JsonParseException if the specified text is not valid JSON
-   * @since 1.3
-   */
-  public JsonElement parse(Reader json) throws JsonIOException, JsonSyntaxException {
-    try {
-      JsonReader jsonReader = new JsonReader(json);
-      JsonElement element = parse(jsonReader);
-      if (!element.isJsonNull() && jsonReader.peek() != JsonToken.END_DOCUMENT) {
-        throw new JsonSyntaxException("Did not consume the entire document.");
-      }
-      return element;
-    } catch (MalformedJsonException e) {
-      throw new JsonSyntaxException(e);
-    } catch (IOException e) {
-      throw new JsonIOException(e);
-    } catch (NumberFormatException e) {
-      throw new JsonSyntaxException(e);
-    }
-  }
-
-  /**
-   * Returns the next value from the JSON stream as a parse tree.
-   *
-   * @throws JsonParseException if there is an IOException or if the specified
-   *     text is not valid JSON
-   * @since 1.6
-   */
-  public JsonElement parse(JsonReader json) throws JsonIOException, JsonSyntaxException {
-    boolean lenient = json.isLenient();
-    json.setLenient(true);
-    try {
-      return Streams.parse(json);
-    } catch (StackOverflowError e) {
-      throw new JsonParseException("Failed parsing JSON source: " + json + " to Json", e);
-    } catch (OutOfMemoryError e) {
-      throw new JsonParseException("Failed parsing JSON source: " + json + " to Json", e);
-    } catch (JsonParseException e) {
-      if (e.getCause() instanceof EOFException) {
-        return JsonNull.createJsonNull();
-      }
-      throw e;
-    } finally {
-      json.setLenient(lenient);
-    }
-  }
-}
+/*
+ * Copyright (C) 2009 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.massivecraft.factions.gson;
+
+import com.massivecraft.factions.gson.stream.JsonReader;
+import com.massivecraft.factions.gson.stream.JsonToken;
+import com.massivecraft.factions.gson.stream.MalformedJsonException;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+
+/**
+ * A parser to parse Json into a parse tree of {@link JsonElement}s
+ *
+ * @author Inderjeet Singh
+ * @author Joel Leitch
+ * @since 1.3
+ */
+public final class JsonParser {
+
+  /**
+   * Parses the specified JSON string into a parse tree
+   *
+   * @param json JSON text
+   * @return a parse tree of {@link JsonElement}s corresponding to the specified JSON
+   * @throws JsonParseException if the specified text is not valid JSON
+   * @since 1.3
+   */
+  public JsonElement parse(String json) throws JsonSyntaxException {
+    return parse(new StringReader(json));
+  }
+
+  /**
+   * Parses the specified JSON string into a parse tree
+   *
+   * @param json JSON text
+   * @return a parse tree of {@link JsonElement}s corresponding to the specified JSON
+   * @throws JsonParseException if the specified text is not valid JSON
+   * @since 1.3
+   */
+  public JsonElement parse(Reader json) throws JsonIOException, JsonSyntaxException {
+    try {
+      JsonReader jsonReader = new JsonReader(json);
+      JsonElement element = parse(jsonReader);
+      if (!element.isJsonNull() && jsonReader.peek() != JsonToken.END_DOCUMENT) {
+        throw new JsonSyntaxException("Did not consume the entire document.");
+      }
+      return element;
+    } catch (MalformedJsonException e) {
+      throw new JsonSyntaxException(e);
+    } catch (IOException e) {
+      throw new JsonIOException(e);
+    } catch (NumberFormatException e) {
+      throw new JsonSyntaxException(e);
+    }
+  }
+
+  /**
+   * Returns the next value from the JSON stream as a parse tree.
+   *
+   * @throws JsonParseException if there is an IOException or if the specified
+   *     text is not valid JSON
+   * @since 1.6
+   */
+  public JsonElement parse(JsonReader json) throws JsonIOException, JsonSyntaxException {
+    boolean lenient = json.isLenient();
+    json.setLenient(true);
+    try {
+      return Streams.parse(json);
+    } catch (StackOverflowError e) {
+      throw new JsonParseException("Failed parsing JSON source: " + json + " to Json", e);
+    } catch (OutOfMemoryError e) {
+      throw new JsonParseException("Failed parsing JSON source: " + json + " to Json", e);
+    } catch (JsonParseException e) {
+      if (e.getCause() instanceof EOFException) {
+        return JsonNull.createJsonNull();
+      }
+      throw e;
+    } finally {
+      json.setLenient(lenient);
+    }
+  }
+}
diff --git a/src/org/mcteam/factions/gson/JsonPrimitive.java b/src/com/massivecraft/factions/gson/JsonPrimitive.java
similarity index 99%
rename from src/org/mcteam/factions/gson/JsonPrimitive.java
rename to src/com/massivecraft/factions/gson/JsonPrimitive.java
index d830ffb4..b9cc9601 100644
--- a/src/org/mcteam/factions/gson/JsonPrimitive.java
+++ b/src/com/massivecraft/factions/gson/JsonPrimitive.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
-import org.mcteam.factions.gson.internal.$Gson$Preconditions;
+import com.massivecraft.factions.gson.internal.$Gson$Preconditions;
 
 import java.io.IOException;
 import java.math.BigDecimal;
diff --git a/src/org/mcteam/factions/gson/JsonSerializationContext.java b/src/com/massivecraft/factions/gson/JsonSerializationContext.java
similarity index 97%
rename from src/org/mcteam/factions/gson/JsonSerializationContext.java
rename to src/com/massivecraft/factions/gson/JsonSerializationContext.java
index 3c60d7d1..94561977 100644
--- a/src/org/mcteam/factions/gson/JsonSerializationContext.java
+++ b/src/com/massivecraft/factions/gson/JsonSerializationContext.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 import java.lang.reflect.Type;
 
diff --git a/src/org/mcteam/factions/gson/JsonSerializationContextDefault.java b/src/com/massivecraft/factions/gson/JsonSerializationContextDefault.java
similarity index 95%
rename from src/org/mcteam/factions/gson/JsonSerializationContextDefault.java
rename to src/com/massivecraft/factions/gson/JsonSerializationContextDefault.java
index 14c3df00..1374b635 100644
--- a/src/org/mcteam/factions/gson/JsonSerializationContextDefault.java
+++ b/src/com/massivecraft/factions/gson/JsonSerializationContextDefault.java
@@ -1,65 +1,65 @@
-/*
- * Copyright (C) 2008 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.mcteam.factions.gson;
-
-
-import java.lang.reflect.Type;
-
-/**
- * An implementation of serialization context for Gson.
- *
- * @author Inderjeet Singh
- */
-final class JsonSerializationContextDefault implements JsonSerializationContext {
-
-  private final ObjectNavigator objectNavigator;
-  private final FieldNamingStrategy2 fieldNamingPolicy;
-  private final ParameterizedTypeHandlerMap> serializers;
-  private final boolean serializeNulls;
-  private final MemoryRefStack ancestors;
-
-  JsonSerializationContextDefault(ObjectNavigator objectNavigator,
-      FieldNamingStrategy2 fieldNamingPolicy, boolean serializeNulls,
-      ParameterizedTypeHandlerMap> serializers) {
-    this.objectNavigator = objectNavigator;
-    this.fieldNamingPolicy = fieldNamingPolicy;
-    this.serializeNulls = serializeNulls;
-    this.serializers = serializers;
-    this.ancestors = new MemoryRefStack();
-  }
-
-  public JsonElement serialize(Object src) {
-    if (src == null) {
-      return JsonNull.createJsonNull();
-    }
-    return serialize(src, src.getClass(), false);
-  }
-
-  public JsonElement serialize(Object src, Type typeOfSrc) {
-    return serialize(src, typeOfSrc, true);
-  }
-
-  JsonElement serialize(Object src, Type typeOfSrc, boolean preserveType) {
-    if (src == null) {
-      return JsonNull.createJsonNull();
-    }
-    JsonSerializationVisitor visitor = new JsonSerializationVisitor(
-        objectNavigator, fieldNamingPolicy, serializeNulls, serializers, this, ancestors);
-    objectNavigator.accept(new ObjectTypePair(src, typeOfSrc, preserveType), visitor);
-    return visitor.getJsonElement();
-  }
-}
+/*
+ * Copyright (C) 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.massivecraft.factions.gson;
+
+
+import java.lang.reflect.Type;
+
+/**
+ * An implementation of serialization context for Gson.
+ *
+ * @author Inderjeet Singh
+ */
+final class JsonSerializationContextDefault implements JsonSerializationContext {
+
+  private final ObjectNavigator objectNavigator;
+  private final FieldNamingStrategy2 fieldNamingPolicy;
+  private final ParameterizedTypeHandlerMap> serializers;
+  private final boolean serializeNulls;
+  private final MemoryRefStack ancestors;
+
+  JsonSerializationContextDefault(ObjectNavigator objectNavigator,
+      FieldNamingStrategy2 fieldNamingPolicy, boolean serializeNulls,
+      ParameterizedTypeHandlerMap> serializers) {
+    this.objectNavigator = objectNavigator;
+    this.fieldNamingPolicy = fieldNamingPolicy;
+    this.serializeNulls = serializeNulls;
+    this.serializers = serializers;
+    this.ancestors = new MemoryRefStack();
+  }
+
+  public JsonElement serialize(Object src) {
+    if (src == null) {
+      return JsonNull.createJsonNull();
+    }
+    return serialize(src, src.getClass(), false);
+  }
+
+  public JsonElement serialize(Object src, Type typeOfSrc) {
+    return serialize(src, typeOfSrc, true);
+  }
+
+  JsonElement serialize(Object src, Type typeOfSrc, boolean preserveType) {
+    if (src == null) {
+      return JsonNull.createJsonNull();
+    }
+    JsonSerializationVisitor visitor = new JsonSerializationVisitor(
+        objectNavigator, fieldNamingPolicy, serializeNulls, serializers, this, ancestors);
+    objectNavigator.accept(new ObjectTypePair(src, typeOfSrc, preserveType), visitor);
+    return visitor.getJsonElement();
+  }
+}
diff --git a/src/org/mcteam/factions/gson/JsonSerializationVisitor.java b/src/com/massivecraft/factions/gson/JsonSerializationVisitor.java
similarity index 97%
rename from src/org/mcteam/factions/gson/JsonSerializationVisitor.java
rename to src/com/massivecraft/factions/gson/JsonSerializationVisitor.java
index 25af6b1e..a6c7bc0b 100644
--- a/src/org/mcteam/factions/gson/JsonSerializationVisitor.java
+++ b/src/com/massivecraft/factions/gson/JsonSerializationVisitor.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
-import org.mcteam.factions.gson.internal.$Gson$Types;
-import org.mcteam.factions.gson.internal.$Gson$Preconditions;
+import com.massivecraft.factions.gson.internal.$Gson$Preconditions;
+import com.massivecraft.factions.gson.internal.$Gson$Types;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Type;
diff --git a/src/org/mcteam/factions/gson/JsonSerializer.java b/src/com/massivecraft/factions/gson/JsonSerializer.java
similarity index 95%
rename from src/org/mcteam/factions/gson/JsonSerializer.java
rename to src/com/massivecraft/factions/gson/JsonSerializer.java
index 5940bfe5..c61999fb 100644
--- a/src/org/mcteam/factions/gson/JsonSerializer.java
+++ b/src/com/massivecraft/factions/gson/JsonSerializer.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.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 org.mcteam.factions.gson.GsonBuilder#registerTypeAdapter(Type, Object)}.
+ * this serializer through {@link com.massivecraft.factions.gson.GsonBuilder#registerTypeAdapter(Type, Object)}.
  *
  * 
    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}.
    
diff --git a/src/org/mcteam/factions/gson/JsonStreamParser.java b/src/com/massivecraft/factions/gson/JsonStreamParser.java
similarity index 94%
rename from src/org/mcteam/factions/gson/JsonStreamParser.java
rename to src/com/massivecraft/factions/gson/JsonStreamParser.java
index ac868936..3ea06915 100644
--- a/src/org/mcteam/factions/gson/JsonStreamParser.java
+++ b/src/com/massivecraft/factions/gson/JsonStreamParser.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -22,9 +22,9 @@ import java.io.StringReader;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import org.mcteam.factions.gson.stream.JsonReader;
-import org.mcteam.factions.gson.stream.JsonToken;
-import org.mcteam.factions.gson.stream.MalformedJsonException;
+import com.massivecraft.factions.gson.stream.JsonReader;
+import com.massivecraft.factions.gson.stream.JsonToken;
+import com.massivecraft.factions.gson.stream.MalformedJsonException;
 
 /**
  * A streaming parser that allows reading of multiple {@link JsonElement}s from the specified reader
diff --git a/src/org/mcteam/factions/gson/JsonSyntaxException.java b/src/com/massivecraft/factions/gson/JsonSyntaxException.java
similarity index 97%
rename from src/org/mcteam/factions/gson/JsonSyntaxException.java
rename to src/com/massivecraft/factions/gson/JsonSyntaxException.java
index accb9f30..87768d67 100644
--- a/src/org/mcteam/factions/gson/JsonSyntaxException.java
+++ b/src/com/massivecraft/factions/gson/JsonSyntaxException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 /**
  * This exception is raised when Gson attempts to read (or write) a malformed
diff --git a/src/org/mcteam/factions/gson/JsonTreeNavigator.java b/src/com/massivecraft/factions/gson/JsonTreeNavigator.java
similarity index 96%
rename from src/org/mcteam/factions/gson/JsonTreeNavigator.java
rename to src/com/massivecraft/factions/gson/JsonTreeNavigator.java
index 9656b6ac..50d554a5 100644
--- a/src/org/mcteam/factions/gson/JsonTreeNavigator.java
+++ b/src/com/massivecraft/factions/gson/JsonTreeNavigator.java
@@ -1,111 +1,111 @@
-/*
- * Copyright (C) 2008 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.mcteam.factions.gson;
-
-import java.io.IOException;
-import java.util.Map;
-
-/**
- * A navigator to navigate a tree of JsonElement nodes in Depth-first order
- * 
- * @author Inderjeet Singh
- */
-final class JsonTreeNavigator {
-  private final JsonElementVisitor visitor;
-  private final boolean visitNulls;
-
-  JsonTreeNavigator(JsonElementVisitor visitor, boolean visitNulls) {
-    this.visitor = visitor;
-    this.visitNulls = visitNulls;
-  }
-  
-  public void navigate(JsonElement element) throws IOException {
-    if (element.isJsonNull()) {
-      visitor.visitNull();
-    } else if (element.isJsonArray()) {
-      JsonArray array = element.getAsJsonArray();
-      visitor.startArray(array);
-      boolean isFirst = true;
-      for (JsonElement child : array) {
-        visitChild(array, child, isFirst);
-        if (isFirst) {
-          isFirst = false;
-        }
-      }
-      visitor.endArray(array);
-    } else if (element.isJsonObject()) {
-      JsonObject object = element.getAsJsonObject();
-      visitor.startObject(object);
-      boolean isFirst = true;
-      for (Map.Entry member : object.entrySet()) {
-        boolean visited = visitChild(object, member.getKey(), member.getValue(), isFirst);
-        if (visited && isFirst) {
-          isFirst = false;
-        }
-      }
-      visitor.endObject(object);
-    } else { // must be JsonPrimitive
-      visitor.visitPrimitive(element.getAsJsonPrimitive());
-    }    
-  }
-
-  /**
-   * Returns true if the child was visited, false if it was skipped.
-   */
-  private boolean visitChild(JsonObject parent, String childName, JsonElement child, 
-      boolean isFirst) throws IOException {
-    if (child.isJsonNull()) {
-      if (visitNulls) {
-        visitor.visitNullObjectMember(parent, childName, isFirst);
-        navigate(child.getAsJsonNull());
-      } else { // Null value is being skipped.
-        return false;
-      }
-    } else if (child.isJsonArray()) {
-      JsonArray childAsArray = child.getAsJsonArray();
-      visitor.visitObjectMember(parent, childName, childAsArray, isFirst);
-      navigate(childAsArray);
-    } else if (child.isJsonObject()) {
-      JsonObject childAsObject = child.getAsJsonObject();
-      visitor.visitObjectMember(parent, childName, childAsObject, isFirst);
-      navigate(childAsObject);
-    } else { // is a JsonPrimitive
-      visitor.visitObjectMember(parent, childName, child.getAsJsonPrimitive(), isFirst);          
-    }
-    return true;
-  }
-
-  /**
-   * Returns true if the child was visited, false if it was skipped.
-   */
-  private void visitChild(JsonArray parent, JsonElement child, boolean isFirst) throws IOException {
-    if (child.isJsonNull()) {
-      visitor.visitNullArrayMember(parent, isFirst);
-      navigate(child);
-	  } else if (child.isJsonArray()) {
-      JsonArray childAsArray = child.getAsJsonArray();
-      visitor.visitArrayMember(parent, childAsArray, isFirst);
-      navigate(childAsArray);
-    } else if (child.isJsonObject()) {
-      JsonObject childAsObject = child.getAsJsonObject();
-      visitor.visitArrayMember(parent, childAsObject, isFirst);
-      navigate(childAsObject);
-    } else { // is a JsonPrimitive
-      visitor.visitArrayMember(parent, child.getAsJsonPrimitive(), isFirst);          
-    }
-  }
-}
+/*
+ * Copyright (C) 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.massivecraft.factions.gson;
+
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * A navigator to navigate a tree of JsonElement nodes in Depth-first order
+ * 
+ * @author Inderjeet Singh
+ */
+final class JsonTreeNavigator {
+  private final JsonElementVisitor visitor;
+  private final boolean visitNulls;
+
+  JsonTreeNavigator(JsonElementVisitor visitor, boolean visitNulls) {
+    this.visitor = visitor;
+    this.visitNulls = visitNulls;
+  }
+  
+  public void navigate(JsonElement element) throws IOException {
+    if (element.isJsonNull()) {
+      visitor.visitNull();
+    } else if (element.isJsonArray()) {
+      JsonArray array = element.getAsJsonArray();
+      visitor.startArray(array);
+      boolean isFirst = true;
+      for (JsonElement child : array) {
+        visitChild(array, child, isFirst);
+        if (isFirst) {
+          isFirst = false;
+        }
+      }
+      visitor.endArray(array);
+    } else if (element.isJsonObject()) {
+      JsonObject object = element.getAsJsonObject();
+      visitor.startObject(object);
+      boolean isFirst = true;
+      for (Map.Entry member : object.entrySet()) {
+        boolean visited = visitChild(object, member.getKey(), member.getValue(), isFirst);
+        if (visited && isFirst) {
+          isFirst = false;
+        }
+      }
+      visitor.endObject(object);
+    } else { // must be JsonPrimitive
+      visitor.visitPrimitive(element.getAsJsonPrimitive());
+    }    
+  }
+
+  /**
+   * Returns true if the child was visited, false if it was skipped.
+   */
+  private boolean visitChild(JsonObject parent, String childName, JsonElement child, 
+      boolean isFirst) throws IOException {
+    if (child.isJsonNull()) {
+      if (visitNulls) {
+        visitor.visitNullObjectMember(parent, childName, isFirst);
+        navigate(child.getAsJsonNull());
+      } else { // Null value is being skipped.
+        return false;
+      }
+    } else if (child.isJsonArray()) {
+      JsonArray childAsArray = child.getAsJsonArray();
+      visitor.visitObjectMember(parent, childName, childAsArray, isFirst);
+      navigate(childAsArray);
+    } else if (child.isJsonObject()) {
+      JsonObject childAsObject = child.getAsJsonObject();
+      visitor.visitObjectMember(parent, childName, childAsObject, isFirst);
+      navigate(childAsObject);
+    } else { // is a JsonPrimitive
+      visitor.visitObjectMember(parent, childName, child.getAsJsonPrimitive(), isFirst);          
+    }
+    return true;
+  }
+
+  /**
+   * Returns true if the child was visited, false if it was skipped.
+   */
+  private void visitChild(JsonArray parent, JsonElement child, boolean isFirst) throws IOException {
+    if (child.isJsonNull()) {
+      visitor.visitNullArrayMember(parent, isFirst);
+      navigate(child);
+	  } else if (child.isJsonArray()) {
+      JsonArray childAsArray = child.getAsJsonArray();
+      visitor.visitArrayMember(parent, childAsArray, isFirst);
+      navigate(childAsArray);
+    } else if (child.isJsonObject()) {
+      JsonObject childAsObject = child.getAsJsonObject();
+      visitor.visitArrayMember(parent, childAsObject, isFirst);
+      navigate(childAsObject);
+    } else { // is a JsonPrimitive
+      visitor.visitArrayMember(parent, child.getAsJsonPrimitive(), isFirst);          
+    }
+  }
+}
diff --git a/src/org/mcteam/factions/gson/LongSerializationPolicy.java b/src/com/massivecraft/factions/gson/LongSerializationPolicy.java
similarity index 98%
rename from src/org/mcteam/factions/gson/LongSerializationPolicy.java
rename to src/com/massivecraft/factions/gson/LongSerializationPolicy.java
index bc8027ff..b303f213 100644
--- a/src/org/mcteam/factions/gson/LongSerializationPolicy.java
+++ b/src/com/massivecraft/factions/gson/LongSerializationPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 /**
  * Defines the expected format for a {@code long} or {@code Long} type when its serialized.
diff --git a/src/org/mcteam/factions/gson/LowerCamelCaseSeparatorNamingPolicy.java b/src/com/massivecraft/factions/gson/LowerCamelCaseSeparatorNamingPolicy.java
similarity index 97%
rename from src/org/mcteam/factions/gson/LowerCamelCaseSeparatorNamingPolicy.java
rename to src/com/massivecraft/factions/gson/LowerCamelCaseSeparatorNamingPolicy.java
index 0d8161a3..438d692c 100644
--- a/src/org/mcteam/factions/gson/LowerCamelCaseSeparatorNamingPolicy.java
+++ b/src/com/massivecraft/factions/gson/LowerCamelCaseSeparatorNamingPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 /**
  * A {@link FieldNamingStrategy2} that ensures the JSON field names consist of only
diff --git a/src/org/mcteam/factions/gson/LowerCaseNamingPolicy.java b/src/com/massivecraft/factions/gson/LowerCaseNamingPolicy.java
similarity index 97%
rename from src/org/mcteam/factions/gson/LowerCaseNamingPolicy.java
rename to src/com/massivecraft/factions/gson/LowerCaseNamingPolicy.java
index c8e1f0dc..602f004b 100644
--- a/src/org/mcteam/factions/gson/LowerCaseNamingPolicy.java
+++ b/src/com/massivecraft/factions/gson/LowerCaseNamingPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
diff --git a/src/org/mcteam/factions/gson/LruCache.java b/src/com/massivecraft/factions/gson/LruCache.java
similarity index 97%
rename from src/org/mcteam/factions/gson/LruCache.java
rename to src/com/massivecraft/factions/gson/LruCache.java
index e9318a2f..58d7b1e1 100644
--- a/src/org/mcteam/factions/gson/LruCache.java
+++ b/src/com/massivecraft/factions/gson/LruCache.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 
 import java.util.LinkedHashMap;
diff --git a/src/org/mcteam/factions/gson/MapAsArrayTypeAdapter.java b/src/com/massivecraft/factions/gson/MapAsArrayTypeAdapter.java
similarity index 95%
rename from src/org/mcteam/factions/gson/MapAsArrayTypeAdapter.java
rename to src/com/massivecraft/factions/gson/MapAsArrayTypeAdapter.java
index 98b308d8..3224a1a7 100644
--- a/src/org/mcteam/factions/gson/MapAsArrayTypeAdapter.java
+++ b/src/com/massivecraft/factions/gson/MapAsArrayTypeAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -44,9 +44,9 @@ import java.util.Map;
  * But GSON is unable to deserialize this value because the JSON string name is
  * just the {@link Object#toString() toString()} of the map key. Attempting to
  * convert the above JSON to an object fails with a parse exception:
- * 
    org.mcteam.factions.gson.JsonParseException: Expecting object found: "(5,6)"
- *   at org.mcteam.factions.gson.JsonObjectDeserializationVisitor.visitFieldUsingCustomHandler
- *   at org.mcteam.factions.gson.ObjectNavigator.navigateClassFields
+ * 
    com.google.gson.JsonParseException: Expecting object found: "(5,6)"
+ *   at com.google.gson.JsonObjectDeserializationVisitor.visitFieldUsingCustomHandler
+ *   at com.google.gson.ObjectNavigator.navigateClassFields
  *   ...
    
  *
  * 
    Maps as JSON arrays
    
diff --git a/src/org/mcteam/factions/gson/MapTypeAdapter.java b/src/com/massivecraft/factions/gson/MapTypeAdapter.java
similarity index 96%
rename from src/org/mcteam/factions/gson/MapTypeAdapter.java
rename to src/com/massivecraft/factions/gson/MapTypeAdapter.java
index d1d52399..6b20ef8b 100644
--- a/src/org/mcteam/factions/gson/MapTypeAdapter.java
+++ b/src/com/massivecraft/factions/gson/MapTypeAdapter.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
-import org.mcteam.factions.gson.internal.$Gson$Types;
+import com.massivecraft.factions.gson.internal.$Gson$Types;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
diff --git a/src/org/mcteam/factions/gson/MappedObjectConstructor.java b/src/com/massivecraft/factions/gson/MappedObjectConstructor.java
similarity index 96%
rename from src/org/mcteam/factions/gson/MappedObjectConstructor.java
rename to src/com/massivecraft/factions/gson/MappedObjectConstructor.java
index 81ac8019..90f1ed11 100644
--- a/src/org/mcteam/factions/gson/MappedObjectConstructor.java
+++ b/src/com/massivecraft/factions/gson/MappedObjectConstructor.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
-import org.mcteam.factions.gson.internal.$Gson$Types;
+import com.massivecraft.factions.gson.internal.$Gson$Types;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Type;
diff --git a/src/org/mcteam/factions/gson/MemoryRefStack.java b/src/com/massivecraft/factions/gson/MemoryRefStack.java
similarity index 95%
rename from src/org/mcteam/factions/gson/MemoryRefStack.java
rename to src/com/massivecraft/factions/gson/MemoryRefStack.java
index fa2292d1..84475ed4 100644
--- a/src/org/mcteam/factions/gson/MemoryRefStack.java
+++ b/src/com/massivecraft/factions/gson/MemoryRefStack.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
-import org.mcteam.factions.gson.internal.$Gson$Preconditions;
+import com.massivecraft.factions.gson.internal.$Gson$Preconditions;
 
 import java.util.Stack;
 
diff --git a/src/org/mcteam/factions/gson/ModifierBasedExclusionStrategy.java b/src/com/massivecraft/factions/gson/ModifierBasedExclusionStrategy.java
similarity index 97%
rename from src/org/mcteam/factions/gson/ModifierBasedExclusionStrategy.java
rename to src/com/massivecraft/factions/gson/ModifierBasedExclusionStrategy.java
index 89f7a7ba..c29934ce 100644
--- a/src/org/mcteam/factions/gson/ModifierBasedExclusionStrategy.java
+++ b/src/com/massivecraft/factions/gson/ModifierBasedExclusionStrategy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/src/org/mcteam/factions/gson/ModifyFirstLetterNamingPolicy.java b/src/com/massivecraft/factions/gson/ModifyFirstLetterNamingPolicy.java
similarity index 97%
rename from src/org/mcteam/factions/gson/ModifyFirstLetterNamingPolicy.java
rename to src/com/massivecraft/factions/gson/ModifyFirstLetterNamingPolicy.java
index d53982ae..dc358178 100644
--- a/src/org/mcteam/factions/gson/ModifyFirstLetterNamingPolicy.java
+++ b/src/com/massivecraft/factions/gson/ModifyFirstLetterNamingPolicy.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
-import org.mcteam.factions.gson.internal.$Gson$Preconditions;
+import com.massivecraft.factions.gson.internal.$Gson$Preconditions;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
diff --git a/src/org/mcteam/factions/gson/NullExclusionStrategy.java b/src/com/massivecraft/factions/gson/NullExclusionStrategy.java
similarity index 96%
rename from src/org/mcteam/factions/gson/NullExclusionStrategy.java
rename to src/com/massivecraft/factions/gson/NullExclusionStrategy.java
index 8836ede3..fa0d0fa4 100644
--- a/src/org/mcteam/factions/gson/NullExclusionStrategy.java
+++ b/src/com/massivecraft/factions/gson/NullExclusionStrategy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 /**
  * This acts as a "Null Object" pattern for the {@link ExclusionStrategy}.
diff --git a/src/org/mcteam/factions/gson/ObjectConstructor.java b/src/com/massivecraft/factions/gson/ObjectConstructor.java
similarity index 97%
rename from src/org/mcteam/factions/gson/ObjectConstructor.java
rename to src/com/massivecraft/factions/gson/ObjectConstructor.java
index 86fe8ca9..5094c909 100644
--- a/src/org/mcteam/factions/gson/ObjectConstructor.java
+++ b/src/com/massivecraft/factions/gson/ObjectConstructor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 import java.lang.reflect.Type;
 
diff --git a/src/org/mcteam/factions/gson/ObjectNavigator.java b/src/com/massivecraft/factions/gson/ObjectNavigator.java
similarity index 97%
rename from src/org/mcteam/factions/gson/ObjectNavigator.java
rename to src/com/massivecraft/factions/gson/ObjectNavigator.java
index 2f442f6a..7491bfc6 100644
--- a/src/org/mcteam/factions/gson/ObjectNavigator.java
+++ b/src/com/massivecraft/factions/gson/ObjectNavigator.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
-import org.mcteam.factions.gson.internal.$Gson$Types;
+import com.massivecraft.factions.gson.internal.$Gson$Types;
 
 import java.lang.reflect.Type;
 
diff --git a/src/org/mcteam/factions/gson/ObjectTypePair.java b/src/com/massivecraft/factions/gson/ObjectTypePair.java
similarity index 99%
rename from src/org/mcteam/factions/gson/ObjectTypePair.java
rename to src/com/massivecraft/factions/gson/ObjectTypePair.java
index d38b8e8e..bdabc203 100644
--- a/src/org/mcteam/factions/gson/ObjectTypePair.java
+++ b/src/com/massivecraft/factions/gson/ObjectTypePair.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 
 import java.lang.reflect.Type;
diff --git a/src/org/mcteam/factions/gson/Pair.java b/src/com/massivecraft/factions/gson/Pair.java
similarity index 97%
rename from src/org/mcteam/factions/gson/Pair.java
rename to src/com/massivecraft/factions/gson/Pair.java
index cb3a5bed..de76aee0 100644
--- a/src/org/mcteam/factions/gson/Pair.java
+++ b/src/com/massivecraft/factions/gson/Pair.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 /**
  * A simple object that holds onto a pair of object references, first and second.
diff --git a/src/org/mcteam/factions/gson/ParameterizedTypeHandlerMap.java b/src/com/massivecraft/factions/gson/ParameterizedTypeHandlerMap.java
similarity index 98%
rename from src/org/mcteam/factions/gson/ParameterizedTypeHandlerMap.java
rename to src/com/massivecraft/factions/gson/ParameterizedTypeHandlerMap.java
index 6e83d6eb..67a7dd80 100644
--- a/src/org/mcteam/factions/gson/ParameterizedTypeHandlerMap.java
+++ b/src/com/massivecraft/factions/gson/ParameterizedTypeHandlerMap.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
-import org.mcteam.factions.gson.internal.$Gson$Types;
+import com.massivecraft.factions.gson.internal.$Gson$Types;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
diff --git a/src/org/mcteam/factions/gson/Primitives.java b/src/com/massivecraft/factions/gson/Primitives.java
similarity index 97%
rename from src/org/mcteam/factions/gson/Primitives.java
rename to src/com/massivecraft/factions/gson/Primitives.java
index 9629dbe1..f185552b 100644
--- a/src/org/mcteam/factions/gson/Primitives.java
+++ b/src/com/massivecraft/factions/gson/Primitives.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 
 import java.lang.reflect.Type;
@@ -22,7 +22,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.mcteam.factions.gson.internal.$Gson$Preconditions;
+import com.massivecraft.factions.gson.internal.$Gson$Preconditions;
 
 /**
  * Contains static utility methods pertaining to primitive types and their
diff --git a/src/org/mcteam/factions/gson/RecursiveFieldNamingPolicy.java b/src/com/massivecraft/factions/gson/RecursiveFieldNamingPolicy.java
similarity index 97%
rename from src/org/mcteam/factions/gson/RecursiveFieldNamingPolicy.java
rename to src/com/massivecraft/factions/gson/RecursiveFieldNamingPolicy.java
index 6d8a305b..c751e8f5 100644
--- a/src/org/mcteam/factions/gson/RecursiveFieldNamingPolicy.java
+++ b/src/com/massivecraft/factions/gson/RecursiveFieldNamingPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
diff --git a/src/org/mcteam/factions/gson/ReflectingFieldNavigator.java b/src/com/massivecraft/factions/gson/ReflectingFieldNavigator.java
similarity index 94%
rename from src/org/mcteam/factions/gson/ReflectingFieldNavigator.java
rename to src/com/massivecraft/factions/gson/ReflectingFieldNavigator.java
index fb2fd8f4..305f04e0 100644
--- a/src/org/mcteam/factions/gson/ReflectingFieldNavigator.java
+++ b/src/com/massivecraft/factions/gson/ReflectingFieldNavigator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Field;
@@ -21,9 +21,9 @@ import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.mcteam.factions.gson.ObjectNavigator.Visitor;
-import org.mcteam.factions.gson.internal.$Gson$Preconditions;
-import org.mcteam.factions.gson.internal.$Gson$Types;
+import com.massivecraft.factions.gson.ObjectNavigator.Visitor;
+import com.massivecraft.factions.gson.internal.$Gson$Preconditions;
+import com.massivecraft.factions.gson.internal.$Gson$Types;
 
 /**
  * Visits each of the fields of the specified class using reflection
diff --git a/src/org/mcteam/factions/gson/SerializedNameAnnotationInterceptingNamingPolicy.java b/src/com/massivecraft/factions/gson/SerializedNameAnnotationInterceptingNamingPolicy.java
similarity index 88%
rename from src/org/mcteam/factions/gson/SerializedNameAnnotationInterceptingNamingPolicy.java
rename to src/com/massivecraft/factions/gson/SerializedNameAnnotationInterceptingNamingPolicy.java
index 537c40e7..f548f09c 100644
--- a/src/org/mcteam/factions/gson/SerializedNameAnnotationInterceptingNamingPolicy.java
+++ b/src/com/massivecraft/factions/gson/SerializedNameAnnotationInterceptingNamingPolicy.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
-import org.mcteam.factions.gson.annotations.SerializedName;
+import com.massivecraft.factions.gson.annotations.SerializedName;
 
 /**
  * A {@link FieldNamingStrategy2} that acts as a chain of responsibility. If the
- * {@link org.mcteam.factions.gson.annotations.SerializedName} annotation is applied to a
+ * {@link com.massivecraft.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/org/mcteam/factions/gson/Streams.java b/src/com/massivecraft/factions/gson/Streams.java
similarity index 96%
rename from src/org/mcteam/factions/gson/Streams.java
rename to src/com/massivecraft/factions/gson/Streams.java
index 305c504e..9e4f1329 100644
--- a/src/org/mcteam/factions/gson/Streams.java
+++ b/src/com/massivecraft/factions/gson/Streams.java
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
+
+import com.massivecraft.factions.gson.stream.JsonReader;
+import com.massivecraft.factions.gson.stream.JsonWriter;
+import com.massivecraft.factions.gson.stream.MalformedJsonException;
 
-import org.mcteam.factions.gson.stream.JsonReader;
-import org.mcteam.factions.gson.stream.JsonWriter;
-import org.mcteam.factions.gson.stream.MalformedJsonException;
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.Writer;
diff --git a/src/org/mcteam/factions/gson/SyntheticFieldExclusionStrategy.java b/src/com/massivecraft/factions/gson/SyntheticFieldExclusionStrategy.java
similarity index 96%
rename from src/org/mcteam/factions/gson/SyntheticFieldExclusionStrategy.java
rename to src/com/massivecraft/factions/gson/SyntheticFieldExclusionStrategy.java
index 5824b04c..a9d25dfb 100644
--- a/src/org/mcteam/factions/gson/SyntheticFieldExclusionStrategy.java
+++ b/src/com/massivecraft/factions/gson/SyntheticFieldExclusionStrategy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 /**
  * A data object that stores attributes of a field.
diff --git a/src/org/mcteam/factions/gson/UnsafeAllocator.java b/src/com/massivecraft/factions/gson/UnsafeAllocator.java
similarity index 98%
rename from src/org/mcteam/factions/gson/UnsafeAllocator.java
rename to src/com/massivecraft/factions/gson/UnsafeAllocator.java
index 82cb29cc..77a7f205 100644
--- a/src/org/mcteam/factions/gson/UnsafeAllocator.java
+++ b/src/com/massivecraft/factions/gson/UnsafeAllocator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 import java.io.ObjectInputStream;
 import java.io.ObjectStreamClass;
diff --git a/src/org/mcteam/factions/gson/UpperCamelCaseSeparatorNamingPolicy.java b/src/com/massivecraft/factions/gson/UpperCamelCaseSeparatorNamingPolicy.java
similarity index 97%
rename from src/org/mcteam/factions/gson/UpperCamelCaseSeparatorNamingPolicy.java
rename to src/com/massivecraft/factions/gson/UpperCamelCaseSeparatorNamingPolicy.java
index 70b09b66..3ae5c9fe 100644
--- a/src/org/mcteam/factions/gson/UpperCamelCaseSeparatorNamingPolicy.java
+++ b/src/com/massivecraft/factions/gson/UpperCamelCaseSeparatorNamingPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 /**
  * A {@link FieldNamingStrategy2} that ensures the JSON field names consist of mixed
diff --git a/src/org/mcteam/factions/gson/UpperCaseNamingPolicy.java b/src/com/massivecraft/factions/gson/UpperCaseNamingPolicy.java
similarity index 97%
rename from src/org/mcteam/factions/gson/UpperCaseNamingPolicy.java
rename to src/com/massivecraft/factions/gson/UpperCaseNamingPolicy.java
index 6546883c..b659a70a 100644
--- a/src/org/mcteam/factions/gson/UpperCaseNamingPolicy.java
+++ b/src/com/massivecraft/factions/gson/UpperCaseNamingPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
diff --git a/src/org/mcteam/factions/gson/VersionConstants.java b/src/com/massivecraft/factions/gson/VersionConstants.java
similarity index 95%
rename from src/org/mcteam/factions/gson/VersionConstants.java
rename to src/com/massivecraft/factions/gson/VersionConstants.java
index 4173db01..5b7a7112 100644
--- a/src/org/mcteam/factions/gson/VersionConstants.java
+++ b/src/com/massivecraft/factions/gson/VersionConstants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
 /**
  * Class contain all constants for versioning support.
diff --git a/src/org/mcteam/factions/gson/VersionExclusionStrategy.java b/src/com/massivecraft/factions/gson/VersionExclusionStrategy.java
similarity index 89%
rename from src/org/mcteam/factions/gson/VersionExclusionStrategy.java
rename to src/com/massivecraft/factions/gson/VersionExclusionStrategy.java
index d55fc56c..894af80f 100644
--- a/src/org/mcteam/factions/gson/VersionExclusionStrategy.java
+++ b/src/com/massivecraft/factions/gson/VersionExclusionStrategy.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson;
+package com.massivecraft.factions.gson;
 
-import org.mcteam.factions.gson.annotations.Since;
-import org.mcteam.factions.gson.annotations.Until;
-import org.mcteam.factions.gson.internal.$Gson$Preconditions;
+import com.massivecraft.factions.gson.annotations.Since;
+import com.massivecraft.factions.gson.annotations.Until;
+import com.massivecraft.factions.gson.internal.$Gson$Preconditions;
 
 /**
  * This strategy will exclude any files and/or class that are passed the
diff --git a/src/org/mcteam/factions/gson/annotations/Expose.java b/src/com/massivecraft/factions/gson/annotations/Expose.java
similarity index 91%
rename from src/org/mcteam/factions/gson/annotations/Expose.java
rename to src/com/massivecraft/factions/gson/annotations/Expose.java
index 0dea005e..81523c41 100644
--- a/src/org/mcteam/factions/gson/annotations/Expose.java
+++ b/src/com/massivecraft/factions/gson/annotations/Expose.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson.annotations;
+package com.massivecraft.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.
  *
- * 
    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()}
+ * 
    This annotation has no effect unless you build {@link com.massivecraft.factions.gson.Gson}
+ * with a {@link com.massivecraft.factions.gson.GsonBuilder} and invoke
+ * {@link com.massivecraft.factions.gson.GsonBuilder#excludeFieldsWithoutExposeAnnotation()}
  * method.
    
  *
  * 
    Here is an example of how this annotation is meant to be used:
diff --git a/src/org/mcteam/factions/gson/annotations/SerializedName.java b/src/com/massivecraft/factions/gson/annotations/SerializedName.java
similarity index 85%
rename from src/org/mcteam/factions/gson/annotations/SerializedName.java
rename to src/com/massivecraft/factions/gson/annotations/SerializedName.java
index 1be64914..5dfc5bd7 100644
--- a/src/org/mcteam/factions/gson/annotations/SerializedName.java
+++ b/src/com/massivecraft/factions/gson/annotations/SerializedName.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson.annotations;
+package com.massivecraft.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.
  *
- * 
    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}
+ * 
    This annotation will override any {@link com.massivecraft.factions.gson.FieldNamingPolicy}, including
+ * the default field naming policy, that may have been set on the {@link com.massivecraft.factions.gson.Gson}
  * instance.  A different naming policy can set using the {@code GsonBuilder} class.  See
- * {@link org.mcteam.factions.gson.GsonBuilder#setFieldNamingPolicy(org.mcteam.factions.gson.FieldNamingPolicy)}
+ * {@link com.massivecraft.factions.gson.GsonBuilder#setFieldNamingPolicy(com.massivecraft.factions.gson.FieldNamingPolicy)}
  * for more information.
    
  *
  * 
    Here is an example of how this annotation is meant to be used:
    
@@ -58,7 +58,7 @@ import java.lang.annotation.Target;
  *
  * 
    NOTE: The value you specify in this annotation must be a valid JSON field name.
    
  *
- * @see org.mcteam.factions.gson.FieldNamingPolicy
+ * @see com.massivecraft.factions.gson.FieldNamingPolicy
  *
  * @author Inderjeet Singh
  * @author Joel Leitch
diff --git a/src/org/mcteam/factions/gson/annotations/Since.java b/src/com/massivecraft/factions/gson/annotations/Since.java
similarity index 87%
rename from src/org/mcteam/factions/gson/annotations/Since.java
rename to src/com/massivecraft/factions/gson/annotations/Since.java
index 7d4730c5..1b41c10b 100644
--- a/src/org/mcteam/factions/gson/annotations/Since.java
+++ b/src/com/massivecraft/factions/gson/annotations/Since.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson.annotations;
+package com.massivecraft.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.
  *
  * 
    
- * 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.
+ * This annotation has no effect unless you build {@link com.massivecraft.factions.gson.Gson} with a
+ * {@link com.massivecraft.factions.gson.GsonBuilder} and invoke
+ * {@link com.massivecraft.factions.gson.GsonBuilder#setVersion(double)} method.
  *
  * 
    Here is an example of how this annotation is meant to be used:
    
  * 
    diff --git a/src/org/mcteam/factions/gson/annotations/Until.java b/src/com/massivecraft/factions/gson/annotations/Until.java
similarity index 88%
rename from src/org/mcteam/factions/gson/annotations/Until.java
rename to src/com/massivecraft/factions/gson/annotations/Until.java
index 904a1ce6..280be47b 100644
--- a/src/org/mcteam/factions/gson/annotations/Until.java
+++ b/src/com/massivecraft/factions/gson/annotations/Until.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson.annotations;
+package com.massivecraft.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.
  *
  * 
    
- * 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.
+ * This annotation has no effect unless you build {@link com.massivecraft.factions.gson.Gson} with a
+ * {@link com.massivecraft.factions.gson.GsonBuilder} and invoke
+ * {@link com.massivecraft.factions.gson.GsonBuilder#setVersion(double)} method.
  *
  * 
    Here is an example of how this annotation is meant to be used:
    
  * 
    diff --git a/src/org/mcteam/factions/gson/annotations/package-info.java b/src/com/massivecraft/factions/gson/annotations/package-info.java
similarity index 56%
rename from src/org/mcteam/factions/gson/annotations/package-info.java
rename to src/com/massivecraft/factions/gson/annotations/package-info.java
index f5190215..9294bd10 100644
--- a/src/org/mcteam/factions/gson/annotations/package-info.java
+++ b/src/com/massivecraft/factions/gson/annotations/package-info.java
@@ -1,6 +1,6 @@
 /**
- * This package provides annotations that can be used with {@link org.mcteam.factions.gson.Gson}.
+ * This package provides annotations that can be used with {@link com.massivecraft.factions.gson.Gson}.
  * 
  * @author Inderjeet Singh, Joel Leitch
  */
-package org.mcteam.factions.gson.annotations;
\ No newline at end of file
+package com.massivecraft.factions.gson.annotations;
\ No newline at end of file
diff --git a/src/org/mcteam/factions/gson/internal/$Gson$Preconditions.java b/src/com/massivecraft/factions/gson/internal/$Gson$Preconditions.java
similarity index 92%
rename from src/org/mcteam/factions/gson/internal/$Gson$Preconditions.java
rename to src/com/massivecraft/factions/gson/internal/$Gson$Preconditions.java
index c6fb2a26..0f716a9c 100644
--- a/src/org/mcteam/factions/gson/internal/$Gson$Preconditions.java
+++ b/src/com/massivecraft/factions/gson/internal/$Gson$Preconditions.java
@@ -1,51 +1,51 @@
-/*
- * Copyright (C) 2008 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.mcteam.factions.gson.internal;
-
-/**
- * A simple utility class used to check method Preconditions.
- *
- * 
    - * public long divideBy(long value) {
- *   Preconditions.checkArgument(value != 0);
- *   return this.value / value;
- * }
- * 
    
- *
- * @author Inderjeet Singh
- * @author Joel Leitch
- */
-public final class $Gson$Preconditions {
-  public static  T checkNotNull(T obj) {
-    if (obj == null) {
-      throw new NullPointerException();
-    }
-    return obj;
-  }
-
-  public static void checkArgument(boolean condition) {
-    if (!condition) {
-      throw new IllegalArgumentException();
-    }
-  }
-
-  public static void checkState(boolean condition) {
-    if (!condition) {
-      throw new IllegalStateException();
-    }
-  }
-}
+/*
+ * Copyright (C) 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.massivecraft.factions.gson.internal;
+
+/**
+ * A simple utility class used to check method Preconditions.
+ *
+ * 
    + * public long divideBy(long value) {
+ *   Preconditions.checkArgument(value != 0);
+ *   return this.value / value;
+ * }
+ * 
    
+ *
+ * @author Inderjeet Singh
+ * @author Joel Leitch
+ */
+public final class $Gson$Preconditions {
+  public static  T checkNotNull(T obj) {
+    if (obj == null) {
+      throw new NullPointerException();
+    }
+    return obj;
+  }
+
+  public static void checkArgument(boolean condition) {
+    if (!condition) {
+      throw new IllegalArgumentException();
+    }
+  }
+
+  public static void checkState(boolean condition) {
+    if (!condition) {
+      throw new IllegalStateException();
+    }
+  }
+}
diff --git a/src/org/mcteam/factions/gson/internal/$Gson$Types.java b/src/com/massivecraft/factions/gson/internal/$Gson$Types.java
similarity index 98%
rename from src/org/mcteam/factions/gson/internal/$Gson$Types.java
rename to src/com/massivecraft/factions/gson/internal/$Gson$Types.java
index 3adae2f4..72a0081b 100644
--- a/src/org/mcteam/factions/gson/internal/$Gson$Types.java
+++ b/src/com/massivecraft/factions/gson/internal/$Gson$Types.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson.internal;
+package com.massivecraft.factions.gson.internal;
+
+import static com.massivecraft.factions.gson.internal.$Gson$Preconditions.checkArgument;
+import static com.massivecraft.factions.gson.internal.$Gson$Preconditions.checkNotNull;
 
-import static org.mcteam.factions.gson.internal.$Gson$Preconditions.checkArgument;
-import static org.mcteam.factions.gson.internal.$Gson$Preconditions.checkNotNull;
 import java.io.Serializable;
 import java.lang.reflect.Array;
 import java.lang.reflect.GenericArrayType;
diff --git a/src/org/mcteam/factions/gson/internal/package-info.java b/src/com/massivecraft/factions/gson/internal/package-info.java
similarity index 83%
rename from src/org/mcteam/factions/gson/internal/package-info.java
rename to src/com/massivecraft/factions/gson/internal/package-info.java
index 28c0c6e8..9730a80a 100644
--- a/src/org/mcteam/factions/gson/internal/package-info.java
+++ b/src/com/massivecraft/factions/gson/internal/package-info.java
@@ -4,4 +4,4 @@
  *
  * @author Inderjeet Singh, Joel Leitch, Jesse Wilson
  */
-package org.mcteam.factions.gson.internal;
\ No newline at end of file
+package com.massivecraft.factions.gson.internal;
\ No newline at end of file
diff --git a/src/com/massivecraft/factions/gson/package-info.java b/src/com/massivecraft/factions/gson/package-info.java
new file mode 100644
index 00000000..a316ae1f
--- /dev/null
+++ b/src/com/massivecraft/factions/gson/package-info.java
@@ -0,0 +1,11 @@
+/**
+ * This package provides the {@link com.google.gson.Gson} class to convert Json to Java and
+ * vice-versa.
+ *
+ * 
    The primary class to use is {@link com.google.gson.Gson} which can be constructed with
+ * {@code new Gson()} (using default settings) or by using {@link com.google.gson.GsonBuilder}
+ * (to configure various options such as using versioning and so on).
    
+ *
+ * @author Inderjeet Singh, Joel Leitch
+ */
+package com.massivecraft.factions.gson;
\ No newline at end of file
diff --git a/src/org/mcteam/factions/gson/reflect/TypeToken.java b/src/com/massivecraft/factions/gson/reflect/TypeToken.java
similarity index 98%
rename from src/org/mcteam/factions/gson/reflect/TypeToken.java
rename to src/com/massivecraft/factions/gson/reflect/TypeToken.java
index 2c0849fb..584729fd 100644
--- a/src/org/mcteam/factions/gson/reflect/TypeToken.java
+++ b/src/com/massivecraft/factions/gson/reflect/TypeToken.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson.reflect;
+package com.massivecraft.factions.gson.reflect;
+
+import com.massivecraft.factions.gson.internal.$Gson$Preconditions;
+import com.massivecraft.factions.gson.internal.$Gson$Types;
 
-import org.mcteam.factions.gson.internal.$Gson$Types;
-import org.mcteam.factions.gson.internal.$Gson$Preconditions;
 import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
diff --git a/src/org/mcteam/factions/gson/reflect/package-info.java b/src/com/massivecraft/factions/gson/reflect/package-info.java
similarity index 75%
rename from src/org/mcteam/factions/gson/reflect/package-info.java
rename to src/com/massivecraft/factions/gson/reflect/package-info.java
index 5e2f1539..8e7d3ee7 100644
--- a/src/org/mcteam/factions/gson/reflect/package-info.java
+++ b/src/com/massivecraft/factions/gson/reflect/package-info.java
@@ -3,4 +3,4 @@
  *  
  * @author Inderjeet Singh, Joel Leitch
  */
-package org.mcteam.factions.gson.reflect;
\ No newline at end of file
+package com.massivecraft.factions.gson.reflect;
\ No newline at end of file
diff --git a/src/org/mcteam/factions/gson/stream/JsonReader.java b/src/com/massivecraft/factions/gson/stream/JsonReader.java
similarity index 99%
rename from src/org/mcteam/factions/gson/stream/JsonReader.java
rename to src/com/massivecraft/factions/gson/stream/JsonReader.java
index 4499a78a..0e34228d 100644
--- a/src/org/mcteam/factions/gson/stream/JsonReader.java
+++ b/src/com/massivecraft/factions/gson/stream/JsonReader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson.stream;
+package com.massivecraft.factions.gson.stream;
 
 import java.io.Closeable;
 import java.io.EOFException;
diff --git a/src/org/mcteam/factions/gson/stream/JsonScope.java b/src/com/massivecraft/factions/gson/stream/JsonScope.java
similarity index 97%
rename from src/org/mcteam/factions/gson/stream/JsonScope.java
rename to src/com/massivecraft/factions/gson/stream/JsonScope.java
index 504856ca..c0950760 100644
--- a/src/org/mcteam/factions/gson/stream/JsonScope.java
+++ b/src/com/massivecraft/factions/gson/stream/JsonScope.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson.stream;
+package com.massivecraft.factions.gson.stream;
 
 /**
  * Lexical scoping elements within a JSON reader or writer.
diff --git a/src/org/mcteam/factions/gson/stream/JsonToken.java b/src/com/massivecraft/factions/gson/stream/JsonToken.java
similarity index 97%
rename from src/org/mcteam/factions/gson/stream/JsonToken.java
rename to src/com/massivecraft/factions/gson/stream/JsonToken.java
index 2b717ee8..0ec7e433 100644
--- a/src/org/mcteam/factions/gson/stream/JsonToken.java
+++ b/src/com/massivecraft/factions/gson/stream/JsonToken.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson.stream;
+package com.massivecraft.factions.gson.stream;
 
 /**
  * A structure, name or value type in a JSON-encoded string.
diff --git a/src/org/mcteam/factions/gson/stream/JsonWriter.java b/src/com/massivecraft/factions/gson/stream/JsonWriter.java
similarity index 99%
rename from src/org/mcteam/factions/gson/stream/JsonWriter.java
rename to src/com/massivecraft/factions/gson/stream/JsonWriter.java
index ff865131..31ceed5d 100644
--- a/src/org/mcteam/factions/gson/stream/JsonWriter.java
+++ b/src/com/massivecraft/factions/gson/stream/JsonWriter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson.stream;
+package com.massivecraft.factions.gson.stream;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/src/org/mcteam/factions/gson/stream/MalformedJsonException.java b/src/com/massivecraft/factions/gson/stream/MalformedJsonException.java
similarity index 96%
rename from src/org/mcteam/factions/gson/stream/MalformedJsonException.java
rename to src/com/massivecraft/factions/gson/stream/MalformedJsonException.java
index b34fa2e8..1c9a3163 100644
--- a/src/org/mcteam/factions/gson/stream/MalformedJsonException.java
+++ b/src/com/massivecraft/factions/gson/stream/MalformedJsonException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mcteam.factions.gson.stream;
+package com.massivecraft.factions.gson.stream;
 
 import java.io.IOException;
 
diff --git a/src/org/mcteam/factions/listeners/FactionsBlockListener.java b/src/com/massivecraft/factions/listeners/FactionsBlockListener.java
similarity index 90%
rename from src/org/mcteam/factions/listeners/FactionsBlockListener.java
rename to src/com/massivecraft/factions/listeners/FactionsBlockListener.java
index e93ca7df..f9afd467 100644
--- a/src/org/mcteam/factions/listeners/FactionsBlockListener.java
+++ b/src/com/massivecraft/factions/listeners/FactionsBlockListener.java
@@ -1,4 +1,4 @@
-package org.mcteam.factions.listeners;
+package com.massivecraft.factions.listeners;
 
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -7,12 +7,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.massivecraft.factions.Board;
+import com.massivecraft.factions.Conf;
+import com.massivecraft.factions.FLocation;
+import com.massivecraft.factions.FPlayer;
+import com.massivecraft.factions.Faction;
+import com.massivecraft.factions.Factions;
 
 
 public class FactionsBlockListener extends BlockListener {
diff --git a/src/org/mcteam/factions/listeners/FactionsEntityListener.java b/src/com/massivecraft/factions/listeners/FactionsEntityListener.java
similarity index 96%
rename from src/org/mcteam/factions/listeners/FactionsEntityListener.java
rename to src/com/massivecraft/factions/listeners/FactionsEntityListener.java
index 8c5dfe91..1c34a556 100644
--- a/src/org/mcteam/factions/listeners/FactionsEntityListener.java
+++ b/src/com/massivecraft/factions/listeners/FactionsEntityListener.java
@@ -1,4 +1,4 @@
-package org.mcteam.factions.listeners;
+package com.massivecraft.factions.listeners;
 
 import java.text.MessageFormat;
 
@@ -18,14 +18,15 @@ import org.bukkit.event.entity.EntityTargetEvent;
 import org.bukkit.event.painting.PaintingBreakByEntityEvent;
 import org.bukkit.event.painting.PaintingBreakEvent;
 import org.bukkit.event.painting.PaintingPlaceEvent;
-import org.mcteam.factions.Board;
-import org.mcteam.factions.Conf;
-import org.mcteam.factions.Factions;
-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.massivecraft.factions.Board;
+import com.massivecraft.factions.Conf;
+import com.massivecraft.factions.FLocation;
+import com.massivecraft.factions.FPlayer;
+import com.massivecraft.factions.Faction;
+import com.massivecraft.factions.Factions;
+import com.massivecraft.factions.struct.Relation;
+import com.massivecraft.factions.util.EntityUtil;
 
 
 public class FactionsEntityListener extends EntityListener {
diff --git a/src/org/mcteam/factions/listeners/FactionsPlayerListener.java b/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java
similarity index 96%
rename from src/org/mcteam/factions/listeners/FactionsPlayerListener.java
rename to src/com/massivecraft/factions/listeners/FactionsPlayerListener.java
index db538a90..264d0a43 100644
--- a/src/org/mcteam/factions/listeners/FactionsPlayerListener.java
+++ b/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java
@@ -1,4 +1,4 @@
-package org.mcteam.factions.listeners;
+package com.massivecraft.factions.listeners;
 
 import java.util.List;
 import java.util.logging.Logger;
@@ -19,14 +19,15 @@ import org.bukkit.event.player.PlayerListener;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 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.struct.Role;
-import org.mcteam.factions.util.TextUtil;
+
+import com.massivecraft.factions.Board;
+import com.massivecraft.factions.Conf;
+import com.massivecraft.factions.FLocation;
+import com.massivecraft.factions.FPlayer;
+import com.massivecraft.factions.Faction;
+import com.massivecraft.factions.Factions;
+import com.massivecraft.factions.struct.Role;
+import com.massivecraft.factions.util.TextUtil;
 
 
 
diff --git a/src/org/mcteam/factions/struct/Relation.java b/src/com/massivecraft/factions/struct/Relation.java
similarity index 92%
rename from src/org/mcteam/factions/struct/Relation.java
rename to src/com/massivecraft/factions/struct/Relation.java
index f3233e19..25866850 100644
--- a/src/org/mcteam/factions/struct/Relation.java
+++ b/src/com/massivecraft/factions/struct/Relation.java
@@ -1,7 +1,8 @@
-package org.mcteam.factions.struct;
+package com.massivecraft.factions.struct;
 
 import org.bukkit.ChatColor;
-import org.mcteam.factions.Conf;
+
+import com.massivecraft.factions.Conf;
 
 
 public enum Relation {
diff --git a/src/org/mcteam/factions/struct/Role.java b/src/com/massivecraft/factions/struct/Role.java
similarity index 86%
rename from src/org/mcteam/factions/struct/Role.java
rename to src/com/massivecraft/factions/struct/Role.java
index ab219247..496ae73e 100644
--- a/src/org/mcteam/factions/struct/Role.java
+++ b/src/com/massivecraft/factions/struct/Role.java
@@ -1,6 +1,6 @@
-package org.mcteam.factions.struct;
+package com.massivecraft.factions.struct;
 
-import org.mcteam.factions.Conf;
+import com.massivecraft.factions.Conf;
 
 public enum Role {
 	ADMIN(2, "admin"),
diff --git a/src/org/mcteam/factions/util/AsciiCompass.java b/src/com/massivecraft/factions/util/AsciiCompass.java
similarity index 98%
rename from src/org/mcteam/factions/util/AsciiCompass.java
rename to src/com/massivecraft/factions/util/AsciiCompass.java
index 82b7f798..66cf7dbf 100644
--- a/src/org/mcteam/factions/util/AsciiCompass.java
+++ b/src/com/massivecraft/factions/util/AsciiCompass.java
@@ -1,4 +1,4 @@
-package org.mcteam.factions.util;
+package com.massivecraft.factions.util;
 
 import java.util.*;
 
diff --git a/src/org/mcteam/factions/util/DiscUtil.java b/src/com/massivecraft/factions/util/DiscUtil.java
similarity index 95%
rename from src/org/mcteam/factions/util/DiscUtil.java
rename to src/com/massivecraft/factions/util/DiscUtil.java
index 69762008..0d2ce25f 100644
--- a/src/org/mcteam/factions/util/DiscUtil.java
+++ b/src/com/massivecraft/factions/util/DiscUtil.java
@@ -1,4 +1,4 @@
-package org.mcteam.factions.util;
+package com.massivecraft.factions.util;
 
 import java.io.*;
 
diff --git a/src/org/mcteam/factions/util/EntityUtil.java b/src/com/massivecraft/factions/util/EntityUtil.java
similarity index 91%
rename from src/org/mcteam/factions/util/EntityUtil.java
rename to src/com/massivecraft/factions/util/EntityUtil.java
index d2e94d23..9e5411d3 100644
--- a/src/org/mcteam/factions/util/EntityUtil.java
+++ b/src/com/massivecraft/factions/util/EntityUtil.java
@@ -1,4 +1,4 @@
-package org.mcteam.factions.util;
+package com.massivecraft.factions.util;
 
 import org.bukkit.entity.Creature;
 import org.bukkit.entity.CreatureType;
diff --git a/src/org/mcteam/factions/util/MiscUtil.java b/src/com/massivecraft/factions/util/MiscUtil.java
similarity index 90%
rename from src/org/mcteam/factions/util/MiscUtil.java
rename to src/com/massivecraft/factions/util/MiscUtil.java
index 1f066015..cb6f7e22 100644
--- a/src/org/mcteam/factions/util/MiscUtil.java
+++ b/src/com/massivecraft/factions/util/MiscUtil.java
@@ -1,4 +1,4 @@
-package org.mcteam.factions.util;
+package com.massivecraft.factions.util;
 
 public class MiscUtil {
 	
diff --git a/src/org/mcteam/factions/util/TextUtil.java b/src/com/massivecraft/factions/util/TextUtil.java
similarity index 96%
rename from src/org/mcteam/factions/util/TextUtil.java
rename to src/com/massivecraft/factions/util/TextUtil.java
index 7e1d5efa..847c6677 100644
--- a/src/org/mcteam/factions/util/TextUtil.java
+++ b/src/com/massivecraft/factions/util/TextUtil.java
@@ -1,8 +1,9 @@
-package org.mcteam.factions.util;
+package com.massivecraft.factions.util;
 import java.util.*;
 
 import org.bukkit.Material;
-import org.mcteam.factions.Conf;
+
+import com.massivecraft.factions.Conf;
 
 
 public class TextUtil {
diff --git a/src/org/mcteam/factions/gson/package-info.java b/src/org/mcteam/factions/gson/package-info.java
deleted file mode 100644
index 7a0a1aba..00000000
--- a/src/org/mcteam/factions/gson/package-info.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * This package provides the {@link org.mcteam.factions.gson.Gson} class to convert Json to Java and
- * vice-versa.
- *
- * 
    The primary class to use is {@link org.mcteam.factions.gson.Gson} which can be constructed with
- * {@code new Gson()} (using default settings) or by using {@link org.mcteam.factions.gson.GsonBuilder}
- * (to configure various options such as using versioning and so on).
    
- *
- * @author Inderjeet Singh, Joel Leitch
- */
-package org.mcteam.factions.gson;
\ No newline at end of file