Fix some Bugs in the server
Move some files from the shared objects to the server implementation