Cleanup to get download packaging to work again

Just a couple of import tweaks and path fixes to handle the new structure. Really straightforward and not terribly exciting. @bcipolli Please review.