Moved Doodad to a somewhat less stupid location.