Some restructuring. Got rid of the Mvpvm stuff. Moved stuff to appropriate projects.