Further work on structure and markup
Added license