collapse temporary servicelib_service cpp back into main cpp