Refactors 'resolver' into a separate module.
Removes unused import.