More folder refactoring.