Move everything out to a proper supervision hierarchy. Trigger queue federation by policy rather than hard coding.