re-structure (2)