Restructure to move most content into the discussion.