Reorganize system.prop