Restructuring into bundles