Change maps folder to server root
Stop Match from implementing CallBack
Merge