diff --git a/cbp/ModIRC.cbp b/cbp/ModIRC.cbp
index 34f94b78..58ee279d 100644
--- a/cbp/ModIRC.cbp
+++ b/cbp/ModIRC.cbp
@@ -196,7 +196,7 @@
 			</Target>
 			<Target title="Win32 Debug Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win32-d/mod_irc32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win32-d/standalone/mod_irc32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win32-d/" />
 				<Option object_output="../obj/mingw32-d/" />
 				<Option type="3" />
@@ -223,7 +223,7 @@
 			</Target>
 			<Target title="Win32 Release Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win32/mod_irc32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win32/standalone/mod_irc32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win32/" />
 				<Option object_output="../obj/mingw32/" />
 				<Option type="3" />
@@ -251,7 +251,7 @@
 			</Target>
 			<Target title="Win64 Debug Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win64-d/mod_irc64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win64-d/standalone/mod_irc64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win64-d/" />
 				<Option object_output="../obj/mingw64-d/" />
 				<Option type="3" />
@@ -279,7 +279,7 @@
 			</Target>
 			<Target title="Win64 Release Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win64/mod_irc64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win64/standalone/mod_irc64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win64/" />
 				<Option object_output="../obj/mingw64/" />
 				<Option type="3" />
@@ -308,7 +308,7 @@
 			</Target>
 			<Target title="Linux32 Debug Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux32-d/mod_irc32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux32-d/standalone/mod_irc32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux32-d/" />
 				<Option object_output="../obj/gcc32-d/" />
 				<Option type="3" />
@@ -334,7 +334,7 @@
 			</Target>
 			<Target title="Linux32 Release Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux32/mod_irc32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux32/standalone/mod_irc32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux32/" />
 				<Option object_output="../obj/gcc32/" />
 				<Option type="3" />
@@ -361,7 +361,7 @@
 			</Target>
 			<Target title="Linux64 Debug Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux64-d/mod_irc64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux64-d/standalone/mod_irc64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux64-d/" />
 				<Option object_output="../obj/gcc64-d/" />
 				<Option type="3" />
@@ -388,7 +388,7 @@
 			</Target>
 			<Target title="Linux64 Release Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux64/mod_irc64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux64/standalone/mod_irc64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux64/" />
 				<Option object_output="../obj/gcc64/" />
 				<Option type="3" />
diff --git a/cbp/ModJSON.cbp b/cbp/ModJSON.cbp
index 7c6a9817..8f062ae4 100644
--- a/cbp/ModJSON.cbp
+++ b/cbp/ModJSON.cbp
@@ -188,7 +188,7 @@
 			</Target>
 			<Target title="Win32 Debug Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win32-d/mod_json32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win32-d/standalone/mod_json32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win32-d/" />
 				<Option object_output="../obj/mingw32-d/" />
 				<Option type="3" />
@@ -213,7 +213,7 @@
 			</Target>
 			<Target title="Win32 Release Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win32/mod_json32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win32/standalone/mod_json32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win32/" />
 				<Option object_output="../obj/mingw32/" />
 				<Option type="3" />
@@ -239,7 +239,7 @@
 			</Target>
 			<Target title="Win64 Debug Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win64-d/mod_json64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win64-d/standalone/mod_json64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win64-d/" />
 				<Option object_output="../obj/mingw64-d/" />
 				<Option type="3" />
@@ -265,7 +265,7 @@
 			</Target>
 			<Target title="Win64 Release Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win64/mod_json64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win64/standalone/mod_json64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win64/" />
 				<Option object_output="../obj/mingw64/" />
 				<Option type="3" />
@@ -292,7 +292,7 @@
 			</Target>
 			<Target title="Linux32 Debug Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux32-d/mod_json32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux32-d/standalone/mod_json32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux32-d/" />
 				<Option object_output="../obj/gcc32-d/" />
 				<Option type="3" />
@@ -318,7 +318,7 @@
 			</Target>
 			<Target title="Linux32 Release Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux32/mod_json32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux32/standalone/mod_json32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux32/" />
 				<Option object_output="../obj/gcc32/" />
 				<Option type="3" />
@@ -345,7 +345,7 @@
 			</Target>
 			<Target title="Linux64 Debug Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux64-d/mod_json64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux64-d/standalone/mod_json64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux64-d/" />
 				<Option object_output="../obj/gcc64-d/" />
 				<Option type="3" />
