Renaming mixins
Adding support for mercurial