diff --git a/AI/BattleAI/BattleAI.cbp b/AI/BattleAI/BattleAI.cbp
index dac21be6a..8510873b4 100644
--- a/AI/BattleAI/BattleAI.cbp
+++ b/AI/BattleAI/BattleAI.cbp
@@ -7,19 +7,16 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="bin/Debug/BattleAI" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
+				<Option output="../BattleAI" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Debug/" />
 				<Option type="3" />
 				<Option compiler="gcc" />
 				<Compiler>
 					<Add option="-g" />
 				</Compiler>
-				<Linker>
-					<Add directory="../../bin/Debug" />
-				</Linker>
 			</Target>
 			<Target title="Release">
-				<Option output="bin/Release/BattleAI" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
+				<Option output="../BattleAI" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Release/" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -28,7 +25,6 @@
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
-					<Add directory="../../bin/Release" />
 				</Linker>
 			</Target>
 		</Build>
@@ -49,6 +45,7 @@
 			<Add option="-lboost_system$(#boost.libsuffix)" />
 			<Add option="-lVCMI_lib" />
 			<Add directory="$(#boost.lib)" />
+			<Add directory="../.." />
 		</Linker>
 		<Unit filename="BattleAI.cpp" />
 		<Unit filename="BattleAI.h" />
diff --git a/AI/EmptyAI/EmptyAI.cbp b/AI/EmptyAI/EmptyAI.cbp
index 163844cb8..b506aa93b 100644
--- a/AI/EmptyAI/EmptyAI.cbp
+++ b/AI/EmptyAI/EmptyAI.cbp
@@ -7,19 +7,16 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="bin/Debug/EmptyAI" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
+				<Option output="../EmptyAI" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Debug/" />
 				<Option type="3" />
 				<Option compiler="gcc" />
 				<Compiler>
 					<Add option="-ggdb" />
 				</Compiler>
-				<Linker>
-					<Add directory="../../bin/Debug" />
-				</Linker>
 			</Target>
 			<Target title="Release">
-				<Option output="bin/Release/EmptyAI" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
+				<Option output="../EmptyAI" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Release/" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -29,7 +26,6 @@
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
-					<Add directory="../../bin/Release" />
 				</Linker>
 			</Target>
 		</Build>
@@ -50,6 +46,7 @@
 			<Add option="-lboost_system$(#boost.libsuffix)" />
 			<Add option="-lVCMI_lib" />
 			<Add directory="$(#boost.lib)" />
+			<Add directory="../.." />
 		</Linker>
 		<Unit filename="CEmptyAI.cpp" />
 		<Unit filename="CEmptyAI.h" />
