diff --git a/dev/SocketsBase/SocketsBase.cbp b/dev/SocketsBase/SocketsBase.cbp
deleted file mode 100644
index 2ed3adc52..000000000
--- a/dev/SocketsBase/SocketsBase.cbp
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="SocketsBase" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Debug">
-				<Option output="bin/Debug/SocketsBase" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/Debug/" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-g" />
-				</Compiler>
-			</Target>
-			<Target title="Release">
-				<Option output="bin/Release/SocketsBase" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/Release/" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-Wall" />
-			<Add option="-fexceptions" />
-		</Compiler>
-		<Linker>
-			<Add option="-lpthread" />
-			<Add option="-lcurl" />
-			<Add library="../../lib/enet/build/libenet.a" />
-		</Linker>
-		<Unit filename="callback_object.cpp" />
-		<Unit filename="callback_object.hpp" />
-		<Unit filename="client_network_manager.cpp" />
-		<Unit filename="client_network_manager.hpp" />
-		<Unit filename="http_functions.cpp" />
-		<Unit filename="http_functions.hpp" />
-		<Unit filename="main.cpp" />
-		<Unit filename="network_manager.cpp" />
-		<Unit filename="network_manager.hpp" />
-		<Unit filename="protocol.cpp" />
-		<Unit filename="protocol.hpp" />
-		<Unit filename="protocol_listener.hpp" />
-		<Unit filename="protocol_manager.cpp" />
-		<Unit filename="protocol_manager.hpp" />
-		<Unit filename="protocols/get_public_address.cpp" />
-		<Unit filename="protocols/get_public_address.hpp" />
-		<Unit filename="server_network_manager.cpp" />
-		<Unit filename="server_network_manager.hpp" />
-		<Unit filename="singleton.hpp" />
-		<Unit filename="stk_host.cpp" />
-		<Unit filename="stk_host.hpp" />
-		<Unit filename="stk_peer.cpp" />
-		<Unit filename="stk_peer.hpp" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>
diff --git a/dev/SocketsBase/SocketsBase.depend b/dev/SocketsBase/SocketsBase.depend
deleted file mode 100644
index 5d831ae76..000000000
--- a/dev/SocketsBase/SocketsBase.depend
+++ /dev/null
@@ -1,132 +0,0 @@
-# depslib dependency file v1.0
-1371490349 source:/home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/main.cpp
-	<iostream>
-	<enet/enet.h>
-	"client_network_manager.hpp"
-	"server_network_manager.hpp"
-	"protocol_manager.hpp"
-	"protocols/get_public_address.hpp"
-	<stdio.h>
-	<string.h>
-
-1371308465 source:/home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/client.cpp
-	"client.hpp"
-	<string.h>
-
-1371308471 /home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/client.hpp
-	"stk_peer.h"
-	<enet/enet.h>
-
-1371308808 /home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/stk_peer.h
-
-1371490431 source:/home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/client_network_manager.cpp
-	"client_network_manager.hpp"
-	<stdio.h>
-
-1371480489 /home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/client_network_manager.hpp
-	"network_manager.hpp"
-
-1371481319 /home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/network_manager.hpp
-	"stk_peer.hpp"
-	"stk_host.hpp"
-	<vector>
-	"protocol_manager.hpp"
-
-1370655017 /home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/server.hpp
-	"stk_peer.h"
-	<enet/enet.h>
-
-1371494752 source:/home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/network_manager.cpp
-	"network_manager.hpp"
-	<stdio.h>
-
-1370655140 source:/home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/server.cpp
-	"server.hpp"
-	<string.h>
-
-1371480479 source:/home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/server_network_manager.cpp
-	"server_network_manager.hpp"
-	<enet/enet.h>
-	<stdio.h>
-	<string.h>
-	<pthread.h>
-
-1371480483 /home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/server_network_manager.hpp
-	"network_manager.hpp"
-
-1371345329 source:/home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/stk_peer.cpp
-	"stk_peer.hpp"
-	<stdio.h>
-	<string.h>
-
-1371342227 /home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/stk_peer.hpp
-	"stk_host.hpp"
-	<enet/enet.h>
-
-1371494269 /home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/stk_host.hpp
-	<enet/enet.h>
-
-1371494673 source:/home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/stk_host.cpp
-	"stk_host.hpp"
-	"network_manager.hpp"
-	<stdio.h>
-	<string.h>
-	<pthread.h>
-
-1371429449 /home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/protocol_listener.hpp
-	<vector>
-	<stdint.h>
-
-1371344039 source:/home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/http_functions.cpp
-	"http_functions.hpp"
-	<iostream>
-	<string>
-	<curl/curl.h>
-
-1371343994 /home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/http_functions.hpp
-	<string>
-
-1371480450 /home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/protocol_manager.hpp
-	<vector>
-	<stdint.h>
-
-1371346908 source:/home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/packet.cpp
-	"packet.hpp"
-
-1371427096 /home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/packet.hpp
-	<string>
-	<vector>
-
-1371485468 source:/home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/protocol.cpp
-	"protocol.hpp"
-
-1371485485 /home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/protocol.hpp
-	"protocol_manager.hpp"
-	"callback_object.hpp"
-	<stdint.h>
-
-1371342576 source:/home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/protocol_listener.cpp
-	"protocol_listener.hpp"
-
-1371481407 source:/home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/protocol_manager.cpp
-	"protocol_manager.hpp"
-	"protocol.hpp"
-	<assert.h>
-	<stdio.h>
-
-1371494759 source:/home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/protocols/get_public_address.cpp
-	"get_public_address.hpp"
-	"../network_manager.hpp"
-	<time.h>
-	<stdlib.h>
-	<assert.h>
-	<stdio.h>
-
-1371485726 /home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/protocols/get_public_address.hpp
-	"../protocol.hpp"
-
-1371485520 /home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/callback_object.hpp
-
-1371485516 source:/home/hilnius/Development/svn/supertuxkart/main/branches/hilnius/dev/SocketsBase/callback_object.cpp
-	"callback_object.hpp"
-
diff --git a/dev/SocketsBase/SocketsBase.layout b/dev/SocketsBase/SocketsBase.layout
deleted file mode 100644
index 6a0f9d8e1..000000000
--- a/dev/SocketsBase/SocketsBase.layout
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_layout_file>
-	<ActiveTarget name="Debug" />
-	<File name="protocol.hpp" open="1" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="105" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="protocols/get_public_address.hpp" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="89" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="protocol_manager.hpp" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="464" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="protocol_listener.hpp" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="528" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="protocol_manager.cpp" open="1" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="748" topLine="19" />
-		</Cursor>
-	</File>
-	<File name="network_manager.cpp" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="886" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="network_manager.hpp" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="148" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="http_functions.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="332" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="stk_host.cpp" open="1" top="1" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="4196" topLine="90" />
-		</Cursor>
-	</File>
-	<File name="stk_peer.hpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="436" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="singleton.hpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="942" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="protocol.cpp" open="1" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="71" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="client_network_manager.hpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="440" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="stk_peer.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="483" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="server_network_manager.cpp" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="193" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="stk_host.hpp" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="983" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="server_network_manager.hpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="427" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="main.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="938" topLine="19" />
-		</Cursor>
-	</File>
-	<File name="client_network_manager.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="726" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="protocols/get_public_address.cpp" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="3074" topLine="76" />
-		</Cursor>
-	</File>
-</CodeBlocks_layout_file>
diff --git a/dev/SocketsBase/callback_object.cpp b/dev/SocketsBase/callback_object.cpp
new file mode 100644
index 000000000..cbba8acfb
--- /dev/null
+++ b/dev/SocketsBase/callback_object.cpp
@@ -0,0 +1,9 @@
+#include "callback_object.hpp"
+
+CallbackObject::CallbackObject()
+{
+}
+
+CallbackObject::~CallbackObject()
+{
+}
diff --git a/dev/SocketsBase/callback_object.hpp b/dev/SocketsBase/callback_object.hpp
new file mode 100644
index 000000000..70c4ab486
--- /dev/null
+++ b/dev/SocketsBase/callback_object.hpp
@@ -0,0 +1,14 @@
+#ifndef CALLBACK_OBJECT_HPP
+#define CALLBACK_OBJECT_HPP
+
+
+class CallbackObject
+{
+    public:
+        CallbackObject();
+        virtual ~CallbackObject();
+        
+    protected:
+};
+
+#endif // CALLBACK_OBJECT_HPP