diff --git a/FFXIVClassic Lobby Server/ClientConnection.cs b/FFXIVClassic Lobby Server/ClientConnection.cs
index 76e77fd9..fb103a5b 100644
--- a/FFXIVClassic Lobby Server/ClientConnection.cs	
+++ b/FFXIVClassic Lobby Server/ClientConnection.cs	
@@ -1,14 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Net.Sockets;
 using FFXIVClassic_Lobby_Server.packets;
-using System.Diagnostics;
 using FFXIVClassic_Lobby_Server.common;
 using System.Collections.Concurrent;
-using System.IO;
 using Cyotek.Collections.Generic;
 using System.Net;
 
diff --git a/FFXIVClassic Lobby Server/ConfigConstants.cs b/FFXIVClassic Lobby Server/ConfigConstants.cs
index 7968aa5e..75d96000 100644
--- a/FFXIVClassic Lobby Server/ConfigConstants.cs	
+++ b/FFXIVClassic Lobby Server/ConfigConstants.cs	
@@ -1,18 +1,16 @@
-using FFXIVClassic_Lobby_Server.common;
-using STA.Settings;
+using STA.Settings;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Lobby_Server
 {
     class ConfigConstants
     {
         public static String OPTIONS_BINDIP;
-        public static bool OPTIONS_TIMESTAMP = false;
+        public static String OPTIONS_PORT;
+        public static bool   OPTIONS_TIMESTAMP = false;
+        public static String OPTIONS_LOGPATH;
+        public static String OPTIONS_LOGFILE;
 
         public static String DATABASE_HOST;
         public static String DATABASE_PORT;
@@ -22,20 +20,23 @@ namespace FFXIVClassic_Lobby_Server
 
         public static bool load()
         {
-            Console.Write("Loading config.ini file... ");
+            Console.Write("Loading lobby_config.ini file... ");
 
-            if (!File.Exists("./config.ini"))
+            if (!File.Exists("./lobby_config.ini"))
             {
                 Console.ForegroundColor = ConsoleColor.Red;
-                Console.WriteLine("[FILE NOT FOUND]");
+                Console.WriteLine(String.Format("[FILE NOT FOUND]"));
                 Console.ForegroundColor = ConsoleColor.Gray;
                 return false;
             }
 
-            INIFile configIni = new INIFile("./config.ini");
+            INIFile configIni = new INIFile("./lobby_config.ini");
 
             ConfigConstants.OPTIONS_BINDIP =        configIni.GetValue("General", "server_ip", "127.0.0.1");
-            ConfigConstants.OPTIONS_TIMESTAMP =     configIni.GetValue("General", "showtimestamp", "true").ToLower().Equals("true");            
+            ConfigConstants.OPTIONS_PORT =          configIni.GetValue("General", "server_port", "54994");
+            ConfigConstants.OPTIONS_TIMESTAMP =     configIni.GetValue("General", "showtimestamp", "true").ToLower().Equals("true");
+            ConfigConstants.OPTIONS_LOGPATH =       configIni.GetValue("General", "log_path", "./logs/");
+            ConfigConstants.OPTIONS_LOGFILE =       configIni.GetValue("General", "log_file_name", String.Format("lobby_{0}_{1}.log", OPTIONS_BINDIP, OPTIONS_PORT));
 
             ConfigConstants.DATABASE_HOST =         configIni.GetValue("Database", "host", "");
             ConfigConstants.DATABASE_PORT =         configIni.GetValue("Database", "port", "");
@@ -44,7 +45,7 @@ namespace FFXIVClassic_Lobby_Server
             ConfigConstants.DATABASE_PASSWORD =     configIni.GetValue("Database", "password", "");
 
             Console.ForegroundColor = ConsoleColor.Green;
-            Console.WriteLine("[OK]");
+            Console.WriteLine(String.Format("[OK]"));
             Console.ForegroundColor = ConsoleColor.Gray;
 
             return true;
diff --git a/FFXIVClassic Lobby Server/Database.cs b/FFXIVClassic Lobby Server/Database.cs
index 1f7ec710..fcf706d9 100644
--- a/FFXIVClassic Lobby Server/Database.cs	
+++ b/FFXIVClassic Lobby Server/Database.cs	
@@ -1,14 +1,11 @@
 using FFXIVClassic_Lobby_Server.dataobjects;
 using MySql.Data.MySqlClient;
 using Dapper;
-using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using FFXIVClassic_Lobby_Server.common;
 using FFXIVClassic_Lobby_Server.utils;
+using FFXIVClassic_Lobby_Server.common;
 
 namespace FFXIVClassic_Lobby_Server
 {
@@ -35,7 +32,10 @@ namespace FFXIVClassic_Lobby_Server
                     }
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+
+                }
                 finally
                 {
                     conn.Dispose();
@@ -88,6 +88,10 @@ namespace FFXIVClassic_Lobby_Server
                 }
                 catch (MySqlException e)
                 {
+                    Log.error(e.ToString());
+                   
+                    Log.error(e.ToString());
+                   
                     pid = 0;
                     cid = 0;
                 }
@@ -179,6 +183,8 @@ namespace FFXIVClassic_Lobby_Server
                 }
                 catch (MySqlException e)
                 {
+                    Log.error(e.ToString());
+                   
                     conn.Dispose();
                     return;
                 }
@@ -202,6 +208,8 @@ namespace FFXIVClassic_Lobby_Server
                 }
                 catch (MySqlException e)
                 {
+                    Log.error(e.ToString());
+                   
                     conn.Dispose();
                     return;
                 }
@@ -222,6 +230,8 @@ namespace FFXIVClassic_Lobby_Server
                 }
                 catch (MySqlException e)
                 {
+                    Log.error(e.ToString());
+                   
 
                 }
                 finally
@@ -267,6 +277,8 @@ namespace FFXIVClassic_Lobby_Server
                 }
                 catch (MySqlException e)
                 {
+                    Log.error(e.ToString());
+                   
 
                 }
                 finally
@@ -298,6 +310,8 @@ namespace FFXIVClassic_Lobby_Server
                 }
                 catch (MySqlException e)
                 {
+                    Log.error(e.ToString());
+                   
 
                 }
                 finally
@@ -320,7 +334,9 @@ namespace FFXIVClassic_Lobby_Server
                     worldList = conn.Query<World>("SELECT * FROM servers WHERE isActive=true").ToList();                                       
                 }
                 catch (MySqlException e)
-                { worldList = new List<World>(); }
+                {
+                    Log.error(e.ToString());
+                    worldList = new List<World>(); }
                 finally
                 {                    
                     conn.Dispose();
@@ -340,7 +356,9 @@ namespace FFXIVClassic_Lobby_Server
                     world = conn.Query<World>("SELECT * FROM servers WHERE id=@ServerId", new {ServerId = serverId}).SingleOrDefault();                  
                 }
                 catch (MySqlException e)
