Restructured the existing examples