Refactor the TypeResolver. It now makes part of the manager namespace.