fix folders structure