changed a little of Game organization