diff --git a/AI/FuzzyLite/FuzzyLite.cbp b/AI/FuzzyLite/FuzzyLite.cbp
index cc10f25a1..3c5171620 100644
--- a/AI/FuzzyLite/FuzzyLite.cbp
+++ b/AI/FuzzyLite/FuzzyLite.cbp
@@ -1,130 +1,130 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="FuzzyLite" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Debug">
-				<Option output="bin\Debug\FuzzyLite" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="obj\Debug\" />
-				<Option type="2" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-g" />
-				</Compiler>
-			</Target>
-			<Target title="Release">
-				<Option output="bin\Release\FuzzyLite" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="obj\Release\" />
-				<Option type="2" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-fomit-frame-pointer" />
-					<Add option="-O2" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-Wextra" />
-			<Add option="-Wall" />
-			<Add option="-fexceptions" />
-			<Add option="-Wpointer-arith" />
-			<Add option="-Wno-switch" />
-			<Add option="-Wno-sign-compare" />
-			<Add option="-Wno-unused-parameter" />
-			<Add option="-Wno-overloaded-virtual" />
-		</Compiler>
-		<Unit filename="AreaCentroidAlgorithm.cpp" />
-		<Unit filename="AreaCentroidAlgorithm.h" />
-		<Unit filename="CompoundTerm.cpp" />
-		<Unit filename="CompoundTerm.h" />
-		<Unit filename="DescriptiveAntecedent.cpp" />
-		<Unit filename="DescriptiveAntecedent.h" />
-		<Unit filename="DiscreteTerm.cpp" />
-		<Unit filename="DiscreteTerm.h" />
-		<Unit filename="FunctionTerm.cpp" />
-		<Unit filename="FunctionTerm.h" />
-		<Unit filename="FuzzyAnd.cpp" />
-		<Unit filename="FuzzyAnd.h" />
-		<Unit filename="FuzzyAntecedent.cpp" />
-		<Unit filename="FuzzyAntecedent.h" />
-		<Unit filename="FuzzyConsequent.cpp" />
-		<Unit filename="FuzzyConsequent.h" />
-		<Unit filename="FuzzyDefuzzifier.cpp" />
-		<Unit filename="FuzzyDefuzzifier.h" />
-		<Unit filename="FuzzyEngine.cpp" />
-		<Unit filename="FuzzyEngine.h" />
-		<Unit filename="FuzzyException.cpp" />
-		<Unit filename="FuzzyException.h" />
-		<Unit filename="FuzzyExceptions.cpp" />
-		<Unit filename="FuzzyExceptions.h" />
-		<Unit filename="FuzzyLite.h" />
-		<Unit filename="FuzzyModulation.cpp" />
-		<Unit filename="FuzzyModulation.h" />
-		<Unit filename="FuzzyOperation.cpp" />
-		<Unit filename="FuzzyOperation.h" />
-		<Unit filename="FuzzyOperator.cpp" />
-		<Unit filename="FuzzyOperator.h" />
-		<Unit filename="FuzzyOr.cpp" />
-		<Unit filename="FuzzyOr.h" />
-		<Unit filename="FuzzyRule.cpp" />
-		<Unit filename="FuzzyRule.h" />
-		<Unit filename="Hedge.cpp" />
-		<Unit filename="Hedge.h" />
-		<Unit filename="HedgeSet.cpp" />
-		<Unit filename="HedgeSet.h" />
-		<Unit filename="InfixToPostfix.cpp" />
-		<Unit filename="InfixToPostfix.h" />
-		<Unit filename="InputLVar.cpp" />
-		<Unit filename="InputLVar.h" />
-		<Unit filename="LinguisticTerm.cpp" />
-		<Unit filename="LinguisticTerm.h" />
-		<Unit filename="LinguisticVariable.cpp" />
-		<Unit filename="LinguisticVariable.h" />
-		<Unit filename="MamdaniConsequent.cpp" />
-		<Unit filename="MamdaniConsequent.h" />
-		<Unit filename="MamdaniRule.cpp" />
-		<Unit filename="MamdaniRule.h" />
-		<Unit filename="OutputLVar.cpp" />
-		<Unit filename="OutputLVar.h" />
-		<Unit filename="RectangularTerm.cpp" />
-		<Unit filename="RectangularTerm.h" />
-		<Unit filename="RuleBlock.cpp" />
-		<Unit filename="RuleBlock.h" />
-		<Unit filename="ShoulderTerm.cpp" />
-		<Unit filename="ShoulderTerm.h" />
-		<Unit filename="SingletonTerm.cpp" />
-		<Unit filename="SingletonTerm.h" />
-		<Unit filename="StrOp.cpp" />
-		<Unit filename="StrOp.h" />
-		<Unit filename="TakagiSugenoConsequent.cpp" />
-		<Unit filename="TakagiSugenoConsequent.h" />
-		<Unit filename="TakagiSugenoRule.cpp" />
-		<Unit filename="TakagiSugenoRule.h" />
-		<Unit filename="TakagiSugenoTerm.cpp" />
-		<Unit filename="TakagiSugenoTerm.h" />
-		<Unit filename="TrapezoidalTerm.cpp" />
-		<Unit filename="TrapezoidalTerm.h" />
-		<Unit filename="TriangularTerm.cpp" />
-		<Unit filename="TriangularTerm.h" />
-		<Unit filename="defs.h" />
-		<Unit filename="flScalar.h" />
-		<Unit filename="main.cpp" />
-		<Unit filename="test.h" />
-		<Extensions>
-			<code_completion />
-			<envvars />
-			<debugger />
-			<lib_finder disable_auto="1" />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="FuzzyLite" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="Debug">
+				<Option output="bin\Debug\FuzzyLite" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="" />
+				<Option object_output="obj\Debug\" />
+				<Option type="2" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Compiler>
+					<Add option="-g" />
+				</Compiler>
+			</Target>
+			<Target title="Release">
+				<Option output="bin\Release\FuzzyLite" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="" />
+				<Option object_output="obj\Release\" />
+				<Option type="2" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Compiler>
+					<Add option="-fomit-frame-pointer" />
+					<Add option="-O2" />
+				</Compiler>
+				<Linker>
+					<Add option="-s" />
+				</Linker>
+			</Target>
+		</Build>
+		<Compiler>
+			<Add option="-Wextra" />
+			<Add option="-Wall" />
+			<Add option="-fexceptions" />
+			<Add option="-Wpointer-arith" />
+			<Add option="-Wno-switch" />
+			<Add option="-Wno-sign-compare" />
+			<Add option="-Wno-unused-parameter" />
+			<Add option="-Wno-overloaded-virtual" />
+		</Compiler>
+		<Unit filename="AreaCentroidAlgorithm.cpp" />
+		<Unit filename="AreaCentroidAlgorithm.h" />
+		<Unit filename="CompoundTerm.cpp" />
+		<Unit filename="CompoundTerm.h" />
+		<Unit filename="DescriptiveAntecedent.cpp" />
+		<Unit filename="DescriptiveAntecedent.h" />
+		<Unit filename="DiscreteTerm.cpp" />
+		<Unit filename="DiscreteTerm.h" />
+		<Unit filename="FunctionTerm.cpp" />
+		<Unit filename="FunctionTerm.h" />
+		<Unit filename="FuzzyAnd.cpp" />
+		<Unit filename="FuzzyAnd.h" />
+		<Unit filename="FuzzyAntecedent.cpp" />
+		<Unit filename="FuzzyAntecedent.h" />
+		<Unit filename="FuzzyConsequent.cpp" />
+		<Unit filename="FuzzyConsequent.h" />
+		<Unit filename="FuzzyDefuzzifier.cpp" />
+		<Unit filename="FuzzyDefuzzifier.h" />
+		<Unit filename="FuzzyEngine.cpp" />
+		<Unit filename="FuzzyEngine.h" />
+		<Unit filename="FuzzyException.cpp" />
+		<Unit filename="FuzzyException.h" />
+		<Unit filename="FuzzyExceptions.cpp" />
+		<Unit filename="FuzzyExceptions.h" />
+		<Unit filename="FuzzyLite.h" />
+		<Unit filename="FuzzyModulation.cpp" />
+		<Unit filename="FuzzyModulation.h" />
+		<Unit filename="FuzzyOperation.cpp" />
+		<Unit filename="FuzzyOperation.h" />
+		<Unit filename="FuzzyOperator.cpp" />
+		<Unit filename="FuzzyOperator.h" />
+		<Unit filename="FuzzyOr.cpp" />
+		<Unit filename="FuzzyOr.h" />
+		<Unit filename="FuzzyRule.cpp" />
+		<Unit filename="FuzzyRule.h" />
+		<Unit filename="Hedge.cpp" />
+		<Unit filename="Hedge.h" />
+		<Unit filename="HedgeSet.cpp" />
+		<Unit filename="HedgeSet.h" />
+		<Unit filename="InfixToPostfix.cpp" />
+		<Unit filename="InfixToPostfix.h" />
+		<Unit filename="InputLVar.cpp" />
+		<Unit filename="InputLVar.h" />
+		<Unit filename="LinguisticTerm.cpp" />
+		<Unit filename="LinguisticTerm.h" />
+		<Unit filename="LinguisticVariable.cpp" />
+		<Unit filename="LinguisticVariable.h" />
+		<Unit filename="MamdaniConsequent.cpp" />
+		<Unit filename="MamdaniConsequent.h" />
+		<Unit filename="MamdaniRule.cpp" />
+		<Unit filename="MamdaniRule.h" />
+		<Unit filename="OutputLVar.cpp" />
+		<Unit filename="OutputLVar.h" />
+		<Unit filename="RectangularTerm.cpp" />
+		<Unit filename="RectangularTerm.h" />
+		<Unit filename="RuleBlock.cpp" />
+		<Unit filename="RuleBlock.h" />
+		<Unit filename="ShoulderTerm.cpp" />
+		<Unit filename="ShoulderTerm.h" />
+		<Unit filename="SingletonTerm.cpp" />
+		<Unit filename="SingletonTerm.h" />
+		<Unit filename="StrOp.cpp" />
+		<Unit filename="StrOp.h" />
+		<Unit filename="TakagiSugenoConsequent.cpp" />
+		<Unit filename="TakagiSugenoConsequent.h" />
+		<Unit filename="TakagiSugenoRule.cpp" />
+		<Unit filename="TakagiSugenoRule.h" />
+		<Unit filename="TakagiSugenoTerm.cpp" />
+		<Unit filename="TakagiSugenoTerm.h" />
+		<Unit filename="TrapezoidalTerm.cpp" />
+		<Unit filename="TrapezoidalTerm.h" />
+		<Unit filename="TriangularTerm.cpp" />
+		<Unit filename="TriangularTerm.h" />
+		<Unit filename="defs.h" />
+		<Unit filename="flScalar.h" />
+		<Unit filename="main.cpp" />
+		<Unit filename="test.h" />
+		<Extensions>
+			<code_completion />
+			<envvars />
+			<debugger />
+			<lib_finder disable_auto="1" />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>
diff --git a/AI/StupidAI/StupidAI.cbp b/AI/StupidAI/StupidAI.cbp
index e0a8e5cb9..51112af8b 100644
--- a/AI/StupidAI/StupidAI.cbp
+++ b/AI/StupidAI/StupidAI.cbp
@@ -7,19 +7,16 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="bin/Debug/StupidAI" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
+				<Option output="../StupidAI" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Debug/" />
 				<Option type="3" />
 				<Option compiler="gcc" />
 				<Compiler>
 					<Add option="-ggdb" />
 				</Compiler>
