Change buckets to reflect the exact same structure as the branches