Re-structure

Re-structure