Moved lots of types into common Server module and resolved `clients` record name conflict