Restructured folder hierarchy.