Reformat/reorganize imports