Initial re-structure