folder helper refactoring