Rework structure of HTML files