Added new content structure
Updates structure in comments