folders refactorings