backup of the sources

* refactoring of resolvers and scanners