Remove lang cleanup and fix dir
Merge pull request #942 from roots/language-attributes

Remove lang cleanup and fix dir