change folders structure refactoring