Confined the VXI code to just the necessary files.