Tournament structure rewritten (separation in multiple include files)
plus enhancements for tournaments