Feature/split bundles