Get rid of the toplevel "package" thing

This isn't needed really, and it simplifies code.