Re-structuring MCP