Re-structure content