organize imports, remove imports from same package