Reorganize properties