Bump version and reorder changelog