divide services; fix rename