modified folders structure