Moves count fix and refactor Game