Re-structuring MCP once more.
Merge pull request #3 from jaredbischof/master

Re-structuring MCP once more.