Transform Judge into a module rather than a class
Fix conflicts