Further changed the structure of the project to further reflect

the client/server duality.