nvfx: move stuff around