Reorganised imports.
Removed auto "created by" headers