Working out more of the server/client foundation
Removed/moved some files