diff --git a/plugin/pom.xml b/plugin/pom.xml
index af4fe1b0..8e237bed 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -226,15 +226,15 @@
                     <relocations>
                         <relocation>
                             <pattern>org.bstats.bukkit</pattern>
-                            <shadedPattern>me.filoghost.holographicdisplays.lib.metrics</shadedPattern>
+                            <shadedPattern>me.filoghost.holographicdisplays.plugin.lib.metrics</shadedPattern>
                         </relocation>
                         <relocation>
                             <pattern>me.filoghost.updatechecker</pattern>
-                            <shadedPattern>me.filoghost.holographicdisplays.lib.updater</shadedPattern>
+                            <shadedPattern>me.filoghost.holographicdisplays.plugin.lib.updater</shadedPattern>
                         </relocation>
                         <relocation>
                             <pattern>me.filoghost.fcommons</pattern>
-                            <shadedPattern>me.filoghost.holographicdisplays.lib.fcommons</shadedPattern>
+                            <shadedPattern>me.filoghost.holographicdisplays.plugin.lib.fcommons</shadedPattern>
                         </relocation>
                     </relocations>
                 </configuration>
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketListener.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketListener.java
index cc310192..62d0d4fe 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketListener.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketListener.java
@@ -13,9 +13,9 @@ import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.wrappers.WrappedWatchableObject;
 import me.filoghost.holographicdisplays.plugin.bridge.placeholderapi.PlaceholderAPIHook;
-import me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet.AbstractPacket;
-import me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet.WrapperPlayServerEntityMetadata;
-import me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet.WrapperPlayServerSpawnEntityLiving;
+import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.AbstractPacket;
+import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.WrapperPlayServerEntityMetadata;
+import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.WrapperPlayServerSpawnEntityLiving;
 import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker;
 import me.filoghost.holographicdisplays.plugin.placeholder.tracking.TrackedLine;
 import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketSender.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketSender.java
index 2e4aa8e6..4d5951fb 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketSender.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketSender.java
@@ -6,14 +6,14 @@
 package me.filoghost.holographicdisplays.plugin.bridge.protocollib;
 
 import com.comphenix.protocol.wrappers.WrappedDataWatcher;
-import me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet.AbstractPacket;
-import me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet.WrapperPlayServerAttachEntity;
-import me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet.WrapperPlayServerEntityDestroy;
-import me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet.WrapperPlayServerEntityMetadata;
-import me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet.WrapperPlayServerMount;
-import me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet.WrapperPlayServerSpawnEntity;
-import me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet.WrapperPlayServerSpawnEntity.ObjectTypes;
-import me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet.WrapperPlayServerSpawnEntityLiving;
+import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.AbstractPacket;
+import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.WrapperPlayServerAttachEntity;
+import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.WrapperPlayServerEntityDestroy;
+import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.WrapperPlayServerEntityMetadata;
+import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.WrapperPlayServerMount;
+import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.WrapperPlayServerSpawnEntity;
+import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.WrapperPlayServerSpawnEntity.ObjectTypes;
+import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.WrapperPlayServerSpawnEntityLiving;
 import me.filoghost.holographicdisplays.common.hologram.StandardHologram;
 import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine;
 import me.filoghost.holographicdisplays.common.hologram.StandardItemLine;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/HologramLineParser.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/HologramLineParser.java
index 78fcb636..15653b3f 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/HologramLineParser.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/HologramLineParser.java
@@ -7,8 +7,8 @@ package me.filoghost.holographicdisplays.plugin.disk;
 
 import me.filoghost.fcommons.MaterialsHelper;
 import me.filoghost.fcommons.Strings;
-import me.filoghost.holographicdisplays.plugin.nbt.parser.MojangsonParseException;
-import me.filoghost.holographicdisplays.plugin.nbt.parser.MojangsonParser;
+import me.filoghost.holographicdisplays.plugin.lib.nbt.parser.MojangsonParseException;
+import me.filoghost.holographicdisplays.plugin.lib.nbt.parser.MojangsonParser;
 import me.filoghost.holographicdisplays.plugin.hologram.internal.InternalHologram;
 import me.filoghost.holographicdisplays.plugin.hologram.internal.InternalHologramLine;
 import org.bukkit.Bukkit;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTByte.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTByte.java
