added missing files, fixed FileSystemCollector