diff --git a/api/src/main/java/lol/pyr/znpcsplus/api/ZApi.java b/api/src/main/java/lol/pyr/znpcsplus/api/ZApi.java
index 760702c..81bfd7f 100644
--- a/api/src/main/java/lol/pyr/znpcsplus/api/ZApi.java
+++ b/api/src/main/java/lol/pyr/znpcsplus/api/ZApi.java
@@ -1,6 +1,7 @@
 package lol.pyr.znpcsplus.api;
 
 import lol.pyr.znpcsplus.api.npc.NPC;
+import lol.pyr.znpcsplus.api.npc.NPCRegistry;
 import lol.pyr.znpcsplus.api.npc.NPCType;
 import lol.pyr.znpcsplus.util.ZLocation;
 import org.bukkit.World;
diff --git a/api/src/main/java/lol/pyr/znpcsplus/api/npc/EntityProperty.java b/api/src/main/java/lol/pyr/znpcsplus/api/entity/EntityProperty.java
similarity index 97%
rename from api/src/main/java/lol/pyr/znpcsplus/api/npc/EntityProperty.java
rename to api/src/main/java/lol/pyr/znpcsplus/api/entity/EntityProperty.java
index 2d68be5..b467915 100644
--- a/api/src/main/java/lol/pyr/znpcsplus/api/npc/EntityProperty.java
+++ b/api/src/main/java/lol/pyr/znpcsplus/api/entity/EntityProperty.java
@@ -1,4 +1,4 @@
-package lol.pyr.znpcsplus.api.npc;
+package lol.pyr.znpcsplus.api.entity;
 
 import lol.pyr.znpcsplus.api.skin.SkinDescriptor;
 import net.kyori.adventure.text.Component;
