Moving internal modules around to improve sanity, as well as haddock exports
Re-generating all services with updated response type prefixes: 'rs'->'r'