rearranges imports for consistency