savegame: more moving things around