diff --git a/eqlaunch/CMakeLists.txt b/eqlaunch/CMakeLists.txt
index 922522d86..376bc8147 100644
--- a/eqlaunch/CMakeLists.txt
+++ b/eqlaunch/CMakeLists.txt
@@ -3,12 +3,12 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 SET(eqlaunch_sources
 	eqlaunch.cpp
 	worldserver.cpp
-	ZoneLaunch.cpp
+	zone_launch.cpp
 )
 
 SET(eqlaunch_headers
 	worldserver.h
-	ZoneLaunch.h
+	zone_launch.h
 )
 
 ADD_EXECUTABLE(eqlaunch ${eqlaunch_sources} ${eqlaunch_headers})
diff --git a/eqlaunch/eqlaunch.cpp b/eqlaunch/eqlaunch.cpp
index da14c40e8..fbac09541 100644
--- a/eqlaunch/eqlaunch.cpp
+++ b/eqlaunch/eqlaunch.cpp
@@ -23,7 +23,7 @@
 #include "../common/platform.h"
 #include "../common/crash.h"
 #include "worldserver.h"
-#include "ZoneLaunch.h"
+#include "zone_launch.h"
 #include <vector>
 #include <map>
 #include <set>
diff --git a/eqlaunch/worldserver.cpp b/eqlaunch/worldserver.cpp
index 7b542a183..1754b6564 100644
--- a/eqlaunch/worldserver.cpp
+++ b/eqlaunch/worldserver.cpp
@@ -16,12 +16,11 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 #include "../common/debug.h"
-#include "worldserver.h"
 #include "../common/servertalk.h"
-#include "ZoneLaunch.h"
 #include "../common/eqemu_config.h"
 #include "../common/string_util.h"
-
+#include "worldserver.h"
+#include "zone_launch.h"
 
 WorldServer::WorldServer(std::map<std::string, ZoneLaunch *> &zones, const char *name, const EQEmuConfig *config)
 : WorldConnection(EmuTCPConnection::packetModeLauncher, config->SharedKey.c_str()),
diff --git a/eqlaunch/ZoneLaunch.cpp b/eqlaunch/zone_launch.cpp
similarity index 99%
rename from eqlaunch/ZoneLaunch.cpp
rename to eqlaunch/zone_launch.cpp
index 42d1debe8..fee133da7 100644
--- a/eqlaunch/ZoneLaunch.cpp
+++ b/eqlaunch/zone_launch.cpp
@@ -16,11 +16,10 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-
-
-#include "ZoneLaunch.h"
-#include "worldserver.h"
+#include "../common/debug.h"
 #include "../common/eqemu_config.h"
+#include "zone_launch.h"
+#include "worldserver.h"
 
 //static const uint32 ZONE_RESTART_DELAY = 10000;
 //static const uint32 ZONE_TERMINATE_WAIT = 10000;
