Moving files around
Major refactor on tournament class