move Clients into its own part of server/types