Folders Refactoring