re-structure property folder
multiple property status
merge