diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index ccde46894a..9a9f85a269 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2007/02/01
+	* Reorganized the vs6 project files (update will follow)
 	* Fixed an accidental change in r9758 (edit&continue) [ultramage]
 	* Added support for mob skill target 'randomtarget', when specified, it
 	  will pick a random enemy from within the skill's cast range. [Skotlex]
diff --git a/vcproj-6/trunk.dsw b/eAthena-6.dsw
similarity index 100%
rename from vcproj-6/trunk.dsw
rename to eAthena-6.dsw
diff --git a/vcproj-6/char/char.dsp b/vcproj-6/char-server_txt.dsp
similarity index 100%
rename from vcproj-6/char/char.dsp
rename to vcproj-6/char-server_txt.dsp
diff --git a/vcproj-6/char/char.001 b/vcproj-6/char/char.001
deleted file mode 100644
index 89ebb587b8..0000000000
--- a/vcproj-6/char/char.001
+++ /dev/null
@@ -1,285 +0,0 @@
-# Microsoft Developer Studio Project File - Name="char" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=char - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "char.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "char.mak" CFG="char - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "char - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D PACKETVER=6 /D "TXT_ONLY" /D "NEW_006b" /D "__WIN32" /D "LOCALZLIB" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /YX /FD /c
-# ADD BASE RSC /l 0x419 /d "NDEBUG"
-# ADD RSC /l 0x419 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib zdll.lib /nologo /subsystem:console /machine:I386 /out:"../../char.exe" /libpath:"../../lib"
-# Begin Target
-
-# Name "char - Win32 Release"
-# Begin Group "common"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\common\cbasetypes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\core.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\core.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\db.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\db.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\ers.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\ers.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\grfio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\grfio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\lock.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\lock.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\malloc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\malloc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\mapindex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\mapindex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\mmo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\nullpo.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\nullpo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\plugin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\plugins.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\plugins.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\showmsg.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\showmsg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\socket.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\socket.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\strlib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\strlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\timer.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\timer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\utils.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\utils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\version.h
-# End Source File
-# End Group
-# Begin Group "char"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\char\char.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char\char.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char\int_guild.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char\int_guild.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char\int_party.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char\int_party.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char\int_pet.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char\int_pet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char\int_status.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char\int_status.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char\int_storage.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char\int_storage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char\inter.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char\inter.h
-# End Source File
-# End Group
-# Begin Group "zlib"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\zlib\crypt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\ioapi.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\ioapi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\iowin32.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\iowin32.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\unzip.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\unzip.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\zconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\zlib.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/vcproj-6/char/char.dsw b/vcproj-6/char/char.dsw
deleted file mode 100644
index e27c585227..0000000000
--- a/vcproj-6/char/char.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "char"=".\char.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/vcproj-6/char/char.opt b/vcproj-6/char/char.opt
deleted file mode 100644
index 24dfe59b65..0000000000
Binary files a/vcproj-6/char/char.opt and /dev/null differ
diff --git a/vcproj-6/char_sql/char_sql.001 b/vcproj-6/char_sql/char_sql.001
deleted file mode 100644
index 9da8ed6b20..0000000000
--- a/vcproj-6/char_sql/char_sql.001
+++ /dev/null
@@ -1,286 +0,0 @@
-# Microsoft Developer Studio Project File - Name="char_sql" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=char_sql - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "char_sql.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "char_sql.mak" CFG="char_sql - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "char_sql - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src\common" /I "..\..\src\mysql" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D PACKETVER=6 /D "NEW_006b" /D "__WIN32" /D "LOCALZLIB" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /YX /FD /c
-# ADD BASE RSC /l 0x419 /d "NDEBUG"
-# ADD RSC /l 0x419 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib zdll.lib libmysql.lib /nologo /subsystem:console /machine:I386 /out:"../../char_sql.exe" /libpath:"../../lib"
-# Begin Target
-
-# Name "char_sql - Win32 Release"
-# Begin Group "common"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\common\cbasetypes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\core.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\core.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\db.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\db.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\ers.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\ers.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\grfio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\grfio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\lock.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\lock.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\malloc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\malloc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\mapindex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\mapindex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\mmo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\nullpo.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\nullpo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\plugin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\plugins.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\plugins.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\showmsg.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\showmsg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\socket.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\socket.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\strlib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\strlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\timer.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\timer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\utils.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\utils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\version.h
-# End Source File
-# End Group
-# Begin Group "char_sql"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\char.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\char.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\int_guild.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\int_guild.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\int_party.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\int_party.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\int_pet.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\int_pet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\int_storage.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\int_storage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\inter.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\inter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\itemdb.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\itemdb.h
-# End Source File
-# End Group
-# Begin Group "zlib"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\zlib\crypt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\ioapi.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\ioapi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\iowin32.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\iowin32.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\unzip.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\unzip.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\zconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\zlib.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/vcproj-6/char_sql/char_sql.dsp b/vcproj-6/char_sql/char_sql.dsp
deleted file mode 100644
index bd4ab8740e..0000000000
--- a/vcproj-6/char_sql/char_sql.dsp
+++ /dev/null
@@ -1,286 +0,0 @@
-# Microsoft Developer Studio Project File - Name="char_sql" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=char_sql - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "char_sql.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "char_sql.mak" CFG="char_sql - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "char_sql - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src\common" /I "..\..\src\mysql" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D PACKETVER=6 /D "NEW_006b" /D "__WIN32" /D "LOCALZLIB" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /YX /FD /c
-# ADD BASE RSC /l 0x419 /d "NDEBUG"
-# ADD RSC /l 0x419 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib zdll.lib libmysql.lib /nologo /subsystem:console /machine:I386 /out:"../../char_sql.exe" /libpath:"../../lib"
-# Begin Target
-
-# Name "char_sql - Win32 Release"
-# Begin Group "common"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\common\cbasetypes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\core.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\core.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\db.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\db.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\ers.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\ers.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\grfio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\grfio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\lock.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\lock.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\malloc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\malloc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\mapindex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\mapindex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\mmo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\nullpo.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\nullpo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\plugin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\plugins.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\plugins.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\showmsg.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\showmsg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\socket.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\socket.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\strlib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\strlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\timer.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\timer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\utils.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\utils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\version.h
-# End Source File
-# End Group
-# Begin Group "char_sql"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\char.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\char.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\int_guild.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\int_guild.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\int_party.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\int_party.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\int_pet.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\int_pet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\int_storage.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\int_storage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\inter.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\inter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\itemdb.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\char_sql\itemdb.h
-# End Source File
-# End Group
-# Begin Group "zlib"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\zlib\crypt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\ioapi.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\ioapi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\iowin32.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\iowin32.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\unzip.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\unzip.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\zconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\zlib.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/vcproj-6/login_sql/login_sql.dsp b/vcproj-6/login-server_sql.dsp
similarity index 100%
rename from vcproj-6/login_sql/login_sql.dsp
rename to vcproj-6/login-server_sql.dsp
diff --git a/vcproj-6/login/login.dsp b/vcproj-6/login-server_txt.dsp
similarity index 100%
rename from vcproj-6/login/login.dsp
rename to vcproj-6/login-server_txt.dsp
diff --git a/vcproj-6/login/login.001 b/vcproj-6/login/login.001
deleted file mode 100644
index 2b6675f05c..0000000000
--- a/vcproj-6/login/login.001
+++ /dev/null
@@ -1,250 +0,0 @@
-# Microsoft Developer Studio Project File - Name="login" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=login - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "login.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "login.mak" CFG="login - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "login - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D PACKETVER=6 /D "TXT_ONLY" /D "NEW_006b" /D "__WIN32" /D "LOCALZLIB" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /YX /FD /c
-# ADD BASE RSC /l 0x419 /d "NDEBUG"
-# ADD RSC /l 0x419 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WSOCK32.lib zdll.lib /nologo /subsystem:console /machine:I386 /out:"../../login-server.exe" /libpath:"../../lib"
-# SUBTRACT LINK32 /pdb:none
-# Begin Target
-
-# Name "login - Win32 Release"
-# Begin Group "common"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\common\cbasetypes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\core.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\core.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\db.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\db.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\ers.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\ers.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\grfio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\grfio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\lock.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\lock.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\malloc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\malloc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\mapindex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\mapindex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\mmo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\nullpo.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\nullpo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\plugin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\plugins.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\plugins.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\showmsg.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\showmsg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\socket.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\socket.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\strlib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\strlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\svnversion.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\timer.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\timer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\utils.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\utils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\version.h
-# End Source File
-# End Group
-# Begin Group "login"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\login\login.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\login\login.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\login\md5calc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\login\md5calc.h
-# End Source File
-# End Group
-# Begin Group "zlib"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\zlib\crypt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\ioapi.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\ioapi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\iowin32.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\iowin32.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\unzip.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\unzip.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\zconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\zlib.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/vcproj-6/login_sql/login_sql.001 b/vcproj-6/login_sql/login_sql.001
deleted file mode 100644
index 5c72242b92..0000000000
--- a/vcproj-6/login_sql/login_sql.001
+++ /dev/null
@@ -1,250 +0,0 @@
-# Microsoft Developer Studio Project File - Name="login_sql" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=login_sql - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "login_sql.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "login_sql.mak" CFG="login_sql - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "login_sql - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src\common" /I "..\..\src\mysql" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D PACKETVER=6 /D "NEW_006b" /D "__WIN32" /D "LOCALZLIB" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /YX /FD /c
-# ADD BASE RSC /l 0x419 /d "NDEBUG"
-# ADD RSC /l 0x419 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WSOCK32.lib zdll.lib libmysql.lib /nologo /subsystem:console /machine:I386 /out:"../../login-server_sql.exe" /libpath:"../../lib"
-# Begin Target
-
-# Name "login_sql - Win32 Release"
-# Begin Group "common"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\common\cbasetypes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\core.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\core.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\db.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\db.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\ers.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\ers.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\grfio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\grfio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\lock.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\lock.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\malloc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\malloc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\mapindex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\mapindex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\mmo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\nullpo.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\nullpo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\plugin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\plugins.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\plugins.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\showmsg.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\showmsg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\socket.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\socket.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\strlib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\strlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\svnversion.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\timer.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\timer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\utils.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\utils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\version.h
-# End Source File
-# End Group
-# Begin Group "login_sql"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\login_sql\login.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\login_sql\login.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\login_sql\md5calc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\login_sql\md5calc.h
-# End Source File
-# End Group
-# Begin Group "zlib"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\zlib\crypt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\ioapi.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\ioapi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\iowin32.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\iowin32.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\unzip.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\unzip.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\zconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\zlib.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/vcproj-6/map_sql/map_sql.dsp b/vcproj-6/map-server_sql.dsp
similarity index 100%
rename from vcproj-6/map_sql/map_sql.dsp
rename to vcproj-6/map-server_sql.dsp
diff --git a/vcproj-6/map/map.dsp b/vcproj-6/map-server_txt.dsp
similarity index 100%
rename from vcproj-6/map/map.dsp
rename to vcproj-6/map-server_txt.dsp
diff --git a/vcproj-6/map/map.001 b/vcproj-6/map/map.001
deleted file mode 100644
index 29261054c3..0000000000
--- a/vcproj-6/map/map.001
+++ /dev/null
@@ -1,477 +0,0 @@
-# Microsoft Developer Studio Project File - Name="map" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=map - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "map.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "map.mak" CFG="map - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "map - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D PACKETVER=6 /D "TXT_ONLY" /D "NEW_006b" /D "__WIN32" /D "LOCALZLIB" /D "PCRE_SUPPORT" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /YX /FD /c
-# ADD BASE RSC /l 0x419 /d "NDEBUG"
-# ADD RSC /l 0x419 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WSOCK32.lib zdll.lib pcre.lib /nologo /subsystem:console /machine:I386 /out:"../../map-server.exe" /libpath:"../../lib"
-# Begin Target
-
-# Name "map - Win32 Release"
-# Begin Group "common"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\common\cbasetypes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\core.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\core.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\db.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\db.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\ers.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\ers.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\grfio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\grfio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\lock.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\lock.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\malloc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\malloc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\mapindex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\mapindex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\mmo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\nullpo.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\nullpo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\plugin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\plugins.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\plugins.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\showmsg.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\showmsg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\socket.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\socket.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\strlib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\strlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\svnversion.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\timer.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\timer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\utils.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\utils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\version.h
-# End Source File
-# End Group
-# Begin Group "map"
-
-# PROP Default_Filter ""
-# Begin Group "cpp"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\map\atcommand.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\battle.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\charcommand.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\charsave.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\chat.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\chrif.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\clif.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\date.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\guild.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\intif.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\irc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\itemdb.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\log.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\mail.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\map.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\mercenary.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\mob.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\npc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\npc_chat.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\party.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\path.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\pc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\pet.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\script.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\skill.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\status.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\storage.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\trade.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\unit.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\vending.c
-# End Source File
-# End Group
-# Begin Group "h"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\map\atcommand.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\battle.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\charcommand.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\charsave.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\chat.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\chrif.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\clif.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\date.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\guild.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\intif.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\irc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\itemdb.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\log.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\mail.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\map.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\mercenary.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\mob.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\npc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\party.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\pc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\pcre.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\pet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\script.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\skill.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\status.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\storage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\trade.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\unit.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\vending.h
-# End Source File
-# End Group
-# End Group
-# Begin Group "zlib"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\zlib\crypt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\ioapi.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\ioapi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\iowin32.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\iowin32.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\unzip.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\unzip.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\zconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\zlib.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/vcproj-6/map_sql/map_sql.001 b/vcproj-6/map_sql/map_sql.001
deleted file mode 100644
index 6e76bac32f..0000000000
--- a/vcproj-6/map_sql/map_sql.001
+++ /dev/null
@@ -1,461 +0,0 @@
-# Microsoft Developer Studio Project File - Name="map_sql" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=map_sql - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "map_sql.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "map_sql.mak" CFG="map_sql - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "map_sql - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\src\common" /I "..\..\src\mysql" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D PACKETVER=6 /D "NEW_006b" /D "__WIN32" /D "LOCALZLIB" /D "PCRE_SUPPORT" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /YX /FD /c
-# ADD BASE RSC /l 0x419 /d "NDEBUG"
-# ADD RSC /l 0x419 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib WSOCK32.lib zdll.lib libmysql.lib pcre.lib /nologo /subsystem:console /machine:I386 /out:"../../map-server_sql.exe" /libpath:"../../lib"
-# Begin Target
-
-# Name "map_sql - Win32 Release"
-# Begin Group "common"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\common\cbasetypes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\core.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\core.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\db.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\db.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\ers.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\ers.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\grfio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\grfio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\lock.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\lock.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\malloc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\malloc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\mapindex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\mapindex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\mmo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\nullpo.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\nullpo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\plugin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\plugins.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\plugins.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\showmsg.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\showmsg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\socket.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\socket.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\strlib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\strlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\svnversion.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\timer.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\timer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\utils.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\utils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\version.h
-# End Source File
-# End Group
-# Begin Group "map"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\map\atcommand.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\atcommand.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\battle.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\battle.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\charcommand.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\charcommand.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\charsave.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\charsave.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\chat.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\chat.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\chrif.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\chrif.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\clif.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\clif.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\date.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\date.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\guild.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\guild.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\intif.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\intif.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\irc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\irc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\itemdb.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\itemdb.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\log.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\log.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\mail.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\mail.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\map.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\map.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\mercenary.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\mercenary.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\mob.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\mob.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\npc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\npc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\npc_chat.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\party.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\party.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\path.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\pc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\pc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\pcre.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\pet.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\pet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\script.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\script.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\skill.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\skill.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\status.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\status.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\storage.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\storage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\trade.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\trade.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\vending.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\map\vending.h
-# End Source File
-# End Group
-# Begin Group "zlib"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\zlib\crypt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\ioapi.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\ioapi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\iowin32.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\iowin32.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\unzip.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\unzip.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\zconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\zlib\zlib.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/vcproj-6/trunk.opt b/vcproj-6/trunk.opt
deleted file mode 100644
index 5867ca30e4..0000000000
Binary files a/vcproj-6/trunk.opt and /dev/null differ