Add doc type, character encoding
Consolidate files