Move model.repo.util classes to model.repo.spi