Mvp reorg

Abandoning project... sadface.