Converting endTurn over to use event
Relocating Query to query module
Extracting TurnQuery