Restructured folder structure