Renamed folder Wrapper => mpWrapper (important for includes)
Improved source structure
Merge branch 'project-structure-cleanup'