Add namespace Game, add laoding and states
Merge