More V1D/VDP reorg