Reorganize bundle into smaller modules