Rearranged folder structure