Re-structuring html