Initial Commit after separation of client and server