diff --git a/plugin/pom.xml b/plugin/pom.xml
index ce722d30..980b44e9 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -225,16 +225,16 @@
- org.bstats
- me.filoghost.holographicdisplays.metrics
+ org.bstats.bukkit
+ me.filoghost.holographicdisplays.lib.metrics
me.filoghost.updatechecker
- me.filoghost.holographicdisplays.updater
+ me.filoghost.holographicdisplays.lib.updater
me.filoghost.fcommons
- me.filoghost.holographicdisplays.fcommons
+ me.filoghost.holographicdisplays.lib.fcommons
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/Colors.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/Colors.java
similarity index 92%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/Colors.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/Colors.java
index b5a1dc9d..cfac4c65 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/Colors.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/Colors.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays;
+package me.filoghost.holographicdisplays.plugin;
import org.bukkit.ChatColor;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/DefaultHolographicDisplaysAPI.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/DefaultHolographicDisplaysAPI.java
similarity index 93%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/DefaultHolographicDisplaysAPI.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/DefaultHolographicDisplaysAPI.java
index 21fe6508..7b039181 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/DefaultHolographicDisplaysAPI.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/DefaultHolographicDisplaysAPI.java
@@ -3,14 +3,14 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays;
+package me.filoghost.holographicdisplays.plugin;
import me.filoghost.fcommons.Preconditions;
import me.filoghost.holographicdisplays.api.Hologram;
import me.filoghost.holographicdisplays.api.HolographicDisplaysAPI;
import me.filoghost.holographicdisplays.api.placeholder.PlaceholderReplacer;
-import me.filoghost.holographicdisplays.object.api.APIHologramManager;
-import me.filoghost.holographicdisplays.placeholder.registry.PlaceholderRegistry;
+import me.filoghost.holographicdisplays.plugin.object.api.APIHologramManager;
+import me.filoghost.holographicdisplays.plugin.placeholder.registry.PlaceholderRegistry;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.plugin.Plugin;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/DefaultHolographicDisplaysAPIProvider.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/DefaultHolographicDisplaysAPIProvider.java
similarity index 89%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/DefaultHolographicDisplaysAPIProvider.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/DefaultHolographicDisplaysAPIProvider.java
index 219c4e26..f4383fcb 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/DefaultHolographicDisplaysAPIProvider.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/DefaultHolographicDisplaysAPIProvider.java
@@ -3,14 +3,14 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays;
+package me.filoghost.holographicdisplays.plugin;
import me.filoghost.fcommons.Preconditions;
import me.filoghost.holographicdisplays.api.HolographicDisplaysAPI;
import me.filoghost.holographicdisplays.api.internal.HolographicDisplaysAPIProvider;
import me.filoghost.holographicdisplays.core.nms.NMSManager;
-import me.filoghost.holographicdisplays.object.api.APIHologramManager;
-import me.filoghost.holographicdisplays.placeholder.registry.PlaceholderRegistry;
+import me.filoghost.holographicdisplays.plugin.object.api.APIHologramManager;
+import me.filoghost.holographicdisplays.plugin.placeholder.registry.PlaceholderRegistry;
import org.bukkit.entity.Entity;
import org.bukkit.plugin.Plugin;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/HolographicDisplays.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/HolographicDisplays.java
similarity index 78%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/HolographicDisplays.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/HolographicDisplays.java
index e7b4586b..837e9361 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/HolographicDisplays.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/HolographicDisplays.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays;
+package me.filoghost.holographicdisplays.plugin;
import com.gmail.filoghost.holographicdisplays.api.internal.HologramsAPIProvider;
import me.filoghost.fcommons.FCommonsPlugin;
@@ -11,34 +11,34 @@ import me.filoghost.fcommons.FeatureSupport;
import me.filoghost.fcommons.config.exception.ConfigException;
import me.filoghost.fcommons.logging.ErrorCollector;
import me.filoghost.holographicdisplays.api.internal.HolographicDisplaysAPIProvider;
-import me.filoghost.holographicdisplays.bridge.bungeecord.BungeeServerTracker;
-import me.filoghost.holographicdisplays.bridge.placeholderapi.PlaceholderAPIHook;
-import me.filoghost.holographicdisplays.bridge.protocollib.ProtocolLibHook;
-import me.filoghost.holographicdisplays.commands.HologramCommandManager;
+import me.filoghost.holographicdisplays.plugin.bridge.bungeecord.BungeeServerTracker;
+import me.filoghost.holographicdisplays.plugin.bridge.placeholderapi.PlaceholderAPIHook;
+import me.filoghost.holographicdisplays.plugin.bridge.protocollib.ProtocolLibHook;
+import me.filoghost.holographicdisplays.plugin.commands.HologramCommandManager;
import me.filoghost.holographicdisplays.core.nms.NMSManager;
import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings;
-import me.filoghost.holographicdisplays.disk.ConfigManager;
-import me.filoghost.holographicdisplays.disk.Configuration;
-import me.filoghost.holographicdisplays.disk.HologramDatabase;
-import me.filoghost.holographicdisplays.disk.upgrade.LegacySymbolsUpgrade;
-import me.filoghost.holographicdisplays.legacy.api.v2.V2HologramsAPIProvider;
-import me.filoghost.holographicdisplays.listener.ChunkListener;
-import me.filoghost.holographicdisplays.listener.InteractListener;
-import me.filoghost.holographicdisplays.listener.SpawnListener;
-import me.filoghost.holographicdisplays.listener.UpdateNotificationListener;
-import me.filoghost.holographicdisplays.log.PrintableErrorCollector;
-import me.filoghost.holographicdisplays.object.api.APIHologram;
-import me.filoghost.holographicdisplays.object.api.APIHologramManager;
-import me.filoghost.holographicdisplays.object.internal.InternalHologram;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramManager;
-import me.filoghost.holographicdisplays.placeholder.tracking.PlaceholderLineTracker;
-import me.filoghost.holographicdisplays.placeholder.tracking.PlaceholderTracker;
-import me.filoghost.holographicdisplays.placeholder.TickClock;
-import me.filoghost.holographicdisplays.placeholder.TickingTask;
-import me.filoghost.holographicdisplays.placeholder.internal.AnimationRegistry;
-import me.filoghost.holographicdisplays.placeholder.internal.DefaultPlaceholders;
-import me.filoghost.holographicdisplays.placeholder.registry.PlaceholderRegistry;
-import me.filoghost.holographicdisplays.util.NMSVersion;
+import me.filoghost.holographicdisplays.plugin.disk.ConfigManager;
+import me.filoghost.holographicdisplays.plugin.disk.Configuration;
+import me.filoghost.holographicdisplays.plugin.disk.HologramDatabase;
+import me.filoghost.holographicdisplays.plugin.disk.upgrade.LegacySymbolsUpgrade;
+import me.filoghost.holographicdisplays.plugin.legacy.api.v2.V2HologramsAPIProvider;
+import me.filoghost.holographicdisplays.plugin.listener.ChunkListener;
+import me.filoghost.holographicdisplays.plugin.listener.InteractListener;
+import me.filoghost.holographicdisplays.plugin.listener.SpawnListener;
+import me.filoghost.holographicdisplays.plugin.listener.UpdateNotificationListener;
+import me.filoghost.holographicdisplays.plugin.log.PrintableErrorCollector;
+import me.filoghost.holographicdisplays.plugin.object.api.APIHologram;
+import me.filoghost.holographicdisplays.plugin.object.api.APIHologramManager;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologram;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramManager;
+import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker;
+import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderTracker;
+import me.filoghost.holographicdisplays.plugin.placeholder.TickClock;
+import me.filoghost.holographicdisplays.plugin.placeholder.TickingTask;
+import me.filoghost.holographicdisplays.plugin.placeholder.internal.AnimationRegistry;
+import me.filoghost.holographicdisplays.plugin.placeholder.internal.DefaultPlaceholders;
+import me.filoghost.holographicdisplays.plugin.placeholder.registry.PlaceholderRegistry;
+import me.filoghost.holographicdisplays.plugin.util.NMSVersion;
import org.bstats.bukkit.MetricsLite;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/Permissions.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/Permissions.java
similarity index 85%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/Permissions.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/Permissions.java
index ce61d640..676d77d5 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/Permissions.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/Permissions.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays;
+package me.filoghost.holographicdisplays.plugin;
public class Permissions {
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/bungeecord/BungeeMessenger.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/bungeecord/BungeeMessenger.java
similarity index 96%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/bridge/bungeecord/BungeeMessenger.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/bungeecord/BungeeMessenger.java
index 1d9d9bfd..7bd14846 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/bungeecord/BungeeMessenger.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/bungeecord/BungeeMessenger.java
@@ -3,10 +3,10 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.bridge.bungeecord;
+package me.filoghost.holographicdisplays.plugin.bridge.bungeecord;
import me.filoghost.fcommons.logging.Log;
-import me.filoghost.holographicdisplays.disk.Configuration;
+import me.filoghost.holographicdisplays.plugin.disk.Configuration;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/bungeecord/BungeeServerTracker.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/bungeecord/BungeeServerTracker.java
similarity index 91%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/bridge/bungeecord/BungeeServerTracker.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/bungeecord/BungeeServerTracker.java
index 284993b5..546f100f 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/bungeecord/BungeeServerTracker.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/bungeecord/BungeeServerTracker.java
@@ -3,15 +3,15 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.bridge.bungeecord;
+package me.filoghost.holographicdisplays.plugin.bridge.bungeecord;
import me.filoghost.fcommons.logging.Log;
-import me.filoghost.holographicdisplays.HolographicDisplays;
-import me.filoghost.holographicdisplays.bridge.bungeecord.pinger.PingResponse;
-import me.filoghost.holographicdisplays.bridge.bungeecord.pinger.ServerPinger;
+import me.filoghost.holographicdisplays.plugin.HolographicDisplays;
+import me.filoghost.holographicdisplays.plugin.bridge.bungeecord.pinger.PingResponse;
+import me.filoghost.holographicdisplays.plugin.bridge.bungeecord.pinger.ServerPinger;
import me.filoghost.holographicdisplays.core.DebugLogger;
-import me.filoghost.holographicdisplays.disk.Configuration;
-import me.filoghost.holographicdisplays.disk.ServerAddress;
+import me.filoghost.holographicdisplays.plugin.disk.Configuration;
+import me.filoghost.holographicdisplays.plugin.disk.ServerAddress;
import org.bukkit.Bukkit;
import org.bukkit.plugin.Plugin;
import org.jetbrains.annotations.NotNull;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/bungeecord/ServerInfo.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/bungeecord/ServerInfo.java
similarity index 92%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/bridge/bungeecord/ServerInfo.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/bungeecord/ServerInfo.java
index 9a0a39d3..6a5bb2b9 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/bungeecord/ServerInfo.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/bungeecord/ServerInfo.java
@@ -3,10 +3,10 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.bridge.bungeecord;
+package me.filoghost.holographicdisplays.plugin.bridge.bungeecord;
import me.filoghost.fcommons.Strings;
-import me.filoghost.holographicdisplays.disk.Configuration;
+import me.filoghost.holographicdisplays.plugin.disk.Configuration;
public class ServerInfo {
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/bungeecord/pinger/PingResponse.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/bungeecord/pinger/PingResponse.java
similarity index 95%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/bridge/bungeecord/pinger/PingResponse.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/bungeecord/pinger/PingResponse.java
index 409890cf..6d08052a 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/bungeecord/pinger/PingResponse.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/bungeecord/pinger/PingResponse.java
@@ -3,10 +3,10 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.bridge.bungeecord.pinger;
+package me.filoghost.holographicdisplays.plugin.bridge.bungeecord.pinger;
import me.filoghost.holographicdisplays.core.DebugLogger;
-import me.filoghost.holographicdisplays.disk.ServerAddress;
+import me.filoghost.holographicdisplays.plugin.disk.ServerAddress;
import org.json.simple.JSONObject;
import org.json.simple.JSONValue;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/bungeecord/pinger/ServerPinger.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/bungeecord/pinger/ServerPinger.java
similarity index 95%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/bridge/bungeecord/pinger/ServerPinger.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/bungeecord/pinger/ServerPinger.java
index dd8ff904..b3d25c02 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/bungeecord/pinger/ServerPinger.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/bungeecord/pinger/ServerPinger.java
@@ -3,9 +3,9 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.bridge.bungeecord.pinger;
+package me.filoghost.holographicdisplays.plugin.bridge.bungeecord.pinger;
-import me.filoghost.holographicdisplays.disk.ServerAddress;
+import me.filoghost.holographicdisplays.plugin.disk.ServerAddress;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/placeholderapi/PlaceholderAPIHook.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/placeholderapi/PlaceholderAPIHook.java
similarity index 91%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/bridge/placeholderapi/PlaceholderAPIHook.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/placeholderapi/PlaceholderAPIHook.java
index 61dbf9c8..dbcb5f90 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/placeholderapi/PlaceholderAPIHook.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/placeholderapi/PlaceholderAPIHook.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.bridge.placeholderapi;
+package me.filoghost.holographicdisplays.plugin.bridge.placeholderapi;
import me.clip.placeholderapi.PlaceholderAPI;
import org.bukkit.Bukkit;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/DebugHelper.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/DebugHelper.java
similarity index 98%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/DebugHelper.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/DebugHelper.java
index e6728a10..096ee5bc 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/DebugHelper.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/DebugHelper.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.bridge.protocollib;
+package me.filoghost.holographicdisplays.plugin.bridge.protocollib;
import com.comphenix.net.sf.cglib.proxy.Factory;
import com.comphenix.protocol.events.PacketContainer;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/MetadataHelper.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/MetadataHelper.java
similarity index 98%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/MetadataHelper.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/MetadataHelper.java
index 7a9735da..85c7f286 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/MetadataHelper.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/MetadataHelper.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.bridge.protocollib;
+package me.filoghost.holographicdisplays.plugin.bridge.protocollib;
import com.comphenix.protocol.utility.MinecraftReflection;
import com.comphenix.protocol.wrappers.WrappedDataWatcher;
@@ -11,7 +11,7 @@ import com.comphenix.protocol.wrappers.WrappedDataWatcher.Registry;
import com.comphenix.protocol.wrappers.WrappedDataWatcher.Serializer;
import com.comphenix.protocol.wrappers.WrappedDataWatcher.WrappedDataWatcherObject;
import com.comphenix.protocol.wrappers.WrappedWatchableObject;
-import me.filoghost.holographicdisplays.util.NMSVersion;
+import me.filoghost.holographicdisplays.plugin.util.NMSVersion;
import java.util.List;
import java.util.Optional;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/PacketListener.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketListener.java
similarity index 90%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/PacketListener.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketListener.java
index da74589b..881bd59d 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/PacketListener.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketListener.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.bridge.protocollib;
+package me.filoghost.holographicdisplays.plugin.bridge.protocollib;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.ProtocolLibrary;
@@ -12,19 +12,19 @@ import com.comphenix.protocol.events.PacketAdapter;
import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.events.PacketEvent;
import com.comphenix.protocol.wrappers.WrappedWatchableObject;
-import me.filoghost.holographicdisplays.bridge.placeholderapi.PlaceholderAPIHook;
-import me.filoghost.holographicdisplays.bridge.protocollib.packet.AbstractPacket;
-import me.filoghost.holographicdisplays.bridge.protocollib.packet.WrapperPlayServerEntityMetadata;
-import me.filoghost.holographicdisplays.bridge.protocollib.packet.WrapperPlayServerSpawnEntityLiving;
+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.placeholder.tracking.PlaceholderLineTracker;
+import me.filoghost.holographicdisplays.plugin.placeholder.tracking.TrackedLine;
import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine;
import me.filoghost.holographicdisplays.core.hologram.StandardTextLine;
import me.filoghost.holographicdisplays.core.nms.NMSManager;
import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings;
import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand;
import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity;
-import me.filoghost.holographicdisplays.placeholder.tracking.PlaceholderLineTracker;
-import me.filoghost.holographicdisplays.placeholder.tracking.TrackedLine;
-import me.filoghost.holographicdisplays.util.NMSVersion;
+import me.filoghost.holographicdisplays.plugin.util.NMSVersion;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/PacketSender.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketSender.java
similarity index 89%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/PacketSender.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketSender.java
index f21d2a10..ad287de5 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/PacketSender.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketSender.java
@@ -3,17 +3,17 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.bridge.protocollib;
+package me.filoghost.holographicdisplays.plugin.bridge.protocollib;
import com.comphenix.protocol.wrappers.WrappedDataWatcher;
-import me.filoghost.holographicdisplays.bridge.protocollib.packet.AbstractPacket;
-import me.filoghost.holographicdisplays.bridge.protocollib.packet.WrapperPlayServerAttachEntity;
-import me.filoghost.holographicdisplays.bridge.protocollib.packet.WrapperPlayServerEntityDestroy;
-import me.filoghost.holographicdisplays.bridge.protocollib.packet.WrapperPlayServerEntityMetadata;
-import me.filoghost.holographicdisplays.bridge.protocollib.packet.WrapperPlayServerMount;
-import me.filoghost.holographicdisplays.bridge.protocollib.packet.WrapperPlayServerSpawnEntity;
-import me.filoghost.holographicdisplays.bridge.protocollib.packet.WrapperPlayServerSpawnEntity.ObjectTypes;
-import me.filoghost.holographicdisplays.bridge.protocollib.packet.WrapperPlayServerSpawnEntityLiving;
+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.core.hologram.StandardHologram;
import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine;
import me.filoghost.holographicdisplays.core.hologram.StandardItemLine;
@@ -23,7 +23,7 @@ import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand;
import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity;
import me.filoghost.holographicdisplays.core.nms.entity.NMSItem;
import me.filoghost.holographicdisplays.core.nms.entity.NMSSlime;
-import me.filoghost.holographicdisplays.util.NMSVersion;
+import me.filoghost.holographicdisplays.plugin.util.NMSVersion;
import org.bukkit.entity.Player;
import java.util.ArrayList;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/ProtocolLibHook.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/ProtocolLibHook.java
similarity index 94%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/ProtocolLibHook.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/ProtocolLibHook.java
index 5f230caf..fa412679 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/ProtocolLibHook.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/ProtocolLibHook.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.bridge.protocollib;
+package me.filoghost.holographicdisplays.plugin.bridge.protocollib;
import me.filoghost.fcommons.Preconditions;
import me.filoghost.fcommons.logging.ErrorCollector;
@@ -12,8 +12,8 @@ import me.filoghost.holographicdisplays.core.Utils;
import me.filoghost.holographicdisplays.core.hologram.StandardHologram;
import me.filoghost.holographicdisplays.core.nms.NMSManager;
import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings;
-import me.filoghost.holographicdisplays.placeholder.tracking.PlaceholderLineTracker;
-import me.filoghost.holographicdisplays.util.VersionUtils;
+import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker;
+import me.filoghost.holographicdisplays.plugin.util.VersionUtils;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.entity.Player;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/packet/AbstractPacket.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/AbstractPacket.java
similarity index 67%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/packet/AbstractPacket.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/AbstractPacket.java
index a33e34fa..5b5a0026 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/packet/AbstractPacket.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/AbstractPacket.java
@@ -1,20 +1,9 @@
/*
- * PacketWrapper - Contains wrappers for each packet in Minecraft.
- * Copyright (C) 2012 Kristian S. Stangeland
+ * Copyright (C) filoghost and contributors
*
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.bridge.protocollib.packet;
+package me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.ProtocolLibrary;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/packet/WrapperPlayServerAttachEntity.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerAttachEntity.java
similarity index 76%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/packet/WrapperPlayServerAttachEntity.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerAttachEntity.java
index 3e8e5aea..eb8bb780 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/packet/WrapperPlayServerAttachEntity.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerAttachEntity.java
@@ -1,20 +1,9 @@
/*
- * PacketWrapper - Contains wrappers for each packet in Minecraft.
- * Copyright (C) 2012 Kristian S. Stangeland
+ * Copyright (C) filoghost and contributors
*
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.bridge.protocollib.packet;
+package me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.PacketContainer;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/packet/WrapperPlayServerEntityDestroy.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerEntityDestroy.java
similarity index 55%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/packet/WrapperPlayServerEntityDestroy.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerEntityDestroy.java
index d8633fbf..4021fe88 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/packet/WrapperPlayServerEntityDestroy.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerEntityDestroy.java
@@ -1,20 +1,9 @@
/*
- * PacketWrapper - Contains wrappers for each packet in Minecraft.
- * Copyright (C) 2012 Kristian S. Stangeland
+ * Copyright (C) filoghost and contributors
*
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.bridge.protocollib.packet;
+package me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.PacketContainer;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/packet/WrapperPlayServerEntityMetadata.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerEntityMetadata.java
similarity index 68%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/packet/WrapperPlayServerEntityMetadata.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerEntityMetadata.java
index 4b8bcc20..445d1815 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/packet/WrapperPlayServerEntityMetadata.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerEntityMetadata.java
@@ -1,20 +1,9 @@
/*
- * PacketWrapper - Contains wrappers for each packet in Minecraft.
- * Copyright (C) 2012 Kristian S. Stangeland
+ * Copyright (C) filoghost and contributors
*
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.bridge.protocollib.packet;
+package me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.PacketContainer;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/packet/WrapperPlayServerMount.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerMount.java
similarity index 60%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/packet/WrapperPlayServerMount.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerMount.java
index 5a3d4343..79761e1b 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/packet/WrapperPlayServerMount.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerMount.java
@@ -1,20 +1,9 @@
/*
- * PacketWrapper - Contains wrappers for each packet in Minecraft.
- * Copyright (C) 2012 Kristian S. Stangeland
+ * Copyright (C) filoghost and contributors
*
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.bridge.protocollib.packet;
+package me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.PacketContainer;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/packet/WrapperPlayServerSpawnEntity.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerSpawnEntity.java
similarity index 82%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/packet/WrapperPlayServerSpawnEntity.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerSpawnEntity.java
index 5d6f72db..973cdcbb 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/packet/WrapperPlayServerSpawnEntity.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerSpawnEntity.java
@@ -1,20 +1,9 @@
/*
- * PacketWrapper - Contains wrappers for each packet in Minecraft.
- * Copyright (C) 2012 Kristian S. Stangeland
+ * Copyright (C) filoghost and contributors
*
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.bridge.protocollib.packet;
+package me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.ProtocolLibrary;
@@ -22,7 +11,7 @@ import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.events.PacketEvent;
import com.comphenix.protocol.injector.PacketConstructor;
import com.comphenix.protocol.reflect.IntEnum;
-import me.filoghost.holographicdisplays.util.NMSVersion;
+import me.filoghost.holographicdisplays.plugin.util.NMSVersion;
import org.bukkit.World;
import org.bukkit.entity.Entity;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/packet/WrapperPlayServerSpawnEntityLiving.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerSpawnEntityLiving.java
similarity index 75%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/packet/WrapperPlayServerSpawnEntityLiving.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerSpawnEntityLiving.java
index c8e922c9..eeceedd5 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/packet/WrapperPlayServerSpawnEntityLiving.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/packet/WrapperPlayServerSpawnEntityLiving.java
@@ -1,20 +1,9 @@
/*
- * PacketWrapper - Contains wrappers for each packet in Minecraft.
- * Copyright (C) 2012 Kristian S. Stangeland
+ * Copyright (C) filoghost and contributors
*
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.bridge.protocollib.packet;
+package me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.ProtocolLibrary;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/HologramCommandManager.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/HologramCommandManager.java
similarity index 78%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/commands/HologramCommandManager.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/HologramCommandManager.java
index ae08510c..d055a3e6 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/HologramCommandManager.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/HologramCommandManager.java
@@ -3,40 +3,40 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.commands;
+package me.filoghost.holographicdisplays.plugin.commands;
import me.filoghost.fcommons.command.CommandContext;
import me.filoghost.fcommons.command.sub.SubCommand;
import me.filoghost.fcommons.command.sub.SubCommandContext;
import me.filoghost.fcommons.command.sub.SubCommandManager;
-import me.filoghost.holographicdisplays.Colors;
-import me.filoghost.holographicdisplays.HolographicDisplays;
-import me.filoghost.holographicdisplays.commands.subs.AddlineCommand;
-import me.filoghost.holographicdisplays.commands.subs.AlignCommand;
-import me.filoghost.holographicdisplays.commands.subs.CopyCommand;
-import me.filoghost.holographicdisplays.commands.subs.CreateCommand;
-import me.filoghost.holographicdisplays.commands.subs.DebugCommand;
-import me.filoghost.holographicdisplays.commands.subs.DeleteCommand;
-import me.filoghost.holographicdisplays.commands.subs.EditCommand;
-import me.filoghost.holographicdisplays.commands.subs.HelpCommand;
-import me.filoghost.holographicdisplays.commands.subs.InfoCommand;
-import me.filoghost.holographicdisplays.commands.subs.InsertlineCommand;
-import me.filoghost.holographicdisplays.commands.subs.ListCommand;
-import me.filoghost.holographicdisplays.commands.subs.MovehereCommand;
-import me.filoghost.holographicdisplays.commands.subs.NearCommand;
-import me.filoghost.holographicdisplays.commands.subs.QuickEditCommand;
-import me.filoghost.holographicdisplays.commands.subs.ReadimageCommand;
-import me.filoghost.holographicdisplays.commands.subs.ReadtextCommand;
-import me.filoghost.holographicdisplays.commands.subs.ReloadCommand;
-import me.filoghost.holographicdisplays.commands.subs.RemovelineCommand;
-import me.filoghost.holographicdisplays.commands.subs.SetlineCommand;
-import me.filoghost.holographicdisplays.commands.subs.TeleportCommand;
+import me.filoghost.holographicdisplays.plugin.Colors;
+import me.filoghost.holographicdisplays.plugin.HolographicDisplays;
+import me.filoghost.holographicdisplays.plugin.commands.subs.AddlineCommand;
+import me.filoghost.holographicdisplays.plugin.commands.subs.AlignCommand;
+import me.filoghost.holographicdisplays.plugin.commands.subs.CopyCommand;
+import me.filoghost.holographicdisplays.plugin.commands.subs.CreateCommand;
+import me.filoghost.holographicdisplays.plugin.commands.subs.MovehereCommand;
+import me.filoghost.holographicdisplays.plugin.commands.subs.NearCommand;
+import me.filoghost.holographicdisplays.plugin.commands.subs.QuickEditCommand;
+import me.filoghost.holographicdisplays.plugin.commands.subs.ReadimageCommand;
+import me.filoghost.holographicdisplays.plugin.commands.subs.ReadtextCommand;
+import me.filoghost.holographicdisplays.plugin.commands.subs.ReloadCommand;
+import me.filoghost.holographicdisplays.plugin.commands.subs.RemovelineCommand;
+import me.filoghost.holographicdisplays.plugin.commands.subs.SetlineCommand;
+import me.filoghost.holographicdisplays.plugin.commands.subs.TeleportCommand;
+import me.filoghost.holographicdisplays.plugin.commands.subs.DebugCommand;
+import me.filoghost.holographicdisplays.plugin.commands.subs.DeleteCommand;
+import me.filoghost.holographicdisplays.plugin.commands.subs.EditCommand;
+import me.filoghost.holographicdisplays.plugin.commands.subs.HelpCommand;
+import me.filoghost.holographicdisplays.plugin.commands.subs.InfoCommand;
+import me.filoghost.holographicdisplays.plugin.commands.subs.InsertlineCommand;
+import me.filoghost.holographicdisplays.plugin.commands.subs.ListCommand;
import me.filoghost.holographicdisplays.core.Utils;
import me.filoghost.holographicdisplays.core.nms.NMSManager;
-import me.filoghost.holographicdisplays.disk.ConfigManager;
-import me.filoghost.holographicdisplays.disk.Configuration;
-import me.filoghost.holographicdisplays.object.internal.InternalHologram;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramManager;
+import me.filoghost.holographicdisplays.plugin.disk.ConfigManager;
+import me.filoghost.holographicdisplays.plugin.disk.Configuration;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologram;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramManager;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.ComponentBuilder;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/HologramCommandValidate.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/HologramCommandValidate.java
similarity index 79%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/commands/HologramCommandValidate.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/HologramCommandValidate.java
index 8077fc86..8f34d0bc 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/HologramCommandValidate.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/HologramCommandValidate.java
@@ -3,17 +3,17 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.commands;
+package me.filoghost.holographicdisplays.plugin.commands;
import me.filoghost.fcommons.command.validation.CommandException;
import me.filoghost.fcommons.command.validation.CommandValidate;
import me.filoghost.holographicdisplays.core.Utils;
-import me.filoghost.holographicdisplays.disk.HologramLineParser;
-import me.filoghost.holographicdisplays.disk.HologramLoadException;
-import me.filoghost.holographicdisplays.object.internal.InternalHologram;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramLine;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramManager;
-import me.filoghost.holographicdisplays.util.FileUtils;
+import me.filoghost.holographicdisplays.plugin.disk.HologramLineParser;
+import me.filoghost.holographicdisplays.plugin.disk.HologramLoadException;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologram;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramLine;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramManager;
+import me.filoghost.holographicdisplays.plugin.util.FileUtils;
import java.nio.file.Files;
import java.nio.file.Path;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/HologramSubCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/HologramSubCommand.java
similarity index 94%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/commands/HologramSubCommand.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/HologramSubCommand.java
index 5405ec98..cadeb5d9 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/HologramSubCommand.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/HologramSubCommand.java
@@ -3,11 +3,11 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.commands;
+package me.filoghost.holographicdisplays.plugin.commands;
import me.filoghost.fcommons.command.CommandContext;
import me.filoghost.fcommons.command.sub.SubCommand;
-import me.filoghost.holographicdisplays.Permissions;
+import me.filoghost.holographicdisplays.plugin.Permissions;
import java.util.Arrays;
import java.util.Collections;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/Messages.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/Messages.java
similarity index 88%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/commands/Messages.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/Messages.java
index 121758ff..a89c625b 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/Messages.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/Messages.java
@@ -3,9 +3,9 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.commands;
+package me.filoghost.holographicdisplays.plugin.commands;
-import me.filoghost.holographicdisplays.Colors;
+import me.filoghost.holographicdisplays.plugin.Colors;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/AddlineCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/AddlineCommand.java
similarity index 73%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/AddlineCommand.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/AddlineCommand.java
index 785adf94..3263b520 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/AddlineCommand.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/AddlineCommand.java
@@ -3,19 +3,19 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.commands.subs;
+package me.filoghost.holographicdisplays.plugin.commands.subs;
import me.filoghost.fcommons.Strings;
import me.filoghost.fcommons.command.sub.SubCommandContext;
import me.filoghost.fcommons.command.validation.CommandException;
-import me.filoghost.holographicdisplays.Colors;
-import me.filoghost.holographicdisplays.commands.HologramCommandManager;
-import me.filoghost.holographicdisplays.commands.HologramCommandValidate;
-import me.filoghost.holographicdisplays.disk.ConfigManager;
-import me.filoghost.holographicdisplays.event.InternalHologramEditEvent;
-import me.filoghost.holographicdisplays.object.internal.InternalHologram;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramLine;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramManager;
+import me.filoghost.holographicdisplays.plugin.Colors;
+import me.filoghost.holographicdisplays.plugin.commands.HologramCommandManager;
+import me.filoghost.holographicdisplays.plugin.commands.HologramCommandValidate;
+import me.filoghost.holographicdisplays.plugin.disk.ConfigManager;
+import me.filoghost.holographicdisplays.plugin.event.InternalHologramEditEvent;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologram;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramLine;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramManager;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/AlignCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/AlignCommand.java
similarity index 82%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/AlignCommand.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/AlignCommand.java
index 6ded2242..a33a06ff 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/AlignCommand.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/AlignCommand.java
@@ -3,17 +3,17 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.commands.subs;
+package me.filoghost.holographicdisplays.plugin.commands.subs;
import me.filoghost.fcommons.command.sub.SubCommandContext;
import me.filoghost.fcommons.command.validation.CommandException;
import me.filoghost.fcommons.command.validation.CommandValidate;
-import me.filoghost.holographicdisplays.Colors;
-import me.filoghost.holographicdisplays.commands.HologramCommandValidate;
-import me.filoghost.holographicdisplays.commands.HologramSubCommand;
-import me.filoghost.holographicdisplays.disk.ConfigManager;
-import me.filoghost.holographicdisplays.object.internal.InternalHologram;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramManager;
+import me.filoghost.holographicdisplays.plugin.Colors;
+import me.filoghost.holographicdisplays.plugin.commands.HologramCommandValidate;
+import me.filoghost.holographicdisplays.plugin.commands.HologramSubCommand;
+import me.filoghost.holographicdisplays.plugin.disk.ConfigManager;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologram;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramManager;
import org.bukkit.Location;
import org.bukkit.command.CommandSender;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/CopyCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/CopyCommand.java
similarity index 75%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/CopyCommand.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/CopyCommand.java
index dbb92264..94a088bf 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/CopyCommand.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/CopyCommand.java
@@ -3,17 +3,17 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.commands.subs;
+package me.filoghost.holographicdisplays.plugin.commands.subs;
import me.filoghost.fcommons.command.sub.SubCommandContext;
import me.filoghost.fcommons.command.validation.CommandException;
-import me.filoghost.holographicdisplays.Colors;
-import me.filoghost.holographicdisplays.commands.HologramCommandValidate;
-import me.filoghost.holographicdisplays.commands.HologramSubCommand;
-import me.filoghost.holographicdisplays.disk.ConfigManager;
-import me.filoghost.holographicdisplays.object.internal.InternalHologram;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramLine;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramManager;
+import me.filoghost.holographicdisplays.plugin.Colors;
+import me.filoghost.holographicdisplays.plugin.commands.HologramCommandValidate;
+import me.filoghost.holographicdisplays.plugin.commands.HologramSubCommand;
+import me.filoghost.holographicdisplays.plugin.disk.ConfigManager;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologram;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramLine;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramManager;
import org.bukkit.command.CommandSender;
import java.util.ArrayList;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/CreateCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/CreateCommand.java
similarity index 85%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/CreateCommand.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/CreateCommand.java
index bfb00f7f..03ff1f74 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/CreateCommand.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/CreateCommand.java
@@ -3,19 +3,19 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.commands.subs;
+package me.filoghost.holographicdisplays.plugin.commands.subs;
import me.filoghost.fcommons.Strings;
import me.filoghost.fcommons.command.sub.SubCommandContext;
import me.filoghost.fcommons.command.validation.CommandException;
import me.filoghost.fcommons.command.validation.CommandValidate;
-import me.filoghost.holographicdisplays.Colors;
-import me.filoghost.holographicdisplays.commands.HologramCommandValidate;
-import me.filoghost.holographicdisplays.commands.HologramSubCommand;
-import me.filoghost.holographicdisplays.disk.ConfigManager;
-import me.filoghost.holographicdisplays.object.internal.InternalHologram;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramLine;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramManager;
+import me.filoghost.holographicdisplays.plugin.Colors;
+import me.filoghost.holographicdisplays.plugin.commands.HologramCommandValidate;
+import me.filoghost.holographicdisplays.plugin.commands.HologramSubCommand;
+import me.filoghost.holographicdisplays.plugin.disk.ConfigManager;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologram;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramLine;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramManager;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.command.CommandSender;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/DebugCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/DebugCommand.java
similarity index 94%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/DebugCommand.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/DebugCommand.java
index 4066725f..cc5f5758 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/DebugCommand.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/DebugCommand.java
@@ -3,11 +3,11 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.commands.subs;
+package me.filoghost.holographicdisplays.plugin.commands.subs;
import me.filoghost.fcommons.command.sub.SubCommandContext;
-import me.filoghost.holographicdisplays.Colors;
-import me.filoghost.holographicdisplays.commands.HologramSubCommand;
+import me.filoghost.holographicdisplays.plugin.Colors;
+import me.filoghost.holographicdisplays.plugin.commands.HologramSubCommand;
import me.filoghost.holographicdisplays.core.nms.NMSManager;
import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity;
import me.filoghost.holographicdisplays.core.hologram.StandardHologram;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/DeleteCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/DeleteCommand.java
similarity index 72%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/DeleteCommand.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/DeleteCommand.java
index c7391deb..7d9cf446 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/DeleteCommand.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/DeleteCommand.java
@@ -3,16 +3,16 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.commands.subs;
+package me.filoghost.holographicdisplays.plugin.commands.subs;
import me.filoghost.fcommons.command.sub.SubCommandContext;
import me.filoghost.fcommons.command.validation.CommandException;
-import me.filoghost.holographicdisplays.Colors;
-import me.filoghost.holographicdisplays.commands.HologramCommandValidate;
-import me.filoghost.holographicdisplays.commands.HologramSubCommand;
-import me.filoghost.holographicdisplays.disk.ConfigManager;
-import me.filoghost.holographicdisplays.object.internal.InternalHologram;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramManager;
+import me.filoghost.holographicdisplays.plugin.Colors;
+import me.filoghost.holographicdisplays.plugin.commands.HologramSubCommand;
+import me.filoghost.holographicdisplays.plugin.commands.HologramCommandValidate;
+import me.filoghost.holographicdisplays.plugin.disk.ConfigManager;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologram;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramManager;
import org.bukkit.command.CommandSender;
public class DeleteCommand extends HologramSubCommand {
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/EditCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/EditCommand.java
similarity index 82%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/EditCommand.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/EditCommand.java
index 29838d50..51f054d5 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/EditCommand.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/EditCommand.java
@@ -3,17 +3,17 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.commands.subs;
+package me.filoghost.holographicdisplays.plugin.commands.subs;
import me.filoghost.fcommons.command.sub.SubCommandContext;
import me.filoghost.fcommons.command.validation.CommandException;
-import me.filoghost.holographicdisplays.Colors;
-import me.filoghost.holographicdisplays.commands.HologramCommandManager;
-import me.filoghost.holographicdisplays.commands.HologramCommandValidate;
-import me.filoghost.holographicdisplays.commands.HologramSubCommand;
-import me.filoghost.holographicdisplays.commands.Messages;
-import me.filoghost.holographicdisplays.object.internal.InternalHologram;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramManager;
+import me.filoghost.holographicdisplays.plugin.Colors;
+import me.filoghost.holographicdisplays.plugin.commands.HologramCommandManager;
+import me.filoghost.holographicdisplays.plugin.commands.HologramSubCommand;
+import me.filoghost.holographicdisplays.plugin.commands.Messages;
+import me.filoghost.holographicdisplays.plugin.commands.HologramCommandValidate;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologram;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramManager;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.ComponentBuilder;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/HelpCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/HelpCommand.java
similarity index 90%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/HelpCommand.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/HelpCommand.java
index f440f72c..130eb5f7 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/HelpCommand.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/HelpCommand.java
@@ -3,13 +3,13 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.commands.subs;
+package me.filoghost.holographicdisplays.plugin.commands.subs;
import me.filoghost.fcommons.command.sub.SubCommandContext;
-import me.filoghost.holographicdisplays.Colors;
-import me.filoghost.holographicdisplays.commands.HologramCommandManager;
-import me.filoghost.holographicdisplays.commands.HologramSubCommand;
-import me.filoghost.holographicdisplays.commands.Messages;
+import me.filoghost.holographicdisplays.plugin.Colors;
+import me.filoghost.holographicdisplays.plugin.commands.HologramCommandManager;
+import me.filoghost.holographicdisplays.plugin.commands.HologramSubCommand;
+import me.filoghost.holographicdisplays.plugin.commands.Messages;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.ComponentBuilder;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/InfoCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/InfoCommand.java
similarity index 73%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/InfoCommand.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/InfoCommand.java
index 359a40dc..5c14fd4d 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/InfoCommand.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/InfoCommand.java
@@ -3,17 +3,17 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.commands.subs;
+package me.filoghost.holographicdisplays.plugin.commands.subs;
import me.filoghost.fcommons.command.sub.SubCommandContext;
import me.filoghost.fcommons.command.validation.CommandException;
-import me.filoghost.holographicdisplays.Colors;
-import me.filoghost.holographicdisplays.commands.HologramCommandManager;
-import me.filoghost.holographicdisplays.commands.HologramCommandValidate;
-import me.filoghost.holographicdisplays.commands.Messages;
-import me.filoghost.holographicdisplays.object.internal.InternalHologram;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramLine;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramManager;
+import me.filoghost.holographicdisplays.plugin.Colors;
+import me.filoghost.holographicdisplays.plugin.commands.HologramCommandManager;
+import me.filoghost.holographicdisplays.plugin.commands.Messages;
+import me.filoghost.holographicdisplays.plugin.commands.HologramCommandValidate;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologram;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramLine;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramManager;
import org.bukkit.command.CommandSender;
public class InfoCommand extends LineEditingCommand implements QuickEditCommand {
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/InsertlineCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/InsertlineCommand.java
similarity index 80%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/InsertlineCommand.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/InsertlineCommand.java
index d15776b9..af024d45 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/InsertlineCommand.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/InsertlineCommand.java
@@ -3,21 +3,21 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.commands.subs;
+package me.filoghost.holographicdisplays.plugin.commands.subs;
import me.filoghost.fcommons.Strings;
import me.filoghost.fcommons.command.sub.SubCommandContext;
import me.filoghost.fcommons.command.validation.CommandException;
import me.filoghost.fcommons.command.validation.CommandValidate;
-import me.filoghost.holographicdisplays.Colors;
-import me.filoghost.holographicdisplays.commands.HologramCommandManager;
-import me.filoghost.holographicdisplays.commands.HologramCommandValidate;
-import me.filoghost.holographicdisplays.commands.Messages;
-import me.filoghost.holographicdisplays.disk.ConfigManager;
-import me.filoghost.holographicdisplays.event.InternalHologramEditEvent;
-import me.filoghost.holographicdisplays.object.internal.InternalHologram;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramLine;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramManager;
+import me.filoghost.holographicdisplays.plugin.Colors;
+import me.filoghost.holographicdisplays.plugin.commands.HologramCommandManager;
+import me.filoghost.holographicdisplays.plugin.commands.Messages;
+import me.filoghost.holographicdisplays.plugin.commands.HologramCommandValidate;
+import me.filoghost.holographicdisplays.plugin.disk.ConfigManager;
+import me.filoghost.holographicdisplays.plugin.event.InternalHologramEditEvent;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologram;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramLine;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramManager;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/LineEditingCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/LineEditingCommand.java
similarity index 69%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/LineEditingCommand.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/LineEditingCommand.java
index 0389be52..edd0543a 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/LineEditingCommand.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/LineEditingCommand.java
@@ -3,9 +3,9 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.commands.subs;
+package me.filoghost.holographicdisplays.plugin.commands.subs;
-import me.filoghost.holographicdisplays.commands.HologramSubCommand;
+import me.filoghost.holographicdisplays.plugin.commands.HologramSubCommand;
public abstract class LineEditingCommand extends HologramSubCommand {
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/ListCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/ListCommand.java
similarity index 85%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/ListCommand.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/ListCommand.java
index 0d12a23f..87c93c0b 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/ListCommand.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/ListCommand.java
@@ -3,16 +3,16 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.commands.subs;
+package me.filoghost.holographicdisplays.plugin.commands.subs;
import me.filoghost.fcommons.command.sub.SubCommandContext;
import me.filoghost.fcommons.command.validation.CommandException;
import me.filoghost.fcommons.command.validation.CommandValidate;
-import me.filoghost.holographicdisplays.Colors;
-import me.filoghost.holographicdisplays.commands.HologramSubCommand;
-import me.filoghost.holographicdisplays.commands.Messages;
-import me.filoghost.holographicdisplays.object.internal.InternalHologram;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramManager;
+import me.filoghost.holographicdisplays.plugin.Colors;
+import me.filoghost.holographicdisplays.plugin.commands.HologramSubCommand;
+import me.filoghost.holographicdisplays.plugin.commands.Messages;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologram;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramManager;
import org.bukkit.command.CommandSender;
import java.util.List;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/MovehereCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/MovehereCommand.java
similarity index 76%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/MovehereCommand.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/MovehereCommand.java
index 1fc14ad6..6eba5cd5 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/MovehereCommand.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/MovehereCommand.java
@@ -3,17 +3,17 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.commands.subs;
+package me.filoghost.holographicdisplays.plugin.commands.subs;
import me.filoghost.fcommons.command.sub.SubCommandContext;
import me.filoghost.fcommons.command.validation.CommandException;
import me.filoghost.fcommons.command.validation.CommandValidate;
-import me.filoghost.holographicdisplays.Colors;
-import me.filoghost.holographicdisplays.commands.HologramCommandValidate;
-import me.filoghost.holographicdisplays.commands.HologramSubCommand;
-import me.filoghost.holographicdisplays.disk.ConfigManager;
-import me.filoghost.holographicdisplays.object.internal.InternalHologram;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramManager;
+import me.filoghost.holographicdisplays.plugin.Colors;
+import me.filoghost.holographicdisplays.plugin.commands.HologramCommandValidate;
+import me.filoghost.holographicdisplays.plugin.commands.HologramSubCommand;
+import me.filoghost.holographicdisplays.plugin.disk.ConfigManager;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologram;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramManager;
import org.bukkit.Location;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/NearCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/NearCommand.java
similarity index 84%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/NearCommand.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/NearCommand.java
index 2e3f4c90..8f335a10 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/NearCommand.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/NearCommand.java
@@ -3,16 +3,16 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.commands.subs;
+package me.filoghost.holographicdisplays.plugin.commands.subs;
import me.filoghost.fcommons.command.sub.SubCommandContext;
import me.filoghost.fcommons.command.validation.CommandException;
import me.filoghost.fcommons.command.validation.CommandValidate;
-import me.filoghost.holographicdisplays.Colors;
-import me.filoghost.holographicdisplays.commands.HologramSubCommand;
-import me.filoghost.holographicdisplays.commands.Messages;
-import me.filoghost.holographicdisplays.object.internal.InternalHologram;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramManager;
+import me.filoghost.holographicdisplays.plugin.Colors;
+import me.filoghost.holographicdisplays.plugin.commands.HologramSubCommand;
+import me.filoghost.holographicdisplays.plugin.commands.Messages;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologram;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramManager;
import org.bukkit.World;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/QuickEditCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/QuickEditCommand.java
similarity index 73%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/QuickEditCommand.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/QuickEditCommand.java
index 3d20b1aa..647c3edc 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/QuickEditCommand.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/QuickEditCommand.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.commands.subs;
+package me.filoghost.holographicdisplays.plugin.commands.subs;
public interface QuickEditCommand {
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/ReadimageCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/ReadimageCommand.java
similarity index 85%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/ReadimageCommand.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/ReadimageCommand.java
index dcf5fd36..c0a739ab 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/ReadimageCommand.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/ReadimageCommand.java
@@ -3,25 +3,25 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.commands.subs;
+package me.filoghost.holographicdisplays.plugin.commands.subs;
import me.filoghost.fcommons.command.CommandContext;
import me.filoghost.fcommons.command.sub.SubCommandContext;
import me.filoghost.fcommons.command.validation.CommandException;
import me.filoghost.fcommons.command.validation.CommandValidate;
import me.filoghost.fcommons.logging.Log;
-import me.filoghost.holographicdisplays.Colors;
-import me.filoghost.holographicdisplays.commands.HologramCommandValidate;
-import me.filoghost.holographicdisplays.commands.Messages;
-import me.filoghost.holographicdisplays.disk.ConfigManager;
-import me.filoghost.holographicdisplays.event.InternalHologramEditEvent;
-import me.filoghost.holographicdisplays.image.ImageMessage;
-import me.filoghost.holographicdisplays.image.ImageReadException;
-import me.filoghost.holographicdisplays.image.ImageReader;
-import me.filoghost.holographicdisplays.image.ImageTooWideException;
-import me.filoghost.holographicdisplays.object.internal.InternalHologram;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramManager;
-import me.filoghost.holographicdisplays.object.internal.InternalTextLine;
+import me.filoghost.holographicdisplays.plugin.Colors;
+import me.filoghost.holographicdisplays.plugin.image.ImageMessage;
+import me.filoghost.holographicdisplays.plugin.image.ImageReadException;
+import me.filoghost.holographicdisplays.plugin.image.ImageReader;
+import me.filoghost.holographicdisplays.plugin.image.ImageTooWideException;
+import me.filoghost.holographicdisplays.plugin.commands.HologramCommandValidate;
+import me.filoghost.holographicdisplays.plugin.commands.Messages;
+import me.filoghost.holographicdisplays.plugin.disk.ConfigManager;
+import me.filoghost.holographicdisplays.plugin.event.InternalHologramEditEvent;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologram;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramManager;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalTextLine;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/ReadtextCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/ReadtextCommand.java
similarity index 81%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/ReadtextCommand.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/ReadtextCommand.java
index fff5b7c2..ac153e86 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/ReadtextCommand.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/ReadtextCommand.java
@@ -3,22 +3,22 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.commands.subs;
+package me.filoghost.holographicdisplays.plugin.commands.subs;
import me.filoghost.fcommons.command.CommandContext;
import me.filoghost.fcommons.command.sub.SubCommandContext;
import me.filoghost.fcommons.command.validation.CommandException;
-import me.filoghost.holographicdisplays.Colors;
-import me.filoghost.holographicdisplays.commands.HologramCommandValidate;
-import me.filoghost.holographicdisplays.commands.Messages;
-import me.filoghost.holographicdisplays.disk.ConfigManager;
-import me.filoghost.holographicdisplays.disk.HologramLineParser;
-import me.filoghost.holographicdisplays.disk.HologramLoadException;
-import me.filoghost.holographicdisplays.event.InternalHologramEditEvent;
-import me.filoghost.holographicdisplays.object.internal.InternalHologram;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramLine;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramManager;
-import me.filoghost.holographicdisplays.util.FileUtils;
+import me.filoghost.holographicdisplays.plugin.Colors;
+import me.filoghost.holographicdisplays.plugin.commands.HologramCommandValidate;
+import me.filoghost.holographicdisplays.plugin.commands.Messages;
+import me.filoghost.holographicdisplays.plugin.disk.ConfigManager;
+import me.filoghost.holographicdisplays.plugin.disk.HologramLineParser;
+import me.filoghost.holographicdisplays.plugin.disk.HologramLoadException;
+import me.filoghost.holographicdisplays.plugin.event.InternalHologramEditEvent;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologram;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramLine;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramManager;
+import me.filoghost.holographicdisplays.plugin.util.FileUtils;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/ReloadCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/ReloadCommand.java
similarity index 75%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/ReloadCommand.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/ReloadCommand.java
index 8ba6f741..4a09cec3 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/ReloadCommand.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/ReloadCommand.java
@@ -3,14 +3,14 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.commands.subs;
+package me.filoghost.holographicdisplays.plugin.commands.subs;
import me.filoghost.fcommons.command.sub.SubCommandContext;
-import me.filoghost.holographicdisplays.Colors;
-import me.filoghost.holographicdisplays.HolographicDisplays;
-import me.filoghost.holographicdisplays.commands.HologramSubCommand;
-import me.filoghost.holographicdisplays.event.HolographicDisplaysReloadEvent;
-import me.filoghost.holographicdisplays.log.PrintableErrorCollector;
+import me.filoghost.holographicdisplays.plugin.Colors;
+import me.filoghost.holographicdisplays.plugin.HolographicDisplays;
+import me.filoghost.holographicdisplays.plugin.commands.HologramSubCommand;
+import me.filoghost.holographicdisplays.plugin.event.HolographicDisplaysReloadEvent;
+import me.filoghost.holographicdisplays.plugin.log.PrintableErrorCollector;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/RemovelineCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/RemovelineCommand.java
similarity index 79%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/RemovelineCommand.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/RemovelineCommand.java
index d559ea28..336eb6bb 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/RemovelineCommand.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/RemovelineCommand.java
@@ -3,18 +3,18 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.commands.subs;
+package me.filoghost.holographicdisplays.plugin.commands.subs;
import me.filoghost.fcommons.command.sub.SubCommandContext;
import me.filoghost.fcommons.command.validation.CommandException;
import me.filoghost.fcommons.command.validation.CommandValidate;
-import me.filoghost.holographicdisplays.Colors;
-import me.filoghost.holographicdisplays.commands.HologramCommandManager;
-import me.filoghost.holographicdisplays.commands.HologramCommandValidate;
-import me.filoghost.holographicdisplays.disk.ConfigManager;
-import me.filoghost.holographicdisplays.event.InternalHologramEditEvent;
-import me.filoghost.holographicdisplays.object.internal.InternalHologram;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramManager;
+import me.filoghost.holographicdisplays.plugin.Colors;
+import me.filoghost.holographicdisplays.plugin.commands.HologramCommandManager;
+import me.filoghost.holographicdisplays.plugin.commands.HologramCommandValidate;
+import me.filoghost.holographicdisplays.plugin.disk.ConfigManager;
+import me.filoghost.holographicdisplays.plugin.event.InternalHologramEditEvent;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologram;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramManager;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/SetlineCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/SetlineCommand.java
similarity index 77%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/SetlineCommand.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/SetlineCommand.java
index 1d76318b..3154a3b6 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/SetlineCommand.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/SetlineCommand.java
@@ -3,20 +3,20 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.commands.subs;
+package me.filoghost.holographicdisplays.plugin.commands.subs;
import me.filoghost.fcommons.Strings;
import me.filoghost.fcommons.command.sub.SubCommandContext;
import me.filoghost.fcommons.command.validation.CommandException;
import me.filoghost.fcommons.command.validation.CommandValidate;
-import me.filoghost.holographicdisplays.Colors;
-import me.filoghost.holographicdisplays.commands.HologramCommandManager;
-import me.filoghost.holographicdisplays.commands.HologramCommandValidate;
-import me.filoghost.holographicdisplays.disk.ConfigManager;
-import me.filoghost.holographicdisplays.event.InternalHologramEditEvent;
-import me.filoghost.holographicdisplays.object.internal.InternalHologram;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramLine;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramManager;
+import me.filoghost.holographicdisplays.plugin.Colors;
+import me.filoghost.holographicdisplays.plugin.commands.HologramCommandManager;
+import me.filoghost.holographicdisplays.plugin.commands.HologramCommandValidate;
+import me.filoghost.holographicdisplays.plugin.disk.ConfigManager;
+import me.filoghost.holographicdisplays.plugin.event.InternalHologramEditEvent;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologram;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramLine;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramManager;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/TeleportCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/TeleportCommand.java
similarity index 76%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/TeleportCommand.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/TeleportCommand.java
index 7aa1a962..e1c4f4a5 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/TeleportCommand.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/TeleportCommand.java
@@ -3,16 +3,16 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.commands.subs;
+package me.filoghost.holographicdisplays.plugin.commands.subs;
import me.filoghost.fcommons.command.sub.SubCommandContext;
import me.filoghost.fcommons.command.validation.CommandException;
import me.filoghost.fcommons.command.validation.CommandValidate;
-import me.filoghost.holographicdisplays.Colors;
-import me.filoghost.holographicdisplays.commands.HologramCommandValidate;
-import me.filoghost.holographicdisplays.commands.HologramSubCommand;
-import me.filoghost.holographicdisplays.object.internal.InternalHologram;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramManager;
+import me.filoghost.holographicdisplays.plugin.Colors;
+import me.filoghost.holographicdisplays.plugin.commands.HologramCommandValidate;
+import me.filoghost.holographicdisplays.plugin.commands.HologramSubCommand;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologram;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramManager;
import org.bukkit.Location;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/disk/ConfigManager.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/ConfigManager.java
similarity index 96%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/disk/ConfigManager.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/ConfigManager.java
index 8148a9fc..fd297a80 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/disk/ConfigManager.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/ConfigManager.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.disk;
+package me.filoghost.holographicdisplays.plugin.disk;
import me.filoghost.fcommons.config.BaseConfigManager;
import me.filoghost.fcommons.config.Config;
@@ -14,7 +14,7 @@ import me.filoghost.fcommons.config.exception.ConfigException;
import me.filoghost.fcommons.config.mapped.MappedConfigLoader;
import me.filoghost.fcommons.logging.ErrorCollector;
import me.filoghost.fcommons.logging.Log;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramManager;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramManager;
import java.nio.file.Path;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/disk/Configuration.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/Configuration.java
similarity index 97%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/disk/Configuration.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/Configuration.java
index 0272388f..46582913 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/disk/Configuration.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/Configuration.java
@@ -4,12 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-/*
- * Copyright (C) filoghost and contributors
- *
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-package me.filoghost.holographicdisplays.disk;
+package me.filoghost.holographicdisplays.plugin.disk;
import me.filoghost.fcommons.Strings;
import me.filoghost.fcommons.logging.ErrorCollector;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/disk/ConfigurationFileModel.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/ConfigurationFileModel.java
similarity index 98%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/disk/ConfigurationFileModel.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/ConfigurationFileModel.java
index c8f4498b..94bfe549 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/disk/ConfigurationFileModel.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/ConfigurationFileModel.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.disk;
+package me.filoghost.holographicdisplays.plugin.disk;
import me.filoghost.fcommons.config.Config;
import me.filoghost.fcommons.config.mapped.Path;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/disk/HologramConfig.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/HologramConfig.java
similarity index 93%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/disk/HologramConfig.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/HologramConfig.java
index 39ae58fd..cc4c4ab4 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/disk/HologramConfig.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/HologramConfig.java
@@ -3,13 +3,13 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.disk;
+package me.filoghost.holographicdisplays.plugin.disk;
import me.filoghost.fcommons.Strings;
import me.filoghost.fcommons.config.ConfigSection;
-import me.filoghost.holographicdisplays.object.internal.InternalHologram;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramLine;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramManager;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologram;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramLine;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramManager;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/disk/HologramDatabase.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/HologramDatabase.java
similarity index 90%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/disk/HologramDatabase.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/HologramDatabase.java
index 9cbc62c9..498db16f 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/disk/HologramDatabase.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/HologramDatabase.java
@@ -3,15 +3,15 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.disk;
+package me.filoghost.holographicdisplays.plugin.disk;
import me.filoghost.fcommons.config.Config;
import me.filoghost.fcommons.config.ConfigPath;
import me.filoghost.fcommons.config.ConfigSection;
import me.filoghost.fcommons.config.ConfigType;
import me.filoghost.fcommons.logging.ErrorCollector;
-import me.filoghost.holographicdisplays.object.internal.InternalHologram;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramManager;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologram;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramManager;
import java.util.ArrayList;
import java.util.List;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/disk/HologramLineParser.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/HologramLineParser.java
similarity index 90%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/disk/HologramLineParser.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/HologramLineParser.java
index 5ad0f265..277aa6fb 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/disk/HologramLineParser.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/HologramLineParser.java
@@ -3,14 +3,14 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.disk;
+package me.filoghost.holographicdisplays.plugin.disk;
import me.filoghost.fcommons.MaterialsHelper;
import me.filoghost.fcommons.Strings;
-import me.filoghost.holographicdisplays.nbt.parser.MojangsonParseException;
-import me.filoghost.holographicdisplays.nbt.parser.MojangsonParser;
-import me.filoghost.holographicdisplays.object.internal.InternalHologram;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramLine;
+import me.filoghost.holographicdisplays.plugin.nbt.parser.MojangsonParseException;
+import me.filoghost.holographicdisplays.plugin.nbt.parser.MojangsonParser;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologram;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramLine;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/disk/HologramLoadException.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/HologramLoadException.java
similarity index 86%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/disk/HologramLoadException.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/HologramLoadException.java
index cca33f3f..f2ce1b00 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/disk/HologramLoadException.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/HologramLoadException.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.disk;
+package me.filoghost.holographicdisplays.plugin.disk;
public class HologramLoadException extends Exception {
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/disk/ServerAddress.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/ServerAddress.java
similarity index 92%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/disk/ServerAddress.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/ServerAddress.java
index f0feedb2..d570a74c 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/disk/ServerAddress.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/ServerAddress.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.disk;
+package me.filoghost.holographicdisplays.plugin.disk;
public class ServerAddress {
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/disk/StaticReplacements.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/StaticReplacements.java
similarity index 97%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/disk/StaticReplacements.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/StaticReplacements.java
index 5b705613..cac63b4f 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/disk/StaticReplacements.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/StaticReplacements.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.disk;
+package me.filoghost.holographicdisplays.plugin.disk;
import me.filoghost.fcommons.Colors;
import me.filoghost.fcommons.config.ConfigPath;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/disk/TextFormatter.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/TextFormatter.java
similarity index 76%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/disk/TextFormatter.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/TextFormatter.java
index 5dd8b54f..efe4bdb3 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/disk/TextFormatter.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/TextFormatter.java
@@ -4,12 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-/*
- * Copyright (C) filoghost and contributors
- *
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-package me.filoghost.holographicdisplays.disk;
+package me.filoghost.holographicdisplays.plugin.disk;
import me.filoghost.fcommons.Colors;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/disk/upgrade/LegacySymbolsUpgrade.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/upgrade/LegacySymbolsUpgrade.java
similarity index 96%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/disk/upgrade/LegacySymbolsUpgrade.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/upgrade/LegacySymbolsUpgrade.java
index f8697f0d..f3110496 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/disk/upgrade/LegacySymbolsUpgrade.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/upgrade/LegacySymbolsUpgrade.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.disk.upgrade;
+package me.filoghost.holographicdisplays.plugin.disk.upgrade;
import me.filoghost.fcommons.Strings;
import me.filoghost.fcommons.config.Config;
@@ -14,7 +14,7 @@ import me.filoghost.fcommons.config.ConfigSection;
import me.filoghost.fcommons.config.exception.ConfigLoadException;
import me.filoghost.fcommons.config.exception.ConfigSaveException;
import me.filoghost.fcommons.logging.ErrorCollector;
-import me.filoghost.holographicdisplays.disk.ConfigManager;
+import me.filoghost.holographicdisplays.plugin.disk.ConfigManager;
import org.apache.commons.lang.StringEscapeUtils;
import java.io.IOException;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/event/HolographicDisplaysReloadEvent.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/event/HolographicDisplaysReloadEvent.java
similarity index 89%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/event/HolographicDisplaysReloadEvent.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/event/HolographicDisplaysReloadEvent.java
index 663cac4c..b8b25347 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/event/HolographicDisplaysReloadEvent.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/event/HolographicDisplaysReloadEvent.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.event;
+package me.filoghost.holographicdisplays.plugin.event;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/event/InternalHologramEditEvent.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/event/InternalHologramEditEvent.java
similarity index 83%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/event/InternalHologramEditEvent.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/event/InternalHologramEditEvent.java
index 2693dfe7..7f140add 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/event/InternalHologramEditEvent.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/event/InternalHologramEditEvent.java
@@ -3,9 +3,9 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.event;
+package me.filoghost.holographicdisplays.plugin.event;
-import me.filoghost.holographicdisplays.object.internal.InternalHologram;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologram;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/image/ImageMessage.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/image/ImageMessage.java
similarity index 98%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/image/ImageMessage.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/image/ImageMessage.java
index e302167c..d02a7ddd 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/image/ImageMessage.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/image/ImageMessage.java
@@ -3,9 +3,9 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.image;
+package me.filoghost.holographicdisplays.plugin.image;
-import me.filoghost.holographicdisplays.disk.Configuration;
+import me.filoghost.holographicdisplays.plugin.disk.Configuration;
import org.bukkit.ChatColor;
import java.awt.Color;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/image/ImageReadException.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/image/ImageReadException.java
similarity index 73%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/image/ImageReadException.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/image/ImageReadException.java
index 917909d0..a1230544 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/image/ImageReadException.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/image/ImageReadException.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.image;
+package me.filoghost.holographicdisplays.plugin.image;
public class ImageReadException extends Exception {
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/image/ImageReader.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/image/ImageReader.java
similarity index 94%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/image/ImageReader.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/image/ImageReader.java
index 5ab636a9..55981179 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/image/ImageReader.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/image/ImageReader.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.image;
+package me.filoghost.holographicdisplays.plugin.image;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/image/ImageTooWideException.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/image/ImageTooWideException.java
similarity index 74%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/image/ImageTooWideException.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/image/ImageTooWideException.java
index dfd2cead..11719a29 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/image/ImageTooWideException.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/image/ImageTooWideException.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.image;
+package me.filoghost.holographicdisplays.plugin.image;
public class ImageTooWideException extends Exception {
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/NewPickupHandlerAdapter.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/NewPickupHandlerAdapter.java
similarity index 95%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/NewPickupHandlerAdapter.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/NewPickupHandlerAdapter.java
index 16920a90..a7ea647d 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/NewPickupHandlerAdapter.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/NewPickupHandlerAdapter.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.legacy.api.v2;
+package me.filoghost.holographicdisplays.plugin.legacy.api.v2;
import com.gmail.filoghost.holographicdisplays.api.handler.PickupHandler;
import org.bukkit.entity.Player;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/NewTouchHandlerAdapter.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/NewTouchHandlerAdapter.java
similarity index 95%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/NewTouchHandlerAdapter.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/NewTouchHandlerAdapter.java
index 21e05248..38b47621 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/NewTouchHandlerAdapter.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/NewTouchHandlerAdapter.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.legacy.api.v2;
+package me.filoghost.holographicdisplays.plugin.legacy.api.v2;
import com.gmail.filoghost.holographicdisplays.api.handler.TouchHandler;
import org.bukkit.entity.Player;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/V2HologramAdapter.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2HologramAdapter.java
similarity index 96%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/V2HologramAdapter.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2HologramAdapter.java
index e41c84da..ccb5c6dc 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/V2HologramAdapter.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2HologramAdapter.java
@@ -3,14 +3,14 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.legacy.api.v2;
+package me.filoghost.holographicdisplays.plugin.legacy.api.v2;
import com.gmail.filoghost.holographicdisplays.api.Hologram;
import com.gmail.filoghost.holographicdisplays.api.VisibilityManager;
import com.gmail.filoghost.holographicdisplays.api.line.HologramLine;
import com.gmail.filoghost.holographicdisplays.api.line.ItemLine;
import com.gmail.filoghost.holographicdisplays.api.line.TextLine;
-import me.filoghost.holographicdisplays.object.api.APIHologram;
+import me.filoghost.holographicdisplays.plugin.object.api.APIHologram;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.inventory.ItemStack;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/V2HologramLineAdapter.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2HologramLineAdapter.java
similarity index 89%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/V2HologramLineAdapter.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2HologramLineAdapter.java
index 54b80b6b..58bd8661 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/V2HologramLineAdapter.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2HologramLineAdapter.java
@@ -3,10 +3,10 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.legacy.api.v2;
+package me.filoghost.holographicdisplays.plugin.legacy.api.v2;
import com.gmail.filoghost.holographicdisplays.api.line.HologramLine;
-import me.filoghost.holographicdisplays.object.api.APIHologramLine;
+import me.filoghost.holographicdisplays.plugin.object.api.APIHologramLine;
@SuppressWarnings("deprecation")
public abstract class V2HologramLineAdapter implements HologramLine {
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/V2HologramsAPIProvider.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2HologramsAPIProvider.java
similarity index 93%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/V2HologramsAPIProvider.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2HologramsAPIProvider.java
index b43286ea..0c4835b3 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/V2HologramsAPIProvider.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2HologramsAPIProvider.java
@@ -3,16 +3,16 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.legacy.api.v2;
+package me.filoghost.holographicdisplays.plugin.legacy.api.v2;
import com.gmail.filoghost.holographicdisplays.api.Hologram;
import com.gmail.filoghost.holographicdisplays.api.internal.HologramsAPIProvider;
import com.gmail.filoghost.holographicdisplays.api.placeholder.PlaceholderReplacer;
import me.filoghost.fcommons.Preconditions;
import me.filoghost.holographicdisplays.core.nms.NMSManager;
-import me.filoghost.holographicdisplays.object.api.APIHologram;
-import me.filoghost.holographicdisplays.object.api.APIHologramManager;
-import me.filoghost.holographicdisplays.placeholder.registry.PlaceholderRegistry;
+import me.filoghost.holographicdisplays.plugin.object.api.APIHologram;
+import me.filoghost.holographicdisplays.plugin.object.api.APIHologramManager;
+import me.filoghost.holographicdisplays.plugin.placeholder.registry.PlaceholderRegistry;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.entity.Entity;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/V2ItemLineAdapter.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2ItemLineAdapter.java
similarity index 95%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/V2ItemLineAdapter.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2ItemLineAdapter.java
index 3892198a..26962731 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/V2ItemLineAdapter.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2ItemLineAdapter.java
@@ -3,11 +3,11 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.legacy.api.v2;
+package me.filoghost.holographicdisplays.plugin.legacy.api.v2;
import com.gmail.filoghost.holographicdisplays.api.handler.PickupHandler;
import com.gmail.filoghost.holographicdisplays.api.line.ItemLine;
-import me.filoghost.holographicdisplays.object.api.APIItemLine;
+import me.filoghost.holographicdisplays.plugin.object.api.APIItemLine;
import org.bukkit.inventory.ItemStack;
@SuppressWarnings("deprecation")
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/V2PickupHandlerAdapter.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2PickupHandlerAdapter.java
similarity index 95%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/V2PickupHandlerAdapter.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2PickupHandlerAdapter.java
index b45c3d5f..50d66070 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/V2PickupHandlerAdapter.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2PickupHandlerAdapter.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.legacy.api.v2;
+package me.filoghost.holographicdisplays.plugin.legacy.api.v2;
import me.filoghost.holographicdisplays.api.handler.PickupHandler;
import org.bukkit.entity.Player;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/V2TextLineAdapter.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2TextLineAdapter.java
similarity index 82%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/V2TextLineAdapter.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2TextLineAdapter.java
index c198be95..ddf5f140 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/V2TextLineAdapter.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2TextLineAdapter.java
@@ -3,10 +3,10 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.legacy.api.v2;
+package me.filoghost.holographicdisplays.plugin.legacy.api.v2;
import com.gmail.filoghost.holographicdisplays.api.line.TextLine;
-import me.filoghost.holographicdisplays.object.api.APITextLine;
+import me.filoghost.holographicdisplays.plugin.object.api.APITextLine;
@SuppressWarnings("deprecation")
public class V2TextLineAdapter extends V2TouchableLineAdapter implements TextLine {
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/V2TouchHandlerAdapter.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2TouchHandlerAdapter.java
similarity index 95%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/V2TouchHandlerAdapter.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2TouchHandlerAdapter.java
index de2890f7..c03c4935 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/V2TouchHandlerAdapter.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2TouchHandlerAdapter.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.legacy.api.v2;
+package me.filoghost.holographicdisplays.plugin.legacy.api.v2;
import me.filoghost.holographicdisplays.api.handler.TouchHandler;
import org.bukkit.entity.Player;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/V2TouchableLineAdapter.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2TouchableLineAdapter.java
similarity index 95%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/V2TouchableLineAdapter.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2TouchableLineAdapter.java
index 8995975e..871d552e 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/V2TouchableLineAdapter.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2TouchableLineAdapter.java
@@ -3,11 +3,11 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.legacy.api.v2;
+package me.filoghost.holographicdisplays.plugin.legacy.api.v2;
import com.gmail.filoghost.holographicdisplays.api.handler.TouchHandler;
import com.gmail.filoghost.holographicdisplays.api.line.TouchableLine;
-import me.filoghost.holographicdisplays.object.api.APITouchableLine;
+import me.filoghost.holographicdisplays.plugin.object.api.APITouchableLine;
@SuppressWarnings("deprecation")
abstract class V2TouchableLineAdapter extends V2HologramLineAdapter implements TouchableLine {
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/V2VisibilityManagerAdapter.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2VisibilityManagerAdapter.java
similarity index 93%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/V2VisibilityManagerAdapter.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2VisibilityManagerAdapter.java
index bf8e868d..7add73cb 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/legacy/api/v2/V2VisibilityManagerAdapter.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2VisibilityManagerAdapter.java
@@ -3,11 +3,11 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.legacy.api.v2;
+package me.filoghost.holographicdisplays.plugin.legacy.api.v2;
import com.gmail.filoghost.holographicdisplays.api.VisibilityManager;
import me.filoghost.holographicdisplays.api.VisibilitySettings.Visibility;
-import me.filoghost.holographicdisplays.object.api.DefaultVisibilitySettings;
+import me.filoghost.holographicdisplays.plugin.object.api.DefaultVisibilitySettings;
import org.bukkit.entity.Player;
@SuppressWarnings("deprecation")
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/listener/ChunkListener.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/ChunkListener.java
similarity index 87%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/listener/ChunkListener.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/ChunkListener.java
index d770c33d..42ebcceb 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/listener/ChunkListener.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/ChunkListener.java
@@ -3,13 +3,13 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.listener;
+package me.filoghost.holographicdisplays.plugin.listener;
import me.filoghost.holographicdisplays.core.nms.NMSManager;
import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity;
-import me.filoghost.holographicdisplays.object.api.APIHologramManager;
-import me.filoghost.holographicdisplays.object.internal.InternalHologramManager;
-import me.filoghost.holographicdisplays.util.SchedulerUtils;
+import me.filoghost.holographicdisplays.plugin.object.api.APIHologramManager;
+import me.filoghost.holographicdisplays.plugin.object.internal.InternalHologramManager;
+import me.filoghost.holographicdisplays.plugin.util.SchedulerUtils;
import org.bukkit.Chunk;
import org.bukkit.entity.Entity;
import org.bukkit.event.EventHandler;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/listener/InteractListener.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/InteractListener.java
similarity index 96%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/listener/InteractListener.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/InteractListener.java
index 652e2bc0..fe1b0cc6 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/listener/InteractListener.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/InteractListener.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.listener;
+package me.filoghost.holographicdisplays.plugin.listener;
import me.filoghost.holographicdisplays.core.nms.NMSManager;
import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/listener/SpawnListener.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/SpawnListener.java
similarity index 95%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/listener/SpawnListener.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/SpawnListener.java
index f4967804..5c1fea51 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/listener/SpawnListener.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/SpawnListener.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.listener;
+package me.filoghost.holographicdisplays.plugin.listener;
import me.filoghost.holographicdisplays.core.nms.NMSManager;
import org.bukkit.event.EventHandler;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/listener/UpdateNotificationListener.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/UpdateNotificationListener.java
similarity index 84%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/listener/UpdateNotificationListener.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/UpdateNotificationListener.java
index f947ffea..65cd0482 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/listener/UpdateNotificationListener.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/UpdateNotificationListener.java
@@ -3,13 +3,13 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.listener;
+package me.filoghost.holographicdisplays.plugin.listener;
import me.filoghost.fcommons.logging.Log;
-import me.filoghost.holographicdisplays.Colors;
-import me.filoghost.holographicdisplays.HolographicDisplays;
-import me.filoghost.holographicdisplays.Permissions;
-import me.filoghost.holographicdisplays.disk.Configuration;
+import me.filoghost.holographicdisplays.plugin.Colors;
+import me.filoghost.holographicdisplays.plugin.HolographicDisplays;
+import me.filoghost.holographicdisplays.plugin.Permissions;
+import me.filoghost.holographicdisplays.plugin.disk.Configuration;
import me.filoghost.updatechecker.UpdateChecker;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/log/ErrorPrintInfo.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/log/ErrorPrintInfo.java
similarity index 93%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/log/ErrorPrintInfo.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/log/ErrorPrintInfo.java
index d457241a..1a6b320f 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/log/ErrorPrintInfo.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/log/ErrorPrintInfo.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.log;
+package me.filoghost.holographicdisplays.plugin.log;
import java.util.List;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/log/MessagePartJoiner.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/log/MessagePartJoiner.java
similarity index 97%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/log/MessagePartJoiner.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/log/MessagePartJoiner.java
index 209d9b0a..976b9250 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/log/MessagePartJoiner.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/log/MessagePartJoiner.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.log;
+package me.filoghost.holographicdisplays.plugin.log;
import me.filoghost.fcommons.Strings;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/log/PrintableErrorCollector.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/log/PrintableErrorCollector.java
similarity index 96%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/log/PrintableErrorCollector.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/log/PrintableErrorCollector.java
index e3574c96..31277a58 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/log/PrintableErrorCollector.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/log/PrintableErrorCollector.java
@@ -3,14 +3,14 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.log;
+package me.filoghost.holographicdisplays.plugin.log;
import me.filoghost.fcommons.ExceptionUtils;
import me.filoghost.fcommons.config.exception.ConfigException;
import me.filoghost.fcommons.config.exception.ConfigSyntaxException;
import me.filoghost.fcommons.logging.ErrorCollector;
import me.filoghost.fcommons.logging.ErrorLog;
-import me.filoghost.holographicdisplays.disk.HologramLoadException;
+import me.filoghost.holographicdisplays.plugin.disk.HologramLoadException;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTByte.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTByte.java
similarity index 87%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTByte.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTByte.java
index 3caa4644..d0234a1d 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTByte.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTByte.java
@@ -1,9 +1,9 @@
/*
- * Copyright (C) Jan Schultke
+ * Copyright (C) filoghost and contributors
*
- * SPDX-License-Identifier: MIT
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.nbt;
+package me.filoghost.holographicdisplays.plugin.nbt;
/**
* The {@code TAG_Byte} tag.
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTByteArray.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTByteArray.java
similarity index 90%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTByteArray.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTByteArray.java
index 95dda63d..7d23d175 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTByteArray.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTByteArray.java
@@ -1,9 +1,9 @@
/*
- * Copyright (C) Jan Schultke
+ * Copyright (C) filoghost and contributors
*
- * SPDX-License-Identifier: MIT
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.nbt;
+package me.filoghost.holographicdisplays.plugin.nbt;
import java.util.Arrays;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTCompound.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTCompound.java
similarity index 98%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTCompound.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTCompound.java
index 5a470fc1..172d9e63 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTCompound.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTCompound.java
@@ -1,9 +1,9 @@
/*
- * Copyright (C) Jan Schultke
+ * Copyright (C) filoghost and contributors
*
- * SPDX-License-Identifier: MIT
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.nbt;
+package me.filoghost.holographicdisplays.plugin.nbt;
import java.util.Collections;
import java.util.LinkedHashMap;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTDouble.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTDouble.java
similarity index 87%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTDouble.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTDouble.java
index 50a3a76f..fa5f51ae 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTDouble.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTDouble.java
@@ -1,9 +1,9 @@
/*
- * Copyright (C) Jan Schultke
+ * Copyright (C) filoghost and contributors
*
- * SPDX-License-Identifier: MIT
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.nbt;
+package me.filoghost.holographicdisplays.plugin.nbt;
/**
* The {@code TAG_Double} tag.
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTFloat.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTFloat.java
similarity index 87%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTFloat.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTFloat.java
index 25d0a590..f5e922d0 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTFloat.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTFloat.java
@@ -1,9 +1,9 @@
/*
- * Copyright (C) Jan Schultke
+ * Copyright (C) filoghost and contributors
*
- * SPDX-License-Identifier: MIT
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.nbt;
+package me.filoghost.holographicdisplays.plugin.nbt;
/**
* The {@code TAG_Float} tag.
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTInt.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTInt.java
similarity index 87%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTInt.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTInt.java
index b891ac44..7b8624b9 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTInt.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTInt.java
@@ -1,9 +1,9 @@
/*
- * Copyright (C) Jan Schultke
+ * Copyright (C) filoghost and contributors
*
- * SPDX-License-Identifier: MIT
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.nbt;
+package me.filoghost.holographicdisplays.plugin.nbt;
/**
* The {@code TAG_Int} tag.
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTIntArray.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTIntArray.java
similarity index 92%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTIntArray.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTIntArray.java
index b178345d..199cc097 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTIntArray.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTIntArray.java
@@ -1,9 +1,9 @@
/*
- * Copyright (C) Jan Schultke
+ * Copyright (C) filoghost and contributors
*
- * SPDX-License-Identifier: MIT
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.nbt;
+package me.filoghost.holographicdisplays.plugin.nbt;
import java.util.Arrays;
import java.util.Objects;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTList.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTList.java
similarity index 96%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTList.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTList.java
index 3bdb5ba0..66750951 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTList.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTList.java
@@ -1,9 +1,9 @@
/*
- * Copyright (C) Jan Schultke
+ * Copyright (C) filoghost and contributors
*
- * SPDX-License-Identifier: MIT
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.nbt;
+package me.filoghost.holographicdisplays.plugin.nbt;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTLong.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTLong.java
similarity index 87%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTLong.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTLong.java
index 496bd7f2..514098f1 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTLong.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTLong.java
@@ -1,9 +1,9 @@
/*
- * Copyright (C) Jan Schultke
+ * Copyright (C) filoghost and contributors
*
- * SPDX-License-Identifier: MIT
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.nbt;
+package me.filoghost.holographicdisplays.plugin.nbt;
/**
* The {@code TAG_Long} tag.
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTLongArray.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTLongArray.java
similarity index 91%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTLongArray.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTLongArray.java
index 4ce4c446..26a87fb7 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTLongArray.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTLongArray.java
@@ -1,9 +1,9 @@
/*
- * Copyright (C) Jan Schultke
+ * Copyright (C) filoghost and contributors
*
- * SPDX-License-Identifier: MIT
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.nbt;
+package me.filoghost.holographicdisplays.plugin.nbt;
import java.util.Arrays;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTShort.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTShort.java
similarity index 87%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTShort.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTShort.java
index 965ace1f..88cabc07 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTShort.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTShort.java
@@ -1,9 +1,9 @@
/*
- * Copyright (C) Jan Schultke
+ * Copyright (C) filoghost and contributors
*
- * SPDX-License-Identifier: MIT
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.nbt;
+package me.filoghost.holographicdisplays.plugin.nbt;
/**
* The {@code TAG_Short} tag.
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTString.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTString.java
similarity index 90%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTString.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTString.java
index 4b221789..bc0e639e 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTString.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTString.java
@@ -1,9 +1,9 @@
/*
- * Copyright (C) Jan Schultke
+ * Copyright (C) filoghost and contributors
*
- * SPDX-License-Identifier: MIT
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.nbt;
+package me.filoghost.holographicdisplays.plugin.nbt;
/**
* The {@code TAG_String} tag.
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTTag.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTTag.java
similarity index 89%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTTag.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTTag.java
index 3729e12b..5eb15eb6 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTTag.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTTag.java
@@ -1,9 +1,9 @@
/*
- * Copyright (C) Jan Schultke
+ * Copyright (C) filoghost and contributors
*
- * SPDX-License-Identifier: MIT
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.nbt;
+package me.filoghost.holographicdisplays.plugin.nbt;
/**
* An abstract NBT-Tag.
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTType.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTType.java
similarity index 97%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTType.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTType.java
index e738f81e..30eafc0f 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/NBTType.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/NBTType.java
@@ -1,9 +1,9 @@
/*
- * Copyright (C) Jan Schultke
+ * Copyright (C) filoghost and contributors
*
- * SPDX-License-Identifier: MIT
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.nbt;
+package me.filoghost.holographicdisplays.plugin.nbt;
/**
*
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/parser/MojangsonParseException.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/parser/MojangsonParseException.java
similarity index 81%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/nbt/parser/MojangsonParseException.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/parser/MojangsonParseException.java
index 5be7fdc8..d221fc70 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/parser/MojangsonParseException.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/parser/MojangsonParseException.java
@@ -1,9 +1,9 @@
/*
- * Copyright (C) Jan Schultke
+ * Copyright (C) filoghost and contributors
*
- * SPDX-License-Identifier: MIT
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.nbt.parser;
+package me.filoghost.holographicdisplays.plugin.nbt.parser;
import java.io.IOException;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/parser/MojangsonParser.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/parser/MojangsonParser.java
similarity index 92%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/nbt/parser/MojangsonParser.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/parser/MojangsonParser.java
index c258e91f..2e0b74ef 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/nbt/parser/MojangsonParser.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/nbt/parser/MojangsonParser.java
@@ -1,24 +1,24 @@
/*
- * Copyright (C) Jan Schultke
+ * Copyright (C) filoghost and contributors
*
- * SPDX-License-Identifier: MIT
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.nbt.parser;
+package me.filoghost.holographicdisplays.plugin.nbt.parser;
-import me.filoghost.holographicdisplays.nbt.NBTByte;
-import me.filoghost.holographicdisplays.nbt.NBTByteArray;
-import me.filoghost.holographicdisplays.nbt.NBTCompound;
-import me.filoghost.holographicdisplays.nbt.NBTDouble;
-import me.filoghost.holographicdisplays.nbt.NBTFloat;
-import me.filoghost.holographicdisplays.nbt.NBTInt;
-import me.filoghost.holographicdisplays.nbt.NBTIntArray;
-import me.filoghost.holographicdisplays.nbt.NBTList;
-import me.filoghost.holographicdisplays.nbt.NBTLong;
-import me.filoghost.holographicdisplays.nbt.NBTLongArray;
-import me.filoghost.holographicdisplays.nbt.NBTShort;
-import me.filoghost.holographicdisplays.nbt.NBTString;
-import me.filoghost.holographicdisplays.nbt.NBTTag;
-import me.filoghost.holographicdisplays.nbt.NBTType;
+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 java.util.ArrayList;
import java.util.List;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/object/api/APIHologram.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/api/APIHologram.java
similarity index 91%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/object/api/APIHologram.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/api/APIHologram.java
index fbf17a1c..bc4b6df1 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/object/api/APIHologram.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/api/APIHologram.java
@@ -3,15 +3,15 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.object.api;
+package me.filoghost.holographicdisplays.plugin.object.api;
import me.filoghost.fcommons.Preconditions;
import me.filoghost.holographicdisplays.api.Hologram;
import me.filoghost.holographicdisplays.core.nms.NMSManager;
-import me.filoghost.holographicdisplays.disk.Configuration;
-import me.filoghost.holographicdisplays.legacy.api.v2.V2HologramAdapter;
-import me.filoghost.holographicdisplays.object.base.BaseHologram;
-import me.filoghost.holographicdisplays.placeholder.tracking.PlaceholderLineTracker;
+import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker;
+import me.filoghost.holographicdisplays.plugin.disk.Configuration;
+import me.filoghost.holographicdisplays.plugin.legacy.api.v2.V2HologramAdapter;
+import me.filoghost.holographicdisplays.plugin.object.base.BaseHologram;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/object/api/APIHologramLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/api/APIHologramLine.java
similarity index 79%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/object/api/APIHologramLine.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/api/APIHologramLine.java
index adc4b23e..8a183321 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/object/api/APIHologramLine.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/api/APIHologramLine.java
@@ -3,11 +3,11 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.object.api;
+package me.filoghost.holographicdisplays.plugin.object.api;
import me.filoghost.holographicdisplays.api.line.HologramLine;
import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine;
-import me.filoghost.holographicdisplays.legacy.api.v2.V2HologramLineAdapter;
+import me.filoghost.holographicdisplays.plugin.legacy.api.v2.V2HologramLineAdapter;
import org.jetbrains.annotations.NotNull;
public interface APIHologramLine extends HologramLine, StandardHologramLine {
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/object/api/APIHologramManager.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/api/APIHologramManager.java
similarity index 86%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/object/api/APIHologramManager.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/api/APIHologramManager.java
index 73c739e4..364342ff 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/object/api/APIHologramManager.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/api/APIHologramManager.java
@@ -3,12 +3,12 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.object.api;
+package me.filoghost.holographicdisplays.plugin.object.api;
import me.filoghost.holographicdisplays.api.Hologram;
import me.filoghost.holographicdisplays.core.nms.NMSManager;
-import me.filoghost.holographicdisplays.object.base.BaseHologramManager;
-import me.filoghost.holographicdisplays.placeholder.tracking.PlaceholderLineTracker;
+import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker;
+import me.filoghost.holographicdisplays.plugin.object.base.BaseHologramManager;
import org.bukkit.Location;
import org.bukkit.plugin.Plugin;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/object/api/APIItemLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/api/APIItemLine.java
similarity index 86%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/object/api/APIItemLine.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/api/APIItemLine.java
index c24aa88d..8a811bcd 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/object/api/APIItemLine.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/api/APIItemLine.java
@@ -3,13 +3,13 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.object.api;
+package me.filoghost.holographicdisplays.plugin.object.api;
import me.filoghost.holographicdisplays.api.handler.PickupHandler;
import me.filoghost.holographicdisplays.api.handler.TouchHandler;
import me.filoghost.holographicdisplays.api.line.ItemLine;
-import me.filoghost.holographicdisplays.legacy.api.v2.V2ItemLineAdapter;
-import me.filoghost.holographicdisplays.object.base.BaseItemLine;
+import me.filoghost.holographicdisplays.plugin.legacy.api.v2.V2ItemLineAdapter;
+import me.filoghost.holographicdisplays.plugin.object.base.BaseItemLine;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/object/api/APITextLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/api/APITextLine.java
similarity index 84%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/object/api/APITextLine.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/api/APITextLine.java
index e9b0aeca..58536363 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/object/api/APITextLine.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/api/APITextLine.java
@@ -3,12 +3,12 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.object.api;
+package me.filoghost.holographicdisplays.plugin.object.api;
import me.filoghost.holographicdisplays.api.handler.TouchHandler;
import me.filoghost.holographicdisplays.api.line.TextLine;
-import me.filoghost.holographicdisplays.legacy.api.v2.V2TextLineAdapter;
-import me.filoghost.holographicdisplays.object.base.BaseTextLine;
+import me.filoghost.holographicdisplays.plugin.legacy.api.v2.V2TextLineAdapter;
+import me.filoghost.holographicdisplays.plugin.object.base.BaseTextLine;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/object/api/APITouchableLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/api/APITouchableLine.java
similarity index 80%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/object/api/APITouchableLine.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/api/APITouchableLine.java
index 94b3ad42..3865d734 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/object/api/APITouchableLine.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/api/APITouchableLine.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.object.api;
+package me.filoghost.holographicdisplays.plugin.object.api;
import me.filoghost.holographicdisplays.api.line.TouchableLine;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/object/api/DefaultVisibilitySettings.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/api/DefaultVisibilitySettings.java
similarity index 95%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/object/api/DefaultVisibilitySettings.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/api/DefaultVisibilitySettings.java
index 3a22a10f..69e5427a 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/object/api/DefaultVisibilitySettings.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/api/DefaultVisibilitySettings.java
@@ -3,13 +3,13 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.object.api;
+package me.filoghost.holographicdisplays.plugin.object.api;
import me.filoghost.fcommons.Preconditions;
import me.filoghost.holographicdisplays.api.VisibilitySettings;
-import me.filoghost.holographicdisplays.bridge.protocollib.ProtocolLibHook;
+import me.filoghost.holographicdisplays.plugin.bridge.protocollib.ProtocolLibHook;
import me.filoghost.holographicdisplays.core.hologram.StandardHologram;
-import me.filoghost.holographicdisplays.legacy.api.v2.V2VisibilityManagerAdapter;
+import me.filoghost.holographicdisplays.plugin.legacy.api.v2.V2VisibilityManagerAdapter;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/object/base/BaseHologram.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/base/BaseHologram.java
similarity index 96%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/object/base/BaseHologram.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/base/BaseHologram.java
index 6fc95603..1aba26ff 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/object/base/BaseHologram.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/base/BaseHologram.java
@@ -3,14 +3,14 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.object.base;
+package me.filoghost.holographicdisplays.plugin.object.base;
import me.filoghost.fcommons.Preconditions;
import me.filoghost.holographicdisplays.core.hologram.StandardHologram;
import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine;
import me.filoghost.holographicdisplays.core.nms.NMSManager;
-import me.filoghost.holographicdisplays.disk.Configuration;
-import me.filoghost.holographicdisplays.placeholder.tracking.PlaceholderLineTracker;
+import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker;
+import me.filoghost.holographicdisplays.plugin.disk.Configuration;
import org.bukkit.Location;
import org.bukkit.World;
import org.jetbrains.annotations.NotNull;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/object/base/BaseHologramComponent.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/base/BaseHologramComponent.java
similarity index 96%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/object/base/BaseHologramComponent.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/base/BaseHologramComponent.java
index d694555f..bed62d5f 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/object/base/BaseHologramComponent.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/base/BaseHologramComponent.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.object.base;
+package me.filoghost.holographicdisplays.plugin.object.base;
import me.filoghost.fcommons.Preconditions;
import org.bukkit.Chunk;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/object/base/BaseHologramLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/base/BaseHologramLine.java
similarity index 94%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/object/base/BaseHologramLine.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/base/BaseHologramLine.java
index c2d1f0a9..0e2129c5 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/object/base/BaseHologramLine.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/base/BaseHologramLine.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.object.base;
+package me.filoghost.holographicdisplays.plugin.object.base;
import me.filoghost.fcommons.Preconditions;
import me.filoghost.holographicdisplays.core.DebugLogger;
@@ -11,7 +11,7 @@ import me.filoghost.holographicdisplays.core.hologram.StandardHologram;
import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine;
import me.filoghost.holographicdisplays.core.nms.NMSManager;
import me.filoghost.holographicdisplays.core.nms.SpawnFailedException;
-import me.filoghost.holographicdisplays.placeholder.tracking.PlaceholderLineTracker;
+import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker;
import org.bukkit.World;
public abstract class BaseHologramLine extends BaseHologramComponent implements StandardHologramLine {
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/object/base/BaseHologramManager.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/base/BaseHologramManager.java
similarity index 95%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/object/base/BaseHologramManager.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/base/BaseHologramManager.java
index 217a0758..09c9fcbb 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/object/base/BaseHologramManager.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/base/BaseHologramManager.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.object.base;
+package me.filoghost.holographicdisplays.plugin.object.base;
import me.filoghost.fcommons.Preconditions;
import me.filoghost.holographicdisplays.core.hologram.StandardHologram;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/object/base/BaseItemLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/base/BaseItemLine.java
similarity index 98%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/object/base/BaseItemLine.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/base/BaseItemLine.java
index 4a5a99dd..537bc3f0 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/object/base/BaseItemLine.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/base/BaseItemLine.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.object.base;
+package me.filoghost.holographicdisplays.plugin.object.base;
import me.filoghost.fcommons.Preconditions;
import me.filoghost.fcommons.logging.Log;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/object/base/BaseTextLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/base/BaseTextLine.java
similarity index 97%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/object/base/BaseTextLine.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/base/BaseTextLine.java
index 684a3bea..0d1ae38f 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/object/base/BaseTextLine.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/base/BaseTextLine.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.object.base;
+package me.filoghost.holographicdisplays.plugin.object.base;
import me.filoghost.holographicdisplays.core.hologram.StandardTextLine;
import me.filoghost.holographicdisplays.core.nms.SpawnFailedException;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/object/base/BaseTouchableLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/base/BaseTouchableLine.java
similarity index 98%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/object/base/BaseTouchableLine.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/base/BaseTouchableLine.java
index ac5bbc02..906f6576 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/object/base/BaseTouchableLine.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/base/BaseTouchableLine.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.object.base;
+package me.filoghost.holographicdisplays.plugin.object.base;
import me.filoghost.fcommons.logging.Log;
import me.filoghost.holographicdisplays.api.handler.TouchHandler;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/object/internal/InternalHologram.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/internal/InternalHologram.java
similarity index 82%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/object/internal/InternalHologram.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/internal/InternalHologram.java
index 9f06f3af..d02a39b6 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/object/internal/InternalHologram.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/internal/InternalHologram.java
@@ -3,12 +3,12 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.object.internal;
+package me.filoghost.holographicdisplays.plugin.object.internal;
-import me.filoghost.holographicdisplays.HolographicDisplays;
+import me.filoghost.holographicdisplays.plugin.HolographicDisplays;
+import me.filoghost.holographicdisplays.plugin.object.base.BaseHologram;
+import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker;
import me.filoghost.holographicdisplays.core.nms.NMSManager;
-import me.filoghost.holographicdisplays.object.base.BaseHologram;
-import me.filoghost.holographicdisplays.placeholder.tracking.PlaceholderLineTracker;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/object/internal/InternalHologramLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/internal/InternalHologramLine.java
similarity index 81%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/object/internal/InternalHologramLine.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/internal/InternalHologramLine.java
index 93cb37c5..10509123 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/object/internal/InternalHologramLine.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/internal/InternalHologramLine.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.object.internal;
+package me.filoghost.holographicdisplays.plugin.object.internal;
import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/object/internal/InternalHologramManager.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/internal/InternalHologramManager.java
similarity index 83%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/object/internal/InternalHologramManager.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/internal/InternalHologramManager.java
index db0f9c14..69fa34b8 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/object/internal/InternalHologramManager.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/internal/InternalHologramManager.java
@@ -3,11 +3,11 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.object.internal;
+package me.filoghost.holographicdisplays.plugin.object.internal;
import me.filoghost.holographicdisplays.core.nms.NMSManager;
-import me.filoghost.holographicdisplays.object.base.BaseHologramManager;
-import me.filoghost.holographicdisplays.placeholder.tracking.PlaceholderLineTracker;
+import me.filoghost.holographicdisplays.plugin.object.base.BaseHologramManager;
+import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker;
import org.bukkit.Location;
public class InternalHologramManager extends BaseHologramManager {
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/object/internal/InternalItemLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/internal/InternalItemLine.java
similarity index 81%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/object/internal/InternalItemLine.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/internal/InternalItemLine.java
index 80cb79b8..340fe8c6 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/object/internal/InternalItemLine.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/internal/InternalItemLine.java
@@ -3,9 +3,9 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.object.internal;
+package me.filoghost.holographicdisplays.plugin.object.internal;
-import me.filoghost.holographicdisplays.object.base.BaseItemLine;
+import me.filoghost.holographicdisplays.plugin.object.base.BaseItemLine;
import org.bukkit.inventory.ItemStack;
public class InternalItemLine extends BaseItemLine implements InternalHologramLine {
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/object/internal/InternalTextLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/internal/InternalTextLine.java
similarity index 82%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/object/internal/InternalTextLine.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/internal/InternalTextLine.java
index 9ad2c02c..4dfe0a9c 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/object/internal/InternalTextLine.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/object/internal/InternalTextLine.java
@@ -3,9 +3,9 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.object.internal;
+package me.filoghost.holographicdisplays.plugin.object.internal;
-import me.filoghost.holographicdisplays.object.base.BaseTextLine;
+import me.filoghost.holographicdisplays.plugin.object.base.BaseTextLine;
public class InternalTextLine extends BaseTextLine implements InternalHologramLine {
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/PlaceholderException.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/PlaceholderException.java
similarity index 76%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/PlaceholderException.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/PlaceholderException.java
index e96896a9..dee53d77 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/PlaceholderException.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/PlaceholderException.java
@@ -3,9 +3,9 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder;
+package me.filoghost.holographicdisplays.plugin.placeholder;
-import me.filoghost.holographicdisplays.placeholder.registry.PlaceholderExpansion;
+import me.filoghost.holographicdisplays.plugin.placeholder.registry.PlaceholderExpansion;
public class PlaceholderException extends Exception {
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/StandardPlaceholder.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/StandardPlaceholder.java
similarity index 86%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/StandardPlaceholder.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/StandardPlaceholder.java
index af949a92..844c65ba 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/StandardPlaceholder.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/StandardPlaceholder.java
@@ -3,16 +3,17 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder;
+package me.filoghost.holographicdisplays.plugin.placeholder;
-import me.filoghost.holographicdisplays.placeholder.registry.PlaceholderExpansion;
+import me.filoghost.holographicdisplays.plugin.placeholder.registry.PlaceholderExpansion;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public abstract class StandardPlaceholder {
- private final @NotNull PlaceholderExpansion source;
+ private final @NotNull
+ PlaceholderExpansion source;
protected StandardPlaceholder(@NotNull PlaceholderExpansion source) {
this.source = source;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/TickClock.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/TickClock.java
similarity index 83%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/TickClock.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/TickClock.java
index 690f2956..54a36383 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/TickClock.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/TickClock.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder;
+package me.filoghost.holographicdisplays.plugin.placeholder;
public class TickClock {
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/TickingTask.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/TickingTask.java
similarity index 79%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/TickingTask.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/TickingTask.java
index 5dbd5a22..176a64e2 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/TickingTask.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/TickingTask.java
@@ -3,9 +3,9 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder;
+package me.filoghost.holographicdisplays.plugin.placeholder;
-import me.filoghost.holographicdisplays.placeholder.tracking.PlaceholderLineTracker;
+import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker;
public class TickingTask implements Runnable {
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/internal/AnimationPlaceholder.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/AnimationPlaceholder.java
similarity index 92%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/internal/AnimationPlaceholder.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/AnimationPlaceholder.java
index ad3764cf..fc7f6029 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/internal/AnimationPlaceholder.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/AnimationPlaceholder.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder.internal;
+package me.filoghost.holographicdisplays.plugin.placeholder.internal;
import me.filoghost.holographicdisplays.api.placeholder.Placeholder;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/internal/AnimationRegistry.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/AnimationRegistry.java
similarity index 94%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/internal/AnimationRegistry.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/AnimationRegistry.java
index 1e7e67c8..537522df 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/internal/AnimationRegistry.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/AnimationRegistry.java
@@ -3,13 +3,13 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder.internal;
+package me.filoghost.holographicdisplays.plugin.placeholder.internal;
import me.filoghost.fcommons.config.exception.ConfigSaveException;
import me.filoghost.fcommons.logging.ErrorCollector;
import me.filoghost.holographicdisplays.core.DebugLogger;
-import me.filoghost.holographicdisplays.disk.ConfigManager;
-import me.filoghost.holographicdisplays.disk.TextFormatter;
+import me.filoghost.holographicdisplays.plugin.disk.ConfigManager;
+import me.filoghost.holographicdisplays.plugin.disk.TextFormatter;
import me.filoghost.holographicdisplays.api.placeholder.Placeholder;
import me.filoghost.holographicdisplays.api.placeholder.PlaceholderFactory;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/internal/DefaultPlaceholders.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/DefaultPlaceholders.java
similarity index 90%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/internal/DefaultPlaceholders.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/DefaultPlaceholders.java
index 5df68238..7edc9a41 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/internal/DefaultPlaceholders.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/DefaultPlaceholders.java
@@ -3,14 +3,14 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder.internal;
+package me.filoghost.holographicdisplays.plugin.placeholder.internal;
import me.filoghost.fcommons.collection.CollectionUtils;
-import me.filoghost.holographicdisplays.HolographicDisplays;
-import me.filoghost.holographicdisplays.bridge.bungeecord.BungeeServerTracker;
-import me.filoghost.holographicdisplays.bridge.bungeecord.ServerInfo;
-import me.filoghost.holographicdisplays.disk.Configuration;
-import me.filoghost.holographicdisplays.placeholder.registry.PlaceholderRegistry;
+import me.filoghost.holographicdisplays.plugin.HolographicDisplays;
+import me.filoghost.holographicdisplays.plugin.placeholder.registry.PlaceholderRegistry;
+import me.filoghost.holographicdisplays.plugin.bridge.bungeecord.BungeeServerTracker;
+import me.filoghost.holographicdisplays.plugin.bridge.bungeecord.ServerInfo;
+import me.filoghost.holographicdisplays.plugin.disk.Configuration;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/internal/OnlinePlayersPlaceholderFactory.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/OnlinePlayersPlaceholderFactory.java
similarity index 93%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/internal/OnlinePlayersPlaceholderFactory.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/OnlinePlayersPlaceholderFactory.java
index ea72b26a..75489359 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/internal/OnlinePlayersPlaceholderFactory.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/OnlinePlayersPlaceholderFactory.java
@@ -3,12 +3,12 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder.internal;
+package me.filoghost.holographicdisplays.plugin.placeholder.internal;
import me.filoghost.fcommons.Strings;
import me.filoghost.holographicdisplays.api.placeholder.Placeholder;
import me.filoghost.holographicdisplays.api.placeholder.PlaceholderFactory;
-import me.filoghost.holographicdisplays.bridge.bungeecord.BungeeServerTracker;
+import me.filoghost.holographicdisplays.plugin.bridge.bungeecord.BungeeServerTracker;
import org.bukkit.Bukkit;
import org.jetbrains.annotations.Nullable;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/internal/StaticPlaceholder.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/StaticPlaceholder.java
similarity index 88%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/internal/StaticPlaceholder.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/StaticPlaceholder.java
index b219d3f1..0f23ee40 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/internal/StaticPlaceholder.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/StaticPlaceholder.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder.internal;
+package me.filoghost.holographicdisplays.plugin.placeholder.internal;
import me.filoghost.holographicdisplays.api.placeholder.Placeholder;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/internal/WorldPlayersPlaceholderFactory.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/WorldPlayersPlaceholderFactory.java
similarity index 96%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/internal/WorldPlayersPlaceholderFactory.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/WorldPlayersPlaceholderFactory.java
index 54199cba..549e1e12 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/internal/WorldPlayersPlaceholderFactory.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/WorldPlayersPlaceholderFactory.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder.internal;
+package me.filoghost.holographicdisplays.plugin.placeholder.internal;
import me.filoghost.fcommons.Strings;
import me.filoghost.holographicdisplays.api.placeholder.Placeholder;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/parsing/PlaceholderIdentifier.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/parsing/PlaceholderIdentifier.java
similarity index 92%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/parsing/PlaceholderIdentifier.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/parsing/PlaceholderIdentifier.java
index 71bf3312..0772bcee 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/parsing/PlaceholderIdentifier.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/parsing/PlaceholderIdentifier.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder.parsing;
+package me.filoghost.holographicdisplays.plugin.placeholder.parsing;
import me.filoghost.fcommons.collection.CaseInsensitiveString;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/parsing/PlaceholderOccurrence.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/parsing/PlaceholderOccurrence.java
similarity index 97%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/parsing/PlaceholderOccurrence.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/parsing/PlaceholderOccurrence.java
index fc021b0e..d9f84999 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/parsing/PlaceholderOccurrence.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/parsing/PlaceholderOccurrence.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder.parsing;
+package me.filoghost.holographicdisplays.plugin.placeholder.parsing;
import me.filoghost.fcommons.Strings;
import org.jetbrains.annotations.NotNull;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/parsing/PlaceholderReplaceFunction.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/parsing/PlaceholderReplaceFunction.java
similarity index 78%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/parsing/PlaceholderReplaceFunction.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/parsing/PlaceholderReplaceFunction.java
index 63f64455..86feb115 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/parsing/PlaceholderReplaceFunction.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/parsing/PlaceholderReplaceFunction.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder.parsing;
+package me.filoghost.holographicdisplays.plugin.placeholder.parsing;
@FunctionalInterface
public interface PlaceholderReplaceFunction {
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/parsing/PluginName.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/parsing/PluginName.java
similarity index 93%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/parsing/PluginName.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/parsing/PluginName.java
index 6e1e7b08..b49dc6c8 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/parsing/PluginName.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/parsing/PluginName.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder.parsing;
+package me.filoghost.holographicdisplays.plugin.placeholder.parsing;
import me.filoghost.fcommons.collection.CaseInsensitiveString;
import org.bukkit.plugin.Plugin;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/parsing/StringWithPlaceholders.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/parsing/StringWithPlaceholders.java
similarity index 99%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/parsing/StringWithPlaceholders.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/parsing/StringWithPlaceholders.java
index 47705e6e..494837ab 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/parsing/StringWithPlaceholders.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/parsing/StringWithPlaceholders.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder.parsing;
+package me.filoghost.holographicdisplays.plugin.placeholder.parsing;
import org.jetbrains.annotations.Nullable;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/registry/GlobalPlaceholderExpansion.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/GlobalPlaceholderExpansion.java
similarity index 89%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/registry/GlobalPlaceholderExpansion.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/GlobalPlaceholderExpansion.java
index 84ed1e15..9f43e75b 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/registry/GlobalPlaceholderExpansion.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/GlobalPlaceholderExpansion.java
@@ -3,12 +3,12 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder.registry;
+package me.filoghost.holographicdisplays.plugin.placeholder.registry;
import me.filoghost.holographicdisplays.api.placeholder.Placeholder;
import me.filoghost.holographicdisplays.api.placeholder.PlaceholderFactory;
-import me.filoghost.holographicdisplays.placeholder.PlaceholderException;
-import me.filoghost.holographicdisplays.placeholder.StandardPlaceholder;
+import me.filoghost.holographicdisplays.plugin.placeholder.PlaceholderException;
+import me.filoghost.holographicdisplays.plugin.placeholder.StandardPlaceholder;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import org.jetbrains.annotations.NotNull;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/registry/IndividualPlaceholderExpansion.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/IndividualPlaceholderExpansion.java
similarity index 90%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/registry/IndividualPlaceholderExpansion.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/IndividualPlaceholderExpansion.java
index 68f71c2d..16182bbc 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/registry/IndividualPlaceholderExpansion.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/IndividualPlaceholderExpansion.java
@@ -3,12 +3,12 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder.registry;
+package me.filoghost.holographicdisplays.plugin.placeholder.registry;
import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholder;
import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholderFactory;
-import me.filoghost.holographicdisplays.placeholder.PlaceholderException;
-import me.filoghost.holographicdisplays.placeholder.StandardPlaceholder;
+import me.filoghost.holographicdisplays.plugin.placeholder.PlaceholderException;
+import me.filoghost.holographicdisplays.plugin.placeholder.StandardPlaceholder;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import org.jetbrains.annotations.NotNull;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/registry/PlaceholderExpansion.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/PlaceholderExpansion.java
similarity index 67%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/registry/PlaceholderExpansion.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/PlaceholderExpansion.java
index 1f0ac7b2..4dd3af23 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/registry/PlaceholderExpansion.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/PlaceholderExpansion.java
@@ -3,12 +3,12 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder.registry;
+package me.filoghost.holographicdisplays.plugin.placeholder.registry;
-import me.filoghost.holographicdisplays.placeholder.StandardPlaceholder;
-import me.filoghost.holographicdisplays.placeholder.parsing.PlaceholderIdentifier;
-import me.filoghost.holographicdisplays.placeholder.parsing.PluginName;
-import me.filoghost.holographicdisplays.placeholder.PlaceholderException;
+import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PluginName;
+import me.filoghost.holographicdisplays.plugin.placeholder.StandardPlaceholder;
+import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PlaceholderIdentifier;
+import me.filoghost.holographicdisplays.plugin.placeholder.PlaceholderException;
import org.bukkit.plugin.Plugin;
import org.jetbrains.annotations.Nullable;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/registry/PlaceholderRegistry.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/PlaceholderRegistry.java
similarity index 93%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/registry/PlaceholderRegistry.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/PlaceholderRegistry.java
index 6c6dc640..36910905 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/registry/PlaceholderRegistry.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/PlaceholderRegistry.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder.registry;
+package me.filoghost.holographicdisplays.plugin.placeholder.registry;
import com.google.common.collect.HashBasedTable;
import com.google.common.collect.Iterables;
@@ -14,9 +14,9 @@ import me.filoghost.holographicdisplays.api.placeholder.Placeholder;
import me.filoghost.holographicdisplays.api.placeholder.PlaceholderFactory;
import me.filoghost.holographicdisplays.api.placeholder.PlaceholderReplacer;
import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholder;
-import me.filoghost.holographicdisplays.placeholder.parsing.PlaceholderIdentifier;
-import me.filoghost.holographicdisplays.placeholder.parsing.PlaceholderOccurrence;
-import me.filoghost.holographicdisplays.placeholder.parsing.PluginName;
+import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PluginName;
+import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PlaceholderIdentifier;
+import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PlaceholderOccurrence;
import org.bukkit.plugin.Plugin;
import org.jetbrains.annotations.Nullable;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/registry/SimpleGlobalPlaceholder.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/SimpleGlobalPlaceholder.java
similarity index 92%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/registry/SimpleGlobalPlaceholder.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/SimpleGlobalPlaceholder.java
index 79cdd8c9..a8122cf4 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/registry/SimpleGlobalPlaceholder.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/SimpleGlobalPlaceholder.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder.registry;
+package me.filoghost.holographicdisplays.plugin.placeholder.registry;
import me.filoghost.holographicdisplays.api.placeholder.Placeholder;
import me.filoghost.holographicdisplays.api.placeholder.PlaceholderReplacer;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/registry/SimpleIndividualPlaceholder.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/SimpleIndividualPlaceholder.java
similarity index 93%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/registry/SimpleIndividualPlaceholder.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/SimpleIndividualPlaceholder.java
index e9b950c6..1664a625 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/registry/SimpleIndividualPlaceholder.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/SimpleIndividualPlaceholder.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder.registry;
+package me.filoghost.holographicdisplays.plugin.placeholder.registry;
import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholder;
import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholderReplacer;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/tracking/PlaceholderExceptionHandler.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/PlaceholderExceptionHandler.java
similarity index 82%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/tracking/PlaceholderExceptionHandler.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/PlaceholderExceptionHandler.java
index 10bda5b6..c515f6d7 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/tracking/PlaceholderExceptionHandler.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/PlaceholderExceptionHandler.java
@@ -3,12 +3,12 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder.tracking;
+package me.filoghost.holographicdisplays.plugin.placeholder.tracking;
import me.filoghost.fcommons.logging.Log;
-import me.filoghost.holographicdisplays.placeholder.PlaceholderException;
-import me.filoghost.holographicdisplays.placeholder.TickClock;
-import me.filoghost.holographicdisplays.placeholder.registry.PlaceholderExpansion;
+import me.filoghost.holographicdisplays.plugin.placeholder.PlaceholderException;
+import me.filoghost.holographicdisplays.plugin.placeholder.TickClock;
+import me.filoghost.holographicdisplays.plugin.placeholder.registry.PlaceholderExpansion;
import java.util.Map;
import java.util.WeakHashMap;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/tracking/PlaceholderLineTracker.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/PlaceholderLineTracker.java
similarity index 93%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/tracking/PlaceholderLineTracker.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/PlaceholderLineTracker.java
index e039fba7..bd8ace10 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/tracking/PlaceholderLineTracker.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/PlaceholderLineTracker.java
@@ -3,11 +3,11 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder.tracking;
+package me.filoghost.holographicdisplays.plugin.placeholder.tracking;
import me.filoghost.holographicdisplays.core.hologram.StandardTextLine;
import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand;
-import me.filoghost.holographicdisplays.placeholder.parsing.StringWithPlaceholders;
+import me.filoghost.holographicdisplays.plugin.placeholder.parsing.StringWithPlaceholders;
import org.jetbrains.annotations.Nullable;
import java.util.Iterator;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/tracking/PlaceholderTracker.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/PlaceholderTracker.java
similarity index 86%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/tracking/PlaceholderTracker.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/PlaceholderTracker.java
index 8ee8a5da..4f8bf1a3 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/tracking/PlaceholderTracker.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/PlaceholderTracker.java
@@ -3,15 +3,15 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder.tracking;
+package me.filoghost.holographicdisplays.plugin.placeholder.tracking;
-import me.filoghost.holographicdisplays.placeholder.PlaceholderException;
-import me.filoghost.holographicdisplays.placeholder.StandardPlaceholder;
-import me.filoghost.holographicdisplays.placeholder.TickClock;
-import me.filoghost.holographicdisplays.placeholder.parsing.PlaceholderOccurrence;
-import me.filoghost.holographicdisplays.placeholder.parsing.StringWithPlaceholders;
-import me.filoghost.holographicdisplays.placeholder.registry.PlaceholderExpansion;
-import me.filoghost.holographicdisplays.placeholder.registry.PlaceholderRegistry;
+import me.filoghost.holographicdisplays.plugin.placeholder.PlaceholderException;
+import me.filoghost.holographicdisplays.plugin.placeholder.StandardPlaceholder;
+import me.filoghost.holographicdisplays.plugin.placeholder.TickClock;
+import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PlaceholderOccurrence;
+import me.filoghost.holographicdisplays.plugin.placeholder.parsing.StringWithPlaceholders;
+import me.filoghost.holographicdisplays.plugin.placeholder.registry.PlaceholderExpansion;
+import me.filoghost.holographicdisplays.plugin.placeholder.registry.PlaceholderRegistry;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/tracking/ReplacementHolder.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/ReplacementHolder.java
similarity index 81%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/tracking/ReplacementHolder.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/ReplacementHolder.java
index 3c0ee60e..7f694ed9 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/tracking/ReplacementHolder.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/ReplacementHolder.java
@@ -3,11 +3,11 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder.tracking;
+package me.filoghost.holographicdisplays.plugin.placeholder.tracking;
-import me.filoghost.holographicdisplays.placeholder.PlaceholderException;
-import me.filoghost.holographicdisplays.placeholder.StandardPlaceholder;
-import me.filoghost.holographicdisplays.placeholder.parsing.PlaceholderOccurrence;
+import me.filoghost.holographicdisplays.plugin.placeholder.PlaceholderException;
+import me.filoghost.holographicdisplays.plugin.placeholder.StandardPlaceholder;
+import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PlaceholderOccurrence;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/tracking/TrackedGlobalPlaceholder.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/TrackedGlobalPlaceholder.java
similarity index 73%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/tracking/TrackedGlobalPlaceholder.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/TrackedGlobalPlaceholder.java
index 08d86664..43accd24 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/tracking/TrackedGlobalPlaceholder.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/TrackedGlobalPlaceholder.java
@@ -3,11 +3,11 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder.tracking;
+package me.filoghost.holographicdisplays.plugin.placeholder.tracking;
-import me.filoghost.holographicdisplays.placeholder.PlaceholderException;
-import me.filoghost.holographicdisplays.placeholder.StandardPlaceholder;
-import me.filoghost.holographicdisplays.placeholder.parsing.PlaceholderOccurrence;
+import me.filoghost.holographicdisplays.plugin.placeholder.PlaceholderException;
+import me.filoghost.holographicdisplays.plugin.placeholder.StandardPlaceholder;
+import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PlaceholderOccurrence;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/tracking/TrackedIndividualPlaceholder.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/TrackedIndividualPlaceholder.java
similarity index 79%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/tracking/TrackedIndividualPlaceholder.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/TrackedIndividualPlaceholder.java
index 3eb41357..17ca4b48 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/tracking/TrackedIndividualPlaceholder.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/TrackedIndividualPlaceholder.java
@@ -3,11 +3,11 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder.tracking;
+package me.filoghost.holographicdisplays.plugin.placeholder.tracking;
-import me.filoghost.holographicdisplays.placeholder.PlaceholderException;
-import me.filoghost.holographicdisplays.placeholder.StandardPlaceholder;
-import me.filoghost.holographicdisplays.placeholder.parsing.PlaceholderOccurrence;
+import me.filoghost.holographicdisplays.plugin.placeholder.PlaceholderException;
+import me.filoghost.holographicdisplays.plugin.placeholder.StandardPlaceholder;
+import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PlaceholderOccurrence;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/tracking/TrackedLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/TrackedLine.java
similarity index 89%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/tracking/TrackedLine.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/TrackedLine.java
index 38458ce0..614cc73b 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/tracking/TrackedLine.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/TrackedLine.java
@@ -3,12 +3,12 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder.tracking;
+package me.filoghost.holographicdisplays.plugin.placeholder.tracking;
import me.filoghost.holographicdisplays.core.hologram.StandardTextLine;
import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand;
-import me.filoghost.holographicdisplays.placeholder.parsing.PlaceholderReplaceFunction;
-import me.filoghost.holographicdisplays.placeholder.parsing.StringWithPlaceholders;
+import me.filoghost.holographicdisplays.plugin.placeholder.parsing.StringWithPlaceholders;
+import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PlaceholderReplaceFunction;
import org.bukkit.entity.Player;
public class TrackedLine {
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/tracking/TrackedNullPlaceholder.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/TrackedNullPlaceholder.java
similarity index 77%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/tracking/TrackedNullPlaceholder.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/TrackedNullPlaceholder.java
index e0e25999..3798d81d 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/tracking/TrackedNullPlaceholder.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/TrackedNullPlaceholder.java
@@ -3,9 +3,9 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder.tracking;
+package me.filoghost.holographicdisplays.plugin.placeholder.tracking;
-import me.filoghost.holographicdisplays.placeholder.registry.PlaceholderExpansion;
+import me.filoghost.holographicdisplays.plugin.placeholder.registry.PlaceholderExpansion;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.Nullable;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/tracking/TrackedPlaceholder.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/TrackedPlaceholder.java
similarity index 71%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/tracking/TrackedPlaceholder.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/TrackedPlaceholder.java
index 8c1f77c2..faa32d34 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/tracking/TrackedPlaceholder.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/TrackedPlaceholder.java
@@ -3,10 +3,10 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder.tracking;
+package me.filoghost.holographicdisplays.plugin.placeholder.tracking;
-import me.filoghost.holographicdisplays.placeholder.PlaceholderException;
-import me.filoghost.holographicdisplays.placeholder.registry.PlaceholderExpansion;
+import me.filoghost.holographicdisplays.plugin.placeholder.PlaceholderException;
+import me.filoghost.holographicdisplays.plugin.placeholder.registry.PlaceholderExpansion;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.Nullable;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/util/FileUtils.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/util/FileUtils.java
similarity index 93%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/util/FileUtils.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/util/FileUtils.java
index 24415bd8..2c9e6cb6 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/util/FileUtils.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/util/FileUtils.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.util;
+package me.filoghost.holographicdisplays.plugin.util;
import java.nio.file.Path;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/util/NMSVersion.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/util/NMSVersion.java
similarity index 98%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/util/NMSVersion.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/util/NMSVersion.java
index 36cc8845..ce0b3445 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/util/NMSVersion.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/util/NMSVersion.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.util;
+package me.filoghost.holographicdisplays.plugin.util;
import me.filoghost.fcommons.Preconditions;
import me.filoghost.holographicdisplays.core.nms.NMSManager;
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/util/SchedulerUtils.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/util/SchedulerUtils.java
similarity index 76%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/util/SchedulerUtils.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/util/SchedulerUtils.java
index 56d3c2c8..dfb15835 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/util/SchedulerUtils.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/util/SchedulerUtils.java
@@ -3,9 +3,9 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.util;
+package me.filoghost.holographicdisplays.plugin.util;
-import me.filoghost.holographicdisplays.HolographicDisplays;
+import me.filoghost.holographicdisplays.plugin.HolographicDisplays;
import org.bukkit.Bukkit;
public class SchedulerUtils {
diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/util/VersionUtils.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/util/VersionUtils.java
similarity index 96%
rename from plugin/src/main/java/me/filoghost/holographicdisplays/util/VersionUtils.java
rename to plugin/src/main/java/me/filoghost/holographicdisplays/plugin/util/VersionUtils.java
index 0abdfdb7..5553e367 100644
--- a/plugin/src/main/java/me/filoghost/holographicdisplays/util/VersionUtils.java
+++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/util/VersionUtils.java
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.util;
+package me.filoghost.holographicdisplays.plugin.util;
public class VersionUtils {
diff --git a/plugin/src/main/resources/plugin.yml b/plugin/src/main/resources/plugin.yml
index 8c284c90..1234d28c 100644
--- a/plugin/src/main/resources/plugin.yml
+++ b/plugin/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
name: HolographicDisplays
-main: me.filoghost.holographicdisplays.HolographicDisplays
+main: me.filoghost.holographicdisplays.plugin.HolographicDisplays
author: filoghost
version: ${pluginVersion}
api-version: 1.13
diff --git a/plugin/src/test/java/me/filoghost/holographicdisplays/legacy/api/v2/V2TouchableLineAdapterTest.java b/plugin/src/test/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2TouchableLineAdapterTest.java
similarity index 97%
rename from plugin/src/test/java/me/filoghost/holographicdisplays/legacy/api/v2/V2TouchableLineAdapterTest.java
rename to plugin/src/test/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2TouchableLineAdapterTest.java
index 9397e36d..d85fbd7c 100644
--- a/plugin/src/test/java/me/filoghost/holographicdisplays/legacy/api/v2/V2TouchableLineAdapterTest.java
+++ b/plugin/src/test/java/me/filoghost/holographicdisplays/plugin/legacy/api/v2/V2TouchableLineAdapterTest.java
@@ -3,12 +3,12 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.legacy.api.v2;
+package me.filoghost.holographicdisplays.plugin.legacy.api.v2;
import com.gmail.filoghost.holographicdisplays.api.line.TextLine;
import me.filoghost.holographicdisplays.api.handler.TouchHandler;
-import me.filoghost.holographicdisplays.object.api.APIHologram;
-import me.filoghost.holographicdisplays.object.api.APITextLine;
+import me.filoghost.holographicdisplays.plugin.object.api.APIHologram;
+import me.filoghost.holographicdisplays.plugin.object.api.APITextLine;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.Test;
diff --git a/plugin/src/test/java/me/filoghost/holographicdisplays/placeholder/parsing/StringWithPlaceholdersTest.java b/plugin/src/test/java/me/filoghost/holographicdisplays/plugin/placeholder/parsing/StringWithPlaceholdersTest.java
similarity index 93%
rename from plugin/src/test/java/me/filoghost/holographicdisplays/placeholder/parsing/StringWithPlaceholdersTest.java
rename to plugin/src/test/java/me/filoghost/holographicdisplays/plugin/placeholder/parsing/StringWithPlaceholdersTest.java
index b23d7e8d..58ed2732 100644
--- a/plugin/src/test/java/me/filoghost/holographicdisplays/placeholder/parsing/StringWithPlaceholdersTest.java
+++ b/plugin/src/test/java/me/filoghost/holographicdisplays/plugin/placeholder/parsing/StringWithPlaceholdersTest.java
@@ -3,8 +3,10 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-package me.filoghost.holographicdisplays.placeholder.parsing;
+package me.filoghost.holographicdisplays.plugin.placeholder.parsing;
+import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PlaceholderOccurrence;
+import me.filoghost.holographicdisplays.plugin.placeholder.parsing.StringWithPlaceholders;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;