Refactored models
Fix query
Fix css select width
game.xml urls refactored
Datasource refactor finished