Reorganized, back to working on game.