Reorganize imports (and bump version)