Tournaments structure refactor