Reorder competitions

Resolves issue #791 as much as I can without having a beginning date for competitions, could refactor this to maybe use phases?