Currently, the trivial recovery is contained within the resolution package. Therefore, move it to a separate package and refactor the class.