Rearranged folder structure.