Move ViolationTracker and update its instantiation