- Updated for new Mcp Version
- Expanded APIEntity
- Fixed some file names