Reorganizing to eliminate map folder