I generally avoid restructuring the imports and try to work with the current import structure in the files.