Total reordering of the project.
Bye Bye mpde.