Less searching around.
Moved Vimpy module to support the new file format.