Refactoring folders structure