refactoring of the structure of the bundle