Re-structuring MCP
Merge pull request #2 from jaredbischof/master

Re-structuring MCP