wip restructure