-                {                    
+                {
+                    Log.error(e.ToString());
+                                       
                 }
                 finally
                 {
@@ -476,6 +494,8 @@ namespace FFXIVClassic_Lobby_Server
                 }
                 catch (MySqlException e)
                 {
+                    Log.error(e.ToString());
+                   
                 }
                 finally
                 {
@@ -497,7 +517,9 @@ namespace FFXIVClassic_Lobby_Server
                     nameList = conn.Query<String>("SELECT name FROM reserved_names WHERE userId=@UserId", new { UserId = userId }).ToList();
                 }
                 catch (MySqlException e)
-                { nameList = new List<String>(); }
+                {
+                    Log.error(e.ToString());
+                    nameList = new List<String>(); }
                 finally
                 {
                     conn.Dispose();
@@ -517,7 +539,9 @@ namespace FFXIVClassic_Lobby_Server
                     retainerList = conn.Query<Retainer>("SELECT * FROM retainers WHERE id=@UserId ORDER BY characterId, slot", new { UserId = userId }).ToList();
                 }
                 catch (MySqlException e)
-                { retainerList = new List<Retainer>(); }
+                {
+                    Log.error(e.ToString());
+                    retainerList = new List<Retainer>(); }
                 finally
                 {
                     conn.Dispose();
diff --git a/FFXIVClassic Lobby Server/FFXIVClassic Lobby Server.csproj b/FFXIVClassic Lobby Server/FFXIVClassic Lobby Server.csproj
index b3ade4da..00c7db3a 100644
--- a/FFXIVClassic Lobby Server/FFXIVClassic Lobby Server.csproj	
+++ b/FFXIVClassic Lobby Server/FFXIVClassic Lobby Server.csproj	
@@ -11,6 +11,21 @@
     <AssemblyName>FFXIVClassic_Lobby_Server</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -94,9 +109,21 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.5">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.5 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>copy "$(SolutionDir)data\config.ini" "$(SolutionDir)$(ProjectName)\$(OutDir)"</PostBuildEvent>
+    <PostBuildEvent>copy "$(SolutionDir)data\lobby_config.ini" "$(SolutionDir)$(ProjectName)\$(OutDir)"</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/FFXIVClassic Lobby Server/PacketProcessor.cs b/FFXIVClassic Lobby Server/PacketProcessor.cs
index db2dcaaf..075fb89b 100644
--- a/FFXIVClassic Lobby Server/PacketProcessor.cs	
+++ b/FFXIVClassic Lobby Server/PacketProcessor.cs	
@@ -3,16 +3,11 @@ using FFXIVClassic_Lobby_Server.dataobjects;
 using FFXIVClassic_Lobby_Server.packets;
 using FFXIVClassic_Lobby_Server.packets.receive;
 using FFXIVClassic_Lobby_Server.utils;
-using MySql.Data.MySqlClient;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Lobby_Server
 {
diff --git a/FFXIVClassic Lobby Server/Program.cs b/FFXIVClassic Lobby Server/Program.cs
index af827314..e4052bf9 100644
--- a/FFXIVClassic Lobby Server/Program.cs	
+++ b/FFXIVClassic Lobby Server/Program.cs	
@@ -1,17 +1,14 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
+using System;
 using System.Diagnostics;
 using System.Threading;
-using FFXIVClassic_Lobby_Server.common;
-using System.Runtime.InteropServices;
 using MySql.Data.MySqlClient;
 using System.Reflection;
+using FFXIVClassic_Lobby_Server.common;
 
 namespace FFXIVClassic_Lobby_Server
 {
     class Program
     {
-
         static void Main(string[] args)
         {
 #if DEBUG
@@ -21,36 +18,33 @@ namespace FFXIVClassic_Lobby_Server
 
             bool startServer = true;
 
-            Console.ForegroundColor = ConsoleColor.Yellow;
-            Console.WriteLine("--------FFXIV 1.0 Lobby Server--------");            
-            Console.ForegroundColor = ConsoleColor.Gray;
-
-
-            Assembly assem = Assembly.GetExecutingAssembly();
-            Version vers = assem.GetName().Version;
-            Console.WriteLine("Version: " + vers.ToString());
-
             //Load Config
             if (!ConfigConstants.load())
                 startServer = false;
 
+            Log.log("--------FFXIV 1.0 Lobby Server--------", Log.LogType.Debug);
+
+
+            Assembly assem = Assembly.GetExecutingAssembly();
+            Version vers = assem.GetName().Version;
+            Log.info("Version: " + vers.ToString());
+
             //Test DB Connection
-            Console.Write("Testing DB connection to \"{0}\"... ", ConfigConstants.DATABASE_HOST);
+            Log.info(String.Format("Testing DB connection to \"{0}\"... ", ConfigConstants.DATABASE_HOST));
             using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD)))
             {
                 try
                 {
                     conn.Open();
                     conn.Close();
-                    Console.ForegroundColor = ConsoleColor.Green;
-                    Console.WriteLine("[OK]");
-                    Console.ForegroundColor = ConsoleColor.Gray;
+
+                    Log.conn("[OK]");
                 }
                 catch (MySqlException e)
                 {
-                    Console.ForegroundColor = ConsoleColor.Red;
-                    Console.WriteLine("[FAILED]");
-                    Console.ForegroundColor = ConsoleColor.Gray;
+                    Log.error(e.ToString());
+                    Log.error("[FAILED]");
+
                     startServer = false; 
                 }
             }
@@ -64,7 +58,7 @@ namespace FFXIVClassic_Lobby_Server
                 while (true) Thread.Sleep(10000);
             }
 
-            Console.WriteLine("Press any key to continue...");
+            Log.info("Press any key to continue...");
             Console.ReadKey();
         }
 
diff --git a/FFXIVClassic Lobby Server/Properties/AssemblyInfo.cs b/FFXIVClassic Lobby Server/Properties/AssemblyInfo.cs
index ff86b3cf..d5b223c0 100644
--- a/FFXIVClassic Lobby Server/Properties/AssemblyInfo.cs	
+++ b/FFXIVClassic Lobby Server/Properties/AssemblyInfo.cs	
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
diff --git a/FFXIVClassic Lobby Server/Server.cs b/FFXIVClassic Lobby Server/Server.cs
index 47bfd73d..501767ef 100644
--- a/FFXIVClassic Lobby Server/Server.cs	
+++ b/FFXIVClassic Lobby Server/Server.cs	
@@ -1,13 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Net;
 using System.Net.Sockets;
-using System.Threading.Tasks;
 using System.Threading;
-using FFXIVClassic_Lobby_Server.common;
 using FFXIVClassic_Lobby_Server.packets;
+using FFXIVClassic_Lobby_Server.common;
 
 namespace FFXIVClassic_Lobby_Server
 {
@@ -28,7 +25,7 @@ namespace FFXIVClassic_Lobby_Server
 
         private void socketCleanup()
         {
-            Console.WriteLine("Cleanup thread started; it will run every {0} seconds.", CLEANUP_THREAD_SLEEP_TIME);
+            Log.debug(String.Format("Cleanup thread started; it will run every {0} seconds.", CLEANUP_THREAD_SLEEP_TIME));
             while (!killCleanupThread)
             {
                 int count = 0;
@@ -55,7 +52,7 @@ namespace FFXIVClassic_Lobby_Server
             //cleanupThread.Name = "LobbyThread:Cleanup";
             //cleanupThread.Start();
 
-            IPEndPoint serverEndPoint = new System.Net.IPEndPoint(IPAddress.Parse(ConfigConstants.OPTIONS_BINDIP), FFXIV_LOBBY_PORT);
+            IPEndPoint serverEndPoint = new System.Net.IPEndPoint(IPAddress.Parse(ConfigConstants.OPTIONS_BINDIP), int.Parse(ConfigConstants.OPTIONS_PORT));
            
             try{
                 mServerSocket = new System.Net.Sockets.Socket(serverEndPoint.Address.AddressFamily, SocketType.Stream, ProtocolType.Tcp);                
@@ -82,9 +79,8 @@ namespace FFXIVClassic_Lobby_Server
                 throw new ApplicationException("Error occured starting listeners, check inner exception", e);
             }
 
-            Console.Write("Server has started @ ");
             Console.ForegroundColor = ConsoleColor.White;
-            Console.WriteLine("{0}:{1}", (mServerSocket.LocalEndPoint as IPEndPoint).Address, (mServerSocket.LocalEndPoint as IPEndPoint).Port);
+            Log.debug(String.Format("Lobby Server has started @ {0}:{1}", (mServerSocket.LocalEndPoint as IPEndPoint).Address, (mServerSocket.LocalEndPoint as IPEndPoint).Port));
             Console.ForegroundColor = ConsoleColor.Gray;
 
             mProcessor = new PacketProcessor();
diff --git a/FFXIVClassic Lobby Server/common/Bitfield.cs b/FFXIVClassic Lobby Server/common/Bitfield.cs
index d4e885a0..9e1de16a 100644
--- a/FFXIVClassic Lobby Server/common/Bitfield.cs	
+++ b/FFXIVClassic Lobby Server/common/Bitfield.cs	
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Lobby_Server.common
 {
diff --git a/FFXIVClassic Lobby Server/common/Blowfish.cs b/FFXIVClassic Lobby Server/common/Blowfish.cs
index 92305b58..16590402 100644
--- a/FFXIVClassic Lobby Server/common/Blowfish.cs	
+++ b/FFXIVClassic Lobby Server/common/Blowfish.cs	
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Lobby_Server.common
 {
diff --git a/FFXIVClassic Lobby Server/common/Log.cs b/FFXIVClassic Lobby Server/common/Log.cs
index 93ab8533..d8eb72ce 100644
--- a/FFXIVClassic Lobby Server/common/Log.cs	
+++ b/FFXIVClassic Lobby Server/common/Log.cs	
@@ -1,56 +1,73 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.IO;
 
 namespace FFXIVClassic_Lobby_Server.common
 {
     class Log
     {
+        public enum LogType
+        {
+            Error = ConsoleColor.Red,
+            Debug = ConsoleColor.Yellow,
+            Info = ConsoleColor.Cyan,
+            Sql = ConsoleColor.Magenta,
+            Conn = ConsoleColor.Green,
+            Default = ConsoleColor.Gray
+        }
+
         public static void error(String message)
         {
-            Console.Write("[{0}]", DateTime.Now.ToString("dd/MMM HH:mm"));
-            Console.ForegroundColor = ConsoleColor.Red;
-            Console.Write("[ERROR] ");
-            Console.ForegroundColor = ConsoleColor.Gray ;
-            Console.WriteLine(message);
+            log(message, LogType.Error);
         }
 
         public static void debug(String message)
         {
-            Console.Write("[{0}]", DateTime.Now.ToString("dd/MMM HH:mm"));
-            Console.ForegroundColor = ConsoleColor.Yellow;
-            Console.Write("[DEBUG] ");
-            Console.ForegroundColor = ConsoleColor.Gray;
-            Console.WriteLine(message);
+            #if DEBUG
+                log(message, LogType.Debug);
+            #endif
         }
 
         public static void info(String message)
         {
-            Console.Write("[{0}]", DateTime.Now.ToString("dd/MMM HH:mm"));
-            Console.ForegroundColor = ConsoleColor.Cyan;
-            Console.Write("[INFO] ");
-            Console.ForegroundColor = ConsoleColor.Gray;
-            Console.WriteLine(message);
+            log(message, LogType.Info);
         }
 
         public static void database(String message)
         {
-            Console.Write("[{0}]", DateTime.Now.ToString("dd/MMM HH:mm"));
-            Console.ForegroundColor = ConsoleColor.Magenta;
-            Console.Write("[SQL] ");
-            Console.ForegroundColor = ConsoleColor.Gray;
-            Console.WriteLine(message);
+            log(message, LogType.Sql);
         }
 
         public static void conn(String message)
         {
-            Console.Write("[{0}]", DateTime.Now.ToString("dd/MMM HH:mm"));
-            Console.ForegroundColor = ConsoleColor.Green;
-            Console.Write("[CONN] ");
+            log(message, LogType.Conn);
+        }
+
+        public static void log(String message, LogType type)
+        {
+            var timestamp = String.Format("[{0}] ", DateTime.Now.ToString("dd/MMM HH:mm:ss"));
+            var typestr = String.Format("[{0}] ", type.ToString().ToUpper());
+
+            Console.Write(timestamp);
+            Console.ForegroundColor = (ConsoleColor)type;
+            Console.Write(typestr);
             Console.ForegroundColor = ConsoleColor.Gray;
             Console.WriteLine(message);
+
+            message = message.Insert(0, typestr);
+            message = message.Insert(0, timestamp);
+
+            Directory.CreateDirectory(ConfigConstants.OPTIONS_LOGPATH);
+
+            try
+            {
+                File.AppendAllText(ConfigConstants.OPTIONS_LOGPATH + ConfigConstants.OPTIONS_LOGFILE, message + Environment.NewLine);
+            }
+            catch (Exception e)
+            {
+                Console.ForegroundColor = ConsoleColor.Red;
+                Console.Write(e.Message);
+                Console.ForegroundColor = ConsoleColor.Gray;
+            }
         }
     }
 }
diff --git a/FFXIVClassic Lobby Server/common/Utils.cs b/FFXIVClassic Lobby Server/common/Utils.cs
index 40830386..a1f76626 100644
--- a/FFXIVClassic Lobby Server/common/Utils.cs	
+++ b/FFXIVClassic Lobby Server/common/Utils.cs	
@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Lobby_Server.common
 {
@@ -23,26 +20,64 @@ namespace FFXIVClassic_Lobby_Server.common
 
         public static string ByteArrayToHex(byte[] bytes)
         {
-            var lookup32 = _lookup32;
-            var result = new char[(bytes.Length * 3) + ((bytes.Length / 16) < 1 ? 1 : (bytes.Length / 16) * 3) + bytes.Length + 60];
-            int numNewLines = 0;
-            for (int i = 0; i < bytes.Length; i++)
-            {
-                var val = lookup32[bytes[i]];
-                result[(3 * i) + (17 * numNewLines) + 0] = (char)val;
-                result[(3 * i) + (17 * numNewLines) + 1] = (char)(val >> 16);
-                result[(3 * i) + (17 * numNewLines) + 2] = ' ';
-
-                result[(numNewLines * (3 * 16 + 17)) + (3 * 16) + (i % 16)] = (char)bytes[i] >= 32 && (char)bytes[i] <= 126 ? (char)bytes[i] : '.';
-
-                if (i != bytes.Length - 1 && bytes.Length > 16 && i != 0 && (i + 1) % 16 == 0)
-                {
-                    result[(numNewLines * (3 * 16 + 17)) + (3 * 16) + (16)] = '\n';
-                    numNewLines++;
-                }
-
-            }
-            return new string(result);
+            if (bytes == null) return "<null>";
+            int bytesLength = bytes.Length;
+            var bytesPerLine = 16;
+            char[] HexChars = "0123456789ABCDEF".ToCharArray();
+
+            int firstHexColumn =
+                  8                   // 8 characters for the address
+                + 3;                  // 3 spaces
+
+            int firstCharColumn = firstHexColumn
+                + bytesPerLine * 3       // - 2 digit for the hexadecimal value and 1 space
+                + (bytesPerLine - 1) / 8 // - 1 extra space every 8 characters from the 9th
+                + 2;                  // 2 spaces 
+
+            int lineLength = firstCharColumn
+                + bytesPerLine           // - characters to show the ascii value
+                + Environment.NewLine.Length; // Carriage return and line feed (should normally be 2)
+
+            char[] line = (new String(' ', lineLength - Environment.NewLine.Length) + Environment.NewLine).ToCharArray();
+            int expectedLines = (bytesLength + bytesPerLine - 1) / bytesPerLine;
+            StringBuilder result = new StringBuilder(expectedLines * lineLength);
+
+            for (int i = 0; i < bytesLength; i += bytesPerLine)
+            {
+                line[0] = HexChars[(i >> 28) & 0xF];
+                line[1] = HexChars[(i >> 24) & 0xF];
+                line[2] = HexChars[(i >> 20) & 0xF];
+                line[3] = HexChars[(i >> 16) & 0xF];
+                line[4] = HexChars[(i >> 12) & 0xF];
+                line[5] = HexChars[(i >> 8) & 0xF];
+                line[6] = HexChars[(i >> 4) & 0xF];
+                line[7] = HexChars[(i >> 0) & 0xF];
+
+                int hexColumn = firstHexColumn;
+                int charColumn = firstCharColumn;
+
+                for (int j = 0; j < bytesPerLine; j++)
+                {
+                    if (j > 0 && (j & 7) == 0) hexColumn++;
+                    if (i + j >= bytesLength)
+                    {
+                        line[hexColumn] = ' ';
+                        line[hexColumn + 1] = ' ';
+                        line[charColumn] = ' ';
+                    }
+                    else
+                    {
+                        byte b = bytes[i + j];
+                        line[hexColumn] = HexChars[(b >> 4) & 0xF];
+                        line[hexColumn + 1] = HexChars[b & 0xF];
+                        line[charColumn] = (b < 32 ? '.' : (char)b);
+                    }
+                    hexColumn += 3;
+                    charColumn++;
+                }
+                result.Append(line);
+            }
+            return Environment.NewLine + result.ToString();
         }
 
         public static UInt32 UnixTimeStampUTC()
diff --git a/FFXIVClassic Lobby Server/dataobjects/Account.cs b/FFXIVClassic Lobby Server/dataobjects/Account.cs
index 437b85ab..26415924 100644
--- a/FFXIVClassic Lobby Server/dataobjects/Account.cs	
+++ b/FFXIVClassic Lobby Server/dataobjects/Account.cs	
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Lobby_Server.dataobjects
 {
diff --git a/FFXIVClassic Lobby Server/dataobjects/Appearance.cs b/FFXIVClassic Lobby Server/dataobjects/Appearance.cs
index 6d4457aa..a0b68817 100644
--- a/FFXIVClassic Lobby Server/dataobjects/Appearance.cs	
+++ b/FFXIVClassic Lobby Server/dataobjects/Appearance.cs	
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Lobby_Server.dataobjects
+namespace FFXIVClassic_Lobby_Server.dataobjects
 {
     class Appearance
     {
diff --git a/FFXIVClassic Lobby Server/dataobjects/CharaInfo.cs b/FFXIVClassic Lobby Server/dataobjects/CharaInfo.cs
index 008e5f2b..3fe9c869 100644
--- a/FFXIVClassic Lobby Server/dataobjects/CharaInfo.cs	
+++ b/FFXIVClassic Lobby Server/dataobjects/CharaInfo.cs	
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using FFXIVClassic_Lobby_Server.common;
 using System.IO;
 
@@ -231,7 +227,7 @@ namespace FFXIVClassic_Lobby_Server.dataobjects
         {
             byte[] bytes = File.ReadAllBytes("./packets/charaappearance.bin");
 
-            Console.WriteLine(Utils.ByteArrayToHex(bytes));
+            Log.debug(Utils.ByteArrayToHex(bytes));
 
             return Convert.ToBase64String(bytes).Replace('+', '-').Replace('/', '_');
         }
diff --git a/FFXIVClassic Lobby Server/dataobjects/Character.cs b/FFXIVClassic Lobby Server/dataobjects/Character.cs
index b59c84a7..91a4f597 100644
--- a/FFXIVClassic Lobby Server/dataobjects/Character.cs	
+++ b/FFXIVClassic Lobby Server/dataobjects/Character.cs	
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using FFXIVClassic_Lobby_Server.common;
 using FFXIVClassic_Lobby_Server.dataobjects;
 
@@ -37,9 +33,9 @@ namespace FFXIVClassic_Lobby_Server
             charaInfo.Replace("/", "_");
             byte[] data = System.Convert.FromBase64String(charaInfo);
 
-            Console.WriteLine("------------Base64 printout------------------");
-            Console.WriteLine(Utils.ByteArrayToHex(data));
-            Console.WriteLine("------------Base64 printout------------------");
+            Log.debug("------------Base64 printout------------------");
+            Log.debug(Utils.ByteArrayToHex(data));
+            Log.debug("------------Base64 printout------------------");
 
             CharaInfo chara = new CharaInfo();
 
diff --git a/FFXIVClassic Lobby Server/dataobjects/Retainer.cs b/FFXIVClassic Lobby Server/dataobjects/Retainer.cs
index 9980d1b7..465747e4 100644
--- a/FFXIVClassic Lobby Server/dataobjects/Retainer.cs	
+++ b/FFXIVClassic Lobby Server/dataobjects/Retainer.cs	
@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using FFXIVClassic_Lobby_Server.common;
-
-namespace FFXIVClassic_Lobby_Server
+namespace FFXIVClassic_Lobby_Server
 {
     class Retainer
     {
diff --git a/FFXIVClassic Lobby Server/dataobjects/World.cs b/FFXIVClassic Lobby Server/dataobjects/World.cs
index 20569fcc..8cab7502 100644
--- a/FFXIVClassic Lobby Server/dataobjects/World.cs	
+++ b/FFXIVClassic Lobby Server/dataobjects/World.cs	
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Lobby_Server.dataobjects
+namespace FFXIVClassic_Lobby_Server.dataobjects
 {
     class World
     {
diff --git a/FFXIVClassic Lobby Server/packets/BasePacket.cs b/FFXIVClassic Lobby Server/packets/BasePacket.cs
index 485c60cf..e5ee3402 100644
--- a/FFXIVClassic Lobby Server/packets/BasePacket.cs	
+++ b/FFXIVClassic Lobby Server/packets/BasePacket.cs	
@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Runtime.InteropServices;
 using System.Diagnostics;
 using FFXIVClassic_Lobby_Server.common;
@@ -338,8 +335,8 @@ namespace FFXIVClassic_Lobby_Server.packets
         {
 #if DEBUG
             Console.BackgroundColor = ConsoleColor.DarkYellow;
-            Console.WriteLine("IsAuthed: {0}, IsEncrypted: {1}, Size: 0x{2:X}, Num Subpackets: {3}", header.isAuthenticated, header.isEncrypted, header.packetSize, header.numSubpackets);
-            Console.WriteLine("{0}", Utils.ByteArrayToHex(getHeaderBytes()));
+            Log.debug(String.Format("IsAuthed: {0}, IsEncrypted: {1}, Size: 0x{2:X}, Num Subpackets: {3}", header.isAuthenticated, header.isEncrypted, header.packetSize, header.numSubpackets));
+            Log.debug(String.Format("{0}", Utils.ByteArrayToHex(getHeaderBytes())));
             foreach (SubPacket sub in getSubpackets())
                 sub.debugPrintSubPacket();
             Console.BackgroundColor = ConsoleColor.Black;
diff --git a/FFXIVClassic Lobby Server/packets/HardCoded_Packets.cs b/FFXIVClassic Lobby Server/packets/HardCoded_Packets.cs
index 624fa9a3..2d80bd74 100644
--- a/FFXIVClassic Lobby Server/packets/HardCoded_Packets.cs	
+++ b/FFXIVClassic Lobby Server/packets/HardCoded_Packets.cs	
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Lobby_Server.packets
+namespace FFXIVClassic_Lobby_Server.packets
 {
     class HardCoded_Packets
     {
diff --git a/FFXIVClassic Lobby Server/packets/SubPacket.cs b/FFXIVClassic Lobby Server/packets/SubPacket.cs
index 4941d174..c55353b2 100644
--- a/FFXIVClassic Lobby Server/packets/SubPacket.cs	
+++ b/FFXIVClassic Lobby Server/packets/SubPacket.cs	
@@ -1,10 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Runtime.InteropServices;
-using FFXIVClassic_Lobby_Server;
 using FFXIVClassic_Lobby_Server.common;
 
 namespace FFXIVClassic_Lobby_Server.packets
@@ -146,14 +141,14 @@ namespace FFXIVClassic_Lobby_Server.packets
         {
 #if DEBUG
             Console.BackgroundColor = ConsoleColor.DarkRed;
-            Console.WriteLine("Size: 0x{0:X}", header.subpacketSize);
+            Log.debug(String.Format("Size: 0x{0:X}", header.subpacketSize));
             if (header.type == 0x03)
-                Console.WriteLine("Opcode: 0x{0:X}", gameMessage.opcode);
-            Console.WriteLine("{0}", Utils.ByteArrayToHex(getHeaderBytes()));
+                Log.debug(String.Format("Opcode: 0x{0:X}", gameMessage.opcode));
+            Log.debug(String.Format("{0}", Utils.ByteArrayToHex(getHeaderBytes())));
             if (header.type == 0x03)
-                Console.WriteLine("{0}", Utils.ByteArrayToHex(getGameMessageBytes()));
+                Log.debug(String.Format("{0}", Utils.ByteArrayToHex(getGameMessageBytes())));
             Console.BackgroundColor = ConsoleColor.DarkMagenta;
-            Console.WriteLine("{0}", Utils.ByteArrayToHex(data));
+            Log.debug(String.Format("{0}", Utils.ByteArrayToHex(data)));
             Console.BackgroundColor = ConsoleColor.Black;
 #endif
         }
diff --git a/FFXIVClassic Lobby Server/packets/receive/CharacterModifyPacket.cs b/FFXIVClassic Lobby Server/packets/receive/CharacterModifyPacket.cs
index cc4ebc7f..fc833926 100644
--- a/FFXIVClassic Lobby Server/packets/receive/CharacterModifyPacket.cs	
+++ b/FFXIVClassic Lobby Server/packets/receive/CharacterModifyPacket.cs	
@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Lobby_Server.packets.receive
 {
diff --git a/FFXIVClassic Lobby Server/packets/receive/SecurityHandshakePacket.cs b/FFXIVClassic Lobby Server/packets/receive/SecurityHandshakePacket.cs
index a5fb8b87..b6196ed6 100644
--- a/FFXIVClassic Lobby Server/packets/receive/SecurityHandshakePacket.cs	
+++ b/FFXIVClassic Lobby Server/packets/receive/SecurityHandshakePacket.cs	
@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Lobby_Server.packets.receive
 {
diff --git a/FFXIVClassic Lobby Server/packets/receive/SelectCharacterPacket.cs b/FFXIVClassic Lobby Server/packets/receive/SelectCharacterPacket.cs
index 4e93d593..e23cd88b 100644
--- a/FFXIVClassic Lobby Server/packets/receive/SelectCharacterPacket.cs	
+++ b/FFXIVClassic Lobby Server/packets/receive/SelectCharacterPacket.cs	
@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Lobby_Server.packets.receive
 {
diff --git a/FFXIVClassic Lobby Server/packets/receive/SessionPacket.cs b/FFXIVClassic Lobby Server/packets/receive/SessionPacket.cs
index 53555a8a..4499ca5f 100644
--- a/FFXIVClassic Lobby Server/packets/receive/SessionPacket.cs	
+++ b/FFXIVClassic Lobby Server/packets/receive/SessionPacket.cs	
@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Lobby_Server.packets.receive
 {
diff --git a/FFXIVClassic Lobby Server/packets/send/AccountListPacket.cs b/FFXIVClassic Lobby Server/packets/send/AccountListPacket.cs
index 743ace70..ab68dc7e 100644
--- a/FFXIVClassic Lobby Server/packets/send/AccountListPacket.cs	
+++ b/FFXIVClassic Lobby Server/packets/send/AccountListPacket.cs	
@@ -2,9 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Lobby_Server.packets
 {
diff --git a/FFXIVClassic Lobby Server/packets/send/CharaCreatorPacket.cs b/FFXIVClassic Lobby Server/packets/send/CharaCreatorPacket.cs
index d78f1eaf..b3f1385e 100644
--- a/FFXIVClassic Lobby Server/packets/send/CharaCreatorPacket.cs	
+++ b/FFXIVClassic Lobby Server/packets/send/CharaCreatorPacket.cs	
@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Lobby_Server.packets
 {
diff --git a/FFXIVClassic Lobby Server/packets/send/CharacterListPacket.cs b/FFXIVClassic Lobby Server/packets/send/CharacterListPacket.cs
index 5d0927a2..c8e77f39 100644
--- a/FFXIVClassic Lobby Server/packets/send/CharacterListPacket.cs	
+++ b/FFXIVClassic Lobby Server/packets/send/CharacterListPacket.cs	
@@ -1,11 +1,8 @@
 using FFXIVClassic_Lobby_Server.dataobjects;
-using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Lobby_Server.packets
 {
diff --git a/FFXIVClassic Lobby Server/packets/send/ErrorPacket.cs b/FFXIVClassic Lobby Server/packets/send/ErrorPacket.cs
index 2b9b2e53..25c24049 100644
--- a/FFXIVClassic Lobby Server/packets/send/ErrorPacket.cs	
+++ b/FFXIVClassic Lobby Server/packets/send/ErrorPacket.cs	
@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Lobby_Server.packets
 {
diff --git a/FFXIVClassic Lobby Server/packets/send/ImportListPacket.cs b/FFXIVClassic Lobby Server/packets/send/ImportListPacket.cs
index c8afd789..af029d75 100644
--- a/FFXIVClassic Lobby Server/packets/send/ImportListPacket.cs	
+++ b/FFXIVClassic Lobby Server/packets/send/ImportListPacket.cs	
@@ -1,10 +1,7 @@
-using FFXIVClassic_Lobby_Server.dataobjects;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Lobby_Server.packets
 {
diff --git a/FFXIVClassic Lobby Server/packets/send/RetainerListPacket.cs b/FFXIVClassic Lobby Server/packets/send/RetainerListPacket.cs
index b00d2b2a..f296c072 100644
--- a/FFXIVClassic Lobby Server/packets/send/RetainerListPacket.cs	
+++ b/FFXIVClassic Lobby Server/packets/send/RetainerListPacket.cs	
@@ -1,10 +1,7 @@
-using FFXIVClassic_Lobby_Server.dataobjects;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Lobby_Server.packets
 {
diff --git a/FFXIVClassic Lobby Server/packets/send/SelectCharacterConfirmPacket.cs b/FFXIVClassic Lobby Server/packets/send/SelectCharacterConfirmPacket.cs
index 5d00437f..cc660d2f 100644
--- a/FFXIVClassic Lobby Server/packets/send/SelectCharacterConfirmPacket.cs	
+++ b/FFXIVClassic Lobby Server/packets/send/SelectCharacterConfirmPacket.cs	
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Lobby_Server.packets
 {
diff --git a/FFXIVClassic Lobby Server/packets/send/WorldListPacket.cs b/FFXIVClassic Lobby Server/packets/send/WorldListPacket.cs
index e2912825..c352fa12 100644
--- a/FFXIVClassic Lobby Server/packets/send/WorldListPacket.cs	
+++ b/FFXIVClassic Lobby Server/packets/send/WorldListPacket.cs	
@@ -2,9 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Lobby_Server.packets
 {
diff --git a/FFXIVClassic Lobby Server/utils/CharacterCreatorUtils.cs b/FFXIVClassic Lobby Server/utils/CharacterCreatorUtils.cs
index e1c5f03e..d062bbbf 100644
--- a/FFXIVClassic Lobby Server/utils/CharacterCreatorUtils.cs	
+++ b/FFXIVClassic Lobby Server/utils/CharacterCreatorUtils.cs	
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace FFXIVClassic_Lobby_Server.utils
 {
diff --git a/FFXIVClassic Map Server/ClientConnection.cs b/FFXIVClassic Map Server/ClientConnection.cs
index ae14c995..77c170f4 100644
--- a/FFXIVClassic Map Server/ClientConnection.cs	
+++ b/FFXIVClassic Map Server/ClientConnection.cs	
@@ -1,18 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Net.Sockets;
-using FFXIVClassic_Lobby_Server.packets;
-using System.Diagnostics;
-using FFXIVClassic_Lobby_Server.common;
+using FFXIVClassic_Map_Server.packets;
+using FFXIVClassic_Map_Server.common;
 using System.Collections.Concurrent;
-using System.IO;
-using Cyotek.Collections.Generic;
 using System.Net;
 
-namespace FFXIVClassic_Lobby_Server
+namespace FFXIVClassic_Map_Server
 {
     class ClientConnection
     {
diff --git a/FFXIVClassic Map Server/CommandProcessor.cs b/FFXIVClassic Map Server/CommandProcessor.cs
index 0a1606be..0a73d3c7 100644
--- a/FFXIVClassic Map Server/CommandProcessor.cs	
+++ b/FFXIVClassic Map Server/CommandProcessor.cs	
@@ -1,25 +1,16 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Net;
-using System.Net.Sockets;
-using System.Threading.Tasks;
-using System.Threading;
-using FFXIVClassic_Lobby_Server.common;
+using FFXIVClassic_Map_Server.common;
 using FFXIVClassic_Map_Server.dataobjects;
-using FFXIVClassic_Lobby_Server.packets;
-using System.IO;
+using FFXIVClassic_Map_Server.packets;
 using FFXIVClassic_Map_Server.packets.send.actor;
-using FFXIVClassic_Map_Server;
 using FFXIVClassic_Map_Server.packets.send;
-using FFXIVClassic_Map_Server.dataobjects.chara;
 using FFXIVClassic_Map_Server.Actors;
-using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.actors.chara.player;
 using FFXIVClassic_Map_Server.Properties;
 
-namespace FFXIVClassic_Lobby_Server
+namespace FFXIVClassic_Map_Server
 {
     class CommandProcessor
     {
diff --git a/FFXIVClassic Map Server/ConfigConstants.cs b/FFXIVClassic Map Server/ConfigConstants.cs
index 13174ca4..39583def 100644
--- a/FFXIVClassic Map Server/ConfigConstants.cs	
+++ b/FFXIVClassic Map Server/ConfigConstants.cs	
@@ -1,18 +1,16 @@
-using FFXIVClassic_Lobby_Server.common;
-using STA.Settings;
+using STA.Settings;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace FFXIVClassic_Lobby_Server
+namespace FFXIVClassic_Map_Server
 {
     class ConfigConstants
     {
         public static String OPTIONS_BINDIP;
+        public static String OPTIONS_PORT;
         public static bool   OPTIONS_TIMESTAMP = false;
+        public static String OPTIONS_LOGPATH;
+        public static String OPTIONS_LOGFILE;
 
         public static uint   DATABASE_WORLDID;
         public static String DATABASE_HOST;
@@ -23,20 +21,23 @@ namespace FFXIVClassic_Lobby_Server
 
         public static bool load()
         {
-            Console.Write("Loading config.ini file... ");
+            Console.Write("Loading map_config.ini file... ");
 
-            if (!File.Exists("./config.ini"))
+            if (!File.Exists("./map_config.ini"))
             {
                 Console.ForegroundColor = ConsoleColor.Red;
-                Console.WriteLine("[FILE NOT FOUND]");
+                Console.WriteLine(String.Format("[FILE NOT FOUND]"));
                 Console.ForegroundColor = ConsoleColor.Gray;
                 return false;
             }
 
-            INIFile configIni = new INIFile("./config.ini");
+            INIFile configIni = new INIFile("./map_config.ini");
 
             ConfigConstants.OPTIONS_BINDIP =        configIni.GetValue("General", "server_ip", "127.0.0.1");
+            ConfigConstants.OPTIONS_PORT =          configIni.GetValue("General", "server_port", "54992");
             ConfigConstants.OPTIONS_TIMESTAMP =     configIni.GetValue("General", "showtimestamp", "true").ToLower().Equals("true");
+            ConfigConstants.OPTIONS_LOGPATH =       configIni.GetValue("General", "log_path", "./logs/");
+            ConfigConstants.OPTIONS_LOGFILE =       configIni.GetValue("General", "log_file_name", String.Format("map_{0}_{1}.log", OPTIONS_BINDIP, OPTIONS_PORT));
 
             ConfigConstants.DATABASE_WORLDID =      configIni.GetValue("Database", "worldid", (uint)0);
             ConfigConstants.DATABASE_HOST =         configIni.GetValue("Database", "host", "");
@@ -46,7 +47,7 @@ namespace FFXIVClassic_Lobby_Server
             ConfigConstants.DATABASE_PASSWORD =     configIni.GetValue("Database", "password", "");
 
             Console.ForegroundColor = ConsoleColor.Green;
-            Console.WriteLine("[OK]");
+            Console.WriteLine(String.Format("[OK]"));
             Console.ForegroundColor = ConsoleColor.Gray;
 
             return true;
diff --git a/FFXIVClassic Map Server/Database.cs b/FFXIVClassic Map Server/Database.cs
index e9ecd342..c38aa839 100644
--- a/FFXIVClassic Map Server/Database.cs	
+++ b/FFXIVClassic Map Server/Database.cs	
@@ -1,24 +1,17 @@
 using MySql.Data.MySqlClient;
 using Dapper;
-using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using FFXIVClassic_Lobby_Server.common;
+using FFXIVClassic_Map_Server.common;
 using FFXIVClassic_Map_Server.utils;
-using FFXIVClassic_Lobby_Server.packets;
+using FFXIVClassic_Map_Server.packets;
 using FFXIVClassic_Map_Server.packets.send.player;
-using FFXIVClassic_Lobby_Server.dataobjects;
-using FFXIVClassic_Map_Server;
-using FFXIVClassic_Map_Server.common.EfficientHashTables;
-using FFXIVClassic_Map_Server.Actors;
 using FFXIVClassic_Map_Server.dataobjects;
-using FFXIVClassic_Map_Server.packets.send.Actor.inventory;
+using FFXIVClassic_Map_Server.Actors;
 using FFXIVClassic_Map_Server.actors.chara.player;
 
-namespace FFXIVClassic_Lobby_Server
+namespace FFXIVClassic_Map_Server
 {
 
     class Database
@@ -43,7 +36,9 @@ namespace FFXIVClassic_Lobby_Server
                     }
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+                }
                 finally
                 {
                     conn.Dispose();
@@ -63,7 +58,8 @@ namespace FFXIVClassic_Lobby_Server
                     world = conn.Query<DBWorld>("SELECT * FROM servers WHERE id=@ServerId", new {ServerId = serverId}).SingleOrDefault();                  
                 }
                 catch (MySqlException e)
-                {                    
+                {
+                    Log.error(e.ToString());
                 }
                 finally
                 {
@@ -86,6 +82,7 @@ namespace FFXIVClassic_Lobby_Server
                 }
                 catch (MySqlException e)
                 {
+                    Log.error(e.ToString());
                 }
                 finally
                 {
@@ -140,7 +137,9 @@ namespace FFXIVClassic_Lobby_Server
                     }
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+                }
                 finally
                 {
                     conn.Dispose();
@@ -196,7 +195,9 @@ namespace FFXIVClassic_Lobby_Server
                     cmd.ExecuteNonQuery();
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+                }
                 finally
                 {
                     conn.Dispose();
@@ -230,7 +231,9 @@ namespace FFXIVClassic_Lobby_Server
                     cmd.ExecuteNonQuery();
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+                }
                 finally
                 {
                     conn.Dispose();
@@ -270,7 +273,9 @@ namespace FFXIVClassic_Lobby_Server
                     cmd.ExecuteNonQuery();
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+                }
                 finally
                 {
                     conn.Dispose();
@@ -302,7 +307,9 @@ namespace FFXIVClassic_Lobby_Server
                     cmd.ExecuteNonQuery();
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+                }
                 finally
                 {
                     conn.Dispose();
@@ -352,7 +359,9 @@ namespace FFXIVClassic_Lobby_Server
                     cmd.ExecuteNonQuery();
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+                }
                 finally
                 {
                     conn.Dispose();
@@ -780,7 +789,9 @@ namespace FFXIVClassic_Lobby_Server
                     player.getEquipment().SetEquipment(getEquipment(player, player.charaWork.parameterSave.state_mainSkill[0]));
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+                }
                 finally
                 {
                     conn.Dispose();
@@ -822,7 +833,9 @@ namespace FFXIVClassic_Lobby_Server
                     }
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+                }
                 finally
                 {
                     conn.Dispose();
@@ -858,7 +871,9 @@ namespace FFXIVClassic_Lobby_Server
                     cmd.ExecuteNonQuery();
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+                }
                 finally
                 {
                     conn.Dispose();
@@ -889,7 +904,9 @@ namespace FFXIVClassic_Lobby_Server
                     cmd.ExecuteNonQuery();
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+                }
                 finally
                 {
                     conn.Dispose();
@@ -958,7 +975,9 @@ namespace FFXIVClassic_Lobby_Server
                     }
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+                }
                 finally
                 {
                     conn.Dispose();
@@ -1012,7 +1031,9 @@ namespace FFXIVClassic_Lobby_Server
                     insertedItem = new InventoryItem((uint)cmd.LastInsertedId, itemId, quantity, (ushort)player.getInventory(type).getNextEmptySlot(), itemType, quality, durability, 0, 0, 0, 0, 0, 0);
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+                }
                 finally
                 {
                     conn.Dispose();
@@ -1045,7 +1066,9 @@ namespace FFXIVClassic_Lobby_Server
 
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+                }
                 finally
                 {
                     conn.Dispose();
@@ -1083,7 +1106,9 @@ namespace FFXIVClassic_Lobby_Server
 
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+                }
                 finally
                 {
                     conn.Dispose();
@@ -1122,7 +1147,9 @@ namespace FFXIVClassic_Lobby_Server
 
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+                }
                 finally
                 {
                     conn.Dispose();
@@ -1160,7 +1187,9 @@ namespace FFXIVClassic_Lobby_Server
                     }
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+                }
                 finally
                 {
                     conn.Dispose();
@@ -1204,7 +1233,9 @@ namespace FFXIVClassic_Lobby_Server
                     }
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+                }
                 finally
                 {
                     conn.Dispose();
diff --git a/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj b/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj
index d409ff82..fb1f492e 100644
--- a/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj	
+++ b/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj	
@@ -280,8 +280,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>robocopy "$(SolutionDir)data" "$(SolutionDir)$(ProjectName)\$(OutDir)." /XO  2&gt;nul 1&gt;nul
-EXIT 0</PostBuildEvent>
+    <PostBuildEvent>copy "$(SolutionDir)data\map_config.ini" "$(SolutionDir)$(ProjectName)\$(OutDir)"</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/FFXIVClassic Map Server/PacketProcessor.cs b/FFXIVClassic Map Server/PacketProcessor.cs
index 2e210934..028cedfb 100644
--- a/FFXIVClassic Map Server/PacketProcessor.cs	
+++ b/FFXIVClassic Map Server/PacketProcessor.cs	
@@ -1,40 +1,25 @@
-using FFXIVClassic_Lobby_Server.common;
-using FFXIVClassic_Lobby_Server.packets;
-using MySql.Data.MySqlClient;
+using FFXIVClassic_Map_Server.common;
+using FFXIVClassic_Map_Server.packets;
 using System;
 using System.Collections.Generic;
-using System.Threading;
-using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using FFXIVClassic_Map_Server.dataobjects;
-using FFXIVClassic_Map_Server.packets;
 using FFXIVClassic_Map_Server.packets.receive;
 using FFXIVClassic_Map_Server.packets.send;
 using FFXIVClassic_Map_Server.packets.send.login;
-using FFXIVClassic_Map_Server.packets.send.Actor.inventory;
-using FFXIVClassic_Map_Server.packets.send.Actor;
 using FFXIVClassic_Map_Server.packets.send.actor;
-using FFXIVClassic_Map_Server;
-using FFXIVClassic_Map_Server.packets.send.player;
-using FFXIVClassic_Map_Server.dataobjects.chara;
 using FFXIVClassic_Map_Server.packets.send.supportdesk;
 using FFXIVClassic_Map_Server.packets.receive.social;
 using FFXIVClassic_Map_Server.packets.send.social;
 using FFXIVClassic_Map_Server.packets.receive.supportdesk;
 using FFXIVClassic_Map_Server.packets.receive.recruitment;
 using FFXIVClassic_Map_Server.packets.send.recruitment;
-using FFXIVClassic_Map_Server.packets.send.list;
 using FFXIVClassic_Map_Server.packets.receive.events;
-using FFXIVClassic_Map_Server.packets.send.events;
 using FFXIVClassic_Map_Server.lua;
-using System.Net;
-using FFXIVClassic_Map_Server.common.EfficientHashTables;
 using FFXIVClassic_Map_Server.Actors;
 
-namespace FFXIVClassic_Lobby_Server
+namespace FFXIVClassic_Map_Server
 {
     class PacketProcessor
     {
diff --git a/FFXIVClassic Map Server/Program.cs b/FFXIVClassic Map Server/Program.cs
index 4790bc0f..48e9669b 100644
--- a/FFXIVClassic Map Server/Program.cs	
+++ b/FFXIVClassic Map Server/Program.cs	
@@ -1,17 +1,11 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
+using System;
 using System.Diagnostics;
-using System.Threading;
-using FFXIVClassic_Lobby_Server.common;
-using System.Runtime.InteropServices;
 using MySql.Data.MySqlClient;
 using System.Reflection;
-using System.IO;
-using FFXIVClassic_Lobby_Server.dataobjects;
-using System.Collections.Generic;
-using System.Text;
+using FFXIVClassic_Map_Server.dataobjects;
+using FFXIVClassic_Map_Server.common;
 
-namespace FFXIVClassic_Lobby_Server
+namespace FFXIVClassic_Map_Server
 {
     class Program
     {
@@ -23,36 +17,30 @@ namespace FFXIVClassic_Lobby_Server
 #endif
             bool startServer = true;
 
-            Console.ForegroundColor = ConsoleColor.Cyan;
-            Console.WriteLine("---------FFXIV 1.0 Map Server---------");            
-            Console.ForegroundColor = ConsoleColor.Gray;
-
-
-            Assembly assem = Assembly.GetExecutingAssembly();
-            Version vers = assem.GetName().Version;
-            Console.WriteLine("Version: " + vers.ToString());
-
             //Load Config
             if (!ConfigConstants.load())
                 startServer = false;
 
+            Log.info("---------FFXIV 1.0 Map Server---------");            
+
+            Assembly assem = Assembly.GetExecutingAssembly();
+            Version vers = assem.GetName().Version;
+            Log.info("Version: " + vers.ToString());
+
             //Test DB Connection
-            Console.Write("Testing DB connection... ");
+            Log.info("Testing DB connection... ");
             using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD)))
             {
                 try
                 {
                     conn.Open();
                     conn.Close();
-                    Console.ForegroundColor = ConsoleColor.Green;
-                    Console.WriteLine("[OK]");
-                    Console.ForegroundColor = ConsoleColor.Gray;
+
+                    Log.conn("[OK]");
                 }
                 catch (MySqlException e)
                 {
-                    Console.ForegroundColor = ConsoleColor.Red;
-                    Console.WriteLine("[FAILED]");
-                    Console.ForegroundColor = ConsoleColor.Gray;
+                    Log.error(e.ToString());
                     startServer = false; 
                 }
             }
@@ -60,9 +48,9 @@ namespace FFXIVClassic_Lobby_Server
             //Check World ID
             DBWorld thisWorld = Database.getServer(ConfigConstants.DATABASE_WORLDID);
             if (thisWorld != null)
-                Console.WriteLine("Successfully pulled world info from DB. Server name is {0}.", thisWorld.name);
+                Log.info(String.Format("Successfully pulled world info from DB. Server name is {0}.", thisWorld.name));
             else
-                Console.WriteLine("World info could not be retrieved from the DB. Welcome and MOTD will not be displayed.");
+                Log.info("World info could not be retrieved from the DB. Welcome and MOTD will not be displayed.");
 
             //Start server if A-OK
             if (startServer)
@@ -78,7 +66,7 @@ namespace FFXIVClassic_Lobby_Server
                 }
             }
 
-            Console.WriteLine("Press any key to continue...");
+            Log.info("Press any key to continue...");
             Console.ReadKey();
         }
 
diff --git a/FFXIVClassic Map Server/Properties/AssemblyInfo.cs b/FFXIVClassic Map Server/Properties/AssemblyInfo.cs
index 8a40d90d..e6832007 100644
--- a/FFXIVClassic Map Server/Properties/AssemblyInfo.cs	
+++ b/FFXIVClassic Map Server/Properties/AssemblyInfo.cs	
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
diff --git a/FFXIVClassic Map Server/Server.cs b/FFXIVClassic Map Server/Server.cs
index f0057765..a7e7075a 100644
--- a/FFXIVClassic Map Server/Server.cs	
+++ b/FFXIVClassic Map Server/Server.cs	
@@ -1,24 +1,15 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Net;
 using System.Net.Sockets;
-using System.Threading.Tasks;
 using System.Threading;
-using FFXIVClassic_Lobby_Server.common;
 using FFXIVClassic_Map_Server.dataobjects;
-using FFXIVClassic_Lobby_Server.packets;
-using System.IO;
-using FFXIVClassic_Map_Server.packets.send.actor;
-using FFXIVClassic_Map_Server;
-using FFXIVClassic_Map_Server.packets.send;
-using FFXIVClassic_Map_Server.dataobjects.chara;
+using FFXIVClassic_Map_Server.packets;
+using FFXIVClassic_Map_Server.common;
 using FFXIVClassic_Map_Server.Actors;
 using FFXIVClassic_Map_Server.lua;
-using FFXIVClassic_Map_Server.actors.chara.player;
 
-namespace FFXIVClassic_Lobby_Server
+namespace FFXIVClassic_Map_Server
 {
     class Server
     {
@@ -93,7 +84,7 @@ namespace FFXIVClassic_Lobby_Server
             mWorldManager.LoadZoneEntranceList();
             mWorldManager.LoadNPCs();
 
-            IPEndPoint serverEndPoint = new System.Net.IPEndPoint(IPAddress.Parse(ConfigConstants.OPTIONS_BINDIP), FFXIV_MAP_PORT);
+            IPEndPoint serverEndPoint = new System.Net.IPEndPoint(IPAddress.Parse(ConfigConstants.OPTIONS_BINDIP), int.Parse(ConfigConstants.OPTIONS_PORT));
 
             try
             {
@@ -121,9 +112,8 @@ namespace FFXIVClassic_Lobby_Server
                 throw new ApplicationException("Error occured starting listeners, check inner exception", e);
             }
 
-            Console.Write("Game server has started @ ");
             Console.ForegroundColor = ConsoleColor.White;
-            Console.WriteLine("{0}:{1}", (mServerSocket.LocalEndPoint as IPEndPoint).Address, (mServerSocket.LocalEndPoint as IPEndPoint).Port);
+            Log.debug(String.Format("Map Server has started @ {0}:{1}", (mServerSocket.LocalEndPoint as IPEndPoint).Address, (mServerSocket.LocalEndPoint as IPEndPoint).Port));
             Console.ForegroundColor = ConsoleColor.Gray;
 
             mProcessor = new PacketProcessor(this, mConnectedPlayerList, mConnectionList);
diff --git a/FFXIVClassic Map Server/WorldManager.cs b/FFXIVClassic Map Server/WorldManager.cs
index 7484ac22..a1108c37 100644
--- a/FFXIVClassic Map Server/WorldManager.cs	
+++ b/FFXIVClassic Map Server/WorldManager.cs	
@@ -1,20 +1,12 @@
-using FFXIVClassic_Lobby_Server;
-using FFXIVClassic_Lobby_Server.common;
+using FFXIVClassic_Map_Server.common;
 using FFXIVClassic_Map_Server.actors.area;
 using FFXIVClassic_Map_Server.Actors;
-using FFXIVClassic_Map_Server.common.EfficientHashTables;
-using FFXIVClassic_Map_Server.dataobjects;
-using FFXIVClassic_Map_Server.dataobjects.chara;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send;
 using FFXIVClassic_Map_Server.packets.send.actor;
-using FFXIVClassic_Map_Server.packets.send.login;
 using MySql.Data.MySqlClient;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server
 {
@@ -74,7 +66,10 @@ namespace FFXIVClassic_Map_Server
                     }
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+
+                }
                 finally
                 {
                     conn.Dispose();
@@ -121,7 +116,9 @@ namespace FFXIVClassic_Map_Server
                     }
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+                }
                 finally
                 {
                     conn.Dispose();
@@ -172,7 +169,9 @@ namespace FFXIVClassic_Map_Server
                     }
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+                }
                 finally
                 {
                     conn.Dispose();
@@ -242,7 +241,9 @@ namespace FFXIVClassic_Map_Server
                    
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+                }
                 finally
                 {
                     conn.Dispose();
@@ -313,7 +314,9 @@ namespace FFXIVClassic_Map_Server
 
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+                }
                 finally
                 {
                     conn.Dispose();
diff --git a/FFXIVClassic Map Server/actors/Actor.cs b/FFXIVClassic Map Server/actors/Actor.cs
index eab0e1fa..18901a16 100644
--- a/FFXIVClassic Map Server/actors/Actor.cs	
+++ b/FFXIVClassic Map Server/actors/Actor.cs	
@@ -1,19 +1,10 @@
-using FFXIVClassic_Lobby_Server;
-using FFXIVClassic_Lobby_Server.common;
-using FFXIVClassic_Lobby_Server.packets;
+using FFXIVClassic_Map_Server.packets;
 using FFXIVClassic_Map_Server.actors;
-using FFXIVClassic_Map_Server.actors.area;
-using FFXIVClassic_Map_Server.dataobjects.chara;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send.actor;
 using FFXIVClassic_Map_Server.packets.send.actor.events;
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
 
 namespace FFXIVClassic_Map_Server.Actors
 {
diff --git a/FFXIVClassic Map Server/actors/EventList.cs b/FFXIVClassic Map Server/actors/EventList.cs
index 7b7630c1..1e59f85c 100644
--- a/FFXIVClassic Map Server/actors/EventList.cs	
+++ b/FFXIVClassic Map Server/actors/EventList.cs	
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace FFXIVClassic_Map_Server.actors
 {
diff --git a/FFXIVClassic Map Server/actors/StaticActors.cs b/FFXIVClassic Map Server/actors/StaticActors.cs
index 204e91da..3f037b47 100644
--- a/FFXIVClassic Map Server/actors/StaticActors.cs	
+++ b/FFXIVClassic Map Server/actors/StaticActors.cs	
@@ -1,11 +1,9 @@
-using FFXIVClassic_Lobby_Server.common;
-using FFXIVClassic_Map_Server.dataobjects;
+using FFXIVClassic_Map_Server.common;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.Actors
 {
diff --git a/FFXIVClassic Map Server/actors/area/Area.cs b/FFXIVClassic Map Server/actors/area/Area.cs
index f43ff170..def0b87d 100644
--- a/FFXIVClassic Map Server/actors/area/Area.cs	
+++ b/FFXIVClassic Map Server/actors/area/Area.cs	
@@ -1,15 +1,9 @@
-using FFXIVClassic_Lobby_Server.common;
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.dataobjects;
-using FFXIVClassic_Map_Server.dataobjects.chara;
+using FFXIVClassic_Map_Server.packets;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send.actor;
 using MoonSharp.Interpreter;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.Actors
 {
diff --git a/FFXIVClassic Map Server/actors/area/PrivateArea.cs b/FFXIVClassic Map Server/actors/area/PrivateArea.cs
index 3c6f6726..1858076e 100644
--- a/FFXIVClassic Map Server/actors/area/PrivateArea.cs	
+++ b/FFXIVClassic Map Server/actors/area/PrivateArea.cs	
@@ -1,12 +1,8 @@
-using FFXIVClassic_Lobby_Server.packets;
+using FFXIVClassic_Map_Server.packets;
 using FFXIVClassic_Map_Server.Actors;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send.actor;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.actors.area
 {
diff --git a/FFXIVClassic Map Server/actors/area/Zone.cs b/FFXIVClassic Map Server/actors/area/Zone.cs
index 90e716d2..78bb4d25 100644
--- a/FFXIVClassic Map Server/actors/area/Zone.cs	
+++ b/FFXIVClassic Map Server/actors/area/Zone.cs	
@@ -1,12 +1,8 @@
-using FFXIVClassic_Lobby_Server.packets;
+using FFXIVClassic_Map_Server.packets;
 using FFXIVClassic_Map_Server.Actors;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send.actor;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.actors.area
 {
diff --git a/FFXIVClassic Map Server/actors/chara/AetheryteWork.cs b/FFXIVClassic Map Server/actors/chara/AetheryteWork.cs
index c58166f0..f301ca3c 100644
--- a/FFXIVClassic Map Server/actors/chara/AetheryteWork.cs	
+++ b/FFXIVClassic Map Server/actors/chara/AetheryteWork.cs	
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.Actors.Chara
+namespace FFXIVClassic_Map_Server.Actors.Chara
 {
     class AetheryteWork
     {
diff --git a/FFXIVClassic Map Server/actors/chara/BattleSave.cs b/FFXIVClassic Map Server/actors/chara/BattleSave.cs
index 60d16106..bf9a6000 100644
--- a/FFXIVClassic Map Server/actors/chara/BattleSave.cs	
+++ b/FFXIVClassic Map Server/actors/chara/BattleSave.cs	
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.Actors.Chara
+namespace FFXIVClassic_Map_Server.Actors.Chara
 {
     class BattleSave
     {
diff --git a/FFXIVClassic Map Server/actors/chara/BattleTemp.cs b/FFXIVClassic Map Server/actors/chara/BattleTemp.cs
index ab20425c..0d1c861f 100644
--- a/FFXIVClassic Map Server/actors/chara/BattleTemp.cs	
+++ b/FFXIVClassic Map Server/actors/chara/BattleTemp.cs	
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.Actors.Chara
+namespace FFXIVClassic_Map_Server.Actors.Chara
 {
     class BattleTemp
     {
diff --git a/FFXIVClassic Map Server/actors/chara/CharaWork.cs b/FFXIVClassic Map Server/actors/chara/CharaWork.cs
index 8a35de68..652178d6 100644
--- a/FFXIVClassic Map Server/actors/chara/CharaWork.cs	
+++ b/FFXIVClassic Map Server/actors/chara/CharaWork.cs	
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.Actors.Chara
+namespace FFXIVClassic_Map_Server.Actors.Chara
 {
     class CharaWork
     {
diff --git a/FFXIVClassic Map Server/actors/chara/Character.cs b/FFXIVClassic Map Server/actors/chara/Character.cs
index c453e82f..5766b9b5 100644
--- a/FFXIVClassic Map Server/actors/chara/Character.cs	
+++ b/FFXIVClassic Map Server/actors/chara/Character.cs	
@@ -1,11 +1,6 @@
-using FFXIVClassic_Lobby_Server.packets;
+using FFXIVClassic_Map_Server.packets;
 using FFXIVClassic_Map_Server.Actors.Chara;
 using FFXIVClassic_Map_Server.packets.send.actor;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.Actors
 {
diff --git a/FFXIVClassic Map Server/actors/chara/EventSave.cs b/FFXIVClassic Map Server/actors/chara/EventSave.cs
index 21eebcf7..f6f9424d 100644
--- a/FFXIVClassic Map Server/actors/chara/EventSave.cs	
+++ b/FFXIVClassic Map Server/actors/chara/EventSave.cs	
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.Actors.Chara
+namespace FFXIVClassic_Map_Server.Actors.Chara
 {
     class EventSave
     {
diff --git a/FFXIVClassic Map Server/actors/chara/EventTemp.cs b/FFXIVClassic Map Server/actors/chara/EventTemp.cs
index 4756ffee..70701df2 100644
--- a/FFXIVClassic Map Server/actors/chara/EventTemp.cs	
+++ b/FFXIVClassic Map Server/actors/chara/EventTemp.cs	
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.Actors.Chara
+namespace FFXIVClassic_Map_Server.Actors.Chara
 {
     class EventTemp
     {
diff --git a/FFXIVClassic Map Server/actors/chara/ParameterSave.cs b/FFXIVClassic Map Server/actors/chara/ParameterSave.cs
index 499dfcbb..4dd9f52c 100644
--- a/FFXIVClassic Map Server/actors/chara/ParameterSave.cs	
+++ b/FFXIVClassic Map Server/actors/chara/ParameterSave.cs	
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.Actors.Chara
+namespace FFXIVClassic_Map_Server.Actors.Chara
 {
     class ParameterSave
     {
diff --git a/FFXIVClassic Map Server/actors/chara/ParameterTemp.cs b/FFXIVClassic Map Server/actors/chara/ParameterTemp.cs
index 9a1b12d7..399e7e84 100644
--- a/FFXIVClassic Map Server/actors/chara/ParameterTemp.cs	
+++ b/FFXIVClassic Map Server/actors/chara/ParameterTemp.cs	
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.Actors.Chara
+namespace FFXIVClassic_Map_Server.Actors.Chara
 {
     class ParameterTemp
     {
diff --git a/FFXIVClassic Map Server/actors/chara/Work.cs b/FFXIVClassic Map Server/actors/chara/Work.cs
index 4b62a316..8845bb07 100644
--- a/FFXIVClassic Map Server/actors/chara/Work.cs	
+++ b/FFXIVClassic Map Server/actors/chara/Work.cs	
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.Actors.Chara
+namespace FFXIVClassic_Map_Server.Actors.Chara
 {
     class Work
     {
diff --git a/FFXIVClassic Map Server/actors/chara/npc/Npc.cs b/FFXIVClassic Map Server/actors/chara/npc/Npc.cs
index 4ea2ed8a..b831a7de 100644
--- a/FFXIVClassic Map Server/actors/chara/npc/Npc.cs	
+++ b/FFXIVClassic Map Server/actors/chara/npc/Npc.cs	
@@ -1,9 +1,7 @@
-using FFXIVClassic_Lobby_Server;
-using FFXIVClassic_Lobby_Server.common;
-using FFXIVClassic_Lobby_Server.packets;
+using FFXIVClassic_Map_Server.common;
+using FFXIVClassic_Map_Server.packets;
 using FFXIVClassic_Map_Server.actors;
 using FFXIVClassic_Map_Server.Actors.Chara;
-using FFXIVClassic_Map_Server.dataobjects;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send.actor;
 using FFXIVClassic_Map_Server.utils;
@@ -11,9 +9,6 @@ using MySql.Data.MySqlClient;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.Actors
 {
@@ -242,7 +237,9 @@ namespace FFXIVClassic_Map_Server.Actors
 
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+                }
                 finally
                 {
                     conn.Dispose();
diff --git a/FFXIVClassic Map Server/actors/chara/npc/NpcWork.cs b/FFXIVClassic Map Server/actors/chara/npc/NpcWork.cs
index 1d069f8e..92189450 100644
--- a/FFXIVClassic Map Server/actors/chara/npc/NpcWork.cs	
+++ b/FFXIVClassic Map Server/actors/chara/npc/NpcWork.cs	
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.Actors.Chara
+namespace FFXIVClassic_Map_Server.Actors.Chara
 {
     class NpcWork
     {
diff --git a/FFXIVClassic Map Server/actors/chara/player/Equipment.cs b/FFXIVClassic Map Server/actors/chara/player/Equipment.cs
index 2e622a10..106f32af 100644
--- a/FFXIVClassic Map Server/actors/chara/player/Equipment.cs	
+++ b/FFXIVClassic Map Server/actors/chara/player/Equipment.cs	
@@ -1,13 +1,8 @@
-using FFXIVClassic_Lobby_Server;
-using FFXIVClassic_Map_Server.Actors;
+using FFXIVClassic_Map_Server.Actors;
 using FFXIVClassic_Map_Server.dataobjects;
 using FFXIVClassic_Map_Server.packets.send.actor.inventory;
 using FFXIVClassic_Map_Server.packets.send.Actor.inventory;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.actors.chara.player
 {
diff --git a/FFXIVClassic Map Server/actors/chara/player/Inventory.cs b/FFXIVClassic Map Server/actors/chara/player/Inventory.cs
index 52c90ef2..855934b5 100644
--- a/FFXIVClassic Map Server/actors/chara/player/Inventory.cs	
+++ b/FFXIVClassic Map Server/actors/chara/player/Inventory.cs	
@@ -1,5 +1,4 @@
-using FFXIVClassic_Lobby_Server;
-using FFXIVClassic_Lobby_Server.packets;
+using FFXIVClassic_Map_Server.packets;
 using FFXIVClassic_Map_Server.Actors;
 using FFXIVClassic_Map_Server.dataobjects;
 using FFXIVClassic_Map_Server.packets.send.actor.inventory;
@@ -7,8 +6,6 @@ using FFXIVClassic_Map_Server.packets.send.Actor.inventory;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.actors.chara.player
 {
diff --git a/FFXIVClassic Map Server/actors/chara/player/Player.cs b/FFXIVClassic Map Server/actors/chara/player/Player.cs
index 611fb69f..cc1359a9 100644
--- a/FFXIVClassic Map Server/actors/chara/player/Player.cs	
+++ b/FFXIVClassic Map Server/actors/chara/player/Player.cs	
@@ -1,7 +1,5 @@
-using FFXIVClassic_Lobby_Server;
-using FFXIVClassic_Lobby_Server.common;
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.actors.area;
+using FFXIVClassic_Map_Server.common;
+using FFXIVClassic_Map_Server.packets;
 using FFXIVClassic_Map_Server.actors.chara.player;
 using FFXIVClassic_Map_Server.actors.director;
 using FFXIVClassic_Map_Server.dataobjects;
@@ -10,19 +8,13 @@ using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send;
 using FFXIVClassic_Map_Server.packets.send.actor;
 using FFXIVClassic_Map_Server.packets.send.actor.events;
-using FFXIVClassic_Map_Server.packets.send.actor.inventory;
 using FFXIVClassic_Map_Server.packets.send.Actor.inventory;
 using FFXIVClassic_Map_Server.packets.send.events;
 using FFXIVClassic_Map_Server.packets.send.list;
-using FFXIVClassic_Map_Server.packets.send.login;
 using FFXIVClassic_Map_Server.packets.send.player;
 using FFXIVClassic_Map_Server.utils;
-using MySql.Data.MySqlClient;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.Actors
 {
diff --git a/FFXIVClassic Map Server/actors/chara/player/PlayerWork.cs b/FFXIVClassic Map Server/actors/chara/player/PlayerWork.cs
index 050ec57d..b0b358cd 100644
--- a/FFXIVClassic Map Server/actors/chara/player/PlayerWork.cs	
+++ b/FFXIVClassic Map Server/actors/chara/player/PlayerWork.cs	
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.dataobjects.chara
+namespace FFXIVClassic_Map_Server.dataobjects.chara
 {
     class PlayerWork
     {
diff --git a/FFXIVClassic Map Server/actors/command/Command.cs b/FFXIVClassic Map Server/actors/command/Command.cs
index 03e4e064..f4f0a538 100644
--- a/FFXIVClassic Map Server/actors/command/Command.cs	
+++ b/FFXIVClassic Map Server/actors/command/Command.cs	
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.Actors
+namespace FFXIVClassic_Map_Server.Actors
 {
     class Command : Actor
     {
diff --git a/FFXIVClassic Map Server/actors/debug/Debug.cs b/FFXIVClassic Map Server/actors/debug/Debug.cs
index 1fbb3d59..9625afd6 100644
--- a/FFXIVClassic Map Server/actors/debug/Debug.cs	
+++ b/FFXIVClassic Map Server/actors/debug/Debug.cs	
@@ -1,12 +1,7 @@
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.dataobjects;
+using FFXIVClassic_Map_Server.packets;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send.actor;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.Actors
 {
diff --git a/FFXIVClassic Map Server/actors/director/Director.cs b/FFXIVClassic Map Server/actors/director/Director.cs
index 4ae68542..f8a5e12f 100644
--- a/FFXIVClassic Map Server/actors/director/Director.cs	
+++ b/FFXIVClassic Map Server/actors/director/Director.cs	
@@ -1,12 +1,8 @@
-using FFXIVClassic_Lobby_Server.packets;
+using FFXIVClassic_Map_Server.packets;
 using FFXIVClassic_Map_Server.Actors;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send.actor;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.actors.director
 {
diff --git a/FFXIVClassic Map Server/actors/director/OpeningDirector.cs b/FFXIVClassic Map Server/actors/director/OpeningDirector.cs
index 67d35c6c..276d4e9e 100644
--- a/FFXIVClassic Map Server/actors/director/OpeningDirector.cs	
+++ b/FFXIVClassic Map Server/actors/director/OpeningDirector.cs	
@@ -1,12 +1,9 @@
-using FFXIVClassic_Lobby_Server.packets;
+using FFXIVClassic_Map_Server.packets;
 using FFXIVClassic_Map_Server.Actors;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send.actor;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.actors.director
 {
diff --git a/FFXIVClassic Map Server/actors/director/WeatherDirector.cs b/FFXIVClassic Map Server/actors/director/WeatherDirector.cs
index 0aa0917a..931750ef 100644
--- a/FFXIVClassic Map Server/actors/director/WeatherDirector.cs	
+++ b/FFXIVClassic Map Server/actors/director/WeatherDirector.cs	
@@ -1,13 +1,9 @@
-using FFXIVClassic_Lobby_Server.packets;
+using FFXIVClassic_Map_Server.packets;
 using FFXIVClassic_Map_Server.actors.director;
-using FFXIVClassic_Map_Server.dataobjects;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send.actor;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.Actors
 {
diff --git a/FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0g001.cs b/FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0g001.cs
index 51908902..5c0a972f 100644
--- a/FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0g001.cs	
+++ b/FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0g001.cs	
@@ -1,12 +1,8 @@
-using FFXIVClassic_Lobby_Server.packets;
+using FFXIVClassic_Map_Server.packets;
 using FFXIVClassic_Map_Server.Actors;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send.actor;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.actors.director
 {
diff --git a/FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0l001.cs b/FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0l001.cs
index 2d5d1aec..26b8cf0c 100644
--- a/FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0l001.cs	
+++ b/FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0l001.cs	
@@ -1,12 +1,8 @@
-using FFXIVClassic_Lobby_Server.packets;
+using FFXIVClassic_Map_Server.packets;
 using FFXIVClassic_Map_Server.Actors;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send.actor;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.actors.director
 {
diff --git a/FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0u001.cs b/FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0u001.cs
index 2a860b05..11c50869 100644
--- a/FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0u001.cs	
+++ b/FFXIVClassic Map Server/actors/director/quest/QuestDirectorMan0u001.cs	
@@ -1,12 +1,8 @@
-using FFXIVClassic_Lobby_Server.packets;
+using FFXIVClassic_Map_Server.packets;
 using FFXIVClassic_Map_Server.Actors;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send.actor;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.actors.director
 {
diff --git a/FFXIVClassic Map Server/actors/judge/Judge.cs b/FFXIVClassic Map Server/actors/judge/Judge.cs
index b2ab5531..6e12a12a 100644
--- a/FFXIVClassic Map Server/actors/judge/Judge.cs	
+++ b/FFXIVClassic Map Server/actors/judge/Judge.cs	
@@ -1,11 +1,4 @@
-using FFXIVClassic_Map_Server.dataobjects;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.Actors
+namespace FFXIVClassic_Map_Server.Actors
 {
     class Judge : Actor
     {
diff --git a/FFXIVClassic Map Server/actors/quest/Quest.cs b/FFXIVClassic Map Server/actors/quest/Quest.cs
index 8a6469e5..e51beb90 100644
--- a/FFXIVClassic Map Server/actors/quest/Quest.cs	
+++ b/FFXIVClassic Map Server/actors/quest/Quest.cs	
@@ -1,5 +1,4 @@
-using FFXIVClassic_Lobby_Server;
-using FFXIVClassic_Lobby_Server.common;
+using FFXIVClassic_Map_Server.common;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
diff --git a/FFXIVClassic Map Server/actors/world/WorldMaster.cs b/FFXIVClassic Map Server/actors/world/WorldMaster.cs
index 8d0b2cc1..7d58aa50 100644
--- a/FFXIVClassic Map Server/actors/world/WorldMaster.cs	
+++ b/FFXIVClassic Map Server/actors/world/WorldMaster.cs	
@@ -1,12 +1,7 @@
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.dataobjects;
+using FFXIVClassic_Map_Server.packets;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send.actor;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.Actors
 {
diff --git a/FFXIVClassic Map Server/common/Bitfield.cs b/FFXIVClassic Map Server/common/Bitfield.cs
index d4e885a0..61e56c5c 100644
--- a/FFXIVClassic Map Server/common/Bitfield.cs	
+++ b/FFXIVClassic Map Server/common/Bitfield.cs	
@@ -1,10 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace FFXIVClassic_Lobby_Server.common
+namespace FFXIVClassic_Map_Server.common
 {
     [global::System.AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
     sealed class BitfieldLengthAttribute : Attribute
diff --git a/FFXIVClassic Map Server/common/Blowfish.cs b/FFXIVClassic Map Server/common/Blowfish.cs
index 92305b58..ccc7075b 100644
--- a/FFXIVClassic Map Server/common/Blowfish.cs	
+++ b/FFXIVClassic Map Server/common/Blowfish.cs	
@@ -1,10 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace FFXIVClassic_Lobby_Server.common
+namespace FFXIVClassic_Map_Server.common
 {
     public class Blowfish
     {   
diff --git a/FFXIVClassic Map Server/common/EfficientHashTables.cs b/FFXIVClassic Map Server/common/EfficientHashTables.cs
index 9ac2c4aa..e4bcf517 100644
--- a/FFXIVClassic Map Server/common/EfficientHashTables.cs	
+++ b/FFXIVClassic Map Server/common/EfficientHashTables.cs	
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.common
 {
diff --git a/FFXIVClassic Map Server/common/Log.cs b/FFXIVClassic Map Server/common/Log.cs
index 5c127a25..b68ea944 100644
--- a/FFXIVClassic Map Server/common/Log.cs	
+++ b/FFXIVClassic Map Server/common/Log.cs	
@@ -1,58 +1,73 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.IO;
 
-namespace FFXIVClassic_Lobby_Server.common
+namespace FFXIVClassic_Map_Server.common
 {
     class Log
     {
+        public enum LogType
+        {
+            Error = ConsoleColor.Red,
+            Debug = ConsoleColor.Yellow,
+            Info = ConsoleColor.Cyan,
+            Sql = ConsoleColor.Magenta,
+            Conn = ConsoleColor.Green,
+            Default = ConsoleColor.Gray
+        }
+
         public static void error(String message)
         {
-            Console.Write("[{0}]", DateTime.Now.ToString("dd/MMM HH:mm"));
-            Console.ForegroundColor = ConsoleColor.Red;
-            Console.Write("[ERROR] ");
-            Console.ForegroundColor = ConsoleColor.Gray ;
-            Console.WriteLine(message);
+            log(message, LogType.Error);
         }
 
         public static void debug(String message)
-        {         
-#if DEBUG
-            Console.Write("[{0}]", DateTime.Now.ToString("dd/MMM HH:mm"));
-            Console.ForegroundColor = ConsoleColor.Yellow;
-            Console.Write("[DEBUG] ");
-            Console.ForegroundColor = ConsoleColor.Gray;
-            Console.WriteLine(message);
-#endif
+        {
+            #if DEBUG
+                log(message, LogType.Debug);
+            #endif
         }
 
         public static void info(String message)
         {
-            Console.Write("[{0}]", DateTime.Now.ToString("dd/MMM HH:mm"));
-            Console.ForegroundColor = ConsoleColor.Cyan;
-            Console.Write("[INFO] ");
-            Console.ForegroundColor = ConsoleColor.Gray;
-            Console.WriteLine(message);
+            log(message, LogType.Info);
         }
 
         public static void database(String message)
         {
-            Console.Write("[{0}]", DateTime.Now.ToString("dd/MMM HH:mm"));
-            Console.ForegroundColor = ConsoleColor.Magenta;
-            Console.Write("[SQL] ");
-            Console.ForegroundColor = ConsoleColor.Gray;
-            Console.WriteLine(message);
+            log(message, LogType.Sql);
         }
 
         public static void conn(String message)
         {
-            Console.Write("[{0}]", DateTime.Now.ToString("dd/MMM HH:mm"));
-            Console.ForegroundColor = ConsoleColor.Green;
-            Console.Write("[CONN] ");
+            log(message, LogType.Conn);
+        }
+
+        private static void log(String message, LogType type)
+        {
+            var timestamp = String.Format("[{0}] ", DateTime.Now.ToString("dd/MMM HH:mm:ss"));
+            var typestr = String.Format("[{0}] ", type.ToString().ToUpper());
+
+            Console.Write(timestamp);
+            Console.ForegroundColor = (ConsoleColor)type;
+            Console.Write(typestr);
             Console.ForegroundColor = ConsoleColor.Gray;
             Console.WriteLine(message);
+
+            message = message.Insert(0, typestr);
+            message = message.Insert(0, timestamp);
+
+            Directory.CreateDirectory(ConfigConstants.OPTIONS_LOGPATH);
+
+            try
+            {
+                File.AppendAllText(ConfigConstants.OPTIONS_LOGPATH + ConfigConstants.OPTIONS_LOGFILE, message + Environment.NewLine);
+            }
+            catch (Exception e)
+            {
+                Console.ForegroundColor = ConsoleColor.Red;
+                Console.Write(e.Message);
+                Console.ForegroundColor = ConsoleColor.Gray;
+            }
         }
     }
 }
diff --git a/FFXIVClassic Map Server/common/Utils.cs b/FFXIVClassic Map Server/common/Utils.cs
index d66c188a..e4e37cf9 100644
--- a/FFXIVClassic Map Server/common/Utils.cs	
+++ b/FFXIVClassic Map Server/common/Utils.cs	
@@ -1,11 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
-namespace FFXIVClassic_Lobby_Server.common
+namespace FFXIVClassic_Map_Server.common
 {
     static class Utils
     {
@@ -24,26 +21,64 @@ namespace FFXIVClassic_Lobby_Server.common
 
         public static string ByteArrayToHex(byte[] bytes)
         {
-            var lookup32 = _lookup32;
-            var result = new char[(bytes.Length * 3) + ((bytes.Length/16) < 1 ? 1 : (bytes.Length/16)*3) + bytes.Length+60];
-            int numNewLines = 0;
-            for (int i = 0; i < bytes.Length; i++)
-            {
-                var val = lookup32[bytes[i]];
-                result[(3 * i) + (17 * numNewLines) + 0] = (char)val;
-                result[(3 * i) + (17 * numNewLines) + 1] = (char)(val >> 16);
-                result[(3 * i) + (17 * numNewLines) + 2] = ' ';
-
-                result[(numNewLines * (3*16+17)) + (3 * 16) + (i % 16)] = (char)bytes[i] >= 32 && (char)bytes[i] <= 126 ? (char)bytes[i] : '.';
-                
-                if (i != bytes.Length - 1 && bytes.Length > 16 && i != 0 && (i+1) % 16 == 0)
-                {
-                    result[(numNewLines * (3*16+17)) + (3 * 16) + (16)] = '\n';
-                    numNewLines++;
-                }
-               
-            }
-            return new string(result);
+            if (bytes == null) return "<null>";
+            int bytesLength = bytes.Length;
+            var bytesPerLine = 16;
+            char[] HexChars = "0123456789ABCDEF".ToCharArray();
+
+            int firstHexColumn =
+                  8                   // 8 characters for the address
+                + 3;                  // 3 spaces
+
+            int firstCharColumn = firstHexColumn
+                + bytesPerLine * 3       // - 2 digit for the hexadecimal value and 1 space
+                + (bytesPerLine - 1) / 8 // - 1 extra space every 8 characters from the 9th
+                + 2;                  // 2 spaces 
+
+            int lineLength = firstCharColumn
+                + bytesPerLine           // - characters to show the ascii value
+                + Environment.NewLine.Length; // Carriage return and line feed (should normally be 2)
+
+            char[] line = (new String(' ', lineLength - Environment.NewLine.Length) + Environment.NewLine).ToCharArray();
+            int expectedLines = (bytesLength + bytesPerLine - 1) / bytesPerLine;
+            StringBuilder result = new StringBuilder(expectedLines * lineLength);
+
+            for (int i = 0; i < bytesLength; i += bytesPerLine)
+            {
+                line[0] = HexChars[(i >> 28) & 0xF];
+                line[1] = HexChars[(i >> 24) & 0xF];
+                line[2] = HexChars[(i >> 20) & 0xF];
+                line[3] = HexChars[(i >> 16) & 0xF];
+                line[4] = HexChars[(i >> 12) & 0xF];
+                line[5] = HexChars[(i >> 8) & 0xF];
+                line[6] = HexChars[(i >> 4) & 0xF];
+                line[7] = HexChars[(i >> 0) & 0xF];
+
+                int hexColumn = firstHexColumn;
+                int charColumn = firstCharColumn;
+
+                for (int j = 0; j < bytesPerLine; j++)
+                {
+                    if (j > 0 && (j & 7) == 0) hexColumn++;
+                    if (i + j >= bytesLength)
+                    {
+                        line[hexColumn] = ' ';
+                        line[hexColumn + 1] = ' ';
+                        line[charColumn] = ' ';
+                    }
+                    else
+                    {
+                        byte b = bytes[i + j];
+                        line[hexColumn] = HexChars[(b >> 4) & 0xF];
+                        line[hexColumn + 1] = HexChars[b & 0xF];
+                        line[charColumn] = (b < 32 ? '.' : (char)b);
+                    }
+                    hexColumn += 3;
+                    charColumn++;
+                }
+                result.Append(line);
+            }
+            return Environment.NewLine + result.ToString();
         }
 
         public static UInt32 UnixTimeStampUTC()
@@ -223,7 +258,7 @@ namespace FFXIVClassic_Lobby_Server.common
 
                 offset += 4 + count2;
 
-                Console.WriteLine(result);
+                Log.debug(result);
             }
         }
 
diff --git a/FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs b/FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs
index 2a966f81..70d14b39 100644
--- a/FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs	
+++ b/FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs	
@@ -1,14 +1,9 @@
-using FFXIVClassic_Lobby_Server;
-using FFXIVClassic_Lobby_Server.common;
-using FFXIVClassic_Lobby_Server.packets;
+using FFXIVClassic_Map_Server.common;
+using FFXIVClassic_Map_Server.packets;
 using FFXIVClassic_Map_Server.Actors;
 using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send.actor;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.dataobjects
 {
diff --git a/FFXIVClassic Map Server/dataobjects/DBWorld.cs b/FFXIVClassic Map Server/dataobjects/DBWorld.cs
index 6b135ccd..f9b79bf6 100644
--- a/FFXIVClassic Map Server/dataobjects/DBWorld.cs	
+++ b/FFXIVClassic Map Server/dataobjects/DBWorld.cs	
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Lobby_Server.dataobjects
+namespace FFXIVClassic_Map_Server.dataobjects
 {
     class DBWorld
     {
diff --git a/FFXIVClassic Map Server/dataobjects/InventoryItem.cs b/FFXIVClassic Map Server/dataobjects/InventoryItem.cs
index a916018d..e7d8f6fc 100644
--- a/FFXIVClassic Map Server/dataobjects/InventoryItem.cs	
+++ b/FFXIVClassic Map Server/dataobjects/InventoryItem.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.dataobjects
 {
diff --git a/FFXIVClassic Map Server/dataobjects/Item.cs b/FFXIVClassic Map Server/dataobjects/Item.cs
index e57ab02a..351117c9 100644
--- a/FFXIVClassic Map Server/dataobjects/Item.cs	
+++ b/FFXIVClassic Map Server/dataobjects/Item.cs	
@@ -1,9 +1,5 @@
 using MySql.Data.MySqlClient;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.dataobjects
 {
diff --git a/FFXIVClassic Map Server/dataobjects/RecruitmentDetails.cs b/FFXIVClassic Map Server/dataobjects/RecruitmentDetails.cs
index 9acc647b..af32614e 100644
--- a/FFXIVClassic Map Server/dataobjects/RecruitmentDetails.cs	
+++ b/FFXIVClassic Map Server/dataobjects/RecruitmentDetails.cs	
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.dataobjects
+namespace FFXIVClassic_Map_Server.dataobjects
 {
     class RecruitmentDetails
     {
diff --git a/FFXIVClassic Map Server/dataobjects/SearchEntry.cs b/FFXIVClassic Map Server/dataobjects/SearchEntry.cs
index ad94a040..9a60b055 100644
--- a/FFXIVClassic Map Server/dataobjects/SearchEntry.cs	
+++ b/FFXIVClassic Map Server/dataobjects/SearchEntry.cs	
@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.dataobjects
 {
diff --git a/FFXIVClassic Map Server/lua/LuaEngine.cs b/FFXIVClassic Map Server/lua/LuaEngine.cs
index 89d2c272..60b86c5d 100644
--- a/FFXIVClassic Map Server/lua/LuaEngine.cs	
+++ b/FFXIVClassic Map Server/lua/LuaEngine.cs	
@@ -1,6 +1,5 @@
-using FFXIVClassic_Lobby_Server;
-using FFXIVClassic_Lobby_Server.common;
-using FFXIVClassic_Lobby_Server.packets;
+using FFXIVClassic_Map_Server.common;
+using FFXIVClassic_Map_Server.packets;
 using FFXIVClassic_Map_Server.actors.director;
 using FFXIVClassic_Map_Server.Actors;
 using FFXIVClassic_Map_Server.dataobjects;
@@ -13,9 +12,6 @@ using MoonSharp.Interpreter.Loaders;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.lua
 {
diff --git a/FFXIVClassic Map Server/lua/LuaEvent.cs b/FFXIVClassic Map Server/lua/LuaEvent.cs
index 73a4fb02..12a57ed9 100644
--- a/FFXIVClassic Map Server/lua/LuaEvent.cs	
+++ b/FFXIVClassic Map Server/lua/LuaEvent.cs	
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.lua
+namespace FFXIVClassic_Map_Server.lua
 {
     class LuaEvent
     {
diff --git a/FFXIVClassic Map Server/lua/LuaNpc.cs b/FFXIVClassic Map Server/lua/LuaNpc.cs
index b41edf9d..78d240ea 100644
--- a/FFXIVClassic Map Server/lua/LuaNpc.cs	
+++ b/FFXIVClassic Map Server/lua/LuaNpc.cs	
@@ -1,13 +1,5 @@
 using FFXIVClassic_Map_Server.Actors;
-using FFXIVClassic_Map_Server.dataobjects;
-using FFXIVClassic_Map_Server.packets.send;
-using FFXIVClassic_Map_Server.packets.send.events;
 using MoonSharp.Interpreter;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.lua
 {
diff --git a/FFXIVClassic Map Server/lua/LuaParam.cs b/FFXIVClassic Map Server/lua/LuaParam.cs
index 20ecea3b..263af598 100644
--- a/FFXIVClassic Map Server/lua/LuaParam.cs	
+++ b/FFXIVClassic Map Server/lua/LuaParam.cs	
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.lua
 {
diff --git a/FFXIVClassic Map Server/lua/LuaPlayer.cs b/FFXIVClassic Map Server/lua/LuaPlayer.cs
index 7ff39c81..b8be404b 100644
--- a/FFXIVClassic Map Server/lua/LuaPlayer.cs	
+++ b/FFXIVClassic Map Server/lua/LuaPlayer.cs	
@@ -1,13 +1,7 @@
 using FFXIVClassic_Map_Server.Actors;
-using FFXIVClassic_Map_Server.dataobjects;
 using FFXIVClassic_Map_Server.packets.send;
-using FFXIVClassic_Map_Server.packets.send.events;
 using MoonSharp.Interpreter;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.lua
 {
diff --git a/FFXIVClassic Map Server/lua/LuaUtils.cs b/FFXIVClassic Map Server/lua/LuaUtils.cs
index 101b9fd3..ec253535 100644
--- a/FFXIVClassic Map Server/lua/LuaUtils.cs	
+++ b/FFXIVClassic Map Server/lua/LuaUtils.cs	
@@ -1,14 +1,11 @@
-using FFXIVClassic_Lobby_Server.common;
+using FFXIVClassic_Map_Server.common;
 using FFXIVClassic_Map_Server.Actors;
-using FFXIVClassic_Map_Server.dataobjects;
 using FFXIVClassic_Map_Server.lua;
 using MoonSharp.Interpreter;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server
 {
diff --git a/FFXIVClassic Map Server/packets/BasePacket.cs b/FFXIVClassic Map Server/packets/BasePacket.cs
index 9e9c9c48..eac717b6 100644
--- a/FFXIVClassic Map Server/packets/BasePacket.cs	
+++ b/FFXIVClassic Map Server/packets/BasePacket.cs	
@@ -1,16 +1,13 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Runtime.InteropServices;
 using System.Diagnostics;
-using FFXIVClassic_Lobby_Server.common;
+using FFXIVClassic_Map_Server.common;
 using System.IO;
 
-namespace FFXIVClassic_Lobby_Server.packets
-{    
-   
+namespace FFXIVClassic_Map_Server.packets
+{
+
     [StructLayout(LayoutKind.Sequential)]
     public struct BasePacketHeader
     {
@@ -336,8 +333,8 @@ namespace FFXIVClassic_Lobby_Server.packets
         {
 #if DEBUG
             Console.BackgroundColor = ConsoleColor.DarkYellow;
-            Console.WriteLine("IsAuthed: {0}, IsEncrypted: {1}, Size: 0x{2:X}, Num Subpackets: {3}", header.isAuthenticated, header.isCompressed, header.packetSize, header.numSubpackets);            
-            Console.WriteLine("{0}", Utils.ByteArrayToHex(getHeaderBytes()));
+            Log.debug(String.Format("IsAuthed: {0}, IsEncrypted: {1}, Size: 0x{2:X}, Num Subpackets: {3}", header.isAuthenticated, header.isCompressed, header.packetSize, header.numSubpackets));            
+            Log.debug(String.Format("{0}", Utils.ByteArrayToHex(getHeaderBytes())));
             foreach (SubPacket sub in getSubpackets())
                 sub.debugPrintSubPacket();
             Console.BackgroundColor = ConsoleColor.Black;
diff --git a/FFXIVClassic Map Server/packets/SubPacket.cs b/FFXIVClassic Map Server/packets/SubPacket.cs
index 87231156..4695b5b7 100644
--- a/FFXIVClassic Map Server/packets/SubPacket.cs	
+++ b/FFXIVClassic Map Server/packets/SubPacket.cs	
@@ -1,13 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Runtime.InteropServices;
-using FFXIVClassic_Lobby_Server;
-using FFXIVClassic_Lobby_Server.common;
+using FFXIVClassic_Map_Server.common;
 
-namespace FFXIVClassic_Lobby_Server.packets
+namespace FFXIVClassic_Map_Server.packets
 {
     [StructLayout(LayoutKind.Sequential)]
     public struct SubPacketHeader
@@ -146,14 +141,14 @@ namespace FFXIVClassic_Lobby_Server.packets
         {
 #if DEBUG
             Console.BackgroundColor = ConsoleColor.DarkRed;
-            Console.WriteLine("Size: 0x{0:X}", header.subpacketSize);
+            Log.debug(String.Format("Size: 0x{0:X}", header.subpacketSize));
             if (header.type == 0x03)
-                Console.WriteLine("Opcode: 0x{0:X}", gameMessage.opcode);
-            Console.WriteLine("{0}", Utils.ByteArrayToHex(getHeaderBytes()));
+                Log.debug(String.Format("Opcode: 0x{0:X}", gameMessage.opcode));
+            Log.debug(String.Format("{0}", Utils.ByteArrayToHex(getHeaderBytes())));
             if (header.type == 0x03)
-                Console.WriteLine("{0}", Utils.ByteArrayToHex(getGameMessageBytes()));
+                Log.debug(String.Format("{0}", Utils.ByteArrayToHex(getGameMessageBytes())));
             Console.BackgroundColor = ConsoleColor.DarkMagenta;
-            Console.WriteLine("{0}", Utils.ByteArrayToHex(data));
+            Log.debug(String.Format("{0}", Utils.ByteArrayToHex(data)));
             Console.BackgroundColor = ConsoleColor.Black;
 #endif
         }
diff --git a/FFXIVClassic Map Server/packets/receive/ChatMessagePacket.cs b/FFXIVClassic Map Server/packets/receive/ChatMessagePacket.cs
index 2b3e85f5..877df6f3 100644
--- a/FFXIVClassic Map Server/packets/receive/ChatMessagePacket.cs	
+++ b/FFXIVClassic Map Server/packets/receive/ChatMessagePacket.cs	
@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.receive
 {
diff --git a/FFXIVClassic Map Server/packets/receive/HandshakePacket.cs b/FFXIVClassic Map Server/packets/receive/HandshakePacket.cs
index 10b146ff..20586f6e 100644
--- a/FFXIVClassic Map Server/packets/receive/HandshakePacket.cs	
+++ b/FFXIVClassic Map Server/packets/receive/HandshakePacket.cs	
@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.receive
 {
diff --git a/FFXIVClassic Map Server/packets/receive/LangaugeCodePacket.cs b/FFXIVClassic Map Server/packets/receive/LangaugeCodePacket.cs
index 021c2ca3..c5e68583 100644
--- a/FFXIVClassic Map Server/packets/receive/LangaugeCodePacket.cs	
+++ b/FFXIVClassic Map Server/packets/receive/LangaugeCodePacket.cs	
@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.receive
 {
diff --git a/FFXIVClassic Map Server/packets/receive/LockTargetPacket.cs b/FFXIVClassic Map Server/packets/receive/LockTargetPacket.cs
index 9032e6f5..8f542aad 100644
--- a/FFXIVClassic Map Server/packets/receive/LockTargetPacket.cs	
+++ b/FFXIVClassic Map Server/packets/receive/LockTargetPacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.receive
 {
diff --git a/FFXIVClassic Map Server/packets/receive/ParameterDataRequestPacket.cs b/FFXIVClassic Map Server/packets/receive/ParameterDataRequestPacket.cs
index 7413feb8..1658a0a3 100644
--- a/FFXIVClassic Map Server/packets/receive/ParameterDataRequestPacket.cs	
+++ b/FFXIVClassic Map Server/packets/receive/ParameterDataRequestPacket.cs	
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.receive
 {
diff --git a/FFXIVClassic Map Server/packets/receive/PingPacket.cs b/FFXIVClassic Map Server/packets/receive/PingPacket.cs
index 74dca840..68ca8cba 100644
--- a/FFXIVClassic Map Server/packets/receive/PingPacket.cs	
+++ b/FFXIVClassic Map Server/packets/receive/PingPacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.receive
 {
diff --git a/FFXIVClassic Map Server/packets/receive/SetTargetPacket.cs b/FFXIVClassic Map Server/packets/receive/SetTargetPacket.cs
index 05500ba7..b38cd5a7 100644
--- a/FFXIVClassic Map Server/packets/receive/SetTargetPacket.cs	
+++ b/FFXIVClassic Map Server/packets/receive/SetTargetPacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.receive
 {
diff --git a/FFXIVClassic Map Server/packets/receive/UpdatePlayerPositionPacket.cs b/FFXIVClassic Map Server/packets/receive/UpdatePlayerPositionPacket.cs
index dfd7cb9f..a1d88502 100644
--- a/FFXIVClassic Map Server/packets/receive/UpdatePlayerPositionPacket.cs	
+++ b/FFXIVClassic Map Server/packets/receive/UpdatePlayerPositionPacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.receive
 {
diff --git a/FFXIVClassic Map Server/packets/receive/_0x02ReceivePacket.cs b/FFXIVClassic Map Server/packets/receive/_0x02ReceivePacket.cs
index b1c7cdc7..aab20b5c 100644
--- a/FFXIVClassic Map Server/packets/receive/_0x02ReceivePacket.cs	
+++ b/FFXIVClassic Map Server/packets/receive/_0x02ReceivePacket.cs	
@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.receive
 {
diff --git a/FFXIVClassic Map Server/packets/receive/_0x07Packet.cs b/FFXIVClassic Map Server/packets/receive/_0x07Packet.cs
index f4091f25..a8a503b6 100644
--- a/FFXIVClassic Map Server/packets/receive/_0x07Packet.cs	
+++ b/FFXIVClassic Map Server/packets/receive/_0x07Packet.cs	
@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.receive
 {
diff --git a/FFXIVClassic Map Server/packets/receive/events/EventStartPacket.cs b/FFXIVClassic Map Server/packets/receive/events/EventStartPacket.cs
index 3f5e7993..cd18740a 100644
--- a/FFXIVClassic Map Server/packets/receive/events/EventStartPacket.cs	
+++ b/FFXIVClassic Map Server/packets/receive/events/EventStartPacket.cs	
@@ -1,11 +1,8 @@
-using FFXIVClassic_Lobby_Server.common;
-using FFXIVClassic_Map_Server.lua;
+using FFXIVClassic_Map_Server.lua;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.receive.events
 {
diff --git a/FFXIVClassic Map Server/packets/receive/events/EventUpdatePacket.cs b/FFXIVClassic Map Server/packets/receive/events/EventUpdatePacket.cs
index 976c6c68..dfc60347 100644
--- a/FFXIVClassic Map Server/packets/receive/events/EventUpdatePacket.cs	
+++ b/FFXIVClassic Map Server/packets/receive/events/EventUpdatePacket.cs	
@@ -2,9 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.receive.events
 {
diff --git a/FFXIVClassic Map Server/packets/receive/recruitment/RecruitmentDetailsRequestPacket.cs b/FFXIVClassic Map Server/packets/receive/recruitment/RecruitmentDetailsRequestPacket.cs
index 7f2706af..8e335d32 100644
--- a/FFXIVClassic Map Server/packets/receive/recruitment/RecruitmentDetailsRequestPacket.cs	
+++ b/FFXIVClassic Map Server/packets/receive/recruitment/RecruitmentDetailsRequestPacket.cs	
@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.receive.recruitment
 {
diff --git a/FFXIVClassic Map Server/packets/receive/recruitment/RecruitmentSearchRequestPacket.cs b/FFXIVClassic Map Server/packets/receive/recruitment/RecruitmentSearchRequestPacket.cs
index 07f55b10..e8513cfd 100644
--- a/FFXIVClassic Map Server/packets/receive/recruitment/RecruitmentSearchRequestPacket.cs	
+++ b/FFXIVClassic Map Server/packets/receive/recruitment/RecruitmentSearchRequestPacket.cs	
@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.receive.recruitment
 {
diff --git a/FFXIVClassic Map Server/packets/receive/recruitment/StartRecruitingRequestPacket.cs b/FFXIVClassic Map Server/packets/receive/recruitment/StartRecruitingRequestPacket.cs
index 154bbb7e..53f7e4f0 100644
--- a/FFXIVClassic Map Server/packets/receive/recruitment/StartRecruitingRequestPacket.cs	
+++ b/FFXIVClassic Map Server/packets/receive/recruitment/StartRecruitingRequestPacket.cs	
@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.receive.recruitment
 {
diff --git a/FFXIVClassic Map Server/packets/receive/social/AddRemoveSocialPacket.cs b/FFXIVClassic Map Server/packets/receive/social/AddRemoveSocialPacket.cs
index b4f60d9b..693d752e 100644
--- a/FFXIVClassic Map Server/packets/receive/social/AddRemoveSocialPacket.cs	
+++ b/FFXIVClassic Map Server/packets/receive/social/AddRemoveSocialPacket.cs	
@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.receive.social
 {
diff --git a/FFXIVClassic Map Server/packets/receive/social/FriendlistRequestPacket.cs b/FFXIVClassic Map Server/packets/receive/social/FriendlistRequestPacket.cs
index 39fbda78..8353764a 100644
--- a/FFXIVClassic Map Server/packets/receive/social/FriendlistRequestPacket.cs	
+++ b/FFXIVClassic Map Server/packets/receive/social/FriendlistRequestPacket.cs	
@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.receive.social
 {
diff --git a/FFXIVClassic Map Server/packets/receive/supportdesk/FaqBodyRequestPacket.cs b/FFXIVClassic Map Server/packets/receive/supportdesk/FaqBodyRequestPacket.cs
index bcf2a398..22a1e18a 100644
--- a/FFXIVClassic Map Server/packets/receive/supportdesk/FaqBodyRequestPacket.cs	
+++ b/FFXIVClassic Map Server/packets/receive/supportdesk/FaqBodyRequestPacket.cs	
@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.receive.supportdesk
 {
diff --git a/FFXIVClassic Map Server/packets/receive/supportdesk/FaqListRequestPacket.cs b/FFXIVClassic Map Server/packets/receive/supportdesk/FaqListRequestPacket.cs
index 2bb1376a..6862b8e5 100644
--- a/FFXIVClassic Map Server/packets/receive/supportdesk/FaqListRequestPacket.cs	
+++ b/FFXIVClassic Map Server/packets/receive/supportdesk/FaqListRequestPacket.cs	
@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.receive.supportdesk
 {
diff --git a/FFXIVClassic Map Server/packets/receive/supportdesk/GMSupportTicketPacket.cs b/FFXIVClassic Map Server/packets/receive/supportdesk/GMSupportTicketPacket.cs
index cab46175..4e88e164 100644
--- a/FFXIVClassic Map Server/packets/receive/supportdesk/GMSupportTicketPacket.cs	
+++ b/FFXIVClassic Map Server/packets/receive/supportdesk/GMSupportTicketPacket.cs	
@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.receive.supportdesk
 {
diff --git a/FFXIVClassic Map Server/packets/receive/supportdesk/GMTicketIssuesRequestPacket.cs b/FFXIVClassic Map Server/packets/receive/supportdesk/GMTicketIssuesRequestPacket.cs
index e3943c90..e1875cb6 100644
--- a/FFXIVClassic Map Server/packets/receive/supportdesk/GMTicketIssuesRequestPacket.cs	
+++ b/FFXIVClassic Map Server/packets/receive/supportdesk/GMTicketIssuesRequestPacket.cs	
@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.receive.supportdesk
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/ActorDoEmotePacket.cs b/FFXIVClassic Map Server/packets/send/Actor/ActorDoEmotePacket.cs
index 643388f9..6bb36c4b 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/ActorDoEmotePacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/ActorDoEmotePacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/ActorInstantiatePacket.cs b/FFXIVClassic Map Server/packets/send/Actor/ActorInstantiatePacket.cs
index f79e5f70..0a9f69f8 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/ActorInstantiatePacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/ActorInstantiatePacket.cs	
@@ -1,11 +1,8 @@
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.lua;
+using FFXIVClassic_Map_Server.lua;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/ActorSpecialGraphicPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/ActorSpecialGraphicPacket.cs
index 1efd25dd..7db9cef7 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/ActorSpecialGraphicPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/ActorSpecialGraphicPacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/AddActorPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/AddActorPacket.cs
index c92e23a2..b0f4fd24 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/AddActorPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/AddActorPacket.cs	
@@ -1,11 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.packets.send.actor
+namespace FFXIVClassic_Map_Server.packets.send.actor
 {
     class AddActorPacket
     {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/BattleAction1Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/BattleAction1Packet.cs
index 24c3fc95..c2ac69e3 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/BattleAction1Packet.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/BattleAction1Packet.cs	
@@ -1,10 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.IO;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/DeleteAllActorsPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/DeleteAllActorsPacket.cs
index 3544ef84..d3461cd3 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/DeleteAllActorsPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/DeleteAllActorsPacket.cs	
@@ -1,11 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.packets.send.actor
+namespace FFXIVClassic_Map_Server.packets.send.actor
 {
     class DeleteAllActorsPacket
     {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/MoveActorToPositionPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/MoveActorToPositionPacket.cs
index a869e1ea..01c054c9 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/MoveActorToPositionPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/MoveActorToPositionPacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/RemoveActorPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/RemoveActorPacket.cs
index 980b6845..eaeb97bf 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/RemoveActorPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/RemoveActorPacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorAppearancePacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorAppearancePacket.cs
index cca658af..d0e7d85b 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/SetActorAppearancePacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorAppearancePacket.cs	
@@ -1,10 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.IO;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorIconPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorIconPacket.cs
index 03649d46..adedc0b0 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/SetActorIconPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorIconPacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorIdleAnimationPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorIdleAnimationPacket.cs
index 545c2ba2..e332dbaf 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/SetActorIdleAnimationPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorIdleAnimationPacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorIsZoningPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorIsZoningPacket.cs
index 4ab3d1a2..8e30823a 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/SetActorIsZoningPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorIsZoningPacket.cs	
@@ -1,11 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.packets.send.actor
+namespace FFXIVClassic_Map_Server.packets.send.actor
 {
     class SetActorIsZoningPacket
     {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorNamePacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorNamePacket.cs
index c41005ef..7ef682fb 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/SetActorNamePacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorNamePacket.cs	
@@ -1,10 +1,6 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorPositionPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorPositionPacket.cs
index 4d6718d6..59a1a683 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/SetActorPositionPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorPositionPacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs
index fc4c85c4..bfa3d3f6 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs	
@@ -1,12 +1,9 @@
-using FFXIVClassic_Lobby_Server.common;
-using FFXIVClassic_Lobby_Server.packets;
+using FFXIVClassic_Map_Server.common;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorSpeedPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorSpeedPacket.cs
index 6c846be2..659fc5aa 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/SetActorSpeedPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorSpeedPacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatePacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatePacket.cs
index c3d4d385..386abe7c 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatePacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatePacket.cs	
@@ -1,9 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs
index 27409ea0..3135f353 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs
index c47f5353..63b3d8e6 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetAnimatedPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetAnimatedPacket.cs
index 4ab2227e..b144942e 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetAnimatedPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetAnimatedPacket.cs	
@@ -1,9 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetPacket.cs
index 425cdc9f..db269009 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetPacket.cs	
@@ -1,9 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/_0x132Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/_0x132Packet.cs
index 202c3c1e..90f6395a 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/_0x132Packet.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/_0x132Packet.cs	
@@ -1,10 +1,6 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/_0xFPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/_0xFPacket.cs
index b3a61ddc..ad31f280 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/_0xFPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/_0xFPacket.cs	
@@ -1,10 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.IO;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleAction.cs b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleAction.cs
index 6e5ae733..71bf867b 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleAction.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleAction.cs	
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.packets.send.actor.battle
+namespace FFXIVClassic_Map_Server.packets.send.actor.battle
 {
     class BattleAction
     {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX00Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX00Packet.cs
index a24b0ee6..f2173c62 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX00Packet.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX00Packet.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor.battle
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX01Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX01Packet.cs
index 5a8d7af4..04edb879 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX01Packet.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX01Packet.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor.battle
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX10Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX10Packet.cs
index 7f22a969..c809bc61 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX10Packet.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX10Packet.cs	
@@ -1,11 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.packets.send.actor.battle;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor.battle
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX18Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX18Packet.cs
index 9cf5469c..3345b801 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX18Packet.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX18Packet.cs	
@@ -1,11 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.packets.send.actor.battle;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor.battle
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/events/SetEmoteEventCondition.cs b/FFXIVClassic Map Server/packets/send/Actor/events/SetEmoteEventCondition.cs
index 64a6ba49..a5f6d6e3 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/events/SetEmoteEventCondition.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/events/SetEmoteEventCondition.cs	
@@ -1,11 +1,7 @@
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.actors;
+using FFXIVClassic_Map_Server.actors;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor.events
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/events/SetEventStatus.cs b/FFXIVClassic Map Server/packets/send/Actor/events/SetEventStatus.cs
index 0f854ea8..dcf14e4a 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/events/SetEventStatus.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/events/SetEventStatus.cs	
@@ -1,10 +1,6 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor.events
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/events/SetNoticeEventCondition.cs b/FFXIVClassic Map Server/packets/send/Actor/events/SetNoticeEventCondition.cs
index e1c9204a..d48bff56 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/events/SetNoticeEventCondition.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/events/SetNoticeEventCondition.cs	
@@ -1,11 +1,7 @@
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.actors;
+using FFXIVClassic_Map_Server.actors;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor.events
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithCircle.cs b/FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithCircle.cs
index 5866b3eb..c218339e 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithCircle.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithCircle.cs	
@@ -1,11 +1,7 @@
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.actors;
+using FFXIVClassic_Map_Server.actors;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor.events
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithFan.cs b/FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithFan.cs
index 700b0321..21b638b2 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithFan.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithFan.cs	
@@ -1,11 +1,7 @@
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.actors;
+using FFXIVClassic_Map_Server.actors;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor.events
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithTriggerBox.cs b/FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithTriggerBox.cs
index c338b1b8..517dc082 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithTriggerBox.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithTriggerBox.cs	
@@ -1,11 +1,7 @@
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.actors;
+using FFXIVClassic_Map_Server.actors;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor.events
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/events/SetTalkEventCondition.cs b/FFXIVClassic Map Server/packets/send/Actor/events/SetTalkEventCondition.cs
index 67a4a3dd..716ead46 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/events/SetTalkEventCondition.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/events/SetTalkEventCondition.cs	
@@ -1,11 +1,7 @@
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.actors;
+using FFXIVClassic_Map_Server.actors;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor.events
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX01Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX01Packet.cs
index 44422757..4f3175b1 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX01Packet.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX01Packet.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX08Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX08Packet.cs
index 9cb1086b..5e956990 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX08Packet.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX08Packet.cs	
@@ -1,11 +1,7 @@
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.dataobjects;
+using FFXIVClassic_Map_Server.dataobjects;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX16Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX16Packet.cs
index c733edfc..c9776eb7 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX16Packet.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX16Packet.cs	
@@ -1,11 +1,7 @@
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.dataobjects;
+using FFXIVClassic_Map_Server.dataobjects;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX32Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX32Packet.cs
index 2081256e..b4827947 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX32Packet.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX32Packet.cs	
@@ -1,11 +1,7 @@
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.dataobjects;
+using FFXIVClassic_Map_Server.dataobjects;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX64Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX64Packet.cs
index a8109e54..410556b2 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX64Packet.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/EquipmentListX64Packet.cs	
@@ -1,11 +1,7 @@
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.dataobjects;
+using FFXIVClassic_Map_Server.dataobjects;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryBeginChangePacket.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryBeginChangePacket.cs
index 34728dc1..ea90f1d0 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryBeginChangePacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryBeginChangePacket.cs	
@@ -1,11 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
+namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
 {
     class InventoryBeginChangePacket
     {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryEndChangePacket.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryEndChangePacket.cs
index b0266b3c..516d3396 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryEndChangePacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryEndChangePacket.cs	
@@ -1,11 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
+namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
 {
     class InventoryEndChangePacket
     {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryItemEndPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryItemEndPacket.cs
index 414ceecd..ab5db224 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryItemEndPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryItemEndPacket.cs	
@@ -1,11 +1,6 @@
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.dataobjects;
-using System;
+using FFXIVClassic_Map_Server.dataobjects;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryItemPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryItemPacket.cs
index d898bb49..bffc20bc 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryItemPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryItemPacket.cs	
@@ -1,11 +1,6 @@
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.dataobjects;
-using System;
+using FFXIVClassic_Map_Server.dataobjects;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX01Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX01Packet.cs
index af0e1ce8..f585b22c 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX01Packet.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX01Packet.cs	
@@ -1,11 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.dataobjects;
-using System;
-using System.Collections.Generic;
+using FFXIVClassic_Map_Server.dataobjects;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX08Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX08Packet.cs
index 9be456a7..2e811033 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX08Packet.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX08Packet.cs	
@@ -1,11 +1,7 @@
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.dataobjects;
+using FFXIVClassic_Map_Server.dataobjects;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX16Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX16Packet.cs
index cd60c041..5c79fea3 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX16Packet.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX16Packet.cs	
@@ -1,11 +1,6 @@
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.dataobjects;
-using System;
+using FFXIVClassic_Map_Server.dataobjects;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX32Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX32Packet.cs
index f18275f5..32eae219 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX32Packet.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX32Packet.cs	
@@ -1,11 +1,6 @@
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.dataobjects;
-using System;
+using FFXIVClassic_Map_Server.dataobjects;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX64Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX64Packet.cs
index e8443e9f..127bf32b 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX64Packet.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX64Packet.cs	
@@ -1,11 +1,6 @@
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.dataobjects;
-using System;
+using FFXIVClassic_Map_Server.dataobjects;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX01Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX01Packet.cs
index b91c56fb..fe7e035e 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX01Packet.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX01Packet.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX08Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX08Packet.cs
index 26c4f27c..0d59892c 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX08Packet.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX08Packet.cs	
@@ -1,10 +1,6 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX16Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX16Packet.cs
index 7d7ad104..4414c9bb 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX16Packet.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX16Packet.cs	
@@ -1,10 +1,6 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX32Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX32Packet.cs
index 4b05d273..5e3e9808 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX32Packet.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX32Packet.cs	
@@ -1,10 +1,6 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX64Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX64Packet.cs
index 8359d2b4..5233dd31 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX64Packet.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX64Packet.cs	
@@ -1,10 +1,6 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetBeginPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetBeginPacket.cs
index b7828c92..cf12e0e8 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetBeginPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetBeginPacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
 {
diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetEndPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetEndPacket.cs
index 16ae71c0..c6cf8dd0 100644
--- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetEndPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetEndPacket.cs	
@@ -1,11 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
+namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory
 {
     class InventorySetEndPacket
     {
diff --git a/FFXIVClassic Map Server/packets/send/GameMessagePacket.cs b/FFXIVClassic Map Server/packets/send/GameMessagePacket.cs
index 92c413be..b96a26a3 100644
--- a/FFXIVClassic Map Server/packets/send/GameMessagePacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/GameMessagePacket.cs	
@@ -1,11 +1,8 @@
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.lua;
+using FFXIVClassic_Map_Server.lua;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send
 {
diff --git a/FFXIVClassic Map Server/packets/send/LogoutPacket.cs b/FFXIVClassic Map Server/packets/send/LogoutPacket.cs
index 553bf127..fbb5d4a7 100644
--- a/FFXIVClassic Map Server/packets/send/LogoutPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/LogoutPacket.cs	
@@ -1,11 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.packets.send
+namespace FFXIVClassic_Map_Server.packets.send
 {
     class LogoutPacket
     {
diff --git a/FFXIVClassic Map Server/packets/send/PongPacket.cs b/FFXIVClassic Map Server/packets/send/PongPacket.cs
index abddf2f7..1ae4233e 100644
--- a/FFXIVClassic Map Server/packets/send/PongPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/PongPacket.cs	
@@ -1,11 +1,5 @@
-using FFXIVClassic_Lobby_Server.common;
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.receive
 {
diff --git a/FFXIVClassic Map Server/packets/send/QuitPacket.cs b/FFXIVClassic Map Server/packets/send/QuitPacket.cs
index 8099b683..f425537c 100644
--- a/FFXIVClassic Map Server/packets/send/QuitPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/QuitPacket.cs	
@@ -1,11 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.packets.send
+namespace FFXIVClassic_Map_Server.packets.send
 {
     class QuitPacket
     {
diff --git a/FFXIVClassic Map Server/packets/send/SendMessagePacket.cs b/FFXIVClassic Map Server/packets/send/SendMessagePacket.cs
index f27b48c4..09a59e97 100644
--- a/FFXIVClassic Map Server/packets/send/SendMessagePacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/SendMessagePacket.cs	
@@ -1,10 +1,6 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send
 {
diff --git a/FFXIVClassic Map Server/packets/send/SetMapPacket.cs b/FFXIVClassic Map Server/packets/send/SetMapPacket.cs
index e42b75b7..3a54c3e4 100644
--- a/FFXIVClassic Map Server/packets/send/SetMapPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/SetMapPacket.cs	
@@ -1,10 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.IO;
 
 namespace FFXIVClassic_Map_Server.packets.send
 {
diff --git a/FFXIVClassic Map Server/packets/send/SetMusicPacket.cs b/FFXIVClassic Map Server/packets/send/SetMusicPacket.cs
index d4f8320a..e69305c9 100644
--- a/FFXIVClassic Map Server/packets/send/SetMusicPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/SetMusicPacket.cs	
@@ -1,9 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System;
 
 namespace FFXIVClassic_Map_Server.packets.send
 {
diff --git a/FFXIVClassic Map Server/packets/send/SetWeatherPacket.cs b/FFXIVClassic Map Server/packets/send/SetWeatherPacket.cs
index 63778379..cb076e7d 100644
--- a/FFXIVClassic Map Server/packets/send/SetWeatherPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/SetWeatherPacket.cs	
@@ -1,9 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System;
 
 namespace FFXIVClassic_Map_Server.packets.send
 {
diff --git a/FFXIVClassic Map Server/packets/send/_0x02Packet.cs b/FFXIVClassic Map Server/packets/send/_0x02Packet.cs
index 64621176..95810c97 100644
--- a/FFXIVClassic Map Server/packets/send/_0x02Packet.cs	
+++ b/FFXIVClassic Map Server/packets/send/_0x02Packet.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send
 {
diff --git a/FFXIVClassic Map Server/packets/send/_0x10Packet.cs b/FFXIVClassic Map Server/packets/send/_0x10Packet.cs
index 5c036792..5100cf7a 100644
--- a/FFXIVClassic Map Server/packets/send/_0x10Packet.cs	
+++ b/FFXIVClassic Map Server/packets/send/_0x10Packet.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send
 {
diff --git a/FFXIVClassic Map Server/packets/send/_0xE2Packet.cs b/FFXIVClassic Map Server/packets/send/_0xE2Packet.cs
index e2149f36..1bc7c351 100644
--- a/FFXIVClassic Map Server/packets/send/_0xE2Packet.cs	
+++ b/FFXIVClassic Map Server/packets/send/_0xE2Packet.cs	
@@ -1,9 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System;
 
 namespace FFXIVClassic_Map_Server.packets.send
 {
diff --git a/FFXIVClassic Map Server/packets/send/events/EndEventPacket.cs b/FFXIVClassic Map Server/packets/send/events/EndEventPacket.cs
index 72cc0e72..7f1bc1cd 100644
--- a/FFXIVClassic Map Server/packets/send/events/EndEventPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/events/EndEventPacket.cs	
@@ -1,10 +1,6 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.events
 {
diff --git a/FFXIVClassic Map Server/packets/send/events/KickEventPacket.cs b/FFXIVClassic Map Server/packets/send/events/KickEventPacket.cs
index 3fbdc1af..f67398a2 100644
--- a/FFXIVClassic Map Server/packets/send/events/KickEventPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/events/KickEventPacket.cs	
@@ -1,11 +1,8 @@
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.lua;
+using FFXIVClassic_Map_Server.lua;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.events
 {
diff --git a/FFXIVClassic Map Server/packets/send/events/RunEventFunctionPacket.cs b/FFXIVClassic Map Server/packets/send/events/RunEventFunctionPacket.cs
index 20330d3e..98a153c6 100644
--- a/FFXIVClassic Map Server/packets/send/events/RunEventFunctionPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/events/RunEventFunctionPacket.cs	
@@ -1,12 +1,8 @@
-using FFXIVClassic_Lobby_Server.common;
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.lua;
+using FFXIVClassic_Map_Server.lua;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.events
 {
diff --git a/FFXIVClassic Map Server/packets/send/list/ListBeginPacket.cs b/FFXIVClassic Map Server/packets/send/list/ListBeginPacket.cs
index 3d24a700..263e2a4a 100644
--- a/FFXIVClassic Map Server/packets/send/list/ListBeginPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/list/ListBeginPacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.list
 {
diff --git a/FFXIVClassic Map Server/packets/send/list/ListEndPacket.cs b/FFXIVClassic Map Server/packets/send/list/ListEndPacket.cs
index b85a6d17..fe5f0100 100644
--- a/FFXIVClassic Map Server/packets/send/list/ListEndPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/list/ListEndPacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.list
 {
diff --git a/FFXIVClassic Map Server/packets/send/list/ListEntriesEndPacket.cs b/FFXIVClassic Map Server/packets/send/list/ListEntriesEndPacket.cs
index 13ef33c6..809af982 100644
--- a/FFXIVClassic Map Server/packets/send/list/ListEntriesEndPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/list/ListEntriesEndPacket.cs	
@@ -1,10 +1,7 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.list
 {
diff --git a/FFXIVClassic Map Server/packets/send/list/ListEntry.cs b/FFXIVClassic Map Server/packets/send/list/ListEntry.cs
index 9a6ac250..97859916 100644
--- a/FFXIVClassic Map Server/packets/send/list/ListEntry.cs	
+++ b/FFXIVClassic Map Server/packets/send/list/ListEntry.cs	
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.packets.send.list
+namespace FFXIVClassic_Map_Server.packets.send.list
 {
     class ListEntry
     {
diff --git a/FFXIVClassic Map Server/packets/send/list/ListStartPacket.cs b/FFXIVClassic Map Server/packets/send/list/ListStartPacket.cs
index 9535703b..05fa6f90 100644
--- a/FFXIVClassic Map Server/packets/send/list/ListStartPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/list/ListStartPacket.cs	
@@ -1,10 +1,6 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.list
 {
diff --git a/FFXIVClassic Map Server/packets/send/list/ListUtils.cs b/FFXIVClassic Map Server/packets/send/list/ListUtils.cs
index 09866ddd..59318c8b 100644
--- a/FFXIVClassic Map Server/packets/send/list/ListUtils.cs	
+++ b/FFXIVClassic Map Server/packets/send/list/ListUtils.cs	
@@ -1,9 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace FFXIVClassic_Map_Server.packets.send.list
 {
diff --git a/FFXIVClassic Map Server/packets/send/list/SetListPropertyPacket.cs b/FFXIVClassic Map Server/packets/send/list/SetListPropertyPacket.cs
index ebec18c7..fcfadc63 100644
--- a/FFXIVClassic Map Server/packets/send/list/SetListPropertyPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/list/SetListPropertyPacket.cs	
@@ -1,12 +1,9 @@
-using FFXIVClassic_Lobby_Server.common;
-using FFXIVClassic_Lobby_Server.packets;
+using FFXIVClassic_Map_Server.common;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor
 {
diff --git a/FFXIVClassic Map Server/packets/send/login/0x2Packet.cs b/FFXIVClassic Map Server/packets/send/login/0x2Packet.cs
index fd7030aa..015b7f08 100644
--- a/FFXIVClassic Map Server/packets/send/login/0x2Packet.cs	
+++ b/FFXIVClassic Map Server/packets/send/login/0x2Packet.cs	
@@ -1,10 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.IO;
 
 namespace FFXIVClassic_Map_Server.packets.send.login
 {
diff --git a/FFXIVClassic Map Server/packets/send/login/0x7ResponsePacket.cs b/FFXIVClassic Map Server/packets/send/login/0x7ResponsePacket.cs
index c4cbde84..bad66f4d 100644
--- a/FFXIVClassic Map Server/packets/send/login/0x7ResponsePacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/login/0x7ResponsePacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.login
 {
diff --git a/FFXIVClassic Map Server/packets/send/player/AchievementEarnedPacket.cs b/FFXIVClassic Map Server/packets/send/player/AchievementEarnedPacket.cs
index 4b04676e..31764238 100644
--- a/FFXIVClassic Map Server/packets/send/player/AchievementEarnedPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/player/AchievementEarnedPacket.cs	
@@ -1,9 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System;
 
 namespace FFXIVClassic_Map_Server.packets.send.player
 {
diff --git a/FFXIVClassic Map Server/packets/send/player/InfoRequestResponsePacket.cs b/FFXIVClassic Map Server/packets/send/player/InfoRequestResponsePacket.cs
index c568d661..e771fe30 100644
--- a/FFXIVClassic Map Server/packets/send/player/InfoRequestResponsePacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/player/InfoRequestResponsePacket.cs	
@@ -1,12 +1,6 @@
-using FFXIVClassic_Lobby_Server.common;
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.lua;
-using System;
+using FFXIVClassic_Map_Server.lua;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.player
 {
diff --git a/FFXIVClassic Map Server/packets/send/player/SendAchievementRatePacket.cs b/FFXIVClassic Map Server/packets/send/player/SendAchievementRatePacket.cs
index dd821f51..a80c90b9 100644
--- a/FFXIVClassic Map Server/packets/send/player/SendAchievementRatePacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/player/SendAchievementRatePacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.player
 {
diff --git a/FFXIVClassic Map Server/packets/send/player/SetAchievementPointsPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetAchievementPointsPacket.cs
index 59b462b8..232548d9 100644
--- a/FFXIVClassic Map Server/packets/send/player/SetAchievementPointsPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/player/SetAchievementPointsPacket.cs	
@@ -1,10 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System;
 
 namespace FFXIVClassic_Map_Server.packets.send.player
 {
diff --git a/FFXIVClassic Map Server/packets/send/player/SetChocoboNamePacket.cs b/FFXIVClassic Map Server/packets/send/player/SetChocoboNamePacket.cs
index 9f0dacf4..b38bed3c 100644
--- a/FFXIVClassic Map Server/packets/send/player/SetChocoboNamePacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/player/SetChocoboNamePacket.cs	
@@ -1,9 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Text;
 
 namespace FFXIVClassic_Map_Server.packets.send.player
 {
diff --git a/FFXIVClassic Map Server/packets/send/player/SetCompletedAchievementsPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetCompletedAchievementsPacket.cs
index 054e3659..3ca74b8c 100644
--- a/FFXIVClassic Map Server/packets/send/player/SetCompletedAchievementsPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/player/SetCompletedAchievementsPacket.cs	
@@ -1,11 +1,5 @@
-using FFXIVClassic_Lobby_Server.common;
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using FFXIVClassic_Map_Server.common;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.player
 {
diff --git a/FFXIVClassic Map Server/packets/send/player/SetCurrentJobPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetCurrentJobPacket.cs
index 6e4aad85..e4043714 100644
--- a/FFXIVClassic Map Server/packets/send/player/SetCurrentJobPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/player/SetCurrentJobPacket.cs	
@@ -1,9 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System;
 
 namespace FFXIVClassic_Map_Server.packets.send.player
 {
diff --git a/FFXIVClassic Map Server/packets/send/player/SetCurrentMountChocoboPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetCurrentMountChocoboPacket.cs
index aa59d7ed..28c7bc2e 100644
--- a/FFXIVClassic Map Server/packets/send/player/SetCurrentMountChocoboPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/player/SetCurrentMountChocoboPacket.cs	
@@ -1,11 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.packets.send.player
+namespace FFXIVClassic_Map_Server.packets.send.player
 {
     class SetCurrentMountChocoboPacket
     {
diff --git a/FFXIVClassic Map Server/packets/send/player/SetCurrentMountGoobbuePacket.cs b/FFXIVClassic Map Server/packets/send/player/SetCurrentMountGoobbuePacket.cs
index 2ba84994..0429392c 100644
--- a/FFXIVClassic Map Server/packets/send/player/SetCurrentMountGoobbuePacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/player/SetCurrentMountGoobbuePacket.cs	
@@ -1,11 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.packets.send.player
+namespace FFXIVClassic_Map_Server.packets.send.player
 {
     class SetCurrentMountGoobbuePacket
     {
diff --git a/FFXIVClassic Map Server/packets/send/player/SetCutsceneBookPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetCutsceneBookPacket.cs
index 177cc2c3..3e9c4680 100644
--- a/FFXIVClassic Map Server/packets/send/player/SetCutsceneBookPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/player/SetCutsceneBookPacket.cs	
@@ -1,11 +1,7 @@
-using FFXIVClassic_Lobby_Server.common;
-using FFXIVClassic_Lobby_Server.packets;
+using FFXIVClassic_Map_Server.common;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.player
 {
diff --git a/FFXIVClassic Map Server/packets/send/player/SetGrandCompanyPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetGrandCompanyPacket.cs
index 5af08034..b175c2ea 100644
--- a/FFXIVClassic Map Server/packets/send/player/SetGrandCompanyPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/player/SetGrandCompanyPacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.actor
 {
diff --git a/FFXIVClassic Map Server/packets/send/player/SetHasChocoboPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetHasChocoboPacket.cs
index 0c63324f..bc7d9321 100644
--- a/FFXIVClassic Map Server/packets/send/player/SetHasChocoboPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/player/SetHasChocoboPacket.cs	
@@ -1,11 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.packets.send.player
+namespace FFXIVClassic_Map_Server.packets.send.player
 {
     class SetHasChocoboPacket
     {
diff --git a/FFXIVClassic Map Server/packets/send/player/SetHasGoobbuePacket.cs b/FFXIVClassic Map Server/packets/send/player/SetHasGoobbuePacket.cs
index f798fc5f..c4f28e2c 100644
--- a/FFXIVClassic Map Server/packets/send/player/SetHasGoobbuePacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/player/SetHasGoobbuePacket.cs	
@@ -1,11 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.packets.send.player
+namespace FFXIVClassic_Map_Server.packets.send.player
 {
     class SetHasGoobbuePacket
     {
diff --git a/FFXIVClassic Map Server/packets/send/player/SetLatestAchievementsPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetLatestAchievementsPacket.cs
index 174580f4..155d27b0 100644
--- a/FFXIVClassic Map Server/packets/send/player/SetLatestAchievementsPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/player/SetLatestAchievementsPacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.player
 {
diff --git a/FFXIVClassic Map Server/packets/send/player/SetPlayerDreamPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetPlayerDreamPacket.cs
index e943807e..8f1df9b3 100644
--- a/FFXIVClassic Map Server/packets/send/player/SetPlayerDreamPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/player/SetPlayerDreamPacket.cs	
@@ -1,9 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System;
 
 namespace FFXIVClassic_Map_Server.packets.send.player
 {
diff --git a/FFXIVClassic Map Server/packets/send/player/SetPlayerTitlePacket.cs b/FFXIVClassic Map Server/packets/send/player/SetPlayerTitlePacket.cs
index 8a5b10ae..155e8cd3 100644
--- a/FFXIVClassic Map Server/packets/send/player/SetPlayerTitlePacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/player/SetPlayerTitlePacket.cs	
@@ -1,9 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System;
 
 namespace FFXIVClassic_Map_Server.packets.send.player
 {
diff --git a/FFXIVClassic Map Server/packets/send/player/_0x196Packet.cs b/FFXIVClassic Map Server/packets/send/player/_0x196Packet.cs
index 7be6e752..ab5e0e3f 100644
--- a/FFXIVClassic Map Server/packets/send/player/_0x196Packet.cs	
+++ b/FFXIVClassic Map Server/packets/send/player/_0x196Packet.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.player
 {
diff --git a/FFXIVClassic Map Server/packets/send/recruitment/CurrentRecruitmentDetailsPacket.cs b/FFXIVClassic Map Server/packets/send/recruitment/CurrentRecruitmentDetailsPacket.cs
index fb2ca6cf..77c9095f 100644
--- a/FFXIVClassic Map Server/packets/send/recruitment/CurrentRecruitmentDetailsPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/recruitment/CurrentRecruitmentDetailsPacket.cs	
@@ -1,11 +1,7 @@
-using FFXIVClassic_Lobby_Server.packets;
-using FFXIVClassic_Map_Server.dataobjects;
+using FFXIVClassic_Map_Server.dataobjects;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.recruitment
 {
diff --git a/FFXIVClassic Map Server/packets/send/recruitment/EndRecruitmentPacket.cs b/FFXIVClassic Map Server/packets/send/recruitment/EndRecruitmentPacket.cs
index cf67203a..4709f0bf 100644
--- a/FFXIVClassic Map Server/packets/send/recruitment/EndRecruitmentPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/recruitment/EndRecruitmentPacket.cs	
@@ -1,11 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.packets.send.recruitment
+namespace FFXIVClassic_Map_Server.packets.send.recruitment
 {
     class EndRecruitmentPacket
     {
diff --git a/FFXIVClassic Map Server/packets/send/recruitment/RecruiterStatePacket.cs b/FFXIVClassic Map Server/packets/send/recruitment/RecruiterStatePacket.cs
index 50d4b82e..6e13ac72 100644
--- a/FFXIVClassic Map Server/packets/send/recruitment/RecruiterStatePacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/recruitment/RecruiterStatePacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.recruitment
 {
diff --git a/FFXIVClassic Map Server/packets/send/recruitment/StartRecruitingResponse.cs b/FFXIVClassic Map Server/packets/send/recruitment/StartRecruitingResponse.cs
index 829b9ce2..d4a8b87d 100644
--- a/FFXIVClassic Map Server/packets/send/recruitment/StartRecruitingResponse.cs	
+++ b/FFXIVClassic Map Server/packets/send/recruitment/StartRecruitingResponse.cs	
@@ -1,11 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.packets.send.recruitment
+namespace FFXIVClassic_Map_Server.packets.send.recruitment
 {
     class StartRecruitingResponse
     {
diff --git a/FFXIVClassic Map Server/packets/send/social/BlacklistAddedPacket.cs b/FFXIVClassic Map Server/packets/send/social/BlacklistAddedPacket.cs
index 67c817c7..9962a699 100644
--- a/FFXIVClassic Map Server/packets/send/social/BlacklistAddedPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/social/BlacklistAddedPacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
+using System.IO;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.social
 {
diff --git a/FFXIVClassic Map Server/packets/send/social/BlacklistRemovedPacket.cs b/FFXIVClassic Map Server/packets/send/social/BlacklistRemovedPacket.cs
index c1466a72..ff6cdc13 100644
--- a/FFXIVClassic Map Server/packets/send/social/BlacklistRemovedPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/social/BlacklistRemovedPacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
+using System.IO;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.social
 {
diff --git a/FFXIVClassic Map Server/packets/send/social/FriendStatusPacket.cs b/FFXIVClassic Map Server/packets/send/social/FriendStatusPacket.cs
index 0a7b48f0..3ddb2e1b 100644
--- a/FFXIVClassic Map Server/packets/send/social/FriendStatusPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/social/FriendStatusPacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.social
 {
diff --git a/FFXIVClassic Map Server/packets/send/social/FriendlistAddedPacket.cs b/FFXIVClassic Map Server/packets/send/social/FriendlistAddedPacket.cs
index 51036bb8..6e6a69e5 100644
--- a/FFXIVClassic Map Server/packets/send/social/FriendlistAddedPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/social/FriendlistAddedPacket.cs	
@@ -1,10 +1,6 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.social
 {
diff --git a/FFXIVClassic Map Server/packets/send/social/FriendlistRemovedPacket.cs b/FFXIVClassic Map Server/packets/send/social/FriendlistRemovedPacket.cs
index 8fa68eb1..95882a58 100644
--- a/FFXIVClassic Map Server/packets/send/social/FriendlistRemovedPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/social/FriendlistRemovedPacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
+using System.IO;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.social
 {
diff --git a/FFXIVClassic Map Server/packets/send/social/SendBlacklistPacket.cs b/FFXIVClassic Map Server/packets/send/social/SendBlacklistPacket.cs
index 893fb2b3..5f7dccfa 100644
--- a/FFXIVClassic Map Server/packets/send/social/SendBlacklistPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/social/SendBlacklistPacket.cs	
@@ -1,10 +1,6 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.social
 {
diff --git a/FFXIVClassic Map Server/packets/send/social/SendFriendlistPacket.cs b/FFXIVClassic Map Server/packets/send/social/SendFriendlistPacket.cs
index 35d0fb7e..7d8ed27c 100644
--- a/FFXIVClassic Map Server/packets/send/social/SendFriendlistPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/social/SendFriendlistPacket.cs	
@@ -1,10 +1,6 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.social
 {
diff --git a/FFXIVClassic Map Server/packets/send/supportdesk/EndGMTicketPacket.cs b/FFXIVClassic Map Server/packets/send/supportdesk/EndGMTicketPacket.cs
index 676f53f9..b4370f63 100644
--- a/FFXIVClassic Map Server/packets/send/supportdesk/EndGMTicketPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/supportdesk/EndGMTicketPacket.cs	
@@ -1,11 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.packets.send.supportdesk
+namespace FFXIVClassic_Map_Server.packets.send.supportdesk
 {
     class EndGMTicketPacket
     {
diff --git a/FFXIVClassic Map Server/packets/send/supportdesk/FaqBodyResponsePacket.cs b/FFXIVClassic Map Server/packets/send/supportdesk/FaqBodyResponsePacket.cs
index caa4cc44..e7f2ce35 100644
--- a/FFXIVClassic Map Server/packets/send/supportdesk/FaqBodyResponsePacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/supportdesk/FaqBodyResponsePacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
+using System.IO;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.supportdesk
 {
diff --git a/FFXIVClassic Map Server/packets/send/supportdesk/FaqListResponsePacket.cs b/FFXIVClassic Map Server/packets/send/supportdesk/FaqListResponsePacket.cs
index 2acfdd28..a4141982 100644
--- a/FFXIVClassic Map Server/packets/send/supportdesk/FaqListResponsePacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/supportdesk/FaqListResponsePacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
+using System.IO;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.supportdesk
 {
diff --git a/FFXIVClassic Map Server/packets/send/supportdesk/GMTicketPacket.cs b/FFXIVClassic Map Server/packets/send/supportdesk/GMTicketPacket.cs
index eddd09d6..811f7177 100644
--- a/FFXIVClassic Map Server/packets/send/supportdesk/GMTicketPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/supportdesk/GMTicketPacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
+using System.IO;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.supportdesk
 {
diff --git a/FFXIVClassic Map Server/packets/send/supportdesk/GMTicketSentResponsePacket.cs b/FFXIVClassic Map Server/packets/send/supportdesk/GMTicketSentResponsePacket.cs
index cd40e5c2..f1135116 100644
--- a/FFXIVClassic Map Server/packets/send/supportdesk/GMTicketSentResponsePacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/supportdesk/GMTicketSentResponsePacket.cs	
@@ -1,11 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.packets.send.supportdesk
+namespace FFXIVClassic_Map_Server.packets.send.supportdesk
 {
     class GMTicketSentResponsePacket
     {
diff --git a/FFXIVClassic Map Server/packets/send/supportdesk/IssueListResponsePacket.cs b/FFXIVClassic Map Server/packets/send/supportdesk/IssueListResponsePacket.cs
index fad44d70..58d32f5c 100644
--- a/FFXIVClassic Map Server/packets/send/supportdesk/IssueListResponsePacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/supportdesk/IssueListResponsePacket.cs	
@@ -1,10 +1,5 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
+using System.IO;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.packets.send.supportdesk
 {
diff --git a/FFXIVClassic Map Server/packets/send/supportdesk/StartGMTicketPacket.cs b/FFXIVClassic Map Server/packets/send/supportdesk/StartGMTicketPacket.cs
index a15715a5..a7ebe4db 100644
--- a/FFXIVClassic Map Server/packets/send/supportdesk/StartGMTicketPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/supportdesk/StartGMTicketPacket.cs	
@@ -1,11 +1,4 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FFXIVClassic_Map_Server.packets.send.supportdesk
+namespace FFXIVClassic_Map_Server.packets.send.supportdesk
 {
     class StartGMTicketPacket
     {
diff --git a/FFXIVClassic Map Server/utils/ActorPropertyPacketUtil.cs b/FFXIVClassic Map Server/utils/ActorPropertyPacketUtil.cs
index be3e2f6b..0447d0d4 100644
--- a/FFXIVClassic Map Server/utils/ActorPropertyPacketUtil.cs	
+++ b/FFXIVClassic Map Server/utils/ActorPropertyPacketUtil.cs	
@@ -1,11 +1,6 @@
-using FFXIVClassic_Lobby_Server.packets;
-using System;
+using FFXIVClassic_Map_Server.packets;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using FFXIVClassic_Map_Server.packets.send.actor;
-using FFXIVClassic_Map_Server.dataobjects;
 using FFXIVClassic_Map_Server.Actors;
 
 namespace FFXIVClassic_Map_Server.utils
diff --git a/FFXIVClassic Map Server/utils/CharacterUtils.cs b/FFXIVClassic Map Server/utils/CharacterUtils.cs
index a1ff65dd..54c8551d 100644
--- a/FFXIVClassic Map Server/utils/CharacterUtils.cs	
+++ b/FFXIVClassic Map Server/utils/CharacterUtils.cs	
@@ -1,9 +1,5 @@
-using FFXIVClassic_Lobby_Server.common;
+using FFXIVClassic_Map_Server.common;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.utils
 {
diff --git a/FFXIVClassic Map Server/utils/SQLGeneration.cs b/FFXIVClassic Map Server/utils/SQLGeneration.cs
index 33375438..ea2f465e 100644
--- a/FFXIVClassic Map Server/utils/SQLGeneration.cs	
+++ b/FFXIVClassic Map Server/utils/SQLGeneration.cs	
@@ -1,14 +1,11 @@
-using FFXIVClassic_Lobby_Server;
-using FFXIVClassic_Lobby_Server.common;
+using FFXIVClassic_Map_Server.common;
 using FFXIVClassic_Map_Server.packets.send.player;
 using MySql.Data.MySqlClient;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 
 namespace FFXIVClassic_Map_Server.utils
 {
@@ -82,13 +79,15 @@ namespace FFXIVClassic_Map_Server.utils
 
                         cmd.Parameters["@placename"].Value = placenames[pId];
 
-                        Console.WriteLine("Wrote: {0}", id);
+                        Log.debug(String.Format("Wrote: {0}", id));
                         cmd.ExecuteNonQuery();
 
                     }
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+                }
                 finally
                 {
                     conn.Dispose();
@@ -138,13 +137,15 @@ namespace FFXIVClassic_Map_Server.utils
                         cmd.Parameters["@id"].Value = id;
                         cmd.Parameters["@displayNameId"].Value = nameId;
 
-                        Console.WriteLine("Wrote: {0} : {1}", id, nameId);
+                        Log.debug(String.Format("Wrote: {0} : {1}", id, nameId));
                         cmd.ExecuteNonQuery();
 
                     }
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+                }
                 finally
                 {
                     conn.Dispose();
@@ -202,13 +203,15 @@ namespace FFXIVClassic_Map_Server.utils
 
                         cmd.Parameters["@id"].Value = id;
 
-                        Console.WriteLine("Wrote: {0}", id);                        
+                        Log.debug(String.Format("Wrote: {0}", id));                        
                         cmd.ExecuteNonQuery();
 
                     }
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+                }
                 finally
                 {
                     conn.Dispose();
@@ -285,7 +288,7 @@ namespace FFXIVClassic_Map_Server.utils
                         else if (id == 1500)
                             otherId = SetCompletedAchievementsPacket.CATEGORY_GRAND_COMPANY;
 
-                        Console.WriteLine("Wrote: {0} : {1} : {2} : {3}", id, name, otherId, points);
+                        Log.debug(String.Format("Wrote: {0} : {1} : {2} : {3}", id, name, otherId, points));
                         cmd.Parameters["@id"].Value = id;
                         cmd.Parameters["@name"].Value = name;
                         cmd.Parameters["@otherId"].Value = otherId;                        
@@ -296,7 +299,9 @@ namespace FFXIVClassic_Map_Server.utils
                     }
                 }
                 catch (MySqlException e)
-                { Console.WriteLine(e); }
+                {
+                    Log.error(e.ToString());
+                }
                 finally
                 {
                     conn.Dispose();
@@ -333,7 +338,7 @@ namespace FFXIVClassic_Map_Server.utils
 
                             string output2 = String.Format("mStaticActors.Add(0x{0:x}, new {2}(0x{0:x}, \"{1}\"));", id, output.Substring(1 + output.LastIndexOf("/")), output.Split('/')[1]);
 
-                            Console.WriteLine(output2);
+                            Log.debug(output2);
                             w.WriteLine(output2);
 
                         }
diff --git a/data/config.ini b/data/lobby_config.ini
similarity index 91%
rename from data/config.ini
rename to data/lobby_config.ini
index 7caf0001..4a9db1a8 100644
--- a/data/config.ini
+++ b/data/lobby_config.ini
@@ -8,4 +8,4 @@ host=127.0.0.1
 port=3306
 database=ffxiv_server
 username=root
-password=
\ No newline at end of file
+password=root
\ No newline at end of file
diff --git a/data/map_config.ini b/data/map_config.ini
new file mode 100644
index 00000000..4a9db1a8
--- /dev/null
+++ b/data/map_config.ini
@@ -0,0 +1,11 @@
+[General]
+server_ip=127.0.0.1
+showtimestamp = true
+
+[Database]
+worldid=1
+host=127.0.0.1
+port=3306
+database=ffxiv_server
+username=root
+password=root
\ No newline at end of file
diff --git a/sql/export.sh b/sql/export.sh
new file mode 100644
index 00000000..9070a4e9
--- /dev/null
+++ b/sql/export.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+EXPORT_PATH=C:/repositories/ffxiv-classic-server/sql/
+USER=root
+PASS=root
+DBNAME=ffxiv_server
+for T in `mysqlshow -u $USER -p$PASS $DBNAME %`;
+do
+    echo "Backing up $T"
+    mysqldump -u $USER -p$PASS $DBNAME $T --extended-insert=FALSE --no-tablespaces > $EXPORT_PATH/$T.sql
+done;
\ No newline at end of file
diff --git a/sql/import.sh b/sql/import.sh
new file mode 100644
index 00000000..c9767e0b
--- /dev/null
+++ b/sql/import.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+IMPORT_PATH=C:/repositories/ffxiv-classic-server/sql/
+USER=root
+PASS=root
+DBNAME=ffxiv_server
+
+ECHO Creating Database $DBNAME
+mysqladmin -h localhost -u $USER -p$PASS DROP $DBNAME
+
+ECHO Creating Database $DBNAME
+mysqladmin -h localhost -u $USER -p$PASS CREATE $DBNAME
+
+ECHO Loading $DBNAME tables into the database
+cd $IMPORT_PATH
+FOR %%X IN (*.sql) DO ECHO Importing %%X & "c:\program files\mysql\mysql server 5.7\bin\mysql" $DBNAME -h localhost -u $USER -p$PASS < %%X
+
+ECHO Finished!
\ No newline at end of file