Start pulling out util.mvp.api plugin