Moved TypeResolver back to rules package and removed or refactored some
dependencies to it.