Changed ml class names; removed redundant cpp files