fix a bunch of imports. it doesn't make any sense to import via the package you're already inside