Re-structured internals
Packages are a nice thing. While they add imports, they make things
cleaner.