adapting to the modified folders structure