Fixing the insertion of tournaments, renaming files, and cleanup of unused variables
Merge remote-tracking branch 'origin/master'