Implement suggested restructuring.