Move stuff around so I can begin the work of extracting the engine from
the game.