Massive code restructuring.