Move ratepolice back into the farm package.