reorganize and bump version