Major rewrite of game logic XMLs