restructure markup
final draft