Reformat bundle organization