Continue refactoring in resolver, api and build operation