Restructured tmLanguage to be consistent with other languages