Refactor folders structure