[Aux] Restructuring.