Move various bits into gamelib