Reorganize and cleanup system.prop