Rearranged folder layout.