Initial refactor of N2VC