reorganize && fix