diff --git a/api/src/main/java/lol/pyr/znpcsplus/api/PropertyHolder.java b/api/src/main/java/lol/pyr/znpcsplus/api/entity/PropertyHolder.java
similarity index 61%
rename from api/src/main/java/lol/pyr/znpcsplus/api/PropertyHolder.java
rename to api/src/main/java/lol/pyr/znpcsplus/api/entity/PropertyHolder.java
index 4273c5e..51ffcfd 100644
--- a/api/src/main/java/lol/pyr/znpcsplus/api/PropertyHolder.java
+++ b/api/src/main/java/lol/pyr/znpcsplus/api/entity/PropertyHolder.java
@@ -1,6 +1,4 @@
-package lol.pyr.znpcsplus.api;
-
-import lol.pyr.znpcsplus.api.npc.EntityProperty;
+package lol.pyr.znpcsplus.api.entity;
 
 public interface PropertyHolder {
     <T> T getProperty(EntityProperty<T> key);
diff --git a/api/src/main/java/lol/pyr/znpcsplus/api/Hologram.java b/api/src/main/java/lol/pyr/znpcsplus/api/hologram/Hologram.java
similarity index 86%
rename from api/src/main/java/lol/pyr/znpcsplus/api/Hologram.java
rename to api/src/main/java/lol/pyr/znpcsplus/api/hologram/Hologram.java
index 5fb289c..a00a68b 100644
--- a/api/src/main/java/lol/pyr/znpcsplus/api/Hologram.java
+++ b/api/src/main/java/lol/pyr/znpcsplus/api/hologram/Hologram.java
@@ -1,4 +1,4 @@
-package lol.pyr.znpcsplus.api;
+package lol.pyr.znpcsplus.api.hologram;
 
 import net.kyori.adventure.text.Component;
 
diff --git a/api/src/main/java/lol/pyr/znpcsplus/api/npc/NPC.java b/api/src/main/java/lol/pyr/znpcsplus/api/npc/NPC.java
index b357405..a8f0628 100644
--- a/api/src/main/java/lol/pyr/znpcsplus/api/npc/NPC.java
+++ b/api/src/main/java/lol/pyr/znpcsplus/api/npc/NPC.java
@@ -1,7 +1,7 @@
 package lol.pyr.znpcsplus.api.npc;
 
-import lol.pyr.znpcsplus.api.Hologram;
-import lol.pyr.znpcsplus.api.PropertyHolder;
+import lol.pyr.znpcsplus.api.hologram.Hologram;
+import lol.pyr.znpcsplus.api.entity.PropertyHolder;
 
 public interface NPC extends PropertyHolder {
     Hologram getHologram();
diff --git a/api/src/main/java/lol/pyr/znpcsplus/api/NPCRegistry.java b/api/src/main/java/lol/pyr/znpcsplus/api/npc/NPCRegistry.java
similarity index 79%
rename from api/src/main/java/lol/pyr/znpcsplus/api/NPCRegistry.java
rename to api/src/main/java/lol/pyr/znpcsplus/api/npc/NPCRegistry.java
index 490f96f..39dcb96 100644
--- a/api/src/main/java/lol/pyr/znpcsplus/api/NPCRegistry.java
+++ b/api/src/main/java/lol/pyr/znpcsplus/api/npc/NPCRegistry.java
@@ -1,6 +1,4 @@
-package lol.pyr.znpcsplus.api;
-
-import lol.pyr.znpcsplus.api.npc.NPC;
+package lol.pyr.znpcsplus.api.npc;
 
 import java.util.Collection;
 
diff --git a/api/src/main/java/lol/pyr/znpcsplus/api/npc/NPCType.java b/api/src/main/java/lol/pyr/znpcsplus/api/npc/NPCType.java
index f3f45b1..2f8e75c 100644
--- a/api/src/main/java/lol/pyr/znpcsplus/api/npc/NPCType.java
+++ b/api/src/main/java/lol/pyr/znpcsplus/api/npc/NPCType.java
@@ -4,6 +4,7 @@ import com.github.retrooper.packetevents.PacketEvents;
 import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import com.github.retrooper.packetevents.protocol.entity.type.EntityType;
 import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
+import lol.pyr.znpcsplus.api.entity.EntityProperty;
 
 import java.util.*;
 
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/ZNPCsApi.java b/plugin/src/main/java/lol/pyr/znpcsplus/ZNPCsApi.java
index 74becbf..18b70c9 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/ZNPCsApi.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/ZNPCsApi.java
@@ -1,7 +1,7 @@
 package lol.pyr.znpcsplus;
 
 import lol.pyr.znpcsplus.api.ZApi;
-import lol.pyr.znpcsplus.api.NPCRegistry;
+import lol.pyr.znpcsplus.api.npc.NPCRegistry;
 import lol.pyr.znpcsplus.api.npc.NPC;
 import lol.pyr.znpcsplus.api.npc.NPCType;
 import lol.pyr.znpcsplus.util.ZLocation;
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/ZNPCsPlus.java b/plugin/src/main/java/lol/pyr/znpcsplus/ZNPCsPlus.java
index a499d57..f29423a 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/ZNPCsPlus.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/ZNPCsPlus.java
@@ -8,7 +8,7 @@ import io.github.znetworkw.znpcservers.listeners.InventoryListener;
 import io.github.znetworkw.znpcservers.utility.BungeeUtils;
 import io.github.znetworkw.znpcservers.utility.SchedulerUtils;
 import lol.pyr.znpcsplus.api.ZApiProvider;
-import lol.pyr.znpcsplus.api.npc.EntityProperty;
+import lol.pyr.znpcsplus.api.entity.EntityProperty;
 import lol.pyr.znpcsplus.api.npc.NPCType;
 import lol.pyr.znpcsplus.config.Configs;
 import lol.pyr.znpcsplus.interaction.InteractionPacketListener;
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/entity/PacketEntity.java b/plugin/src/main/java/lol/pyr/znpcsplus/entity/PacketEntity.java
index 5f4c13c..e5210c9 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/entity/PacketEntity.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/entity/PacketEntity.java
@@ -4,7 +4,7 @@ import com.github.retrooper.packetevents.protocol.entity.type.EntityType;
 import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
 import io.github.znetworkw.znpcservers.reflection.Reflections;
 import io.github.znetworkw.znpcservers.utility.Utils;
-import lol.pyr.znpcsplus.api.PropertyHolder;
+import lol.pyr.znpcsplus.api.entity.PropertyHolder;
 import lol.pyr.znpcsplus.packets.PacketFactory;
 import lol.pyr.znpcsplus.util.ZLocation;
 import org.bukkit.entity.Player;
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/hologram/Hologram.java b/plugin/src/main/java/lol/pyr/znpcsplus/hologram/Hologram.java
index 2ca2e07..9af424e 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/hologram/Hologram.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/hologram/Hologram.java
@@ -10,7 +10,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-public class Hologram extends Viewable implements lol.pyr.znpcsplus.api.Hologram {
+public class Hologram extends Viewable implements lol.pyr.znpcsplus.api.hologram.Hologram {
     private ZLocation location;
     private final List<HologramLine> lines = new ArrayList<>();
 
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/hologram/HologramLine.java b/plugin/src/main/java/lol/pyr/znpcsplus/hologram/HologramLine.java
index 875ae8a..f8576c9 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/hologram/HologramLine.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/hologram/HologramLine.java
@@ -1,8 +1,8 @@
 package lol.pyr.znpcsplus.hologram;
 
 import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
-import lol.pyr.znpcsplus.api.PropertyHolder;
-import lol.pyr.znpcsplus.api.npc.EntityProperty;
+import lol.pyr.znpcsplus.api.entity.PropertyHolder;
+import lol.pyr.znpcsplus.api.entity.EntityProperty;
 import lol.pyr.znpcsplus.entity.PacketEntity;
 import lol.pyr.znpcsplus.util.ZLocation;
 import net.kyori.adventure.text.Component;
@@ -42,13 +42,13 @@ public class HologramLine implements PropertyHolder {
     @SuppressWarnings("unchecked")
     @Override
     public <T> T getProperty(EntityProperty<T> key) {
-        if (key == lol.pyr.znpcsplus.api.npc.EntityProperty.INVISIBLE) return (T) Boolean.TRUE;
-        if (key == lol.pyr.znpcsplus.api.npc.EntityProperty.NAME) return (T) text;
+        if (key == EntityProperty.INVISIBLE) return (T) Boolean.TRUE;
+        if (key == EntityProperty.NAME) return (T) text;
         return key.getDefaultValue();
     }
 
     @Override
     public boolean hasProperty(EntityProperty<?> key) {
-        return key == lol.pyr.znpcsplus.api.npc.EntityProperty.NAME || key == lol.pyr.znpcsplus.api.npc.EntityProperty.INVISIBLE;
+        return key == EntityProperty.NAME || key == EntityProperty.INVISIBLE;
     }
 }
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/npc/NPC.java b/plugin/src/main/java/lol/pyr/znpcsplus/npc/NPC.java
index fd086f9..98f4ad6 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/npc/NPC.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/npc/NPC.java
@@ -1,6 +1,6 @@
 package lol.pyr.znpcsplus.npc;
 
-import lol.pyr.znpcsplus.api.npc.EntityProperty;
+import lol.pyr.znpcsplus.api.entity.EntityProperty;
 import lol.pyr.znpcsplus.api.npc.NPCType;
 import lol.pyr.znpcsplus.entity.PacketEntity;
 import lol.pyr.znpcsplus.hologram.Hologram;
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/npc/NPCRegistry.java b/plugin/src/main/java/lol/pyr/znpcsplus/npc/NPCRegistry.java
index 2cb069f..735c2d4 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/npc/NPCRegistry.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/npc/NPCRegistry.java
@@ -7,7 +7,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-public class NPCRegistry implements lol.pyr.znpcsplus.api.NPCRegistry {
+public class NPCRegistry implements lol.pyr.znpcsplus.api.npc.NPCRegistry {
     private final static NPCRegistry registry = new NPCRegistry();
 
     public static NPCRegistry get() {
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/packets/PacketFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/packets/PacketFactory.java
index 865ffab..d71ff7d 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/packets/PacketFactory.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/packets/PacketFactory.java
@@ -5,7 +5,7 @@ import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import com.github.retrooper.packetevents.protocol.entity.data.EntityData;
 import lol.pyr.znpcsplus.ZNPCsPlus;
 import lol.pyr.znpcsplus.entity.PacketEntity;
-import lol.pyr.znpcsplus.api.PropertyHolder;
+import lol.pyr.znpcsplus.api.entity.PropertyHolder;
 import lol.pyr.znpcsplus.util.LazyLoader;
 import org.bukkit.entity.Player;
 
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_14Factory.java b/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_14Factory.java
index 310b15c..c74f1e4 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_14Factory.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_14Factory.java
@@ -3,8 +3,8 @@ package lol.pyr.znpcsplus.packets;
 import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerSpawnEntity;
 import lol.pyr.znpcsplus.entity.PacketEntity;
 import lol.pyr.znpcsplus.util.ZLocation;
-import lol.pyr.znpcsplus.api.npc.EntityProperty;
-import lol.pyr.znpcsplus.api.PropertyHolder;
+import lol.pyr.znpcsplus.api.entity.EntityProperty;
+import lol.pyr.znpcsplus.api.entity.PropertyHolder;
 import org.bukkit.entity.Player;
 
 import java.util.Optional;
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_19Factory.java b/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_19Factory.java
index 88be188..6888e8b 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_19Factory.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_19Factory.java
@@ -6,7 +6,7 @@ import com.github.retrooper.packetevents.protocol.player.UserProfile;
 import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerPlayerInfoRemove;
 import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerPlayerInfoUpdate;
 import lol.pyr.znpcsplus.entity.PacketEntity;
-import lol.pyr.znpcsplus.api.PropertyHolder;
+import lol.pyr.znpcsplus.api.entity.PropertyHolder;
 import net.kyori.adventure.text.Component;
 import org.bukkit.entity.Player;
 
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_8Factory.java b/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_8Factory.java
index 1a9cb34..73925dc 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_8Factory.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_8Factory.java
@@ -11,8 +11,8 @@ import com.github.retrooper.packetevents.util.Vector3d;
 import com.github.retrooper.packetevents.wrapper.PacketWrapper;
 import com.github.retrooper.packetevents.wrapper.play.server.*;
 import lol.pyr.znpcsplus.ZNPCsPlus;
-import lol.pyr.znpcsplus.api.PropertyHolder;
-import lol.pyr.znpcsplus.api.npc.EntityProperty;
+import lol.pyr.znpcsplus.api.entity.PropertyHolder;
+import lol.pyr.znpcsplus.api.entity.EntityProperty;
 import lol.pyr.znpcsplus.entity.PacketEntity;
 import lol.pyr.znpcsplus.metadata.MetadataFactory;
 import lol.pyr.znpcsplus.skin.BaseSkinDescriptor;
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_9Factory.java b/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_9Factory.java
index e680e61..e52f492 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_9Factory.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_9Factory.java
@@ -4,8 +4,8 @@ import com.github.retrooper.packetevents.protocol.entity.data.EntityData;
 import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
 import lol.pyr.znpcsplus.entity.PacketEntity;
 import lol.pyr.znpcsplus.metadata.MetadataFactory;
-import lol.pyr.znpcsplus.api.npc.EntityProperty;
-import lol.pyr.znpcsplus.api.PropertyHolder;
+import lol.pyr.znpcsplus.api.entity.EntityProperty;
+import lol.pyr.znpcsplus.api.entity.PropertyHolder;
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;