Re-arranging folder structure.