Fix Round IDs for finals
Restructure plugin to use shared tools