Fix folders structure after refactoring