similarity index 94%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTByte.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTByte.java
index 9ba41f8a..164212a2 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTByte.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTByte.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-package me.filoghost.holographicdisplays.plugin.nbt;
+package me.filoghost.holographicdisplays.plugin.lib.nbt;
 
 /**
  * The {@code TAG_Byte} tag.
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTByteArray.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTByteArray.java
similarity index 96%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTByteArray.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTByteArray.java
index c186cf90..1901a9c8 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTByteArray.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTByteArray.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-package me.filoghost.holographicdisplays.plugin.nbt;
+package me.filoghost.holographicdisplays.plugin.lib.nbt;
 
 import java.util.Arrays;
 
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTCompound.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTCompound.java
similarity index 99%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTCompound.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTCompound.java
index 775be486..0efcb32f 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTCompound.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTCompound.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-package me.filoghost.holographicdisplays.plugin.nbt;
+package me.filoghost.holographicdisplays.plugin.lib.nbt;
 
 import java.util.Collections;
 import java.util.LinkedHashMap;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTDouble.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTDouble.java
similarity index 94%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTDouble.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTDouble.java
index bda0aafc..211640b3 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTDouble.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTDouble.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-package me.filoghost.holographicdisplays.plugin.nbt;
+package me.filoghost.holographicdisplays.plugin.lib.nbt;
 
 /**
  * The {@code TAG_Double} tag.
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTFloat.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTFloat.java
similarity index 94%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTFloat.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTFloat.java
index baf58f25..d41f5671 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTFloat.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTFloat.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-package me.filoghost.holographicdisplays.plugin.nbt;
+package me.filoghost.holographicdisplays.plugin.lib.nbt;
 
 /**
  * The {@code TAG_Float} tag.
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTInt.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTInt.java
similarity index 94%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTInt.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTInt.java
index 0751719a..f2fe990a 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTInt.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTInt.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-package me.filoghost.holographicdisplays.plugin.nbt;
+package me.filoghost.holographicdisplays.plugin.lib.nbt;
 
 /**
  * The {@code TAG_Int} tag.
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTIntArray.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTIntArray.java
similarity index 96%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTIntArray.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTIntArray.java
index 4ab56e75..52bc2a91 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTIntArray.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTIntArray.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-package me.filoghost.holographicdisplays.plugin.nbt;
+package me.filoghost.holographicdisplays.plugin.lib.nbt;
 
 import java.util.Arrays;
 import java.util.Objects;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTList.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTList.java
similarity index 98%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTList.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTList.java
index 9f316b0a..cdf182c3 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTList.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTList.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-package me.filoghost.holographicdisplays.plugin.nbt;
+package me.filoghost.holographicdisplays.plugin.lib.nbt;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTLong.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTLong.java
similarity index 94%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTLong.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTLong.java
index 523cfae5..d3b83085 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTLong.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTLong.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-package me.filoghost.holographicdisplays.plugin.nbt;
+package me.filoghost.holographicdisplays.plugin.lib.nbt;
 
 /**
  * The {@code TAG_Long} tag.
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTLongArray.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTLongArray.java
similarity index 96%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTLongArray.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTLongArray.java
index e5cbf0af..9d9e5887 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTLongArray.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTLongArray.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-package me.filoghost.holographicdisplays.plugin.nbt;
+package me.filoghost.holographicdisplays.plugin.lib.nbt;
 
 import java.util.Arrays;
 
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTShort.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTShort.java
similarity index 94%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTShort.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTShort.java
index d989191e..4ab79570 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTShort.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTShort.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-package me.filoghost.holographicdisplays.plugin.nbt;
+package me.filoghost.holographicdisplays.plugin.lib.nbt;
 
 /**
  * The {@code TAG_Short} tag.
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTString.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTString.java
similarity index 96%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTString.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTString.java
index 3156bb25..2847a889 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTString.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTString.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-package me.filoghost.holographicdisplays.plugin.nbt;
+package me.filoghost.holographicdisplays.plugin.lib.nbt;
 
 /**
  * The {@code TAG_String} tag.
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTTag.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTTag.java
similarity index 95%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTTag.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTTag.java
index 7c5ce1df..87cdd5e8 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTTag.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTTag.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-package me.filoghost.holographicdisplays.plugin.nbt;
+package me.filoghost.holographicdisplays.plugin.lib.nbt;
 
 /**
  * An abstract NBT-Tag.
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTType.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTType.java
similarity index 98%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTType.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTType.java
index f61744ea..ba8af3f5 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTType.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/NBTType.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-package me.filoghost.holographicdisplays.plugin.nbt;
+package me.filoghost.holographicdisplays.plugin.lib.nbt;
 
 /**
  * <p>
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/parser/MojangsonParseException.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/parser/MojangsonParseException.java
similarity index 91%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/parser/MojangsonParseException.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/parser/MojangsonParseException.java
index 8bd314d5..f6069c3b 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/parser/MojangsonParseException.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/parser/MojangsonParseException.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-package me.filoghost.holographicdisplays.plugin.nbt.parser;
+package me.filoghost.holographicdisplays.plugin.lib.nbt.parser;
 
 import java.io.IOException;
 
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/parser/MojangsonParser.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/parser/MojangsonParser.java
similarity index 92%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/parser/MojangsonParser.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/parser/MojangsonParser.java
index adbe6d6a..47521514 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/parser/MojangsonParser.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/parser/MojangsonParser.java
@@ -3,22 +3,22 @@
  *
  * SPDX-License-Identifier: MIT
  */
