Update markup

- Remove hgroup

Add <main>

Drop some classes.

More to come