refactoring tour folder