refactoring folders structure project