reorganize wallet package