Reorg for server/client separation