folder sync refactor work wip