Organize imports, run eclipse cleanup