Reorder topics, references #19