Rearranged folders structure