Great, now please standardize the skills folder and the MCP config.