Cleanup: Imports

Added package.d to all packages, and cleaned up imports to be only packages.

I don't feel particularly strongly about this, and it's open to discussion.