Merge some packages into the base package

[jpsember]

I'm running into dependency cycles, and it will be much more convenient to have one import statement rather than several for what are probably essential packages anyways.