major refactoring of language artifacts