Rearrange game model
Name things better
Fix merge conflicts