Fixup imports

Expose items at the package level to make application use easier, rather than
having to dig through lower modules.