Refactor vpp-japi