refactor imports to be more sane