Merge #content with article tag.
Rename right templates to aside.