Move some classes into the new org.apollo.game.model.entity package, and update plugins and classes that reference these.

src/org/apollo/game/GameService.java

@@ -11,9 +11,9 @@ import java.util.concurrent.TimeUnit;
 
 import org.apollo.Service;
 import org.apollo.game.event.handler.chain.EventHandlerChainGroup;
-import org.apollo.game.model.Player;
 import org.apollo.game.model.World;
 import org.apollo.game.model.World.RegistrationStatus;
+import org.apollo.game.model.entity.Player;
 import org.apollo.game.sync.ClientSynchronizer;
 import org.apollo.io.EventHandlerChainParser;
 import org.apollo.io.RsaKeyParser;

src/org/apollo/game/action/Action.java

@@ -1,6 +1,6 @@
 package org.apollo.game.action;
 
-import org.apollo.game.model.Mob;
+import org.apollo.game.model.entity.Mob;
 import org.apollo.game.scheduling.ScheduledTask;
 
 /**

src/org/apollo/game/action/DistancedAction.java

@@ -1,7 +1,7 @@
 package org.apollo.game.action;
 
-import org.apollo.game.model.Mob;
 import org.apollo.game.model.Position;
+import org.apollo.game.model.entity.Mob;
 
 /**
  * An @{link Action} which fires when a distance requirement is met.

src/org/apollo/game/command/CommandDispatcher.java

@@ -3,7 +3,7 @@ package org.apollo.game.command;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 
 /**
  * A class that dispatches {@link Command}s to {@link CommandListener}s.

src/org/apollo/game/command/CommandListener.java

@@ -1,6 +1,6 @@
 package org.apollo.game.command;
 
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 import org.apollo.game.model.settings.PrivilegeLevel;
 
 /**

src/org/apollo/game/command/CreditsCommandListener.java

@@ -4,8 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import org.apollo.game.model.Player;
 import org.apollo.game.model.World;
+import org.apollo.game.model.entity.Player;
 import org.apollo.util.plugin.PluginManager;
 
 /**

src/org/apollo/game/event/handler/EventHandler.java

@@ -1,7 +1,7 @@
 package org.apollo.game.event.handler;
 
 import org.apollo.game.event.Event;
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 
 /**
  * A class which handles events.

src/org/apollo/game/event/handler/chain/EventHandlerChain.java

@@ -3,7 +3,7 @@ package org.apollo.game.event.handler.chain;
 import org.apollo.game.event.Event;
 import org.apollo.game.event.handler.EventHandler;
 import org.apollo.game.event.handler.EventHandlerContext;
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 
 /**
  * A chain of event handlers.

src/org/apollo/game/event/handler/impl/BankButtonEventHandler.java

@@ -3,7 +3,7 @@ package org.apollo.game.event.handler.impl;
 import org.apollo.game.event.handler.EventHandler;
 import org.apollo.game.event.handler.EventHandlerContext;
 import org.apollo.game.event.impl.ButtonEvent;
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 
 /**
  * An {@link EventHandler} that responds to {@link ButtonEvent}s for withdrawing items as notes.

src/org/apollo/game/event/handler/impl/BankEventHandler.java

@@ -3,7 +3,7 @@ package org.apollo.game.event.handler.impl;
 import org.apollo.game.event.handler.EventHandler;
 import org.apollo.game.event.handler.EventHandlerContext;
 import org.apollo.game.event.impl.ItemActionEvent;
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 import org.apollo.game.model.inter.bank.BankConstants;
 import org.apollo.game.model.inter.bank.BankDepositEnterAmountListener;
 import org.apollo.game.model.inter.bank.BankUtils;

src/org/apollo/game/event/handler/impl/ChatEventHandler.java

@@ -3,7 +3,7 @@ package org.apollo.game.event.handler.impl;
 import org.apollo.game.event.handler.EventHandler;
 import org.apollo.game.event.handler.EventHandlerContext;
 import org.apollo.game.event.impl.ChatEvent;
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 import org.apollo.game.sync.block.SynchronizationBlock;
 
 /**

src/org/apollo/game/event/handler/impl/ChatVerificationHandler.java

@@ -3,7 +3,7 @@ package org.apollo.game.event.handler.impl;
 import org.apollo.game.event.handler.EventHandler;
 import org.apollo.game.event.handler.EventHandlerContext;
 import org.apollo.game.event.impl.ChatEvent;
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 
 /**
  * An {@link EventHandler} that verifies {@link ChatEvent}s.

src/org/apollo/game/event/handler/impl/ClosedInterfaceEventHandler.java

@@ -3,7 +3,7 @@ package org.apollo.game.event.handler.impl;
 import org.apollo.game.event.handler.EventHandler;
 import org.apollo.game.event.handler.EventHandlerContext;
 import org.apollo.game.event.impl.ClosedInterfaceEvent;
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 
 /**
  * An {@link EventHandler} for the {@link ClosedInterfaceEvent}.
@@ -14,6 +14,7 @@ public final class ClosedInterfaceEventHandler extends EventHandler<ClosedInterf
 
 	@Override
 	public void handle(EventHandlerContext ctx, Player player, ClosedInterfaceEvent event) {
+		System.out.println("closing interface");
 		player.getInterfaceSet().interfaceClosed();
 	}
 

src/org/apollo/game/event/handler/impl/CommandEventHandler.java

@@ -4,8 +4,8 @@ import org.apollo.game.command.Command;
 import org.apollo.game.event.handler.EventHandler;
 import org.apollo.game.event.handler.EventHandlerContext;
 import org.apollo.game.event.impl.CommandEvent;
-import org.apollo.game.model.Player;
 import org.apollo.game.model.World;
+import org.apollo.game.model.entity.Player;
 
 /**
  * An {@link EventHandler} that dispatches {@link CommandEvent}s.

src/org/apollo/game/event/handler/impl/DialogueButtonHandler.java

@@ -3,8 +3,8 @@ package org.apollo.game.event.handler.impl;
 import org.apollo.game.event.handler.EventHandler;
 import org.apollo.game.event.handler.EventHandlerContext;
 import org.apollo.game.event.impl.ButtonEvent;
+import org.apollo.game.model.entity.Player;
 import org.apollo.game.model.inter.InterfaceType;
-import org.apollo.game.model.Player;
 
 /**
  * An {@link EventHandler} which intercepts button clicks on dialogues, and forwards the event to the current listener.

src/org/apollo/game/event/handler/impl/DialogueContinueEventHandler.java

@@ -3,8 +3,8 @@ package org.apollo.game.event.handler.impl;
 import org.apollo.game.event.handler.EventHandler;
 import org.apollo.game.event.handler.EventHandlerContext;
 import org.apollo.game.event.impl.DialogueContinueEvent;
+import org.apollo.game.model.entity.Player;
 import org.apollo.game.model.inter.InterfaceType;
-import org.apollo.game.model.Player;
 
 /**
  * An {@link EventHandler} for the {@link DialogueContinueEvent}.

src/org/apollo/game/event/handler/impl/EnteredAmountEventHandler.java

@@ -3,7 +3,7 @@ package org.apollo.game.event.handler.impl;
 import org.apollo.game.event.handler.EventHandler;
 import org.apollo.game.event.handler.EventHandlerContext;
 import org.apollo.game.event.impl.EnteredAmountEvent;
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 
 /**
  * An {@link EventHandler} for the {@link EnteredAmountEvent}.

src/org/apollo/game/event/handler/impl/EquipEventHandler.java

@@ -3,12 +3,12 @@ package org.apollo.game.event.handler.impl;
 import org.apollo.game.event.handler.EventHandler;
 import org.apollo.game.event.handler.EventHandlerContext;
 import org.apollo.game.event.impl.ItemOptionEvent;
-import org.apollo.game.model.EquipmentConstants;
-import org.apollo.game.model.Inventory;
 import org.apollo.game.model.Item;
-import org.apollo.game.model.Player;
-import org.apollo.game.model.Skill;
 import org.apollo.game.model.def.EquipmentDefinition;
+import org.apollo.game.model.entity.EquipmentConstants;
+import org.apollo.game.model.entity.Player;
+import org.apollo.game.model.entity.Skill;
+import org.apollo.game.model.inv.Inventory;
 import org.apollo.game.model.inv.SynchronizationInventoryListener;
 import org.apollo.util.LanguageUtil;
 

src/org/apollo/game/event/handler/impl/ItemOnItemVerificationHandler.java

@@ -3,10 +3,10 @@ package org.apollo.game.event.handler.impl;
 import org.apollo.game.event.handler.EventHandler;
 import org.apollo.game.event.handler.EventHandlerContext;
 import org.apollo.game.event.impl.ItemOnItemEvent;
-import org.apollo.game.model.Inventory;
 import org.apollo.game.model.Item;
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 import org.apollo.game.model.inter.bank.BankConstants;
+import org.apollo.game.model.inv.Inventory;
 import org.apollo.game.model.inv.SynchronizationInventoryListener;
 
 /**

src/org/apollo/game/event/handler/impl/ItemOnObjectVerificationHandler.java

@@ -3,10 +3,10 @@ package org.apollo.game.event.handler.impl;
 import org.apollo.game.event.handler.EventHandler;
 import org.apollo.game.event.handler.EventHandlerContext;
 import org.apollo.game.event.impl.ItemOnObjectEvent;
-import org.apollo.game.model.Inventory;
 import org.apollo.game.model.Item;
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 import org.apollo.game.model.inter.bank.BankConstants;
+import org.apollo.game.model.inv.Inventory;
 import org.apollo.game.model.inv.SynchronizationInventoryListener;
 
 /**

src/org/apollo/game/event/handler/impl/ItemVerificationHandler.java

@@ -3,10 +3,10 @@ package org.apollo.game.event.handler.impl;
 import org.apollo.game.event.handler.EventHandler;
 import org.apollo.game.event.handler.EventHandlerContext;
 import org.apollo.game.event.impl.InventoryItemEvent;
-import org.apollo.game.model.Inventory;
 import org.apollo.game.model.Item;
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 import org.apollo.game.model.inter.bank.BankConstants;
+import org.apollo.game.model.inv.Inventory;
 import org.apollo.game.model.inv.SynchronizationInventoryListener;
 
 /**

src/org/apollo/game/event/handler/impl/NpcActionVerificationHandler.java

@@ -3,10 +3,10 @@ package org.apollo.game.event.handler.impl;
 import org.apollo.game.event.handler.EventHandler;
 import org.apollo.game.event.handler.EventHandlerContext;
 import org.apollo.game.event.impl.NpcActionEvent;
-import org.apollo.game.model.Npc;
-import org.apollo.game.model.Player;
 import org.apollo.game.model.World;
 import org.apollo.game.model.WorldConstants;
+import org.apollo.game.model.entity.Npc;
+import org.apollo.game.model.entity.Player;
 
 /**
  * An {@link EventHandler} that verifies {@link org.apollo.game.event.impl.NpcActionEvent}

src/org/apollo/game/event/handler/impl/PlayerDesignEventHandler.java

@@ -4,7 +4,7 @@ import org.apollo.game.event.handler.EventHandler;
 import org.apollo.game.event.handler.EventHandlerContext;
 import org.apollo.game.event.impl.CloseInterfaceEvent;
 import org.apollo.game.event.impl.PlayerDesignEvent;
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 
 /**
  * An {@link EventHandler} that handles {@link PlayerDesignEvent}s.

src/org/apollo/game/event/handler/impl/PlayerDesignVerificationHandler.java

@@ -4,7 +4,7 @@ import org.apollo.game.event.handler.EventHandler;
 import org.apollo.game.event.handler.EventHandlerContext;
 import org.apollo.game.event.impl.PlayerDesignEvent;
 import org.apollo.game.model.Appearance;
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 import org.apollo.game.model.settings.Gender;
 
 /**

src/org/apollo/game/event/handler/impl/RemoveEventHandler.java

@@ -3,9 +3,9 @@ package org.apollo.game.event.handler.impl;
 import org.apollo.game.event.handler.EventHandler;
 import org.apollo.game.event.handler.EventHandlerContext;
 import org.apollo.game.event.impl.ItemActionEvent;
-import org.apollo.game.model.Inventory;
 import org.apollo.game.model.Item;
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
+import org.apollo.game.model.inv.Inventory;
 import org.apollo.game.model.inv.SynchronizationInventoryListener;
 
 /**

src/org/apollo/game/event/handler/impl/SwitchItemEventHandler.java

@@ -3,9 +3,9 @@ package org.apollo.game.event.handler.impl;
 import org.apollo.game.event.handler.EventHandler;
 import org.apollo.game.event.handler.EventHandlerContext;
 import org.apollo.game.event.impl.SwitchItemEvent;
-import org.apollo.game.model.Inventory;
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 import org.apollo.game.model.inter.bank.BankConstants;
+import org.apollo.game.model.inv.Inventory;
 import org.apollo.game.model.inv.SynchronizationInventoryListener;
 
 /**

src/org/apollo/game/event/handler/impl/WalkEventHandler.java

@@ -3,9 +3,9 @@ package org.apollo.game.event.handler.impl;
 import org.apollo.game.event.handler.EventHandler;
 import org.apollo.game.event.handler.EventHandlerContext;
 import org.apollo.game.event.impl.WalkEvent;
-import org.apollo.game.model.Player;
 import org.apollo.game.model.Position;
-import org.apollo.game.model.WalkingQueue;
+import org.apollo.game.model.entity.Player;
+import org.apollo.game.model.entity.WalkingQueue;
 
 /**
  * A{@link EventHandler} that handles {@link WalkEvent}s.

src/org/apollo/game/event/impl/NpcSynchronizationEvent.java

@@ -3,8 +3,8 @@ package org.apollo.game.event.impl;
 import java.util.List;
 
 import org.apollo.game.event.Event;
-import org.apollo.game.model.Npc;
 import org.apollo.game.model.Position;
+import org.apollo.game.model.entity.Npc;
 import org.apollo.game.sync.seg.SynchronizationSegment;
 
 /**

src/org/apollo/game/event/impl/UpdateSkillEvent.java

@@ -1,7 +1,7 @@
 package org.apollo.game.event.impl;
 
 import org.apollo.game.event.Event;
-import org.apollo.game.model.Skill;
+import org.apollo.game.model.entity.Skill;
 
 /**
  * An {@link Event} sent to the client to update a player's skill level.

src/org/apollo/game/event/impl/UpdateSlottedItemsEvent.java

@@ -1,7 +1,7 @@
 package org.apollo.game.event.impl;
 
 import org.apollo.game.event.Event;
-import org.apollo.game.model.SlottedItem;
+import org.apollo.game.model.inv.SlottedItem;
 
 /**
  * An {@link Event} sent to the client that updates a single item in an interface.

src/org/apollo/game/login/LoginDispatcher.java

@@ -3,7 +3,7 @@ package org.apollo.game.login;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 
 /**
  * A class that dispatches {@link Player}s to {@link LoginListener}s.

src/org/apollo/game/login/LoginListener.java

@@ -1,6 +1,6 @@
 package org.apollo.game.login;
 
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 
 /**
  * A class that should be extended for actions that should be executed when the player logs in.

src/org/apollo/game/login/LogoutDispatcher.java

@@ -3,7 +3,7 @@ package org.apollo.game.login;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 
 /**
  * A class that dispatches {@link Player}s to {@link LogoutListener}s.

src/org/apollo/game/login/LogoutListener.java

@@ -1,6 +1,6 @@
 package org.apollo.game.login;
 
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 
 /**
  * An interface that should be implemented for actions that should be executed when the player logs out.

src/org/apollo/game/model/World.java

@@ -21,6 +21,9 @@ import org.apollo.game.model.def.EquipmentDefinition;
 import org.apollo.game.model.def.ItemDefinition;
 import org.apollo.game.model.def.NpcDefinition;
 import org.apollo.game.model.def.ObjectDefinition;
+import org.apollo.game.model.entity.Entity;
+import org.apollo.game.model.entity.Npc;
+import org.apollo.game.model.entity.Player;
 import org.apollo.game.model.obj.GameObject;
 import org.apollo.game.model.sector.Sector;
 import org.apollo.game.model.sector.SectorCoordinates;

src/org/apollo/game/model/area/Sector.java

@@ -5,8 +5,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apollo.game.model.Entity;
-import org.apollo.game.model.Entity.EntityType;
+import org.apollo.game.model.entity.Entity;
+import org.apollo.game.model.entity.Entity.EntityType;
 import org.apollo.game.model.Position;
 
 /**

src/org/apollo/game/model/area/SectorListener.java

@@ -1,6 +1,6 @@
 package org.apollo.game.model.area;
 
-import org.apollo.game.model.Entity;
+import org.apollo.game.model.entity.Entity;
 
 /**
  * A class that should be extended by listeners that execute actions when an entity is added or removed from the sector.

src/org/apollo/game/model/def/EquipmentDefinition.java

@@ -4,7 +4,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apollo.game.model.Item;
-import org.apollo.game.model.Skill;
+import org.apollo.game.model.entity.Skill;
 
 /**
  * Represents a type of {@link Item} which may be equipped.

src/org/apollo/game/model/def/NpcDefinition.java

@@ -1,6 +1,6 @@
 package org.apollo.game.model.def;
 
-import org.apollo.game.model.Npc;
+import org.apollo.game.model.entity.Npc;
 
 /**
  * Represents a type of {@link Npc}.

src/org/apollo/game/model/entity/Entity.java

@@ -1,4 +1,11 @@
-package org.apollo.game.model;
+package org.apollo.game.model.entity;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.apollo.game.model.Position;
 
 /**
  * Represents an in-game entity, such as a mob, object, projectile etc.
@@ -41,6 +48,11 @@ public abstract class Entity {
 
 	}
 
+	/**
+	 * A map of attribute names to attributes.
+	 */
+	protected final Map<String, Object> attributes = new HashMap<>(5);
+
 	/**
 	 * The position of this entity.
 	 */
