more vendor files and reorg