Move properties to system.prop