Refactor repo to split bundles