Removed lots of imports; fixed packaging to make internal import(s) less verbose