Moved resolver into the Maven repo.
More refactorings.