Refactor on Folders per Topic