WIP restructuring

WIP restructuring.