Simplify packaging and remove final I from interfaces