@@ -372,7 +372,7 @@
 			</Target>
 			<Target title="Linux64 Release Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux64/mod_json64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux64/standalone/mod_json64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux64/" />
 				<Option object_output="../obj/gcc64/" />
 				<Option type="3" />
diff --git a/cbp/ModMMDB.cbp b/cbp/ModMMDB.cbp
index 174e2396..8f8ed618 100644
--- a/cbp/ModMMDB.cbp
+++ b/cbp/ModMMDB.cbp
@@ -192,7 +192,7 @@
 			</Target>
 			<Target title="Win32 Debug Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win32-d/mod_mmdb32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win32-d/standalone/mod_mmdb32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win32-d/" />
 				<Option object_output="../obj/mingw32-d/" />
 				<Option type="3" />
@@ -218,7 +218,7 @@
 			</Target>
 			<Target title="Win32 Release Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win32/mod_mmdb32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win32/standalone/mod_mmdb32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win32/" />
 				<Option object_output="../obj/mingw32/" />
 				<Option type="3" />
@@ -245,7 +245,7 @@
 			</Target>
 			<Target title="Win64 Debug Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win64-d/mod_mmdb64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win64-d/standalone/mod_mmdb64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win64-d/" />
 				<Option object_output="../obj/mingw64-d/" />
 				<Option type="3" />
@@ -272,7 +272,7 @@
 			</Target>
 			<Target title="Win64 Release Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win64/mod_mmdb64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win64/standalone/mod_mmdb64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win64/" />
 				<Option object_output="../obj/mingw64/" />
 				<Option type="3" />
@@ -300,7 +300,7 @@
 			</Target>
 			<Target title="Linux32 Debug Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux32-d/mod_mmdb32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux32-d/standalone/mod_mmdb32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux32-d/" />
 				<Option object_output="../obj/gcc32-d/" />
 				<Option type="3" />
@@ -326,7 +326,7 @@
 			</Target>
 			<Target title="Linux32 Release Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux32/mod_mmdb32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux32/standalone/mod_mmdb32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux32/" />
 				<Option object_output="../obj/gcc32/" />
 				<Option type="3" />
@@ -353,7 +353,7 @@
 			</Target>
 			<Target title="Linux64 Debug Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux64-d/mod_mmdb64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux64-d/standalone/mod_mmdb64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux64-d/" />
 				<Option object_output="../obj/gcc64-d/" />
 				<Option type="3" />
@@ -380,7 +380,7 @@
 			</Target>
 			<Target title="Linux64 Release Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux64/mod_mmdb64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux64/standalone/mod_mmdb64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux64/" />
 				<Option object_output="../obj/gcc64/" />
 				<Option type="3" />
diff --git a/cbp/ModMongoose.cbp b/cbp/ModMongoose.cbp
index c82fae3d..31935498 100644
--- a/cbp/ModMongoose.cbp
+++ b/cbp/ModMongoose.cbp
@@ -192,7 +192,7 @@
 			</Target>
 			<Target title="Win32 Debug Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win32-d/mod_mg32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win32-d/standalone/mod_mg32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win32-d/" />
 				<Option object_output="../obj/mingw32-d/" />
 				<Option type="3" />
@@ -218,7 +218,7 @@
 			</Target>
 			<Target title="Win32 Release Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win32/mod_mg32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win32/standalone/mod_mg32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win32/" />
 				<Option object_output="../obj/mingw32/" />
 				<Option type="3" />
@@ -245,7 +245,7 @@
 			</Target>
 			<Target title="Win64 Debug Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win64-d/mod_mg64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win64-d/standalone/mod_mg64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win64-d/" />
 				<Option object_output="../obj/mingw64-d/" />
 				<Option type="3" />
@@ -272,7 +272,7 @@
 			</Target>
 			<Target title="Win64 Release Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win64/mod_mg64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win64/standalone/mod_mg64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win64/" />
 				<Option object_output="../obj/mingw64/" />
 				<Option type="3" />
@@ -300,7 +300,7 @@
 			</Target>
 			<Target title="Linux32 Debug Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux32-d/mod_mg32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux32-d/standalone/mod_mg32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux32-d/" />
 				<Option object_output="../obj/gcc32-d/" />
 				<Option type="3" />
