17 files changed, 790 insertions, 789 deletions

diff --git a/Makefile b/Makefile
index 99b89aa..c958d5b 100644
--- a/Makefile
+++ b/Makefile
@@ -13,9 +13,9 @@ else
 	CFLAGS += -O2
 endif
 
-HEADERS = $(SRCDIR)/common.hh $(SRCDIR)/config.hh $(SRCDIR)/connection.hh $(SRCDIR)/containers.hh $(SRCDIR)/crcombat.hh $(SRCDIR)/creature.hh $(SRCDIR)/crskill.hh $(SRCDIR)/enums.hh $(SRCDIR)/info.hh $(SRCDIR)/magic.hh $(SRCDIR)/map.hh $(SRCDIR)/monster.hh $(SRCDIR)/objects.hh $(SRCDIR)/player.hh $(SRCDIR)/script.hh $(SRCDIR)/stubs.hh $(SRCDIR)/thread.hh
+HEADERS = $(SRCDIR)/common.hh $(SRCDIR)/config.hh $(SRCDIR)/connection.hh $(SRCDIR)/containers.hh $(SRCDIR)/cr.hh $(SRCDIR)/enums.hh $(SRCDIR)/info.hh $(SRCDIR)/magic.hh $(SRCDIR)/map.hh $(SRCDIR)/objects.hh $(SRCDIR)/script.hh $(SRCDIR)/stubs.hh $(SRCDIR)/thread.hh
 
-$(BUILDDIR)/$(OUTPUTEXE): $(BUILDDIR)/config.obj $(BUILDDIR)/crcombat.obj $(BUILDDIR)/creature.obj $(BUILDDIR)/crskill.obj $(BUILDDIR)/info.obj $(BUILDDIR)/magic.obj $(BUILDDIR)/main.obj $(BUILDDIR)/map.obj $(BUILDDIR)/objects.obj $(BUILDDIR)/player.obj $(BUILDDIR)/script.obj $(BUILDDIR)/shm.obj $(BUILDDIR)/strings.obj $(BUILDDIR)/thread.obj $(BUILDDIR)/time.obj $(BUILDDIR)/util.obj
+$(BUILDDIR)/$(OUTPUTEXE): $(BUILDDIR)/config.obj $(BUILDDIR)/crcombat.obj $(BUILDDIR)/crmain.obj $(BUILDDIR)/crplayer.obj $(BUILDDIR)/crskill.obj $(BUILDDIR)/info.obj $(BUILDDIR)/magic.obj $(BUILDDIR)/main.obj $(BUILDDIR)/map.obj $(BUILDDIR)/objects.obj $(BUILDDIR)/script.obj $(BUILDDIR)/shm.obj $(BUILDDIR)/strings.obj $(BUILDDIR)/thread.obj $(BUILDDIR)/time.obj $(BUILDDIR)/util.obj
 	$(CC) -c $(CFLAGS) $(LFLAGS) -o $@ $^
 
 $(BUILDDIR)/config.obj: $(SRCDIR)/config.cc $(HEADERS)
@@ -26,7 +26,11 @@ $(BUILDDIR)/crcombat.obj: $(SRCDIR)/crcombat.cc $(HEADERS)
 	@mkdir -p $(@D)
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-$(BUILDDIR)/creature.obj: $(SRCDIR)/creature.cc $(HEADERS)
+$(BUILDDIR)/crmain.obj: $(SRCDIR)/crmain.cc $(HEADERS)
+	@mkdir -p $(@D)
+	$(CC) -c $(CFLAGS) -o $@ $<
+
+$(BUILDDIR)/crplayer.obj: $(SRCDIR)/crplayer.cc $(HEADERS)
 	@mkdir -p $(@D)
 	$(CC) -c $(CFLAGS) -o $@ $<
 
@@ -54,10 +58,6 @@ $(BUILDDIR)/objects.obj: $(SRCDIR)/objects.cc $(HEADERS)
 	@mkdir -p $(@D)
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-$(BUILDDIR)/player.obj: $(SRCDIR)/player.cc $(HEADERS)
-	@mkdir -p $(@D)
-	$(CC) -c $(CFLAGS) -o $@ $<
-
 $(BUILDDIR)/script.obj: $(SRCDIR)/script.cc $(HEADERS)
 	@mkdir -p $(@D)
 	$(CC) -c $(CFLAGS) -o $@ $<
diff --git a/TODO.md b/TODO.md
index 76f56d2..e237083 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,9 +1,20 @@
 ## TODO NEXT
-- MAGIC.CC
 - merge creature headers into a single one CR.HH
 	- this should help preventing dependency cycles and centralize creature data
 		structures and globals in a single place
-- CRMAIN.CC
+- CRMAIN.CC, CRPLAYER.CC, CRNONPL.CC, CRACT.CC
+- HOUSES.CC
+- INFO.CC
+- OPERATE.CC
+- MOVEUSE.CC
+- SENDING.CC
+- RECEIVING.CC
+- CONNECTIONS.CC
+- COMMUNICATION.CC
+- READER.CC
+- WRITER.CC
+- QUERY.CC
+- DBFUNCS.CC
 
 ## Stack allocations
 Any functions that use `alloca` or some other form of dynamic stack allocations will cause decompiled functions to be an absolute mess. It usually shows up in the decompiled code as both a size computation like `-(VAR + CONST & 0xfffffff0)`, followed by some assignment. It doesn't make total sense without looking at the disassembly. I've encountered ~30 such computations and expect the functions containing them to be amongt the most challenging/annoying to be properly decompiled.
@@ -15,8 +26,9 @@ I didn't dive into how exceptions are handled, but it seems that the ones relate
 The decompiled file has ~115K lines of C. If we take ~15K lines to be rubbish, this can be round to ~100K. Considering a low estimate of 200 lines per day, the whole process could take up to 500 days which is quite a bit but not impossible. Now considering a high estimate of 1K lines per day, it could take 100 days which is also quite a bit.
 
 ## TODO AFTER FIRST PASS
+- Review dividing comments. I feel like the current "//========" blends in too easily, making it hard to see.
 - Trim rough edges.
-- Avoid unsafe libc functions like `strcpy`, `strncpy`, `strcat`, `sprintf` etc...
+- Replace unsafe libc functions like `strcpy`, `strncpy`, `strcat`, `sprintf` etc...
 - Handle connections inline with `poll`/`epoll` (probably?).
 - Remove exceptions.
 - Review signal usage for timing (SIGALRM, etc...).
diff --git a/reference/types.hh b/reference/types.hh
index 507ea78..c970e35 100644
--- a/reference/types.hh
+++ b/reference/types.hh
@@ -188,106 +188,6 @@ struct THelpDepot {
     int DepotNr;
 };
 
