This is series of supplement-ification (Bug 78440). This will be far less trivial than moving isolated object like device controller though. May be worth doing. maybe not.