Prep for restructure