@@ -55,6 +67,25 @@ public abstract class Entity {
 		this.position = position;
 	}
 
+	/**
+	 * Gets the value of the attribute with the specified name.
+	 * 
+	 * @param name The name of the attribute.
+	 * @return The value of the attribute.
+	 */
+	public final Object getAttribute(String name) {
+		return attributes.get(name);
+	}
+
+	/**
+	 * Gets all of the attributes of this entity, as a {@link Set} of {@link Entry} objects.
+	 * 
+	 * @return The set of attributes.
+	 */
+	public final Set<Entry<String, Object>> getAttributes() {
+		return attributes.entrySet();
+	}
+
 	/**
 	 * Gets the {@link EntityType} of this entity.
 	 * 
@@ -71,4 +102,14 @@ public abstract class Entity {
 		return position;
 	}
 
+	/**
+	 * Sets the value of the attribute with the specified name.
+	 * 
+	 * @param name The name of the attribute.
+	 * @param value The value of the attribute.
+	 */
+	public final void setAttribute(String name, Object value) {
+		attributes.put(name, value);
+	}
+
 }

src/org/apollo/game/model/entity/EquipmentConstants.java

@@ -1,4 +1,4 @@
-package org.apollo.game.model;
+package org.apollo.game.model.entity;
 
 /**
  * Contains equipment-related constants.

src/org/apollo/game/model/entity/Mob.java

@@ -1,11 +1,18 @@
-package org.apollo.game.model;
+package org.apollo.game.model.entity;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apollo.game.action.Action;
-import org.apollo.game.model.Inventory.StackMode;
+import org.apollo.game.model.Animation;
+import org.apollo.game.model.Direction;
+import org.apollo.game.model.Graphic;
+import org.apollo.game.model.Position;
+import org.apollo.game.model.World;
 import org.apollo.game.model.def.NpcDefinition;
+import org.apollo.game.model.inv.Inventory;
+import org.apollo.game.model.inv.InventoryConstants;
+import org.apollo.game.model.inv.Inventory.StackMode;
 import org.apollo.game.scheduling.impl.SkillNormalizationTask;
 import org.apollo.game.sync.block.SynchronizationBlock;
 import org.apollo.game.sync.block.SynchronizationBlockSet;

src/org/apollo/game/model/entity/Npc.java

@@ -1,5 +1,6 @@
-package org.apollo.game.model;
+package org.apollo.game.model.entity;
 
+import org.apollo.game.model.Position;
 import org.apollo.game.model.def.NpcDefinition;
 import org.apollo.game.sync.block.SynchronizationBlock;
 

src/org/apollo/game/model/entity/Player.java

@@ -1,4 +1,4 @@
-package org.apollo.game.model;
+package org.apollo.game.model.entity;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -15,7 +15,9 @@ import org.apollo.game.event.impl.ServerMessageEvent;
 import org.apollo.game.event.impl.SetWidgetTextEvent;
 import org.apollo.game.event.impl.SwitchTabInterfaceEvent;
 import org.apollo.game.event.impl.UpdateRunEnergyEvent;
-import org.apollo.game.model.Inventory.StackMode;
+import org.apollo.game.model.Appearance;
+import org.apollo.game.model.Position;
+import org.apollo.game.model.World;
 import org.apollo.game.model.inter.InterfaceConstants;
 import org.apollo.game.model.inter.InterfaceListener;
 import org.apollo.game.model.inter.InterfaceSet;
@@ -23,8 +25,11 @@ import org.apollo.game.model.inter.bank.BankConstants;
 import org.apollo.game.model.inter.bank.BankInterfaceListener;
 import org.apollo.game.model.inv.AppearanceInventoryListener;
 import org.apollo.game.model.inv.FullInventoryListener;
+import org.apollo.game.model.inv.Inventory;
+import org.apollo.game.model.inv.InventoryConstants;
 import org.apollo.game.model.inv.InventoryListener;
 import org.apollo.game.model.inv.SynchronizationInventoryListener;
+import org.apollo.game.model.inv.Inventory.StackMode;
 import org.apollo.game.model.settings.PrivacyState;
 import org.apollo.game.model.settings.PrivilegeLevel;
 import org.apollo.game.model.settings.ScreenBrightness;

src/org/apollo/game/model/entity/Skill.java

@@ -1,4 +1,4 @@
-package org.apollo.game.model;
+package org.apollo.game.model.entity;
 
 /**
  * Represents a single skill.

src/org/apollo/game/model/entity/SkillSet.java

@@ -1,4 +1,4 @@
-package org.apollo.game.model;
+package org.apollo.game.model.entity;
 
 import java.util.ArrayList;
 import java.util.List;

src/org/apollo/game/model/entity/WalkingQueue.java

@@ -1,9 +1,12 @@
-package org.apollo.game.model;
+package org.apollo.game.model.entity;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.Queue;
 
+import org.apollo.game.model.Direction;
+import org.apollo.game.model.Position;
+
 /**
  * A queue of {@link Direction}s which a {@link Mob} will follow.
  * 

src/org/apollo/game/model/entity/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * Contains entity related classes.
+ */
+package org.apollo.game.model.entity;