-struct TPlayerData {
-    ulong CharacterID;
-    pid_t Locked;
-    int Sticky;
-    bool Dirty;
-    int Race;
-    struct TOutfit OriginalOutfit;
-    struct TOutfit CurrentOutfit;
-    time_t LastLoginTime;
-    time_t LastLogoutTime;
-    int startx;
-    int starty;
-    int startz;
-    int posx;
-    int posy;
-    int posz;
-    int Profession;
-    int PlayerkillerEnd;
-    int Actual[25];
-    int Maximum[25];
-    int Minimum[25];
-    int DeltaAct[25];
-    int MagicDeltaAct[25];
-    int Cycle[25];
-    int MaxCycle[25];
-    int Count[25];
-    int MaxCount[25];
-    int AddLevel[25];
-    int Experience[25];
-    int FactorPercent[25];
-    int NextLevel[25];
-    int Delta[25];
-    uchar SpellList[256];
-    int QuestValues[500];
-    int MurderTimestamps[20];
-    uchar *Inventory;
-    int InventorySize;
-    uchar *Depot[9];
-    int DepotSize[9];
-    ulong AccountID;
-    int Sex;
-    char Name[30];
-    uchar Rights[12];
-    char Guild[31];
-    char Rank[31];
-    char Title[31];
-    int Buddies;
-    ulong Buddy[100];
-    char BuddyName[100][30];
-    ulong EarliestYellRound;
-    ulong EarliestTradeChannelRound;
-    ulong EarliestSpellTime;
-    ulong EarliestMultiuseTime;
-    ulong TalkBufferFullTime;
-    ulong MutingEndRound;
-    ulong Addressees[20];
-    ulong AddresseesTimes[20];
-    int NumberOfMutings;
-};
-
-struct TPlayer {
-    struct TCreature super_TCreature;
-    ulong AccountID;
-    char Guild[31];
-    char Rank[31];
-    char Title[31];
-    char IPAddress[16];
-    uchar Rights[12];
-    struct Object Depot;
-    int DepotNr;
-    int DepotSpace;
-    enum RESULT ConstructError;
-    struct TPlayerData *PlayerData;
-    struct Object TradeObject;
-    ulong TradePartner;
-    bool TradeAccepted;
-    int OldState;
-    ulong Request;
-    int RequestTimestamp;
-    ulong RequestProcessingGamemaster;
-    int TutorActivities;
-    uchar SpellList[256];
-    int QuestValues[500];
-    struct Object OpenContainer[16];
-    struct vector<long_unsigned_int> AttackedPlayers;
-    int NumberOfAttackedPlayers;
-    bool Aggressor;
-    struct vector<long_unsigned_int> FormerAttackedPlayers;
-    int NumberOfFormerAttackedPlayers;
-    bool FormerAggressor;
-    ulong FormerLogoutRound;
-    ulong PartyLeader;
-    ulong PartyLeavingRound;
-    ulong TalkBufferFullTime;
-    ulong MutingEndRound;
-    int NumberOfMutings;
-    ulong Addressees[20];
-    ulong AddresseesTimes[20];
-};
-
 struct TParty {
     ulong Leader;
     struct vector<long_unsigned_int> Member;
diff --git a/src/cr.hh b/src/cr.hh
new file mode 100644
index 0000000..0d10cd3
--- /dev/null
+++ b/src/cr.hh
@@ -0,0 +1,619 @@
+#ifndef TIBIA_CREATURE_HH_
+#define TIBIA_CREATURE_HH_ 1
+
+#include "common.hh"
+#include "connection.hh"
+#include "containers.hh"
+#include "map.hh"
+
+struct TCreature;
+
+// TRaceData
+// =============================================================================
+struct TOutfit{
+	int OutfitID;
+	union{
+		uint16 ObjectType;
+		uint8 Colors[4];
+	};
+};
+
+struct TSkillData {
+	int Nr;
+	int Actual;
+	int Minimum;
+	int Maximum;
+	int NextLevel;
+	int FactorPercent;
+	int AddLevel;
+};
+
+struct TItemData {
+	ObjectType Type;
+	int Maximum;
+	int Probability;
+};
+
+struct TSpellData {
+	SpellShapeType Shape;
+	int ShapeParam1;
+	int ShapeParam2;
+	int ShapeParam3;
+	int ShapeParam4;
+	SpellImpactType Impact;
+	int ImpactParam1;
+	int ImpactParam2;
+	int ImpactParam3;
+	int ImpactParam4;
+	int Delay;
+};
+
+struct TRaceData {
+	TRaceData(void);
+
+	char Name[30];
+	char Article[3];
+	TOutfit Outfit;
+	ObjectType MaleCorpse;
+	ObjectType FemaleCorpse;
+	BloodType Blood;
+	int ExperiencePoints;
+	int FleeThreshold;
+	int Attack;
+	int Defend;
+	int Armor;
+	int Poison;
+	int SummonCost;
+	int LoseTarget;
+	int Strategy[4];
+	bool KickBoxes;
+	bool KickCreatures;
+	bool SeeInvisible;
+	bool Unpushable;
+	bool DistanceFighting;
+	bool NoSummon;
+	bool NoIllusion;
+	bool NoConvince;
+	bool NoBurning;
+	bool NoPoison;
+	bool NoEnergy;
+	bool NoHit;
+	bool NoLifeDrain;
+	bool NoParalyze;
+	int Skills;
+	vector<TSkillData> Skill;
+	int Talks;
+	vector<uint32> Talk; // POINTER? Probably a reference from `AddDynamicString`?
+	int Items;
+	vector<TItemData> Item;
+	int Spells;
+	vector<TSpellData> Spell;
+};
+
+// TSkillBase 
+// =============================================================================
+struct TSkill{
+	// REGULAR FUNCTIONS
+	// =========================================================================
+	TSkill(int SkNr, TCreature *Master);
+	int Get(void);
+	int GetProgress(void);
+	void Check(void);
+	void Change(int Amount);
+	void SetMDAct(int MDAct);
+	void Load(int Act, int Max, int Min, int DAct, int MDAct,
+			int Cycle, int MaxCycle, int Count, int MaxCount, int AddLevel,
+			int Exp, int FactorPercent, int NextLevel, int Delta);
+	void Save(int *Act, int *Max, int *Min, int *DAct, int *MDAct,
+			int *Cycle, int *MaxCycle, int *Count, int *MaxCount, int *AddLevel,
+			int *Exp, int *FactorPercent, int *NextLevel, int *Delta);
+
+	// VIRTUAL FUNCTIONS
+	// =========================================================================
+	virtual ~TSkill(void);																// VTABLE[ 0]
+	// Duplicate destructor that also calls operator delete.							// VTABLE[ 1]
+	virtual void Set(int Value);														// VTABLE[ 2]
+	virtual void Increase(int Amount);													// VTABLE[ 3]
+	virtual void Decrease(int Amount);													// VTABLE[ 4]
+	virtual int GetExpForLevel(int Level);												// VTABLE[ 5]
+	virtual void Advance(int Range);													// VTABLE[ 6]
+	virtual void ChangeSkill(int FactorPercent, int Delta);								// VTABLE[ 7]
+	virtual int ProbeValue(int Max, bool Increase);										// VTABLE[ 8]
+	virtual bool Probe(int Diff, int Prob, bool Increase);								// VTABLE[ 9]
+	virtual bool Process(void);															// VTABLE[10]
+	virtual bool SetTimer(int Cycle, int Count, int MaxCount, int AdditionalValue);		// VTABLE[11]
+	virtual bool DelTimer(void);														// VTABLE[12]
+	virtual int TimerValue(void);														// VTABLE[13]
+	virtual bool Jump(int Range);														// VTABLE[14]
+	virtual void Event(int Range);														// VTABLE[15]
+	virtual void Reset(void);															// VTABLE[16]
+
+	// DATA
+	// =========================================================================
+	//void *VTABLE;		// IMPLICIT
+	int DAct;			// Delta Value - Probably from equipment.
+	int MDAct;			// Delta Magic Value - Probably from spells.
+	uint16 SkNr;
+	TCreature *Master;
+	int Act;			// Actual Value (?)
+	int Max;
+	int Min;
+	int FactorPercent;
+	int LastLevel;
+	int NextLevel;
+	int Delta;
+	int Exp;
+	int Cycle;
+	int MaxCycle;
+	int Count;
+	int MaxCount;
+	int AddLevel;
+};
+
+struct TSkillLevel: TSkill {
+	TSkillLevel(int SkNr, TCreature *Master) : TSkill(SkNr, Master) {}
+	void Increase(int Amount) override;
+	void Decrease(int Amount) override;
+	int GetExpForLevel(int Level) override;
+	bool Jump(int Range) override;
+};
+
+struct TSkillProbe: TSkill {
+	TSkillProbe(int SkNr, TCreature *Master) : TSkill(SkNr, Master) {}
+	void Increase(int Amount) override;
+	void Decrease(int Amount) override;
+	int GetExpForLevel(int Level) override;
+	void ChangeSkill(int FactorPercent, int Delta) override;
+	int ProbeValue(int Max, bool Increase) override;
+	bool Probe(int Diff, int Prob, bool Increase) override;
+	bool SetTimer(int Cycle, int Count, int MaxCount, int AdditionalValue) override;
+	bool Jump(int Range) override;
+	void Event(int Range) override;
+};
+
+struct TSkillAdd: TSkill {
+	TSkillAdd(int SkNr, TCreature *Master) : TSkill(SkNr, Master) {}
+	void Advance(int Range) override;
+};
+
+struct TSkillHitpoints: TSkillAdd {
+	TSkillHitpoints(int SkNr, TCreature *Master) : TSkillAdd(SkNr, Master) {}
+	void Set(int Value) override;
+};
+
+struct TSkillMana: TSkillAdd {
+	TSkillMana(int SkNr, TCreature *Master) : TSkillAdd(SkNr, Master) {}
+	void Set(int Value) override;
+};
+
+struct TSkillGoStrength: TSkillAdd {
+	TSkillGoStrength(int SkNr, TCreature *Master) : TSkillAdd(SkNr, Master) {}
+	bool SetTimer(int Cycle, int Count, int MaxCount, int AdditionalValue) override;
+	void Event(int Range) override;
+};
+
+struct TSkillCarryStrength: TSkillAdd {
+	TSkillCarryStrength(int SkNr, TCreature *Master) : TSkillAdd(SkNr, Master) {}
+	void Set(int Value) override;
+};
+
+struct TSkillSoulpoints: TSkillAdd {
+	TSkillSoulpoints(int SkNr, TCreature *Master) : TSkillAdd(SkNr, Master) {}
+	void Set(int Value) override;
+	int TimerValue(void) override;
+	void Event(int Range) override;
+};
+
+struct TSkillFed: TSkill {
+	TSkillFed(int SkNr, TCreature *Master) : TSkill(SkNr, Master) {}
+	void Event(int Range) override;
+};
+
+struct TSkillLight: TSkill {
+	TSkillLight(int SkNr, TCreature *Master) : TSkill(SkNr, Master) {}
+	bool SetTimer(int Cycle, int Count, int MaxCount, int AdditionalValue) override;
+	void Event(int Range) override;
+};
+
+struct TSkillIllusion: TSkill {
+	TSkillIllusion(int SkNr, TCreature *Master) : TSkill(SkNr, Master) {}
+	bool SetTimer(int Cycle, int Count, int MaxCount, int AdditionalValue) override;
+	void Event(int Range) override;
+};
+
+struct TSkillPoison: TSkill {
+	TSkillPoison(int SkNr, TCreature *Master) : TSkill(SkNr, Master) {}
+	bool Process(void) override;
+	bool SetTimer(int Cycle, int Count, int MaxCount, int AdditionalValue) override;
+	void Event(int Range) override;
+	void Reset(void) override;
+};
+
+struct TSkillBurning: TSkill {
+	TSkillBurning(int SkNr, TCreature *Master) : TSkill(SkNr, Master) {}
+	void Event(int Range) override;
+};
+
+struct TSkillEnergy: TSkill {
+	TSkillEnergy(int SkNr, TCreature *Master) : TSkill(SkNr, Master) {}
+	void Event(int Range) override;
+};
+
+struct TSkillBase{
+	// REGULAR FUNCTIONS
+	// =========================================================================
+	TSkillBase(void);
+	~TSkillBase(void);
+	bool NewSkill(uint16 SkillNo, TCreature *Creature);
+	bool SetSkills(int Race);
+	void ProcessSkills(void);
+	bool SetTimer(uint16 SkNr, int Cycle, int Count, int MaxCount, int AdditionalValue);
+	void DelTimer(uint16 SkNr);
+
+	// DATA
+	// =========================================================================
+	TSkill *Skills[25];
+	TSkill *TimerList[25];
+	uint16 FirstFreeTimer;
+};
+
+// TCombat
+// =============================================================================
+struct TCombatEntry{
+	uint32 ID;
+	uint32 Damage;
+	uint32 TimeStamp;
+};
+
+struct TCombat{
+	// REGULAR FUNCTIONS
+	// =========================================================================
+	TCombat(void);
+	void GetWeapon(void);
+	void GetAmmo(void);
+	void CheckCombatValues(void);
+	void GetAttackValue(int *Value, int *SkillNr);
+	void GetDefendValue(int *Value, int *SkillNr);
+	int GetAttackDamage(void);
+	int GetDefendDamage(void);
+	int GetArmorStrength(void);
+	int GetDistance(void);
+	void ActivateLearning(void);
+	void SetAttackMode(uint8 AttackMode);
+	void SetChaseMode(uint8 ChaseMode);
+	void SetSecureMode(uint8 SecureMode);
+	void SetAttackDest(uint32 TargetID, bool Follow);
+	void CanToDoAttack(void);
+	void StopAttack(int Delay);
+	void DelayAttack(int Milliseconds);
+	void Attack(void);
+	void CloseAttack(TCreature *Target);
+	void DistanceAttack(TCreature *Target);
+	void WandAttack(TCreature *Target);
+	void AddDamageToCombatList(uint32 Attacker, uint32 Damage);
+	uint32 GetDamageByCreature(uint32 CreatureID);
+	uint32 GetMostDangerousAttacker(void);
+	void DistributeExperiencePoints(uint32 Exp);
+
+
+	// DATA
+	// =========================================================================
+	TCreature *Master;
+	uint32 EarliestAttackTime;
+	uint32 EarliestDefendTime;
+	uint32 LastDefendTime;
+	uint32 LatestAttackTime;
+	uint8 AttackMode;
+	uint8 ChaseMode;
+	uint8 SecureMode;
+	uint32 AttackDest;
+	bool Following;
+	Object Shield;
+	Object Close;
+	Object Missile;
+	Object Throw;
+	Object Wand;
+	Object Ammo;
+	bool Fist;
+	uint32 CombatDamage;
+	int ActCombatEntry;
+	TCombatEntry CombatList[20];
+	int LearningPoints;
+};
+
+// TCreature
+// =============================================================================
+
+struct TToDoEntry {
+	ToDoType Code;
+	union{
+		struct{
+			uint32 Time;
+		} Wait;
+
+		struct{
+			int x;
+			int y;
+			int z;
+		} Go;
+
+		struct{
+			int Direction;
+		} Rotate;
+
+		struct{
+			uint32 Obj;
+			int x;
+			int y;
+			int z;
+			int Count;
+		} Move;
+
+		struct{
+			uint32 Obj;
+			uint32 Partner;
+		} Trade;
+
+		struct{
+			uint32 Obj1;
+			uint32 Obj2;
+			int Dummy;
+		} Use;
+
+		struct{
+			uint32 Obj;
+		} Turn;
+
+		struct{
+			uint32 Text; // POINTER? Probably a reference from `AddDynamicString`?
+			int Mode;
+			uint32 Addressee;
+			bool CheckSpamming;
+		} Talk;
+
+		struct{
+			int NewState;
+		} ChangeState;
+	};
+};
+
+struct TCreature: TSkillBase {
+	// REGULAR FUNCTIONS
+	// =========================================================================
+	TCreature(void);
+	void Attack(void);
+	int Damage(TCreature *Attacker, int Damage, int DamageType);
+	void StartLogout(bool Force, bool StopFight);
+	void BlockLogout(int Delay, bool BlockProtectionZone);
+	void ToDoGo(int DestX, int DestY, int DestZ, bool Dest, int MaxSteps);
+
+	// VIRTUAL FUNCTIONS
+	// =========================================================================
+	virtual ~TCreature(void);															// VTABLE[ 0]
+	// Duplicate destructor that also calls operator delete.							// VTABLE[ 1]
+	virtual void Death(void);															// VTABLE[ 2]
+	virtual bool MovePossible(int x, int y, int z, bool Execute, bool Jump);			// VTABLE[ 3]
+	virtual bool IsPeaceful(void);														// VTABLE[ 4]
+	virtual uint32 GetMaster(void);														// VTABLE[ 5]
+	virtual void TalkStimulus(uint32 SpeakerID, const char *Text);						// VTABLE[ 6]
+	virtual void DamageStimulus(uint32 AttackerID, int Damage, int DamageType);			// VTABLE[ 7]
+	virtual void IdleStimulus(void);													// VTABLE[ 8]
+	virtual void CreatureMoveStimulus(uint32 CreatureID, int Type);						// VTABLE[ 9]
+	virtual void AttackStimulus(uint32 AttackerID);										// VTABLE[10]
+
+	// DATA
+	// =========================================================================
+	//void *VTABLE;					// IMPLICIT
+	//TSkillBase super_TSkillBase;	// IMPLICIT
+	TCombat Combat;
+	uint32 ID;
+	TCreature *NextHashEntry;
+	uint32 NextChainCreature;
+	char Name[31];
+	char Murderer[31];
+	TOutfit OrgOutfit;
+	TOutfit Outfit;
+	int startx;
+	int starty;
+	int startz;
+	int posx;
+	int posy;
+	int posz;
+	int Sex;
+	int Race;
+	int Direction;
+	int Radius;
+	CreatureType Type;
+	bool IsDead;
+	int LoseInventory;
+	bool LoggingOut;
+	bool LogoutAllowed;
+	uint32 EarliestLogoutRound;
+	uint32 EarliestProtectionZoneRound;
+	uint32 EarliestYellRound;
+	uint32 EarliestTradeChannelRound;
+	uint32 EarliestSpellTime;
+	uint32 EarliestMultiuseTime;
+	uint32 EarliestWalkTime;
+	uint32 LifeEndRound;
+	TKnownCreature *FirstKnowingConnection;
+	int SummonedCreatures;
+	uint32 FireDamageOrigin;
+	uint32 PoisonDamageOrigin;
+	uint32 EnergyDamageOrigin;
+	Object CrObject;
+	vector<TToDoEntry> ToDoList;
+	int ActToDo;
+	int NrToDo;
+	uint32 NextWakeup;
+	bool Stop;
+	bool LockToDo;
+	uint8 Profession;
+	TConnection *Connection;
+};
+
+// TNonPlayer
+// =============================================================================
+
+// TNPC
+// =============================================================================
+
+// TMonster
+// =============================================================================
+#if 0
+struct TMonster: TNonplayer {
+
+	// DATA
+    int Home;
+    uint32 Master;
+    uint32 Target;
+};
+#endif
+
+// TPlayer
+// =============================================================================
+struct TPlayerData {
+	uint32 CharacterID;
+	pid_t Locked;
+	int Sticky;
+	bool Dirty;
+	int Race;
+	TOutfit OriginalOutfit;
+	TOutfit CurrentOutfit;
+	time_t LastLoginTime;
+	time_t LastLogoutTime;
+	int startx;
+	int starty;
+	int startz;
+	int posx;
+	int posy;
+	int posz;
+	int Profession;
+	int PlayerkillerEnd;
+	int Actual[25];
+	int Maximum[25];
+	int Minimum[25];
+	int DeltaAct[25];
+	int MagicDeltaAct[25];
+	int Cycle[25];
+	int MaxCycle[25];
+	int Count[25];
+	int MaxCount[25];
+	int AddLevel[25];
+	int Experience[25];
+	int FactorPercent[25];
+	int NextLevel[25];
+	int Delta[25];
+	uint8 SpellList[256];
+	int QuestValues[500];
+	int MurderTimestamps[20];
+	uint8 *Inventory;
+	int InventorySize;
+	uint8 *Depot[9];
+	int DepotSize[9];
+	uint32 AccountID;
+	int Sex;
+	char Name[30];
+	uint8 Rights[12];
+	char Guild[31];
+	char Rank[31];
+	char Title[31];
+	int Buddies;
+	uint32 Buddy[100];
+	char BuddyName[100][30];
+	uint32 EarliestYellRound;
+	uint32 EarliestTradeChannelRound;
+	uint32 EarliestSpellTime;
+	uint32 EarliestMultiuseTime;
+	uint32 TalkBufferFullTime;
+	uint32 MutingEndRound;
+	uint32 Addressees[20];
+	uint32 AddresseesTimes[20];
+	int NumberOfMutings;
+};
+
+struct TPlayer: TCreature {
+	// REGULAR FUNCTIONS
+	// =========================================================================
+	uint8 GetRealProfession(void);
+	uint8 GetEffectiveProfession(void);
+	uint8 GetActiveProfession(void);
+	bool GetActivePromotion(void);
+	void ClearProfession(void);
+	void SetProfession(uint8 Profession);
+
+	int GetQuestValue(int Number);
+	void SetQuestValue(int Number, int Value);
+
+	uint32 GetPartyLeader(bool CheckFormer);
+
+	bool SpellKnown(int SpellNr);
+
+	bool IsAttackJustified(uint32 Victim);
+	void RecordAttack(uint32 Victim);
+	void RecordMurder(uint32 Victim);
+
+	void CheckState(void);
+
+	// VIRTUAL FUNCTIONS
+	// =========================================================================
+	// TODO
+
+	// DATA
+	// =========================================================================
+	//TCreature super_TCreature;	// IMPLICIT
+	uint32 AccountID;
+	char Guild[31];
+	char Rank[31];
+	char Title[31];
+	char IPAddress[16];
+	uint8 Rights[12];
+	Object Depot;
+	int DepotNr;
+	int DepotSpace;
+	RESULT ConstructError;
+	TPlayerData *PlayerData;
+	Object TradeObject;
+	uint32 TradePartner;
+	bool TradeAccepted;
+	int OldState;
+	uint32 Request;
+	int RequestTimestamp;
+	uint32 RequestProcessingGamemaster;
+	int TutorActivities;
+	uint8 SpellList[256];
+	int QuestValues[500];
+	Object OpenContainer[16];
+	vector<uint32> AttackedPlayers;
+	int NumberOfAttackedPlayers;
+	bool Aggressor;
+	vector<uint32> FormerAttackedPlayers;
+	int NumberOfFormerAttackedPlayers;
+	bool FormerAggressor;
+	uint32 FormerLogoutRound;
+	uint32 PartyLeader;
+	uint32 PartyLeavingRound;
+	uint32 TalkBufferFullTime;
+	uint32 MutingEndRound;
+	int NumberOfMutings;
+	uint32 Addressees[20];
+	uint32 AddresseesTimes[20];
+};
+
+// Creature API
+// =============================================================================
+
+#define MAX_RACES 512
+
+// crmain.cc
+extern TRaceData RaceData[MAX_RACES];
+extern int KilledCreatures[MAX_RACES];
+extern int KilledPlayers[MAX_RACES];
+
+// TODO(fusion): These probably belong elsewhere but we should come back to
+// this when we're wrapping up creature files.
+bool IsCreaturePlayer(uint32 CreatureID);
+void AddKillStatistics(int AttackerRace, int DefenderRace);
+int GetRaceByName(const char *RaceName);
+
+#endif //TIBIA_CREATURE_HH_
diff --git a/src/crcombat.cc b/src/crcombat.cc
index e1bf72f..9edfe9b 100644
--- a/src/crcombat.cc
+++ b/src/crcombat.cc
@@ -1,6 +1,4 @@
-#include "creature.hh"
-#include "monster.hh"
-#include "player.hh"
+#include "cr.hh"
 #include "config.hh"
 #include "magic.hh"
 
diff --git a/src/crcombat.hh b/src/crcombat.hh
deleted file mode 100644
index b5db3c3..0000000
--- a/src/crcombat.hh
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef TIBIA_CRCOMBAT_HH_
-#define TIBIA_CRCOMBAT_HH_ 1
-
-struct TCreature;
-
-struct TCombatEntry{
-	uint32 ID;
-	uint32 Damage;
-	uint32 TimeStamp;
-};
-
-struct TCombat{
-	// REGULAR FUNCTIONS
-	// =========================================================================
-	TCombat(void);
-	void GetWeapon(void);
-	void GetAmmo(void);
-	void CheckCombatValues(void);
-	void GetAttackValue(int *Value, int *SkillNr);
-	void GetDefendValue(int *Value, int *SkillNr);
-	int GetAttackDamage(void);
-	int GetDefendDamage(void);
-	int GetArmorStrength(void);
-	int GetDistance(void);
-	void ActivateLearning(void);
-	void SetAttackMode(uint8 AttackMode);
-	void SetChaseMode(uint8 ChaseMode);
-	void SetSecureMode(uint8 SecureMode);
-	void SetAttackDest(uint32 TargetID, bool Follow);
-	void CanToDoAttack(void);
-	void StopAttack(int Delay);
-	void DelayAttack(int Milliseconds);
-	void Attack(void);
-	void CloseAttack(TCreature *Target);
-	void DistanceAttack(TCreature *Target);
-	void WandAttack(TCreature *Target);
-	void AddDamageToCombatList(uint32 Attacker, uint32 Damage);
-	uint32 GetDamageByCreature(uint32 CreatureID);
-	uint32 GetMostDangerousAttacker(void);
-	void DistributeExperiencePoints(uint32 Exp);
-
-
-	// DATA
-	// =========================================================================
-	TCreature *Master;
-	uint32 EarliestAttackTime;
-	uint32 EarliestDefendTime;
-	uint32 LastDefendTime;
-	uint32 LatestAttackTime;
-	uint8 AttackMode;
-	uint8 ChaseMode;
-	uint8 SecureMode;
-	uint32 AttackDest;
-	bool Following;
-	Object Shield;
-	Object Close;
-	Object Missile;
-	Object Throw;
-	Object Wand;
-	Object Ammo;
-	bool Fist;
-	uint32 CombatDamage;
-	int ActCombatEntry;
-	TCombatEntry CombatList[20];
-	int LearningPoints;
-};
-
-#endif //TIBIA_CRCOMBAT_HH_
diff --git a/src/creature.hh b/src/creature.hh
deleted file mode 100644
index cfa0293..0000000
--- a/src/creature.hh
+++ /dev/null
@@ -1,154 +0,0 @@
-#ifndef TIBIA_CREATURE_HH_
-#define TIBIA_CREATURE_HH_ 1
-
-#include "common.hh"
-#include "connection.hh"
-#include "containers.hh"
-#include "map.hh"
-
-#include "crcombat.hh"
-#include "crskill.hh"
-
-struct TOutfit{
-	int OutfitID;
-	union{
-		uint16 ObjectType;
-		uint8 Colors[4];
-	};
-};
-
-struct TToDoEntry {
-    ToDoType Code;
-    union{
-        struct{
-            uint32 Time;
-        } Wait;
-
-        struct{
-            int x;
-            int y;
-            int z;
-        } Go;
-
-        struct{
-            int Direction;
-        } Rotate;
-
-        struct{
-            uint32 Obj;
-            int x;
-            int y;
-            int z;
-            int Count;
-        } Move;
-
-        struct{
-            uint32 Obj;
-            uint32 Partner;
-        } Trade;
-
-        struct{
-            uint32 Obj1;
-            uint32 Obj2;
-            int Dummy;
-        } Use;
-
-        struct{
-            uint32 Obj;
-        } Turn;
-
-        struct{
-            uint32 Text; // POINTER? Probably a reference from `AddDynamicString`?
-            int Mode;
-            uint32 Addressee;
-            bool CheckSpamming;
-        } Talk;
-
-        struct{
-            int NewState;
-        } ChangeState;
-    };
-};
-
-struct TCreature: TSkillBase {
-	// REGULAR FUNCTIONS
-	// =========================================================================
-	TCreature(void);
-	void Attack(void);
-	int Damage(TCreature *Attacker, int Damage, int DamageType);
-	void StartLogout(bool Force, bool StopFight);
-	void BlockLogout(int Delay, bool BlockProtectionZone);
-	void ToDoGo(int DestX, int DestY, int DestZ, bool Dest, int MaxSteps);
-
-	// VIRTUAL FUNCTIONS
-	// =========================================================================
-	virtual ~TCreature(void);															// VTABLE[ 0]
-	// Duplicate destructor that also calls operator delete.							// VTABLE[ 1]
-	virtual void Death(void);															// VTABLE[ 2]
-	virtual bool MovePossible(int x, int y, int z, bool Execute, bool Jump);			// VTABLE[ 3]
-	virtual bool IsPeaceful(void);														// VTABLE[ 4]
-	virtual uint32 GetMaster(void);														// VTABLE[ 5]
-	virtual void TalkStimulus(uint32 SpeakerID, const char *Text);						// VTABLE[ 6]
-	virtual void DamageStimulus(uint32 AttackerID, int Damage, int DamageType);			// VTABLE[ 7]
-	virtual void IdleStimulus(void);													// VTABLE[ 8]
-	virtual void CreatureMoveStimulus(uint32 CreatureID, int Type);						// VTABLE[ 9]
-	virtual void AttackStimulus(uint32 AttackerID);										// VTABLE[10]
-
-	// DATA
-	// =========================================================================
-	//void *VTABLE;					// IMPLICIT
-	//TSkillBase super_TSkillBase;	// IMPLICIT
-	TCombat Combat;
-	uint32 ID;
-	TCreature *NextHashEntry;
-	uint32 NextChainCreature;
-	char Name[31];
-	char Murderer[31];
-	TOutfit OrgOutfit;
-	TOutfit Outfit;
-	int startx;
-	int starty;
-	int startz;
-	int posx;
-	int posy;
-	int posz;
-	int Sex;
-	int Race;
-	int Direction;
-	int Radius;
-	CreatureType Type;
-	bool IsDead;
-	int LoseInventory;
-	bool LoggingOut;
-	bool LogoutAllowed;
-	uint32 EarliestLogoutRound;
-	uint32 EarliestProtectionZoneRound;
-	uint32 EarliestYellRound;
-	uint32 EarliestTradeChannelRound;
-	uint32 EarliestSpellTime;
-	uint32 EarliestMultiuseTime;
-	uint32 EarliestWalkTime;
-	uint32 LifeEndRound;
-	TKnownCreature *FirstKnowingConnection;
-	int SummonedCreatures;
-	uint32 FireDamageOrigin;
-	uint32 PoisonDamageOrigin;
-	uint32 EnergyDamageOrigin;
-	Object CrObject;
-	vector<TToDoEntry> ToDoList;
-	int ActToDo;
-	int NrToDo;
-	uint32 NextWakeup;
-	bool Stop;
-	bool LockToDo;
-	uint8 Profession;
-	TConnection *Connection;
-};
-
-// TODO(fusion): These probably belong elsewhere but we should come back to
-// this when we're wrapping up creature files.
-bool IsCreaturePlayer(uint32 CreatureID);
-void AddKillStatistics(int AttackerRace, int DefenderRace);
-int GetRaceByName(const char *RaceName);
-
-#endif //TIBIA_CREATURE_HH_
diff --git a/src/creature.cc b/src/crmain.cc
index 9eadc6e..31d93fb 100644
--- a/src/creature.cc
+++ b/src/crmain.cc
@@ -1,9 +1,24 @@
-#include "creature.hh"
-#include "monster.hh"
+#include "cr.hh"
 #include "enums.hh"
 
 #include "stubs.hh"
 
+static uint32 NextCreatureID;
+static matrix<uint32> *FirstChainCreature;
+static TCreature *HashList[1000];
+
+static int FirstFreeCreature;
+static vector<TCreature*> CreatureList(0, 10000, 1000);
+
+static priority_queue<uint32, uint32> ToDoQueue(5000, 1000);
+//static priority_queue<uint32, TAttackWave*> AttackWaveQueue(100, 100);
+
+TRaceData RaceData[MAX_RACES];
+int KilledCreatures[MAX_RACES];
+int KilledPlayers[MAX_RACES];
+
+// TCreature
+// =============================================================================
 TCreature::TCreature(void) :
 		TSkillBase(),
 		Combat(),
@@ -56,46 +71,6 @@ void TCreature::Attack(void){
 	this->Combat.Attack();
 }
 
-// Temporary Location
-// =============================================================================
-// =============================================================================
-// TODO(fusion): These probably belong elsewhere but we should come back to
-// this when we're wrapping up creature files.
-
-bool IsCreaturePlayer(uint32 CreatureID){
-	return CreatureID < 0x40000000;
-}
-
-void AddKillStatistics(int AttackerRace, int DefenderRace){
-	// NOTE(fusion): I think the race name can be "human" only for players,
-	// which means we're probably tracking how many creatures are killed by
-	// players with `KilledCreatures`, and how many players are killed by
-	// creatures with `KilledPlayers`.
-
-	if(strcmp(RaceData[AttackerRace].Name, "human") == 0){
-		KilledCreatures[DefenderRace] += 1;
-	}
-
-	// NOTE(fusion): This seems to track how many players are killed by
-	if(strcmp(RaceData[DefenderRace].Name, "human") == 0){
-		KilledPlayers[AttackerRace] += 1;
-	}
-}
-
-int GetRaceByName(const char *RaceName){
-	int Result = 0;
-	for(int Race = 1; Race < NARRAY(RaceData); Race += 1){
-		if(stricmp(RaceName, RaceData[Race].Name) == 0){
-			Result = Race;
-			break;
-		}
-	}
-	return Result;
-}
-
-// =============================================================================
-// =============================================================================
-
 int TCreature::Damage(TCreature *Attacker, int Damage, int DamageType){
 	if(this->IsDead || this->Type == NPC){
 		return 0;
@@ -486,3 +461,129 @@ int TCreature::Damage(TCreature *Attacker, int Damage, int DamageType){
 	AnnounceChangedCreature(this->ID, 1); // CREATURE_HITPOINTS_CHANGED ?
 	return Damage;
 }
+
+// Creature
+// =============================================================================
+bool IsCreaturePlayer(uint32 CreatureID){
+	return CreatureID < 0x40000000;
+}
+
+//
+
+void DeleteChainCreature(TCreature *Creature){
+	if(Creature == NULL){
+		error("DeleteChainCreature: Übegebene Kreatur existiert nicht.\n");
+		return;
+	}
+
+	// NOTE(fusion): All creatures in each 16x16 region form a creature linked
+	// list, despite its current floor. Whether that is a good idea is a whole
+	// other matter.
+	int BlockX = Creature->posx / 16;
+	int BlockY = Creature->posy / 16;
+	uint32 *FirstID = FirstChainCreature->at(BlockX, BlockY);
+
+	if(*FirstID == Creature->ID){
+		*FirstID = Creature->NextChainCreature;
+	}else{
+		uint32 CurrentID = *FirstID;
+		while(true){
+			if(CurrentID == 0){
+				error("DeleteChainCreature: Kreatur nicht gefunden.\n");
+				return;
+			}
+
+			TCreature *Current = GetCreature(CurrentID);
+			if(Current == NULL){
+				error("DeleteChainCreature: Kreatur existiert nicht.\n");
+				return;
+			}
+
+			if(Current->NextChainCreature == Creature->ID){
+				Current->NextChainCreature = Creature->NextChainCreature;
+				break;
+			}
+
+			CurrentID = Current->NextChainCreature;
+		}
+	}
+}
+
+// Kill Statistics
+// =============================================================================
+void AddKillStatistics(int AttackerRace, int DefenderRace){
+	// NOTE(fusion): I think the race name can be "human" only for players,
+	// which means we're probably tracking how many creatures are killed by
+	// players with `KilledCreatures`, and how many players are killed by
+	// creatures with `KilledPlayers`.
+
+	if(strcmp(RaceData[AttackerRace].Name, "human") == 0){
+		KilledCreatures[DefenderRace] += 1;
+	}
+
+	// NOTE(fusion): This seems to track how many players are killed by
+	if(strcmp(RaceData[DefenderRace].Name, "human") == 0){
+		KilledPlayers[AttackerRace] += 1;
+	}
+}
+
+// Race
+// =============================================================================
+TRaceData::TRaceData(void) :
+		Skill(1, 5, 5),
+		Talk(1, 5, 5),
+		Item(1, 5, 5),
+		Spell(1, 5, 5)
+{
+	this->Name[0] = 0;
+	this->Article[0] = 0;
+	this->Outfit.OutfitID = 0;
+	this->Outfit.ObjectType = 0;
+	this->Blood = BT_BLOOD;
+	this->ExperiencePoints = 0;
+	this->FleeThreshold = 0;
+	this->Attack = 0;
+	this->Defend = 0;
+	this->Armor = 0;
+	this->Poison = 0;
+	this->SummonCost = 0;
+	this->LoseTarget = 0;
+	this->Strategy[0] = 100;
+	this->Strategy[1] = 0;
+	this->Strategy[2] = 0;
+	this->Strategy[3] = 0;
+	this->KickBoxes = false;
+	this->KickCreatures = false;
+	this->SeeInvisible = false;
+	this->Unpushable = false;
+	this->DistanceFighting = false;
+	this->NoSummon = false;
+	this->NoIllusion = false;
+	this->NoConvince = false;
+	this->NoBurning = false;
+	this->NoPoison = false;
+	this->NoEnergy = false;
+	this->NoHit = false;
+	this->NoLifeDrain = false;
+	this->NoParalyze = false;
+	this->Skills = 0;
+	this->Talks = 0;
+	this->Items = 0;
+	this->Spells = 0;
+}
+
+int GetRaceByName(const char *RaceName){
+	int Result = 0;
+	for(int Race = 1; Race < NARRAY(RaceData); Race += 1){
+		if(stricmp(RaceName, RaceData[Race].Name) == 0){
+			Result = Race;
+			break;
+		}
+	}
+	return Result;
+}
+
+// Raid
+// =============================================================================
+
+
diff --git a/src/player.cc b/src/crplayer.cc
index 04298c6..3193843 100644
--- a/src/player.cc
+++ b/src/crplayer.cc
@@ -1,5 +1,4 @@
-#include "player.hh"
-#include "enums.hh"
+#include "cr.hh"
 
 #include "stubs.hh"
 
diff --git a/src/crskill.cc b/src/crskill.cc
index 384e1fc..d2eb067 100644
--- a/src/crskill.cc
+++ b/src/crskill.cc
@@ -1,5 +1,4 @@
-#include "creature.hh"
-#include "monster.hh"
+#include "cr.hh"
 
 #include "stubs.hh"
 
diff --git a/src/crskill.hh b/src/crskill.hh
deleted file mode 100644
index abb2476..0000000
--- a/src/crskill.hh
+++ /dev/null
@@ -1,173 +0,0 @@
-#ifndef TIBIA_CRSKILL_HH_
-#define TIBIA_CRSKILL_HH_ 1
-
-#include "common.hh"
-
-struct TCreature;
-
-struct TSkill{
-	// REGULAR FUNCTIONS
-	// =========================================================================
-	TSkill(int SkNr, TCreature *Master);
-	int Get(void);
-	int GetProgress(void);
-	void Check(void);
-	void Change(int Amount);
-	void SetMDAct(int MDAct);
-	void Load(int Act, int Max, int Min, int DAct, int MDAct,
-			int Cycle, int MaxCycle, int Count, int MaxCount, int AddLevel,
-			int Exp, int FactorPercent, int NextLevel, int Delta);
-	void Save(int *Act, int *Max, int *Min, int *DAct, int *MDAct,
-			int *Cycle, int *MaxCycle, int *Count, int *MaxCount, int *AddLevel,
-			int *Exp, int *FactorPercent, int *NextLevel, int *Delta);
-
-	// VIRTUAL FUNCTIONS
-	// =========================================================================
-	virtual ~TSkill(void);																// VTABLE[ 0]
-	// Duplicate destructor that also calls operator delete.							// VTABLE[ 1]
-	virtual void Set(int Value);														// VTABLE[ 2]
-	virtual void Increase(int Amount);													// VTABLE[ 3]
-	virtual void Decrease(int Amount);													// VTABLE[ 4]
-	virtual int GetExpForLevel(int Level);												// VTABLE[ 5]
-	virtual void Advance(int Range);													// VTABLE[ 6]
-	virtual void ChangeSkill(int FactorPercent, int Delta);								// VTABLE[ 7]
-	virtual int ProbeValue(int Max, bool Increase);										// VTABLE[ 8]
-	virtual bool Probe(int Diff, int Prob, bool Increase);								// VTABLE[ 9]
-	virtual bool Process(void);															// VTABLE[10]
-	virtual bool SetTimer(int Cycle, int Count, int MaxCount, int AdditionalValue);		// VTABLE[11]
-	virtual bool DelTimer(void);														// VTABLE[12]
-	virtual int TimerValue(void);														// VTABLE[13]
-	virtual bool Jump(int Range);														// VTABLE[14]
-	virtual void Event(int Range);														// VTABLE[15]
-	virtual void Reset(void);															// VTABLE[16]
-
-	// DATA
-	// =========================================================================
-	//void *VTABLE;		// IMPLICIT
-	int DAct;			// Delta Value - Probably from equipment.
-	int MDAct;			// Delta Magic Value - Probably from spells.
-	uint16 SkNr;
-	TCreature *Master;
-	int Act;			// Actual Value (?)
-	int Max;
-	int Min;
-	int FactorPercent;
-	int LastLevel;
-	int NextLevel;
-	int Delta;
-	int Exp;
-	int Cycle;
-	int MaxCycle;
-	int Count;
-	int MaxCount;
-	int AddLevel;
-};
-
-struct TSkillLevel: TSkill {
-	TSkillLevel(int SkNr, TCreature *Master) : TSkill(SkNr, Master) {}
-	void Increase(int Amount) override;
-	void Decrease(int Amount) override;
-	int GetExpForLevel(int Level) override;
-	bool Jump(int Range) override;
-};
-
-struct TSkillProbe: TSkill {
-	TSkillProbe(int SkNr, TCreature *Master) : TSkill(SkNr, Master) {}
-	void Increase(int Amount) override;
-	void Decrease(int Amount) override;
-	int GetExpForLevel(int Level) override;
-	void ChangeSkill(int FactorPercent, int Delta) override;
-	int ProbeValue(int Max, bool Increase) override;
-	bool Probe(int Diff, int Prob, bool Increase) override;
-	bool SetTimer(int Cycle, int Count, int MaxCount, int AdditionalValue) override;
-	bool Jump(int Range) override;
-	void Event(int Range) override;
-};
-
-struct TSkillAdd: TSkill {
-	TSkillAdd(int SkNr, TCreature *Master) : TSkill(SkNr, Master) {}
-	void Advance(int Range) override;
-};
-
-struct TSkillHitpoints: TSkillAdd {
-	TSkillHitpoints(int SkNr, TCreature *Master) : TSkillAdd(SkNr, Master) {}
-	void Set(int Value) override;
-};
-
-struct TSkillMana: TSkillAdd {
-	TSkillMana(int SkNr, TCreature *Master) : TSkillAdd(SkNr, Master) {}
-	void Set(int Value) override;
-};
-
-struct TSkillGoStrength: TSkillAdd {
-	TSkillGoStrength(int SkNr, TCreature *Master) : TSkillAdd(SkNr, Master) {}
-	bool SetTimer(int Cycle, int Count, int MaxCount, int AdditionalValue) override;
-	void Event(int Range) override;
-};
-
-struct TSkillCarryStrength: TSkillAdd {
-	TSkillCarryStrength(int SkNr, TCreature *Master) : TSkillAdd(SkNr, Master) {}
-	void Set(int Value) override;
-};
-
-struct TSkillSoulpoints: TSkillAdd {
-	TSkillSoulpoints(int SkNr, TCreature *Master) : TSkillAdd(SkNr, Master) {}
-	void Set(int Value) override;
-	int TimerValue(void) override;
-	void Event(int Range) override;
-};
-
-struct TSkillFed: TSkill {
-	TSkillFed(int SkNr, TCreature *Master) : TSkill(SkNr, Master) {}
-	void Event(int Range) override;
-};
-
-struct TSkillLight: TSkill {
-	TSkillLight(int SkNr, TCreature *Master) : TSkill(SkNr, Master) {}
-	bool SetTimer(int Cycle, int Count, int MaxCount, int AdditionalValue) override;
-	void Event(int Range) override;
-};
-
-struct TSkillIllusion: TSkill {
-	TSkillIllusion(int SkNr, TCreature *Master) : TSkill(SkNr, Master) {}
-	bool SetTimer(int Cycle, int Count, int MaxCount, int AdditionalValue) override;
-	void Event(int Range) override;
-};
-
-struct TSkillPoison: TSkill {
-	TSkillPoison(int SkNr, TCreature *Master) : TSkill(SkNr, Master) {}
-	bool Process(void) override;
-	bool SetTimer(int Cycle, int Count, int MaxCount, int AdditionalValue) override;
-	void Event(int Range) override;
-	void Reset(void) override;
-};
-
-struct TSkillBurning: TSkill {
-	TSkillBurning(int SkNr, TCreature *Master) : TSkill(SkNr, Master) {}
-	void Event(int Range) override;
-};
-
-struct TSkillEnergy: TSkill {
-	TSkillEnergy(int SkNr, TCreature *Master) : TSkill(SkNr, Master) {}
-	void Event(int Range) override;
-};
-
-struct TSkillBase{
-	// REGULAR FUNCTIONS
-	// =========================================================================
-	TSkillBase(void);
-	~TSkillBase(void);
-	bool NewSkill(uint16 SkillNo, TCreature *Creature);
-	bool SetSkills(int Race);
-	void ProcessSkills(void);
-	bool SetTimer(uint16 SkNr, int Cycle, int Count, int MaxCount, int AdditionalValue);
-	void DelTimer(uint16 SkNr);
-
-	// DATA
-	// =========================================================================
-	TSkill *Skills[25];
-	TSkill *TimerList[25];
-	uint16 FirstFreeTimer;
-};
-
-#endif //TIBIA_CRSKILL_HH_
diff --git a/src/info.cc b/src/info.cc
index 7105535..808133b 100644
--- a/src/info.cc
+++ b/src/info.cc
@@ -1,5 +1,5 @@
 #include "info.hh"
-#include "creature.hh"
+#include "cr.hh"
 
 #include "stubs.hh"
 
diff --git a/src/magic.cc b/src/magic.cc
index b3d70b1..ea1ba73 100644
--- a/src/magic.cc
+++ b/src/magic.cc
@@ -1,8 +1,6 @@
 #include "magic.hh"
 #include "config.hh"
-#include "creature.hh"
 #include "info.hh"
-#include "monster.hh"
 
 #include "stubs.hh"
 
diff --git a/src/magic.hh b/src/magic.hh
index e1dc354..8946153 100644
--- a/src/magic.hh
+++ b/src/magic.hh
@@ -2,7 +2,7 @@
 #define TIBIA_MAGIC_HH_ 1
 
 #include "common.hh"
-#include "creature.hh"
+#include "cr.hh"
 
 enum : int {
 	FIELD_TYPE_FIRE = 1,
diff --git a/src/monster.hh b/src/monster.hh
deleted file mode 100644
index f7ce3f5..0000000
--- a/src/monster.hh
+++ /dev/null
@@ -1,93 +0,0 @@
-#ifndef TIBIA_MONSTER_HH_
-#define TIBIA_MONSTER_HH_ 1
-
-#include "common.hh"
-#include "creature.hh"
-#include "containers.hh"
-#include "enums.hh"
-
-struct TSkillData {
-    int Nr;
-    int Actual;
-    int Minimum;
-    int Maximum;
-    int NextLevel;
-    int FactorPercent;
-    int AddLevel;
-};
-
-struct TItemData {
-    ObjectType Type;
-    int Maximum;
-    int Probability;
-};
-
-struct TSpellData {
-    SpellShapeType Shape;
-    int ShapeParam1;
-    int ShapeParam2;
-    int ShapeParam3;
-    int ShapeParam4;
-    SpellImpactType Impact;
-    int ImpactParam1;
-    int ImpactParam2;
-    int ImpactParam3;
-    int ImpactParam4;
-    int Delay;
-};
-
-struct TRaceData {
-    char Name[30];
-    char Article[3];
-    TOutfit Outfit;
-    ObjectType MaleCorpse;
-    ObjectType FemaleCorpse;
-    BloodType Blood;
-    int ExperiencePoints;
-    int FleeThreshold;
-    int Attack;
-    int Defend;
-    int Armor;
-    int Poison;
-    int SummonCost;
-    int LoseTarget;
-    int Strategy[4];
-    bool KickBoxes;
-    bool KickCreatures;
-    bool SeeInvisible;
-    bool Unpushable;
-    bool DistanceFighting;
-    bool NoSummon;
-    bool NoIllusion;
-    bool NoConvince;
-    bool NoBurning;
-    bool NoPoison;
-    bool NoEnergy;
-    bool NoHit;
-    bool NoLifeDrain;
-    bool NoParalyze;
-    int Skills;
-    vector<TSkillData> Skill;
-    int Talks;
-    vector<uint32> Talk; // POINTER? Probably a reference from `AddDynamicString`?
-    int Items;
-    vector<TItemData> Item;
-    int Spells;
-    vector<TSpellData> Spell;
-};
-
-#if 0
-// TODO(fusion):
-struct TMonster: TNonplayer {
-    int Home;
-    uint32 Master;
-    uint32 Target;
-};
-#endif
-
-//#define MAX_RACES 512
-extern TRaceData RaceData[512];
-extern int KilledCreatures[512];
-extern int KilledPlayers[512];
-
-#endif //TIBIA_MONSTER_HH_
diff --git a/src/player.hh b/src/player.hh
deleted file mode 100644
index 0731f11..0000000
--- a/src/player.hh
+++ /dev/null
@@ -1,136 +0,0 @@
-#ifndef TIBIA_PLAYER_HH_
-#define TIBIA_PLAYER_HH_ 1
-
-#include "common.hh"
-#include "containers.hh"
-#include "creature.hh"
-
-struct TPlayerData {
-	uint32 CharacterID;
-	pid_t Locked;
-	int Sticky;
-	bool Dirty;
-	int Race;
-	TOutfit OriginalOutfit;
-	TOutfit CurrentOutfit;
-	time_t LastLoginTime;
-	time_t LastLogoutTime;
-	int startx;
-	int starty;
-	int startz;
-	int posx;
-	int posy;
-	int posz;
-	int Profession;
-	int PlayerkillerEnd;
-	int Actual[25];
-	int Maximum[25];
-	int Minimum[25];
-	int DeltaAct[25];
-	int MagicDeltaAct[25];
-	int Cycle[25];
-	int MaxCycle[25];
-	int Count[25];
-	int MaxCount[25];
-	int AddLevel[25];
-	int Experience[25];
-	int FactorPercent[25];
-	int NextLevel[25];
-	int Delta[25];
-	uint8 SpellList[256];
-	int QuestValues[500];
-	int MurderTimestamps[20];
-	uint8 *Inventory;
-	int InventorySize;
-	uint8 *Depot[9];
-	int DepotSize[9];
-	uint32 AccountID;
-	int Sex;
-	char Name[30];
-	uint8 Rights[12];
-	char Guild[31];
-	char Rank[31];
-	char Title[31];
-	int Buddies;
-	uint32 Buddy[100];
-	char BuddyName[100][30];
-	uint32 EarliestYellRound;
-	uint32 EarliestTradeChannelRound;
-	uint32 EarliestSpellTime;
-	uint32 EarliestMultiuseTime;
-	uint32 TalkBufferFullTime;
-	uint32 MutingEndRound;
-	uint32 Addressees[20];
-	uint32 AddresseesTimes[20];
-	int NumberOfMutings;
-};
-
-struct TPlayer: TCreature {
-	// REGULAR FUNCTIONS
-	// =========================================================================
-	uint8 GetRealProfession(void);
-	uint8 GetEffectiveProfession(void);
-	uint8 GetActiveProfession(void);
-	bool GetActivePromotion(void);
-	void ClearProfession(void);
-	void SetProfession(uint8 Profession);
-
-	int GetQuestValue(int Number);
-	void SetQuestValue(int Number, int Value);
-
-	uint32 GetPartyLeader(bool CheckFormer);
-
-	bool SpellKnown(int SpellNr);
-
-	bool IsAttackJustified(uint32 Victim);
-	void RecordAttack(uint32 Victim);
-	void RecordMurder(uint32 Victim);
-
-	void CheckState(void);
-
-	// VIRTUAL FUNCTIONS
-	// =========================================================================
-	// TODO
-
-	// DATA
-	// =========================================================================
-	//TCreature super_TCreature;	// IMPLICIT
-	uint32 AccountID;
-	char Guild[31];
-	char Rank[31];
-	char Title[31];
-	char IPAddress[16];
-	uint8 Rights[12];
-	Object Depot;
-	int DepotNr;
-	int DepotSpace;
-	RESULT ConstructError;
-	TPlayerData *PlayerData;
-	Object TradeObject;
-	uint32 TradePartner;
-	bool TradeAccepted;
-	int OldState;
-	uint32 Request;
-	int RequestTimestamp;
-	uint32 RequestProcessingGamemaster;
-	int TutorActivities;
-	uint8 SpellList[256];
-	int QuestValues[500];
-	Object OpenContainer[16];
-	vector<uint32> AttackedPlayers;
-	int NumberOfAttackedPlayers;
-	bool Aggressor;
-	vector<uint32> FormerAttackedPlayers;
-	int NumberOfFormerAttackedPlayers;
-	bool FormerAggressor;
-	uint32 FormerLogoutRound;
-	uint32 PartyLeader;
-	uint32 PartyLeavingRound;
-	uint32 TalkBufferFullTime;
-	uint32 MutingEndRound;
-	int NumberOfMutings;
-	uint32 Addressees[20];
-	uint32 AddresseesTimes[20];
-};
-
-#endif //TIBIA_PLAYER_HH_
diff --git a/src/stubs.hh b/src/stubs.hh
index a1b451a..030f502 100644
--- a/src/stubs.hh
+++ b/src/stubs.hh
@@ -4,10 +4,9 @@
 #include "common.hh"
 #include "enums.hh"
 #include "connection.hh"
-#include "creature.hh"
+#include "cr.hh"
 #include "magic.hh"
 #include "map.hh"
-#include "player.hh"
 
 // IMPORTANT(fusion): These function definitions exist to test compilation. They're
 // not yet implemented and will cause the linker to fail with unresolved symbols.