Move ServiceRegistry to api module