Add subpackages to setup.py

And update MPL version
Merge branch 'project-layout'
Add some TODO items