src/org/apollo/game/model/inter/InterfaceSet.java

@@ -8,7 +8,7 @@ import org.apollo.game.event.impl.EnterAmountEvent;
 import org.apollo.game.event.impl.OpenDialogueInterfaceEvent;
 import org.apollo.game.event.impl.OpenInterfaceEvent;
 import org.apollo.game.event.impl.OpenInterfaceSidebarEvent;
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 import org.apollo.game.model.inter.dialogue.DialogueListener;
 
 /**

src/org/apollo/game/model/inter/bank/BankDepositEnterAmountListener.java

@@ -1,6 +1,6 @@
 package org.apollo.game.model.inter.bank;
 
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 import org.apollo.game.model.inter.EnterAmountListener;
 
 /**

src/org/apollo/game/model/inter/bank/BankInterfaceListener.java

@@ -1,6 +1,6 @@
 package org.apollo.game.model.inter.bank;
 
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 import org.apollo.game.model.inter.InterfaceListener;
 import org.apollo.game.model.inv.InventoryListener;
 

src/org/apollo/game/model/inter/bank/BankUtils.java

@@ -1,10 +1,10 @@
 package org.apollo.game.model.inter.bank;
 
-import org.apollo.game.model.Inventory;
 import org.apollo.game.model.Item;
-import org.apollo.game.model.Player;
 import org.apollo.game.model.def.ItemDefinition;
+import org.apollo.game.model.entity.Player;
 import org.apollo.game.model.inter.InterfaceListener;
+import org.apollo.game.model.inv.Inventory;
 import org.apollo.game.model.inv.InventoryListener;
 import org.apollo.game.model.inv.SynchronizationInventoryListener;
 

src/org/apollo/game/model/inter/bank/BankWithdrawEnterAmountListener.java

@@ -1,6 +1,6 @@
 package org.apollo.game.model.inter.bank;
 
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 import org.apollo.game.model.inter.EnterAmountListener;
 
 /**

src/org/apollo/game/model/inv/AppearanceInventoryListener.java

@@ -1,8 +1,7 @@
 package org.apollo.game.model.inv;
 
-import org.apollo.game.model.Inventory;
 import org.apollo.game.model.Item;
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 import org.apollo.game.sync.block.SynchronizationBlock;
 
 /**

src/org/apollo/game/model/inv/FullInventoryListener.java

@@ -2,8 +2,7 @@ package org.apollo.game.model.inv;
 
 import org.apollo.game.event.Event;
 import org.apollo.game.event.impl.ServerMessageEvent;
-import org.apollo.game.model.Inventory;
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 
 /**
  * An {@link InventoryListener} which sends a message to a player when an inventory has run out of space.

src/org/apollo/game/model/inv/Inventory.java

@@ -1,10 +1,10 @@
-package org.apollo.game.model;
+package org.apollo.game.model.inv;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apollo.game.model.Item;
 import org.apollo.game.model.def.ItemDefinition;
-import org.apollo.game.model.inv.InventoryListener;
 
 /**
  * Represents an inventory - a collection of {@link Item}s.

src/org/apollo/game/model/inv/InventoryAdapter.java

@@ -1,6 +1,5 @@
 package org.apollo.game.model.inv;
 
-import org.apollo.game.model.Inventory;
 import org.apollo.game.model.Item;
 
 /**

src/org/apollo/game/model/inv/InventoryConstants.java

@@ -1,4 +1,4 @@
-package org.apollo.game.model;
+package org.apollo.game.model.inv;
 
 /**
  * Holds {@link Inventory}-related constants.

src/org/apollo/game/model/inv/InventoryListener.java

@@ -1,6 +1,5 @@
 package org.apollo.game.model.inv;
 
-import org.apollo.game.model.Inventory;
 import org.apollo.game.model.Item;
 
 /**

src/org/apollo/game/model/inv/SlottedItem.java

@@ -1,4 +1,6 @@
-package org.apollo.game.model;
+package org.apollo.game.model.inv;
+
+import org.apollo.game.model.Item;
 
 /**
  * A class which contains an {@link Item} and its corresponding slot.

src/org/apollo/game/model/inv/SynchronizationInventoryListener.java

@@ -2,10 +2,8 @@ package org.apollo.game.model.inv;
 
 import org.apollo.game.event.impl.UpdateItemsEvent;
 import org.apollo.game.event.impl.UpdateSlottedItemsEvent;
-import org.apollo.game.model.Inventory;
 import org.apollo.game.model.Item;
-import org.apollo.game.model.Player;
-import org.apollo.game.model.SlottedItem;
+import org.apollo.game.model.entity.Player;
 
 /**
  * An {@link InventoryListener} which synchronizes the state of the server's inventory with the client's.

src/org/apollo/game/model/obj/GameObject.java

@@ -1,8 +1,8 @@
 package org.apollo.game.model.obj;
 
-import org.apollo.game.model.Entity;
 import org.apollo.game.model.Position;
 import org.apollo.game.model.def.ObjectDefinition;
+import org.apollo.game.model.entity.Entity;
 
 /**
  * Represents an object in the game world.

src/org/apollo/game/model/sector/Sector.java

@@ -5,8 +5,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apollo.game.model.Entity;
-import org.apollo.game.model.Entity.EntityType;
+import org.apollo.game.model.entity.Entity;
+import org.apollo.game.model.entity.Entity.EntityType;
 import org.apollo.game.model.Position;
 
 /**
@@ -146,7 +146,7 @@ public final class Sector {
 	public boolean removeEntity(Entity entity) {
 		List<Entity> entities = this.entities.get(entity.getPosition());
 		if (entities == null) {
-			this.entities.put(entity.getPosition(), new ArrayList<Entity>());
+			this.entities.put(entity.getPosition(), new ArrayList<>());
 			return false;
 		}
 

src/org/apollo/game/model/sector/SectorListener.java

@@ -1,6 +1,6 @@
 package org.apollo.game.model.sector;
 
-import org.apollo.game.model.Entity;
+import org.apollo.game.model.entity.Entity;
 
 /**
  * A class that should be extended by listeners that execute actions when an entity is added or removed from the sector.

src/org/apollo/game/model/skill/LevelUpSkillListener.java

@@ -1,8 +1,8 @@
 package org.apollo.game.model.skill;
 
-import org.apollo.game.model.Player;
-import org.apollo.game.model.Skill;
-import org.apollo.game.model.SkillSet;
+import org.apollo.game.model.entity.Player;
+import org.apollo.game.model.entity.Skill;
+import org.apollo.game.model.entity.SkillSet;
 import org.apollo.util.LanguageUtil;
 
 /**

src/org/apollo/game/model/skill/SkillAdapter.java

@@ -1,7 +1,7 @@
 package org.apollo.game.model.skill;
 
-import org.apollo.game.model.Skill;
-import org.apollo.game.model.SkillSet;
+import org.apollo.game.model.entity.Skill;
+import org.apollo.game.model.entity.SkillSet;
 
 /**
  * An adapter for the {@link SkillListener}.

src/org/apollo/game/model/skill/SkillListener.java

@@ -1,7 +1,7 @@
 package org.apollo.game.model.skill;
 
-import org.apollo.game.model.Skill;
-import org.apollo.game.model.SkillSet;
+import org.apollo.game.model.entity.Skill;
+import org.apollo.game.model.entity.SkillSet;
 
 /**
  * An interface which listens to events from a {@link SkillSet}.

src/org/apollo/game/model/skill/SynchronizationSkillListener.java

@@ -1,9 +1,9 @@
 package org.apollo.game.model.skill;
 
 import org.apollo.game.event.impl.UpdateSkillEvent;
-import org.apollo.game.model.Player;
-import org.apollo.game.model.Skill;
-import org.apollo.game.model.SkillSet;
+import org.apollo.game.model.entity.Player;
+import org.apollo.game.model.entity.Skill;
+import org.apollo.game.model.entity.SkillSet;
 import org.apollo.game.sync.block.SynchronizationBlock;
 
 /**

src/org/apollo/game/scheduling/impl/SkillNormalizationTask.java

@@ -1,6 +1,6 @@
 package org.apollo.game.scheduling.impl;
 
-import org.apollo.game.model.Mob;
+import org.apollo.game.model.entity.Mob;
 import org.apollo.game.scheduling.ScheduledTask;
 
 /**

src/org/apollo/game/sync/ParallelClientSynchronizer.java

@@ -6,9 +6,9 @@ import java.util.concurrent.Phaser;
 import java.util.concurrent.ThreadFactory;
 
 import org.apollo.game.GameService;
-import org.apollo.game.model.Npc;
-import org.apollo.game.model.Player;
 import org.apollo.game.model.World;
+import org.apollo.game.model.entity.Npc;
+import org.apollo.game.model.entity.Player;
 import org.apollo.game.sync.task.NpcSynchronizationTask;
 import org.apollo.game.sync.task.PhasedSynchronizationTask;
 import org.apollo.game.sync.task.PlayerSynchronizationTask;

src/org/apollo/game/sync/SequentialClientSynchronizer.java

@@ -1,9 +1,9 @@
 package org.apollo.game.sync;
 
 import org.apollo.game.GameService;
-import org.apollo.game.model.Npc;
-import org.apollo.game.model.Player;
 import org.apollo.game.model.World;
+import org.apollo.game.model.entity.Npc;
+import org.apollo.game.model.entity.Player;
 import org.apollo.game.sync.task.NpcSynchronizationTask;
 import org.apollo.game.sync.task.PlayerSynchronizationTask;
 import org.apollo.game.sync.task.PostNpcSynchronizationTask;

src/org/apollo/game/sync/block/AppearanceBlock.java

@@ -1,7 +1,7 @@
 package org.apollo.game.sync.block;
 
 import org.apollo.game.model.Appearance;
-import org.apollo.game.model.Inventory;
+import org.apollo.game.model.inv.Inventory;
 
 /**
  * The appearance {@link SynchronizationBlock}. Only players can utilise this block.

src/org/apollo/game/sync/block/SynchronizationBlock.java

@@ -4,8 +4,8 @@ import org.apollo.game.event.impl.ChatEvent;
 import org.apollo.game.model.Animation;
 import org.apollo.game.model.Direction;
 import org.apollo.game.model.Graphic;
-import org.apollo.game.model.Player;
 import org.apollo.game.model.Position;
+import org.apollo.game.model.entity.Player;
 import org.apollo.game.sync.seg.SynchronizationSegment;
 
 /**

src/org/apollo/game/sync/task/NpcSynchronizationTask.java

@@ -5,10 +5,10 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.apollo.game.event.impl.NpcSynchronizationEvent;
-import org.apollo.game.model.Npc;
-import org.apollo.game.model.Player;
 import org.apollo.game.model.Position;
 import org.apollo.game.model.World;
+import org.apollo.game.model.entity.Npc;
+import org.apollo.game.model.entity.Player;
 import org.apollo.game.sync.seg.AddNpcSegment;
 import org.apollo.game.sync.seg.MovementSegment;
 import org.apollo.game.sync.seg.RemoveMobSegment;

src/org/apollo/game/sync/task/PlayerSynchronizationTask.java

@@ -5,9 +5,9 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.apollo.game.event.impl.PlayerSynchronizationEvent;
-import org.apollo.game.model.Player;
 import org.apollo.game.model.Position;
 import org.apollo.game.model.World;
+import org.apollo.game.model.entity.Player;
 import org.apollo.game.sync.block.AppearanceBlock;
 import org.apollo.game.sync.block.ChatBlock;
 import org.apollo.game.sync.block.SynchronizationBlock;

src/org/apollo/game/sync/task/PostNpcSynchronizationTask.java

@@ -1,6 +1,6 @@
 package org.apollo.game.sync.task;
 
-import org.apollo.game.model.Npc;
+import org.apollo.game.model.entity.Npc;
 
 /**
  * A {@link SynchronizationTask} which does post-synchronization work for the specified {@link Npc}.

src/org/apollo/game/sync/task/PostPlayerSynchronizationTask.java

@@ -1,6 +1,6 @@
 package org.apollo.game.sync.task;
 
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 
 /**
  * A {@link SynchronizationTask} which does post-synchronization work for the specified {@link Player}.

src/org/apollo/game/sync/task/PreNpcSynchronizationTask.java

@@ -1,6 +1,6 @@
 package org.apollo.game.sync.task;
 
-import org.apollo.game.model.Npc;
+import org.apollo.game.model.entity.Npc;
 
 /**
  * A {@link SynchronizationTask} which does pre-synchronization work for the specified npc.

src/org/apollo/game/sync/task/PrePlayerSynchronizationTask.java

@@ -1,8 +1,8 @@
 package org.apollo.game.sync.task;
 
 import org.apollo.game.event.impl.RegionChangeEvent;
-import org.apollo.game.model.Player;
 import org.apollo.game.model.Position;
+import org.apollo.game.model.entity.Player;
 
 /**
  * A {@link SynchronizationTask} which does pre-synchronization work for the specified {@link Player}.

src/org/apollo/io/player/PlayerLoaderResponse.java

@@ -1,6 +1,6 @@
 package org.apollo.io.player;
 
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 import org.apollo.net.codec.login.LoginConstants;
 
 /**

src/org/apollo/io/player/PlayerSaver.java

@@ -1,6 +1,6 @@
 package org.apollo.io.player;
 
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 
 /**
  * An interface which may be implemented by others which are capable of saving players. For example, implementations

src/org/apollo/io/player/impl/BinaryPlayerLoader.java

@@ -8,12 +8,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apollo.game.model.Appearance;
-import org.apollo.game.model.Inventory;
 import org.apollo.game.model.Item;
-import org.apollo.game.model.Player;
 import org.apollo.game.model.Position;
-import org.apollo.game.model.Skill;
-import org.apollo.game.model.SkillSet;
+import org.apollo.game.model.entity.Player;
+import org.apollo.game.model.entity.Skill;
+import org.apollo.game.model.entity.SkillSet;
+import org.apollo.game.model.inv.Inventory;
 import org.apollo.game.model.settings.Gender;
 import org.apollo.game.model.settings.PrivacyState;
 import org.apollo.game.model.settings.PrivilegeLevel;

src/org/apollo/io/player/impl/BinaryPlayerSaver.java

@@ -5,14 +5,15 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map.Entry;
 
 import org.apollo.game.model.Appearance;
-import org.apollo.game.model.Inventory;
 import org.apollo.game.model.Item;
-import org.apollo.game.model.Player;
 import org.apollo.game.model.Position;
-import org.apollo.game.model.Skill;
-import org.apollo.game.model.SkillSet;
+import org.apollo.game.model.entity.Player;
+import org.apollo.game.model.entity.Skill;
+import org.apollo.game.model.entity.SkillSet;
+import org.apollo.game.model.inv.Inventory;
 import org.apollo.io.player.PlayerSaver;
 import org.apollo.util.NameUtil;
 import org.apollo.util.StreamUtil;
@@ -87,6 +88,34 @@ public final class BinaryPlayerSaver implements PlayerSaver {
 			for (String username : usernames) {
 				out.writeLong(NameUtil.encodeBase37(username));
 			}
+
+			for (Entry<String, Object> attribute : player.getAttributes()) {
+				saveAttribute(out, attribute);
+			}
+		}
+	}
+
+	/**
+	 * Writes an attribute to the specified output stream.
+	 * 
+	 * @param out The output stream.
+	 * @param attribute The attribute.
+	 * @throws IOException If an I/O error occurs.
+	 */
+	private void saveAttribute(DataOutputStream out, Entry<String, Object> attribute) throws IOException {
+		StreamUtil.writeString(out, attribute.getKey());
+		Object value = attribute.getValue();
+		if (value instanceof String) {
+			out.writeByte(0);
+			StreamUtil.writeString(out, (String) value);
+		} else if (value instanceof Integer) {
+			out.writeByte(1);
+			out.writeInt((Integer) value);
+		} else if (value instanceof Boolean) {
+			out.writeByte(2);
+			out.writeByte(((Boolean) value) ? 1 : 0);
+		} else {
+			throw new IllegalArgumentException("Undefined attribute type " + value + ".");
 		}
 	}
 

