Restructured the content