reorganize and update version