-				<Linker>
-					<Add directory="../../bin/Debug" />
-				</Linker>
 			</Target>
 			<Target title="Release">
-				<Option output="bin/Release/StupidAI" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
+				<Option output="../StupidAI" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Release/" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -29,7 +26,6 @@
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
-					<Add directory="../../bin/Release" />
 				</Linker>
 			</Target>
 		</Build>
@@ -52,6 +48,7 @@
 			<Add option="-lboost_system$(#boost.libsuffix)" />
 			<Add option="-lVCMI_lib" />
 			<Add directory="$(#boost.lib)" />
+			<Add directory="../.." />
 		</Linker>
 		<Unit filename="StdInc.h">
 			<Option compile="1" />
diff --git a/AI/VCAI/VCAI.cbp b/AI/VCAI/VCAI.cbp
index ea4ae56fc..ca9bafe69 100644
--- a/AI/VCAI/VCAI.cbp
+++ b/AI/VCAI/VCAI.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="bin/Debug/VCAI" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
+				<Option output="../VCAI" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Debug/" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -15,12 +15,11 @@
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add directory="../../bin/Debug" />
 					<Add directory="../FuzzyLite/bin/Debug" />
 				</Linker>
 			</Target>
 			<Target title="Release">
-				<Option output="bin/Release/VCAI" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
+				<Option output="../VCAI" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Release/" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -30,7 +29,6 @@
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
-					<Add directory="../../bin/Release" />
 					<Add directory="../FuzzyLite/bin/Release" />
 				</Linker>
 			</Target>
