Improve/normalize game architecture.
