Refactor bundles organization