rearrange packages

remove unused imports