Restructure subscriptions and listeners.