Moved vendor to separated lib