folders structure updated