Re-arranging folder structure