Organize imports (and remove unused)