Reorded folder structure