diff --git a/eqlaunch/ZoneLaunch.h b/eqlaunch/zone_launch.h
similarity index 100%
rename from eqlaunch/ZoneLaunch.h
rename to eqlaunch/zone_launch.h
diff --git a/utils/azone2/3d.hpp b/utils/deprecated/azone2/3d.hpp
similarity index 100%
rename from utils/azone2/3d.hpp
rename to utils/deprecated/azone2/3d.hpp
diff --git a/utils/azone2/3d_base.hpp b/utils/deprecated/azone2/3d_base.hpp
similarity index 100%
rename from utils/azone2/3d_base.hpp
rename to utils/deprecated/azone2/3d_base.hpp
diff --git a/utils/azone2/GLModelViewer.cpp b/utils/deprecated/azone2/GLModelViewer.cpp
similarity index 100%
rename from utils/azone2/GLModelViewer.cpp
rename to utils/deprecated/azone2/GLModelViewer.cpp
diff --git a/utils/azone2/GLModelViewer.h b/utils/deprecated/azone2/GLModelViewer.h
similarity index 100%
rename from utils/azone2/GLModelViewer.h
rename to utils/deprecated/azone2/GLModelViewer.h
diff --git a/utils/azone2/README b/utils/deprecated/azone2/README
similarity index 100%
rename from utils/azone2/README
rename to utils/deprecated/azone2/README
diff --git a/utils/azone2/archive.hpp b/utils/deprecated/azone2/archive.hpp
similarity index 100%
rename from utils/azone2/archive.hpp
rename to utils/deprecated/azone2/archive.hpp
diff --git a/utils/azone2/awater.cpp b/utils/deprecated/azone2/awater.cpp
similarity index 100%
rename from utils/azone2/awater.cpp
rename to utils/deprecated/azone2/awater.cpp
diff --git a/utils/azone2/awater.h b/utils/deprecated/azone2/awater.h
similarity index 100%
rename from utils/azone2/awater.h
rename to utils/deprecated/azone2/awater.h
diff --git a/utils/azone2/azone.cpp b/utils/deprecated/azone2/azone.cpp
similarity index 100%
rename from utils/azone2/azone.cpp
rename to utils/deprecated/azone2/azone.cpp
diff --git a/utils/azone2/azone.h b/utils/deprecated/azone2/azone.h
similarity index 100%
rename from utils/azone2/azone.h
rename to utils/deprecated/azone2/azone.h
diff --git a/utils/azone2/azone.ini b/utils/deprecated/azone2/azone.ini
similarity index 100%
rename from utils/azone2/azone.ini
rename to utils/deprecated/azone2/azone.ini
diff --git a/utils/azone2/dat.cpp b/utils/deprecated/azone2/dat.cpp
similarity index 100%
rename from utils/azone2/dat.cpp
rename to utils/deprecated/azone2/dat.cpp
diff --git a/utils/azone2/dat.hpp b/utils/deprecated/azone2/dat.hpp
similarity index 100%
rename from utils/azone2/dat.hpp
rename to utils/deprecated/azone2/dat.hpp
diff --git a/utils/azone2/file.cpp b/utils/deprecated/azone2/file.cpp
similarity index 100%
rename from utils/azone2/file.cpp
rename to utils/deprecated/azone2/file.cpp
diff --git a/utils/azone2/file.hpp b/utils/deprecated/azone2/file.hpp
similarity index 100%
rename from utils/azone2/file.hpp
rename to utils/deprecated/azone2/file.hpp
diff --git a/utils/azone2/file_loader.hpp b/utils/deprecated/azone2/file_loader.hpp
similarity index 100%
rename from utils/azone2/file_loader.hpp
rename to utils/deprecated/azone2/file_loader.hpp
diff --git a/utils/azone2/global.cpp b/utils/deprecated/azone2/global.cpp
similarity index 100%
rename from utils/azone2/global.cpp
rename to utils/deprecated/azone2/global.cpp
diff --git a/utils/azone2/global.hpp b/utils/deprecated/azone2/global.hpp
similarity index 100%
rename from utils/azone2/global.hpp
rename to utils/deprecated/azone2/global.hpp
diff --git a/utils/azone2/listobj.cpp b/utils/deprecated/azone2/listobj.cpp
similarity index 100%
rename from utils/azone2/listobj.cpp
rename to utils/deprecated/azone2/listobj.cpp
diff --git a/utils/azone2/octree.hpp b/utils/deprecated/azone2/octree.hpp
similarity index 100%
rename from utils/azone2/octree.hpp
rename to utils/deprecated/azone2/octree.hpp
diff --git a/utils/azone2/pfs.cpp b/utils/deprecated/azone2/pfs.cpp
similarity index 100%
rename from utils/azone2/pfs.cpp
rename to utils/deprecated/azone2/pfs.cpp
diff --git a/utils/azone2/pfs.hpp b/utils/deprecated/azone2/pfs.hpp
similarity index 100%
rename from utils/azone2/pfs.hpp
rename to utils/deprecated/azone2/pfs.hpp
diff --git a/utils/azone2/s3d.h b/utils/deprecated/azone2/s3d.h
similarity index 100%
rename from utils/azone2/s3d.h
rename to utils/deprecated/azone2/s3d.h
diff --git a/utils/azone2/ter.cpp b/utils/deprecated/azone2/ter.cpp
similarity index 100%
rename from utils/azone2/ter.cpp
rename to utils/deprecated/azone2/ter.cpp
diff --git a/utils/azone2/ter.hpp b/utils/deprecated/azone2/ter.hpp
similarity index 100%
rename from utils/azone2/ter.hpp
rename to utils/deprecated/azone2/ter.hpp
diff --git a/utils/azone2/types.h b/utils/deprecated/azone2/types.h
similarity index 100%
rename from utils/azone2/types.h
rename to utils/deprecated/azone2/types.h
diff --git a/utils/azone2/wld.cpp b/utils/deprecated/azone2/wld.cpp
similarity index 100%
rename from utils/azone2/wld.cpp
rename to utils/deprecated/azone2/wld.cpp
diff --git a/utils/azone2/wld.hpp b/utils/deprecated/azone2/wld.hpp
similarity index 100%
rename from utils/azone2/wld.hpp
rename to utils/deprecated/azone2/wld.hpp
diff --git a/utils/azone2/wld_structs.hpp b/utils/deprecated/azone2/wld_structs.hpp
similarity index 100%
rename from utils/azone2/wld_structs.hpp
rename to utils/deprecated/azone2/wld_structs.hpp
diff --git a/utils/azone2/zon.cpp b/utils/deprecated/azone2/zon.cpp
similarity index 100%
rename from utils/azone2/zon.cpp
rename to utils/deprecated/azone2/zon.cpp
diff --git a/utils/azone2/zon.hpp b/utils/deprecated/azone2/zon.hpp
similarity index 100%
rename from utils/azone2/zon.hpp
rename to utils/deprecated/azone2/zon.hpp
diff --git a/utils/azone2/zonv4.cpp b/utils/deprecated/azone2/zonv4.cpp
similarity index 100%
rename from utils/azone2/zonv4.cpp
rename to utils/deprecated/azone2/zonv4.cpp
diff --git a/utils/azone2/zonv4.hpp b/utils/deprecated/azone2/zonv4.hpp
similarity index 100%
rename from utils/azone2/zonv4.hpp
rename to utils/deprecated/azone2/zonv4.hpp
diff --git a/utils/pfs_list/CMakeLists.txt b/utils/deprecated/pfs_list/CMakeLists.txt
similarity index 100%
rename from utils/pfs_list/CMakeLists.txt
rename to utils/deprecated/pfs_list/CMakeLists.txt
diff --git a/utils/pfs_list/Common/CMakeLists.txt b/utils/deprecated/pfs_list/Common/CMakeLists.txt
similarity index 100%
rename from utils/pfs_list/Common/CMakeLists.txt
rename to utils/deprecated/pfs_list/Common/CMakeLists.txt
diff --git a/utils/pfs_list/Common/Include/Archive.h b/utils/deprecated/pfs_list/Common/Include/Archive.h
similarity index 100%
rename from utils/pfs_list/Common/Include/Archive.h
rename to utils/deprecated/pfs_list/Common/Include/Archive.h
diff --git a/utils/pfs_list/Common/Include/Compression.h b/utils/deprecated/pfs_list/Common/Include/Compression.h
similarity index 100%
rename from utils/pfs_list/Common/Include/Compression.h
rename to utils/deprecated/pfs_list/Common/Include/Compression.h
diff --git a/utils/pfs_list/Common/Include/PFSArchive.h b/utils/deprecated/pfs_list/Common/Include/PFSArchive.h
similarity index 100%
rename from utils/pfs_list/Common/Include/PFSArchive.h
rename to utils/deprecated/pfs_list/Common/Include/PFSArchive.h
diff --git a/utils/pfs_list/Common/Include/PFSDataStructs.h b/utils/deprecated/pfs_list/Common/Include/PFSDataStructs.h
similarity index 100%
rename from utils/pfs_list/Common/Include/PFSDataStructs.h
rename to utils/deprecated/pfs_list/Common/Include/PFSDataStructs.h
diff --git a/utils/pfs_list/Common/Source/Compression.cpp b/utils/deprecated/pfs_list/Common/Source/Compression.cpp
similarity index 100%
rename from utils/pfs_list/Common/Source/Compression.cpp
rename to utils/deprecated/pfs_list/Common/Source/Compression.cpp
diff --git a/utils/pfs_list/Common/Source/PFSArchive.cpp b/utils/deprecated/pfs_list/Common/Source/PFSArchive.cpp
similarity index 100%
rename from utils/pfs_list/Common/Source/PFSArchive.cpp
rename to utils/deprecated/pfs_list/Common/Source/PFSArchive.cpp
diff --git a/utils/pfs_list/PFSList/CMakeLists.txt b/utils/deprecated/pfs_list/PFSList/CMakeLists.txt
similarity index 100%
rename from utils/pfs_list/PFSList/CMakeLists.txt
rename to utils/deprecated/pfs_list/PFSList/CMakeLists.txt
diff --git a/utils/pfs_list/PFSList/Source/main.cpp b/utils/deprecated/pfs_list/PFSList/Source/main.cpp
similarity index 100%
rename from utils/pfs_list/PFSList/Source/main.cpp
rename to utils/deprecated/pfs_list/PFSList/Source/main.cpp
diff --git a/utils/player_profile_set/Readme.txt b/utils/deprecated/player_profile_set/Readme.txt
similarity index 100%
rename from utils/player_profile_set/Readme.txt
rename to utils/deprecated/player_profile_set/Readme.txt
diff --git a/utils/player_profile_set/bin/database.ini b/utils/deprecated/player_profile_set/bin/database.ini
similarity index 100%
rename from utils/player_profile_set/bin/database.ini
rename to utils/deprecated/player_profile_set/bin/database.ini
diff --git a/utils/player_profile_set/player_profile_set.sln b/utils/deprecated/player_profile_set/player_profile_set.sln
similarity index 100%
rename from utils/player_profile_set/player_profile_set.sln
rename to utils/deprecated/player_profile_set/player_profile_set.sln
diff --git a/utils/player_profile_set/player_profile_set/MiscFunctions.cpp b/utils/deprecated/player_profile_set/player_profile_set/MiscFunctions.cpp
similarity index 100%
rename from utils/player_profile_set/player_profile_set/MiscFunctions.cpp
rename to utils/deprecated/player_profile_set/player_profile_set/MiscFunctions.cpp
diff --git a/utils/player_profile_set/player_profile_set/MiscFunctions.h b/utils/deprecated/player_profile_set/player_profile_set/MiscFunctions.h
similarity index 100%
rename from utils/player_profile_set/player_profile_set/MiscFunctions.h
rename to utils/deprecated/player_profile_set/player_profile_set/MiscFunctions.h
diff --git a/utils/player_profile_set/player_profile_set/database.cpp b/utils/deprecated/player_profile_set/player_profile_set/database.cpp
similarity index 100%
rename from utils/player_profile_set/player_profile_set/database.cpp
rename to utils/deprecated/player_profile_set/player_profile_set/database.cpp
diff --git a/utils/player_profile_set/player_profile_set/database.h b/utils/deprecated/player_profile_set/player_profile_set/database.h
similarity index 100%
rename from utils/player_profile_set/player_profile_set/database.h
rename to utils/deprecated/player_profile_set/player_profile_set/database.h
diff --git a/utils/player_profile_set/player_profile_set/eq_player_structs.h b/utils/deprecated/player_profile_set/player_profile_set/eq_player_structs.h
similarity index 100%
rename from utils/player_profile_set/player_profile_set/eq_player_structs.h
rename to utils/deprecated/player_profile_set/player_profile_set/eq_player_structs.h
diff --git a/utils/player_profile_set/player_profile_set/eqemu_string.h b/utils/deprecated/player_profile_set/player_profile_set/eqemu_string.h
similarity index 100%
rename from utils/player_profile_set/player_profile_set/eqemu_string.h
rename to utils/deprecated/player_profile_set/player_profile_set/eqemu_string.h
diff --git a/utils/player_profile_set/player_profile_set/ini.cpp b/utils/deprecated/player_profile_set/player_profile_set/ini.cpp
similarity index 100%
rename from utils/player_profile_set/player_profile_set/ini.cpp
rename to utils/deprecated/player_profile_set/player_profile_set/ini.cpp
diff --git a/utils/player_profile_set/player_profile_set/ini.h b/utils/deprecated/player_profile_set/player_profile_set/ini.h
similarity index 100%
rename from utils/player_profile_set/player_profile_set/ini.h
rename to utils/deprecated/player_profile_set/player_profile_set/ini.h
diff --git a/utils/player_profile_set/player_profile_set/main.cpp b/utils/deprecated/player_profile_set/player_profile_set/main.cpp
similarity index 100%
rename from utils/player_profile_set/player_profile_set/main.cpp
rename to utils/deprecated/player_profile_set/player_profile_set/main.cpp
diff --git a/utils/player_profile_set/player_profile_set/main.h b/utils/deprecated/player_profile_set/player_profile_set/main.h
similarity index 100%
rename from utils/player_profile_set/player_profile_set/main.h
rename to utils/deprecated/player_profile_set/player_profile_set/main.h
diff --git a/utils/player_profile_set/player_profile_set/player_profile_set.vcproj b/utils/deprecated/player_profile_set/player_profile_set/player_profile_set.vcproj
similarity index 100%
rename from utils/player_profile_set/player_profile_set/player_profile_set.vcproj
rename to utils/deprecated/player_profile_set/player_profile_set/player_profile_set.vcproj
diff --git a/utils/player_profile_set/player_profile_set/types.h b/utils/deprecated/player_profile_set/player_profile_set/types.h
similarity index 100%
rename from utils/player_profile_set/player_profile_set/types.h
rename to utils/deprecated/player_profile_set/player_profile_set/types.h