Properly refactored the moved files
Fixed method calls that were broken by an MCP update