Temporary, system-config module split