Further application restructuring.