Refactoring folders structure.