- awaiting async fs operation to avoid race conditions

- more flexible handling of workspace folders