merge
merge
merge
refactoring fileBrowser and fsWorker
work with async