Restructuring to remove the excessive 'festival_service' folders