Split DataBundle into CoreBundle & ProviderBundle