A new way of seperating server/client

One branch, no more mistakes like duping in the future.