Split resolve/annotate/findNode into separate modules