18 files changed, 183 insertions, 183 deletions
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackApiExample.java b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackApiExample.java
index b6558ff..6b2d893 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackApiExample.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackApiExample.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
+package io.fd.jvpp.core.examples;
 
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.callback.GetNodeIndexReplyCallback;
-import io.fd.vpp.jvpp.core.callback.ShowVersionReplyCallback;
-import io.fd.vpp.jvpp.core.callback.SwInterfaceDetailsCallback;
-import io.fd.vpp.jvpp.core.dto.GetNodeIndex;
-import io.fd.vpp.jvpp.core.dto.GetNodeIndexReply;
-import io.fd.vpp.jvpp.core.dto.ShowVersion;
-import io.fd.vpp.jvpp.core.dto.ShowVersionReply;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceDump;
+import io.fd.jvpp.JVpp;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.VppCallbackException;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.callback.GetNodeIndexReplyCallback;
+import io.fd.jvpp.core.callback.ShowVersionReplyCallback;
+import io.fd.jvpp.core.callback.SwInterfaceDetailsCallback;
+import io.fd.jvpp.core.dto.GetNodeIndex;
+import io.fd.jvpp.core.dto.GetNodeIndexReply;
+import io.fd.jvpp.core.dto.ShowVersion;
+import io.fd.jvpp.core.dto.ShowVersionReply;
+import io.fd.jvpp.core.dto.SwInterfaceDetails;
+import io.fd.jvpp.core.dto.SwInterfaceDump;
 import java.nio.charset.StandardCharsets;
 
 public class CallbackApiExample {
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackApiReadPerfTest.java b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackApiReadPerfTest.java
index 6ff440d..26a371e 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackApiReadPerfTest.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackApiReadPerfTest.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
-
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.callback.ShowVersionReplyCallback;
-import io.fd.vpp.jvpp.core.dto.*;
+package io.fd.jvpp.core.examples;
+
+import io.fd.jvpp.JVpp;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.VppCallbackException;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.callback.ShowVersionReplyCallback;
+import io.fd.jvpp.core.dto.*;
 
 import java.util.logging.Logger;
 
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackApiWritePerfTest.java b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackApiWritePerfTest.java
index 1940ddc..dd045fe 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackApiWritePerfTest.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackApiWritePerfTest.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
-
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.dto.*;
-import io.fd.vpp.jvpp.core.callback.ClassifyAddDelTableReplyCallback;
+package io.fd.jvpp.core.examples;
+
+import io.fd.jvpp.JVpp;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.VppCallbackException;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.dto.*;
+import io.fd.jvpp.core.callback.ClassifyAddDelTableReplyCallback;
 
 import java.util.logging.Logger;
 
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackCliApiExample.java b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackCliApiExample.java
index b692291..49a3f62 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackCliApiExample.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackCliApiExample.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
+package io.fd.jvpp.core.examples;
 
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.callback.CliInbandReplyCallback;
-import io.fd.vpp.jvpp.core.dto.CliInband;
-import io.fd.vpp.jvpp.core.dto.CliInbandReply;
+import io.fd.jvpp.JVpp;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.VppCallbackException;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.callback.CliInbandReplyCallback;
+import io.fd.jvpp.core.dto.CliInband;
+import io.fd.jvpp.core.dto.CliInbandReply;
 
 import java.nio.charset.StandardCharsets;
 
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackJVppFacadeExample.java b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackJVppFacadeExample.java
index a8b9186..b9409f8 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackJVppFacadeExample.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackJVppFacadeExample.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
-
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.callback.GetNodeIndexReplyCallback;
-import io.fd.vpp.jvpp.core.callback.ShowVersionReplyCallback;
-import io.fd.vpp.jvpp.core.callfacade.CallbackJVppCoreFacade;
-import io.fd.vpp.jvpp.core.dto.GetNodeIndex;
-import io.fd.vpp.jvpp.core.dto.GetNodeIndexReply;
-import io.fd.vpp.jvpp.core.dto.ShowVersionReply;
+package io.fd.jvpp.core.examples;
+
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.VppCallbackException;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.callback.GetNodeIndexReplyCallback;
+import io.fd.jvpp.core.callback.ShowVersionReplyCallback;
+import io.fd.jvpp.core.callfacade.CallbackJVppCoreFacade;
+import io.fd.jvpp.core.dto.GetNodeIndex;
+import io.fd.jvpp.core.dto.GetNodeIndexReply;
+import io.fd.jvpp.core.dto.ShowVersionReply;
 import java.nio.charset.StandardCharsets;
 
 /**
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackJVppFacadeNotificationExample.java b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackJVppFacadeNotificationExample.java
index 832464a..3ac2310 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackJVppFacadeNotificationExample.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackJVppFacadeNotificationExample.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
-
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.core.JVppCore;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.callback.WantInterfaceEventsReplyCallback;
-import io.fd.vpp.jvpp.core.callback.SwInterfaceEventCallback;
-import io.fd.vpp.jvpp.core.callfacade.CallbackJVppCoreFacade;
-import io.fd.vpp.jvpp.core.dto.WantInterfaceEventsReply;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceEvent;
+package io.fd.jvpp.core.examples;
+
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.VppCallbackException;
+import io.fd.jvpp.core.JVppCore;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.callback.WantInterfaceEventsReplyCallback;
+import io.fd.jvpp.core.callback.SwInterfaceEventCallback;
+import io.fd.jvpp.core.callfacade.CallbackJVppCoreFacade;
+import io.fd.jvpp.core.dto.WantInterfaceEventsReply;
+import io.fd.jvpp.core.dto.SwInterfaceEvent;
 
 public class CallbackJVppFacadeNotificationExample {
 
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackNotificationApiExample.java b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackNotificationApiExample.java
index 9ed418e..6de0a6f 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackNotificationApiExample.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/CallbackNotificationApiExample.java
@@ -14,23 +14,23 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
-
-import static io.fd.vpp.jvpp.core.examples.NotificationUtils.getChangeInterfaceState;
-import static io.fd.vpp.jvpp.core.examples.NotificationUtils.getDisableInterfaceNotificationsReq;
-import static io.fd.vpp.jvpp.core.examples.NotificationUtils.getEnableInterfaceNotificationsReq;
-import static io.fd.vpp.jvpp.core.examples.NotificationUtils.printNotification;
-
-import io.fd.vpp.jvpp.JVpp;
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.VppCallbackException;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.callback.SwInterfaceEventCallback;
-import io.fd.vpp.jvpp.core.callback.WantInterfaceEventsReplyCallback;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceEvent;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceSetFlagsReply;
-import io.fd.vpp.jvpp.core.dto.WantInterfaceEventsReply;
+package io.fd.jvpp.core.examples;
+
+import static io.fd.jvpp.core.examples.NotificationUtils.getChangeInterfaceState;
+import static io.fd.jvpp.core.examples.NotificationUtils.getDisableInterfaceNotificationsReq;
+import static io.fd.jvpp.core.examples.NotificationUtils.getEnableInterfaceNotificationsReq;
+import static io.fd.jvpp.core.examples.NotificationUtils.printNotification;
+
+import io.fd.jvpp.JVpp;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.VppCallbackException;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.callback.SwInterfaceEventCallback;
+import io.fd.jvpp.core.callback.WantInterfaceEventsReplyCallback;
+import io.fd.jvpp.core.dto.SwInterfaceEvent;
+import io.fd.jvpp.core.dto.SwInterfaceSetFlagsReply;
+import io.fd.jvpp.core.dto.WantInterfaceEventsReply;
 
 public class CallbackNotificationApiExample {
 
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CreateSubInterfaceExample.java b/java/jvpp-core/io/fd/jvpp/core/examples/CreateSubInterfaceExample.java
index 3db6d30..cc07520 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CreateSubInterfaceExample.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/CreateSubInterfaceExample.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
+package io.fd.jvpp.core.examples;
 
 import static java.util.Objects.requireNonNull;
 
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.dto.CreateSubif;
-import io.fd.vpp.jvpp.core.dto.CreateSubifReply;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceDetailsReplyDump;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceDump;
-import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.dto.CreateSubif;
+import io.fd.jvpp.core.dto.CreateSubifReply;
+import io.fd.jvpp.core.dto.SwInterfaceDetailsReplyDump;
+import io.fd.jvpp.core.dto.SwInterfaceDump;
+import io.fd.jvpp.core.future.FutureJVppCoreFacade;
 import java.nio.charset.StandardCharsets;
 
 /**
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/FutureApiExample.java b/java/jvpp-core/io/fd/jvpp/core/examples/FutureApiExample.java
index 030e689..ff1755d 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/FutureApiExample.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/FutureApiExample.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
+package io.fd.jvpp.core.examples;
 
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.dto.BridgeDomainDetailsReplyDump;
-import io.fd.vpp.jvpp.core.dto.BridgeDomainDump;
-import io.fd.vpp.jvpp.core.dto.GetNodeIndex;
-import io.fd.vpp.jvpp.core.dto.GetNodeIndexReply;
-import io.fd.vpp.jvpp.core.dto.ShowVersion;
-import io.fd.vpp.jvpp.core.dto.ShowVersionReply;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceDetailsReplyDump;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceDump;
-import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.dto.BridgeDomainDetailsReplyDump;
+import io.fd.jvpp.core.dto.BridgeDomainDump;
+import io.fd.jvpp.core.dto.GetNodeIndex;
+import io.fd.jvpp.core.dto.GetNodeIndexReply;
+import io.fd.jvpp.core.dto.ShowVersion;
+import io.fd.jvpp.core.dto.ShowVersionReply;
+import io.fd.jvpp.core.dto.SwInterfaceDetails;
+import io.fd.jvpp.core.dto.SwInterfaceDetailsReplyDump;
+import io.fd.jvpp.core.dto.SwInterfaceDump;
+import io.fd.jvpp.core.future.FutureJVppCoreFacade;
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/FutureApiNotificationExample.java b/java/jvpp-core/io/fd/jvpp/core/examples/FutureApiNotificationExample.java
index 3c84fd7..67fd05c 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/FutureApiNotificationExample.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/FutureApiNotificationExample.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
+package io.fd.jvpp.core.examples;
 
-import static io.fd.vpp.jvpp.core.examples.NotificationUtils.getChangeInterfaceState;
-import static io.fd.vpp.jvpp.core.examples.NotificationUtils.getDisableInterfaceNotificationsReq;
-import static io.fd.vpp.jvpp.core.examples.NotificationUtils.getEnableInterfaceNotificationsReq;
+import static io.fd.jvpp.core.examples.NotificationUtils.getChangeInterfaceState;
+import static io.fd.jvpp.core.examples.NotificationUtils.getDisableInterfaceNotificationsReq;
+import static io.fd.jvpp.core.examples.NotificationUtils.getEnableInterfaceNotificationsReq;
 
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
-import io.fd.vpp.jvpp.core.callback.SwInterfaceEventCallback;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceEvent;
-import io.fd.vpp.jvpp.VppCallbackException;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.future.FutureJVppCoreFacade;
+import io.fd.jvpp.core.callback.SwInterfaceEventCallback;
+import io.fd.jvpp.core.dto.SwInterfaceEvent;
+import io.fd.jvpp.VppCallbackException;
 
 public class FutureApiNotificationExample {
 
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/FutureApiReadPerfTest.java b/java/jvpp-core/io/fd/jvpp/core/examples/FutureApiReadPerfTest.java
index f335b28..747a66a 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/FutureApiReadPerfTest.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/FutureApiReadPerfTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
+package io.fd.jvpp.core.examples;
 
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.callback.ShowVersionReplyCallback;
-import io.fd.vpp.jvpp.core.dto.*;
-import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.callback.ShowVersionReplyCallback;
+import io.fd.jvpp.core.dto.*;
+import io.fd.jvpp.core.future.FutureJVppCoreFacade;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.logging.Logger;
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/L2AclExample.java b/java/jvpp-core/io/fd/jvpp/core/examples/L2AclExample.java
index 0be85d4..7f6742a 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/L2AclExample.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/L2AclExample.java
@@ -14,26 +14,26 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
-
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSessionReply;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTableReply;
-import io.fd.vpp.jvpp.core.dto.ClassifySessionDetailsReplyDump;
-import io.fd.vpp.jvpp.core.dto.ClassifySessionDump;
-import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterface;
-import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterfaceReply;
-import io.fd.vpp.jvpp.core.dto.ClassifyTableIds;
-import io.fd.vpp.jvpp.core.dto.ClassifyTableIdsReply;
-import io.fd.vpp.jvpp.core.dto.ClassifyTableInfo;
-import io.fd.vpp.jvpp.core.dto.ClassifyTableInfoReply;
-import io.fd.vpp.jvpp.core.dto.InputAclSetInterface;
-import io.fd.vpp.jvpp.core.dto.InputAclSetInterfaceReply;
-import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
+package io.fd.jvpp.core.examples;
+
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.dto.ClassifyAddDelSession;
+import io.fd.jvpp.core.dto.ClassifyAddDelSessionReply;
+import io.fd.jvpp.core.dto.ClassifyAddDelTable;
+import io.fd.jvpp.core.dto.ClassifyAddDelTableReply;
+import io.fd.jvpp.core.dto.ClassifySessionDetailsReplyDump;
+import io.fd.jvpp.core.dto.ClassifySessionDump;
+import io.fd.jvpp.core.dto.ClassifyTableByInterface;
+import io.fd.jvpp.core.dto.ClassifyTableByInterfaceReply;
+import io.fd.jvpp.core.dto.ClassifyTableIds;
+import io.fd.jvpp.core.dto.ClassifyTableIdsReply;
+import io.fd.jvpp.core.dto.ClassifyTableInfo;
+import io.fd.jvpp.core.dto.ClassifyTableInfoReply;
+import io.fd.jvpp.core.dto.InputAclSetInterface;
+import io.fd.jvpp.core.dto.InputAclSetInterfaceReply;
+import io.fd.jvpp.core.future.FutureJVppCoreFacade;
 
 /**
  * <p>Tests L2 ACL creation and read.<br> Equivalent to the following vppctl commands:<br>
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/LispAdjacencyExample.java b/java/jvpp-core/io/fd/jvpp/core/examples/LispAdjacencyExample.java
index f637669..32addbc 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/LispAdjacencyExample.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/LispAdjacencyExample.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
+package io.fd.jvpp.core.examples;
 
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.dto.LispAddDelAdjacency;
-import io.fd.vpp.jvpp.core.dto.LispAddDelLocalEid;
-import io.fd.vpp.jvpp.core.dto.LispAddDelLocatorSet;
-import io.fd.vpp.jvpp.core.dto.LispAddDelRemoteMapping;
-import io.fd.vpp.jvpp.core.dto.LispAdjacenciesGet;
-import io.fd.vpp.jvpp.core.dto.LispAdjacenciesGetReply;
-import io.fd.vpp.jvpp.core.dto.LispEnableDisable;
-import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.dto.LispAddDelAdjacency;
+import io.fd.jvpp.core.dto.LispAddDelLocalEid;
+import io.fd.jvpp.core.dto.LispAddDelLocatorSet;
+import io.fd.jvpp.core.dto.LispAddDelRemoteMapping;
+import io.fd.jvpp.core.dto.LispAdjacenciesGet;
+import io.fd.jvpp.core.dto.LispAdjacenciesGetReply;
+import io.fd.jvpp.core.dto.LispEnableDisable;
+import io.fd.jvpp.core.future.FutureJVppCoreFacade;
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.ExecutionException;
 import java.util.logging.Logger;
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/NotificationUtils.java b/java/jvpp-core/io/fd/jvpp/core/examples/NotificationUtils.java
index e963d63..7b78389 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/NotificationUtils.java
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/NotificationUtils.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.examples;
+package io.fd.jvpp.core.examples;
 
 import java.io.PrintStream;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceSetFlags;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceEvent;
-import io.fd.vpp.jvpp.core.dto.WantInterfaceEvents;
+import io.fd.jvpp.core.dto.SwInterfaceSetFlags;
+import io.fd.jvpp.core.dto.SwInterfaceEvent;
+import io.fd.jvpp.core.dto.WantInterfaceEvents;
 
 final class NotificationUtils {
 
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/Readme.txt b/java/jvpp-core/io/fd/jvpp/core/examples/Readme.txt
index 9fe3c7a..df4dd89 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/examples/Readme.txt
+++ b/java/jvpp-core/io/fd/jvpp/core/examples/Readme.txt
@@ -2,8 +2,8 @@ This package contains basic examples for jvpp. To run the examples:
 
 - Make sure VPP is running
 - From VPP's build-root/ folder execute:
-  - release version: sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-18.01.jar:build-vpp-native/vpp/vpp-api/java/jvpp-core-18.01.jar io.fd.vpp.jvpp.core.examples.[test name]
-  - debug version: sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-18.01.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-core-18.01.jar io.fd.vpp.jvpp.core.examples.[test name]
+  - release version: sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-18.01.jar:build-vpp-native/vpp/vpp-api/java/jvpp-core-18.01.jar io.fd.jvpp.core.examples.[test name]
+  - debug version: sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-18.01.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-core-18.01.jar io.fd.jvpp.core.examples.[test name]
 
 Available examples:
 CallbackApiExample - Similar to ControlPingTest, invokes more complex calls (e.g. interface dump) using low level JVpp APIs
@@ -18,7 +18,7 @@ LispAdjacencyExample - Example of lisp adjacency creation and read (custom vpe.a
 
 CallbackApiReadPerfTest, FutureApiReadPerfTest, CallbackApiWritePerfTest - test provide two ways to count invocations:
 1) maximum number of invocations and received replyies within 1 sec
-sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-18.01.jar:build-vpp-native/vpp/vpp-api/java/jvpp-core-18.01.jar io.fd.vpp.jvpp.core.examples.[test name]
+sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-18.01.jar:build-vpp-native/vpp/vpp-api/java/jvpp-core-18.01.jar io.fd.jvpp.core.examples.[test name]
 2) measure time in ns from first request to receiving last reply over set amount of requests
-sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-18.01.jar:build-vpp-native/vpp/vpp-api/java/jvpp-core-18.01.jar io.fd.vpp.jvpp.core.examples.[test name] [number of request to send]
+sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-18.01.jar:build-vpp-native/vpp/vpp-api/java/jvpp-core-18.01.jar io.fd.jvpp.core.examples.[test name] [number of request to send]
 
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackApiTest.java b/java/jvpp-core/io/fd/jvpp/core/test/CallbackApiTest.java
index 493116c..06255a7 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackApiTest.java
+++ b/java/jvpp-core/io/fd/jvpp/core/test/CallbackApiTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.test;
+package io.fd.jvpp.core.test;
 
-import io.fd.vpp.jvpp.AbstractCallbackApiTest;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.AbstractCallbackApiTest;
+import io.fd.jvpp.core.JVppCoreImpl;
 
 import java.util.logging.Logger;
 
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/test/FutureApiTest.java b/java/jvpp-core/io/fd/jvpp/core/test/FutureApiTest.java
index d3acecc..6af4a41 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/test/FutureApiTest.java
+++ b/java/jvpp-core/io/fd/jvpp/core/test/FutureApiTest.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package io.fd.vpp.jvpp.core.test;
+package io.fd.jvpp.core.test;
 
-import io.fd.vpp.jvpp.JVppRegistry;
-import io.fd.vpp.jvpp.JVppRegistryImpl;
-import io.fd.vpp.jvpp.core.JVppCoreImpl;
-import io.fd.vpp.jvpp.core.dto.BridgeDomainDetailsReplyDump;
-import io.fd.vpp.jvpp.core.dto.BridgeDomainDump;
-import io.fd.vpp.jvpp.core.dto.GetNodeIndex;
-import io.fd.vpp.jvpp.core.dto.GetNodeIndexReply;
-import io.fd.vpp.jvpp.core.dto.ShowVersion;
-import io.fd.vpp.jvpp.core.dto.ShowVersionReply;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceDetailsReplyDump;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceDump;
-import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
+import io.fd.jvpp.JVppRegistry;
+import io.fd.jvpp.JVppRegistryImpl;
+import io.fd.jvpp.core.JVppCoreImpl;
+import io.fd.jvpp.core.dto.BridgeDomainDetailsReplyDump;
+import io.fd.jvpp.core.dto.BridgeDomainDump;
+import io.fd.jvpp.core.dto.GetNodeIndex;
+import io.fd.jvpp.core.dto.GetNodeIndexReply;
+import io.fd.jvpp.core.dto.ShowVersion;
+import io.fd.jvpp.core.dto.ShowVersionReply;
+import io.fd.jvpp.core.dto.SwInterfaceDetails;
+import io.fd.jvpp.core.dto.SwInterfaceDetailsReplyDump;
+import io.fd.jvpp.core.dto.SwInterfaceDump;
+import io.fd.jvpp.core.future.FutureJVppCoreFacade;
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
diff --git a/java/jvpp-core/io/fd/vpp/jvpp/core/test/Readme.txt b/java/jvpp-core/io/fd/jvpp/core/test/Readme.txt
index b74cf60..f7cb5fc 100644
--- a/java/jvpp-core/io/fd/vpp/jvpp/core/test/Readme.txt
+++ b/java/jvpp-core/io/fd/jvpp/core/test/Readme.txt
@@ -2,8 +2,8 @@ This package contains basic tests for jvpp. To run the tests:
 
 - Make sure VPP is running
 - From VPP's build-root/ folder execute:
-  - release version: sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp-native/vpp/vpp-api/java/jvpp-core-17.10.jar io.fd.vpp.jvpp.core.test.[test name]
-  - debug version: sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-core-17.10.jar io.fd.vpp.jvpp.core.test.[test name]
+  - release version: sudo java -cp build-vpp-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp-native/vpp/vpp-api/java/jvpp-core-17.10.jar io.fd.jvpp.core.test.[test name]
+  - debug version: sudo java -cp build-vpp_debug-native/vpp/vpp-api/java/jvpp-registry-17.10.jar:build-vpp_debug-native/vpp/vpp-api/java/jvpp-core-17.10.jar io.fd.jvpp.core.test.[test name]
 
 Available tests:
 CallbackApiTest - Similar to ControlPingTest, invokes more complex calls (e.g. interface dump) using low level JVpp APIs