Move ServiceConfig building code into SystemConfig