re-order imports for e-z files