re-structure
Re-structure