Updating / refactoring for multi-folder