Renamed client and server to be more accurate

Also makes room for a possible centralized server