restructure - MCV

restructure