restructuring the bundle source