Reorganise dvt branch after v1.0 release