-package me.filoghost.holographicdisplays.plugin.nbt.parser;
+package me.filoghost.holographicdisplays.plugin.lib.nbt.parser;
 
-import me.filoghost.holographicdisplays.plugin.nbt.NBTByteArray;
-import me.filoghost.holographicdisplays.plugin.nbt.NBTCompound;
-import me.filoghost.holographicdisplays.plugin.nbt.NBTDouble;
-import me.filoghost.holographicdisplays.plugin.nbt.NBTFloat;
-import me.filoghost.holographicdisplays.plugin.nbt.NBTIntArray;
-import me.filoghost.holographicdisplays.plugin.nbt.NBTLong;
-import me.filoghost.holographicdisplays.plugin.nbt.NBTString;
-import me.filoghost.holographicdisplays.plugin.nbt.NBTTag;
-import me.filoghost.holographicdisplays.plugin.nbt.NBTByte;
-import me.filoghost.holographicdisplays.plugin.nbt.NBTInt;
-import me.filoghost.holographicdisplays.plugin.nbt.NBTList;
-import me.filoghost.holographicdisplays.plugin.nbt.NBTLongArray;
-import me.filoghost.holographicdisplays.plugin.nbt.NBTShort;
-import me.filoghost.holographicdisplays.plugin.nbt.NBTType;
+import me.filoghost.holographicdisplays.plugin.lib.nbt.NBTByte;
+import me.filoghost.holographicdisplays.plugin.lib.nbt.NBTByteArray;
+import me.filoghost.holographicdisplays.plugin.lib.nbt.NBTCompound;
+import me.filoghost.holographicdisplays.plugin.lib.nbt.NBTDouble;
+import me.filoghost.holographicdisplays.plugin.lib.nbt.NBTFloat;
+import me.filoghost.holographicdisplays.plugin.lib.nbt.NBTInt;
+import me.filoghost.holographicdisplays.plugin.lib.nbt.NBTIntArray;
+import me.filoghost.holographicdisplays.plugin.lib.nbt.NBTList;
+import me.filoghost.holographicdisplays.plugin.lib.nbt.NBTLong;
+import me.filoghost.holographicdisplays.plugin.lib.nbt.NBTLongArray;
+import me.filoghost.holographicdisplays.plugin.lib.nbt.NBTTag;
+import me.filoghost.holographicdisplays.plugin.lib.nbt.NBTType;
+import me.filoghost.holographicdisplays.plugin.lib.nbt.NBTString;
+import me.filoghost.holographicdisplays.plugin.lib.nbt.NBTShort;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/AbstractPacket.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/packetwrapper/AbstractPacket.java
similarity index 97%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/AbstractPacket.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/packetwrapper/AbstractPacket.java
index 86f28840..c5fb3abc 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/AbstractPacket.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/packetwrapper/AbstractPacket.java
@@ -14,7 +14,7 @@
  *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
  *  02111-1307 USA
  */