@@ -326,7 +326,7 @@
 			</Target>
 			<Target title="Linux32 Release Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux32/mod_mg32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux32/standalone/mod_mg32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux32/" />
 				<Option object_output="../obj/gcc32/" />
 				<Option type="3" />
@@ -353,7 +353,7 @@
 			</Target>
 			<Target title="Linux64 Debug Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux64-d/mod_mg64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux64-d/standalone/mod_mg64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux64-d/" />
 				<Option object_output="../obj/gcc64-d/" />
 				<Option type="3" />
@@ -380,7 +380,7 @@
 			</Target>
 			<Target title="Linux64 Release Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux64/mod_mg64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux64/standalone/mod_mg64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux64/" />
 				<Option object_output="../obj/gcc64/" />
 				<Option type="3" />
diff --git a/cbp/ModMySQL.cbp b/cbp/ModMySQL.cbp
index 41905ac9..9728941e 100644
--- a/cbp/ModMySQL.cbp
+++ b/cbp/ModMySQL.cbp
@@ -208,7 +208,7 @@
 			</Target>
 			<Target title="Win32 Debug Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win32-d/mod_mysql32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win32-d/standalone/mod_mysql32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win32-d/" />
 				<Option object_output="../obj/mingw32-d/" />
 				<Option type="3" />
@@ -236,7 +236,7 @@
 			</Target>
 			<Target title="Win32 Release Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win32/mod_mysql32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win32/standalone/mod_mysql32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win32/" />
 				<Option object_output="../obj/mingw32/" />
 				<Option type="3" />
@@ -265,7 +265,7 @@
 			</Target>
 			<Target title="Win64 Debug Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win64-d/mod_mysql64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win64-d/standalone/mod_mysql64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win64-d/" />
 				<Option object_output="../obj/mingw64-d/" />
 				<Option type="3" />
@@ -294,7 +294,7 @@
 			</Target>
 			<Target title="Win64 Release Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win64/mod_mysql64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win64/standalone/mod_mysql64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win64/" />
 				<Option object_output="../obj/mingw64/" />
 				<Option type="3" />
@@ -324,7 +324,7 @@
 			</Target>
 			<Target title="Linux32 Debug Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux32-d/mod_mysql32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux32-d/standalone/mod_mysql32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux32-d/" />
 				<Option object_output="../obj/gcc32-d/" />
 				<Option type="3" />
@@ -352,7 +352,7 @@
 			</Target>
 			<Target title="Linux32 Release Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux32/mod_mysql32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux32/standalone/mod_mysql32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux32/" />
 				<Option object_output="../obj/gcc32/" />
 				<Option type="3" />
@@ -381,7 +381,7 @@
 			</Target>
 			<Target title="Linux64 Debug Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux64-d/mod_mysql64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux64-d/standalone/mod_mysql64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux64-d/" />
 				<Option object_output="../obj/gcc64-d/" />
 				<Option type="3" />
@@ -410,7 +410,7 @@
 			</Target>
 			<Target title="Linux64 Release Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux64/mod_mysql64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux64/standalone/mod_mysql64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux64/" />
 				<Option object_output="../obj/gcc64/" />
 				<Option type="3" />
diff --git a/cbp/ModSQLite.cbp b/cbp/ModSQLite.cbp
index 4fb3fdd5..485e9acd 100644
--- a/cbp/ModSQLite.cbp
+++ b/cbp/ModSQLite.cbp
@@ -188,7 +188,7 @@
 			</Target>
 			<Target title="Win32 Debug Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win32-d/mod_sqlite32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win32-d/standalone/mod_sqlite32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win32-d/" />
 				<Option object_output="../obj/mingw32-d/" />
 				<Option type="3" />
@@ -213,7 +213,7 @@
 			</Target>
 			<Target title="Win32 Release Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win32/mod_sqlite32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win32/standalone/mod_sqlite32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win32/" />
 				<Option object_output="../obj/mingw32/" />
 				<Option type="3" />
@@ -239,7 +239,7 @@
 			</Target>
 			<Target title="Win64 Debug Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win64-d/mod_sqlite64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win64-d/standalone/mod_sqlite64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win64-d/" />
 				<Option object_output="../obj/mingw64-d/" />
 				<Option type="3" />
