folder refactor