diff --git a/SnapClient.cbp b/SnapClient.cbp
index f52d5bf6..6761b0a3 100644
--- a/SnapClient.cbp
+++ b/SnapClient.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="bin/Debug/SnapServer" prefix_auto="1" extension_auto="1" />
+				<Option output="bin/Debug/snapserver" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Debug/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -16,7 +16,7 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output="bin/Release/SnapServer" prefix_auto="1" extension_auto="1" />
+				<Option output="bin/Release/snapserver" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Release/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -36,6 +36,7 @@
 		</Compiler>
 		<Linker>
 			<Add library="boost_system" />
+			<Add library="boost_program_options" />
 		</Linker>
 		<Unit filename="server/snapServer.cpp" />
 		<Extensions>
diff --git a/SnapClient.layout b/SnapClient.layout
index 1053280a..188bbd3d 100644
--- a/SnapClient.layout
+++ b/SnapClient.layout
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
 	<ActiveTarget name="Debug" />
+	<File name="server/snapServer.cpp" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="4599" topLine="167" />
+		</Cursor>
+	</File>
 </CodeBlocks_layout_file>
diff --git a/SnapServer.cbp b/SnapServer.cbp
index 3d34c805..db7161b7 100644
--- a/SnapServer.cbp
+++ b/SnapServer.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="bin/Debug/SnapClient" prefix_auto="1" extension_auto="1" />
+				<Option output="bin/Debug/snapclient" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Debug/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -16,7 +16,7 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output="bin/Release/SnapClient" prefix_auto="1" extension_auto="1" />
+				<Option output="bin/Release/snapclient" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Release/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
diff --git a/SnapServer.layout b/SnapServer.layout
index 1b58f323..45629070 100644
--- a/SnapServer.layout
+++ b/SnapServer.layout
@@ -3,7 +3,7 @@
 	<ActiveTarget name="Debug" />
 	<File name="client/stream.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="767" topLine="163" />
+			<Cursor1 position="767" topLine="7" />
 		</Cursor>
 	</File>
 	<File name="client/stream.h" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -11,14 +11,19 @@
 			<Cursor1 position="0" topLine="0" />
 		</Cursor>
 	</File>
+	<File name="common/chunk.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="720" topLine="10" />
+		</Cursor>
+	</File>
 	<File name="client/doubleBuffer.h" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="0" topLine="0" />
 		</Cursor>
 	</File>
-	<File name="client/snapClient.cpp" open="1" top="1" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="client/snapClient.cpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="2862" topLine="93" />
+			<Cursor1 position="2862" topLine="20" />
 		</Cursor>
 	</File>
 </CodeBlocks_layout_file>