Move resolver, make it possible to have independent bundles.