Reformat / Organize import