Revert "Minimally included missing modules needed for basic operation"
Merge pull request #12 from ausaccessfed/revert-11-bugfix/mpm-include

Revert "Minimally included missing modules needed for basic operation"