reorder entries and add smartassv2 governor

Change-Id: I7d85cedb8439310cbfe90d7bd7ed622a49d9ba7f