restructured output to include a subfolder for each shapefile