Structure changes, BOM and UTF8 auto fixes