refactored subscriptions and users controllers