Rearrange import alphabetically, rearrange expose, correct file structure to standard