Readd vim class

Change-Id: Ib2c694a96cddbb5bd208415bc6d0bbcfd025dce7