diff --git a/revision_data.h.in.cmake b/revision_data.h.in.cmake
index b308e322196..6e79a976cc6 100644
--- a/revision_data.h.in.cmake
+++ b/revision_data.h.in.cmake
@@ -9,7 +9,7 @@
  #define _SOURCE_DIRECTORY          R"(@CMAKE_SOURCE_DIR@)"
  #define _BUILD_DIRECTORY           R"(@BUILDDIR@)"
  #define _MYSQL_EXECUTABLE          R"(@MYSQL_EXECUTABLE@)"
- #define _FULL_DATABASE             "TDB_full_world_335.20061_2020_06_15.sql"
+ #define _FULL_DATABASE             "TDB_full_world_335.20071_2020_07_15.sql"
  #define VER_COMPANYNAME_STR        "TrinityCore Developers"
  #define VER_LEGALCOPYRIGHT_STR     "(c)2008-2019 TrinityCore"
  #define VER_FILEVERSION            0,0,0
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index c66c207842a..ec0018bb2b1 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -72,7 +72,7 @@ CREATE TABLE `account_access` (
   `AccountID` int(10) unsigned NOT NULL,
   `SecurityLevel` tinyint(3) unsigned NOT NULL,
   `RealmID` int(11) NOT NULL DEFAULT '-1',
-  `Comment` VARCHAR(255) DEFAULT NULL,
+  `Comment` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`AccountID`,`RealmID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1965,7 +1965,8 @@ INSERT INTO `updates` VALUES
 ('2020_04_18_00_auth.sql','BD962B50760771B60F2785027D6957EEF2009240','ARCHIVED','2020-04-18 14:09:28',0),
 ('2020_05_15_00_auth.sql','765389B45F97A02160A58B373D63166F7F7D4427','ARCHIVED','2020-05-15 08:55:56',0),
 ('2020_06_15_00_auth.sql','3158036285CC9A4AB7D39063F9687649A21D0A94','ARCHIVED','2020-06-15 07:48:08',0),
-('2020_06_20_00_auth.sql','85345FAF20B91DA7B157AE1E17DF5B6446C2E109','ARCHIVED','2020-06-11 10:48:00',0);
+('2020_06_20_00_auth.sql','85345FAF20B91DA7B157AE1E17DF5B6446C2E109','ARCHIVED','2020-06-11 10:48:00',0),
+('2020_07_15_00_auth.sql','56748440894EA78C3BE72C4A3F2E97E256E6EE40','ARCHIVED','2020-07-15 10:35:41',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2067,4 +2068,4 @@ SET character_set_client = @saved_cs_client;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-06-15  7:48:11
+-- Dump completed on 2020-07-15 10:35:47
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index 0fdf198928d..a4c97454ac2 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -2646,7 +2646,8 @@ INSERT INTO `updates` VALUES
 ('2020_03_16_00_characters.sql','A38437DA80F6A5D35958A09CFC74EE1CDC465BA8','ARCHIVED','2020-03-16 08:47:49',0),
 ('2020_04_15_00_characters.sql','61F7DE3B81C7E479FFF9463A39DF568826926F39','ARCHIVED','2020-04-15 11:03:56',0),
 ('2020_05_15_00_characters.sql','F1C2FECAA4EB623560914E7758E0BB8364CA135A','ARCHIVED','2020-05-15 08:55:56',0),
-('2020_06_15_00_characters.sql','99C4F85580421E928003380D8F992C4EF5E627DF','ARCHIVED','2020-06-15 07:48:08',0);
+('2020_06_15_00_characters.sql','99C4F85580421E928003380D8F992C4EF5E627DF','ARCHIVED','2020-06-15 07:48:08',0),
+('2020_07_15_00_characters.sql','D87627DC6E4D222F68A1F56F0B3B986EF9A590EF','ARCHIVED','2020-07-15 10:35:41',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2813,4 +2814,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-06-15  7:48:11
+-- Dump completed on 2020-07-15 10:35:47
diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql
index cfa61dc118c..81aeed2142f 100644
--- a/sql/base/dev/world_database.sql
+++ b/sql/base/dev/world_database.sql
@@ -174,6 +174,20 @@ CREATE TABLE `areatrigger_teleport` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Trigger System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `battlefield_template`
+--
+
+DROP TABLE IF EXISTS `battlefield_template`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `battlefield_template` (
+  `TypeId` tinyint(3) unsigned NOT NULL,
+  `ScriptName` varchar(64) NOT NULL DEFAULT '',
+  `comment` text
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `battleground_template`
 --
@@ -775,7 +789,7 @@ CREATE TABLE `creature_text_locale` (
   `ID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Locale` varchar(4) NOT NULL,
   `Text` text,
-  PRIMARY KEY (`CreatureID`,`GroupID`,`ID`)
+  PRIMARY KEY (`CreatureID`,`GroupID`,`ID`,`Locale`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -836,7 +850,8 @@ CREATE TABLE `event_scripts` (
   `x` float NOT NULL DEFAULT '0',
   `y` float NOT NULL DEFAULT '0',
   `z` float NOT NULL DEFAULT '0',
-  `o` float NOT NULL DEFAULT '0'
+  `o` float NOT NULL DEFAULT '0',
+  `Comment` varchar(255) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -920,9 +935,9 @@ DROP TABLE IF EXISTS `game_event_battleground_holiday`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `game_event_battleground_holiday` (
-  `eventEntry` tinyint(3) unsigned NOT NULL COMMENT 'Entry of the game event',
-  `bgflag` int(10) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`eventEntry`)
+  `EventEntry` tinyint(3) unsigned NOT NULL COMMENT 'game_event EventEntry identifier',
+  `BattlegroundID` int(3) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`EventEntry`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -1350,6 +1365,10 @@ CREATE TABLE `gameobject_template_addon` (
   `flags` int(10) unsigned NOT NULL DEFAULT '0',
   `mingold` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `maxgold` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `artkit0` int(11) NOT NULL DEFAULT '0',
+  `artkit1` int(11) NOT NULL DEFAULT '0',
+  `artkit2` int(11) NOT NULL DEFAULT '0',
+  `artkit3` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`entry`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2442,7 +2461,7 @@ CREATE TABLE `pool_members` (
   `type` smallint(10) unsigned NOT NULL,
   `spawnId` int(10) unsigned NOT NULL,
   `poolSpawnId` int(10) unsigned NOT NULL,
-  `chance` double unsigned NOT NULL,
+  `chance` float NOT NULL,
   `description` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`type`,`spawnId`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -3516,7 +3535,8 @@ CREATE TABLE `spell_scripts` (
   `x` float NOT NULL DEFAULT '0',
   `y` float NOT NULL DEFAULT '0',
   `z` float NOT NULL DEFAULT '0',
-  `o` float NOT NULL DEFAULT '0'
+  `o` float NOT NULL DEFAULT '0',
+  `Comment` varchar(255) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -3833,6 +3853,7 @@ CREATE TABLE `waypoint_scripts` (
   `z` float NOT NULL DEFAULT '0',
   `o` float NOT NULL DEFAULT '0',
   `guid` int(11) NOT NULL DEFAULT '0',
+  `Comment` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`guid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -3864,4 +3885,4 @@ CREATE TABLE `waypoints` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-06-15  7:48:12
+-- Dump completed on 2020-07-15 10:35:48
diff --git a/sql/updates/auth/3.3.5/2020_06_15_00_auth.sql b/sql/old/3.3.5a/auth/20061_2020_07_15/2020_06_15_00_auth.sql
similarity index 100%
rename from sql/updates/auth/3.3.5/2020_06_15_00_auth.sql
rename to sql/old/3.3.5a/auth/20061_2020_07_15/2020_06_15_00_auth.sql
diff --git a/sql/updates/auth/3.3.5/2020_06_20_00_auth.sql b/sql/old/3.3.5a/auth/20061_2020_07_15/2020_06_20_00_auth.sql
similarity index 100%
rename from sql/updates/auth/3.3.5/2020_06_20_00_auth.sql
rename to sql/old/3.3.5a/auth/20061_2020_07_15/2020_06_20_00_auth.sql
diff --git a/sql/updates/characters/3.3.5/2020_06_15_00_characters.sql b/sql/old/3.3.5a/characters/20061_2020_07_15/2020_06_15_00_characters.sql
similarity index 100%
rename from sql/updates/characters/3.3.5/2020_06_15_00_characters.sql
rename to sql/old/3.3.5a/characters/20061_2020_07_15/2020_06_15_00_characters.sql
diff --git a/sql/updates/world/3.3.5/2020_06_15_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_15_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_15_00_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_15_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_17_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_17_00_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_17_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_17_01_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_17_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_17_02_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_17_03_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_17_03_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_17_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_17_04_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_17_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_05_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_17_05_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_05_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_17_06_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_06_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_17_06_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_06_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_17_07_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_07_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_17_07_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_07_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_17_08_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_08_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_17_08_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_08_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_17_09_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_09_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_17_09_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_09_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_17_10_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_10_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_17_10_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_10_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_18_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_18_00_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_18_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_18_01_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_18_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_18_02_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_18_03_world_335.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_03_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_18_03_world_335.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_06_18_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_18_04_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_18_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_05_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_18_05_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_05_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_19_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_19_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_19_00_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_19_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_20_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_20_00_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_20_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_20_01_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_20_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_20_02_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_20_03_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_20_03_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_20_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_20_04_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_20_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_05_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_20_05_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_05_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_20_06_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_06_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_20_06_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_06_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_22_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_22_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_22_00_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_22_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_24_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_24_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_24_00_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_24_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_24_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_24_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_24_01_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_24_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_24_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_24_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_24_02_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_24_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_26_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_26_00_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_26_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_26_01_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_26_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_26_02_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_26_03_world_335.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_03_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_26_03_world_335.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_06_26_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_26_04_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_26_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_05_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_26_05_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_05_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_26_06_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_06_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_26_06_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_06_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_26_07_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_07_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_26_07_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_07_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_26_08_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_08_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_26_08_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_08_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_26_09_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_09_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_26_09_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_09_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_26_10_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_10_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_26_10_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_10_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_26_11_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_11_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_26_11_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_11_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_26_12_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_12_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_26_12_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_12_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_28_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_28_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_28_00_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_28_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_28_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_28_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_28_01_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_28_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_29_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_29_00_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_29_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_29_01_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_29_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_29_02_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_29_03_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_29_03_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_29_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_29_04_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_29_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_05_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_29_05_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_05_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_30_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_30_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_30_00_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_30_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_30_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_30_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_30_01_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_30_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_30_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_30_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_06_30_02_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_06_30_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_01_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_01_00_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_01_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_01_02_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_01_03_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_01_03_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_01_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_01_04_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_01_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_05_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_01_05_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_05_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_01_06_world_335.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_06_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_01_06_world_335.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_06_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_07_01_07_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_07_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_01_07_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_07_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_03_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_03_00_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_03_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_03_01_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_03_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_03_02_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_03_03_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_03_03_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_03_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_03_04_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_03_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_05_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_03_05_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_05_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_03_06_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_06_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_03_06_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_06_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_03_07_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_07_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_03_07_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_07_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_03_08_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_08_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_03_08_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_08_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_03_09_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_09_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_03_09_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_09_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_04_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_04_00_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_04_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_04_01_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_04_02_world_335.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_02_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_04_02_world_335.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_07_04_03_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_04_03_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_05_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_05_00_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_05_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_05_01_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_05_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_05_02_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_05_03_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_05_03_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_05_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_05_04_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_05_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_05_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_05_05_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_05_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_05_06_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_06_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_05_06_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_06_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_05_07_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_07_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_05_07_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_07_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_05_08_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_08_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_05_08_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_08_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_05_09_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_09_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_05_09_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_09_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_05_10_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_10_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_05_10_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_10_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_07_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_07_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_07_00_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_07_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_08_00_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_08_01_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_08_02_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_03_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_08_03_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_08_04_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_05_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_08_05_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_05_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_06_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_06_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_08_06_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_06_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_07_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_07_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_08_07_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_07_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_08_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_08_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_08_08_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_08_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_09_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_09_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_08_09_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_09_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_10_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_10_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_08_10_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_10_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_11_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_11_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_08_11_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_11_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_12_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_12_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_08_12_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_12_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_13_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_13_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_08_13_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_13_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_14_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_14_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_08_14_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_14_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_15_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_15_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_08_15_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_15_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_16_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_16_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_08_16_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_16_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_17_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_17_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_08_17_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_17_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_18_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_18_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_08_18_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_18_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_19_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_19_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_08_19_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_19_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_20_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_20_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_08_20_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_20_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_09_00_world_335.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_00_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_09_00_world_335.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_07_09_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_09_01_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_09_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_09_02_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_09_03_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_09_03_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_09_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_09_04_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_09_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_05_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_09_05_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_05_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_14_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_14_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_14_00_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_14_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_14_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_14_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_14_01_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_14_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_14_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_14_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2020_07_14_02_world.sql
rename to sql/old/3.3.5a/world/20061_2020_07_15/2020_07_14_02_world.sql
diff --git a/sql/updates/auth/3.3.5/2020_07_15_00_auth.sql b/sql/updates/auth/3.3.5/2020_07_15_00_auth.sql
new file mode 100644
index 00000000000..d0cbe2be812
--- /dev/null
+++ b/sql/updates/auth/3.3.5/2020_07_15_00_auth.sql
@@ -0,0 +1,2 @@
+-- TDB 335.20071 auth
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/characters/3.3.5/2020_07_15_00_characters.sql b/sql/updates/characters/3.3.5/2020_07_15_00_characters.sql
new file mode 100644
index 00000000000..a7c2ce238da
--- /dev/null
+++ b/sql/updates/characters/3.3.5/2020_07_15_00_characters.sql
@@ -0,0 +1,2 @@
+-- TDB 335.20071 characters
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/world/3.3.5/2020_07_15_00_world.sql b/sql/updates/world/3.3.5/2020_07_15_00_world.sql
new file mode 100644
index 00000000000..4126ef8b506
--- /dev/null
+++ b/sql/updates/world/3.3.5/2020_07_15_00_world.sql
@@ -0,0 +1,3 @@
+-- TDB 335.20071 world
+UPDATE `version` SET `db_version`='TDB 335.20071', `cache_id`=20071 LIMIT 1;
+UPDATE `updates` SET `state`='ARCHIVED';