Merge changes I6058c2d8,I5ed735f2,Iee493f33,I8325ca40

* changes:
  Remove intermediate mterp files from the repository.
  Remove "sister" code from mterp.
  Group mterp files
  Rewrite the mterp code generator and the template snippets.