Decrease visibility of internals to 'private[io', clean up imports