@@ -57,6 +55,7 @@
 			<Add option="-lboost_chrono$(#boost.libsuffix)" />
 			<Add option="-lVCMI_lib" />
 			<Add directory="$(#boost.lib)" />
+			<Add directory="../.." />
 		</Linker>
 		<Unit filename="Fuzzy.cpp" />
 		<Unit filename="Fuzzy.h" />
diff --git a/Scripting/ERM/ERM.cbp b/Scripting/ERM/ERM.cbp
index 282322d27..47b15783f 100644
--- a/Scripting/ERM/ERM.cbp
+++ b/Scripting/ERM/ERM.cbp
@@ -7,32 +7,26 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="bin/Debug/ERM" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
+				<Option output="../ERM" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Debug/" />
 				<Option type="3" />
 				<Option compiler="gcc" />
-				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="-O" />
 					<Add option="-ggdb" />
 				</Compiler>
-				<Linker>
-					<Add directory="../../bin/Debug" />
-				</Linker>
 			</Target>
 			<Target title="Release">
-				<Option output="bin/Release/ERM" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
+				<Option output="../ERM" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Release/" />
 				<Option type="3" />
 				<Option compiler="gcc" />
-				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="-fomit-frame-pointer" />
 					<Add option="-O2" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
-					<Add directory="../../bin/Release" />
 				</Linker>
 			</Target>
 		</Build>
