Feature/folder sync