Restructured syntax file