Rearranged contest models so they validate.

@Xyene, class declarations are executed in order of definition.