enable subdirectory of csvs in zip files
Merge branch 'rm_production' into production