Added distinction between dirs and files for source2env