@@ -52,10 +46,10 @@
 			<Add option="-lboost_filesystem$(#boost.libsuffix)" />
 			<Add option="-lboost_system$(#boost.libsuffix)" />
 			<Add option="-lboost_thread$(#boost.libsuffix)" />
-			<Add option="-lboost_iostreams$(#boost.libsuffix)" />
 			<Add option="-lboost_chrono$(#boost.libsuffix)" />
 			<Add option="-lVCMI_lib" />
 			<Add directory="$(#boost.lib)" />
+			<Add directory="../.." />
 		</Linker>
 		<Unit filename="ERMInterpreter.cpp" />
 		<Unit filename="ERMInterpreter.h" />
diff --git a/client/VCMI_client.cbp b/client/VCMI_client.cbp
index 9e7da3a57..26a8a1059 100644
--- a/client/VCMI_client.cbp
+++ b/client/VCMI_client.cbp
@@ -4,22 +4,22 @@
 	<Project>
 		<Option title="VCMI_client" />
 		<Option pch_mode="2" />
+		<Option default_target="Release" />
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="../bin/Debug/VCMI_client" prefix_auto="1" extension_auto="1" />
+				<Option output="../VCMI_client" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="../" />
 				<Option object_output="../obj/Debug/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
 					<Add option="-g" />
 				</Compiler>
-				<Linker>
-					<Add directory="../bin/Debug" />
-				</Linker>
 			</Target>
 			<Target title="Release">
-				<Option output="../bin/Release/VCMI_client" prefix_auto="1" extension_auto="1" />
+				<Option output="../VCMI_client" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="../" />
 				<Option object_output="../obj/Release/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -29,7 +29,6 @@
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
-					<Add directory="../bin/Release" />
 				</Linker>
 			</Target>
 		</Build>
@@ -66,6 +65,7 @@
 			<Add option="-lVCMI_lib" />
 			<Add directory="$(#boost.lib)" />
 			<Add directory="$(#sdl.lib)" />
+			<Add directory="../" />
 		</Linker>
 		<Unit filename="../CCallback.cpp" />
 		<Unit filename="../CCallback.h" />
