OC-1230: app doesn't show the folders structure correct for a while. Improve Sync Proccess