Turn DVSNI into module, add more appropriate challenges/api