moved more stuff out of Game Namespace