Re-arrange dependencies, expose subset