diff --git a/lib/VCMI_lib.cbp b/lib/VCMI_lib.cbp
index 3361b2567..25997efa2 100644
--- a/lib/VCMI_lib.cbp
+++ b/lib/VCMI_lib.cbp
@@ -9,7 +9,7 @@
 		<Build>
 			<Target title="Debug">
 				<Option platforms="Windows;" />
-				<Option output="../bin/Debug/VCMI_lib" prefix_auto="0" extension_auto="1" />
+				<Option output="../VCMI_lib" prefix_auto="0" extension_auto="1" />
 				<Option object_output="../obj/Debug/Lib" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -21,7 +21,7 @@
 			</Target>
 			<Target title="Release">
 				<Option platforms="Windows;" />
-				<Option output="../bin/Release/VCMI_lib" prefix_auto="0" extension_auto="1" />
+				<Option output="../VCMI_lib" prefix_auto="0" extension_auto="1" />
 				<Option object_output="../obj/Release/Lib" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -101,6 +101,7 @@
 		<Unit filename="CObjectHandler.h" />
 		<Unit filename="CObstacleInstance.cpp" />
 		<Unit filename="CObstacleInstance.h" />
+		<Unit filename="CRandomGenerator.h" />
 		<Unit filename="CScriptingModule.h" />
 		<Unit filename="CSpellHandler.cpp" />
 		<Unit filename="CSpellHandler.h" />
@@ -144,6 +145,8 @@
 		<Unit filename="Mapping/CCampaignHandler.h" />
 		<Unit filename="Mapping/CMap.cpp" />
 		<Unit filename="Mapping/CMap.h" />
+		<Unit filename="Mapping/CMapEditManager.cpp" />
+		<Unit filename="Mapping/CMapEditManager.h" />
 		<Unit filename="Mapping/CMapInfo.cpp" />
 		<Unit filename="Mapping/CMapInfo.h" />
 		<Unit filename="Mapping/CMapService.cpp" />
@@ -152,6 +155,8 @@
 		<Unit filename="NetPacksLib.cpp" />
 		<Unit filename="RMG/CMapGenOptions.cpp" />
 		<Unit filename="RMG/CMapGenOptions.h" />
+		<Unit filename="RMG/CMapGenerator.cpp" />
+		<Unit filename="RMG/CMapGenerator.h" />
 		<Unit filename="RegisterTypes.h" />
 		<Unit filename="ResourceSet.cpp" />
 		<Unit filename="ResourceSet.h" />
diff --git a/server/VCMI_server.cbp b/server/VCMI_server.cbp
index 514ea1815..856a66093 100644
--- a/server/VCMI_server.cbp
+++ b/server/VCMI_server.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="../bin/Debug/VCMI_server" prefix_auto="1" extension_auto="1" />
+				<Option output="../VCMI_server" prefix_auto="1" extension_auto="1" />
 				<Option object_output="../obj/Debug/Server" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -15,12 +15,9 @@
 				<Compiler>
 					<Add option="-ggdb" />
 				</Compiler>
-				<Linker>
-					<Add directory="../bin/Debug" />
-				</Linker>
 			</Target>
 			<Target title="Release">
-				<Option output="../bin/Release/VCMI_server" prefix_auto="1" extension_auto="1" />
+				<Option output="../VCMI_server" prefix_auto="1" extension_auto="1" />
 				<Option object_output="../obj/Release/Server" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -30,7 +27,6 @@
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
-					<Add directory="../bin/Release" />
 				</Linker>
 			</Target>
 		</Build>
@@ -61,6 +57,7 @@
 			<Add option="-lboost_chrono$(#boost.libsuffix)" />
 			<Add option="-lVCMI_lib" />
 			<Add directory="$(#boost.lib)" />
+			<Add directory="../" />
 		</Linker>
 		<Unit filename="CGameHandler.cpp" />
 		<Unit filename="CGameHandler.h" />