Migrate to serviceutils/tools and serviceutils/srm