Updating folder-structure and renaming methods, expectations and providers