Reorganized vendor code