Removing hard dependencies between bundle
[refactoring] Removing hard dependencies between bundle