Replace evil and evil-surround with packages.