Change tag format
Move headers to an include tree