Organize import + format + increase version number