changed file order of project
changed order of grammar