From 8b5c8fd354f860f2f9dcbb25d3b69e2a0daa70e7 Mon Sep 17 00:00:00 2001
From: Olof Larsson <olof@sylt.nu>
Date: Fri, 11 May 2012 15:27:48 +0200
Subject: [PATCH] Bump to MCore3

---
 plugin.yml                                    |   5 +-
 .../{mcore2 => mcore3}/InternalListener.java  |   8 +-
 .../massivecraft/{mcore2 => mcore3}/Lang.java |   2 +-
 .../{mcore2 => mcore3}/MCore.java             |  16 +--
 .../{mcore2 => mcore3}/MPlugin.java           |  16 +--
 .../{mcore2 => mcore3}/Predictate.java        |   2 +-
 .../cmd/BukkitGlueCommand.java                |   4 +-
 .../{mcore2 => mcore3}/cmd/Cmd.java           |  22 ++--
 .../{mcore2 => mcore3}/cmd/HelpCommand.java   |   8 +-
 .../{mcore2 => mcore3}/cmd/MCommand.java      |  18 ++--
 .../cmd/VisibilityMode.java                   |   2 +-
 .../{mcore2 => mcore3}/cmd/arg/AHBase.java    |   4 +-
 .../{mcore2 => mcore3}/cmd/arg/AHBoolean.java |   2 +-
 .../{mcore2 => mcore3}/cmd/arg/AHByte.java    |   2 +-
 .../{mcore2 => mcore3}/cmd/arg/AHDate.java    |   2 +-
 .../{mcore2 => mcore3}/cmd/arg/AHDouble.java  |   2 +-
 .../{mcore2 => mcore3}/cmd/arg/AHFloat.java   |   2 +-
 .../{mcore2 => mcore3}/cmd/arg/AHInteger.java |   2 +-
 .../cmd/arg/AHMaterial.java                   |   4 +-
 .../{mcore2 => mcore3}/cmd/arg/AHPlayer.java  |   4 +-
 .../cmd/arg/AHPlayerWrapper.java              |  10 +-
 .../cmd/arg/AHPrimitive.java                  |   4 +-
 .../{mcore2 => mcore3}/cmd/arg/AHWorld.java   |   4 +-
 .../cmd/arg/IArgHandler.java                  |   4 +-
 .../{mcore2 => mcore3}/cmd/req/IReq.java      |   4 +-
 .../cmd/req/ReqHasPerm.java                   |   6 +-
 .../cmd/req/ReqIsPlayer.java                  |   6 +-
 .../gson/InventoryTypeAdapter.java            |  18 ++--
 .../lib/gson/DefaultDateTypeAdapter.java      |  20 ++--
 .../lib/gson/ExclusionStrategy.java           |   8 +-
 .../lib/gson/FieldAttributes.java             |   4 +-
 .../lib/gson/FieldNamingPolicy.java           |   8 +-
 .../lib/gson/FieldNamingStrategy.java         |   2 +-
 .../{mcore2 => mcore3}/lib/gson/Gson.java     | 100 +++++++++---------
 .../lib/gson/GsonBuilder.java                 |  42 ++++----
 .../lib/gson/InstanceCreator.java             |   4 +-
 .../lib/gson/JsonArray.java                   |  10 +-
 .../lib/gson/JsonDeserializationContext.java  |  10 +-
 .../lib/gson/JsonDeserializer.java            |  12 +--
 .../lib/gson/JsonElement.java                 |  14 +--
 .../lib/gson/JsonIOException.java             |   4 +-
 .../{mcore2 => mcore3}/lib/gson/JsonNull.java |   6 +-
 .../lib/gson/JsonObject.java                  |  14 +--
 .../lib/gson/JsonParseException.java          |   4 +-
 .../lib/gson/JsonParser.java                  |  20 ++--
 .../lib/gson/JsonPrimitive.java               |  10 +-
 .../lib/gson/JsonSerializationContext.java    |   8 +-
 .../lib/gson/JsonSerializer.java              |  10 +-
 .../lib/gson/JsonStreamParser.java            |  18 ++--
 .../lib/gson/JsonSyntaxException.java         |   4 +-
 .../lib/gson/LongSerializationPolicy.java     |   6 +-
 .../lib/gson/TreeTypeAdapter.java             |  28 ++---
 .../lib/gson/TypeAdapter.java                 |  28 ++---
 .../lib/gson/TypeAdapterFactory.java          |  10 +-
 .../lib/gson/annotations/Expose.java          |   8 +-
 .../lib/gson/annotations/SerializedName.java  |  10 +-
 .../lib/gson/annotations/Since.java           |   8 +-
 .../lib/gson/annotations/Until.java           |   8 +-
 .../lib/gson/annotations/package-info.java    |   4 +-
 .../gson/internal/$Gson$Preconditions.java    |   2 +-
 .../lib/gson/internal/$Gson$Types.java        |   6 +-
 .../gson/internal/ConstructorConstructor.java |  10 +-
 .../lib/gson/internal/Excluder.java           |  28 ++---
 .../lib/gson/internal/GsonInternalAccess.java |  12 +--
 .../internal/JsonReaderInternalAccess.java    |   6 +-
 .../lib/gson/internal/LazilyParsedNumber.java |   2 +-
 .../lib/gson/internal/ObjectConstructor.java  |   2 +-
 .../lib/gson/internal/Pair.java               |   4 +-
 .../lib/gson/internal/Primitives.java         |   4 +-
 .../lib/gson/internal/Streams.java            |  20 ++--
 .../lib/gson/internal/UnsafeAllocator.java    |   4 +-
 .../gson/internal/bind/ArrayTypeAdapter.java  |  22 ++--
 .../internal/bind/BigDecimalTypeAdapter.java  |  12 +--
 .../internal/bind/BigIntegerTypeAdapter.java  |  12 +--
 .../bind/CollectionTypeAdapterFactory.java    |  24 ++---
 .../gson/internal/bind/DateTypeAdapter.java   |  20 ++--
 .../gson/internal/bind/JsonTreeReader.java    |  16 +--
 .../gson/internal/bind/JsonTreeWriter.java    |  14 +--
 .../internal/bind/MapTypeAdapterFactory.java  |  40 +++----
 .../gson/internal/bind/ObjectTypeAdapter.java |  18 ++--
 .../bind/ReflectiveTypeAdapterFactory.java    |  36 +++----
 .../internal/bind/SqlDateTypeAdapter.java     |  20 ++--
 .../gson/internal/bind/TimeTypeAdapter.java   |  20 ++--
 .../bind/TypeAdapterRuntimeTypeWrapper.java   |  14 +--
 .../lib/gson/internal/bind/TypeAdapters.java  |  34 +++---
 .../lib/gson/internal/package-info.java       |   2 +-
 .../lib/gson/package-info.java                |   8 +-
 .../lib/gson/reflect/TypeToken.java           |   8 +-
 .../lib/gson/reflect/package-info.java        |   2 +-
 .../lib/gson/stream/JsonReader.java           |  16 +--
 .../lib/gson/stream/JsonScope.java            |   2 +-
 .../lib/gson/stream/JsonToken.java            |   2 +-
 .../lib/gson/stream/JsonWriter.java           |   6 +-
 .../gson/stream/MalformedJsonException.java   |   4 +-
 .../lib/gson/stream/StringPool.java           |   2 +-
 .../{mcore2 => mcore3}/persist/Entity.java    |   2 +-
 .../persist/IClassManager.java                |   4 +-
 .../{mcore2 => mcore3}/persist/One.java       |   6 +-
 .../{mcore2 => mcore3}/persist/Persist.java   |   4 +-
 .../persist/PlayerEntity.java                 |   4 +-
 .../{mcore2 => mcore3}/persist/SaveTask.java  |   2 +-
 .../persist/gson/GsonClassManager.java        |  10 +-
 .../persist/gson/GsonPlayerEntityManager.java |   8 +-
 .../persist/gson/JsonFileFilter.java          |   2 +-
 .../util/ClassLoadHack.java                   |   2 +-
 .../{mcore2 => mcore3}/util/DiscUtil.java     |   2 +-
 .../{mcore2 => mcore3}/util/IntervalUtil.java |   4 +-
 .../{mcore2 => mcore3}/util/LibLoader.java    |   4 +-
 .../{mcore2 => mcore3}/util/MUtil.java        |   4 +-
 .../{mcore2 => mcore3}/util/Perm.java         |   4 +-
 .../{mcore2 => mcore3}/util/PlayerUtil.java   |   2 +-
 .../{mcore2 => mcore3}/util/SmokeUtil.java    |   2 +-
 .../{mcore2 => mcore3}/util/Txt.java          |   2 +-
 113 files changed, 573 insertions(+), 574 deletions(-)
 rename src/com/massivecraft/{mcore2 => mcore3}/InternalListener.java (80%)
 rename src/com/massivecraft/{mcore2 => mcore3}/Lang.java (92%)
 rename src/com/massivecraft/{mcore2 => mcore3}/MCore.java (88%)
 rename src/com/massivecraft/{mcore2 => mcore3}/MPlugin.java (83%)
 rename src/com/massivecraft/{mcore2 => mcore3}/Predictate.java (63%)
 rename src/com/massivecraft/{mcore2 => mcore3}/cmd/BukkitGlueCommand.java (85%)
 rename src/com/massivecraft/{mcore2 => mcore3}/cmd/Cmd.java (72%)
 rename src/com/massivecraft/{mcore2 => mcore3}/cmd/HelpCommand.java (84%)
 rename src/com/massivecraft/{mcore2 => mcore3}/cmd/MCommand.java (93%)
 rename src/com/massivecraft/{mcore2 => mcore3}/cmd/VisibilityMode.java (89%)
 rename src/com/massivecraft/{mcore2 => mcore3}/cmd/arg/AHBase.java (79%)
 rename src/com/massivecraft/{mcore2 => mcore3}/cmd/arg/AHBoolean.java (86%)
 rename src/com/massivecraft/{mcore2 => mcore3}/cmd/arg/AHByte.java (80%)
 rename src/com/massivecraft/{mcore2 => mcore3}/cmd/arg/AHDate.java (86%)
 rename src/com/massivecraft/{mcore2 => mcore3}/cmd/arg/AHDouble.java (81%)
 rename src/com/massivecraft/{mcore2 => mcore3}/cmd/arg/AHFloat.java (80%)
 rename src/com/massivecraft/{mcore2 => mcore3}/cmd/arg/AHInteger.java (81%)
 rename src/com/massivecraft/{mcore2 => mcore3}/cmd/arg/AHMaterial.java (82%)
 rename src/com/massivecraft/{mcore2 => mcore3}/cmd/arg/AHPlayer.java (87%)
 rename src/com/massivecraft/{mcore2 => mcore3}/cmd/arg/AHPlayerWrapper.java (79%)
 rename src/com/massivecraft/{mcore2 => mcore3}/cmd/arg/AHPrimitive.java (83%)
 rename src/com/massivecraft/{mcore2 => mcore3}/cmd/arg/AHWorld.java (80%)
 rename src/com/massivecraft/{mcore2 => mcore3}/cmd/arg/IArgHandler.java (77%)
 rename src/com/massivecraft/{mcore2 => mcore3}/cmd/req/IReq.java (77%)
 rename src/com/massivecraft/{mcore2 => mcore3}/cmd/req/ReqHasPerm.java (78%)
 rename src/com/massivecraft/{mcore2 => mcore3}/cmd/req/ReqIsPlayer.java (78%)
 rename src/com/massivecraft/{mcore2 => mcore3}/gson/InventoryTypeAdapter.java (90%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/DefaultDateTypeAdapter.java (87%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/ExclusionStrategy.java (95%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/FieldAttributes.java (97%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/FieldNamingPolicy.java (96%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/FieldNamingStrategy.java (96%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/Gson.java (92%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/GsonBuilder.java (95%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/InstanceCreator.java (97%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/JsonArray.java (97%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/JsonDeserializationContext.java (85%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/JsonDeserializer.java (91%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/JsonElement.java (96%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/JsonIOException.java (92%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/JsonNull.java (87%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/JsonObject.java (94%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/JsonParseException.java (95%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/JsonParser.java (82%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/JsonPrimitive.java (97%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/JsonSerializationContext.java (89%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/JsonSerializer.java (92%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/JsonStreamParser.java (87%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/JsonSyntaxException.java (93%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/LongSerializationPolicy.java (92%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/TreeTypeAdapter.java (86%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/TypeAdapter.java (93%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/TypeAdapterFactory.java (96%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/annotations/Expose.java (93%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/annotations/SerializedName.java (87%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/annotations/Since.java (90%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/annotations/Until.java (91%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/annotations/package-info.java (54%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/internal/$Gson$Preconditions.java (92%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/internal/$Gson$Types.java (99%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/internal/ConstructorConstructor.java (95%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/internal/Excluder.java (89%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/internal/GsonInternalAccess.java (77%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/internal/JsonReaderInternalAccess.java (85%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/internal/LazilyParsedNumber.java (97%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/internal/ObjectConstructor.java (95%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/internal/Pair.java (93%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/internal/Primitives.java (97%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/internal/Streams.java (84%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/internal/UnsafeAllocator.java (96%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/internal/bind/ArrayTypeAdapter.java (81%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/internal/bind/BigDecimalTypeAdapter.java (78%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/internal/bind/BigIntegerTypeAdapter.java (78%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/internal/bind/CollectionTypeAdapterFactory.java (81%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/internal/bind/DateTypeAdapter.java (83%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/internal/bind/JsonTreeReader.java (93%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/internal/bind/JsonTreeWriter.java (93%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/internal/bind/MapTypeAdapterFactory.java (88%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/internal/bind/ObjectTypeAdapter.java (83%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/internal/bind/ReflectiveTypeAdapterFactory.java (86%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/internal/bind/SqlDateTypeAdapter.java (78%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/internal/bind/TimeTypeAdapter.java (78%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java (85%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/internal/bind/TypeAdapters.java (96%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/internal/package-info.java (83%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/package-info.java (57%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/reflect/TypeToken.java (97%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/reflect/package-info.java (74%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/stream/JsonReader.java (98%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/stream/JsonScope.java (97%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/stream/JsonToken.java (97%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/stream/JsonWriter.java (99%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/stream/MalformedJsonException.java (93%)
 rename src/com/massivecraft/{mcore2 => mcore3}/lib/gson/stream/StringPool.java (97%)
 rename src/com/massivecraft/{mcore2 => mcore3}/persist/Entity.java (91%)
 rename src/com/massivecraft/{mcore2 => mcore3}/persist/IClassManager.java (94%)
 rename src/com/massivecraft/{mcore2 => mcore3}/persist/One.java (91%)
 rename src/com/massivecraft/{mcore2 => mcore3}/persist/Persist.java (94%)
 rename src/com/massivecraft/{mcore2 => mcore3}/persist/PlayerEntity.java (90%)
 rename src/com/massivecraft/{mcore2 => mcore3}/persist/SaveTask.java (87%)
 rename src/com/massivecraft/{mcore2 => mcore3}/persist/gson/GsonClassManager.java (93%)
 rename src/com/massivecraft/{mcore2 => mcore3}/persist/gson/GsonPlayerEntityManager.java (84%)
 rename src/com/massivecraft/{mcore2 => mcore3}/persist/gson/JsonFileFilter.java (87%)
 rename src/com/massivecraft/{mcore2 => mcore3}/util/ClassLoadHack.java (91%)
 rename src/com/massivecraft/{mcore2 => mcore3}/util/DiscUtil.java (93%)
 rename src/com/massivecraft/{mcore2 => mcore3}/util/IntervalUtil.java (93%)
 rename src/com/massivecraft/{mcore2 => mcore3}/util/LibLoader.java (86%)
 rename src/com/massivecraft/{mcore2 => mcore3}/util/MUtil.java (94%)
 rename src/com/massivecraft/{mcore2 => mcore3}/util/Perm.java (91%)
 rename src/com/massivecraft/{mcore2 => mcore3}/util/PlayerUtil.java (93%)
 rename src/com/massivecraft/{mcore2 => mcore3}/util/SmokeUtil.java (95%)
 rename src/com/massivecraft/{mcore2 => mcore3}/util/Txt.java (96%)

diff --git a/plugin.yml b/plugin.yml
index d6a92fde..d017a25f 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -1,4 +1,3 @@
-name: mcore2
+name: mcore3
 version: 1.0.0
-main: com.massivecraft.mcore2.MCore
-authors: [Olof Larsson, Brett Flannigan]
\ No newline at end of file
+main: com.massivecraft.mcore3.MCore
\ No newline at end of file
diff --git a/src/com/massivecraft/mcore2/InternalListener.java b/src/com/massivecraft/mcore3/InternalListener.java
similarity index 80%
rename from src/com/massivecraft/mcore2/InternalListener.java
rename to src/com/massivecraft/mcore3/InternalListener.java
index 28e5d117..6cc0f5a5 100644
--- a/src/com/massivecraft/mcore2/InternalListener.java
+++ b/src/com/massivecraft/mcore3/InternalListener.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2;
+package com.massivecraft.mcore3;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -7,9 +7,9 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerPreLoginEvent;
 
-import com.massivecraft.mcore2.persist.IClassManager;
-import com.massivecraft.mcore2.persist.Persist;
-import com.massivecraft.mcore2.util.PlayerUtil;
+import com.massivecraft.mcore3.persist.IClassManager;
+import com.massivecraft.mcore3.persist.Persist;
+import com.massivecraft.mcore3.util.PlayerUtil;
 
 public class InternalListener implements Listener
 {
diff --git a/src/com/massivecraft/mcore2/Lang.java b/src/com/massivecraft/mcore3/Lang.java
similarity index 92%
rename from src/com/massivecraft/mcore2/Lang.java
rename to src/com/massivecraft/mcore3/Lang.java
index 0f876e9c..6b345c7b 100644
--- a/src/com/massivecraft/mcore2/Lang.java
+++ b/src/com/massivecraft/mcore3/Lang.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2;
+package com.massivecraft.mcore3;
 
 public class Lang
 {
diff --git a/src/com/massivecraft/mcore2/MCore.java b/src/com/massivecraft/mcore3/MCore.java
similarity index 88%
rename from src/com/massivecraft/mcore2/MCore.java
rename to src/com/massivecraft/mcore3/MCore.java
index 8b1f484c..bdc0fe65 100644
--- a/src/com/massivecraft/mcore2/MCore.java
+++ b/src/com/massivecraft/mcore3/MCore.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2;
+package com.massivecraft.mcore3;
 
 import java.lang.reflect.Modifier;
 import java.util.HashMap;
@@ -9,13 +9,13 @@ import java.util.logging.Logger;
 
 import org.bukkit.plugin.java.JavaPlugin;
 
-import com.massivecraft.mcore2.cmd.Cmd;
-import com.massivecraft.mcore2.lib.gson.GsonBuilder;
-import com.massivecraft.mcore2.persist.One;
-import com.massivecraft.mcore2.persist.Persist;
-import com.massivecraft.mcore2.util.LibLoader;
-import com.massivecraft.mcore2.util.PlayerUtil;
-import com.massivecraft.mcore2.util.Txt;
+import com.massivecraft.mcore3.cmd.Cmd;
+import com.massivecraft.mcore3.lib.gson.GsonBuilder;
+import com.massivecraft.mcore3.persist.One;
+import com.massivecraft.mcore3.persist.Persist;
+import com.massivecraft.mcore3.util.LibLoader;
+import com.massivecraft.mcore3.util.PlayerUtil;
+import com.massivecraft.mcore3.util.Txt;
 
 public class MCore extends JavaPlugin
 {
diff --git a/src/com/massivecraft/mcore2/MPlugin.java b/src/com/massivecraft/mcore3/MPlugin.java
similarity index 83%
rename from src/com/massivecraft/mcore2/MPlugin.java
rename to src/com/massivecraft/mcore3/MPlugin.java
index ea118eeb..a32d7cba 100644
--- a/src/com/massivecraft/mcore2/MPlugin.java
+++ b/src/com/massivecraft/mcore3/MPlugin.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2;
+package com.massivecraft.mcore3;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -7,13 +7,13 @@ import org.bukkit.Bukkit;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import com.massivecraft.mcore2.cmd.Cmd;
-import com.massivecraft.mcore2.lib.gson.Gson;
-import com.massivecraft.mcore2.lib.gson.GsonBuilder;
-import com.massivecraft.mcore2.persist.One;
-import com.massivecraft.mcore2.persist.Persist;
-import com.massivecraft.mcore2.util.LibLoader;
-import com.massivecraft.mcore2.util.Txt;
+import com.massivecraft.mcore3.cmd.Cmd;
+import com.massivecraft.mcore3.lib.gson.Gson;
+import com.massivecraft.mcore3.lib.gson.GsonBuilder;
+import com.massivecraft.mcore3.persist.One;
+import com.massivecraft.mcore3.persist.Persist;
+import com.massivecraft.mcore3.util.LibLoader;
+import com.massivecraft.mcore3.util.Txt;
 
 public abstract class MPlugin extends JavaPlugin implements Listener
 {
diff --git a/src/com/massivecraft/mcore2/Predictate.java b/src/com/massivecraft/mcore3/Predictate.java
similarity index 63%
rename from src/com/massivecraft/mcore2/Predictate.java
rename to src/com/massivecraft/mcore3/Predictate.java
index 5451ddc2..7e64d0bb 100644
--- a/src/com/massivecraft/mcore2/Predictate.java
+++ b/src/com/massivecraft/mcore3/Predictate.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2;
+package com.massivecraft.mcore3;
 
 public interface Predictate<T>
 {
diff --git a/src/com/massivecraft/mcore2/cmd/BukkitGlueCommand.java b/src/com/massivecraft/mcore3/cmd/BukkitGlueCommand.java
similarity index 85%
rename from src/com/massivecraft/mcore2/cmd/BukkitGlueCommand.java
rename to src/com/massivecraft/mcore3/cmd/BukkitGlueCommand.java
index a064b1df..cd8ce30c 100644
--- a/src/com/massivecraft/mcore2/cmd/BukkitGlueCommand.java
+++ b/src/com/massivecraft/mcore3/cmd/BukkitGlueCommand.java
@@ -1,9 +1,9 @@
-package com.massivecraft.mcore2.cmd;
+package com.massivecraft.mcore3.cmd;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore2.util.Txt;
+import com.massivecraft.mcore3.util.Txt;
 
 public class BukkitGlueCommand extends Command
 {
diff --git a/src/com/massivecraft/mcore2/cmd/Cmd.java b/src/com/massivecraft/mcore3/cmd/Cmd.java
similarity index 72%
rename from src/com/massivecraft/mcore2/cmd/Cmd.java
rename to src/com/massivecraft/mcore3/cmd/Cmd.java
index 039d30e3..55550c6f 100644
--- a/src/com/massivecraft/mcore2/cmd/Cmd.java
+++ b/src/com/massivecraft/mcore3/cmd/Cmd.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2.cmd;
+package com.massivecraft.mcore3.cmd;
 
 import java.util.Date;
 import java.util.HashMap;
@@ -11,16 +11,16 @@ import org.bukkit.command.SimpleCommandMap;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Player;
 
-import com.massivecraft.mcore2.cmd.arg.AHBoolean;
-import com.massivecraft.mcore2.cmd.arg.AHByte;
-import com.massivecraft.mcore2.cmd.arg.AHDate;
-import com.massivecraft.mcore2.cmd.arg.AHDouble;
-import com.massivecraft.mcore2.cmd.arg.AHFloat;
-import com.massivecraft.mcore2.cmd.arg.AHInteger;
-import com.massivecraft.mcore2.cmd.arg.AHMaterial;
-import com.massivecraft.mcore2.cmd.arg.AHPlayer;
-import com.massivecraft.mcore2.cmd.arg.AHWorld;
-import com.massivecraft.mcore2.cmd.arg.IArgHandler;
+import com.massivecraft.mcore3.cmd.arg.AHBoolean;
+import com.massivecraft.mcore3.cmd.arg.AHByte;
+import com.massivecraft.mcore3.cmd.arg.AHDate;
+import com.massivecraft.mcore3.cmd.arg.AHDouble;
+import com.massivecraft.mcore3.cmd.arg.AHFloat;
+import com.massivecraft.mcore3.cmd.arg.AHInteger;
+import com.massivecraft.mcore3.cmd.arg.AHMaterial;
+import com.massivecraft.mcore3.cmd.arg.AHPlayer;
+import com.massivecraft.mcore3.cmd.arg.AHWorld;
+import com.massivecraft.mcore3.cmd.arg.IArgHandler;
 
 public class Cmd
 {
diff --git a/src/com/massivecraft/mcore2/cmd/HelpCommand.java b/src/com/massivecraft/mcore3/cmd/HelpCommand.java
similarity index 84%
rename from src/com/massivecraft/mcore2/cmd/HelpCommand.java
rename to src/com/massivecraft/mcore3/cmd/HelpCommand.java
index fbe84836..049efc59 100644
--- a/src/com/massivecraft/mcore2/cmd/HelpCommand.java
+++ b/src/com/massivecraft/mcore3/cmd/HelpCommand.java
@@ -1,10 +1,10 @@
-package com.massivecraft.mcore2.cmd;
+package com.massivecraft.mcore3.cmd;
 
 import java.util.ArrayList;
 
-import com.massivecraft.mcore2.MPlugin;
-import com.massivecraft.mcore2.cmd.MCommand;
-import com.massivecraft.mcore2.util.Txt;
+import com.massivecraft.mcore3.MPlugin;
+import com.massivecraft.mcore3.cmd.MCommand;
+import com.massivecraft.mcore3.util.Txt;
 
 public class HelpCommand extends MCommand
 {
diff --git a/src/com/massivecraft/mcore2/cmd/MCommand.java b/src/com/massivecraft/mcore3/cmd/MCommand.java
similarity index 93%
rename from src/com/massivecraft/mcore2/cmd/MCommand.java
rename to src/com/massivecraft/mcore3/cmd/MCommand.java
index 1f25cf7d..9b775270 100644
--- a/src/com/massivecraft/mcore2/cmd/MCommand.java
+++ b/src/com/massivecraft/mcore3/cmd/MCommand.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2.cmd;
+package com.massivecraft.mcore3.cmd;
 
 import java.util.*;
 import java.util.Map.Entry;
@@ -7,14 +7,14 @@ import java.util.logging.Level;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.massivecraft.mcore2.Lang;
-import com.massivecraft.mcore2.MCore;
-import com.massivecraft.mcore2.MPlugin;
-import com.massivecraft.mcore2.cmd.arg.IArgHandler;
-import com.massivecraft.mcore2.cmd.req.IReq;
-import com.massivecraft.mcore2.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore2.util.Perm;
-import com.massivecraft.mcore2.util.Txt;
+import com.massivecraft.mcore3.Lang;
+import com.massivecraft.mcore3.MCore;
+import com.massivecraft.mcore3.MPlugin;
+import com.massivecraft.mcore3.cmd.arg.IArgHandler;
+import com.massivecraft.mcore3.cmd.req.IReq;
+import com.massivecraft.mcore3.cmd.req.ReqHasPerm;
+import com.massivecraft.mcore3.util.Perm;
+import com.massivecraft.mcore3.util.Txt;
 
 public abstract class MCommand
 {
diff --git a/src/com/massivecraft/mcore2/cmd/VisibilityMode.java b/src/com/massivecraft/mcore3/cmd/VisibilityMode.java
similarity index 89%
rename from src/com/massivecraft/mcore2/cmd/VisibilityMode.java
rename to src/com/massivecraft/mcore3/cmd/VisibilityMode.java
index 3bad597b..d84eaa98 100644
--- a/src/com/massivecraft/mcore2/cmd/VisibilityMode.java
+++ b/src/com/massivecraft/mcore3/cmd/VisibilityMode.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2.cmd;
+package com.massivecraft.mcore3.cmd;
 
 public enum VisibilityMode
 {
diff --git a/src/com/massivecraft/mcore2/cmd/arg/AHBase.java b/src/com/massivecraft/mcore3/cmd/arg/AHBase.java
similarity index 79%
rename from src/com/massivecraft/mcore2/cmd/arg/AHBase.java
rename to src/com/massivecraft/mcore3/cmd/arg/AHBase.java
index 744082cb..4665c560 100644
--- a/src/com/massivecraft/mcore2/cmd/arg/AHBase.java
+++ b/src/com/massivecraft/mcore3/cmd/arg/AHBase.java
@@ -1,11 +1,11 @@
-package com.massivecraft.mcore2.cmd.arg;
+package com.massivecraft.mcore3.cmd.arg;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore2.MPlugin;
+import com.massivecraft.mcore3.MPlugin;
 
 public abstract class AHBase<T> implements IArgHandler<T>
 {
diff --git a/src/com/massivecraft/mcore2/cmd/arg/AHBoolean.java b/src/com/massivecraft/mcore3/cmd/arg/AHBoolean.java
similarity index 86%
rename from src/com/massivecraft/mcore2/cmd/arg/AHBoolean.java
rename to src/com/massivecraft/mcore3/cmd/arg/AHBoolean.java
index 8ed001f5..a6156e12 100644
--- a/src/com/massivecraft/mcore2/cmd/arg/AHBoolean.java
+++ b/src/com/massivecraft/mcore3/cmd/arg/AHBoolean.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2.cmd.arg;
+package com.massivecraft.mcore3.cmd.arg;
 
 public class AHBoolean extends AHPrimitive<Boolean>
 {	
diff --git a/src/com/massivecraft/mcore2/cmd/arg/AHByte.java b/src/com/massivecraft/mcore3/cmd/arg/AHByte.java
similarity index 80%
rename from src/com/massivecraft/mcore2/cmd/arg/AHByte.java
rename to src/com/massivecraft/mcore3/cmd/arg/AHByte.java
index e4869938..25152ccd 100644
--- a/src/com/massivecraft/mcore2/cmd/arg/AHByte.java
+++ b/src/com/massivecraft/mcore3/cmd/arg/AHByte.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2.cmd.arg;
+package com.massivecraft.mcore3.cmd.arg;
 
 public class AHByte extends AHPrimitive<Byte>
 {	
diff --git a/src/com/massivecraft/mcore2/cmd/arg/AHDate.java b/src/com/massivecraft/mcore3/cmd/arg/AHDate.java
similarity index 86%
rename from src/com/massivecraft/mcore2/cmd/arg/AHDate.java
rename to src/com/massivecraft/mcore3/cmd/arg/AHDate.java
index b0d16345..f5c09aa7 100644
--- a/src/com/massivecraft/mcore2/cmd/arg/AHDate.java
+++ b/src/com/massivecraft/mcore3/cmd/arg/AHDate.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2.cmd.arg;
+package com.massivecraft.mcore3.cmd.arg;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
diff --git a/src/com/massivecraft/mcore2/cmd/arg/AHDouble.java b/src/com/massivecraft/mcore3/cmd/arg/AHDouble.java
similarity index 81%
rename from src/com/massivecraft/mcore2/cmd/arg/AHDouble.java
rename to src/com/massivecraft/mcore3/cmd/arg/AHDouble.java
index 83a329c7..eeb6adca 100644
--- a/src/com/massivecraft/mcore2/cmd/arg/AHDouble.java
+++ b/src/com/massivecraft/mcore3/cmd/arg/AHDouble.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2.cmd.arg;
+package com.massivecraft.mcore3.cmd.arg;
 
 public class AHDouble extends AHPrimitive<Double>
 {	
diff --git a/src/com/massivecraft/mcore2/cmd/arg/AHFloat.java b/src/com/massivecraft/mcore3/cmd/arg/AHFloat.java
similarity index 80%
rename from src/com/massivecraft/mcore2/cmd/arg/AHFloat.java
rename to src/com/massivecraft/mcore3/cmd/arg/AHFloat.java
index 7dd68c9d..a556271f 100644
--- a/src/com/massivecraft/mcore2/cmd/arg/AHFloat.java
+++ b/src/com/massivecraft/mcore3/cmd/arg/AHFloat.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2.cmd.arg;
+package com.massivecraft.mcore3.cmd.arg;
 
 public class AHFloat extends AHPrimitive<Float>
 {	
diff --git a/src/com/massivecraft/mcore2/cmd/arg/AHInteger.java b/src/com/massivecraft/mcore3/cmd/arg/AHInteger.java
similarity index 81%
rename from src/com/massivecraft/mcore2/cmd/arg/AHInteger.java
rename to src/com/massivecraft/mcore3/cmd/arg/AHInteger.java
index 5074ab56..a70cba3d 100644
--- a/src/com/massivecraft/mcore2/cmd/arg/AHInteger.java
+++ b/src/com/massivecraft/mcore3/cmd/arg/AHInteger.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2.cmd.arg;
+package com.massivecraft.mcore3.cmd.arg;
 
 public class AHInteger extends AHPrimitive<Integer>
 {	
diff --git a/src/com/massivecraft/mcore2/cmd/arg/AHMaterial.java b/src/com/massivecraft/mcore3/cmd/arg/AHMaterial.java
similarity index 82%
rename from src/com/massivecraft/mcore2/cmd/arg/AHMaterial.java
rename to src/com/massivecraft/mcore3/cmd/arg/AHMaterial.java
index 00599c15..7f41dbd2 100644
--- a/src/com/massivecraft/mcore2/cmd/arg/AHMaterial.java
+++ b/src/com/massivecraft/mcore3/cmd/arg/AHMaterial.java
@@ -1,9 +1,9 @@
-package com.massivecraft.mcore2.cmd.arg;
+package com.massivecraft.mcore3.cmd.arg;
 
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore2.MPlugin;
+import com.massivecraft.mcore3.MPlugin;
 
 public class AHMaterial extends AHBase<Material>
 {
diff --git a/src/com/massivecraft/mcore2/cmd/arg/AHPlayer.java b/src/com/massivecraft/mcore3/cmd/arg/AHPlayer.java
similarity index 87%
rename from src/com/massivecraft/mcore2/cmd/arg/AHPlayer.java
rename to src/com/massivecraft/mcore3/cmd/arg/AHPlayer.java
index 87c8717c..dfcc33ad 100644
--- a/src/com/massivecraft/mcore2/cmd/arg/AHPlayer.java
+++ b/src/com/massivecraft/mcore3/cmd/arg/AHPlayer.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2.cmd.arg;
+package com.massivecraft.mcore3.cmd.arg;
 
 import java.util.List;
 
@@ -6,7 +6,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.massivecraft.mcore2.MPlugin;
+import com.massivecraft.mcore3.MPlugin;
 
 public class AHPlayer extends AHBase<Player>
 {
diff --git a/src/com/massivecraft/mcore2/cmd/arg/AHPlayerWrapper.java b/src/com/massivecraft/mcore3/cmd/arg/AHPlayerWrapper.java
similarity index 79%
rename from src/com/massivecraft/mcore2/cmd/arg/AHPlayerWrapper.java
rename to src/com/massivecraft/mcore3/cmd/arg/AHPlayerWrapper.java
index b1397686..12439b32 100644
--- a/src/com/massivecraft/mcore2/cmd/arg/AHPlayerWrapper.java
+++ b/src/com/massivecraft/mcore3/cmd/arg/AHPlayerWrapper.java
@@ -1,11 +1,11 @@
-package com.massivecraft.mcore2.cmd.arg;
+package com.massivecraft.mcore3.cmd.arg;
 
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore2.MPlugin;
-import com.massivecraft.mcore2.persist.IClassManager;
-import com.massivecraft.mcore2.persist.Persist;
-import com.massivecraft.mcore2.util.PlayerUtil;
+import com.massivecraft.mcore3.MPlugin;
+import com.massivecraft.mcore3.persist.IClassManager;
+import com.massivecraft.mcore3.persist.Persist;
+import com.massivecraft.mcore3.util.PlayerUtil;
 
 public abstract class AHPlayerWrapper<T> extends AHBase<T>
 {
diff --git a/src/com/massivecraft/mcore2/cmd/arg/AHPrimitive.java b/src/com/massivecraft/mcore3/cmd/arg/AHPrimitive.java
similarity index 83%
rename from src/com/massivecraft/mcore2/cmd/arg/AHPrimitive.java
rename to src/com/massivecraft/mcore3/cmd/arg/AHPrimitive.java
index e3d4d9d9..764e4b0b 100644
--- a/src/com/massivecraft/mcore2/cmd/arg/AHPrimitive.java
+++ b/src/com/massivecraft/mcore3/cmd/arg/AHPrimitive.java
@@ -1,8 +1,8 @@
-package com.massivecraft.mcore2.cmd.arg;
+package com.massivecraft.mcore3.cmd.arg;
 
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore2.MPlugin;
+import com.massivecraft.mcore3.MPlugin;
 
 public abstract class AHPrimitive<T> extends AHBase<T>
 {
diff --git a/src/com/massivecraft/mcore2/cmd/arg/AHWorld.java b/src/com/massivecraft/mcore3/cmd/arg/AHWorld.java
similarity index 80%
rename from src/com/massivecraft/mcore2/cmd/arg/AHWorld.java
rename to src/com/massivecraft/mcore3/cmd/arg/AHWorld.java
index f46915ee..49e8b389 100644
--- a/src/com/massivecraft/mcore2/cmd/arg/AHWorld.java
+++ b/src/com/massivecraft/mcore3/cmd/arg/AHWorld.java
@@ -1,10 +1,10 @@
-package com.massivecraft.mcore2.cmd.arg;
+package com.massivecraft.mcore3.cmd.arg;
 
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore2.MPlugin;
+import com.massivecraft.mcore3.MPlugin;
 
 public class AHWorld extends AHBase<World>
 {
diff --git a/src/com/massivecraft/mcore2/cmd/arg/IArgHandler.java b/src/com/massivecraft/mcore3/cmd/arg/IArgHandler.java
similarity index 77%
rename from src/com/massivecraft/mcore2/cmd/arg/IArgHandler.java
rename to src/com/massivecraft/mcore3/cmd/arg/IArgHandler.java
index 2ce4b562..d18e7a46 100644
--- a/src/com/massivecraft/mcore2/cmd/arg/IArgHandler.java
+++ b/src/com/massivecraft/mcore3/cmd/arg/IArgHandler.java
@@ -1,10 +1,10 @@
-package com.massivecraft.mcore2.cmd.arg;
+package com.massivecraft.mcore3.cmd.arg;
 
 import java.util.Collection;
 
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore2.MPlugin;
+import com.massivecraft.mcore3.MPlugin;
 
 public interface IArgHandler<T>
 {
diff --git a/src/com/massivecraft/mcore2/cmd/req/IReq.java b/src/com/massivecraft/mcore3/cmd/req/IReq.java
similarity index 77%
rename from src/com/massivecraft/mcore2/cmd/req/IReq.java
rename to src/com/massivecraft/mcore3/cmd/req/IReq.java
index b079d93c..1fa2fb99 100644
--- a/src/com/massivecraft/mcore2/cmd/req/IReq.java
+++ b/src/com/massivecraft/mcore3/cmd/req/IReq.java
@@ -1,8 +1,8 @@
-package com.massivecraft.mcore2.cmd.req;
+package com.massivecraft.mcore3.cmd.req;
 
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore2.cmd.MCommand;
+import com.massivecraft.mcore3.cmd.MCommand;
 
 public interface IReq
 {
diff --git a/src/com/massivecraft/mcore2/cmd/req/ReqHasPerm.java b/src/com/massivecraft/mcore3/cmd/req/ReqHasPerm.java
similarity index 78%
rename from src/com/massivecraft/mcore2/cmd/req/ReqHasPerm.java
rename to src/com/massivecraft/mcore3/cmd/req/ReqHasPerm.java
index 0454b45d..ed982e6e 100644
--- a/src/com/massivecraft/mcore2/cmd/req/ReqHasPerm.java
+++ b/src/com/massivecraft/mcore3/cmd/req/ReqHasPerm.java
@@ -1,9 +1,9 @@
-package com.massivecraft.mcore2.cmd.req;
+package com.massivecraft.mcore3.cmd.req;
 
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore2.cmd.MCommand;
-import com.massivecraft.mcore2.util.Perm;
+import com.massivecraft.mcore3.cmd.MCommand;
+import com.massivecraft.mcore3.util.Perm;
 
 public class ReqHasPerm implements IReq
 {
diff --git a/src/com/massivecraft/mcore2/cmd/req/ReqIsPlayer.java b/src/com/massivecraft/mcore3/cmd/req/ReqIsPlayer.java
similarity index 78%
rename from src/com/massivecraft/mcore2/cmd/req/ReqIsPlayer.java
rename to src/com/massivecraft/mcore3/cmd/req/ReqIsPlayer.java
index 07e93878..3f89a6d6 100644
--- a/src/com/massivecraft/mcore2/cmd/req/ReqIsPlayer.java
+++ b/src/com/massivecraft/mcore3/cmd/req/ReqIsPlayer.java
@@ -1,10 +1,10 @@
-package com.massivecraft.mcore2.cmd.req;
+package com.massivecraft.mcore3.cmd.req;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.massivecraft.mcore2.Lang;
-import com.massivecraft.mcore2.cmd.MCommand;
+import com.massivecraft.mcore3.Lang;
+import com.massivecraft.mcore3.cmd.MCommand;
 
 public class ReqIsPlayer implements IReq
 {
diff --git a/src/com/massivecraft/mcore2/gson/InventoryTypeAdapter.java b/src/com/massivecraft/mcore3/gson/InventoryTypeAdapter.java
similarity index 90%
rename from src/com/massivecraft/mcore2/gson/InventoryTypeAdapter.java
rename to src/com/massivecraft/mcore3/gson/InventoryTypeAdapter.java
index ed9cf1c6..0a210562 100644
--- a/src/com/massivecraft/mcore2/gson/InventoryTypeAdapter.java
+++ b/src/com/massivecraft/mcore3/gson/InventoryTypeAdapter.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2.gson;
+package com.massivecraft.mcore3.gson;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -11,14 +11,14 @@ import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 
-import com.massivecraft.mcore2.lib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore2.lib.gson.JsonDeserializer;
-import com.massivecraft.mcore2.lib.gson.JsonElement;
-import com.massivecraft.mcore2.lib.gson.JsonObject;
-import com.massivecraft.mcore2.lib.gson.JsonParseException;
-import com.massivecraft.mcore2.lib.gson.JsonPrimitive;
-import com.massivecraft.mcore2.lib.gson.JsonSerializationContext;
-import com.massivecraft.mcore2.lib.gson.JsonSerializer;
+import com.massivecraft.mcore3.lib.gson.JsonDeserializationContext;
+import com.massivecraft.mcore3.lib.gson.JsonDeserializer;
+import com.massivecraft.mcore3.lib.gson.JsonElement;
+import com.massivecraft.mcore3.lib.gson.JsonObject;
+import com.massivecraft.mcore3.lib.gson.JsonParseException;
+import com.massivecraft.mcore3.lib.gson.JsonPrimitive;
+import com.massivecraft.mcore3.lib.gson.JsonSerializationContext;
+import com.massivecraft.mcore3.lib.gson.JsonSerializer;
 
 public class InventoryTypeAdapter implements JsonDeserializer<Inventory>, JsonSerializer<Inventory>
 {
diff --git a/src/com/massivecraft/mcore2/lib/gson/DefaultDateTypeAdapter.java b/src/com/massivecraft/mcore3/lib/gson/DefaultDateTypeAdapter.java
similarity index 87%
rename from src/com/massivecraft/mcore2/lib/gson/DefaultDateTypeAdapter.java
rename to src/com/massivecraft/mcore3/lib/gson/DefaultDateTypeAdapter.java
index d1dd2702..0059e155 100644
--- a/src/com/massivecraft/mcore2/lib/gson/DefaultDateTypeAdapter.java
+++ b/src/com/massivecraft/mcore3/lib/gson/DefaultDateTypeAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson;
+package com.massivecraft.mcore3.lib.gson;
 
 import java.lang.reflect.Type;
 import java.sql.Timestamp;
@@ -25,15 +25,15 @@ import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
 
-import com.massivecraft.mcore2.lib.gson.DefaultDateTypeAdapter;
-import com.massivecraft.mcore2.lib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore2.lib.gson.JsonDeserializer;
-import com.massivecraft.mcore2.lib.gson.JsonElement;
-import com.massivecraft.mcore2.lib.gson.JsonParseException;
-import com.massivecraft.mcore2.lib.gson.JsonPrimitive;
-import com.massivecraft.mcore2.lib.gson.JsonSerializationContext;
-import com.massivecraft.mcore2.lib.gson.JsonSerializer;
-import com.massivecraft.mcore2.lib.gson.JsonSyntaxException;
+import com.massivecraft.mcore3.lib.gson.DefaultDateTypeAdapter;
+import com.massivecraft.mcore3.lib.gson.JsonDeserializationContext;
+import com.massivecraft.mcore3.lib.gson.JsonDeserializer;
+import com.massivecraft.mcore3.lib.gson.JsonElement;
+import com.massivecraft.mcore3.lib.gson.JsonParseException;
+import com.massivecraft.mcore3.lib.gson.JsonPrimitive;
+import com.massivecraft.mcore3.lib.gson.JsonSerializationContext;
+import com.massivecraft.mcore3.lib.gson.JsonSerializer;
+import com.massivecraft.mcore3.lib.gson.JsonSyntaxException;
 
 /**
  * This type adapter supports three subclasses of date: Date, Timestamp, and
diff --git a/src/com/massivecraft/mcore2/lib/gson/ExclusionStrategy.java b/src/com/massivecraft/mcore3/lib/gson/ExclusionStrategy.java
similarity index 95%
rename from src/com/massivecraft/mcore2/lib/gson/ExclusionStrategy.java
rename to src/com/massivecraft/mcore3/lib/gson/ExclusionStrategy.java
index efbdd55d..29fdd967 100644
--- a/src/com/massivecraft/mcore2/lib/gson/ExclusionStrategy.java
+++ b/src/com/massivecraft/mcore3/lib/gson/ExclusionStrategy.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson;
+package com.massivecraft.mcore3.lib.gson;
 
-import com.massivecraft.mcore2.lib.gson.ExclusionStrategy;
-import com.massivecraft.mcore2.lib.gson.FieldAttributes;
-import com.massivecraft.mcore2.lib.gson.GsonBuilder;
+import com.massivecraft.mcore3.lib.gson.ExclusionStrategy;
+import com.massivecraft.mcore3.lib.gson.FieldAttributes;
+import com.massivecraft.mcore3.lib.gson.GsonBuilder;
 
 /**
  * A strategy (or policy) definition that is used to decide whether or not a field or top-level
diff --git a/src/com/massivecraft/mcore2/lib/gson/FieldAttributes.java b/src/com/massivecraft/mcore3/lib/gson/FieldAttributes.java
similarity index 97%
rename from src/com/massivecraft/mcore2/lib/gson/FieldAttributes.java
rename to src/com/massivecraft/mcore3/lib/gson/FieldAttributes.java
index 837507db..504a0736 100644
--- a/src/com/massivecraft/mcore2/lib/gson/FieldAttributes.java
+++ b/src/com/massivecraft/mcore3/lib/gson/FieldAttributes.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson;
+package com.massivecraft.mcore3.lib.gson;
 
-import com.massivecraft.mcore2.lib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore3.lib.gson.internal.$Gson$Preconditions;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
diff --git a/src/com/massivecraft/mcore2/lib/gson/FieldNamingPolicy.java b/src/com/massivecraft/mcore3/lib/gson/FieldNamingPolicy.java
similarity index 96%
rename from src/com/massivecraft/mcore2/lib/gson/FieldNamingPolicy.java
rename to src/com/massivecraft/mcore3/lib/gson/FieldNamingPolicy.java
index 9df29c49..92f82b7c 100644
--- a/src/com/massivecraft/mcore2/lib/gson/FieldNamingPolicy.java
+++ b/src/com/massivecraft/mcore3/lib/gson/FieldNamingPolicy.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson;
+package com.massivecraft.mcore3.lib.gson;
 
 import java.lang.reflect.Field;
 
-import com.massivecraft.mcore2.lib.gson.FieldNamingStrategy;
+import com.massivecraft.mcore3.lib.gson.FieldNamingStrategy;
 
 /**
  * An enumeration that defines a few standard naming conventions for JSON field names.
- * This enumeration should be used in conjunction with {@link com.massivecraft.mcore2.lib.gson.GsonBuilder}
- * to configure a {@link com.massivecraft.mcore2.lib.gson.Gson} instance to properly translate Java field
+ * This enumeration should be used in conjunction with {@link com.massivecraft.mcore3.lib.gson.GsonBuilder}
+ * to configure a {@link com.massivecraft.mcore3.lib.gson.Gson} instance to properly translate Java field
  * names into the desired JSON field names.
  *
  * @author Inderjeet Singh
diff --git a/src/com/massivecraft/mcore2/lib/gson/FieldNamingStrategy.java b/src/com/massivecraft/mcore3/lib/gson/FieldNamingStrategy.java
similarity index 96%
rename from src/com/massivecraft/mcore2/lib/gson/FieldNamingStrategy.java
rename to src/com/massivecraft/mcore3/lib/gson/FieldNamingStrategy.java
index cf04e97f..45c3471f 100644
--- a/src/com/massivecraft/mcore2/lib/gson/FieldNamingStrategy.java
+++ b/src/com/massivecraft/mcore3/lib/gson/FieldNamingStrategy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson;
+package com.massivecraft.mcore3.lib.gson;
 
 import java.lang.reflect.Field;
 
diff --git a/src/com/massivecraft/mcore2/lib/gson/Gson.java b/src/com/massivecraft/mcore3/lib/gson/Gson.java
similarity index 92%
rename from src/com/massivecraft/mcore2/lib/gson/Gson.java
rename to src/com/massivecraft/mcore3/lib/gson/Gson.java
index 23950bbd..63a25887 100644
--- a/src/com/massivecraft/mcore2/lib/gson/Gson.java
+++ b/src/com/massivecraft/mcore3/lib/gson/Gson.java
@@ -14,48 +14,48 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson;
+package com.massivecraft.mcore3.lib.gson;
 
-import com.massivecraft.mcore2.lib.gson.FieldNamingPolicy;
-import com.massivecraft.mcore2.lib.gson.FieldNamingStrategy;
-import com.massivecraft.mcore2.lib.gson.Gson;
-import com.massivecraft.mcore2.lib.gson.GsonBuilder;
-import com.massivecraft.mcore2.lib.gson.InstanceCreator;
-import com.massivecraft.mcore2.lib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore2.lib.gson.JsonDeserializer;
-import com.massivecraft.mcore2.lib.gson.JsonElement;
-import com.massivecraft.mcore2.lib.gson.JsonIOException;
-import com.massivecraft.mcore2.lib.gson.JsonNull;
-import com.massivecraft.mcore2.lib.gson.JsonParseException;
-import com.massivecraft.mcore2.lib.gson.JsonSerializationContext;
-import com.massivecraft.mcore2.lib.gson.JsonSerializer;
-import com.massivecraft.mcore2.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore2.lib.gson.LongSerializationPolicy;
-import com.massivecraft.mcore2.lib.gson.TypeAdapter;
-import com.massivecraft.mcore2.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore2.lib.gson.internal.ConstructorConstructor;
-import com.massivecraft.mcore2.lib.gson.internal.Excluder;
-import com.massivecraft.mcore2.lib.gson.internal.GsonInternalAccess;
-import com.massivecraft.mcore2.lib.gson.internal.Primitives;
-import com.massivecraft.mcore2.lib.gson.internal.Streams;
-import com.massivecraft.mcore2.lib.gson.internal.bind.ArrayTypeAdapter;
-import com.massivecraft.mcore2.lib.gson.internal.bind.BigDecimalTypeAdapter;
-import com.massivecraft.mcore2.lib.gson.internal.bind.BigIntegerTypeAdapter;
-import com.massivecraft.mcore2.lib.gson.internal.bind.CollectionTypeAdapterFactory;
-import com.massivecraft.mcore2.lib.gson.internal.bind.DateTypeAdapter;
-import com.massivecraft.mcore2.lib.gson.internal.bind.JsonTreeReader;
-import com.massivecraft.mcore2.lib.gson.internal.bind.JsonTreeWriter;
-import com.massivecraft.mcore2.lib.gson.internal.bind.MapTypeAdapterFactory;
-import com.massivecraft.mcore2.lib.gson.internal.bind.ObjectTypeAdapter;
-import com.massivecraft.mcore2.lib.gson.internal.bind.ReflectiveTypeAdapterFactory;
-import com.massivecraft.mcore2.lib.gson.internal.bind.SqlDateTypeAdapter;
-import com.massivecraft.mcore2.lib.gson.internal.bind.TimeTypeAdapter;
-import com.massivecraft.mcore2.lib.gson.internal.bind.TypeAdapters;
-import com.massivecraft.mcore2.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore2.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore2.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore2.lib.gson.stream.JsonWriter;
-import com.massivecraft.mcore2.lib.gson.stream.MalformedJsonException;
+import com.massivecraft.mcore3.lib.gson.FieldNamingPolicy;
+import com.massivecraft.mcore3.lib.gson.FieldNamingStrategy;
+import com.massivecraft.mcore3.lib.gson.Gson;
+import com.massivecraft.mcore3.lib.gson.GsonBuilder;
+import com.massivecraft.mcore3.lib.gson.InstanceCreator;
+import com.massivecraft.mcore3.lib.gson.JsonDeserializationContext;
+import com.massivecraft.mcore3.lib.gson.JsonDeserializer;
+import com.massivecraft.mcore3.lib.gson.JsonElement;
+import com.massivecraft.mcore3.lib.gson.JsonIOException;
+import com.massivecraft.mcore3.lib.gson.JsonNull;
+import com.massivecraft.mcore3.lib.gson.JsonParseException;
+import com.massivecraft.mcore3.lib.gson.JsonSerializationContext;
+import com.massivecraft.mcore3.lib.gson.JsonSerializer;
+import com.massivecraft.mcore3.lib.gson.JsonSyntaxException;
+import com.massivecraft.mcore3.lib.gson.LongSerializationPolicy;
+import com.massivecraft.mcore3.lib.gson.TypeAdapter;
+import com.massivecraft.mcore3.lib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore3.lib.gson.internal.ConstructorConstructor;
+import com.massivecraft.mcore3.lib.gson.internal.Excluder;
+import com.massivecraft.mcore3.lib.gson.internal.GsonInternalAccess;
+import com.massivecraft.mcore3.lib.gson.internal.Primitives;
+import com.massivecraft.mcore3.lib.gson.internal.Streams;
+import com.massivecraft.mcore3.lib.gson.internal.bind.ArrayTypeAdapter;
+import com.massivecraft.mcore3.lib.gson.internal.bind.BigDecimalTypeAdapter;
+import com.massivecraft.mcore3.lib.gson.internal.bind.BigIntegerTypeAdapter;
+import com.massivecraft.mcore3.lib.gson.internal.bind.CollectionTypeAdapterFactory;
+import com.massivecraft.mcore3.lib.gson.internal.bind.DateTypeAdapter;
+import com.massivecraft.mcore3.lib.gson.internal.bind.JsonTreeReader;
+import com.massivecraft.mcore3.lib.gson.internal.bind.JsonTreeWriter;
+import com.massivecraft.mcore3.lib.gson.internal.bind.MapTypeAdapterFactory;
+import com.massivecraft.mcore3.lib.gson.internal.bind.ObjectTypeAdapter;
+import com.massivecraft.mcore3.lib.gson.internal.bind.ReflectiveTypeAdapterFactory;
+import com.massivecraft.mcore3.lib.gson.internal.bind.SqlDateTypeAdapter;
+import com.massivecraft.mcore3.lib.gson.internal.bind.TimeTypeAdapter;
+import com.massivecraft.mcore3.lib.gson.internal.bind.TypeAdapters;
+import com.massivecraft.mcore3.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore3.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore3.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore3.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore3.lib.gson.stream.MalformedJsonException;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -109,7 +109,7 @@ import java.util.Map;
  * <p>See the <a href="https://sites.google.com/site/gson/gson-user-guide">Gson User Guide</a>
  * for a more complete set of examples.</p>
  *
- * @see com.massivecraft.mcore2.lib.gson.reflect.TypeToken
+ * @see com.massivecraft.mcore3.lib.gson.reflect.TypeToken
  *
  * @author Inderjeet Singh
  * @author Joel Leitch
@@ -180,10 +180,10 @@ public final class Gson {
    *   ignores the millisecond portion of the date during serialization. You can change
    *   this by invoking {@link GsonBuilder#setDateFormat(int)} or
    *   {@link GsonBuilder#setDateFormat(String)}. </li>
-   *   <li>By default, Gson ignores the {@link com.massivecraft.mcore2.lib.gson.annotations.Expose} annotation.
+   *   <li>By default, Gson ignores the {@link com.massivecraft.mcore3.lib.gson.annotations.Expose} annotation.
    *   You can enable Gson to serialize/deserialize only those fields marked with this annotation
    *   through {@link GsonBuilder#excludeFieldsWithoutExposeAnnotation()}. </li>
-   *   <li>By default, Gson ignores the {@link com.massivecraft.mcore2.lib.gson.annotations.Since} annotation. You
+   *   <li>By default, Gson ignores the {@link com.massivecraft.mcore3.lib.gson.annotations.Since} annotation. You
    *   can enable Gson to use this annotation through {@link GsonBuilder#setVersion(double)}.</li>
    *   <li>The default field naming policy for the output Json is same as in Java. So, a Java class
    *   field <code>versionNumber</code> will be output as <code>&quot;versionNumber@quot;</code> in
@@ -444,7 +444,7 @@ public final class Gson {
    *
    * @param src the object for which JSON representation is to be created
    * @param typeOfSrc The specific genericized type of src. You can obtain
-   * this type by using the {@link com.massivecraft.mcore2.lib.gson.reflect.TypeToken} class. For example,
+   * this type by using the {@link com.massivecraft.mcore3.lib.gson.reflect.TypeToken} class. For example,
    * to get the type for {@code Collection<Foo>}, you should use:
    * <pre>
    * Type typeOfSrc = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.getType();
@@ -486,7 +486,7 @@ public final class Gson {
    *
    * @param src the object for which JSON representation is to be created
    * @param typeOfSrc The specific genericized type of src. You can obtain
-   * this type by using the {@link com.massivecraft.mcore2.lib.gson.reflect.TypeToken} class. For example,
+   * this type by using the {@link com.massivecraft.mcore3.lib.gson.reflect.TypeToken} class. For example,
    * to get the type for {@code Collection<Foo>}, you should use:
    * <pre>
    * Type typeOfSrc = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.getType();
@@ -528,7 +528,7 @@ public final class Gson {
    *
    * @param src the object for which JSON representation is to be created
    * @param typeOfSrc The specific genericized type of src. You can obtain
-   * this type by using the {@link com.massivecraft.mcore2.lib.gson.reflect.TypeToken} class. For example,
+   * this type by using the {@link com.massivecraft.mcore3.lib.gson.reflect.TypeToken} class. For example,
    * to get the type for {@code Collection<Foo>}, you should use:
    * <pre>
    * Type typeOfSrc = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.getType();
@@ -670,7 +670,7 @@ public final class Gson {
    * @param <T> the type of the desired object
    * @param json the string from which the object is to be deserialized
    * @param typeOfT The specific genericized type of src. You can obtain this type by using the
-   * {@link com.massivecraft.mcore2.lib.gson.reflect.TypeToken} class. For example, to get the type for
+   * {@link com.massivecraft.mcore3.lib.gson.reflect.TypeToken} class. For example, to get the type for
    * {@code Collection<Foo>}, you should use:
    * <pre>
    * Type typeOfT = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.getType();
@@ -723,7 +723,7 @@ public final class Gson {
    * @param <T> the type of the desired object
    * @param json the reader producing Json from which the object is to be deserialized
    * @param typeOfT The specific genericized type of src. You can obtain this type by using the
-   * {@link com.massivecraft.mcore2.lib.gson.reflect.TypeToken} class. For example, to get the type for
+   * {@link com.massivecraft.mcore3.lib.gson.reflect.TypeToken} class. For example, to get the type for
    * {@code Collection<Foo>}, you should use:
    * <pre>
    * Type typeOfT = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.getType();
@@ -820,7 +820,7 @@ public final class Gson {
    * @param json the root of the parse tree of {@link JsonElement}s from which the object is to
    * be deserialized
    * @param typeOfT The specific genericized type of src. You can obtain this type by using the
-   * {@link com.massivecraft.mcore2.lib.gson.reflect.TypeToken} class. For example, to get the type for
+   * {@link com.massivecraft.mcore3.lib.gson.reflect.TypeToken} class. For example, to get the type for
    * {@code Collection<Foo>}, you should use:
    * <pre>
    * Type typeOfT = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.getType();
diff --git a/src/com/massivecraft/mcore2/lib/gson/GsonBuilder.java b/src/com/massivecraft/mcore3/lib/gson/GsonBuilder.java
similarity index 95%
rename from src/com/massivecraft/mcore2/lib/gson/GsonBuilder.java
rename to src/com/massivecraft/mcore3/lib/gson/GsonBuilder.java
index 987e0cf2..379cabed 100644
--- a/src/com/massivecraft/mcore2/lib/gson/GsonBuilder.java
+++ b/src/com/massivecraft/mcore3/lib/gson/GsonBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson;
+package com.massivecraft.mcore3.lib.gson;
 
 import java.lang.reflect.Type;
 import java.sql.Timestamp;
@@ -26,25 +26,25 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.massivecraft.mcore2.lib.gson.DefaultDateTypeAdapter;
-import com.massivecraft.mcore2.lib.gson.ExclusionStrategy;
-import com.massivecraft.mcore2.lib.gson.FieldNamingPolicy;
-import com.massivecraft.mcore2.lib.gson.FieldNamingStrategy;
-import com.massivecraft.mcore2.lib.gson.Gson;
-import com.massivecraft.mcore2.lib.gson.GsonBuilder;
-import com.massivecraft.mcore2.lib.gson.InstanceCreator;
-import com.massivecraft.mcore2.lib.gson.JsonDeserializer;
-import com.massivecraft.mcore2.lib.gson.JsonObject;
-import com.massivecraft.mcore2.lib.gson.JsonSerializer;
-import com.massivecraft.mcore2.lib.gson.LongSerializationPolicy;
-import com.massivecraft.mcore2.lib.gson.TreeTypeAdapter;
-import com.massivecraft.mcore2.lib.gson.TypeAdapter;
-import com.massivecraft.mcore2.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore2.lib.gson.internal.$Gson$Preconditions;
-import com.massivecraft.mcore2.lib.gson.internal.Excluder;
-import com.massivecraft.mcore2.lib.gson.internal.Primitives;
-import com.massivecraft.mcore2.lib.gson.internal.bind.TypeAdapters;
-import com.massivecraft.mcore2.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore3.lib.gson.DefaultDateTypeAdapter;
+import com.massivecraft.mcore3.lib.gson.ExclusionStrategy;
+import com.massivecraft.mcore3.lib.gson.FieldNamingPolicy;
+import com.massivecraft.mcore3.lib.gson.FieldNamingStrategy;
+import com.massivecraft.mcore3.lib.gson.Gson;
+import com.massivecraft.mcore3.lib.gson.GsonBuilder;
+import com.massivecraft.mcore3.lib.gson.InstanceCreator;
+import com.massivecraft.mcore3.lib.gson.JsonDeserializer;
+import com.massivecraft.mcore3.lib.gson.JsonObject;
+import com.massivecraft.mcore3.lib.gson.JsonSerializer;
+import com.massivecraft.mcore3.lib.gson.LongSerializationPolicy;
+import com.massivecraft.mcore3.lib.gson.TreeTypeAdapter;
+import com.massivecraft.mcore3.lib.gson.TypeAdapter;
+import com.massivecraft.mcore3.lib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore3.lib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore3.lib.gson.internal.Excluder;
+import com.massivecraft.mcore3.lib.gson.internal.Primitives;
+import com.massivecraft.mcore3.lib.gson.internal.bind.TypeAdapters;
+import com.massivecraft.mcore3.lib.gson.reflect.TypeToken;
 
 /**
  * <p>Use this builder to construct a {@link Gson} instance when you need to set configuration
@@ -152,7 +152,7 @@ public final class GsonBuilder {
 
   /**
    * Configures Gson to exclude all fields from consideration for serialization or deserialization
-   * that do not have the {@link com.massivecraft.mcore2.lib.gson.annotations.Expose} annotation.
+   * that do not have the {@link com.massivecraft.mcore3.lib.gson.annotations.Expose} annotation.
    *
    * @return a reference to this {@code GsonBuilder} object to fulfill the "Builder" pattern
    */
diff --git a/src/com/massivecraft/mcore2/lib/gson/InstanceCreator.java b/src/com/massivecraft/mcore3/lib/gson/InstanceCreator.java
similarity index 97%
rename from src/com/massivecraft/mcore2/lib/gson/InstanceCreator.java
rename to src/com/massivecraft/mcore3/lib/gson/InstanceCreator.java
index a03ec1ee..b22237e6 100644
--- a/src/com/massivecraft/mcore2/lib/gson/InstanceCreator.java
+++ b/src/com/massivecraft/mcore3/lib/gson/InstanceCreator.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson;
+package com.massivecraft.mcore3.lib.gson;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore2.lib.gson.GsonBuilder;
+import com.massivecraft.mcore3.lib.gson.GsonBuilder;
 
 /**
  * This interface is implemented to create instances of a class that does not define a no-args
diff --git a/src/com/massivecraft/mcore2/lib/gson/JsonArray.java b/src/com/massivecraft/mcore3/lib/gson/JsonArray.java
similarity index 97%
rename from src/com/massivecraft/mcore2/lib/gson/JsonArray.java
rename to src/com/massivecraft/mcore3/lib/gson/JsonArray.java
index b2d6ecd9..3a5c033b 100644
--- a/src/com/massivecraft/mcore2/lib/gson/JsonArray.java
+++ b/src/com/massivecraft/mcore3/lib/gson/JsonArray.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson;
+package com.massivecraft.mcore3.lib.gson;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -22,10 +22,10 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import com.massivecraft.mcore2.lib.gson.JsonArray;
-import com.massivecraft.mcore2.lib.gson.JsonElement;
-import com.massivecraft.mcore2.lib.gson.JsonNull;
-import com.massivecraft.mcore2.lib.gson.JsonPrimitive;
+import com.massivecraft.mcore3.lib.gson.JsonArray;
+import com.massivecraft.mcore3.lib.gson.JsonElement;
+import com.massivecraft.mcore3.lib.gson.JsonNull;
+import com.massivecraft.mcore3.lib.gson.JsonPrimitive;
 
 /**
  * A class representing an array type in Json. An array is a list of {@link JsonElement}s each of
diff --git a/src/com/massivecraft/mcore2/lib/gson/JsonDeserializationContext.java b/src/com/massivecraft/mcore3/lib/gson/JsonDeserializationContext.java
similarity index 85%
rename from src/com/massivecraft/mcore2/lib/gson/JsonDeserializationContext.java
rename to src/com/massivecraft/mcore3/lib/gson/JsonDeserializationContext.java
index 5f07068a..3ec89a3b 100644
--- a/src/com/massivecraft/mcore2/lib/gson/JsonDeserializationContext.java
+++ b/src/com/massivecraft/mcore3/lib/gson/JsonDeserializationContext.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson;
+package com.massivecraft.mcore3.lib.gson;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore2.lib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore2.lib.gson.JsonDeserializer;
-import com.massivecraft.mcore2.lib.gson.JsonElement;
-import com.massivecraft.mcore2.lib.gson.JsonParseException;
+import com.massivecraft.mcore3.lib.gson.JsonDeserializationContext;
+import com.massivecraft.mcore3.lib.gson.JsonDeserializer;
+import com.massivecraft.mcore3.lib.gson.JsonElement;
+import com.massivecraft.mcore3.lib.gson.JsonParseException;
 
 /**
  * Context for deserialization that is passed to a custom deserializer during invocation of its
diff --git a/src/com/massivecraft/mcore2/lib/gson/JsonDeserializer.java b/src/com/massivecraft/mcore3/lib/gson/JsonDeserializer.java
similarity index 91%
rename from src/com/massivecraft/mcore2/lib/gson/JsonDeserializer.java
rename to src/com/massivecraft/mcore3/lib/gson/JsonDeserializer.java
index fafe169c..07fccb63 100644
--- a/src/com/massivecraft/mcore2/lib/gson/JsonDeserializer.java
+++ b/src/com/massivecraft/mcore3/lib/gson/JsonDeserializer.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson;
+package com.massivecraft.mcore3.lib.gson;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore2.lib.gson.GsonBuilder;
-import com.massivecraft.mcore2.lib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore2.lib.gson.JsonElement;
-import com.massivecraft.mcore2.lib.gson.JsonParseException;
-import com.massivecraft.mcore2.lib.gson.TypeAdapter;
+import com.massivecraft.mcore3.lib.gson.GsonBuilder;
+import com.massivecraft.mcore3.lib.gson.JsonDeserializationContext;
+import com.massivecraft.mcore3.lib.gson.JsonElement;
+import com.massivecraft.mcore3.lib.gson.JsonParseException;
+import com.massivecraft.mcore3.lib.gson.TypeAdapter;
 
 /**
  * <p>Interface representing a custom deserializer for Json. You should write a custom
diff --git a/src/com/massivecraft/mcore2/lib/gson/JsonElement.java b/src/com/massivecraft/mcore3/lib/gson/JsonElement.java
similarity index 96%
rename from src/com/massivecraft/mcore2/lib/gson/JsonElement.java
rename to src/com/massivecraft/mcore3/lib/gson/JsonElement.java
index c001b545..8ce97d35 100644
--- a/src/com/massivecraft/mcore2/lib/gson/JsonElement.java
+++ b/src/com/massivecraft/mcore3/lib/gson/JsonElement.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson;
+package com.massivecraft.mcore3.lib.gson;
 
-import com.massivecraft.mcore2.lib.gson.JsonArray;
-import com.massivecraft.mcore2.lib.gson.JsonNull;
-import com.massivecraft.mcore2.lib.gson.JsonObject;
-import com.massivecraft.mcore2.lib.gson.JsonPrimitive;
-import com.massivecraft.mcore2.lib.gson.internal.Streams;
-import com.massivecraft.mcore2.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore3.lib.gson.JsonArray;
+import com.massivecraft.mcore3.lib.gson.JsonNull;
+import com.massivecraft.mcore3.lib.gson.JsonObject;
+import com.massivecraft.mcore3.lib.gson.JsonPrimitive;
+import com.massivecraft.mcore3.lib.gson.internal.Streams;
+import com.massivecraft.mcore3.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.io.StringWriter;
diff --git a/src/com/massivecraft/mcore2/lib/gson/JsonIOException.java b/src/com/massivecraft/mcore3/lib/gson/JsonIOException.java
similarity index 92%
rename from src/com/massivecraft/mcore2/lib/gson/JsonIOException.java
rename to src/com/massivecraft/mcore3/lib/gson/JsonIOException.java
index 3120cb86..d3bc10a3 100644
--- a/src/com/massivecraft/mcore2/lib/gson/JsonIOException.java
+++ b/src/com/massivecraft/mcore3/lib/gson/JsonIOException.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore2.lib.gson;
+package com.massivecraft.mcore3.lib.gson;
 
-import com.massivecraft.mcore2.lib.gson.JsonParseException;
+import com.massivecraft.mcore3.lib.gson.JsonParseException;
 
 /**
  * This exception is raised when Gson was unable to read an input stream
diff --git a/src/com/massivecraft/mcore2/lib/gson/JsonNull.java b/src/com/massivecraft/mcore3/lib/gson/JsonNull.java
similarity index 87%
rename from src/com/massivecraft/mcore2/lib/gson/JsonNull.java
rename to src/com/massivecraft/mcore3/lib/gson/JsonNull.java
index af6e73fd..2093abd3 100644
--- a/src/com/massivecraft/mcore2/lib/gson/JsonNull.java
+++ b/src/com/massivecraft/mcore3/lib/gson/JsonNull.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson;
+package com.massivecraft.mcore3.lib.gson;
 
-import com.massivecraft.mcore2.lib.gson.JsonElement;
-import com.massivecraft.mcore2.lib.gson.JsonNull;
+import com.massivecraft.mcore3.lib.gson.JsonElement;
+import com.massivecraft.mcore3.lib.gson.JsonNull;
 
 /**
  * A class representing a Json {@code null} value.
diff --git a/src/com/massivecraft/mcore2/lib/gson/JsonObject.java b/src/com/massivecraft/mcore3/lib/gson/JsonObject.java
similarity index 94%
rename from src/com/massivecraft/mcore2/lib/gson/JsonObject.java
rename to src/com/massivecraft/mcore3/lib/gson/JsonObject.java
index 1d69c144..e8c44c83 100644
--- a/src/com/massivecraft/mcore2/lib/gson/JsonObject.java
+++ b/src/com/massivecraft/mcore3/lib/gson/JsonObject.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson;
+package com.massivecraft.mcore3.lib.gson;
 
-import com.massivecraft.mcore2.lib.gson.JsonArray;
-import com.massivecraft.mcore2.lib.gson.JsonElement;
-import com.massivecraft.mcore2.lib.gson.JsonNull;
-import com.massivecraft.mcore2.lib.gson.JsonObject;
-import com.massivecraft.mcore2.lib.gson.JsonPrimitive;
-import com.massivecraft.mcore2.lib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore3.lib.gson.JsonArray;
+import com.massivecraft.mcore3.lib.gson.JsonElement;
+import com.massivecraft.mcore3.lib.gson.JsonNull;
+import com.massivecraft.mcore3.lib.gson.JsonObject;
+import com.massivecraft.mcore3.lib.gson.JsonPrimitive;
+import com.massivecraft.mcore3.lib.gson.internal.$Gson$Preconditions;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/src/com/massivecraft/mcore2/lib/gson/JsonParseException.java b/src/com/massivecraft/mcore3/lib/gson/JsonParseException.java
similarity index 95%
rename from src/com/massivecraft/mcore2/lib/gson/JsonParseException.java
rename to src/com/massivecraft/mcore3/lib/gson/JsonParseException.java
index 0a521b44..cc46dc36 100644
--- a/src/com/massivecraft/mcore2/lib/gson/JsonParseException.java
+++ b/src/com/massivecraft/mcore3/lib/gson/JsonParseException.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson;
+package com.massivecraft.mcore3.lib.gson;
 
-import com.massivecraft.mcore2.lib.gson.JsonParseException;
+import com.massivecraft.mcore3.lib.gson.JsonParseException;
 
 /**
  * This exception is raised if there is a serious issue that occurs during parsing of a Json
diff --git a/src/com/massivecraft/mcore2/lib/gson/JsonParser.java b/src/com/massivecraft/mcore3/lib/gson/JsonParser.java
similarity index 82%
rename from src/com/massivecraft/mcore2/lib/gson/JsonParser.java
rename to src/com/massivecraft/mcore3/lib/gson/JsonParser.java
index b9c39f59..8a2543df 100644
--- a/src/com/massivecraft/mcore2/lib/gson/JsonParser.java
+++ b/src/com/massivecraft/mcore3/lib/gson/JsonParser.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore2.lib.gson;
+package com.massivecraft.mcore3.lib.gson;
 
-import com.massivecraft.mcore2.lib.gson.JsonElement;
-import com.massivecraft.mcore2.lib.gson.JsonIOException;
-import com.massivecraft.mcore2.lib.gson.JsonNull;
-import com.massivecraft.mcore2.lib.gson.JsonParseException;
-import com.massivecraft.mcore2.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore2.lib.gson.internal.Streams;
-import com.massivecraft.mcore2.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore2.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore2.lib.gson.stream.MalformedJsonException;
+import com.massivecraft.mcore3.lib.gson.JsonElement;
+import com.massivecraft.mcore3.lib.gson.JsonIOException;
+import com.massivecraft.mcore3.lib.gson.JsonNull;
+import com.massivecraft.mcore3.lib.gson.JsonParseException;
+import com.massivecraft.mcore3.lib.gson.JsonSyntaxException;
+import com.massivecraft.mcore3.lib.gson.internal.Streams;
+import com.massivecraft.mcore3.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore3.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore3.lib.gson.stream.MalformedJsonException;
 
 import java.io.EOFException;
 import java.io.IOException;
diff --git a/src/com/massivecraft/mcore2/lib/gson/JsonPrimitive.java b/src/com/massivecraft/mcore3/lib/gson/JsonPrimitive.java
similarity index 97%
rename from src/com/massivecraft/mcore2/lib/gson/JsonPrimitive.java
rename to src/com/massivecraft/mcore3/lib/gson/JsonPrimitive.java
index 1747135c..76e40046 100644
--- a/src/com/massivecraft/mcore2/lib/gson/JsonPrimitive.java
+++ b/src/com/massivecraft/mcore3/lib/gson/JsonPrimitive.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson;
+package com.massivecraft.mcore3.lib.gson;
 
-import com.massivecraft.mcore2.lib.gson.JsonElement;
-import com.massivecraft.mcore2.lib.gson.JsonPrimitive;
-import com.massivecraft.mcore2.lib.gson.internal.$Gson$Preconditions;
-import com.massivecraft.mcore2.lib.gson.internal.LazilyParsedNumber;
+import com.massivecraft.mcore3.lib.gson.JsonElement;
+import com.massivecraft.mcore3.lib.gson.JsonPrimitive;
+import com.massivecraft.mcore3.lib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore3.lib.gson.internal.LazilyParsedNumber;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/src/com/massivecraft/mcore2/lib/gson/JsonSerializationContext.java b/src/com/massivecraft/mcore3/lib/gson/JsonSerializationContext.java
similarity index 89%
rename from src/com/massivecraft/mcore2/lib/gson/JsonSerializationContext.java
rename to src/com/massivecraft/mcore3/lib/gson/JsonSerializationContext.java
index cbce7895..c403b507 100644
--- a/src/com/massivecraft/mcore2/lib/gson/JsonSerializationContext.java
+++ b/src/com/massivecraft/mcore3/lib/gson/JsonSerializationContext.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson;
+package com.massivecraft.mcore3.lib.gson;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore2.lib.gson.JsonElement;
-import com.massivecraft.mcore2.lib.gson.JsonSerializationContext;
-import com.massivecraft.mcore2.lib.gson.JsonSerializer;
+import com.massivecraft.mcore3.lib.gson.JsonElement;
+import com.massivecraft.mcore3.lib.gson.JsonSerializationContext;
+import com.massivecraft.mcore3.lib.gson.JsonSerializer;
 
 /**
  * Context for serialization that is passed to a custom serializer during invocation of its
diff --git a/src/com/massivecraft/mcore2/lib/gson/JsonSerializer.java b/src/com/massivecraft/mcore3/lib/gson/JsonSerializer.java
similarity index 92%
rename from src/com/massivecraft/mcore2/lib/gson/JsonSerializer.java
rename to src/com/massivecraft/mcore3/lib/gson/JsonSerializer.java
index ab0112ee..442125a5 100644
--- a/src/com/massivecraft/mcore2/lib/gson/JsonSerializer.java
+++ b/src/com/massivecraft/mcore3/lib/gson/JsonSerializer.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson;
+package com.massivecraft.mcore3.lib.gson;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore2.lib.gson.JsonElement;
-import com.massivecraft.mcore2.lib.gson.JsonSerializationContext;
-import com.massivecraft.mcore2.lib.gson.TypeAdapter;
+import com.massivecraft.mcore3.lib.gson.JsonElement;
+import com.massivecraft.mcore3.lib.gson.JsonSerializationContext;
+import com.massivecraft.mcore3.lib.gson.TypeAdapter;
 
 /**
  * Interface representing a custom serializer for Json. You should write a custom serializer, if
  * you are not happy with the default serialization done by Gson. You will also need to register
- * this serializer through {@link com.massivecraft.mcore2.lib.gson.GsonBuilder#registerTypeAdapter(Type, Object)}.
+ * this serializer through {@link com.massivecraft.mcore3.lib.gson.GsonBuilder#registerTypeAdapter(Type, Object)}.
  *
  * <p>Let us look at example where defining a serializer will be useful. The {@code Id} class
  * defined below has two fields: {@code clazz} and {@code value}.</p>
diff --git a/src/com/massivecraft/mcore2/lib/gson/JsonStreamParser.java b/src/com/massivecraft/mcore3/lib/gson/JsonStreamParser.java
similarity index 87%
rename from src/com/massivecraft/mcore2/lib/gson/JsonStreamParser.java
rename to src/com/massivecraft/mcore3/lib/gson/JsonStreamParser.java
index b490c36c..3e7b031d 100644
--- a/src/com/massivecraft/mcore2/lib/gson/JsonStreamParser.java
+++ b/src/com/massivecraft/mcore3/lib/gson/JsonStreamParser.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore2.lib.gson;
+package com.massivecraft.mcore3.lib.gson;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -22,14 +22,14 @@ import java.io.StringReader;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import com.massivecraft.mcore2.lib.gson.JsonElement;
-import com.massivecraft.mcore2.lib.gson.JsonIOException;
-import com.massivecraft.mcore2.lib.gson.JsonParseException;
-import com.massivecraft.mcore2.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore2.lib.gson.internal.Streams;
-import com.massivecraft.mcore2.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore2.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore2.lib.gson.stream.MalformedJsonException;
+import com.massivecraft.mcore3.lib.gson.JsonElement;
+import com.massivecraft.mcore3.lib.gson.JsonIOException;
+import com.massivecraft.mcore3.lib.gson.JsonParseException;
+import com.massivecraft.mcore3.lib.gson.JsonSyntaxException;
+import com.massivecraft.mcore3.lib.gson.internal.Streams;
+import com.massivecraft.mcore3.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore3.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore3.lib.gson.stream.MalformedJsonException;
 
 /**
  * A streaming parser that allows reading of multiple {@link JsonElement}s from the specified reader
diff --git a/src/com/massivecraft/mcore2/lib/gson/JsonSyntaxException.java b/src/com/massivecraft/mcore3/lib/gson/JsonSyntaxException.java
similarity index 93%
rename from src/com/massivecraft/mcore2/lib/gson/JsonSyntaxException.java
rename to src/com/massivecraft/mcore3/lib/gson/JsonSyntaxException.java
index b5612cb8..15f6b1d4 100644
--- a/src/com/massivecraft/mcore2/lib/gson/JsonSyntaxException.java
+++ b/src/com/massivecraft/mcore3/lib/gson/JsonSyntaxException.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore2.lib.gson;
+package com.massivecraft.mcore3.lib.gson;
 
-import com.massivecraft.mcore2.lib.gson.JsonParseException;
+import com.massivecraft.mcore3.lib.gson.JsonParseException;
 
 /**
  * This exception is raised when Gson attempts to read (or write) a malformed
diff --git a/src/com/massivecraft/mcore2/lib/gson/LongSerializationPolicy.java b/src/com/massivecraft/mcore3/lib/gson/LongSerializationPolicy.java
similarity index 92%
rename from src/com/massivecraft/mcore2/lib/gson/LongSerializationPolicy.java
rename to src/com/massivecraft/mcore3/lib/gson/LongSerializationPolicy.java
index 9a8d4342..c57cf196 100644
--- a/src/com/massivecraft/mcore2/lib/gson/LongSerializationPolicy.java
+++ b/src/com/massivecraft/mcore3/lib/gson/LongSerializationPolicy.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson;
+package com.massivecraft.mcore3.lib.gson;
 
-import com.massivecraft.mcore2.lib.gson.JsonElement;
-import com.massivecraft.mcore2.lib.gson.JsonPrimitive;
+import com.massivecraft.mcore3.lib.gson.JsonElement;
+import com.massivecraft.mcore3.lib.gson.JsonPrimitive;
 
 /**
  * Defines the expected format for a {@code long} or {@code Long} type when its serialized.
diff --git a/src/com/massivecraft/mcore2/lib/gson/TreeTypeAdapter.java b/src/com/massivecraft/mcore3/lib/gson/TreeTypeAdapter.java
similarity index 86%
rename from src/com/massivecraft/mcore2/lib/gson/TreeTypeAdapter.java
rename to src/com/massivecraft/mcore3/lib/gson/TreeTypeAdapter.java
index 1ea928fa..3d567c9e 100644
--- a/src/com/massivecraft/mcore2/lib/gson/TreeTypeAdapter.java
+++ b/src/com/massivecraft/mcore3/lib/gson/TreeTypeAdapter.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson;
+package com.massivecraft.mcore3.lib.gson;
 
-import com.massivecraft.mcore2.lib.gson.Gson;
-import com.massivecraft.mcore2.lib.gson.JsonDeserializer;
-import com.massivecraft.mcore2.lib.gson.JsonElement;
-import com.massivecraft.mcore2.lib.gson.JsonSerializer;
-import com.massivecraft.mcore2.lib.gson.TreeTypeAdapter;
-import com.massivecraft.mcore2.lib.gson.TypeAdapter;
-import com.massivecraft.mcore2.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore2.lib.gson.internal.$Gson$Preconditions;
-import com.massivecraft.mcore2.lib.gson.internal.GsonInternalAccess;
-import com.massivecraft.mcore2.lib.gson.internal.Streams;
-import com.massivecraft.mcore2.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore2.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore2.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore3.lib.gson.Gson;
+import com.massivecraft.mcore3.lib.gson.JsonDeserializer;
+import com.massivecraft.mcore3.lib.gson.JsonElement;
+import com.massivecraft.mcore3.lib.gson.JsonSerializer;
+import com.massivecraft.mcore3.lib.gson.TreeTypeAdapter;
+import com.massivecraft.mcore3.lib.gson.TypeAdapter;
+import com.massivecraft.mcore3.lib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore3.lib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore3.lib.gson.internal.GsonInternalAccess;
+import com.massivecraft.mcore3.lib.gson.internal.Streams;
+import com.massivecraft.mcore3.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore3.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore3.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 
diff --git a/src/com/massivecraft/mcore2/lib/gson/TypeAdapter.java b/src/com/massivecraft/mcore3/lib/gson/TypeAdapter.java
similarity index 93%
rename from src/com/massivecraft/mcore2/lib/gson/TypeAdapter.java
rename to src/com/massivecraft/mcore3/lib/gson/TypeAdapter.java
index 804f29af..011b005c 100644
--- a/src/com/massivecraft/mcore2/lib/gson/TypeAdapter.java
+++ b/src/com/massivecraft/mcore3/lib/gson/TypeAdapter.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson;
+package com.massivecraft.mcore3.lib.gson;
 
-import com.massivecraft.mcore2.lib.gson.Gson;
-import com.massivecraft.mcore2.lib.gson.GsonBuilder;
-import com.massivecraft.mcore2.lib.gson.JsonElement;
-import com.massivecraft.mcore2.lib.gson.JsonIOException;
-import com.massivecraft.mcore2.lib.gson.JsonNull;
-import com.massivecraft.mcore2.lib.gson.TypeAdapter;
-import com.massivecraft.mcore2.lib.gson.internal.bind.JsonTreeReader;
-import com.massivecraft.mcore2.lib.gson.internal.bind.JsonTreeWriter;
-import com.massivecraft.mcore2.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore2.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore2.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore3.lib.gson.Gson;
+import com.massivecraft.mcore3.lib.gson.GsonBuilder;
+import com.massivecraft.mcore3.lib.gson.JsonElement;
+import com.massivecraft.mcore3.lib.gson.JsonIOException;
+import com.massivecraft.mcore3.lib.gson.JsonNull;
+import com.massivecraft.mcore3.lib.gson.TypeAdapter;
+import com.massivecraft.mcore3.lib.gson.internal.bind.JsonTreeReader;
+import com.massivecraft.mcore3.lib.gson.internal.bind.JsonTreeWriter;
+import com.massivecraft.mcore3.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore3.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore3.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.io.Reader;
@@ -138,7 +138,7 @@ public abstract class TypeAdapter<T> {
    * Unlike Gson's similar {@link Gson#toJson(JsonElement, Appendable) toJson}
    * method, this write is strict. Create a {@link
    * JsonWriter#setLenient(boolean) lenient} {@code JsonWriter} and call
-   * {@link #write(com.massivecraft.mcore2.lib.gson.stream.JsonWriter, Object)} for lenient
+   * {@link #write(com.massivecraft.mcore3.lib.gson.stream.JsonWriter, Object)} for lenient
    * writing.
    *
    * @param value the Java object to convert. May be null.
@@ -211,7 +211,7 @@ public abstract class TypeAdapter<T> {
    * Converts {@code value} to a JSON document. Unlike Gson's similar {@link
    * Gson#toJson(Object) toJson} method, this write is strict. Create a {@link
    * JsonWriter#setLenient(boolean) lenient} {@code JsonWriter} and call
-   * {@link #write(com.massivecraft.mcore2.lib.gson.stream.JsonWriter, Object)} for lenient
+   * {@link #write(com.massivecraft.mcore3.lib.gson.stream.JsonWriter, Object)} for lenient
    * writing.
    *
    * @param value the Java object to convert. May be null.
diff --git a/src/com/massivecraft/mcore2/lib/gson/TypeAdapterFactory.java b/src/com/massivecraft/mcore3/lib/gson/TypeAdapterFactory.java
similarity index 96%
rename from src/com/massivecraft/mcore2/lib/gson/TypeAdapterFactory.java
rename to src/com/massivecraft/mcore3/lib/gson/TypeAdapterFactory.java
index 3c3478db..6ef4e56c 100644
--- a/src/com/massivecraft/mcore2/lib/gson/TypeAdapterFactory.java
+++ b/src/com/massivecraft/mcore3/lib/gson/TypeAdapterFactory.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson;
+package com.massivecraft.mcore3.lib.gson;
 
-import com.massivecraft.mcore2.lib.gson.Gson;
-import com.massivecraft.mcore2.lib.gson.TypeAdapter;
-import com.massivecraft.mcore2.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore3.lib.gson.Gson;
+import com.massivecraft.mcore3.lib.gson.TypeAdapter;
+import com.massivecraft.mcore3.lib.gson.reflect.TypeToken;
 
 /**
  * Creates type adapters for set of related types. Type adapter factories are
@@ -82,7 +82,7 @@ import com.massivecraft.mcore2.lib.gson.reflect.TypeToken;
  * mapping from lowercase name to enum value is computed eagerly.
  *
  * <p>As with type adapters, factories must be <i>registered</i> with a {@link
- * com.massivecraft.mcore2.lib.gson.GsonBuilder} for them to take effect: <pre>   {@code
+ * com.massivecraft.mcore3.lib.gson.GsonBuilder} for them to take effect: <pre>   {@code
  *
  *  GsonBuilder builder = new GsonBuilder();
  *  builder.registerTypeAdapterFactory(new LowercaseEnumTypeAdapterFactory());
diff --git a/src/com/massivecraft/mcore2/lib/gson/annotations/Expose.java b/src/com/massivecraft/mcore3/lib/gson/annotations/Expose.java
similarity index 93%
rename from src/com/massivecraft/mcore2/lib/gson/annotations/Expose.java
rename to src/com/massivecraft/mcore3/lib/gson/annotations/Expose.java
index 6f3c6291..78dbce03 100644
--- a/src/com/massivecraft/mcore2/lib/gson/annotations/Expose.java
+++ b/src/com/massivecraft/mcore3/lib/gson/annotations/Expose.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.annotations;
+package com.massivecraft.mcore3.lib.gson.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -25,9 +25,9 @@ import java.lang.annotation.Target;
  * An annotation that indicates this member should be exposed for JSON
  * serialization or deserialization.
  *
- * <p>This annotation has no effect unless you build {@link com.massivecraft.mcore2.lib.gson.Gson}
- * with a {@link com.massivecraft.mcore2.lib.gson.GsonBuilder} and invoke
- * {@link com.massivecraft.mcore2.lib.gson.GsonBuilder#excludeFieldsWithoutExposeAnnotation()}
+ * <p>This annotation has no effect unless you build {@link com.massivecraft.mcore3.lib.gson.Gson}
+ * with a {@link com.massivecraft.mcore3.lib.gson.GsonBuilder} and invoke
+ * {@link com.massivecraft.mcore3.lib.gson.GsonBuilder#excludeFieldsWithoutExposeAnnotation()}
  * method.</p>
  *
  * <p>Here is an example of how this annotation is meant to be used:
diff --git a/src/com/massivecraft/mcore2/lib/gson/annotations/SerializedName.java b/src/com/massivecraft/mcore3/lib/gson/annotations/SerializedName.java
similarity index 87%
rename from src/com/massivecraft/mcore2/lib/gson/annotations/SerializedName.java
rename to src/com/massivecraft/mcore3/lib/gson/annotations/SerializedName.java
index b8c1ee6f..695cbdf0 100644
--- a/src/com/massivecraft/mcore2/lib/gson/annotations/SerializedName.java
+++ b/src/com/massivecraft/mcore3/lib/gson/annotations/SerializedName.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.annotations;
+package com.massivecraft.mcore3.lib.gson.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -25,10 +25,10 @@ import java.lang.annotation.Target;
  * An annotation that indicates this member should be serialized to JSON with
  * the provided name value as its field name.
  *
- * <p>This annotation will override any {@link com.massivecraft.mcore2.lib.gson.FieldNamingPolicy}, including
- * the default field naming policy, that may have been set on the {@link com.massivecraft.mcore2.lib.gson.Gson}
+ * <p>This annotation will override any {@link com.massivecraft.mcore3.lib.gson.FieldNamingPolicy}, including
+ * the default field naming policy, that may have been set on the {@link com.massivecraft.mcore3.lib.gson.Gson}
  * instance.  A different naming policy can set using the {@code GsonBuilder} class.  See
- * {@link com.massivecraft.mcore2.lib.gson.GsonBuilder#setFieldNamingPolicy(com.massivecraft.mcore2.lib.gson.FieldNamingPolicy)}
+ * {@link com.massivecraft.mcore3.lib.gson.GsonBuilder#setFieldNamingPolicy(com.massivecraft.mcore3.lib.gson.FieldNamingPolicy)}
  * for more information.</p>
  *
  * <p>Here is an example of how this annotation is meant to be used:</p>
@@ -58,7 +58,7 @@ import java.lang.annotation.Target;
  *
  * <p>NOTE: The value you specify in this annotation must be a valid JSON field name.</p>
  *
- * @see com.massivecraft.mcore2.lib.gson.FieldNamingPolicy
+ * @see com.massivecraft.mcore3.lib.gson.FieldNamingPolicy
  *
  * @author Inderjeet Singh
  * @author Joel Leitch
diff --git a/src/com/massivecraft/mcore2/lib/gson/annotations/Since.java b/src/com/massivecraft/mcore3/lib/gson/annotations/Since.java
similarity index 90%
rename from src/com/massivecraft/mcore2/lib/gson/annotations/Since.java
rename to src/com/massivecraft/mcore3/lib/gson/annotations/Since.java
index e2069281..38da9ba0 100644
--- a/src/com/massivecraft/mcore2/lib/gson/annotations/Since.java
+++ b/src/com/massivecraft/mcore3/lib/gson/annotations/Since.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.annotations;
+package com.massivecraft.mcore3.lib.gson.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -26,9 +26,9 @@ import java.lang.annotation.Target;
  * This annotation is useful to manage versioning of your Json classes for a web-service.
  *
  * <p>
- * This annotation has no effect unless you build {@link com.massivecraft.mcore2.lib.gson.Gson} with a
- * {@link com.massivecraft.mcore2.lib.gson.GsonBuilder} and invoke
- * {@link com.massivecraft.mcore2.lib.gson.GsonBuilder#setVersion(double)} method.
+ * This annotation has no effect unless you build {@link com.massivecraft.mcore3.lib.gson.Gson} with a
+ * {@link com.massivecraft.mcore3.lib.gson.GsonBuilder} and invoke
+ * {@link com.massivecraft.mcore3.lib.gson.GsonBuilder#setVersion(double)} method.
  *
  * <p>Here is an example of how this annotation is meant to be used:</p>
  * <pre>
diff --git a/src/com/massivecraft/mcore2/lib/gson/annotations/Until.java b/src/com/massivecraft/mcore3/lib/gson/annotations/Until.java
similarity index 91%
rename from src/com/massivecraft/mcore2/lib/gson/annotations/Until.java
rename to src/com/massivecraft/mcore3/lib/gson/annotations/Until.java
index 94c4c1b0..da60015a 100644
--- a/src/com/massivecraft/mcore2/lib/gson/annotations/Until.java
+++ b/src/com/massivecraft/mcore3/lib/gson/annotations/Until.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.annotations;
+package com.massivecraft.mcore3.lib.gson.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -28,9 +28,9 @@ import java.lang.annotation.Target;
  * is useful to manage versioning of your JSON classes for a web-service.
  *
  * <p>
- * This annotation has no effect unless you build {@link com.massivecraft.mcore2.lib.gson.Gson} with a
- * {@link com.massivecraft.mcore2.lib.gson.GsonBuilder} and invoke
- * {@link com.massivecraft.mcore2.lib.gson.GsonBuilder#setVersion(double)} method.
+ * This annotation has no effect unless you build {@link com.massivecraft.mcore3.lib.gson.Gson} with a
+ * {@link com.massivecraft.mcore3.lib.gson.GsonBuilder} and invoke
+ * {@link com.massivecraft.mcore3.lib.gson.GsonBuilder#setVersion(double)} method.
  *
  * <p>Here is an example of how this annotation is meant to be used:</p>
  * <pre>
diff --git a/src/com/massivecraft/mcore2/lib/gson/annotations/package-info.java b/src/com/massivecraft/mcore3/lib/gson/annotations/package-info.java
similarity index 54%
rename from src/com/massivecraft/mcore2/lib/gson/annotations/package-info.java
rename to src/com/massivecraft/mcore3/lib/gson/annotations/package-info.java
index b897acca..388f6fcd 100644
--- a/src/com/massivecraft/mcore2/lib/gson/annotations/package-info.java
+++ b/src/com/massivecraft/mcore3/lib/gson/annotations/package-info.java
@@ -1,6 +1,6 @@
 /**
- * This package provides annotations that can be used with {@link com.massivecraft.mcore2.lib.gson.Gson}.
+ * This package provides annotations that can be used with {@link com.massivecraft.mcore3.lib.gson.Gson}.
  * 
  * @author Inderjeet Singh, Joel Leitch
  */
-package com.massivecraft.mcore2.lib.gson.annotations;
\ No newline at end of file
+package com.massivecraft.mcore3.lib.gson.annotations;
\ No newline at end of file
diff --git a/src/com/massivecraft/mcore2/lib/gson/internal/$Gson$Preconditions.java b/src/com/massivecraft/mcore3/lib/gson/internal/$Gson$Preconditions.java
similarity index 92%
rename from src/com/massivecraft/mcore2/lib/gson/internal/$Gson$Preconditions.java
rename to src/com/massivecraft/mcore3/lib/gson/internal/$Gson$Preconditions.java
index e61474ab..3d733453 100644
--- a/src/com/massivecraft/mcore2/lib/gson/internal/$Gson$Preconditions.java
+++ b/src/com/massivecraft/mcore3/lib/gson/internal/$Gson$Preconditions.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.internal;
+package com.massivecraft.mcore3.lib.gson.internal;
 
 /**
  * A simple utility class used to check method Preconditions.
diff --git a/src/com/massivecraft/mcore2/lib/gson/internal/$Gson$Types.java b/src/com/massivecraft/mcore3/lib/gson/internal/$Gson$Types.java
similarity index 99%
rename from src/com/massivecraft/mcore2/lib/gson/internal/$Gson$Types.java
rename to src/com/massivecraft/mcore3/lib/gson/internal/$Gson$Types.java
index f0b7ba7c..bc004b5e 100644
--- a/src/com/massivecraft/mcore2/lib/gson/internal/$Gson$Types.java
+++ b/src/com/massivecraft/mcore3/lib/gson/internal/$Gson$Types.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.internal;
+package com.massivecraft.mcore3.lib.gson.internal;
 
-import static com.massivecraft.mcore2.lib.gson.internal.$Gson$Preconditions.checkArgument;
-import static com.massivecraft.mcore2.lib.gson.internal.$Gson$Preconditions.checkNotNull;
+import static com.massivecraft.mcore3.lib.gson.internal.$Gson$Preconditions.checkArgument;
+import static com.massivecraft.mcore3.lib.gson.internal.$Gson$Preconditions.checkNotNull;
 
 import java.io.Serializable;
 import java.lang.reflect.Array;
diff --git a/src/com/massivecraft/mcore2/lib/gson/internal/ConstructorConstructor.java b/src/com/massivecraft/mcore3/lib/gson/internal/ConstructorConstructor.java
similarity index 95%
rename from src/com/massivecraft/mcore2/lib/gson/internal/ConstructorConstructor.java
rename to src/com/massivecraft/mcore3/lib/gson/internal/ConstructorConstructor.java
index 57d3c34b..10106c5e 100644
--- a/src/com/massivecraft/mcore2/lib/gson/internal/ConstructorConstructor.java
+++ b/src/com/massivecraft/mcore3/lib/gson/internal/ConstructorConstructor.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.internal;
+package com.massivecraft.mcore3.lib.gson.internal;
 
-import com.massivecraft.mcore2.lib.gson.internal.ObjectConstructor;
-import com.massivecraft.mcore2.lib.gson.internal.UnsafeAllocator;
-import com.massivecraft.mcore2.lib.gson.InstanceCreator;
-import com.massivecraft.mcore2.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore3.lib.gson.InstanceCreator;
+import com.massivecraft.mcore3.lib.gson.internal.ObjectConstructor;
+import com.massivecraft.mcore3.lib.gson.internal.UnsafeAllocator;
+import com.massivecraft.mcore3.lib.gson.reflect.TypeToken;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/com/massivecraft/mcore2/lib/gson/internal/Excluder.java b/src/com/massivecraft/mcore3/lib/gson/internal/Excluder.java
similarity index 89%
rename from src/com/massivecraft/mcore2/lib/gson/internal/Excluder.java
rename to src/com/massivecraft/mcore3/lib/gson/internal/Excluder.java
index 9006b939..145cdd58 100644
--- a/src/com/massivecraft/mcore2/lib/gson/internal/Excluder.java
+++ b/src/com/massivecraft/mcore3/lib/gson/internal/Excluder.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.internal;
+package com.massivecraft.mcore3.lib.gson.internal;
 
-import com.massivecraft.mcore2.lib.gson.internal.Excluder;
-import com.massivecraft.mcore2.lib.gson.internal.GsonInternalAccess;
-import com.massivecraft.mcore2.lib.gson.ExclusionStrategy;
-import com.massivecraft.mcore2.lib.gson.FieldAttributes;
-import com.massivecraft.mcore2.lib.gson.Gson;
-import com.massivecraft.mcore2.lib.gson.TypeAdapter;
-import com.massivecraft.mcore2.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore2.lib.gson.annotations.Expose;
-import com.massivecraft.mcore2.lib.gson.annotations.Since;
-import com.massivecraft.mcore2.lib.gson.annotations.Until;
-import com.massivecraft.mcore2.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore2.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore2.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore3.lib.gson.ExclusionStrategy;
+import com.massivecraft.mcore3.lib.gson.FieldAttributes;
+import com.massivecraft.mcore3.lib.gson.Gson;
+import com.massivecraft.mcore3.lib.gson.TypeAdapter;
+import com.massivecraft.mcore3.lib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore3.lib.gson.annotations.Expose;
+import com.massivecraft.mcore3.lib.gson.annotations.Since;
+import com.massivecraft.mcore3.lib.gson.annotations.Until;
+import com.massivecraft.mcore3.lib.gson.internal.Excluder;
+import com.massivecraft.mcore3.lib.gson.internal.GsonInternalAccess;
+import com.massivecraft.mcore3.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore3.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore3.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
diff --git a/src/com/massivecraft/mcore2/lib/gson/internal/GsonInternalAccess.java b/src/com/massivecraft/mcore3/lib/gson/internal/GsonInternalAccess.java
similarity index 77%
rename from src/com/massivecraft/mcore2/lib/gson/internal/GsonInternalAccess.java
rename to src/com/massivecraft/mcore3/lib/gson/internal/GsonInternalAccess.java
index 6cdc4f83..0e63eac6 100644
--- a/src/com/massivecraft/mcore2/lib/gson/internal/GsonInternalAccess.java
+++ b/src/com/massivecraft/mcore3/lib/gson/internal/GsonInternalAccess.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.internal;
+package com.massivecraft.mcore3.lib.gson.internal;
 
-import com.massivecraft.mcore2.lib.gson.internal.GsonInternalAccess;
-import com.massivecraft.mcore2.lib.gson.Gson;
-import com.massivecraft.mcore2.lib.gson.TypeAdapter;
-import com.massivecraft.mcore2.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore2.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore3.lib.gson.Gson;
+import com.massivecraft.mcore3.lib.gson.TypeAdapter;
+import com.massivecraft.mcore3.lib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore3.lib.gson.internal.GsonInternalAccess;
+import com.massivecraft.mcore3.lib.gson.reflect.TypeToken;
 
 /**
  * Internal-only APIs of Gson available only to other classes in Gson.
diff --git a/src/com/massivecraft/mcore2/lib/gson/internal/JsonReaderInternalAccess.java b/src/com/massivecraft/mcore3/lib/gson/internal/JsonReaderInternalAccess.java
similarity index 85%
rename from src/com/massivecraft/mcore2/lib/gson/internal/JsonReaderInternalAccess.java
rename to src/com/massivecraft/mcore3/lib/gson/internal/JsonReaderInternalAccess.java
index 84dda13b..4b131a4f 100644
--- a/src/com/massivecraft/mcore2/lib/gson/internal/JsonReaderInternalAccess.java
+++ b/src/com/massivecraft/mcore3/lib/gson/internal/JsonReaderInternalAccess.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.internal;
+package com.massivecraft.mcore3.lib.gson.internal;
 
-import com.massivecraft.mcore2.lib.gson.internal.JsonReaderInternalAccess;
-import com.massivecraft.mcore2.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore3.lib.gson.internal.JsonReaderInternalAccess;
+import com.massivecraft.mcore3.lib.gson.stream.JsonReader;
 
 import java.io.IOException;
 
diff --git a/src/com/massivecraft/mcore2/lib/gson/internal/LazilyParsedNumber.java b/src/com/massivecraft/mcore3/lib/gson/internal/LazilyParsedNumber.java
similarity index 97%
rename from src/com/massivecraft/mcore2/lib/gson/internal/LazilyParsedNumber.java
rename to src/com/massivecraft/mcore3/lib/gson/internal/LazilyParsedNumber.java
index f7112853..3b102998 100644
--- a/src/com/massivecraft/mcore2/lib/gson/internal/LazilyParsedNumber.java
+++ b/src/com/massivecraft/mcore3/lib/gson/internal/LazilyParsedNumber.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore2.lib.gson.internal;
+package com.massivecraft.mcore3.lib.gson.internal;
 
 import java.math.BigInteger;
 
diff --git a/src/com/massivecraft/mcore2/lib/gson/internal/ObjectConstructor.java b/src/com/massivecraft/mcore3/lib/gson/internal/ObjectConstructor.java
similarity index 95%
rename from src/com/massivecraft/mcore2/lib/gson/internal/ObjectConstructor.java
rename to src/com/massivecraft/mcore3/lib/gson/internal/ObjectConstructor.java
index f5a152b9..634cf1d5 100644
--- a/src/com/massivecraft/mcore2/lib/gson/internal/ObjectConstructor.java
+++ b/src/com/massivecraft/mcore3/lib/gson/internal/ObjectConstructor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.internal;
+package com.massivecraft.mcore3.lib.gson.internal;
 
 /**
  * Defines a generic object construction factory.  The purpose of this class
diff --git a/src/com/massivecraft/mcore2/lib/gson/internal/Pair.java b/src/com/massivecraft/mcore3/lib/gson/internal/Pair.java
similarity index 93%
rename from src/com/massivecraft/mcore2/lib/gson/internal/Pair.java
rename to src/com/massivecraft/mcore3/lib/gson/internal/Pair.java
index f677e53f..d95c658f 100644
--- a/src/com/massivecraft/mcore2/lib/gson/internal/Pair.java
+++ b/src/com/massivecraft/mcore3/lib/gson/internal/Pair.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.internal;
+package com.massivecraft.mcore3.lib.gson.internal;
 
-import com.massivecraft.mcore2.lib.gson.internal.Pair;
+import com.massivecraft.mcore3.lib.gson.internal.Pair;
 
 /**
  * A simple object that holds onto a pair of object references, first and second.
diff --git a/src/com/massivecraft/mcore2/lib/gson/internal/Primitives.java b/src/com/massivecraft/mcore3/lib/gson/internal/Primitives.java
similarity index 97%
rename from src/com/massivecraft/mcore2/lib/gson/internal/Primitives.java
rename to src/com/massivecraft/mcore3/lib/gson/internal/Primitives.java
index 58951cad..c1ee203b 100644
--- a/src/com/massivecraft/mcore2/lib/gson/internal/Primitives.java
+++ b/src/com/massivecraft/mcore3/lib/gson/internal/Primitives.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.internal;
+package com.massivecraft.mcore3.lib.gson.internal;
 
 
-import com.massivecraft.mcore2.lib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore3.lib.gson.internal.$Gson$Preconditions;
 
 import java.lang.reflect.Type;
 import java.util.Collections;
diff --git a/src/com/massivecraft/mcore2/lib/gson/internal/Streams.java b/src/com/massivecraft/mcore3/lib/gson/internal/Streams.java
similarity index 84%
rename from src/com/massivecraft/mcore2/lib/gson/internal/Streams.java
rename to src/com/massivecraft/mcore3/lib/gson/internal/Streams.java
index 9bc9594c..f0040e4a 100644
--- a/src/com/massivecraft/mcore2/lib/gson/internal/Streams.java
+++ b/src/com/massivecraft/mcore3/lib/gson/internal/Streams.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.internal;
+package com.massivecraft.mcore3.lib.gson.internal;
 
-import com.massivecraft.mcore2.lib.gson.JsonElement;
-import com.massivecraft.mcore2.lib.gson.JsonIOException;
-import com.massivecraft.mcore2.lib.gson.JsonNull;
-import com.massivecraft.mcore2.lib.gson.JsonParseException;
-import com.massivecraft.mcore2.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore2.lib.gson.internal.bind.TypeAdapters;
-import com.massivecraft.mcore2.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore2.lib.gson.stream.JsonWriter;
-import com.massivecraft.mcore2.lib.gson.stream.MalformedJsonException;
+import com.massivecraft.mcore3.lib.gson.JsonElement;
+import com.massivecraft.mcore3.lib.gson.JsonIOException;
+import com.massivecraft.mcore3.lib.gson.JsonNull;
+import com.massivecraft.mcore3.lib.gson.JsonParseException;
+import com.massivecraft.mcore3.lib.gson.JsonSyntaxException;
+import com.massivecraft.mcore3.lib.gson.internal.bind.TypeAdapters;
+import com.massivecraft.mcore3.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore3.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore3.lib.gson.stream.MalformedJsonException;
 
 import java.io.EOFException;
 import java.io.IOException;
diff --git a/src/com/massivecraft/mcore2/lib/gson/internal/UnsafeAllocator.java b/src/com/massivecraft/mcore3/lib/gson/internal/UnsafeAllocator.java
similarity index 96%
rename from src/com/massivecraft/mcore2/lib/gson/internal/UnsafeAllocator.java
rename to src/com/massivecraft/mcore3/lib/gson/internal/UnsafeAllocator.java
index fa7ec894..09139825 100644
--- a/src/com/massivecraft/mcore2/lib/gson/internal/UnsafeAllocator.java
+++ b/src/com/massivecraft/mcore3/lib/gson/internal/UnsafeAllocator.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.internal;
+package com.massivecraft.mcore3.lib.gson.internal;
 
 import java.io.ObjectInputStream;
 import java.io.ObjectStreamClass;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
-import com.massivecraft.mcore2.lib.gson.internal.UnsafeAllocator;
+import com.massivecraft.mcore3.lib.gson.internal.UnsafeAllocator;
 
 /**
  * Do sneaky things to allocate objects without invoking their constructors.
diff --git a/src/com/massivecraft/mcore2/lib/gson/internal/bind/ArrayTypeAdapter.java b/src/com/massivecraft/mcore3/lib/gson/internal/bind/ArrayTypeAdapter.java
similarity index 81%
rename from src/com/massivecraft/mcore2/lib/gson/internal/bind/ArrayTypeAdapter.java
rename to src/com/massivecraft/mcore3/lib/gson/internal/bind/ArrayTypeAdapter.java
index 40938e83..99ff11f1 100644
--- a/src/com/massivecraft/mcore2/lib/gson/internal/bind/ArrayTypeAdapter.java
+++ b/src/com/massivecraft/mcore3/lib/gson/internal/bind/ArrayTypeAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.internal.bind;
+package com.massivecraft.mcore3.lib.gson.internal.bind;
 
 import java.io.IOException;
 import java.lang.reflect.Array;
@@ -23,16 +23,16 @@ import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.massivecraft.mcore2.lib.gson.internal.bind.ArrayTypeAdapter;
-import com.massivecraft.mcore2.lib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
-import com.massivecraft.mcore2.lib.gson.Gson;
-import com.massivecraft.mcore2.lib.gson.TypeAdapter;
-import com.massivecraft.mcore2.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore2.lib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore2.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore2.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore2.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore2.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore3.lib.gson.Gson;
+import com.massivecraft.mcore3.lib.gson.TypeAdapter;
+import com.massivecraft.mcore3.lib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore3.lib.gson.internal.$Gson$Types;
+import com.massivecraft.mcore3.lib.gson.internal.bind.ArrayTypeAdapter;
+import com.massivecraft.mcore3.lib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
+import com.massivecraft.mcore3.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore3.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore3.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore3.lib.gson.stream.JsonWriter;
 
 /**
  * Adapt an array of objects.
diff --git a/src/com/massivecraft/mcore2/lib/gson/internal/bind/BigDecimalTypeAdapter.java b/src/com/massivecraft/mcore3/lib/gson/internal/bind/BigDecimalTypeAdapter.java
similarity index 78%
rename from src/com/massivecraft/mcore2/lib/gson/internal/bind/BigDecimalTypeAdapter.java
rename to src/com/massivecraft/mcore3/lib/gson/internal/bind/BigDecimalTypeAdapter.java
index 494aead2..ac52faf4 100644
--- a/src/com/massivecraft/mcore2/lib/gson/internal/bind/BigDecimalTypeAdapter.java
+++ b/src/com/massivecraft/mcore3/lib/gson/internal/bind/BigDecimalTypeAdapter.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.internal.bind;
+package com.massivecraft.mcore3.lib.gson.internal.bind;
 
-import com.massivecraft.mcore2.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore2.lib.gson.TypeAdapter;
-import com.massivecraft.mcore2.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore2.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore2.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore3.lib.gson.JsonSyntaxException;
+import com.massivecraft.mcore3.lib.gson.TypeAdapter;
+import com.massivecraft.mcore3.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore3.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore3.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.math.BigDecimal;
diff --git a/src/com/massivecraft/mcore2/lib/gson/internal/bind/BigIntegerTypeAdapter.java b/src/com/massivecraft/mcore3/lib/gson/internal/bind/BigIntegerTypeAdapter.java
similarity index 78%
rename from src/com/massivecraft/mcore2/lib/gson/internal/bind/BigIntegerTypeAdapter.java
rename to src/com/massivecraft/mcore3/lib/gson/internal/bind/BigIntegerTypeAdapter.java
index 225c4e87..70dccc8a 100644
--- a/src/com/massivecraft/mcore2/lib/gson/internal/bind/BigIntegerTypeAdapter.java
+++ b/src/com/massivecraft/mcore3/lib/gson/internal/bind/BigIntegerTypeAdapter.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.internal.bind;
+package com.massivecraft.mcore3.lib.gson.internal.bind;
 
-import com.massivecraft.mcore2.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore2.lib.gson.TypeAdapter;
-import com.massivecraft.mcore2.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore2.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore2.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore3.lib.gson.JsonSyntaxException;
+import com.massivecraft.mcore3.lib.gson.TypeAdapter;
+import com.massivecraft.mcore3.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore3.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore3.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.math.BigInteger;
diff --git a/src/com/massivecraft/mcore2/lib/gson/internal/bind/CollectionTypeAdapterFactory.java b/src/com/massivecraft/mcore3/lib/gson/internal/bind/CollectionTypeAdapterFactory.java
similarity index 81%
rename from src/com/massivecraft/mcore2/lib/gson/internal/bind/CollectionTypeAdapterFactory.java
rename to src/com/massivecraft/mcore3/lib/gson/internal/bind/CollectionTypeAdapterFactory.java
index 25b13410..172eb73c 100644
--- a/src/com/massivecraft/mcore2/lib/gson/internal/bind/CollectionTypeAdapterFactory.java
+++ b/src/com/massivecraft/mcore3/lib/gson/internal/bind/CollectionTypeAdapterFactory.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.internal.bind;
+package com.massivecraft.mcore3.lib.gson.internal.bind;
 
-import com.massivecraft.mcore2.lib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
-import com.massivecraft.mcore2.lib.gson.Gson;
-import com.massivecraft.mcore2.lib.gson.TypeAdapter;
-import com.massivecraft.mcore2.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore2.lib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore2.lib.gson.internal.ConstructorConstructor;
-import com.massivecraft.mcore2.lib.gson.internal.ObjectConstructor;
-import com.massivecraft.mcore2.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore2.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore2.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore2.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore3.lib.gson.Gson;
+import com.massivecraft.mcore3.lib.gson.TypeAdapter;
+import com.massivecraft.mcore3.lib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore3.lib.gson.internal.$Gson$Types;
+import com.massivecraft.mcore3.lib.gson.internal.ConstructorConstructor;
+import com.massivecraft.mcore3.lib.gson.internal.ObjectConstructor;
+import com.massivecraft.mcore3.lib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
+import com.massivecraft.mcore3.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore3.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore3.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore3.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
diff --git a/src/com/massivecraft/mcore2/lib/gson/internal/bind/DateTypeAdapter.java b/src/com/massivecraft/mcore3/lib/gson/internal/bind/DateTypeAdapter.java
similarity index 83%
rename from src/com/massivecraft/mcore2/lib/gson/internal/bind/DateTypeAdapter.java
rename to src/com/massivecraft/mcore3/lib/gson/internal/bind/DateTypeAdapter.java
index 9d1161c7..d2949542 100644
--- a/src/com/massivecraft/mcore2/lib/gson/internal/bind/DateTypeAdapter.java
+++ b/src/com/massivecraft/mcore3/lib/gson/internal/bind/DateTypeAdapter.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.internal.bind;
+package com.massivecraft.mcore3.lib.gson.internal.bind;
 
-import com.massivecraft.mcore2.lib.gson.internal.bind.DateTypeAdapter;
-import com.massivecraft.mcore2.lib.gson.Gson;
-import com.massivecraft.mcore2.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore2.lib.gson.TypeAdapter;
-import com.massivecraft.mcore2.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore2.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore2.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore2.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore2.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore3.lib.gson.Gson;
+import com.massivecraft.mcore3.lib.gson.JsonSyntaxException;
+import com.massivecraft.mcore3.lib.gson.TypeAdapter;
+import com.massivecraft.mcore3.lib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore3.lib.gson.internal.bind.DateTypeAdapter;
+import com.massivecraft.mcore3.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore3.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore3.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore3.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.text.DateFormat;
diff --git a/src/com/massivecraft/mcore2/lib/gson/internal/bind/JsonTreeReader.java b/src/com/massivecraft/mcore3/lib/gson/internal/bind/JsonTreeReader.java
similarity index 93%
rename from src/com/massivecraft/mcore2/lib/gson/internal/bind/JsonTreeReader.java
rename to src/com/massivecraft/mcore3/lib/gson/internal/bind/JsonTreeReader.java
index df5346a8..d0bd9174 100644
--- a/src/com/massivecraft/mcore2/lib/gson/internal/bind/JsonTreeReader.java
+++ b/src/com/massivecraft/mcore3/lib/gson/internal/bind/JsonTreeReader.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.internal.bind;
+package com.massivecraft.mcore3.lib.gson.internal.bind;
 
-import com.massivecraft.mcore2.lib.gson.JsonArray;
-import com.massivecraft.mcore2.lib.gson.JsonElement;
-import com.massivecraft.mcore2.lib.gson.JsonNull;
-import com.massivecraft.mcore2.lib.gson.JsonObject;
-import com.massivecraft.mcore2.lib.gson.JsonPrimitive;
-import com.massivecraft.mcore2.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore2.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore3.lib.gson.JsonArray;
+import com.massivecraft.mcore3.lib.gson.JsonElement;
+import com.massivecraft.mcore3.lib.gson.JsonNull;
+import com.massivecraft.mcore3.lib.gson.JsonObject;
+import com.massivecraft.mcore3.lib.gson.JsonPrimitive;
+import com.massivecraft.mcore3.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore3.lib.gson.stream.JsonToken;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/src/com/massivecraft/mcore2/lib/gson/internal/bind/JsonTreeWriter.java b/src/com/massivecraft/mcore3/lib/gson/internal/bind/JsonTreeWriter.java
similarity index 93%
rename from src/com/massivecraft/mcore2/lib/gson/internal/bind/JsonTreeWriter.java
rename to src/com/massivecraft/mcore3/lib/gson/internal/bind/JsonTreeWriter.java
index 3f50507e..240c7e3b 100644
--- a/src/com/massivecraft/mcore2/lib/gson/internal/bind/JsonTreeWriter.java
+++ b/src/com/massivecraft/mcore3/lib/gson/internal/bind/JsonTreeWriter.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.internal.bind;
+package com.massivecraft.mcore3.lib.gson.internal.bind;
 
-import com.massivecraft.mcore2.lib.gson.JsonArray;
-import com.massivecraft.mcore2.lib.gson.JsonElement;
-import com.massivecraft.mcore2.lib.gson.JsonNull;
-import com.massivecraft.mcore2.lib.gson.JsonObject;
-import com.massivecraft.mcore2.lib.gson.JsonPrimitive;
-import com.massivecraft.mcore2.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore3.lib.gson.JsonArray;
+import com.massivecraft.mcore3.lib.gson.JsonElement;
+import com.massivecraft.mcore3.lib.gson.JsonNull;
+import com.massivecraft.mcore3.lib.gson.JsonObject;
+import com.massivecraft.mcore3.lib.gson.JsonPrimitive;
+import com.massivecraft.mcore3.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/src/com/massivecraft/mcore2/lib/gson/internal/bind/MapTypeAdapterFactory.java b/src/com/massivecraft/mcore3/lib/gson/internal/bind/MapTypeAdapterFactory.java
similarity index 88%
rename from src/com/massivecraft/mcore2/lib/gson/internal/bind/MapTypeAdapterFactory.java
rename to src/com/massivecraft/mcore3/lib/gson/internal/bind/MapTypeAdapterFactory.java
index 6cbbd0f3..ce50ced7 100644
--- a/src/com/massivecraft/mcore2/lib/gson/internal/bind/MapTypeAdapterFactory.java
+++ b/src/com/massivecraft/mcore3/lib/gson/internal/bind/MapTypeAdapterFactory.java
@@ -14,27 +14,27 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.internal.bind;
+package com.massivecraft.mcore3.lib.gson.internal.bind;
 
-import com.massivecraft.mcore2.lib.gson.internal.bind.JsonTreeWriter;
-import com.massivecraft.mcore2.lib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
-import com.massivecraft.mcore2.lib.gson.internal.bind.TypeAdapters;
-import com.massivecraft.mcore2.lib.gson.Gson;
-import com.massivecraft.mcore2.lib.gson.JsonElement;
-import com.massivecraft.mcore2.lib.gson.JsonIOException;
-import com.massivecraft.mcore2.lib.gson.JsonPrimitive;
-import com.massivecraft.mcore2.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore2.lib.gson.TypeAdapter;
-import com.massivecraft.mcore2.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore2.lib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore2.lib.gson.internal.ConstructorConstructor;
-import com.massivecraft.mcore2.lib.gson.internal.JsonReaderInternalAccess;
-import com.massivecraft.mcore2.lib.gson.internal.ObjectConstructor;
-import com.massivecraft.mcore2.lib.gson.internal.Streams;
-import com.massivecraft.mcore2.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore2.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore2.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore2.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore3.lib.gson.Gson;
+import com.massivecraft.mcore3.lib.gson.JsonElement;
+import com.massivecraft.mcore3.lib.gson.JsonIOException;
+import com.massivecraft.mcore3.lib.gson.JsonPrimitive;
+import com.massivecraft.mcore3.lib.gson.JsonSyntaxException;
+import com.massivecraft.mcore3.lib.gson.TypeAdapter;
+import com.massivecraft.mcore3.lib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore3.lib.gson.internal.$Gson$Types;
+import com.massivecraft.mcore3.lib.gson.internal.ConstructorConstructor;
+import com.massivecraft.mcore3.lib.gson.internal.JsonReaderInternalAccess;
+import com.massivecraft.mcore3.lib.gson.internal.ObjectConstructor;
+import com.massivecraft.mcore3.lib.gson.internal.Streams;
+import com.massivecraft.mcore3.lib.gson.internal.bind.JsonTreeWriter;
+import com.massivecraft.mcore3.lib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
+import com.massivecraft.mcore3.lib.gson.internal.bind.TypeAdapters;
+import com.massivecraft.mcore3.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore3.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore3.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore3.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
diff --git a/src/com/massivecraft/mcore2/lib/gson/internal/bind/ObjectTypeAdapter.java b/src/com/massivecraft/mcore3/lib/gson/internal/bind/ObjectTypeAdapter.java
similarity index 83%
rename from src/com/massivecraft/mcore2/lib/gson/internal/bind/ObjectTypeAdapter.java
rename to src/com/massivecraft/mcore3/lib/gson/internal/bind/ObjectTypeAdapter.java
index ab124267..f103c70a 100644
--- a/src/com/massivecraft/mcore2/lib/gson/internal/bind/ObjectTypeAdapter.java
+++ b/src/com/massivecraft/mcore3/lib/gson/internal/bind/ObjectTypeAdapter.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.internal.bind;
+package com.massivecraft.mcore3.lib.gson.internal.bind;
 
-import com.massivecraft.mcore2.lib.gson.internal.bind.ObjectTypeAdapter;
-import com.massivecraft.mcore2.lib.gson.Gson;
-import com.massivecraft.mcore2.lib.gson.TypeAdapter;
-import com.massivecraft.mcore2.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore2.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore2.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore2.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore2.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore3.lib.gson.Gson;
+import com.massivecraft.mcore3.lib.gson.TypeAdapter;
+import com.massivecraft.mcore3.lib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore3.lib.gson.internal.bind.ObjectTypeAdapter;
+import com.massivecraft.mcore3.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore3.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore3.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore3.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/src/com/massivecraft/mcore2/lib/gson/internal/bind/ReflectiveTypeAdapterFactory.java b/src/com/massivecraft/mcore3/lib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
similarity index 86%
rename from src/com/massivecraft/mcore2/lib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
rename to src/com/massivecraft/mcore3/lib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
index 853f3c70..0a4006c8 100644
--- a/src/com/massivecraft/mcore2/lib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
+++ b/src/com/massivecraft/mcore3/lib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.internal.bind;
+package com.massivecraft.mcore3.lib.gson.internal.bind;
 
-import com.massivecraft.mcore2.lib.gson.internal.bind.ReflectiveTypeAdapterFactory;
-import com.massivecraft.mcore2.lib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
-import com.massivecraft.mcore2.lib.gson.FieldNamingStrategy;
-import com.massivecraft.mcore2.lib.gson.Gson;
-import com.massivecraft.mcore2.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore2.lib.gson.TypeAdapter;
-import com.massivecraft.mcore2.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore2.lib.gson.annotations.SerializedName;
-import com.massivecraft.mcore2.lib.gson.internal.$Gson$Types;
-import com.massivecraft.mcore2.lib.gson.internal.ConstructorConstructor;
-import com.massivecraft.mcore2.lib.gson.internal.Excluder;
-import com.massivecraft.mcore2.lib.gson.internal.ObjectConstructor;
-import com.massivecraft.mcore2.lib.gson.internal.Primitives;
-import com.massivecraft.mcore2.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore2.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore2.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore2.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore3.lib.gson.FieldNamingStrategy;
+import com.massivecraft.mcore3.lib.gson.Gson;
+import com.massivecraft.mcore3.lib.gson.JsonSyntaxException;
+import com.massivecraft.mcore3.lib.gson.TypeAdapter;
+import com.massivecraft.mcore3.lib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore3.lib.gson.annotations.SerializedName;
+import com.massivecraft.mcore3.lib.gson.internal.$Gson$Types;
+import com.massivecraft.mcore3.lib.gson.internal.ConstructorConstructor;
+import com.massivecraft.mcore3.lib.gson.internal.Excluder;
+import com.massivecraft.mcore3.lib.gson.internal.ObjectConstructor;
+import com.massivecraft.mcore3.lib.gson.internal.Primitives;
+import com.massivecraft.mcore3.lib.gson.internal.bind.ReflectiveTypeAdapterFactory;
+import com.massivecraft.mcore3.lib.gson.internal.bind.TypeAdapterRuntimeTypeWrapper;
+import com.massivecraft.mcore3.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore3.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore3.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore3.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
diff --git a/src/com/massivecraft/mcore2/lib/gson/internal/bind/SqlDateTypeAdapter.java b/src/com/massivecraft/mcore3/lib/gson/internal/bind/SqlDateTypeAdapter.java
similarity index 78%
rename from src/com/massivecraft/mcore2/lib/gson/internal/bind/SqlDateTypeAdapter.java
rename to src/com/massivecraft/mcore3/lib/gson/internal/bind/SqlDateTypeAdapter.java
index 2be7163a..e60fb5f5 100644
--- a/src/com/massivecraft/mcore2/lib/gson/internal/bind/SqlDateTypeAdapter.java
+++ b/src/com/massivecraft/mcore3/lib/gson/internal/bind/SqlDateTypeAdapter.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.internal.bind;
+package com.massivecraft.mcore3.lib.gson.internal.bind;
 
-import com.massivecraft.mcore2.lib.gson.internal.bind.SqlDateTypeAdapter;
-import com.massivecraft.mcore2.lib.gson.Gson;
-import com.massivecraft.mcore2.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore2.lib.gson.TypeAdapter;
-import com.massivecraft.mcore2.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore2.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore2.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore2.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore2.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore3.lib.gson.Gson;
+import com.massivecraft.mcore3.lib.gson.JsonSyntaxException;
+import com.massivecraft.mcore3.lib.gson.TypeAdapter;
+import com.massivecraft.mcore3.lib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore3.lib.gson.internal.bind.SqlDateTypeAdapter;
+import com.massivecraft.mcore3.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore3.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore3.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore3.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.text.DateFormat;
diff --git a/src/com/massivecraft/mcore2/lib/gson/internal/bind/TimeTypeAdapter.java b/src/com/massivecraft/mcore3/lib/gson/internal/bind/TimeTypeAdapter.java
similarity index 78%
rename from src/com/massivecraft/mcore2/lib/gson/internal/bind/TimeTypeAdapter.java
rename to src/com/massivecraft/mcore3/lib/gson/internal/bind/TimeTypeAdapter.java
index b0e65efe..83f5d65e 100644
--- a/src/com/massivecraft/mcore2/lib/gson/internal/bind/TimeTypeAdapter.java
+++ b/src/com/massivecraft/mcore3/lib/gson/internal/bind/TimeTypeAdapter.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.internal.bind;
+package com.massivecraft.mcore3.lib.gson.internal.bind;
 
-import com.massivecraft.mcore2.lib.gson.internal.bind.TimeTypeAdapter;
-import com.massivecraft.mcore2.lib.gson.Gson;
-import com.massivecraft.mcore2.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore2.lib.gson.TypeAdapter;
-import com.massivecraft.mcore2.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore2.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore2.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore2.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore2.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore3.lib.gson.Gson;
+import com.massivecraft.mcore3.lib.gson.JsonSyntaxException;
+import com.massivecraft.mcore3.lib.gson.TypeAdapter;
+import com.massivecraft.mcore3.lib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore3.lib.gson.internal.bind.TimeTypeAdapter;
+import com.massivecraft.mcore3.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore3.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore3.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore3.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.sql.Time;
diff --git a/src/com/massivecraft/mcore2/lib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java b/src/com/massivecraft/mcore3/lib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
similarity index 85%
rename from src/com/massivecraft/mcore2/lib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
rename to src/com/massivecraft/mcore3/lib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
index adf9a973..66cb52bd 100644
--- a/src/com/massivecraft/mcore2/lib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
+++ b/src/com/massivecraft/mcore3/lib/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.massivecraft.mcore2.lib.gson.internal.bind;
+package com.massivecraft.mcore3.lib.gson.internal.bind;
 
-import com.massivecraft.mcore2.lib.gson.internal.bind.ReflectiveTypeAdapterFactory;
-import com.massivecraft.mcore2.lib.gson.Gson;
-import com.massivecraft.mcore2.lib.gson.TypeAdapter;
-import com.massivecraft.mcore2.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore2.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore2.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore3.lib.gson.Gson;
+import com.massivecraft.mcore3.lib.gson.TypeAdapter;
+import com.massivecraft.mcore3.lib.gson.internal.bind.ReflectiveTypeAdapterFactory;
+import com.massivecraft.mcore3.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore3.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore3.lib.gson.stream.JsonWriter;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
diff --git a/src/com/massivecraft/mcore2/lib/gson/internal/bind/TypeAdapters.java b/src/com/massivecraft/mcore3/lib/gson/internal/bind/TypeAdapters.java
similarity index 96%
rename from src/com/massivecraft/mcore2/lib/gson/internal/bind/TypeAdapters.java
rename to src/com/massivecraft/mcore3/lib/gson/internal/bind/TypeAdapters.java
index 498980cd..30fa4d66 100644
--- a/src/com/massivecraft/mcore2/lib/gson/internal/bind/TypeAdapters.java
+++ b/src/com/massivecraft/mcore3/lib/gson/internal/bind/TypeAdapters.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.internal.bind;
+package com.massivecraft.mcore3.lib.gson.internal.bind;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -32,22 +32,22 @@ import java.util.Map;
 import java.util.StringTokenizer;
 import java.util.UUID;
 
-import com.massivecraft.mcore2.lib.gson.Gson;
-import com.massivecraft.mcore2.lib.gson.JsonArray;
-import com.massivecraft.mcore2.lib.gson.JsonElement;
-import com.massivecraft.mcore2.lib.gson.JsonIOException;
-import com.massivecraft.mcore2.lib.gson.JsonNull;
-import com.massivecraft.mcore2.lib.gson.JsonObject;
-import com.massivecraft.mcore2.lib.gson.JsonPrimitive;
-import com.massivecraft.mcore2.lib.gson.JsonSyntaxException;
-import com.massivecraft.mcore2.lib.gson.TypeAdapter;
-import com.massivecraft.mcore2.lib.gson.TypeAdapterFactory;
-import com.massivecraft.mcore2.lib.gson.annotations.SerializedName;
-import com.massivecraft.mcore2.lib.gson.internal.LazilyParsedNumber;
-import com.massivecraft.mcore2.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore2.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore2.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore2.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore3.lib.gson.Gson;
+import com.massivecraft.mcore3.lib.gson.JsonArray;
+import com.massivecraft.mcore3.lib.gson.JsonElement;
+import com.massivecraft.mcore3.lib.gson.JsonIOException;
+import com.massivecraft.mcore3.lib.gson.JsonNull;
+import com.massivecraft.mcore3.lib.gson.JsonObject;
+import com.massivecraft.mcore3.lib.gson.JsonPrimitive;
+import com.massivecraft.mcore3.lib.gson.JsonSyntaxException;
+import com.massivecraft.mcore3.lib.gson.TypeAdapter;
+import com.massivecraft.mcore3.lib.gson.TypeAdapterFactory;
+import com.massivecraft.mcore3.lib.gson.annotations.SerializedName;
+import com.massivecraft.mcore3.lib.gson.internal.LazilyParsedNumber;
+import com.massivecraft.mcore3.lib.gson.reflect.TypeToken;
+import com.massivecraft.mcore3.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore3.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore3.lib.gson.stream.JsonWriter;
 
 /**
  * Type adapters for basic types.
diff --git a/src/com/massivecraft/mcore2/lib/gson/internal/package-info.java b/src/com/massivecraft/mcore3/lib/gson/internal/package-info.java
similarity index 83%
rename from src/com/massivecraft/mcore2/lib/gson/internal/package-info.java
rename to src/com/massivecraft/mcore3/lib/gson/internal/package-info.java
index 8f19c411..0d147852 100644
--- a/src/com/massivecraft/mcore2/lib/gson/internal/package-info.java
+++ b/src/com/massivecraft/mcore3/lib/gson/internal/package-info.java
@@ -4,4 +4,4 @@
  *
  * @author Inderjeet Singh, Joel Leitch, Jesse Wilson
  */
-package com.massivecraft.mcore2.lib.gson.internal;
\ No newline at end of file
+package com.massivecraft.mcore3.lib.gson.internal;
\ No newline at end of file
diff --git a/src/com/massivecraft/mcore2/lib/gson/package-info.java b/src/com/massivecraft/mcore3/lib/gson/package-info.java
similarity index 57%
rename from src/com/massivecraft/mcore2/lib/gson/package-info.java
rename to src/com/massivecraft/mcore3/lib/gson/package-info.java
index b56db24e..80dc935e 100644
--- a/src/com/massivecraft/mcore2/lib/gson/package-info.java
+++ b/src/com/massivecraft/mcore3/lib/gson/package-info.java
@@ -1,11 +1,11 @@
 /**
- * This package provides the {@link com.massivecraft.mcore2.lib.gson.Gson} class to convert Json to Java and
+ * This package provides the {@link com.massivecraft.mcore3.lib.gson.Gson} class to convert Json to Java and
  * vice-versa.
  *
- * <p>The primary class to use is {@link com.massivecraft.mcore2.lib.gson.Gson} which can be constructed with
- * {@code new Gson()} (using default settings) or by using {@link com.massivecraft.mcore2.lib.gson.GsonBuilder}
+ * <p>The primary class to use is {@link com.massivecraft.mcore3.lib.gson.Gson} which can be constructed with
+ * {@code new Gson()} (using default settings) or by using {@link com.massivecraft.mcore3.lib.gson.GsonBuilder}
  * (to configure various options such as using versioning and so on).</p>
  *
  * @author Inderjeet Singh, Joel Leitch
  */
-package com.massivecraft.mcore2.lib.gson;
\ No newline at end of file
+package com.massivecraft.mcore3.lib.gson;
\ No newline at end of file
diff --git a/src/com/massivecraft/mcore2/lib/gson/reflect/TypeToken.java b/src/com/massivecraft/mcore3/lib/gson/reflect/TypeToken.java
similarity index 97%
rename from src/com/massivecraft/mcore2/lib/gson/reflect/TypeToken.java
rename to src/com/massivecraft/mcore3/lib/gson/reflect/TypeToken.java
index 1ee259ad..3779a354 100644
--- a/src/com/massivecraft/mcore2/lib/gson/reflect/TypeToken.java
+++ b/src/com/massivecraft/mcore3/lib/gson/reflect/TypeToken.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.reflect;
+package com.massivecraft.mcore3.lib.gson.reflect;
 
-import com.massivecraft.mcore2.lib.gson.reflect.TypeToken;
-import com.massivecraft.mcore2.lib.gson.internal.$Gson$Preconditions;
-import com.massivecraft.mcore2.lib.gson.internal.$Gson$Types;
+import com.massivecraft.mcore3.lib.gson.internal.$Gson$Preconditions;
+import com.massivecraft.mcore3.lib.gson.internal.$Gson$Types;
+import com.massivecraft.mcore3.lib.gson.reflect.TypeToken;
 
 import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.ParameterizedType;
diff --git a/src/com/massivecraft/mcore2/lib/gson/reflect/package-info.java b/src/com/massivecraft/mcore3/lib/gson/reflect/package-info.java
similarity index 74%
rename from src/com/massivecraft/mcore2/lib/gson/reflect/package-info.java
rename to src/com/massivecraft/mcore3/lib/gson/reflect/package-info.java
index 7b52a963..aab26e74 100644
--- a/src/com/massivecraft/mcore2/lib/gson/reflect/package-info.java
+++ b/src/com/massivecraft/mcore3/lib/gson/reflect/package-info.java
@@ -3,4 +3,4 @@
  *  
  * @author Inderjeet Singh, Joel Leitch
  */
-package com.massivecraft.mcore2.lib.gson.reflect;
\ No newline at end of file
+package com.massivecraft.mcore3.lib.gson.reflect;
\ No newline at end of file
diff --git a/src/com/massivecraft/mcore2/lib/gson/stream/JsonReader.java b/src/com/massivecraft/mcore3/lib/gson/stream/JsonReader.java
similarity index 98%
rename from src/com/massivecraft/mcore2/lib/gson/stream/JsonReader.java
rename to src/com/massivecraft/mcore3/lib/gson/stream/JsonReader.java
index 9f42ed75..c0d8a43d 100644
--- a/src/com/massivecraft/mcore2/lib/gson/stream/JsonReader.java
+++ b/src/com/massivecraft/mcore3/lib/gson/stream/JsonReader.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.stream;
+package com.massivecraft.mcore3.lib.gson.stream;
 
-import com.massivecraft.mcore2.lib.gson.stream.JsonReader;
-import com.massivecraft.mcore2.lib.gson.stream.JsonScope;
-import com.massivecraft.mcore2.lib.gson.stream.JsonToken;
-import com.massivecraft.mcore2.lib.gson.stream.MalformedJsonException;
-import com.massivecraft.mcore2.lib.gson.stream.StringPool;
-import com.massivecraft.mcore2.lib.gson.internal.JsonReaderInternalAccess;
-import com.massivecraft.mcore2.lib.gson.internal.bind.JsonTreeReader;
+import com.massivecraft.mcore3.lib.gson.internal.JsonReaderInternalAccess;
+import com.massivecraft.mcore3.lib.gson.internal.bind.JsonTreeReader;
+import com.massivecraft.mcore3.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore3.lib.gson.stream.JsonScope;
+import com.massivecraft.mcore3.lib.gson.stream.JsonToken;
+import com.massivecraft.mcore3.lib.gson.stream.MalformedJsonException;
+import com.massivecraft.mcore3.lib.gson.stream.StringPool;
 
 import java.io.Closeable;
 import java.io.EOFException;
diff --git a/src/com/massivecraft/mcore2/lib/gson/stream/JsonScope.java b/src/com/massivecraft/mcore3/lib/gson/stream/JsonScope.java
similarity index 97%
rename from src/com/massivecraft/mcore2/lib/gson/stream/JsonScope.java
rename to src/com/massivecraft/mcore3/lib/gson/stream/JsonScope.java
index 759695ad..3a866d17 100644
--- a/src/com/massivecraft/mcore2/lib/gson/stream/JsonScope.java
+++ b/src/com/massivecraft/mcore3/lib/gson/stream/JsonScope.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.stream;
+package com.massivecraft.mcore3.lib.gson.stream;
 
 /**
  * Lexical scoping elements within a JSON reader or writer.
diff --git a/src/com/massivecraft/mcore2/lib/gson/stream/JsonToken.java b/src/com/massivecraft/mcore3/lib/gson/stream/JsonToken.java
similarity index 97%
rename from src/com/massivecraft/mcore2/lib/gson/stream/JsonToken.java
rename to src/com/massivecraft/mcore3/lib/gson/stream/JsonToken.java
index e89931ab..9957015d 100644
--- a/src/com/massivecraft/mcore2/lib/gson/stream/JsonToken.java
+++ b/src/com/massivecraft/mcore3/lib/gson/stream/JsonToken.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.stream;
+package com.massivecraft.mcore3.lib.gson.stream;
 
 /**
  * A structure, name or value type in a JSON-encoded string.
diff --git a/src/com/massivecraft/mcore2/lib/gson/stream/JsonWriter.java b/src/com/massivecraft/mcore3/lib/gson/stream/JsonWriter.java
similarity index 99%
rename from src/com/massivecraft/mcore2/lib/gson/stream/JsonWriter.java
rename to src/com/massivecraft/mcore3/lib/gson/stream/JsonWriter.java
index d465ad42..7a1717f4 100644
--- a/src/com/massivecraft/mcore2/lib/gson/stream/JsonWriter.java
+++ b/src/com/massivecraft/mcore3/lib/gson/stream/JsonWriter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.stream;
+package com.massivecraft.mcore3.lib.gson.stream;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -22,8 +22,8 @@ import java.io.Writer;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.massivecraft.mcore2.lib.gson.stream.JsonScope;
-import com.massivecraft.mcore2.lib.gson.stream.JsonWriter;
+import com.massivecraft.mcore3.lib.gson.stream.JsonScope;
+import com.massivecraft.mcore3.lib.gson.stream.JsonWriter;
 
 /**
  * Writes a JSON (<a href="http://www.ietf.org/rfc/rfc4627.txt">RFC 4627</a>)
diff --git a/src/com/massivecraft/mcore2/lib/gson/stream/MalformedJsonException.java b/src/com/massivecraft/mcore3/lib/gson/stream/MalformedJsonException.java
similarity index 93%
rename from src/com/massivecraft/mcore2/lib/gson/stream/MalformedJsonException.java
rename to src/com/massivecraft/mcore3/lib/gson/stream/MalformedJsonException.java
index c6530043..e03d6c46 100644
--- a/src/com/massivecraft/mcore2/lib/gson/stream/MalformedJsonException.java
+++ b/src/com/massivecraft/mcore3/lib/gson/stream/MalformedJsonException.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.stream;
+package com.massivecraft.mcore3.lib.gson.stream;
 
 import java.io.IOException;
 
-import com.massivecraft.mcore2.lib.gson.stream.JsonReader;
+import com.massivecraft.mcore3.lib.gson.stream.JsonReader;
 
 /**
  * Thrown when a reader encounters malformed JSON. Some syntax errors can be
diff --git a/src/com/massivecraft/mcore2/lib/gson/stream/StringPool.java b/src/com/massivecraft/mcore3/lib/gson/stream/StringPool.java
similarity index 97%
rename from src/com/massivecraft/mcore2/lib/gson/stream/StringPool.java
rename to src/com/massivecraft/mcore3/lib/gson/stream/StringPool.java
index ba5dfacf..1c2d72a5 100644
--- a/src/com/massivecraft/mcore2/lib/gson/stream/StringPool.java
+++ b/src/com/massivecraft/mcore3/lib/gson/stream/StringPool.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.massivecraft.mcore2.lib.gson.stream;
+package com.massivecraft.mcore3.lib.gson.stream;
 
 /**
  * A pool of string instances. Unlike the {@link String#intern() VM's
diff --git a/src/com/massivecraft/mcore2/persist/Entity.java b/src/com/massivecraft/mcore3/persist/Entity.java
similarity index 91%
rename from src/com/massivecraft/mcore2/persist/Entity.java
rename to src/com/massivecraft/mcore3/persist/Entity.java
index 0a7ba4b2..fcdd6417 100644
--- a/src/com/massivecraft/mcore2/persist/Entity.java
+++ b/src/com/massivecraft/mcore3/persist/Entity.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2.persist;
+package com.massivecraft.mcore3.persist;
 
 /**
  * Usage of this class is highly optional. You may persist anything. If you are 
diff --git a/src/com/massivecraft/mcore2/persist/IClassManager.java b/src/com/massivecraft/mcore3/persist/IClassManager.java
similarity index 94%
rename from src/com/massivecraft/mcore2/persist/IClassManager.java
rename to src/com/massivecraft/mcore3/persist/IClassManager.java
index 527fe23f..f0e0fcdc 100644
--- a/src/com/massivecraft/mcore2/persist/IClassManager.java
+++ b/src/com/massivecraft/mcore3/persist/IClassManager.java
@@ -1,10 +1,10 @@
-package com.massivecraft.mcore2.persist;
+package com.massivecraft.mcore3.persist;
 
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.Map;
 
-import com.massivecraft.mcore2.Predictate;
+import com.massivecraft.mcore3.Predictate;
 
 public interface IClassManager<T>
 {
diff --git a/src/com/massivecraft/mcore2/persist/One.java b/src/com/massivecraft/mcore3/persist/One.java
similarity index 91%
rename from src/com/massivecraft/mcore2/persist/One.java
rename to src/com/massivecraft/mcore3/persist/One.java
index 911d5972..fef14419 100644
--- a/src/com/massivecraft/mcore2/persist/One.java
+++ b/src/com/massivecraft/mcore3/persist/One.java
@@ -1,11 +1,11 @@
-package com.massivecraft.mcore2.persist;
+package com.massivecraft.mcore3.persist;
 
 import java.io.File;
 import java.lang.reflect.Type;
 import java.util.logging.Level;
 
-import com.massivecraft.mcore2.MPlugin;
-import com.massivecraft.mcore2.util.DiscUtil;
+import com.massivecraft.mcore3.MPlugin;
+import com.massivecraft.mcore3.util.DiscUtil;
 
 // TODO: Give better name and place to differenciate from the entity-orm-ish system in "com.massivecraft.core.persist".
 
diff --git a/src/com/massivecraft/mcore2/persist/Persist.java b/src/com/massivecraft/mcore3/persist/Persist.java
similarity index 94%
rename from src/com/massivecraft/mcore2/persist/Persist.java
rename to src/com/massivecraft/mcore3/persist/Persist.java
index 19aa8273..fb8286ec 100644
--- a/src/com/massivecraft/mcore2/persist/Persist.java
+++ b/src/com/massivecraft/mcore3/persist/Persist.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2.persist;
+package com.massivecraft.mcore3.persist;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -18,7 +18,7 @@ import java.util.SortedSet;
 import java.util.Timer;
 import java.util.TreeSet;
 
-import com.massivecraft.mcore2.Predictate;
+import com.massivecraft.mcore3.Predictate;
 
 public class Persist
 {
diff --git a/src/com/massivecraft/mcore2/persist/PlayerEntity.java b/src/com/massivecraft/mcore3/persist/PlayerEntity.java
similarity index 90%
rename from src/com/massivecraft/mcore2/persist/PlayerEntity.java
rename to src/com/massivecraft/mcore3/persist/PlayerEntity.java
index 1ada4b96..b16bc421 100644
--- a/src/com/massivecraft/mcore2/persist/PlayerEntity.java
+++ b/src/com/massivecraft/mcore3/persist/PlayerEntity.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2.persist;
+package com.massivecraft.mcore3.persist;
 
 import java.util.Collection;
 
@@ -6,7 +6,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
 
-import com.massivecraft.mcore2.util.Txt;
+import com.massivecraft.mcore3.util.Txt;
 
 
 public abstract class PlayerEntity<T extends PlayerEntity<T>> extends Entity<T>
diff --git a/src/com/massivecraft/mcore2/persist/SaveTask.java b/src/com/massivecraft/mcore3/persist/SaveTask.java
similarity index 87%
rename from src/com/massivecraft/mcore2/persist/SaveTask.java
rename to src/com/massivecraft/mcore3/persist/SaveTask.java
index 2ddd1f21..e3208b5e 100644
--- a/src/com/massivecraft/mcore2/persist/SaveTask.java
+++ b/src/com/massivecraft/mcore3/persist/SaveTask.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2.persist;
+package com.massivecraft.mcore3.persist;
 
 import java.util.TimerTask;
 
diff --git a/src/com/massivecraft/mcore2/persist/gson/GsonClassManager.java b/src/com/massivecraft/mcore3/persist/gson/GsonClassManager.java
similarity index 93%
rename from src/com/massivecraft/mcore2/persist/gson/GsonClassManager.java
rename to src/com/massivecraft/mcore3/persist/gson/GsonClassManager.java
index bfe62952..395f6353 100644
--- a/src/com/massivecraft/mcore2/persist/gson/GsonClassManager.java
+++ b/src/com/massivecraft/mcore3/persist/gson/GsonClassManager.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2.persist.gson;
+package com.massivecraft.mcore3.persist.gson;
 
 import java.io.File;
 import java.util.Collection;
@@ -11,10 +11,10 @@ import java.util.concurrent.ConcurrentSkipListMap;
 import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-import com.massivecraft.mcore2.Predictate;
-import com.massivecraft.mcore2.lib.gson.Gson;
-import com.massivecraft.mcore2.persist.IClassManager;
-import com.massivecraft.mcore2.persist.Persist;
+import com.massivecraft.mcore3.Predictate;
+import com.massivecraft.mcore3.lib.gson.Gson;
+import com.massivecraft.mcore3.persist.IClassManager;
+import com.massivecraft.mcore3.persist.Persist;
 
 public abstract class GsonClassManager<T> implements IClassManager<T>
 {
diff --git a/src/com/massivecraft/mcore2/persist/gson/GsonPlayerEntityManager.java b/src/com/massivecraft/mcore3/persist/gson/GsonPlayerEntityManager.java
similarity index 84%
rename from src/com/massivecraft/mcore2/persist/gson/GsonPlayerEntityManager.java
rename to src/com/massivecraft/mcore3/persist/gson/GsonPlayerEntityManager.java
index f4920ff1..e7e9df0a 100644
--- a/src/com/massivecraft/mcore2/persist/gson/GsonPlayerEntityManager.java
+++ b/src/com/massivecraft/mcore3/persist/gson/GsonPlayerEntityManager.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2.persist.gson;
+package com.massivecraft.mcore3.persist.gson;
 
 import java.io.File;
 import java.util.Collection;
@@ -7,9 +7,9 @@ import java.util.Set;
 
 import org.bukkit.entity.Player;
 
-import com.massivecraft.mcore2.Predictate;
-import com.massivecraft.mcore2.lib.gson.Gson;
-import com.massivecraft.mcore2.persist.PlayerEntity;
+import com.massivecraft.mcore3.Predictate;
+import com.massivecraft.mcore3.lib.gson.Gson;
+import com.massivecraft.mcore3.persist.PlayerEntity;
 
 public abstract class GsonPlayerEntityManager<T extends PlayerEntity<T>> extends GsonClassManager<T>
 {
diff --git a/src/com/massivecraft/mcore2/persist/gson/JsonFileFilter.java b/src/com/massivecraft/mcore3/persist/gson/JsonFileFilter.java
similarity index 87%
rename from src/com/massivecraft/mcore2/persist/gson/JsonFileFilter.java
rename to src/com/massivecraft/mcore3/persist/gson/JsonFileFilter.java
index d03b983d..7c4191b4 100644
--- a/src/com/massivecraft/mcore2/persist/gson/JsonFileFilter.java
+++ b/src/com/massivecraft/mcore3/persist/gson/JsonFileFilter.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2.persist.gson;
+package com.massivecraft.mcore3.persist.gson;
 
 import java.io.File;
 import java.io.FileFilter;
diff --git a/src/com/massivecraft/mcore2/util/ClassLoadHack.java b/src/com/massivecraft/mcore3/util/ClassLoadHack.java
similarity index 91%
rename from src/com/massivecraft/mcore2/util/ClassLoadHack.java
rename to src/com/massivecraft/mcore3/util/ClassLoadHack.java
index 3f52d87b..b7f88539 100644
--- a/src/com/massivecraft/mcore2/util/ClassLoadHack.java
+++ b/src/com/massivecraft/mcore3/util/ClassLoadHack.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2.util;
+package com.massivecraft.mcore3.util;
 
 import java.io.File;
 import java.lang.reflect.Method;
diff --git a/src/com/massivecraft/mcore2/util/DiscUtil.java b/src/com/massivecraft/mcore3/util/DiscUtil.java
similarity index 93%
rename from src/com/massivecraft/mcore2/util/DiscUtil.java
rename to src/com/massivecraft/mcore3/util/DiscUtil.java
index 7ea02d91..31b6bcc9 100644
--- a/src/com/massivecraft/mcore2/util/DiscUtil.java
+++ b/src/com/massivecraft/mcore3/util/DiscUtil.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2.util;
+package com.massivecraft.mcore3.util;
 
 import java.io.*;
 import java.net.URL;
diff --git a/src/com/massivecraft/mcore2/util/IntervalUtil.java b/src/com/massivecraft/mcore3/util/IntervalUtil.java
similarity index 93%
rename from src/com/massivecraft/mcore2/util/IntervalUtil.java
rename to src/com/massivecraft/mcore3/util/IntervalUtil.java
index d9239e5b..ed1de8b5 100644
--- a/src/com/massivecraft/mcore2/util/IntervalUtil.java
+++ b/src/com/massivecraft/mcore3/util/IntervalUtil.java
@@ -1,9 +1,9 @@
-package com.massivecraft.mcore2.util;
+package com.massivecraft.mcore3.util;
 
 import java.util.AbstractMap.SimpleEntry;
 import java.util.Map.Entry;
 
-import com.massivecraft.mcore2.MCore;
+import com.massivecraft.mcore3.MCore;
 
 public class IntervalUtil
 {	
diff --git a/src/com/massivecraft/mcore2/util/LibLoader.java b/src/com/massivecraft/mcore3/util/LibLoader.java
similarity index 86%
rename from src/com/massivecraft/mcore2/util/LibLoader.java
rename to src/com/massivecraft/mcore3/util/LibLoader.java
index 063f0101..c8bd9a8b 100644
--- a/src/com/massivecraft/mcore2/util/LibLoader.java
+++ b/src/com/massivecraft/mcore3/util/LibLoader.java
@@ -1,8 +1,8 @@
-package com.massivecraft.mcore2.util;
+package com.massivecraft.mcore3.util;
 
 import java.io.File;
 
-import com.massivecraft.mcore2.MPlugin;
+import com.massivecraft.mcore3.MPlugin;
 
 public class LibLoader
 {	
diff --git a/src/com/massivecraft/mcore2/util/MUtil.java b/src/com/massivecraft/mcore3/util/MUtil.java
similarity index 94%
rename from src/com/massivecraft/mcore2/util/MUtil.java
rename to src/com/massivecraft/mcore3/util/MUtil.java
index bdc6836a..b0b46e0e 100644
--- a/src/com/massivecraft/mcore2/util/MUtil.java
+++ b/src/com/massivecraft/mcore3/util/MUtil.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2.util;
+package com.massivecraft.mcore3.util;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22,7 +22,7 @@ import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.event.player.PlayerInteractEvent;
 
-import com.massivecraft.mcore2.MCore;
+import com.massivecraft.mcore3.MCore;
 
 public class MUtil
 {
diff --git a/src/com/massivecraft/mcore2/util/Perm.java b/src/com/massivecraft/mcore3/util/Perm.java
similarity index 91%
rename from src/com/massivecraft/mcore2/util/Perm.java
rename to src/com/massivecraft/mcore3/util/Perm.java
index c8b3de6e..c1a281d6 100644
--- a/src/com/massivecraft/mcore2/util/Perm.java
+++ b/src/com/massivecraft/mcore3/util/Perm.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2.util;
+package com.massivecraft.mcore3.util;
 
 import java.util.Map;
 import java.util.Map.Entry;
@@ -7,7 +7,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.Permission;
 
-import com.massivecraft.mcore2.Lang;
+import com.massivecraft.mcore3.Lang;
 
 public class Perm
 {
diff --git a/src/com/massivecraft/mcore2/util/PlayerUtil.java b/src/com/massivecraft/mcore3/util/PlayerUtil.java
similarity index 93%
rename from src/com/massivecraft/mcore2/util/PlayerUtil.java
rename to src/com/massivecraft/mcore3/util/PlayerUtil.java
index 7887914a..7eb74128 100644
--- a/src/com/massivecraft/mcore2/util/PlayerUtil.java
+++ b/src/com/massivecraft/mcore3/util/PlayerUtil.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2.util;
+package com.massivecraft.mcore3.util;
 
 import java.io.File;
 import java.util.Set;
diff --git a/src/com/massivecraft/mcore2/util/SmokeUtil.java b/src/com/massivecraft/mcore3/util/SmokeUtil.java
similarity index 95%
rename from src/com/massivecraft/mcore2/util/SmokeUtil.java
rename to src/com/massivecraft/mcore3/util/SmokeUtil.java
index c89f8437..376480ea 100644
--- a/src/com/massivecraft/mcore2/util/SmokeUtil.java
+++ b/src/com/massivecraft/mcore3/util/SmokeUtil.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2.util;
+package com.massivecraft.mcore3.util;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/src/com/massivecraft/mcore2/util/Txt.java b/src/com/massivecraft/mcore3/util/Txt.java
similarity index 96%
rename from src/com/massivecraft/mcore2/util/Txt.java
rename to src/com/massivecraft/mcore3/util/Txt.java
index d53e9f81..359d949d 100644
--- a/src/com/massivecraft/mcore2/util/Txt.java
+++ b/src/com/massivecraft/mcore3/util/Txt.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore2.util;
+package com.massivecraft.mcore3.util;
 
 import java.util.*;
 import java.util.AbstractMap.SimpleEntry;