Refactoring Folders structure.