Major refactoring of many major classes to server.competition