Packages should be simplified

[cchamberlain]

Now that the full API shape is emerging, I should be able to do some cleanup and streamline the builds.