Moving stuff around to make the size of ZVG_modules more manageable.