@@ -265,7 +265,7 @@
 			</Target>
 			<Target title="Win64 Release Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win64/mod_sqlite64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win64/standalone/mod_sqlite64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win64/" />
 				<Option object_output="../obj/mingw64/" />
 				<Option type="3" />
@@ -292,7 +292,7 @@
 			</Target>
 			<Target title="Linux32 Debug Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux32-d/mod_sqlite32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux32-d/standalone/mod_sqlite32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux32-d/" />
 				<Option object_output="../obj/gcc32-d/" />
 				<Option type="3" />
@@ -318,7 +318,7 @@
 			</Target>
 			<Target title="Linux32 Release Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux32/mod_sqlite32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux32/standalone/mod_sqlite32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux32/" />
 				<Option object_output="../obj/gcc32/" />
 				<Option type="3" />
@@ -345,7 +345,7 @@
 			</Target>
 			<Target title="Linux64 Debug Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux64-d/mod_sqlite64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux64-d/standalone/mod_sqlite64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux64-d/" />
 				<Option object_output="../obj/gcc64-d/" />
 				<Option type="3" />
@@ -372,7 +372,7 @@
 			</Target>
 			<Target title="Linux64 Release Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux64/mod_sqlite64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux64/standalone/mod_sqlite64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux64/" />
 				<Option object_output="../obj/gcc64/" />
 				<Option type="3" />
diff --git a/cbp/ModSample.cbp b/cbp/ModSample.cbp
index 7abd8f83..5bf5095c 100644
--- a/cbp/ModSample.cbp
+++ b/cbp/ModSample.cbp
@@ -188,7 +188,7 @@
 			</Target>
 			<Target title="Win32 Debug Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win32-d/mod_sample32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win32-d/standalone/mod_sample32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win32-d/" />
 				<Option object_output="../obj/mingw32-d/" />
 				<Option type="3" />
@@ -213,7 +213,7 @@
 			</Target>
 			<Target title="Win32 Release Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win32/mod_sample32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win32/standalone/mod_sample32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win32/" />
 				<Option object_output="../obj/mingw32/" />
 				<Option type="3" />
@@ -239,7 +239,7 @@
 			</Target>
 			<Target title="Win64 Debug Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win64-d/mod_sample64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win64-d/standalone/mod_sample64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win64-d/" />
 				<Option object_output="../obj/mingw64-d/" />
 				<Option type="3" />
@@ -265,7 +265,7 @@
 			</Target>
 			<Target title="Win64 Release Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win64/mod_sample64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win64/standalone/mod_sample64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win64/" />
 				<Option object_output="../obj/mingw64/" />
 				<Option type="3" />
@@ -292,7 +292,7 @@
 			</Target>
 			<Target title="Linux32 Debug Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux32-d/mod_sample32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux32-d/standalone/mod_sample32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux32-d/" />
 				<Option object_output="../obj/gcc32-d/" />
 				<Option type="3" />
@@ -318,7 +318,7 @@
 			</Target>
 			<Target title="Linux32 Release Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux32/mod_sample32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux32/standalone/mod_sample32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux32/" />
 				<Option object_output="../obj/gcc32/" />
 				<Option type="3" />
@@ -345,7 +345,7 @@
 			</Target>
 			<Target title="Linux64 Debug Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux64-d/mod_sample64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux64-d/standalone/mod_sample64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux64-d/" />
 				<Option object_output="../obj/gcc64-d/" />
 				<Option type="3" />
@@ -372,7 +372,7 @@
 			</Target>
 			<Target title="Linux64 Release Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux64/mod_sample64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux64/standalone/mod_sample64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux64/" />
 				<Option object_output="../obj/gcc64/" />
 				<Option type="3" />
diff --git a/cbp/ModXML.cbp b/cbp/ModXML.cbp
index b9ff6aa7..da0e59fe 100644
--- a/cbp/ModXML.cbp
+++ b/cbp/ModXML.cbp
@@ -188,7 +188,7 @@
 			</Target>
 			<Target title="Win32 Debug Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win32-d/mod_xml32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win32-d/standalone/mod_xml32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win32-d/" />
 				<Option object_output="../obj/mingw32-d/" />
 				<Option type="3" />
@@ -213,7 +213,7 @@
 			</Target>
 			<Target title="Win32 Release Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win32/mod_xml32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win32/standalone/mod_xml32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win32/" />
 				<Option object_output="../obj/mingw32/" />
 				<Option type="3" />