-package me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet;
+package me.filoghost.holographicdisplays.plugin.lib.packetwrapper;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerAttachEntity.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/packetwrapper/WrapperPlayServerAttachEntity.java
similarity index 98%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerAttachEntity.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/packetwrapper/WrapperPlayServerAttachEntity.java
index 180eac3c..88339b84 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerAttachEntity.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/packetwrapper/WrapperPlayServerAttachEntity.java
@@ -14,7 +14,7 @@
  *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
  *  02111-1307 USA
  */
-package me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet;
+package me.filoghost.holographicdisplays.plugin.lib.packetwrapper;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.PacketContainer;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerEntityDestroy.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/packetwrapper/WrapperPlayServerEntityDestroy.java
similarity index 96%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerEntityDestroy.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/packetwrapper/WrapperPlayServerEntityDestroy.java
index 667aa6a0..75c96a0a 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerEntityDestroy.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/packetwrapper/WrapperPlayServerEntityDestroy.java
@@ -14,7 +14,7 @@
  *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
  *  02111-1307 USA
  */
-package me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet;
+package me.filoghost.holographicdisplays.plugin.lib.packetwrapper;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.PacketContainer;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerEntityMetadata.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/packetwrapper/WrapperPlayServerEntityMetadata.java
similarity index 97%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerEntityMetadata.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/packetwrapper/WrapperPlayServerEntityMetadata.java
index f98bb68f..0eb31f5a 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerEntityMetadata.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/packetwrapper/WrapperPlayServerEntityMetadata.java
@@ -14,7 +14,7 @@
  *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
  *  02111-1307 USA
  */
-package me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet;
+package me.filoghost.holographicdisplays.plugin.lib.packetwrapper;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.PacketContainer;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerMount.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/packetwrapper/WrapperPlayServerMount.java
similarity index 96%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerMount.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/packetwrapper/WrapperPlayServerMount.java
index 39a87650..75dcc87c 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerMount.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/packetwrapper/WrapperPlayServerMount.java
@@ -14,7 +14,7 @@
  *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
  *  02111-1307 USA
  */
-package me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet;
+package me.filoghost.holographicdisplays.plugin.lib.packetwrapper;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.PacketContainer;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerSpawnEntity.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/packetwrapper/WrapperPlayServerSpawnEntity.java
similarity index 98%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerSpawnEntity.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/packetwrapper/WrapperPlayServerSpawnEntity.java
index 765c3683..07ec9b0c 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerSpawnEntity.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/packetwrapper/WrapperPlayServerSpawnEntity.java
@@ -14,7 +14,7 @@
  *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
  *  02111-1307 USA
  */
-package me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet;
+package me.filoghost.holographicdisplays.plugin.lib.packetwrapper;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerSpawnEntityLiving.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/packetwrapper/WrapperPlayServerSpawnEntityLiving.java
similarity index 97%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerSpawnEntityLiving.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/packetwrapper/WrapperPlayServerSpawnEntityLiving.java
index d4c9db03..c30286b2 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerSpawnEntityLiving.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/packetwrapper/WrapperPlayServerSpawnEntityLiving.java
@@ -14,7 +14,7 @@
  *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
  *  02111-1307 USA
  */
-package me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet;
+package me.filoghost.holographicdisplays.plugin.lib.packetwrapper;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;