diff --git a/revision_data.h.in.cmake b/revision_data.h.in.cmake
index d1db25941f6..90071c68b7b 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_434.30_2018_05_15.sql"
+ #define _FULL_DATABASE             "TDB_full_world_434.31_2018_06_15.sql"
  #define VER_COMPANYNAME_STR        "TrinityCore Developers"
  #define VER_LEGALCOPYRIGHT_STR     "(c)2008-2018 TrinityCore"
  #define VER_FILEVERSION            0,0,0
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index 44ccf4e29af..c5f18b9f930 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -2010,7 +2010,8 @@ INSERT INTO `updates` VALUES
 ('2018_03_16_00_auth.sql','E77AFBFE7C1DEC8839AECC40140ED1AF55B56A10','ARCHIVED','2018-03-16 01:40:04',0),
 ('2018_03_28_00_auth.sql','45A7C896BDF00B1C319C9F889893D3B95E45EF0A','ARCHIVED','2018-03-28 01:40:04',0),
 ('2018_04_15_00_auth.sql','2293BAA1DA754CFD780838FE99EDB98FD7C041E0','ARCHIVED','2018-04-15 01:40:04',0),
-('2018_05_15_00_auth.sql','9076B44013D5BE1E92A06BDE7CE4F9B6663272CC','ARCHIVED','2018-05-15 01:40:04',0);
+('2018_05_15_00_auth.sql','9076B44013D5BE1E92A06BDE7CE4F9B6663272CC','ARCHIVED','2018-05-15 01:40:04',0),
+('2018_06_15_00_auth.sql','28E2E814F529190BC9423E2A220970F60307DD22','ARCHIVED','2018-06-15 01:40:04',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index 48f8d4b3bb0..21495874d73 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -2956,7 +2956,8 @@ INSERT INTO `updates` VALUES
 ('2018_03_16_00_characters.sql','722EAFB7F508882F584DCAE61F97F1A11EDE126E','ARCHIVED','2018-03-16 00:00:00',0),
 ('2018_03_25_00_characters.sql','4FE3C6866A6DCD4926D451F6009464D290C2EF1F','ARCHIVED','2018-03-25 00:00:00',0),
 ('2018_04_15_00_characters.sql','F7058DE71A2BD3B31088AE586ACB3ECB2EB5A268','ARCHIVED','2018-04-15 00:00:00',0),
-('2018_05_15_00_characters.sql','1FC906E4C7E86DCA67243F0768A94825A2C9E323','ARCHIVED','2018-05-15 00:00:00',0);
+('2018_05_15_00_characters.sql','1FC906E4C7E86DCA67243F0768A94825A2C9E323','ARCHIVED','2018-05-15 00:00:00',0),
+('2018_05_16_00_characters.sql','084C438D587E555D1FBCFC86A2A19570BD0B470A','ARCHIVED','2018-06-15 00:00:00',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/sql/updates/auth/4.3.4/2018_05_15_00_auth.sql b/sql/old/4.3.4/auth/30_2018_06_15/2018_05_15_00_auth.sql
similarity index 100%
rename from sql/updates/auth/4.3.4/2018_05_15_00_auth.sql
rename to sql/old/4.3.4/auth/30_2018_06_15/2018_05_15_00_auth.sql
diff --git a/sql/updates/characters/4.3.4/2018_05_15_00_characters.sql b/sql/old/4.3.4/characters/30_2018_06_15/2018_05_15_00_characters.sql
similarity index 100%
rename from sql/updates/characters/4.3.4/2018_05_15_00_characters.sql
rename to sql/old/4.3.4/characters/30_2018_06_15/2018_05_15_00_characters.sql
diff --git a/sql/updates/world/4.3.4/2018_05_15_00_world.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_15_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_15_00_world.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_15_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_05_15_01_world.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_15_01_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_15_01_world.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_15_01_world.sql
diff --git a/sql/updates/world/4.3.4/2018_05_20_00_world_from_335_was_2018_05_15_00_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_20_00_world_from_335_was_2018_05_15_00_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_20_00_world_from_335_was_2018_05_15_00_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_20_00_world_from_335_was_2018_05_15_00_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_20_01_world_from_335_was_2018_05_15_01_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_20_01_world_from_335_was_2018_05_15_01_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_20_01_world_from_335_was_2018_05_15_01_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_20_01_world_from_335_was_2018_05_15_01_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_20_02_world_from_335_was_2018_05_15_02_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_20_02_world_from_335_was_2018_05_15_02_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_20_02_world_from_335_was_2018_05_15_02_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_20_02_world_from_335_was_2018_05_15_02_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_20_03_world_from_335_was_2018_05_15_03_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_20_03_world_from_335_was_2018_05_15_03_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_20_03_world_from_335_was_2018_05_15_03_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_20_03_world_from_335_was_2018_05_15_03_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_20_04_world_from_335_was_2018_05_16_00_world.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_20_04_world_from_335_was_2018_05_16_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_20_04_world_from_335_was_2018_05_16_00_world.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_20_04_world_from_335_was_2018_05_16_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_05_21_00_world.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_21_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_21_00_world.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_21_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_05_21_01_world.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_21_01_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_21_01_world.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_21_01_world.sql
diff --git a/sql/updates/world/4.3.4/2018_05_22_00_world_from_335_was_2018_05_21_00_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_22_00_world_from_335_was_2018_05_21_00_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_22_00_world_from_335_was_2018_05_21_00_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_22_00_world_from_335_was_2018_05_21_00_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_22_01_world_from_335_was_2018_05_21_01_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_22_01_world_from_335_was_2018_05_21_01_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_22_01_world_from_335_was_2018_05_21_01_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_22_01_world_from_335_was_2018_05_21_01_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_22_02_world_from_335_was_2018_05_21_02_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_22_02_world_from_335_was_2018_05_21_02_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_22_02_world_from_335_was_2018_05_21_02_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_22_02_world_from_335_was_2018_05_21_02_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_23_00_world.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_23_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_23_00_world.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_23_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_05_26_00_world.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_26_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_26_00_world.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_26_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_05_27_00_world_from_335_was_2018_05_23_00_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_27_00_world_from_335_was_2018_05_23_00_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_27_00_world_from_335_was_2018_05_23_00_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_27_00_world_from_335_was_2018_05_23_00_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_27_01_world_from_335_was_2018_05_26_00_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_27_01_world_from_335_was_2018_05_26_00_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_27_01_world_from_335_was_2018_05_26_00_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_27_01_world_from_335_was_2018_05_26_00_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_27_02_world_from_335_was_2018_05_26_01_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_27_02_world_from_335_was_2018_05_26_01_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_27_02_world_from_335_was_2018_05_26_01_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_27_02_world_from_335_was_2018_05_26_01_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_27_03_world_from_335_was_2018_05_26_02_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_27_03_world_from_335_was_2018_05_26_02_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_27_03_world_from_335_was_2018_05_26_02_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_27_03_world_from_335_was_2018_05_26_02_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_27_04_world_from_335_was_2018_05_26_03_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_27_04_world_from_335_was_2018_05_26_03_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_27_04_world_from_335_was_2018_05_26_03_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_27_04_world_from_335_was_2018_05_26_03_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_30_00_world_from_335_was_2018_05_29_00_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_30_00_world_from_335_was_2018_05_29_00_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_30_00_world_from_335_was_2018_05_29_00_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_30_00_world_from_335_was_2018_05_29_00_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_30_01_world_from_335_was_2018_05_29_01_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_30_01_world_from_335_was_2018_05_29_01_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_30_01_world_from_335_was_2018_05_29_01_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_30_01_world_from_335_was_2018_05_29_01_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_30_02_world_from_335_was_2018_05_29_02_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_30_02_world_from_335_was_2018_05_29_02_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_30_02_world_from_335_was_2018_05_29_02_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_30_02_world_from_335_was_2018_05_29_02_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_30_03_world_from_335_was_2018_05_29_03_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_30_03_world_from_335_was_2018_05_29_03_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_30_03_world_from_335_was_2018_05_29_03_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_30_03_world_from_335_was_2018_05_29_03_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_30_04_world_from_335_was_2018_05_29_04_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_30_04_world_from_335_was_2018_05_29_04_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_30_04_world_from_335_was_2018_05_29_04_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_30_04_world_from_335_was_2018_05_29_04_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_30_05_world_from_335_was_2018_05_29_05_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_30_05_world_from_335_was_2018_05_29_05_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_30_05_world_from_335_was_2018_05_29_05_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_30_05_world_from_335_was_2018_05_29_05_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_30_06_world_from_335_was_2018_05_29_06_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_30_06_world_from_335_was_2018_05_29_06_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_30_06_world_from_335_was_2018_05_29_06_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_30_06_world_from_335_was_2018_05_29_06_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_31_00_world_from_335_was_2018_05_31_00_world.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_31_00_world_from_335_was_2018_05_31_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_31_00_world_from_335_was_2018_05_31_00_world.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_31_00_world_from_335_was_2018_05_31_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_05_31_01_world_from_335_was_2018_05_31_01_world.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_31_01_world_from_335_was_2018_05_31_01_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_31_01_world_from_335_was_2018_05_31_01_world.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_31_01_world_from_335_was_2018_05_31_01_world.sql
diff --git a/sql/updates/world/4.3.4/2018_05_31_02_world_from_335_was_2018_05_31_02_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_31_02_world_from_335_was_2018_05_31_02_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_31_02_world_from_335_was_2018_05_31_02_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_31_02_world_from_335_was_2018_05_31_02_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_05_31_03_world_from_335_was_2018_05_31_03_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_05_31_03_world_from_335_was_2018_05_31_03_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_05_31_03_world_from_335_was_2018_05_31_03_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_05_31_03_world_from_335_was_2018_05_31_03_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_06_03_00_world_from_335_was_2018_06_03_00_world.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_06_03_00_world_from_335_was_2018_06_03_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_06_03_00_world_from_335_was_2018_06_03_00_world.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_06_03_00_world_from_335_was_2018_06_03_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_06_03_01_world_from_335_was_2018_06_03_01_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_06_03_01_world_from_335_was_2018_06_03_01_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_06_03_01_world_from_335_was_2018_06_03_01_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_06_03_01_world_from_335_was_2018_06_03_01_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_06_03_02_world_from_335_was_2018_06_03_02_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_06_03_02_world_from_335_was_2018_06_03_02_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_06_03_02_world_from_335_was_2018_06_03_02_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_06_03_02_world_from_335_was_2018_06_03_02_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_06_03_03_world_from_335_was_2018_06_03_03_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_06_03_03_world_from_335_was_2018_06_03_03_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_06_03_03_world_from_335_was_2018_06_03_03_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_06_03_03_world_from_335_was_2018_06_03_03_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_06_03_04_world_from_335_was_2018_06_03_04_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_06_03_04_world_from_335_was_2018_06_03_04_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_06_03_04_world_from_335_was_2018_06_03_04_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_06_03_04_world_from_335_was_2018_06_03_04_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_06_03_05_world.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_06_03_05_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_06_03_05_world.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_06_03_05_world.sql
diff --git a/sql/updates/world/4.3.4/2018_06_03_06_world.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_06_03_06_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_06_03_06_world.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_06_03_06_world.sql
diff --git a/sql/updates/world/4.3.4/2018_06_03_07_world.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_06_03_07_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_06_03_07_world.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_06_03_07_world.sql
diff --git a/sql/updates/world/4.3.4/2018_06_03_08_world_from_335_was_2018_06_03_05_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_06_03_08_world_from_335_was_2018_06_03_05_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_06_03_08_world_from_335_was_2018_06_03_05_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_06_03_08_world_from_335_was_2018_06_03_05_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_06_03_09_world_from_335_was_2018_06_03_06_world.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_06_03_09_world_from_335_was_2018_06_03_06_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_06_03_09_world_from_335_was_2018_06_03_06_world.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_06_03_09_world_from_335_was_2018_06_03_06_world.sql
diff --git a/sql/updates/world/4.3.4/2018_06_03_10_world.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_06_03_10_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_06_03_10_world.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_06_03_10_world.sql
diff --git a/sql/updates/world/4.3.4/2018_06_09_00_world_from_335_was_2018_06_04_00_world.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_06_09_00_world_from_335_was_2018_06_04_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_06_09_00_world_from_335_was_2018_06_04_00_world.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_06_09_00_world_from_335_was_2018_06_04_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_06_09_01_world_from_335_was_2018_06_05_00_world.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_06_09_01_world_from_335_was_2018_06_05_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_06_09_01_world_from_335_was_2018_06_05_00_world.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_06_09_01_world_from_335_was_2018_06_05_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_06_09_02_world_from_335_was_2018_06_08_00_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_06_09_02_world_from_335_was_2018_06_08_00_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_06_09_02_world_from_335_was_2018_06_08_00_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_06_09_02_world_from_335_was_2018_06_08_00_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_06_09_03_world_from_335_was_2018_06_08_01_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_06_09_03_world_from_335_was_2018_06_08_01_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_06_09_03_world_from_335_was_2018_06_08_01_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_06_09_03_world_from_335_was_2018_06_08_01_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_06_09_04_world_from_335_was_2018_06_08_02_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_06_09_04_world_from_335_was_2018_06_08_02_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_06_09_04_world_from_335_was_2018_06_08_02_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_06_09_04_world_from_335_was_2018_06_08_02_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_06_09_05_world_from_335_was_2018_06_08_03_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_06_09_05_world_from_335_was_2018_06_08_03_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_06_09_05_world_from_335_was_2018_06_08_03_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_06_09_05_world_from_335_was_2018_06_08_03_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_06_13_00_world.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_06_13_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_06_13_00_world.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_06_13_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_06_14_00_world_from_335_was_2018_06_13_00_world.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_06_14_00_world_from_335_was_2018_06_13_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_06_14_00_world_from_335_was_2018_06_13_00_world.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_06_14_00_world_from_335_was_2018_06_13_00_world.sql
diff --git a/sql/updates/world/4.3.4/2018_06_14_01_world_from_335_was_2018_06_13_01_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_06_14_01_world_from_335_was_2018_06_13_01_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_06_14_01_world_from_335_was_2018_06_13_01_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_06_14_01_world_from_335_was_2018_06_13_01_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_06_14_02_world_from_335_was_2018_06_13_02_world.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_06_14_02_world_from_335_was_2018_06_13_02_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_06_14_02_world_from_335_was_2018_06_13_02_world.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_06_14_02_world_from_335_was_2018_06_13_02_world.sql
diff --git a/sql/updates/world/4.3.4/2018_06_14_03_world_from_335_was_2018_06_13_03_world.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_06_14_03_world_from_335_was_2018_06_13_03_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_06_14_03_world_from_335_was_2018_06_13_03_world.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_06_14_03_world_from_335_was_2018_06_13_03_world.sql
diff --git a/sql/updates/world/4.3.4/2018_06_14_04_world_from_335_was_2018_06_13_04_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_06_14_04_world_from_335_was_2018_06_13_04_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_06_14_04_world_from_335_was_2018_06_13_04_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_06_14_04_world_from_335_was_2018_06_13_04_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_06_14_05_world_from_335_was_2018_06_13_05_world_335.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_06_14_05_world_from_335_was_2018_06_13_05_world_335.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_06_14_05_world_from_335_was_2018_06_13_05_world_335.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_06_14_05_world_from_335_was_2018_06_13_05_world_335.sql
diff --git a/sql/updates/world/4.3.4/2018_06_14_06_world_from_335_was_2018_06_13_06_world.sql b/sql/old/4.3.4/world/30_2018_06_15/2018_06_14_06_world_from_335_was_2018_06_13_06_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_06_14_06_world_from_335_was_2018_06_13_06_world.sql
rename to sql/old/4.3.4/world/30_2018_06_15/2018_06_14_06_world_from_335_was_2018_06_13_06_world.sql
diff --git a/sql/updates/auth/4.3.4/2018_06_15_00_auth.sql b/sql/updates/auth/4.3.4/2018_06_15_00_auth.sql
new file mode 100644
index 00000000000..b4e620abf6a
--- /dev/null
+++ b/sql/updates/auth/4.3.4/2018_06_15_00_auth.sql
@@ -0,0 +1,2 @@
+-- TDB 4.3.4-31 auth database
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/characters/4.3.4/2018_06_15_00_characters.sql b/sql/updates/characters/4.3.4/2018_06_15_00_characters.sql
new file mode 100644
index 00000000000..3a94272a9f3
--- /dev/null
+++ b/sql/updates/characters/4.3.4/2018_06_15_00_characters.sql
@@ -0,0 +1,2 @@
+-- TDB 4.3.4-31 characters database
+UPDATE `updates` SET `state`='ARCHIVED';