Updates to new structure for mdart
More mdart updates