Refactor gameData to hold entities