Refactor how bundles and frameworks are handled.