Restructured folder structure.