Move cite to be after link, instead of after structure

Change-Id: I69170b68997b8df595cc12e10b3467444e3ae952
Merge "Move cite to be after link, instead of after structure"