Major file re-arrangement for server/client in same project