More folder refactoring