Bladder augmentation and diversion