Added language definition, refactor file-type
Make language case sensitive