re-structure property folder