refactoring topic folders