src/org/apollo/io/player/impl/DiscardPlayerSaver.java

@@ -1,6 +1,6 @@
 package org.apollo.io.player.impl;
 
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 import org.apollo.io.player.PlayerSaver;
 
 /**

src/org/apollo/io/player/impl/DummyPlayerLoader.java

@@ -1,7 +1,7 @@
 package org.apollo.io.player.impl;
 
-import org.apollo.game.model.Player;
 import org.apollo.game.model.Position;
+import org.apollo.game.model.entity.Player;
 import org.apollo.game.model.settings.PrivilegeLevel;
 import org.apollo.io.player.PlayerLoader;
 import org.apollo.io.player.PlayerLoaderResponse;

src/org/apollo/io/player/impl/JdbcPlayerSaver.java

@@ -1,6 +1,6 @@
 package org.apollo.io.player.impl;
 
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 import org.apollo.io.player.PlayerSaver;
 
 public final class JdbcPlayerSaver implements PlayerSaver {

src/org/apollo/login/LoginService.java

@@ -7,7 +7,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 import org.apollo.Service;
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 import org.apollo.io.player.PlayerLoader;
 import org.apollo.io.player.PlayerLoaderResponse;
 import org.apollo.io.player.PlayerSaver;

src/org/apollo/login/PlayerSaverWorker.java

@@ -3,7 +3,7 @@ package org.apollo.login;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 import org.apollo.io.player.PlayerSaver;
 import org.apollo.net.session.GameSession;
 

src/org/apollo/net/release/r317/PlayerSynchronizationEventEncoder.java

@@ -4,12 +4,12 @@ import org.apollo.game.event.impl.PlayerSynchronizationEvent;
 import org.apollo.game.model.Animation;
 import org.apollo.game.model.Appearance;
 import org.apollo.game.model.Direction;
-import org.apollo.game.model.EquipmentConstants;
 import org.apollo.game.model.Graphic;
-import org.apollo.game.model.Inventory;
 import org.apollo.game.model.Item;
 import org.apollo.game.model.Position;
 import org.apollo.game.model.def.EquipmentDefinition;
+import org.apollo.game.model.entity.EquipmentConstants;
+import org.apollo.game.model.inv.Inventory;
 import org.apollo.game.model.settings.Gender;
 import org.apollo.game.sync.block.AnimationBlock;
 import org.apollo.game.sync.block.AppearanceBlock;

src/org/apollo/net/release/r317/Release317.java

@@ -24,7 +24,6 @@ import org.apollo.game.event.impl.RemoveTileItemEvent;
 import org.apollo.game.event.impl.SendFriendEvent;
 import org.apollo.game.event.impl.ServerMessageEvent;
 import org.apollo.game.event.impl.SetPlayerActionEvent;
-import org.apollo.game.event.impl.UpdateTileItemEvent;
 import org.apollo.game.event.impl.SetWidgetItemModelEvent;
 import org.apollo.game.event.impl.SetWidgetModelAnimationEvent;
 import org.apollo.game.event.impl.SetWidgetNpcModelEvent;
@@ -36,6 +35,7 @@ import org.apollo.game.event.impl.UpdateItemsEvent;
 import org.apollo.game.event.impl.UpdateRunEnergyEvent;
 import org.apollo.game.event.impl.UpdateSkillEvent;
 import org.apollo.game.event.impl.UpdateSlottedItemsEvent;
+import org.apollo.game.event.impl.UpdateTileItemEvent;
 import org.apollo.game.event.impl.UpdateWeightEvent;
 import org.apollo.net.meta.PacketMetaDataGroup;
 import org.apollo.net.release.Release;
@@ -138,7 +138,7 @@ public final class Release317 extends Release {
 		register(189, spamEventDecoder);
 		register(210, spamEventDecoder);
 		register(226, spamEventDecoder);
-        register(121, spamEventDecoder);
+		register(121, spamEventDecoder);
 
 		register(155, new FirstNpcActionEventDecoder());
 		register(17, new SecondNpcActionEventDecoder());

src/org/apollo/net/release/r317/UpdateSkillEventEncoder.java

@@ -1,7 +1,7 @@
 package org.apollo.net.release.r317;
 
 import org.apollo.game.event.impl.UpdateSkillEvent;
-import org.apollo.game.model.Skill;
+import org.apollo.game.model.entity.Skill;
 import org.apollo.net.codec.game.DataOrder;
 import org.apollo.net.codec.game.DataType;
 import org.apollo.net.codec.game.GamePacket;

src/org/apollo/net/release/r317/UpdateSlottedItemsEventEncoder.java

@@ -2,7 +2,7 @@ package org.apollo.net.release.r317;
 
 import org.apollo.game.event.impl.UpdateSlottedItemsEvent;
 import org.apollo.game.model.Item;
-import org.apollo.game.model.SlottedItem;
+import org.apollo.game.model.inv.SlottedItem;
 import org.apollo.net.codec.game.DataType;
 import org.apollo.net.codec.game.GamePacket;
 import org.apollo.net.codec.game.GamePacketBuilder;

src/org/apollo/net/release/r377/PlayerSynchronizationEventEncoder.java

@@ -4,12 +4,12 @@ import org.apollo.game.event.impl.PlayerSynchronizationEvent;
 import org.apollo.game.model.Animation;
 import org.apollo.game.model.Appearance;
 import org.apollo.game.model.Direction;
-import org.apollo.game.model.EquipmentConstants;
 import org.apollo.game.model.Graphic;
-import org.apollo.game.model.Inventory;
 import org.apollo.game.model.Item;
 import org.apollo.game.model.Position;
 import org.apollo.game.model.def.EquipmentDefinition;
+import org.apollo.game.model.entity.EquipmentConstants;
+import org.apollo.game.model.inv.Inventory;
 import org.apollo.game.model.settings.Gender;
 import org.apollo.game.sync.block.AnimationBlock;
 import org.apollo.game.sync.block.AppearanceBlock;

src/org/apollo/net/release/r377/UpdateSkillEventEncoder.java

@@ -1,7 +1,7 @@
 package org.apollo.net.release.r377;
 
 import org.apollo.game.event.impl.UpdateSkillEvent;
-import org.apollo.game.model.Skill;
+import org.apollo.game.model.entity.Skill;
 import org.apollo.net.codec.game.DataTransformation;
 import org.apollo.net.codec.game.DataType;
 import org.apollo.net.codec.game.GamePacket;

src/org/apollo/net/release/r377/UpdateSlottedItemsEventEncoder.java

@@ -2,7 +2,7 @@ package org.apollo.net.release.r377;
 
 import org.apollo.game.event.impl.UpdateSlottedItemsEvent;
 import org.apollo.game.model.Item;
-import org.apollo.game.model.SlottedItem;
+import org.apollo.game.model.inv.SlottedItem;
 import org.apollo.net.codec.game.DataType;
 import org.apollo.net.codec.game.GamePacket;
 import org.apollo.net.codec.game.GamePacketBuilder;

src/org/apollo/net/session/GameSession.java

@@ -16,7 +16,7 @@ import org.apollo.game.event.Event;
 import org.apollo.game.event.handler.chain.EventHandlerChain;
 import org.apollo.game.event.handler.chain.EventHandlerChainGroup;
 import org.apollo.game.event.impl.LogoutEvent;
-import org.apollo.game.model.Player;
+import org.apollo.game.model.entity.Player;
 
 /**
  * A game session.

src/org/apollo/net/session/LoginSession.java

@@ -7,8 +7,8 @@ import io.netty.channel.ChannelHandlerContext;
 
 import org.apollo.ServerContext;
 import org.apollo.game.GameService;
-import org.apollo.game.model.Player;
 import org.apollo.game.model.World.RegistrationStatus;
+import org.apollo.game.model.entity.Player;
 import org.apollo.io.player.PlayerLoaderResponse;
 import org.apollo.login.LoginService;
 import org.apollo.net.ApolloHandler;

src/org/apollo/util/MobRepository.java

@@ -3,7 +3,7 @@ package org.apollo.util;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import org.apollo.game.model.Mob;
+import org.apollo.game.model.entity.Mob;
 
 /**
  * A {@link MobRepository} is a repository of {@link Mob}s that are currently active in the game world.