diff --git a/README.md b/README.md
index fd1173f..eb6f0dd 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # ![logo](https://raw.githubusercontent.com/azerothcore/azerothcore.github.io/master/images/logo-github.png) AzerothCore
 ## ARAC - All Races All Classes
 # ![ARAC icon](https://raw.githubusercontent.com/azerothcore/mod-arac/master/icon.png)
-- Latest build status with AzerothCore: [![Build Status](https://github.com/azerothcore/mod-arac/workflows/core-build/badge.svg?branch=master&event=push)](https://github.com/azerothcore/mod-arac)
+- Latest build status with AzerothCore: [![Build Status](https://github.com/azerothcore/mod-arac/actions/workflows/core-build.yml/badge.svg)](https://github.com/azerothcore/mod-arac/actions)
 
 ## Screenshot
 
@@ -13,13 +13,17 @@
 # Usage
 
 - Make a backup of your database before using this module.
-- Apply [the SQL query](https://github.com/heyitsbench/mod-arac/blob/master/data/sql/db-world/arac.sql) to your `world` database.
-- Update your DBC files (client and server) contained in the release, so add [**Patch-A.MPQ**](https://github.com/heyitsbench/mod-arac/blob/master/Patch-A.MPQ) to your WoW/Data/ directory and update the DBC files in your server/data/dbc/ directory with the ones contained in [the DBFilesContent directory](https://github.com/heyitsbench/mod-arac/tree/master/patch-contents/DBFilesContent).
+- Apply [the SQL query](https://github.com/heyitsbench/mod-arac/blob/master/data/sql/db-world/1_base_arac.sql) to your `world` database.
+- Update your DBC files (client and server) contained in the release, so add [**Patch-A.MPQ**](https://github.com/heyitsbench/mod-arac/blob/master/Patch-A.MPQ) to your WoW/Data/ directory and update the DBC files in your server/data/dbc/ directory with the ones contained in [the DBFilesClient directory](https://github.com/heyitsbench/mod-arac/tree/master/patch-contents/DBFilesClient).
+
+# Auto-updater
+
+It is not a requirement to compile this module with the core; the SQL and DBC files are enough on their own. If you wish to have the auto-updater, you would need to add `mod-arac` under your AzerothCore's `modules`. You can read more on the [official page](https://www.azerothcore.org/wiki/installing-a-module).
 
 # Need help?
 
 If you encounter a bug, please [open an issue](https://github.com/azerothcore/mod-arac/issues/new).
-     
+
 
 ## Credits
 
diff --git a/data/sql/(Optional)/world/ARAC Trainers.sql b/data/sql/(Optional)/world/ARAC Trainers.sql
new file mode 100644
index 0000000..9aaa3c7
--- /dev/null
+++ b/data/sql/(Optional)/world/ARAC Trainers.sql	
@@ -0,0 +1,62 @@
+-- Based on Trainers for all ARAC classes (from: https://github.com/heyitsbench/mod-arac/issues/26) and adapted/updated/expanded.
+
+SET @GUID = 3812945;
+
+-- SELECT * FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+54 ORDER BY `ZoneID`;
+
+DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+54;
+INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`, `CreateObject`, `Comment`) VALUES
+(@GUID, 17089, 0, 0, 0, 1, 132, 1, 1, 1, -6161.81, 361.503, 400.31, 2.79316, 300, 0, 0, 115, 126, 0, 0, 0, 0, '', NULL, 0, 'Dun Morogh - Firmanvaar [Shaman Trainer]'),
+(@GUID+1, 3597, 0, 0, 0, 1, 132, 1, 1, 1, -6238.27, 390.62, 391.22, 3.14658, 300, 0, 0, 222, 0, 0, 0, 0, 0, '', NULL, 0, 'Dun Morogh - Mardant Strongoak [Druid Trainer]'),
+(@GUID+2, 17212, 0, 0, 0, 1, 131, 1, 1, 1, -5586.16, -403.092, 424.36, 2.89293, 300, 0, 0, 317, 326, 0, 0, 0, 0, '', NULL, 0, 'Dun Morogh - Tuluun [Shaman Trainer]'),
+(@GUID+3, 3602, 0, 0, 0, 1, 2102, 1, 1, 1, -5593.25, -530.615, 392.429, 3.12855, 300, 0, 0, 574, 0, 0, 0, 0, 0, '', NULL, 0, 'Dun Morogh - Kal [Druid Trainer]'),
+(@GUID+4, 895, 0, 0, 0, 12, 9, 1, 1, 1, -8871.75, -160.224, 80.0796, 0.401682, 300, 0, 0, 102, 0, 0, 0, 0, 0, '', NULL, 0, 'Elwynn Forest - Thorgas Grimson [Hunter Trainer]'),
+(@GUID+5, 3597, 0, 0, 0, 12, 9, 1, 1, 1, -8964.55, -166.123, 80.686, 0.601942, 300, 0, 0, 222, 0, 0, 0, 0, 0, '', NULL, 0, 'Elwynn Forest - Mardant Strongoak [Druid Trainer]'),
+(@GUID+6, 17089, 0, 0, 0, 12, 24, 1, 1, 1, -8884.83, -152.906, 81.9394, 4.42293, 300, 0, 0, 115, 126, 0, 0, 0, 0, '', NULL, 0, 'Elwynn Forest - Firmanvaar [Shaman Trainer]'),
+(@GUID+7, 17212, 0, 0, 0, 12, 87, 1, 1, 1, -9463.56, -5.47152, 63.8213, 1.58135, 300, 0, 0, 317, 326, 0, 0, 0, 0, '', NULL, 0, 'Elwynn Forest - Tuluun [Shaman Trainer]'),
+(@GUID+8, 1231, 0, 0, 0, 12, 87, 1, 1, 1, -9483.52, 51.9159, 56.586, 2.59452, 300, 0, 0, 198, 0, 0, 0, 0, 0, '', NULL, 0, 'Elwynn Forest - Grif Wildheart [Hunter Trainer]'),
+(@GUID+9, 3602, 0, 0, 0, 12, 87, 1, 1, 1, -9418.95, 154.125, 56.2569, 2.3746, 300, 0, 0, 574, 0, 0, 0, 0, 0, '', NULL, 0, 'Elwynn Forest - Kal [Druid Trainer]'),
+(@GUID+10, 3060, 0, 0, 1, 14, 363, 1, 1, 1, -588.63, -4223.49, 38.4113, 3.96699, 300, 0, 0, 176, 0, 0, 0, 0, 0, '', NULL, 0, 'Durotar - Gart Mistrunner [Druid Trainer]'),
+(@GUID+11, 15280, 0, 0, 1, 14, 364, 1, 1, 1, -594.585, -4114.63, 44.4898, 0.695811, 300, 0, 0, 103, 115, 0, 0, 0, 0, '', NULL, 0, 'Durotar - Jesthenis Sunstriker [Paladin Trainer]'),
+(@GUID+12, 3064, 0, 0, 1, 14, 367, 1, 1, 1, -776.996, -4910.85, 19.4554, 2.98527, 300, 0, 0, 247, 0, 0, 0, 0, 0, '', NULL, 0, 'Durotar - Gennia Runetotem [Druid Trainer]'),
+(@GUID+13, 16275, 0, 0, 1, 14, 362, 1, 1, 1, 327.219, -4683.13, 16.4582, 6.05694, 300, 0, 0, 230, 249, 0, 0, 0, 0, '', NULL, 0, 'Durotar - Noellene [Paladin Trainer]'),
+(@GUID+14, 15971, 0, 0, 1, 14, 362, 1, 1, 0, 328.521, -4678.26, 16.4582, 5.16942, 300, 0, 0, 151, 319, 0, 0, 0, 0, '', NULL, 0, 'Durotar - Silvermoon Apprentice [NOT A TRAINER]'),
+(@GUID+15, 3060, 0, 0, 0, 85, 154, 1, 1, 1, 1865.02, 1615.08, 95.6207, 4.16357, 300, 0, 0, 176, 0, 0, 0, 0, 0, '', NULL, 0, 'Tirisfal Glades - Gart Mistrunner [Druid Trainer]'),
+(@GUID+16, 3061, 0, 0, 0, 85, 154, 1, 1, 1, 1823.44, 1627.56, 95.6211, 1.51679, 300, 0, 0, 222, 0, 0, 0, 0, 0, '', NULL, 0, 'Tirisfal Glades - Lanka Farshot [Hunter Trainer]'),
+(@GUID+17, 15280, 0, 0, 0, 85, 154, 1, 1, 1, 1860.22, 1559.02, 99.0788, 1.59533, 300, 0, 0, 103, 115, 0, 0, 0, 0, '', NULL, 0, 'Tirisfal Glades - Jesthenis Sunstriker [Paladin Trainer]'),
+(@GUID+18, 3157, 0, 0, 0, 85, 154, 1, 1, 1, 1854.7, 1576.89, 99.0711, 5.53018, 300, 0, 0, 198, 0, 0, 0, 0, 0, '', NULL, 0, 'Tirisfal Glades - Shikrik [Shaman Trainer]'),
+(@GUID+19, 16275, 0, 0, 0, 85, 2118, 1, 1, 1, 2297.29, 294.616, 36.4087, 5.24036, 300, 0, 0, 230, 249, 0, 0, 0, 0, '', NULL, 0, 'Tirisfal Glades - Noellene [Paladin Trainer]'),
+(@GUID+20, 3066, 0, 0, 0, 85, 159, 1, 1, 1, 2229.32, 283.394, 35.1879, 5.03222, 300, 0, 0, 273, 0, 0, 0, 0, 0, '', NULL, 0, 'Tirisfal Glades - Narm Skychaser [Shaman Trainer]'),
+(@GUID+21, 3064, 0, 0, 0, 85, 159, 1, 1, 1, 2272.4, 348.576, 35.1857, 0.241258, 300, 0, 0, 247, 0, 0, 0, 0, 0, '', NULL, 0, 'Tirisfal Glades - Gennia Runetotem [Druid Trainer]'),
+(@GUID+22, 3171, 0, 0, 0, 85, 2119, 1, 1, 1, 2283.58, 241.316, 34.2451, 1.44685, 300, 0, 0, 356, 0, 0, 0, 0, 0, '', NULL, 0, 'Tirisfal Glades - Thotar [Hunter Trainer]'),
+(@GUID+23, 16500, 0, 0, 1, 141, 256, 1, 1, 1, 10421.2, 787.698, 1322.71, 3.10225, 300, 0, 0, 111, 259, 0, 0, 0, 0, '', NULL, 0, 'Teldrassil - Valaatu [Mage Trainer]'),
+(@GUID+24, 16501, 0, 0, 1, 141, 256, 1, 1, 1, 10526.6, 785.466, 1329.6, 3.32609, 300, 0, 0, 115, 126, 0, 0, 0, 0, '', NULL, 0, 'Teldrassil - Aurelon [Paladin Trainer]'),
+(@GUID+25, 17089, 0, 0, 1, 141, 256, 1, 1, 1, 10425.1, 765.675, 1322.67, 4.36675, 300, 0, 0, 115, 126, 0, 0, 0, 0, '', NULL, 0, 'Teldrassil - Firmanvaar [Shaman Trainer]'),
+(@GUID+26, 459, 0, 0, 1, 141, 256, 1, 1, 1, 10439.8, 771.675, 1322.66, 5.35634, 300, 0, 0, 102, 0, 0, 0, 0, 0, '', NULL, 0, 'Teldrassil - Drusilla La Salle [Warlock Trainer]'),
+(@GUID+27, 17212, 0, 0, 1, 141, 186, 1, 1, 1, 9766.69, 888.837, 1298.14, 1.46155, 300, 0, 0, 317, 326, 0, 0, 0, 0, '', NULL, 0, 'Teldrassil - Tuluun [Shaman Trainer]'),
+(@GUID+28, 906, 0, 0, 1, 141, 186, 1, 1, 1, 9808.36, 959.666, 1324.01, 0.413054, 300, 0, 0, 198, 0, 0, 0, 0, 0, '', NULL, 0, 'Teldrassil - Maximillian Crowe [Warlock Trainer]'),
+(@GUID+29, 17483, 0, 0, 1, 141, 186, 1, 1, 1, 9738.66, 961.994, 1294.11, 5.67915, 300, 0, 0, 186, 191, 0, 0, 0, 0, '', NULL, 0, 'Teldrassil - Tullas [Paladin Trainer]'),
+(@GUID+30, 17481, 0, 0, 1, 141, 186, 1, 1, 1, 9799.34, 974.81, 1313.89, 5.93047, 300, 0, 0, 178, 382, 0, 0, 0, 0, '', NULL, 0, 'Teldrassil - Semid [Mage Trainer]'),
+(@GUID+31, 3155, 0, 0, 1, 215, 221, 1, 1, 1, -2877.36, -204.285, 54.2555, 1.10413, 300, 0, 0, 156, 0, 0, 0, 0, 0, '', NULL, 0, 'Mulgore - Rwag [Rogue Trainer]'),
+(@GUID+32, 3156, 0, 0, 1, 215, 221, 1, 1, 1, -2880.25, -201.257, 54.5007, 0.656476, 300, 0, 0, 176, 0, 0, 0, 0, 0, '', NULL, 0, 'Mulgore - Nartok [Warlock Trainer]'),
+(@GUID+33, 15280, 0, 0, 1, 215, 221, 1, 1, 1, -2861.63, -231.026, 54.8208, 2.43931, 300, 0, 0, 103, 115, 0, 0, 0, 0, '', NULL, 0, 'Mulgore - Jesthenis Sunstriker [Paladin Trainer]'),
+(@GUID+34, 15284, 0, 0, 1, 215, 221, 1, 1, 1, -2863.94, -232.309, 54.8208, 2.08196, 300, 0, 0, 95, 230, 0, 0, 0, 0, '', NULL, 0, 'Mulgore - Matron Arena [Priest Trainer]'),
+(@GUID+35, 16658, 0, 0, 1, 215, 222, 1, 1, 0, -2353.13, -351.583, -0.744894, 0.483653, 300, 0, 0, 2136, 5751, 0, 0, 0, 0, '', NULL, 0, 'Mulgore - Aldrae [Priest Trainer]'),
+(@GUID+36, 16275, 0, 0, 1, 215, 222, 1, 1, 1, -2355.92, -357.108, -0.740873, 1.46933, 300, 0, 0, 230, 249, 0, 0, 0, 0, '', NULL, 0, 'Mulgore - Noellene [Paladin Trainer]'),
+(@GUID+37, 5885, 0, 0, 1, 215, 222, 1, 1, 1, -2395.04, -337.905, 0.371691, 2.51783, 300, 0, 0, 1753, 0, 0, 0, 0, 0, '', NULL, 0, 'Mulgore - Deino [Mage Trainer]'),
+(@GUID+38, 3170, 0, 0, 1, 215, 222, 1, 1, 1, -2411.51, -392.749, -2.0878, 0.758537, 300, 0, 0, 300, 0, 0, 0, 0, 0, '', NULL, 0, 'Mulgore - Kaplak [Rogue Trainer]'),
+(@GUID+39, 2127, 0, 0, 1, 215, 222, 1, 1, 1, -2150.15, -392.177, -2.65734, 1.10019, 300, 0, 0, 328, 0, 0, 0, 0, 0, '', NULL, 0, 'Mulgore - Rupert Boch [Warlock Trainer]'),
+(@GUID+40, 416, 0, 0, 1, 215, 222, 1, 1, 0, -2148.75, -389.601, -2.65697, 4.09647, 300, 0, 0, 35, 76, 0, 0, 0, 0, '', NULL, 0, 'Mulgore - Imp [NOT A TRAINER]'),
+(@GUID+41, 3153, 0, 0, 530, 3430, 3431, 1, 1, 1, 10409.6, -6338.6, 36.9268, 5.39383, 300, 0, 0, 222, 0, 0, 0, 0, 0, '', NULL, 0, 'Eversong Woods - Frang [Warrior Trainer]'),
+(@GUID+42, 3060, 0, 0, 530, 3430, 3431, 1, 1, 1, 10379.3, -6378.03, 37.4032, 1.18802, 300, 0, 0, 176, 0, 0, 0, 0, 0, '', NULL, 0, 'Eversong Woods - Gart Mistrunner [Druid Trainer]'),
+(@GUID+43, 3157, 0, 0, 530, 3430, 3431, 1, 1, 1, 10412, -6336.81, 36.9233, 5.15819, 300, 0, 0, 198, 0, 0, 0, 0, 0, '', NULL, 0, 'Eversong Woods - Shikrik [Shaman Trainer]'),
+(@GUID+44, 3173, 0, 0, 530, 3430, 3665, 1, 1, 1, 9510.95, -6796.94, 16.4927, 5.53126, 300, 0, 0, 328, 0, 0, 0, 0, 0, '', NULL, 0, 'Eversong Woods - Swart [Shaman Trainer]'),
+(@GUID+45, 3064, 0, 0, 530, 3430, 3665, 1, 1, 1, 9488.66, -6895.89, 28.3474, 3.90707, 300, 0, 0, 247, 0, 0, 0, 0, 0, '', NULL, 0, 'Eversong Woods - Gennia Runetotem [Druid Trainer]'),
+(@GUID+46, 3063, 0, 0, 530, 3430, 3665, 1, 1, 1, 9480.68, -6797.76, 16.4921, 0.00363493, 300, 0, 0, 300, 0, 0, 0, 0, 0, '', NULL, 0, 'Eversong Woods - Krang Stonehoof [Warrior Trainer]'),
+(@GUID+47, 459, 0, 0, 530, 3524, 3526, 1, 1, 1, -4178.71, -13686.2, 71.2552, 2.7214, 300, 0, 0, 102, 0, 0, 0, 0, 0, '', NULL, 0, 'Azuremyst Isle - Drusilla La Salle [Warlock Trainer]'),
+(@GUID+48, 3594, 0, 0, 530, 3524, 3527, 1, 1, 1, -4190, -13761.7, 75.0695, 4.56709, 300, 0, 0, 222, 0, 0, 0, 0, 0, '', NULL, 0, 'Azuremyst Isle - Frahun Shadewhisper [Rogue Trainer]'),
+(@GUID+49, 3597, 0, 0, 530, 3524, 3527, 1, 1, 1, -4100.13, -13771.9, 74.7378, 2.49755, 300, 0, 0, 222, 0, 0, 0, 0, 0, '', NULL, 0, 'Azuremyst Isle - Mardant Strongoak [Druid Trainer]'),
+(@GUID+50, 3602, 0, 0, 530, 3524, 3576, 1, 1, 1, -4170.86, -12416.8, 41.8797, 1.48755, 300, 0, 0, 574, 0, 0, 0, 0, 0, '', NULL, 0, 'Azuremyst Isle - Kal [Druid Trainer]'),
+(@GUID+51, 3599, 0, 0, 530, 3524, 3576, 1, 1, 1, -4125.21, -12492.3, 43.4886, 5.24175, 300, 0, 0, 484, 0, 0, 0, 0, 0, '', NULL, 0, 'Azuremyst Isle - Jannok Breezesong [Rogue Trainer]'),
+(@GUID+52, 906, 0, 0, 530, 3524, 3576, 1, 1, 1, -4226.55, -12460.1, 47.2253, 1.95879, 300, 0, 0, 198, 0, 0, 0, 0, 0, '', NULL, 0, 'Azuremyst Isle - Maximillian Crowe [Warlock Trainer]');
+
diff --git a/data/sql/(Optional)/world/Drop Template for Custom Race.sql b/data/sql/(Optional)/world/Drop Template for Custom Race.sql
new file mode 100644
index 0000000..c206203
--- /dev/null
+++ b/data/sql/(Optional)/world/Drop Template for Custom Race.sql	
@@ -0,0 +1,23 @@
+/*
+
+It's assumed you haven't changed the race, racemask or class
+"Template for Custom Race.sql" so this will aim to delete:
+
+Race = 12
+RaceMask = 2048
+Class = 12
+
+*/
+
+SELECT `race` + 11 INTO @race FROM `playercreateinfo` WHERE `race` = 1 LIMIT 1; -- @race
+
+SELECT `racemask` + 2047 INTO @raceMask FROM `playercreateinfo_spell_custom` WHERE `racemask` = 1 LIMIT 1; -- @raceMask
+
+SELECT `class` + 11 INTO @class FROM `player_class_stats` WHERE `Class` = 1 LIMIT 1; -- @class
+
+DELETE FROM `playercreateinfo` WHERE `race` = @race;
+DELETE FROM `player_race_stats` WHERE `Race` = @race;
+DELETE FROM `player_class_stats` WHERE `Class` = @class;
+DELETE FROM `playercreateinfo_action` WHERE `race` = @race;
+DELETE FROM `playercreateinfo_item` WHERE `race` = @race;
+DELETE FROM `playercreateinfo_spell_custom` WHERE `racemask` = @raceMask;
diff --git a/data/sql/(Optional)/world/Template for Custom Race.sql b/data/sql/(Optional)/world/Template for Custom Race.sql
new file mode 100644
index 0000000..06402b1
--- /dev/null
+++ b/data/sql/(Optional)/world/Template for Custom Race.sql	
@@ -0,0 +1,36 @@
+/*
+
+This query allows you to copy information from a specific breed to add new information.
+In this example, the code copies the information from RACE 1 (Human) to add it to race 12 (Fel'Orc).
+
+*/
+
+SELECT `race` + 11 INTO @race FROM `playercreateinfo` WHERE `race` = 1 LIMIT 1; -- @race
+
+SELECT `racemask` + 2047 INTO @raceMask FROM `playercreateinfo_spell_custom` WHERE `racemask` = 1 LIMIT 1; -- @raceMask
+
+SELECT `class` + 11 INTO @class FROM `player_class_stats` WHERE `Class` = 1 LIMIT 1; -- @class
+
+-- PlayerCreateInfo
+REPLACE INTO `playercreateinfo`
+	SELECT @race, `class`, `map`, `zone`, `position_x`, `position_y`, `position_z`, `orientation` FROM `playercreateinfo` WHERE `race` = 1;
+
+-- Player_Race_Stats
+REPLACE INTO `player_race_stats` (`Race`, `Strength`, `Agility`, `Stamina`, `Intellect`, `Spirit`)
+	SELECT @race, `Strength`, `Agility`, `Stamina`, `Intellect`, `Spirit` FROM `player_race_stats` WHERE `race` = 1;
+
+-- Player_Class_Stats
+REPLACE INTO `player_class_stats` (`Class`, `Level`, `BaseHP`, `BaseMana`, `Strength`, `Agility`, `Stamina`, `Intellect`, `Spirit`)
+	SELECT @class, `Level`, `BaseHP`, `BaseMana`, `Strength`, `Agility`, `Stamina`, `Intellect`, `Spirit` FROM `player_class_stats` WHERE `Class` = 1;
+
+-- PlayerCreateInfo_Action
+REPLACE INTO `playercreateinfo_action`
+	SELECT @race, `class`, `button`, `action`, `type` FROM `playercreateinfo_action` WHERE `race` = 1;
+
+-- PlayerCreateInfo_Item
+REPLACE INTO `playercreateinfo_item`
+	SELECT @race, `class`, `itemid`, `amount`, `note` FROM `playercreateinfo_item` WHERE `race` = 1;
+
+-- PlayerCreateInfo_Spell
+REPLACE INTO `playercreateinfo_spell_custom`
+	SELECT @raceMask, `classmask`, `Spell`, `Note` FROM `playercreateinfo_spell_custom` WHERE `racemask` = 1;
diff --git a/data/sql/Copy for Custom Race.sql b/data/sql/Copy for Custom Race.sql
deleted file mode 100644
index 7b69440..0000000
--- a/data/sql/Copy for Custom Race.sql	
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-
-This query allows you to copy information from a specific breed to add new information.
-In this example, the code copies the information from RACE 1 (Human) to add it to race 12 (Fel'Orc).
-
-*/
-
--- PlayerCreateInfo
-REPLACE INTO `playercreateinfo`
-	SELECT race+11, class, map, zone, position_x, position_y, position_z, orientation FROM `playercreateinfo` WHERE race = 1;
-
--- PlayerLevelStats
-REPLACE INTO `player_levelstats`
-	SELECT race+11, class, `level`, str, agi, sta, inte, spi FROM `player_levelstats` WHERE race = 1;
-
--- PlayerCreateInfo_Action
-REPLACE INTO `playercreateinfo_action`
-	SELECT race+11, class, button, `action`, `type` FROM `playercreateinfo_action` WHERE race = 1;
-
--- PlayerCreateInfo_Item
-REPLACE INTO `playercreateinfo_item`
-	SELECT race+11, class, itemid, amount FROM `playercreateinfo_item` WHERE race = 1;
-
--- PlayerCreateInfo_Spell
-REPLACE INTO `playercreateinfo_spell`
-	SELECT racemask+2047, classmask, Spell, Note FROM `playercreateinfo_spell` WHERE racemask = 1;
-
--- PlayerCreateInfo_Spell
-REPLACE INTO `playercreateinfo_spell_custom`
-	SELECT racemask+2047, classmask, Spell, Note FROM `playercreateinfo_spell_custom` WHERE racemask = 1;
diff --git a/data/sql/db-world/(Optional)/Copy for Custom Race.sql b/data/sql/db-world/(Optional)/Copy for Custom Race.sql
deleted file mode 100644
index 7b69440..0000000
--- a/data/sql/db-world/(Optional)/Copy for Custom Race.sql	
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-
-This query allows you to copy information from a specific breed to add new information.
-In this example, the code copies the information from RACE 1 (Human) to add it to race 12 (Fel'Orc).
-
-*/
-
--- PlayerCreateInfo
-REPLACE INTO `playercreateinfo`
-	SELECT race+11, class, map, zone, position_x, position_y, position_z, orientation FROM `playercreateinfo` WHERE race = 1;
-
--- PlayerLevelStats
-REPLACE INTO `player_levelstats`
-	SELECT race+11, class, `level`, str, agi, sta, inte, spi FROM `player_levelstats` WHERE race = 1;
-
--- PlayerCreateInfo_Action
-REPLACE INTO `playercreateinfo_action`
-	SELECT race+11, class, button, `action`, `type` FROM `playercreateinfo_action` WHERE race = 1;
-
--- PlayerCreateInfo_Item
-REPLACE INTO `playercreateinfo_item`
-	SELECT race+11, class, itemid, amount FROM `playercreateinfo_item` WHERE race = 1;
-
--- PlayerCreateInfo_Spell
-REPLACE INTO `playercreateinfo_spell`
-	SELECT racemask+2047, classmask, Spell, Note FROM `playercreateinfo_spell` WHERE racemask = 1;
-
--- PlayerCreateInfo_Spell
-REPLACE INTO `playercreateinfo_spell_custom`
-	SELECT racemask+2047, classmask, Spell, Note FROM `playercreateinfo_spell_custom` WHERE racemask = 1;
diff --git a/data/sql/db-world/arac.sql b/data/sql/db-world/1_base_arac.sql
similarity index 97%
rename from data/sql/db-world/arac.sql
rename to data/sql/db-world/1_base_arac.sql
index 05a05d2..ab8c996 100644
--- a/data/sql/db-world/arac.sql
+++ b/data/sql/db-world/1_base_arac.sql
@@ -1,106 +1,116 @@
 -- playercreateinfo
 
 INSERT IGNORE INTO `playercreateinfo` VALUES
-(1, 1, 0, 12, -8949.95, -132.493, 83.5312, 0),
-(1, 2, 0, 12, -8949.95, -132.493, 83.5312, 0),
-(1, 3, 0, 0, -8949.95, -132.493, 83.5312, 0),
-(1, 4, 0, 12, -8949.95, -132.493, 83.5312, 0),
-(1, 5, 0, 12, -8949.95, -132.493, 83.5312, 0),
-(1, 6, 609, 4298, 2355.84, -5664.77, 426.028, 3.65997),
-(1, 7, 0, 12, -8949.95, -132.493, 83.5312, 0),
-(1, 8, 0, 12, -8949.95, -132.493, 83.5312, 0),
-(1, 9, 0, 12, -8949.95, -132.493, 83.5312, 0),
-(1, 11, 0, 12, -8949.95, -132.493, 83.5312, 0),
-(2, 1, 1, 14, -618.518, -4251.67, 38.718, 0),
-(2, 2, 1, 14, -618.518, -4251.67, 38.718, 0),
-(2, 3, 1, 14, -618.518, -4251.67, 38.718, 0),
-(2, 4, 1, 14, -618.518, -4251.67, 38.718, 0),
-(2, 5, 1, 14, -618.518, -4251.67, 38.718, 0),
-(2, 6, 609, 4298, 2358.44, -5666.9, 426.023, 3.65997),
-(2, 7, 1, 14, -618.518, -4251.67, 38.718, 0),
-(2, 8, 1, 14, -618.518, -4215.67, 38.718, 0),
-(2, 9, 1, 14, -618.518, -4251.67, 38.718, 0),
-(2, 11, 1, 14, -618.518, -4215.67, 38.718, 0),
-(3, 1, 0, 1, -6240.32, 331.033, 382.758, 6.17716),
-(3, 2, 0, 1, -6240.32, 331.033, 382.758, 6.17716),
-(3, 3, 0, 1, -6240.32, 331.033, 382.758, 6.17716),
-(3, 4, 0, 1, -6240.32, 331.033, 382.758, 6.17716),
-(3, 5, 0, 1, -6240.32, 331.033, 382.758, 6.17716),
-(3, 6, 609, 4298, 2358.44, -5666.9, 426.023, 3.65997),
-(3, 7, 0, 1, -6240.32, 331.033, 382.758, 6.17716),
-(3, 8, 0, 1, -6240.32, 331.033, 382.758, 6.17716),
-(3, 9, 0, 1, -6240.32, 331.033, 382.758, 6.17716),
-(3, 11, 0, 1, -6240.32, 331.033, 382.758, 6.17716),
-(4, 1, 1, 141, 10311.3, 832.463, 1326.41, 5.69632),
-(4, 2, 1, 141, 10311.3, 832.463, 1326.41, 5.69632),
-(4, 3, 1, 141, 10311.3, 832.463, 1326.41, 5.69632),
-(4, 4, 1, 141, 10311.3, 832.463, 1326.41, 5.69632),
-(4, 5, 1, 141, 10311.3, 832.463, 1326.41, 5.69632),
-(4, 6, 609, 4298, 2356.21, -5662.21, 426.026, 3.65997),
-(4, 7, 1, 141, 10311.3, 832.463, 1326.41, 5.69632),
-(4, 8, 1, 141, 10311.3, 832.463, 1326.41, 5.69632),
-(4, 9, 1, 141, 10311.3, 832.463, 1326.41, 5.69632),
-(4, 11, 1, 141, 10311.3, 832.463, 1326.41, 5.69632),
-(5, 1, 0, 85, 1676.71, 1678.31, 121.67, 2.70526),
-(5, 2, 0, 85, 1676.71, 1678.31, 121.67, 2.70526),
-(5, 3, 0, 85, 1676.71, 1678.31, 121.67, 2.70526),
-(5, 4, 0, 85, 1676.71, 1678.31, 121.67, 2.70526),
-(5, 5, 0, 85, 1676.71, 1678.31, 121.67, 2.70526),
-(5, 6, 609, 4298, 2356.21, -5662.21, 426.026, 3.65997),
-(5, 7, 0, 85, 1676.71, 1678.31, 121.67, 2.70526),
-(5, 8, 0, 85, 1676.71, 1678.31, 121.67, 2.70526),
-(5, 9, 0, 85, 1676.71, 1678.31, 121.67, 2.70526),
-(5, 11, 0, 85, 1676.71, 1678.31, 121.67, 2.70526),
-(6, 1, 1, 215, -2917.58, -257.98, 52.9968, 0),
-(6, 2, 1, 215, -2917.58, -257.98, 52.9968, 0),
-(6, 3, 1, 215, -2917.58, -257.98, 52.9968, 0),
-(6, 4, 1, 215, -2917.58, -257.98, 52.9968, 0),
-(6, 5, 1, 215, -2917.58, -257.98, 52.9968, 0),
-(6, 6, 609, 4298, 2358.17, -5663.21, 426.027, 3.65997),
-(6, 7, 1, 215, -2917.58, -257.98, 52.9968, 0),
-(6, 8, 1, 215, -2917.58, -257.98, 52.9968, 0),
-(6, 9, 1, 215, -2917.58, -257.98, 52.9968, 0),
-(6, 11, 1, 215, -2917.58, -257.98, 52.9968, 0),
-(7, 1, 0, 1, -6240.32, 331.033, 382.758, 0),
-(7, 2, 0, 1, -6240.32, 331.033, 382.758, 0),
-(7, 3, 0, 1, -6240.32, 331.033, 382.758, 0),
-(7, 4, 0, 1, -6240, 331, 383, 0),
-(7, 5, 0, 1, -6240, 331, 383, 0),
-(7, 6, 609, 4298, 2355.05, -5661.7, 426.026, 3.65997),
-(7, 7, 0, 1, -6240, 331, 383, 0),
-(7, 8, 0, 1, -6240, 331, 383, 0),
-(7, 9, 0, 1, -6240, 331, 383, 0),
-(7, 11, 0, 1, -6240, 331, 383, 0),
-(8, 1, 1, 14, -618.518, -4251.67, 38.718, 0),
-(8, 2, 1, 14, -618.518, -4251.67, 38.718, 0),
-(8, 3, 1, 14, -618.518, -4251.67, 38.718, 0),
-(8, 4, 1, 14, -618.518, -4251.67, 38.718, 0),
-(8, 5, 1, 14, -618.518, -4251.67, 38.718, 0),
-(8, 6, 609, 4298, 2355.05, -5661.7, 426.026, 3.65997),
-(8, 7, 1, 14, -618.518, -4251.67, 38.718, 0),
-(8, 8, 1, 14, -618.518, -4251.67, 38.718, 0),
-(8, 9, 1, 14, -618.518, -4251.67, 38.718, 0),
-(8, 11, 1, 14, -618.518, -4251.67, 38.718, 0),
-(10, 1, 530, 3431, 10349.6, -6357.29, 33.4026, 5.31605),
-(10, 2, 530, 3431, 10349.6, -6357.29, 33.4026, 5.31605),
-(10, 3, 530, 3431, 10349.6, -6357.29, 33.4026, 5.31605),
-(10, 4, 530, 3431, 10349.6, -6357.29, 33.4026, 5.31605),
-(10, 5, 530, 3431, 10349.6, -6357.29, 33.4026, 5.31605),
-(10, 6, 609, 4298, 2355.84, -5664.77, 426.028, 3.65997),
-(10, 7, 530, 3431, 10349.6, -6357.29, 33.4026, 5.31605),
-(10, 8, 530, 3431, 10349.6, -6357.29, 33.4026, 5.31605),
-(10, 9, 530, 3431, 10349.6, -6357.29, 33.4026, 5.31605),
-(10, 11, 530, 3431, 10349.6, -6357.29, 33.4026, 5.31605),
-(11, 1, 530, 3526, -3961.64, -13931.2, 100.615, 2.08364),
-(11, 2, 530, 3526, -3961.64, -13931.2, 100.615, 2.08364),
-(11, 3, 530, 3526, -3961.64, -13931.2, 100.615, 2.08364),
-(11, 4, 530, 3526, -3961.64, -13931.2, 100.615, 2.08364),
-(11, 5, 530, 3526, -3961.64, -13931.2, 100.615, 2.08364),
-(11, 6, 609, 4298, 2358.17, -5663.21, 426.027, 3.65997),
-(11, 7, 530, 3526, -3961.64, -13931.2, 100.615, 2.08364),
-(11, 8, 530, 3526, -3961.64, -13931.2, 100.615, 2.08364),
-(11, 9, 530, 3526, -3961.64, -13931.2, 100.615, 2.08364),
-(11, 11, 530, 3526, -3961.64, -13931.2, 100.615, 2.08364);
+-- Human
+(1, 1, 0, 12, -8949.95, -132.493, 83.5312, 0), -- Warrior
+(1, 2, 0, 12, -8949.95, -132.493, 83.5312, 0), -- Paladin
+(1, 3, 0, 0, -8949.95, -132.493, 83.5312, 0), -- Hunter
+(1, 4, 0, 12, -8949.95, -132.493, 83.5312, 0), -- Rogue
+(1, 5, 0, 12, -8949.95, -132.493, 83.5312, 0), -- Priest
+(1, 6, 609, 4298, 2355.84, -5664.77, 426.028, 3.65997), -- Death Knight
+(1, 7, 0, 12, -8949.95, -132.493, 83.5312, 0), -- Shaman
+(1, 8, 0, 12, -8949.95, -132.493, 83.5312, 0), -- Mage
+(1, 9, 0, 12, -8949.95, -132.493, 83.5312, 0), -- Warlock
+(1, 11, 0, 12, -8949.95, -132.493, 83.5312, 0), -- Druid
+-- Orc
+(2, 1, 1, 14, -618.518, -4251.67, 38.718, 0), -- Warrior
+(2, 2, 1, 14, -618.518, -4251.67, 38.718, 0), -- Paladin
+(2, 3, 1, 14, -618.518, -4251.67, 38.718, 0), -- Hunter
+(2, 4, 1, 14, -618.518, -4251.67, 38.718, 0), -- Rogue
+(2, 5, 1, 14, -618.518, -4251.67, 38.718, 0), -- Priest
+(2, 6, 609, 4298, 2358.44, -5666.9, 426.023, 3.65997), -- Death Knight
+(2, 7, 1, 14, -618.518, -4251.67, 38.718, 0), -- Shaman
+(2, 8, 1, 14, -618.518, -4215.67, 38.718, 0), -- Mage
+(2, 9, 1, 14, -618.518, -4251.67, 38.718, 0), -- Warlock
+(2, 11, 1, 14, -618.518, -4215.67, 38.718, 0), -- Druid
+-- Dwarf
+(3, 1, 0, 1, -6240.32, 331.033, 382.758, 6.17716), -- Warrior
+(3, 2, 0, 1, -6240.32, 331.033, 382.758, 6.17716), -- Paladin
+(3, 3, 0, 1, -6240.32, 331.033, 382.758, 6.17716), -- Hunter
+(3, 4, 0, 1, -6240.32, 331.033, 382.758, 6.17716), -- Rogue
+(3, 5, 0, 1, -6240.32, 331.033, 382.758, 6.17716), -- Priest
+(3, 6, 609, 4298, 2358.44, -5666.9, 426.023, 3.65997), -- Death Knight
+(3, 7, 0, 1, -6240.32, 331.033, 382.758, 6.17716), -- Shaman
+(3, 8, 0, 1, -6240.32, 331.033, 382.758, 6.17716), -- Mage
+(3, 9, 0, 1, -6240.32, 331.033, 382.758, 6.17716), -- Warlock
+(3, 11, 0, 1, -6240.32, 331.033, 382.758, 6.17716), -- Druid
+-- Night Elf
+(4, 1, 1, 141, 10311.3, 832.463, 1326.41, 5.69632), -- Warrior
+(4, 2, 1, 141, 10311.3, 832.463, 1326.41, 5.69632), -- Paladin
+(4, 3, 1, 141, 10311.3, 832.463, 1326.41, 5.69632), -- Hunter
+(4, 4, 1, 141, 10311.3, 832.463, 1326.41, 5.69632), -- Rogue
+(4, 5, 1, 141, 10311.3, 832.463, 1326.41, 5.69632), -- Priest
+(4, 6, 609, 4298, 2356.21, -5662.21, 426.026, 3.65997), -- Death Knight
+(4, 7, 1, 141, 10311.3, 832.463, 1326.41, 5.69632), -- Shaman
+(4, 8, 1, 141, 10311.3, 832.463, 1326.41, 5.69632), -- Mage
+(4, 9, 1, 141, 10311.3, 832.463, 1326.41, 5.69632), -- Warlock
+(4, 11, 1, 141, 10311.3, 832.463, 1326.41, 5.69632), -- Druid
+-- Undead
+(5, 1, 0, 85, 1676.71, 1678.31, 121.67, 2.70526), -- Warrior
+(5, 2, 0, 85, 1676.71, 1678.31, 121.67, 2.70526), -- Paladin
+(5, 3, 0, 85, 1676.71, 1678.31, 121.67, 2.70526), -- Hunter
+(5, 4, 0, 85, 1676.71, 1678.31, 121.67, 2.70526), -- Rogue
+(5, 5, 0, 85, 1676.71, 1678.31, 121.67, 2.70526), -- Priest
+(5, 6, 609, 4298, 2356.21, -5662.21, 426.026, 3.65997), -- Death Knight
+(5, 7, 0, 85, 1676.71, 1678.31, 121.67, 2.70526), -- Shaman
+(5, 8, 0, 85, 1676.71, 1678.31, 121.67, 2.70526), -- Mage
+(5, 9, 0, 85, 1676.71, 1678.31, 121.67, 2.70526), -- Warlock
+(5, 11, 0, 85, 1676.71, 1678.31, 121.67, 2.70526), -- Druid
+-- Tauren
+(6, 1, 1, 215, -2917.58, -257.98, 52.9968, 0), -- Warrior
+(6, 2, 1, 215, -2917.58, -257.98, 52.9968, 0), -- Paladin
+(6, 3, 1, 215, -2917.58, -257.98, 52.9968, 0), -- Hunter
+(6, 4, 1, 215, -2917.58, -257.98, 52.9968, 0), -- Rogue
+(6, 5, 1, 215, -2917.58, -257.98, 52.9968, 0), -- Priest
+(6, 6, 609, 4298, 2358.17, -5663.21, 426.027, 3.65997), -- Death Knight
+(6, 7, 1, 215, -2917.58, -257.98, 52.9968, 0), -- Shaman
+(6, 8, 1, 215, -2917.58, -257.98, 52.9968, 0), -- Mage
+(6, 9, 1, 215, -2917.58, -257.98, 52.9968, 0), -- Warlock
+(6, 11, 1, 215, -2917.58, -257.98, 52.9968, 0), -- Druid
+-- Gnome
+(7, 1, 0, 1, -6240.32, 331.033, 382.758, 0), -- Warrior
+(7, 2, 0, 1, -6240.32, 331.033, 382.758, 0), -- Paladin
+(7, 3, 0, 1, -6240.32, 331.033, 382.758, 0), -- Hunter
+(7, 4, 0, 1, -6240, 331, 383, 0), -- Rogue
+(7, 5, 0, 1, -6240, 331, 383, 0), -- Priest
+(7, 6, 609, 4298, 2355.05, -5661.7, 426.026, 3.65997), -- Death Knight
+(7, 7, 0, 1, -6240, 331, 383, 0), -- Shaman
+(7, 8, 0, 1, -6240, 331, 383, 0), -- Mage
+(7, 9, 0, 1, -6240, 331, 383, 0), -- Warlock
+(7, 11, 0, 1, -6240, 331, 383, 0), -- Druid
+-- Troll
+(8, 1, 1, 14, -618.518, -4251.67, 38.718, 0), -- Warrior
+(8, 2, 1, 14, -618.518, -4251.67, 38.718, 0), -- Paladin
+(8, 3, 1, 14, -618.518, -4251.67, 38.718, 0), -- Hunter
+(8, 4, 1, 14, -618.518, -4251.67, 38.718, 0), -- Rogue
+(8, 5, 1, 14, -618.518, -4251.67, 38.718, 0), -- Priest
+(8, 6, 609, 4298, 2355.05, -5661.7, 426.026, 3.65997), -- Death Knight
+(8, 7, 1, 14, -618.518, -4251.67, 38.718, 0), -- Shaman
+(8, 8, 1, 14, -618.518, -4251.67, 38.718, 0), -- Mage
+(8, 9, 1, 14, -618.518, -4251.67, 38.718, 0), -- Warlock
+(8, 11, 1, 14, -618.518, -4251.67, 38.718, 0), -- Druid
+-- Blood Elf
+(10, 1, 530, 3431, 10349.6, -6357.29, 33.4026, 5.31605), -- Warrior
+(10, 2, 530, 3431, 10349.6, -6357.29, 33.4026, 5.31605), -- Paladin
+(10, 3, 530, 3431, 10349.6, -6357.29, 33.4026, 5.31605), -- Hunter
+(10, 4, 530, 3431, 10349.6, -6357.29, 33.4026, 5.31605), -- Rogue
+(10, 5, 530, 3431, 10349.6, -6357.29, 33.4026, 5.31605), -- Priest
+(10, 6, 609, 4298, 2355.84, -5664.77, 426.028, 3.65997), -- Death Knight
+(10, 7, 530, 3431, 10349.6, -6357.29, 33.4026, 5.31605), -- Shaman
+(10, 8, 530, 3431, 10349.6, -6357.29, 33.4026, 5.31605), -- Mage
+(10, 9, 530, 3431, 10349.6, -6357.29, 33.4026, 5.31605), -- Warlock
+(10, 11, 530, 3431, 10349.6, -6357.29, 33.4026, 5.31605), -- Druid
+-- Draenei
+(11, 1, 530, 3526, -3961.64, -13931.2, 100.615, 2.08364), -- Warrior
+(11, 2, 530, 3526, -3961.64, -13931.2, 100.615, 2.08364), -- Paladin
+(11, 3, 530, 3526, -3961.64, -13931.2, 100.615, 2.08364), -- Hunter
+(11, 4, 530, 3526, -3961.64, -13931.2, 100.615, 2.08364), -- Rogue
+(11, 5, 530, 3526, -3961.64, -13931.2, 100.615, 2.08364), -- Priest
+(11, 6, 609, 4298, 2358.17, -5663.21, 426.027, 3.65997), -- Death Knight
+(11, 7, 530, 3526, -3961.64, -13931.2, 100.615, 2.08364), -- Shaman
+(11, 8, 530, 3526, -3961.64, -13931.2, 100.615, 2.08364), -- Mage
+(11, 9, 530, 3526, -3961.64, -13931.2, 100.615, 2.08364), -- Warlock
+(11, 11, 530, 3526, -3961.64, -13931.2, 100.615, 2.08364); -- Druid
 
 -- playercreateinfo_action
 
@@ -7802,69 +7812,14 @@ INSERT IGNORE INTO `playercreateinfo_spell_custom` VALUES
 
 -- quest_template
 
-UPDATE `quest_template` INNER JOIN `quest_template_addon` 
-	ON `quest_template_addon`.id = `quest_template`.id
-		SET AllowableRaces = 1791
-			WHERE `quest_template_addon`.allowableclasses != 0 AND AllowableRaces != 0;
+UPDATE `quest_template` INNER JOIN `quest_template_addon`
+	ON `quest_template_addon`.`id` = `quest_template`.`id`
+		SET `AllowableRaces` = 1791
+			WHERE `quest_template_addon`.`allowableclasses` != 0 AND `AllowableRaces` != 0;
 
 -- playercreateinfo_skills
 
+-- Bows, Guns, Two-Handed Maces, Daggers and Crossbows (to all Races)
 UPDATE `playercreateinfo_skills`
 	SET `raceMask` = 0
 		WHERE `skill` IN (45, 46, 160, 173, 226) AND `classMask` != 0;
-
-
--- Alliance default totems is the Dwarf ones
-SET @HumanFireTotem := 30754;
-SET @HumanEarthTotem := 30753;
-SET @HumanWaterTotem := 30755;
-SET @HumanAirTotem := 30736;
-
-SET @NightElfFireTotem := 30754;
-SET @NightElfEarthTotem := 30753;
-SET @NightElfWaterTotem := 30755;
-SET @NightElfAirTotem := 30736;
-
-SET @GnomeFireTotem := 30754;
-SET @GnomeEarthTotem := 30753;
-SET @GnomeWaterTotem := 30755;
-SET @GnomeAirTotem := 30736;
-
--- Horde default totems is the Orc ones.
-SET @UndeadFireTotem := 30758;
-SET @UndeadEarthTotem := 30757;
-SET @UndeadWaterTotem := 30759;
-SET @UndeadAirTotem := 30756;
-
-SET @BloodElfFireTotem := 30758;
-SET @BloodElfEarthTotem := 30757;
-SET @BloodElfWaterTotem := 30759;
-SET @BloodElfAirTotem := 30756;
-
--- Human, Night Elf, Undead, Gnome and Blood Elf
-DELETE FROM player_totem_model WHERE RaceID IN (1,4,5,7,10);
-INSERT INTO player_totem_model (TotemID, RaceID, ModelID) VALUES 
-(1, 1, @HumanFireTotem),
-(2, 1, @HumanEarthTotem),
-(3, 1, @HumanWaterTotem),
-(4, 1, @HumanAirTotem),
-
-(1, 4, @NightElfFireTotem),
-(2, 4, @NightElfEarthTotem),
-(3, 4, @NightElfWaterTotem),
-(4, 4, @NightElfAirTotem),
-
-(1, 5, @UndeadFireTotem),
-(2, 5, @UndeadEarthTotem),
-(3, 5, @UndeadWaterTotem),
-(4, 5, @UndeadAirTotem),
-
-(1, 7, @GnomeFireTotem),
-(2, 7, @GnomeEarthTotem),
-(3, 7, @GnomeWaterTotem),
-(4, 7, @GnomeAirTotem),
-
-(1, 10, @BloodElfFireTotem),
-(2, 10, @BloodElfEarthTotem),
-(3, 10, @BloodElfWaterTotem),
-(4, 10, @BloodElfAirTotem);
diff --git a/data/sql/db-world/2_update_totems.sql b/data/sql/db-world/2_update_totems.sql
new file mode 100644
index 0000000..7fab2e4
--- /dev/null
+++ b/data/sql/db-world/2_update_totems.sql
@@ -0,0 +1,54 @@
+-- Alliance default totems is the Dwarf ones.
+SET @Human_Fire_Totem := 30754;
+SET @Human_Earth_Totem := 30753;
+SET @Human_Water_Totem := 30755;
+SET @Human_Air_Totem := 30736;
+
+SET @NightElf_Fire_Totem := 30754;
+SET @NightElf_Earth_Totem := 30753;
+SET @NightElf_Water_Totem := 30755;
+SET @NightElf_Air_Totem := 30736;
+
+SET @Gnome_Fire_Totem := 30754;
+SET @Gnome_Earth_Totem := 30753;
+SET @Gnome_Water_Totem := 30755;
+SET @Gnome_Air_Totem := 30736;
+
+-- Horde default totems is the Orc ones.
+SET @Undead_Fire_Totem := 30758;
+SET @Undead_Earth_Totem := 30757;
+SET @Undead_Water_Totem := 30759;
+SET @Undead_Air_Totem := 30756;
+
+SET @BloodElf_Fire_Totem := 30758;
+SET @BloodElf_Earth_Totem := 30757;
+SET @BloodElf_Water_Totem := 30759;
+SET @BloodElf_Air_Totem := 30756;
+
+-- Human, Night Elf, Undead, Gnome and Blood Elf.
+DELETE FROM `player_totem_model` WHERE `RaceID` IN (1, 4, 5, 7, 10);
+INSERT INTO `player_totem_model` (`TotemID`, `RaceID`, `ModelID`) VALUES
+(1, 1, @Human_Fire_Totem),
+(2, 1, @Human_Earth_Totem),
+(3, 1, @Human_Water_Totem),
+(4, 1, @Human_Air_Totem),
+
+(1, 4, @NightElf_Fire_Totem),
+(2, 4, @NightElf_Earth_Totem),
+(3, 4, @NightElf_Water_Totem),
+(4, 4, @NightElf_Air_Totem),
+
+(1, 5, @Undead_Fire_Totem),
+(2, 5, @Undead_Earth_Totem),
+(3, 5, @Undead_Water_Totem),
+(4, 5, @Undead_Air_Totem),
+
+(1, 7, @Gnome_Fire_Totem),
+(2, 7, @Gnome_Earth_Totem),
+(3, 7, @Gnome_Water_Totem),
+(4, 7, @Gnome_Air_Totem),
+
+(1, 10, @BloodElf_Fire_Totem),
+(2, 10, @BloodElf_Earth_Totem),
+(3, 10, @BloodElf_Water_Totem),
+(4, 10, @BloodElf_Air_Totem);
diff --git a/data/sql/db-world/3_update_shapeshifts.sql b/data/sql/db-world/3_update_shapeshifts.sql
new file mode 100644
index 0000000..a30913a
--- /dev/null
+++ b/data/sql/db-world/3_update_shapeshifts.sql
@@ -0,0 +1,100 @@
+-- Alliance default shapeshifts is the Night Elf ones.
+SET @Human_Cat_Form := 892;
+SET @Human_Bear_Form := 2281;
+SET @Human_DireBear_Form := 2281;
+SET @Human_EpicFlight_Form := 21243;
+SET @Human_Flight_Form := 20857;
+
+SET @Dwarf_Cat_Form := 892;
+SET @Dwarf_Bear_Form := 2281;
+SET @Dwarf_DireBear_Form := 2281;
+SET @Dwarf_EpicFlight_Form := 21243;
+SET @Dwarf_Flight_Form := 20857;
+
+SET @Gnome_Cat_Form := 892;
+SET @Gnome_Bear_Form := 2281;
+SET @Gnome_DireBear_Form := 2281;
+SET @Gnome_EpicFlight_Form := 21243;
+SET @Gnome_Flight_Form := 20857;
+
+SET @Draenei_Cat_Form := 892;
+SET @Draenei_Bear_Form := 2281;
+SET @Draenei_DireBear_Form := 2281;
+SET @Draenei_EpicFlight_Form := 21243;
+SET @Draenei_Flight_Form := 20857;
+
+-- Horde default shapeshifts is the Tauren ones.
+SET @Orc_Cat_Form := 8571;
+SET @Orc_Bear_Form := 2289;
+SET @Orc_DireBear_Form := 2289;
+SET @Orc_EpicFlight_Form := 2289;
+SET @Orc_Flight_Form := 20872;
+
+SET @Undead_Cat_Form := 8571;
+SET @Undead_Bear_Form := 2289;
+SET @Undead_DireBear_Form := 2289;
+SET @Undead_EpicFlight_Form := 2289;
+SET @Undead_Flight_Form := 20872;
+
+SET @Troll_Cat_Form := 8571;
+SET @Troll_Bear_Form := 2289;
+SET @Troll_DireBear_Form := 2289;
+SET @Troll_EpicFlight_Form := 2289;
+SET @Troll_Flight_Form := 20872;
+
+SET @BloodElf_Cat_Form := 8571;
+SET @BloodElf_Bear_Form := 2289;
+SET @BloodElf_DireBear_Form := 2289;
+SET @BloodElf_EpicFlight_Form := 2289;
+SET @BloodElf_Flight_Form := 20872;
+
+-- Human, Orc, Dwarf, Undead, Gnome, Troll, Blood Elf and Draenei.
+DELETE FROM `player_shapeshift_model` WHERE `RaceID` IN (1, 2, 3, 5, 7, 8, 10, 11);
+INSERT INTO `player_shapeshift_model` (`ShapeshiftID`, `RaceID`, `CustomizationID`, `GenderID`, `ModelID`) VALUES
+(1, 1, 255, 2, @Human_Cat_Form),
+(2, 1, 255, 2, @Human_Bear_Form),
+(3, 1, 255, 2, @Human_DireBear_Form),
+(4, 1, 255, 2, @Human_EpicFlight_Form),
+(5, 1, 255, 2, @Human_Flight_Form),
+
+(1, 2, 255, 2, @Orc_Cat_Form),
+(2, 2, 255, 2, @Orc_Bear_Form),
+(3, 2, 255, 2, @Orc_DireBear_Form),
+(4, 2, 255, 2, @Orc_EpicFlight_Form),
+(5, 2, 255, 2, @Orc_Flight_Form),
+
+(1, 3, 255, 2, @Dwarf_Cat_Form),
+(2, 3, 255, 2, @Dwarf_Bear_Form),
+(3, 3, 255, 2, @Dwarf_DireBear_Form),
+(4, 3, 255, 2, @Dwarf_EpicFlight_Form),
+(5, 3, 255, 2, @Dwarf_Flight_Form),
+
+(1, 5, 255, 2, @Undead_Cat_Form),
+(2, 5, 255, 2, @Undead_Bear_Form),
+(3, 5, 255, 2, @Undead_DireBear_Form),
+(4, 5, 255, 2, @Undead_EpicFlight_Form),
+(5, 5, 255, 2, @Undead_Flight_Form),
+
+(1, 7, 255, 2, @Gnome_Cat_Form),
+(2, 7, 255, 2, @Gnome_Bear_Form),
+(3, 7, 255, 2, @Gnome_DireBear_Form),
+(4, 7, 255, 2, @Gnome_EpicFlight_Form),
+(5, 7, 255, 2, @Gnome_Flight_Form),
+
+(1, 8, 255, 2, @Troll_Cat_Form),
+(2, 8, 255, 2, @Troll_Bear_Form),
+(3, 8, 255, 2, @Troll_DireBear_Form),
+(4, 8, 255, 2, @Troll_EpicFlight_Form),
+(5, 8, 255, 2, @Troll_Flight_Form),
+
+(1, 10, 255, 2, @BloodElf_Cat_Form),
+(2, 10, 255, 2, @BloodElf_Bear_Form),
+(3, 10, 255, 2, @BloodElf_DireBear_Form),
+(4, 10, 255, 2, @BloodElf_EpicFlight_Form),
+(5, 10, 255, 2, @BloodElf_Flight_Form),
+
+(1, 11, 255, 2, @Draenei_Cat_Form),
+(2, 11, 255, 2, @Draenei_Bear_Form),
+(3, 11, 255, 2, @Draenei_DireBear_Form),
+(4, 11, 255, 2, @Draenei_EpicFlight_Form),
+(5, 11, 255, 2, @Draenei_Flight_Form);
diff --git a/patch-contents/DBFilesContent/CharBaseInfo.dbc b/patch-contents/DBFilesClient/CharBaseInfo.dbc
similarity index 100%
rename from patch-contents/DBFilesContent/CharBaseInfo.dbc
rename to patch-contents/DBFilesClient/CharBaseInfo.dbc
diff --git a/patch-contents/DBFilesContent/CharStartOutfit.dbc b/patch-contents/DBFilesClient/CharStartOutfit.dbc
similarity index 100%
rename from patch-contents/DBFilesContent/CharStartOutfit.dbc
rename to patch-contents/DBFilesClient/CharStartOutfit.dbc
diff --git a/patch-contents/DBFilesContent/SkillRaceClassInfo.dbc b/patch-contents/DBFilesClient/SkillRaceClassInfo.dbc
similarity index 100%
rename from patch-contents/DBFilesContent/SkillRaceClassInfo.dbc
rename to patch-contents/DBFilesClient/SkillRaceClassInfo.dbc
diff --git a/src/mod_arac_loader.cpp b/src/mod_arac_loader.cpp
new file mode 100644
index 0000000..e92fb9c
--- /dev/null
+++ b/src/mod_arac_loader.cpp
@@ -0,0 +1,9 @@
+/*
+ * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3
+ */
+
+//  Show as "mod-arac" in CMake and auto-apply the "data\sql\%db%" if auto-updater enabled.
+void Addmod_aracScripts()
+{
+
+}