@@ -239,7 +239,7 @@
 			</Target>
 			<Target title="Win64 Debug Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win64-d/mod_xml64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win64-d/standalone/mod_xml64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win64-d/" />
 				<Option object_output="../obj/mingw64-d/" />
 				<Option type="3" />
@@ -265,7 +265,7 @@
 			</Target>
 			<Target title="Win64 Release Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win64/mod_xml64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win64/standalone/mod_xml64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win64/" />
 				<Option object_output="../obj/mingw64/" />
 				<Option type="3" />
@@ -292,7 +292,7 @@
 			</Target>
 			<Target title="Linux32 Debug Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux32-d/mod_xml32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux32-d/standalone/mod_xml32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux32-d/" />
 				<Option object_output="../obj/gcc32-d/" />
 				<Option type="3" />
@@ -318,7 +318,7 @@
 			</Target>
 			<Target title="Linux32 Release Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux32/mod_xml32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux32/standalone/mod_xml32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux32/" />
 				<Option object_output="../obj/gcc32/" />
 				<Option type="3" />
@@ -345,7 +345,7 @@
 			</Target>
 			<Target title="Linux64 Debug Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux64-d/mod_xml64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux64-d/standalone/mod_xml64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux64-d/" />
 				<Option object_output="../obj/gcc64-d/" />
 				<Option type="3" />
@@ -372,7 +372,7 @@
 			</Target>
 			<Target title="Linux64 Release Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux64/mod_xml64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux64/standalone/mod_xml64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux64/" />
 				<Option object_output="../obj/gcc64/" />
 				<Option type="3" />
diff --git a/cbp/Module.cbp b/cbp/Module.cbp
index 686e12c1..a4216208 100644
--- a/cbp/Module.cbp
+++ b/cbp/Module.cbp
@@ -188,7 +188,7 @@
 			</Target>
 			<Target title="Win32 Debug Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win32-d/mod_squirrel32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win32-d/standalone/mod_squirrel32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win32-d/" />
 				<Option object_output="../obj/mingw32-d/" />
 				<Option type="3" />
@@ -213,7 +213,7 @@
 			</Target>
 			<Target title="Win32 Release Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win32/mod_squirrel32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win32/standalone/mod_squirrel32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win32/" />
 				<Option object_output="../obj/mingw32/" />
 				<Option type="3" />
@@ -239,7 +239,7 @@
 			</Target>
 			<Target title="Win64 Debug Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win64-d/mod_squirrel64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win64-d/standalone/mod_squirrel64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win64-d/" />
 				<Option object_output="../obj/mingw64-d/" />
 				<Option type="3" />
@@ -265,7 +265,7 @@
 			</Target>
 			<Target title="Win64 Release Standalone">
 				<Option platforms="Windows;" />
-				<Option output="../bin/win64/mod_squirrel64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/win64/standalone/mod_squirrel64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/win64/" />
 				<Option object_output="../obj/mingw64/" />
 				<Option type="3" />
@@ -292,7 +292,7 @@
 			</Target>
 			<Target title="Linux32 Debug Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux32-d/mod_squirrel32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux32-d/standalone/mod_squirrel32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux32-d/" />
 				<Option object_output="../obj/gcc32-d/" />
 				<Option type="3" />
@@ -318,7 +318,7 @@
 			</Target>
 			<Target title="Linux32 Release Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux32/mod_squirrel32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux32/standalone/mod_squirrel32" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux32/" />
 				<Option object_output="../obj/gcc32/" />
 				<Option type="3" />
@@ -345,7 +345,7 @@
 			</Target>
 			<Target title="Linux64 Debug Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux64-d/mod_squirrel64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux64-d/standalone/mod_squirrel64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux64-d/" />
 				<Option object_output="../obj/gcc64-d/" />
 				<Option type="3" />
@@ -372,7 +372,7 @@
 			</Target>
 			<Target title="Linux64 Release Standalone">
 				<Option platforms="Unix;" />
-				<Option output="../bin/linux64/mod_squirrel64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output="../bin/linux64/standalone/mod_squirrel64" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="../bin/linux64/" />
 				<Option object_output="../obj/gcc64/" />
 				<Option type="3" />