reorganize bundle structure