Change build order so that resolver is included in package