Updating MCP mappings and restructure

Just some updating/spring cleaning:
* Updated MCP mappings for current Forge/MCP
* Restructure for future automation (but actual Ant files need to wait for TC3 API in-repo)