From 8c1a4caabb4d1978e28d2c7bfd43943e22576334 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 25 Apr 2023 11:37:06 +0200
Subject: [PATCH] Rename netconf-impl to netconf-server

This artifact contains only server-side things. Make sure to rename it
to reflect that.

JIRA: NETCONF-945
Change-Id: I13322553c4bdd8979fe564ce1337dfb9e43c7e7a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 artifacts/pom.xml                             | 12 ++----
 features/netconf/odl-netconf-impl/pom.xml     |  2 +-
 netconf/mdsal-netconf-impl/pom.xml            |  2 +-
 .../DefaultNetconfMonitoringService.java      |  2 +-
 .../mdsal/DefaultNetconfServerDispatcher.java |  4 +-
 .../impl/mdsal/NetconfMapperAggregator.java   |  2 +-
 .../netconf/impl/mdsal/OSGiNetconfServer.java |  8 ++--
 netconf/tools/netconf-testtool/pom.xml        |  8 ++--
 .../test/tool/MdsalOperationProvider.java     |  2 +-
 .../test/tool/NetconfDeviceSimulator.java     | 12 +++---
 .../test/tool/SimulatedOperationProvider.java |  2 +-
 .../test/tool/TesttoolNegotiationFactory.java |  4 +-
 .../operations/DefaultOperationsCreator.java  |  2 +-
 .../tool/operations/OperationsCreator.java    |  2 +-
 .../tool/operations/OperationsProvider.java   |  2 +-
 .../tool/rpc/SimulatedCreateSubscription.java |  6 +--
 plugins/sal-netconf-connector/pom.xml         |  2 +-
 .../{netconf-impl => netconf-server}/pom.xml  | 37 +------------------
 .../server}/DefaultSessionIdProvider.java     |  2 +-
 .../server}/NetconfServerDispatcherImpl.java  | 13 +++----
 .../netconf/server}/NetconfServerSession.java | 10 ++---
 .../server}/NetconfServerSessionListener.java |  8 ++--
 .../NetconfServerSessionNegotiator.java       |  2 +-
 ...NetconfServerSessionNegotiatorFactory.java |  6 +--
 ...ServerSessionNegotiatorFactoryBuilder.java |  2 +-
 .../server}/SendErrorExceptionUtil.java       |  7 ++--
 .../server}/ServerChannelInitializer.java     |  4 +-
 .../netconf/server}/SessionIdProvider.java    |  2 +-
 .../operations/DefaultCloseSession.java       |  6 +--
 .../operations/DefaultNetconfOperation.java   |  4 +-
 .../mapping/operations/DefaultStartExi.java   |  4 +-
 .../mapping/operations/DefaultStopExi.java    | 13 +++----
 ...regatedNetconfOperationServiceFactory.java |  2 +-
 .../NetconfCapabilityMonitoringService.java   |  2 +-
 .../osgi/NetconfMonitoringServiceImpl.java    |  3 +-
 .../server}/osgi/NetconfOperationRouter.java  | 10 ++---
 .../osgi/NetconfOperationRouterImpl.java      | 14 +++----
 .../osgi/NetconfSessionMonitoringService.java |  2 +-
 .../util/DeserializerExceptionHandler.java    |  4 +-
 .../src/main/yang/odl-netconf-monitoring.yang |  0
 .../server}/AdditionalHeaderParserTest.java   |  2 +-
 .../server}/ConcurrentClientsTest.java        |  4 +-
 .../netconf/server}/ExiEncodeDecodeTest.java  |  4 +-
 .../netconf/server}/MessageParserTest.java    |  2 +-
 .../server}/NetconfDispatcherImplTest.java    |  4 +-
 .../NetconfServerSessionListenerTest.java     |  5 +--
 .../NetconfServerSessionNegotiatorTest.java   | 18 +++------
 .../server}/NetconfServerSessionTest.java     |  2 +-
 .../server}/SendErrorExceptionUtilTest.java   |  2 +-
 .../operations/DefaultCloseSessionTest.java   | 14 +++----
 .../operations/DefaultStopExiTest.java        |  5 +--
 ...tedNetconfOperationServiceFactoryTest.java |  2 +-
 ...etconfCapabilityMonitoringServiceTest.java |  2 +-
 .../osgi/NetconfOperationRouterImplTest.java  |  8 ++--
 .../NetconfSessionMonitoringServiceTest.java  |  3 +-
 .../DeserializerExceptionHandlerTest.java     |  3 +-
 .../src/test/resources/messages/rpc.xml       |  0
 .../src/test/resources/messages/rpc_ns.xml    |  0
 protocol/pom.xml                              |  2 +-
 59 files changed, 124 insertions(+), 189 deletions(-)
 rename protocol/{netconf-impl => netconf-server}/pom.xml (76%)
 rename protocol/{netconf-impl/src/main/java/org/opendaylight/netconf/impl => netconf-server/src/main/java/org/opendaylight/netconf/server}/DefaultSessionIdProvider.java (96%)
 rename protocol/{netconf-impl/src/main/java/org/opendaylight/netconf/impl => netconf-server/src/main/java/org/opendaylight/netconf/server}/NetconfServerDispatcherImpl.java (73%)
 rename protocol/{netconf-impl/src/main/java/org/opendaylight/netconf/impl => netconf-server/src/main/java/org/opendaylight/netconf/server}/NetconfServerSession.java (96%)
 rename protocol/{netconf-impl/src/main/java/org/opendaylight/netconf/impl => netconf-server/src/main/java/org/opendaylight/netconf/server}/NetconfServerSessionListener.java (97%)
 rename protocol/{netconf-impl/src/main/java/org/opendaylight/netconf/impl => netconf-server/src/main/java/org/opendaylight/netconf/server}/NetconfServerSessionNegotiator.java (98%)
 rename protocol/{netconf-impl/src/main/java/org/opendaylight/netconf/impl => netconf-server/src/main/java/org/opendaylight/netconf/server}/NetconfServerSessionNegotiatorFactory.java (97%)
 rename protocol/{netconf-impl/src/main/java/org/opendaylight/netconf/impl => netconf-server/src/main/java/org/opendaylight/netconf/server}/NetconfServerSessionNegotiatorFactoryBuilder.java (98%)
 rename protocol/{netconf-impl/src/main/java/org/opendaylight/netconf/impl => netconf-server/src/main/java/org/opendaylight/netconf/server}/SendErrorExceptionUtil.java (97%)
 rename protocol/{netconf-impl/src/main/java/org/opendaylight/netconf/impl => netconf-server/src/main/java/org/opendaylight/netconf/server}/ServerChannelInitializer.java (92%)
 rename protocol/{netconf-impl/src/main/java/org/opendaylight/netconf/impl => netconf-server/src/main/java/org/opendaylight/netconf/server}/SessionIdProvider.java (90%)
 rename protocol/{netconf-impl/src/main/java/org/opendaylight/netconf/impl => netconf-server/src/main/java/org/opendaylight/netconf/server}/mapping/operations/DefaultCloseSession.java (94%)
 rename protocol/{netconf-impl/src/main/java/org/opendaylight/netconf/impl => netconf-server/src/main/java/org/opendaylight/netconf/server}/mapping/operations/DefaultNetconfOperation.java (77%)
 rename protocol/{netconf-impl/src/main/java/org/opendaylight/netconf/impl => netconf-server/src/main/java/org/opendaylight/netconf/server}/mapping/operations/DefaultStartExi.java (96%)
 rename protocol/{netconf-impl/src/main/java/org/opendaylight/netconf/impl => netconf-server/src/main/java/org/opendaylight/netconf/server}/mapping/operations/DefaultStopExi.java (78%)
 rename protocol/{netconf-impl/src/main/java/org/opendaylight/netconf/impl => netconf-server/src/main/java/org/opendaylight/netconf/server}/osgi/AggregatedNetconfOperationServiceFactory.java (99%)
 rename protocol/{netconf-impl/src/main/java/org/opendaylight/netconf/impl => netconf-server/src/main/java/org/opendaylight/netconf/server}/osgi/NetconfCapabilityMonitoringService.java (99%)
 rename protocol/{netconf-impl/src/main/java/org/opendaylight/netconf/impl => netconf-server/src/main/java/org/opendaylight/netconf/server}/osgi/NetconfMonitoringServiceImpl.java (98%)
 rename protocol/{netconf-impl/src/main/java/org/opendaylight/netconf/impl => netconf-server/src/main/java/org/opendaylight/netconf/server}/osgi/NetconfOperationRouter.java (76%)
 rename protocol/{netconf-impl/src/main/java/org/opendaylight/netconf/impl => netconf-server/src/main/java/org/opendaylight/netconf/server}/osgi/NetconfOperationRouterImpl.java (96%)
 rename protocol/{netconf-impl/src/main/java/org/opendaylight/netconf/impl => netconf-server/src/main/java/org/opendaylight/netconf/server}/osgi/NetconfSessionMonitoringService.java (99%)
 rename protocol/{netconf-impl/src/main/java/org/opendaylight/netconf/impl => netconf-server/src/main/java/org/opendaylight/netconf/server}/util/DeserializerExceptionHandler.java (93%)
 rename protocol/{netconf-impl => netconf-server}/src/main/yang/odl-netconf-monitoring.yang (100%)
 rename protocol/{netconf-impl/src/test/java/org/opendaylight/netconf/impl => netconf-server/src/test/java/org/opendaylight/netconf/server}/AdditionalHeaderParserTest.java (97%)
 rename protocol/{netconf-impl/src/test/java/org/opendaylight/netconf/impl => netconf-server/src/test/java/org/opendaylight/netconf/server}/ConcurrentClientsTest.java (99%)
 rename protocol/{netconf-impl/src/test/java/org/opendaylight/netconf/impl => netconf-server/src/test/java/org/opendaylight/netconf/server}/ExiEncodeDecodeTest.java (94%)
 rename protocol/{netconf-impl/src/test/java/org/opendaylight/netconf/impl => netconf-server/src/test/java/org/opendaylight/netconf/server}/MessageParserTest.java (99%)
 rename protocol/{netconf-impl/src/test/java/org/opendaylight/netconf/impl => netconf-server/src/test/java/org/opendaylight/netconf/server}/NetconfDispatcherImplTest.java (94%)
 rename protocol/{netconf-impl/src/test/java/org/opendaylight/netconf/impl => netconf-server/src/test/java/org/opendaylight/netconf/server}/NetconfServerSessionListenerTest.java (98%)
 rename protocol/{netconf-impl/src/test/java/org/opendaylight/netconf/impl => netconf-server/src/test/java/org/opendaylight/netconf/server}/NetconfServerSessionNegotiatorTest.java (71%)
 rename protocol/{netconf-impl/src/test/java/org/opendaylight/netconf/impl => netconf-server/src/test/java/org/opendaylight/netconf/server}/NetconfServerSessionTest.java (99%)
 rename protocol/{netconf-impl/src/test/java/org/opendaylight/netconf/impl => netconf-server/src/test/java/org/opendaylight/netconf/server}/SendErrorExceptionUtilTest.java (98%)
 rename protocol/{netconf-impl/src/test/java/org/opendaylight/netconf/impl => netconf-server/src/test/java/org/opendaylight/netconf/server}/mapping/operations/DefaultCloseSessionTest.java (92%)
 rename protocol/{netconf-impl/src/test/java/org/opendaylight/netconf/impl => netconf-server/src/test/java/org/opendaylight/netconf/server}/mapping/operations/DefaultStopExiTest.java (94%)
 rename protocol/{netconf-impl/src/test/java/org/opendaylight/netconf/impl => netconf-server/src/test/java/org/opendaylight/netconf/server}/osgi/AggregatedNetconfOperationServiceFactoryTest.java (99%)
 rename protocol/{netconf-impl/src/test/java/org/opendaylight/netconf/impl => netconf-server/src/test/java/org/opendaylight/netconf/server}/osgi/NetconfCapabilityMonitoringServiceTest.java (99%)
 rename protocol/{netconf-impl/src/test/java/org/opendaylight/netconf/impl => netconf-server/src/test/java/org/opendaylight/netconf/server}/osgi/NetconfOperationRouterImplTest.java (96%)
 rename protocol/{netconf-impl/src/test/java/org/opendaylight/netconf/impl => netconf-server/src/test/java/org/opendaylight/netconf/server}/osgi/NetconfSessionMonitoringServiceTest.java (99%)
 rename protocol/{netconf-impl/src/test/java/org/opendaylight/netconf/impl => netconf-server/src/test/java/org/opendaylight/netconf/server}/util/DeserializerExceptionHandlerTest.java (97%)
 rename protocol/{netconf-impl => netconf-server}/src/test/resources/messages/rpc.xml (100%)
 rename protocol/{netconf-impl => netconf-server}/src/test/resources/messages/rpc_ns.xml (100%)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 27737be14f..f8209c0619 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -62,17 +62,17 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>mdsal-netconf-connector</artifactId>
+                <artifactId>netconf-server</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-impl</artifactId>
+                <artifactId>netconf-mapping-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-mapping-api</artifactId>
+                <artifactId>mdsal-netconf-connector</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -306,12 +306,6 @@
                 <version>${project.version}</version>
                 <type>test-jar</type>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-impl</artifactId>
-                <version>${project.version}</version>
-                <type>test-jar</type>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>netconf-netty-util</artifactId>
diff --git a/features/netconf/odl-netconf-impl/pom.xml b/features/netconf/odl-netconf-impl/pom.xml
index fc45317e16..7ae7595791 100644
--- a/features/netconf/odl-netconf-impl/pom.xml
+++ b/features/netconf/odl-netconf-impl/pom.xml
@@ -59,7 +59,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>netconf-impl</artifactId>
+            <artifactId>netconf-server</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/netconf/mdsal-netconf-impl/pom.xml b/netconf/mdsal-netconf-impl/pom.xml
index 77b4422d53..4c6a1c4114 100644
--- a/netconf/mdsal-netconf-impl/pom.xml
+++ b/netconf/mdsal-netconf-impl/pom.xml
@@ -43,7 +43,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>netconf-impl</artifactId>
+      <artifactId>netconf-server</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
diff --git a/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/DefaultNetconfMonitoringService.java b/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/DefaultNetconfMonitoringService.java
index 1b918657d7..97a78bc865 100644
--- a/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/DefaultNetconfMonitoringService.java
+++ b/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/DefaultNetconfMonitoringService.java
@@ -12,8 +12,8 @@ import static java.util.Objects.requireNonNull;
 import java.util.Map;
 import org.opendaylight.controller.config.threadpool.ScheduledThreadPool;
 import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService;
-import org.opendaylight.netconf.impl.osgi.NetconfMonitoringServiceImpl;
 import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory;
+import org.opendaylight.netconf.server.osgi.NetconfMonitoringServiceImpl;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
diff --git a/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/DefaultNetconfServerDispatcher.java b/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/DefaultNetconfServerDispatcher.java
index a60317b711..a1edec19ee 100644
--- a/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/DefaultNetconfServerDispatcher.java
+++ b/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/DefaultNetconfServerDispatcher.java
@@ -12,8 +12,8 @@ import static java.util.Objects.requireNonNull;
 import io.netty.channel.EventLoopGroup;
 import java.util.Map;
 import org.opendaylight.netconf.api.NetconfServerDispatcher;
-import org.opendaylight.netconf.impl.NetconfServerDispatcherImpl;
-import org.opendaylight.netconf.impl.ServerChannelInitializer;
+import org.opendaylight.netconf.server.NetconfServerDispatcherImpl;
+import org.opendaylight.netconf.server.ServerChannelInitializer;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 
diff --git a/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/NetconfMapperAggregator.java b/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/NetconfMapperAggregator.java
index cf3637a13f..ea0eda2cdb 100644
--- a/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/NetconfMapperAggregator.java
+++ b/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/NetconfMapperAggregator.java
@@ -7,9 +7,9 @@
  */
 package org.opendaylight.netconf.impl.mdsal;
 
-import org.opendaylight.netconf.impl.osgi.AggregatedNetconfOperationServiceFactory;
 import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory;
 import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactoryListener;
+import org.opendaylight.netconf.server.osgi.AggregatedNetconfOperationServiceFactory;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
diff --git a/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/OSGiNetconfServer.java b/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/OSGiNetconfServer.java
index e4bb3ba751..56aae63938 100644
--- a/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/OSGiNetconfServer.java
+++ b/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/OSGiNetconfServer.java
@@ -14,11 +14,11 @@ import io.netty.channel.EventLoopGroup;
 import io.netty.util.Timer;
 import java.util.Map;
 import org.opendaylight.controller.config.threadpool.ScheduledThreadPool;
-import org.opendaylight.netconf.impl.NetconfServerSessionNegotiatorFactory;
-import org.opendaylight.netconf.impl.ServerChannelInitializer;
-import org.opendaylight.netconf.impl.SessionIdProvider;
-import org.opendaylight.netconf.impl.osgi.AggregatedNetconfOperationServiceFactory;
 import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory;
+import org.opendaylight.netconf.server.NetconfServerSessionNegotiatorFactory;
+import org.opendaylight.netconf.server.ServerChannelInitializer;
+import org.opendaylight.netconf.server.SessionIdProvider;
+import org.opendaylight.netconf.server.osgi.AggregatedNetconfOperationServiceFactory;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.service.component.ComponentFactory;
 import org.osgi.service.component.ComponentInstance;
diff --git a/netconf/tools/netconf-testtool/pom.xml b/netconf/tools/netconf-testtool/pom.xml
index 3a6341917c..56a9d7a74c 100644
--- a/netconf/tools/netconf-testtool/pom.xml
+++ b/netconf/tools/netconf-testtool/pom.xml
@@ -89,6 +89,10 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>netconf-server</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.guicedee.services</groupId>
             <artifactId>javax.inject</artifactId>
@@ -98,10 +102,6 @@
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc6991</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>netconf-impl</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-mapping-api</artifactId>
diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java
index 3685f2172b..b60acee256 100644
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java
@@ -23,7 +23,6 @@ import org.opendaylight.mdsal.dom.spi.store.DOMStore;
 import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStoreFactory;
 import org.opendaylight.netconf.api.capability.Capability;
 import org.opendaylight.netconf.api.monitoring.CapabilityListener;
-import org.opendaylight.netconf.impl.SessionIdProvider;
 import org.opendaylight.netconf.mapping.api.NetconfOperation;
 import org.opendaylight.netconf.mapping.api.NetconfOperationService;
 import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory;
@@ -36,6 +35,7 @@ import org.opendaylight.netconf.mdsal.connector.ops.Lock;
 import org.opendaylight.netconf.mdsal.connector.ops.Unlock;
 import org.opendaylight.netconf.mdsal.connector.ops.get.Get;
 import org.opendaylight.netconf.mdsal.connector.ops.get.GetConfig;
+import org.opendaylight.netconf.server.SessionIdProvider;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.NetconfState;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.Yang;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.Schemas;
diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java
index 973426bc5c..b1136c83e4 100644
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java
@@ -38,13 +38,13 @@ import org.opendaylight.netconf.api.capability.BasicCapability;
 import org.opendaylight.netconf.api.capability.Capability;
 import org.opendaylight.netconf.api.capability.YangModuleCapability;
 import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService;
-import org.opendaylight.netconf.impl.DefaultSessionIdProvider;
-import org.opendaylight.netconf.impl.NetconfServerDispatcherImpl;
-import org.opendaylight.netconf.impl.NetconfServerSessionNegotiatorFactory;
-import org.opendaylight.netconf.impl.ServerChannelInitializer;
-import org.opendaylight.netconf.impl.SessionIdProvider;
-import org.opendaylight.netconf.impl.osgi.AggregatedNetconfOperationServiceFactory;
 import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory;
+import org.opendaylight.netconf.server.DefaultSessionIdProvider;
+import org.opendaylight.netconf.server.NetconfServerDispatcherImpl;
+import org.opendaylight.netconf.server.NetconfServerSessionNegotiatorFactory;
+import org.opendaylight.netconf.server.ServerChannelInitializer;
+import org.opendaylight.netconf.server.SessionIdProvider;
+import org.opendaylight.netconf.server.osgi.AggregatedNetconfOperationServiceFactory;
 import org.opendaylight.netconf.shaded.sshd.common.keyprovider.KeyPairProvider;
 import org.opendaylight.netconf.shaded.sshd.common.util.threads.ThreadUtils;
 import org.opendaylight.netconf.ssh.SshProxyServer;
diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java
index 38aabec19f..4988a24d11 100644
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java
@@ -13,10 +13,10 @@ import java.util.Optional;
 import java.util.Set;
 import org.opendaylight.netconf.api.capability.Capability;
 import org.opendaylight.netconf.api.monitoring.CapabilityListener;
-import org.opendaylight.netconf.impl.SessionIdProvider;
 import org.opendaylight.netconf.mapping.api.NetconfOperation;
 import org.opendaylight.netconf.mapping.api.NetconfOperationService;
 import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory;
+import org.opendaylight.netconf.server.SessionIdProvider;
 import org.opendaylight.netconf.test.tool.rpc.DataList;
 import org.opendaylight.netconf.test.tool.rpc.SimulatedCommit;
 import org.opendaylight.netconf.test.tool.rpc.SimulatedCreateSubscription;
diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/TesttoolNegotiationFactory.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/TesttoolNegotiationFactory.java
index d7b2902c29..b6abfe25ea 100644
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/TesttoolNegotiationFactory.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/TesttoolNegotiationFactory.java
@@ -14,10 +14,10 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService;
-import org.opendaylight.netconf.impl.NetconfServerSessionNegotiatorFactory;
-import org.opendaylight.netconf.impl.SessionIdProvider;
 import org.opendaylight.netconf.mapping.api.NetconfOperationService;
 import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory;
+import org.opendaylight.netconf.server.NetconfServerSessionNegotiatorFactory;
+import org.opendaylight.netconf.server.SessionIdProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/DefaultOperationsCreator.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/DefaultOperationsCreator.java
index ec27852a15..8833ff8d9b 100644
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/DefaultOperationsCreator.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/DefaultOperationsCreator.java
@@ -11,9 +11,9 @@ import com.google.common.collect.Sets;
 import java.util.Optional;
 import java.util.Set;
 import org.opendaylight.netconf.api.capability.Capability;
-import org.opendaylight.netconf.impl.SessionIdProvider;
 import org.opendaylight.netconf.mapping.api.NetconfOperation;
 import org.opendaylight.netconf.mapping.api.NetconfOperationService;
+import org.opendaylight.netconf.server.SessionIdProvider;
 import org.opendaylight.netconf.test.tool.rpc.DataList;
 import org.opendaylight.netconf.test.tool.rpc.SimulatedCommit;
 import org.opendaylight.netconf.test.tool.rpc.SimulatedCreateSubscription;
diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/OperationsCreator.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/OperationsCreator.java
index ba8d02e1a6..e9d441d6b7 100644
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/OperationsCreator.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/OperationsCreator.java
@@ -9,8 +9,8 @@ package org.opendaylight.netconf.test.tool.operations;
 
 import java.util.Set;
 import org.opendaylight.netconf.api.capability.Capability;
-import org.opendaylight.netconf.impl.SessionIdProvider;
 import org.opendaylight.netconf.mapping.api.NetconfOperationService;
+import org.opendaylight.netconf.server.SessionIdProvider;
 
 /**
  * Creator which enables testtool users to inject own. implementation of {@link NetconfOperationService}
diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/OperationsProvider.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/OperationsProvider.java
index 6e56e3d5f0..0955c3ddab 100644
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/OperationsProvider.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/OperationsProvider.java
@@ -10,9 +10,9 @@ package org.opendaylight.netconf.test.tool.operations;
 import java.util.Set;
 import org.opendaylight.netconf.api.capability.Capability;
 import org.opendaylight.netconf.api.monitoring.CapabilityListener;
-import org.opendaylight.netconf.impl.SessionIdProvider;
 import org.opendaylight.netconf.mapping.api.NetconfOperationService;
 import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory;
+import org.opendaylight.netconf.server.SessionIdProvider;
 import org.opendaylight.yangtools.concepts.Registration;
 
 
diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java
index c6932349e0..b354dcd100 100644
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java
@@ -27,16 +27,16 @@ import org.opendaylight.netconf.api.NetconfMessage;
 import org.opendaylight.netconf.api.xml.XmlElement;
 import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
 import org.opendaylight.netconf.api.xml.XmlUtil;
-import org.opendaylight.netconf.impl.NetconfServerSession;
-import org.opendaylight.netconf.impl.mapping.operations.DefaultNetconfOperation;
+import org.opendaylight.netconf.server.NetconfServerSession;
+import org.opendaylight.netconf.server.mapping.operations.DefaultNetconfOperation;
 import org.opendaylight.netconf.util.mapping.AbstractLastNetconfOperation;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
 
 public class SimulatedCreateSubscription extends AbstractLastNetconfOperation implements DefaultNetconfOperation {
-
     private final Map<Notification, NetconfMessage> notifications;
+
     private NetconfServerSession session;
     private ScheduledExecutorService scheduledExecutorService;
 
diff --git a/plugins/sal-netconf-connector/pom.xml b/plugins/sal-netconf-connector/pom.xml
index 9bc3e519e0..284d0ef199 100644
--- a/plugins/sal-netconf-connector/pom.xml
+++ b/plugins/sal-netconf-connector/pom.xml
@@ -113,7 +113,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>netconf-impl</artifactId>
+      <artifactId>netconf-server</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/protocol/netconf-impl/pom.xml b/protocol/netconf-server/pom.xml
similarity index 76%
rename from protocol/netconf-impl/pom.xml
rename to protocol/netconf-server/pom.xml
index da8f768931..28acf944e9 100644
--- a/protocol/netconf-impl/pom.xml
+++ b/protocol/netconf-server/pom.xml
@@ -16,7 +16,7 @@
     <relativePath>../../parent</relativePath>
   </parent>
 
-  <artifactId>netconf-impl</artifactId>
+  <artifactId>netconf-server</artifactId>
   <name>${project.artifactId}</name>
   <packaging>bundle</packaging>
 
@@ -90,39 +90,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Export-Package>org.opendaylight.netconf.impl.*</Export-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>test-jar-no-fork</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/DefaultSessionIdProvider.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/DefaultSessionIdProvider.java
similarity index 96%
rename from protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/DefaultSessionIdProvider.java
rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/DefaultSessionIdProvider.java
index ad0ddf8938..29badad0eb 100644
--- a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/DefaultSessionIdProvider.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/DefaultSessionIdProvider.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl;
+package org.opendaylight.netconf.server;
 
 import java.util.concurrent.atomic.AtomicLong;
 import javax.inject.Inject;
diff --git a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerDispatcherImpl.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerDispatcherImpl.java
similarity index 73%
rename from protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerDispatcherImpl.java
rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerDispatcherImpl.java
index e740655069..70a2c91cb1 100644
--- a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerDispatcherImpl.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerDispatcherImpl.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl;
+package org.opendaylight.netconf.server;
 
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.EventLoopGroup;
@@ -17,22 +17,21 @@ import org.opendaylight.netconf.nettyutil.AbstractNetconfDispatcher;
 
 public class NetconfServerDispatcherImpl extends AbstractNetconfDispatcher<NetconfServerSession,
         NetconfServerSessionListener> implements NetconfServerDispatcher {
-
     private final ServerChannelInitializer initializer;
 
-    public NetconfServerDispatcherImpl(ServerChannelInitializer serverChannelInitializer, EventLoopGroup bossGroup,
-                                       EventLoopGroup workerGroup) {
+    public NetconfServerDispatcherImpl(final ServerChannelInitializer serverChannelInitializer,
+            final EventLoopGroup bossGroup, final EventLoopGroup workerGroup) {
         super(bossGroup, workerGroup);
-        this.initializer = serverChannelInitializer;
+        initializer = serverChannelInitializer;
     }
 
     @Override
-    public ChannelFuture createServer(InetSocketAddress address) {
+    public ChannelFuture createServer(final InetSocketAddress address) {
         return super.createServer(address, initializer::initialize);
     }
 
     @Override
-    public ChannelFuture createLocalServer(LocalAddress address) {
+    public ChannelFuture createLocalServer(final LocalAddress address) {
         return super.createServer(address, LocalServerChannel.class, initializer::initialize);
     }
 }
diff --git a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSession.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSession.java
similarity index 96%
rename from protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSession.java
rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSession.java
index dd2961193d..f9a933951d 100644
--- a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSession.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSession.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl;
+package org.opendaylight.netconf.server;
 
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Verify.verify;
@@ -48,19 +48,15 @@ import org.slf4j.LoggerFactory;
 
 public final class NetconfServerSession extends AbstractNetconfSession<NetconfServerSession,
         NetconfServerSessionListener> implements NetconfManagementSession {
-
     private static final Logger LOG = LoggerFactory.getLogger(NetconfServerSession.class);
     private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
-
-    private static final String DATE_TIME_PATTERN_STRING;
+    private static final Pattern DATE_TIME_PATTERN;
 
     static {
         verify(DateAndTime.PATTERN_CONSTANTS.size() == 1);
-        DATE_TIME_PATTERN_STRING = DateAndTime.PATTERN_CONSTANTS.get(0);
+        DATE_TIME_PATTERN = Pattern.compile(DateAndTime.PATTERN_CONSTANTS.get(0));
     }
 
-    private static final Pattern DATE_TIME_PATTERN = Pattern.compile(DATE_TIME_PATTERN_STRING);
-
     private final NetconfHelloMessageAdditionalHeader header;
     private final NetconfServerSessionListener sessionListener;
 
diff --git a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionListener.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionListener.java
similarity index 97%
rename from protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionListener.java
rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionListener.java
index 141edb98d3..4fe0d1aa2e 100644
--- a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionListener.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionListener.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl;
+package org.opendaylight.netconf.server;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
@@ -18,8 +18,8 @@ import org.opendaylight.netconf.api.monitoring.SessionEvent;
 import org.opendaylight.netconf.api.monitoring.SessionListener;
 import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
 import org.opendaylight.netconf.api.xml.XmlUtil;
-import org.opendaylight.netconf.impl.osgi.NetconfOperationRouter;
 import org.opendaylight.netconf.notifications.NetconfNotification;
+import org.opendaylight.netconf.server.osgi.NetconfOperationRouter;
 import org.opendaylight.netconf.util.messages.SubtreeFilter;
 import org.opendaylight.yangtools.yang.common.ErrorSeverity;
 import org.opendaylight.yangtools.yang.common.ErrorTag;
@@ -31,8 +31,8 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 public class NetconfServerSessionListener implements NetconfSessionListener<NetconfServerSession> {
-
     private static final Logger LOG = LoggerFactory.getLogger(NetconfServerSessionListener.class);
+
     private final SessionListener monitoringSessionListener;
     private final NetconfOperationRouter operationRouter;
     private final AutoCloseable onSessionDownCloseable;
@@ -41,7 +41,7 @@ public class NetconfServerSessionListener implements NetconfSessionListener<Netc
                                         final NetconfMonitoringService monitoringService,
                                         final AutoCloseable onSessionDownCloseable) {
         this.operationRouter = operationRouter;
-        this.monitoringSessionListener = monitoringService.getSessionListener();
+        monitoringSessionListener = monitoringService.getSessionListener();
         this.onSessionDownCloseable = onSessionDownCloseable;
     }
 
diff --git a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiator.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionNegotiator.java
similarity index 98%
rename from protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiator.java
rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionNegotiator.java
index efd48b0831..ab60af2aea 100644
--- a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiator.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionNegotiator.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl;
+package org.opendaylight.netconf.server;
 
 import io.netty.channel.Channel;
 import io.netty.channel.local.LocalAddress;
diff --git a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorFactory.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionNegotiatorFactory.java
similarity index 97%
rename from protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorFactory.java
rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionNegotiatorFactory.java
index 385f20fc7b..f3908b2ae3 100644
--- a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorFactory.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionNegotiatorFactory.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl;
+package org.opendaylight.netconf.server;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Collections2;
@@ -21,12 +21,12 @@ import org.opendaylight.netconf.api.NetconfSessionListenerFactory;
 import org.opendaylight.netconf.api.messages.NetconfHelloMessage;
 import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService;
 import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
-import org.opendaylight.netconf.impl.osgi.NetconfOperationRouter;
-import org.opendaylight.netconf.impl.osgi.NetconfOperationRouterImpl;
 import org.opendaylight.netconf.mapping.api.NetconfOperationService;
 import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory;
 import org.opendaylight.netconf.nettyutil.AbstractNetconfSessionNegotiator;
 import org.opendaylight.netconf.nettyutil.NetconfSessionNegotiatorFactory;
+import org.opendaylight.netconf.server.osgi.NetconfOperationRouter;
+import org.opendaylight.netconf.server.osgi.NetconfOperationRouterImpl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.Capabilities;
 
diff --git a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorFactoryBuilder.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionNegotiatorFactoryBuilder.java
similarity index 98%
rename from protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorFactoryBuilder.java
rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionNegotiatorFactoryBuilder.java
index 03d4687c93..3e6e2887b3 100644
--- a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorFactoryBuilder.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionNegotiatorFactoryBuilder.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl;
+package org.opendaylight.netconf.server;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
diff --git a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/SendErrorExceptionUtil.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/SendErrorExceptionUtil.java
similarity index 97%
rename from protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/SendErrorExceptionUtil.java
rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/SendErrorExceptionUtil.java
index b119c3738b..63cb3194a2 100644
--- a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/SendErrorExceptionUtil.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/SendErrorExceptionUtil.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl;
+package org.opendaylight.netconf.server;
 
 import com.google.common.base.Preconditions;
 import io.netty.channel.Channel;
@@ -28,11 +28,10 @@ public final class SendErrorExceptionUtil {
     private static final Logger LOG = LoggerFactory.getLogger(SendErrorExceptionUtil.class);
 
     private SendErrorExceptionUtil() {
-
+        // Hidden on purpose
     }
 
-    public static void sendErrorMessage(final NetconfSession session,
-            final DocumentedException sendErrorException) {
+    public static void sendErrorMessage(final NetconfSession session, final DocumentedException sendErrorException) {
         LOG.trace("Sending error", sendErrorException);
         final Document errorDocument = createDocument(sendErrorException);
         ChannelFuture channelFuture = session.sendMessage(new NetconfMessage(errorDocument));
diff --git a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/ServerChannelInitializer.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/ServerChannelInitializer.java
similarity index 92%
rename from protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/ServerChannelInitializer.java
rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/ServerChannelInitializer.java
index d75c665d8b..52dc7d0751 100644
--- a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/ServerChannelInitializer.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/ServerChannelInitializer.java
@@ -5,14 +5,14 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl;
+package org.opendaylight.netconf.server;
 
 import static java.util.Objects.requireNonNull;
 
 import io.netty.channel.Channel;
 import io.netty.util.concurrent.Promise;
-import org.opendaylight.netconf.impl.util.DeserializerExceptionHandler;
 import org.opendaylight.netconf.nettyutil.AbstractChannelInitializer;
+import org.opendaylight.netconf.server.util.DeserializerExceptionHandler;
 
 public final class ServerChannelInitializer extends AbstractChannelInitializer<NetconfServerSession> {
     private static final String DESERIALIZER_EX_HANDLER_KEY = "deserializerExHandler";
diff --git a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/SessionIdProvider.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/SessionIdProvider.java
similarity index 90%
rename from protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/SessionIdProvider.java
rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/SessionIdProvider.java
index b9d4e0c843..cf1f9e53eb 100644
--- a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/SessionIdProvider.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/SessionIdProvider.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl;
+package org.opendaylight.netconf.server;
 
 public interface SessionIdProvider {
 
diff --git a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultCloseSession.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/mapping/operations/DefaultCloseSession.java
similarity index 94%
rename from protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultCloseSession.java
rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/mapping/operations/DefaultCloseSession.java
index 7fe49959e8..02fde45c91 100644
--- a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultCloseSession.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/mapping/operations/DefaultCloseSession.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl.mapping.operations;
+package org.opendaylight.netconf.server.mapping.operations;
 
 import static java.util.Objects.requireNonNull;
 
@@ -13,7 +13,7 @@ import java.util.Map;
 import org.opendaylight.netconf.api.DocumentedException;
 import org.opendaylight.netconf.api.xml.XmlElement;
 import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
-import org.opendaylight.netconf.impl.NetconfServerSession;
+import org.opendaylight.netconf.server.NetconfServerSession;
 import org.opendaylight.netconf.util.mapping.AbstractSingletonNetconfOperation;
 import org.opendaylight.yangtools.yang.common.ErrorSeverity;
 import org.opendaylight.yangtools.yang.common.ErrorTag;
@@ -65,6 +65,6 @@ public class DefaultCloseSession extends AbstractSingletonNetconfOperation imple
 
     @Override
     public void setNetconfSession(final NetconfServerSession netconfServerSession) {
-        this.session = netconfServerSession;
+        session = netconfServerSession;
     }
 }
diff --git a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultNetconfOperation.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/mapping/operations/DefaultNetconfOperation.java
similarity index 77%
rename from protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultNetconfOperation.java
rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/mapping/operations/DefaultNetconfOperation.java
index 56b2c11e59..7813520051 100644
--- a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultNetconfOperation.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/mapping/operations/DefaultNetconfOperation.java
@@ -5,9 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl.mapping.operations;
+package org.opendaylight.netconf.server.mapping.operations;
 
-import org.opendaylight.netconf.impl.NetconfServerSession;
+import org.opendaylight.netconf.server.NetconfServerSession;
 
 public interface DefaultNetconfOperation {
     void setNetconfSession(NetconfServerSession netconfServerSession);
diff --git a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultStartExi.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/mapping/operations/DefaultStartExi.java
similarity index 96%
rename from protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultStartExi.java
rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/mapping/operations/DefaultStartExi.java
index 65c2168ff6..4f7150a19c 100644
--- a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultStartExi.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/mapping/operations/DefaultStartExi.java
@@ -5,15 +5,15 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl.mapping.operations;
+package org.opendaylight.netconf.server.mapping.operations;
 
 import org.opendaylight.netconf.api.DocumentedException;
 import org.opendaylight.netconf.api.NetconfMessage;
 import org.opendaylight.netconf.api.xml.XmlElement;
 import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
 import org.opendaylight.netconf.api.xml.XmlUtil;
-import org.opendaylight.netconf.impl.NetconfServerSession;
 import org.opendaylight.netconf.mapping.api.NetconfOperationChainedExecution;
+import org.opendaylight.netconf.server.NetconfServerSession;
 import org.opendaylight.netconf.util.mapping.AbstractSingletonNetconfOperation;
 import org.opendaylight.yangtools.yang.common.ErrorSeverity;
 import org.opendaylight.yangtools.yang.common.ErrorTag;
diff --git a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultStopExi.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/mapping/operations/DefaultStopExi.java
similarity index 78%
rename from protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultStopExi.java
rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/mapping/operations/DefaultStopExi.java
index cd2d0f1e93..30de1e854a 100644
--- a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultStopExi.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/mapping/operations/DefaultStopExi.java
@@ -5,12 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl.mapping.operations;
+package org.opendaylight.netconf.server.mapping.operations;
 
 import org.opendaylight.netconf.api.xml.XmlElement;
 import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
 import org.opendaylight.netconf.api.xml.XmlUtil;
-import org.opendaylight.netconf.impl.NetconfServerSession;
+import org.opendaylight.netconf.server.NetconfServerSession;
 import org.opendaylight.netconf.util.mapping.AbstractSingletonNetconfOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,13 +25,12 @@ public class DefaultStopExi extends AbstractSingletonNetconfOperation implements
     private static final Logger LOG = LoggerFactory
             .getLogger(DefaultStopExi.class);
 
-    public DefaultStopExi(String netconfSessionIdForReporting) {
+    public DefaultStopExi(final String netconfSessionIdForReporting) {
         super(netconfSessionIdForReporting);
     }
 
     @Override
-    protected Element handleWithNoSubsequentOperations(Document document,
-                                                       XmlElement operationElement) {
+    protected Element handleWithNoSubsequentOperations(final Document document, final XmlElement operationElement) {
         LOG.debug("Received stop-exi message {} ", XmlUtil.toString(operationElement));
 
         netconfSession.stopExiCommunication();
@@ -53,7 +52,7 @@ public class DefaultStopExi extends AbstractSingletonNetconfOperation implements
     }
 
     @Override
-    public void setNetconfSession(NetconfServerSession netconfServerSession) {
-        this.netconfSession = netconfServerSession;
+    public void setNetconfSession(final NetconfServerSession netconfServerSession) {
+        netconfSession = netconfServerSession;
     }
 }
diff --git a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/AggregatedNetconfOperationServiceFactory.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/AggregatedNetconfOperationServiceFactory.java
similarity index 99%
rename from protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/AggregatedNetconfOperationServiceFactory.java
rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/AggregatedNetconfOperationServiceFactory.java
index 37d9a51f47..372f6e76a0 100644
--- a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/AggregatedNetconfOperationServiceFactory.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/AggregatedNetconfOperationServiceFactory.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl.osgi;
+package org.opendaylight.netconf.server.osgi;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableSet;
diff --git a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringService.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfCapabilityMonitoringService.java
similarity index 99%
rename from protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringService.java
rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfCapabilityMonitoringService.java
index 41d9761a16..92a63e98f8 100644
--- a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringService.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfCapabilityMonitoringService.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl.osgi;
+package org.opendaylight.netconf.server.osgi;
 
 import static com.google.common.base.Preconditions.checkState;
 import static org.opendaylight.netconf.api.xml.XmlNetconfConstants.URN_IETF_PARAMS_NETCONF_CAPABILITY_CANDIDATE_1_0;
diff --git a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfMonitoringServiceImpl.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfMonitoringServiceImpl.java
similarity index 98%
rename from protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfMonitoringServiceImpl.java
rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfMonitoringServiceImpl.java
index d60bf5a6fb..dc62112206 100644
--- a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfMonitoringServiceImpl.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfMonitoringServiceImpl.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl.osgi;
+package org.opendaylight.netconf.server.osgi;
 
 import java.util.Optional;
 import org.opendaylight.controller.config.threadpool.ScheduledThreadPool;
@@ -19,7 +19,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.mon
 import org.opendaylight.yangtools.concepts.Registration;
 
 public class NetconfMonitoringServiceImpl implements NetconfMonitoringService, AutoCloseable {
-
     private final NetconfCapabilityMonitoringService capabilityMonitoring;
     private final NetconfSessionMonitoringService sessionMonitoring;
 
diff --git a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfOperationRouter.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfOperationRouter.java
similarity index 76%
rename from protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfOperationRouter.java
rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfOperationRouter.java
index 1e07ed2d61..91ec67b107 100644
--- a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfOperationRouter.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfOperationRouter.java
@@ -5,17 +5,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
-package org.opendaylight.netconf.impl.osgi;
+package org.opendaylight.netconf.server.osgi;
 
 import org.opendaylight.netconf.api.DocumentedException;
-import org.opendaylight.netconf.impl.NetconfServerSession;
+import org.opendaylight.netconf.server.NetconfServerSession;
 import org.w3c.dom.Document;
 
 public interface NetconfOperationRouter extends AutoCloseable {
 
-    Document onNetconfMessage(Document message, NetconfServerSession session)
-            throws DocumentedException;
-
-
+    Document onNetconfMessage(Document message, NetconfServerSession session) throws DocumentedException;
 }
diff --git a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfOperationRouterImpl.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfOperationRouterImpl.java
similarity index 96%
rename from protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfOperationRouterImpl.java
rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfOperationRouterImpl.java
index b1ab4b26de..9ba53977c5 100644
--- a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfOperationRouterImpl.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfOperationRouterImpl.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl.osgi;
+package org.opendaylight.netconf.server.osgi;
 
 import static com.google.common.base.Preconditions.checkState;
 import static java.util.Objects.requireNonNull;
@@ -20,16 +20,16 @@ import java.util.TreeMap;
 import org.opendaylight.netconf.api.DocumentedException;
 import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService;
 import org.opendaylight.netconf.api.xml.XmlUtil;
-import org.opendaylight.netconf.impl.NetconfServerSession;
-import org.opendaylight.netconf.impl.mapping.operations.DefaultCloseSession;
-import org.opendaylight.netconf.impl.mapping.operations.DefaultNetconfOperation;
-import org.opendaylight.netconf.impl.mapping.operations.DefaultStartExi;
-import org.opendaylight.netconf.impl.mapping.operations.DefaultStopExi;
 import org.opendaylight.netconf.mapping.api.HandlingPriority;
 import org.opendaylight.netconf.mapping.api.NetconfOperation;
 import org.opendaylight.netconf.mapping.api.NetconfOperationChainedExecution;
 import org.opendaylight.netconf.mapping.api.NetconfOperationService;
 import org.opendaylight.netconf.mapping.api.SessionAwareNetconfOperation;
+import org.opendaylight.netconf.server.NetconfServerSession;
+import org.opendaylight.netconf.server.mapping.operations.DefaultCloseSession;
+import org.opendaylight.netconf.server.mapping.operations.DefaultNetconfOperation;
+import org.opendaylight.netconf.server.mapping.operations.DefaultStartExi;
+import org.opendaylight.netconf.server.mapping.operations.DefaultStopExi;
 import org.opendaylight.yangtools.yang.common.ErrorSeverity;
 import org.opendaylight.yangtools.yang.common.ErrorTag;
 import org.opendaylight.yangtools.yang.common.ErrorType;
@@ -38,8 +38,8 @@ import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 
 public class NetconfOperationRouterImpl implements NetconfOperationRouter {
-
     private static final Logger LOG = LoggerFactory.getLogger(NetconfOperationRouterImpl.class);
+
     private final NetconfOperationService netconfOperationServiceSnapshot;
     private final Collection<NetconfOperation> allNetconfOperations;
 
diff --git a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfSessionMonitoringService.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfSessionMonitoringService.java
similarity index 99%
rename from protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfSessionMonitoringService.java
rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfSessionMonitoringService.java
index 1cea62c0fd..149d8c2fce 100644
--- a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfSessionMonitoringService.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfSessionMonitoringService.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl.osgi;
+package org.opendaylight.netconf.server.osgi;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Collections2;
diff --git a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/util/DeserializerExceptionHandler.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/util/DeserializerExceptionHandler.java
similarity index 93%
rename from protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/util/DeserializerExceptionHandler.java
rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/util/DeserializerExceptionHandler.java
index 6deea762f4..03651ea1b3 100644
--- a/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/util/DeserializerExceptionHandler.java
+++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/util/DeserializerExceptionHandler.java
@@ -5,13 +5,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl.util;
+package org.opendaylight.netconf.server.util;
 
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import java.util.Map;
 import org.opendaylight.netconf.api.DocumentedException;
-import org.opendaylight.netconf.impl.SendErrorExceptionUtil;
+import org.opendaylight.netconf.server.SendErrorExceptionUtil;
 import org.opendaylight.yangtools.yang.common.ErrorSeverity;
 import org.opendaylight.yangtools.yang.common.ErrorTag;
 import org.opendaylight.yangtools.yang.common.ErrorType;
diff --git a/protocol/netconf-impl/src/main/yang/odl-netconf-monitoring.yang b/protocol/netconf-server/src/main/yang/odl-netconf-monitoring.yang
similarity index 100%
rename from protocol/netconf-impl/src/main/yang/odl-netconf-monitoring.yang
rename to protocol/netconf-server/src/main/yang/odl-netconf-monitoring.yang
diff --git a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/AdditionalHeaderParserTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/AdditionalHeaderParserTest.java
similarity index 97%
rename from protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/AdditionalHeaderParserTest.java
rename to protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/AdditionalHeaderParserTest.java
index 3edd91d3ae..7c19ae8532 100644
--- a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/AdditionalHeaderParserTest.java
+++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/AdditionalHeaderParserTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl;
+package org.opendaylight.netconf.server;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/ConcurrentClientsTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/ConcurrentClientsTest.java
similarity index 99%
rename from protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/ConcurrentClientsTest.java
rename to protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/ConcurrentClientsTest.java
index 1b45cfaa53..8884955de4 100644
--- a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/ConcurrentClientsTest.java
+++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/ConcurrentClientsTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl;
+package org.opendaylight.netconf.server;
 
 import static com.google.common.base.Preconditions.checkState;
 import static java.util.Objects.requireNonNull;
@@ -62,7 +62,6 @@ import org.opendaylight.netconf.client.SimpleNetconfClientSessionListener;
 import org.opendaylight.netconf.client.TestingNetconfClient;
 import org.opendaylight.netconf.client.conf.NetconfClientConfiguration;
 import org.opendaylight.netconf.client.conf.NetconfClientConfigurationBuilder;
-import org.opendaylight.netconf.impl.osgi.AggregatedNetconfOperationServiceFactory;
 import org.opendaylight.netconf.mapping.api.HandlingPriority;
 import org.opendaylight.netconf.mapping.api.NetconfOperation;
 import org.opendaylight.netconf.mapping.api.NetconfOperationChainedExecution;
@@ -70,6 +69,7 @@ import org.opendaylight.netconf.mapping.api.NetconfOperationService;
 import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory;
 import org.opendaylight.netconf.nettyutil.NeverReconnectStrategy;
 import org.opendaylight.netconf.nettyutil.handler.exi.NetconfStartExiMessage;
+import org.opendaylight.netconf.server.osgi.AggregatedNetconfOperationServiceFactory;
 import org.opendaylight.netconf.util.messages.NetconfMessageUtil;
 import org.opendaylight.netconf.util.test.XmlFileLoader;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.CapabilitiesBuilder;
diff --git a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/ExiEncodeDecodeTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/ExiEncodeDecodeTest.java
similarity index 94%
rename from protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/ExiEncodeDecodeTest.java
rename to protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/ExiEncodeDecodeTest.java
index 2fe0d5173c..c28c98188e 100644
--- a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/ExiEncodeDecodeTest.java
+++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/ExiEncodeDecodeTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl;
+package org.opendaylight.netconf.server;
 
 import static org.junit.Assert.assertNotNull;
 
@@ -20,7 +20,7 @@ public class ExiEncodeDecodeTest {
         String startExiString = XmlFileLoader.xmlFileToString("netconfMessages/startExi.xml");
         assertNotNull(startExiString);
 
-        NetconfMessage startExiMessage = XmlFileLoader.xmlFileToNetconfMessage(("netconfMessages/startExi.xml"));
+        NetconfMessage startExiMessage = XmlFileLoader.xmlFileToNetconfMessage("netconfMessages/startExi.xml");
         assertNotNull(startExiMessage);
 
         /*
diff --git a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/MessageParserTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/MessageParserTest.java
similarity index 99%
rename from protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/MessageParserTest.java
rename to protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/MessageParserTest.java
index 06b76a213d..87f0be168b 100644
--- a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/MessageParserTest.java
+++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/MessageParserTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl;
+package org.opendaylight.netconf.server;
 
 import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
 import static org.junit.Assert.assertArrayEquals;
diff --git a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfDispatcherImplTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfDispatcherImplTest.java
similarity index 94%
rename from protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfDispatcherImplTest.java
rename to protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfDispatcherImplTest.java
index af5ce49e1e..42a9d4b277 100644
--- a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfDispatcherImplTest.java
+++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfDispatcherImplTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl;
+package org.opendaylight.netconf.server;
 
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.EventLoopGroup;
@@ -15,7 +15,7 @@ import java.net.InetSocketAddress;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.netconf.impl.osgi.AggregatedNetconfOperationServiceFactory;
+import org.opendaylight.netconf.server.osgi.AggregatedNetconfOperationServiceFactory;
 
 public class NetconfDispatcherImplTest {
     private EventLoopGroup nettyGroup;
diff --git a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionListenerTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionListenerTest.java
similarity index 98%
rename from protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionListenerTest.java
rename to protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionListenerTest.java
index 80ce81a142..6cf9240284 100644
--- a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionListenerTest.java
+++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionListenerTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl;
+package org.opendaylight.netconf.server;
 
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
@@ -32,13 +32,12 @@ import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService;
 import org.opendaylight.netconf.api.monitoring.SessionEvent;
 import org.opendaylight.netconf.api.monitoring.SessionListener;
 import org.opendaylight.netconf.api.xml.XmlUtil;
-import org.opendaylight.netconf.impl.osgi.NetconfOperationRouter;
 import org.opendaylight.netconf.notifications.NetconfNotification;
+import org.opendaylight.netconf.server.osgi.NetconfOperationRouter;
 import org.w3c.dom.Document;
 
 @RunWith(MockitoJUnitRunner.StrictStubs.class)
 public class NetconfServerSessionListenerTest {
-
     @Mock
     private NetconfOperationRouter router;
     @Mock
diff --git a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionNegotiatorTest.java
similarity index 71%
rename from protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorTest.java
rename to protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionNegotiatorTest.java
index 6e51922904..3fbf785d77 100644
--- a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorTest.java
+++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionNegotiatorTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl;
+package org.opendaylight.netconf.server;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -24,27 +24,21 @@ public class NetconfServerSessionNegotiatorTest {
         assertNotNull(NetconfServerSessionNegotiator.getHostName(socketAddress));
 
         assertEquals(socketAddress.getHostName(),
-                NetconfServerSessionNegotiator.getHostName(socketAddress)
-                        .getValue());
+            NetconfServerSessionNegotiator.getHostName(socketAddress).getValue());
 
         socketAddress = new InetSocketAddress("TestPortInet", 20);
 
         assertEquals(socketAddress.getHostName(),
-                NetconfServerSessionNegotiator.getHostName(socketAddress)
-                        .getValue());
+            NetconfServerSessionNegotiator.getHostName(socketAddress).getValue());
 
         assertEquals(String.valueOf(socketAddress.getPort()),
-                NetconfServerSessionNegotiator.getHostName(socketAddress)
-                        .getKey());
+            NetconfServerSessionNegotiator.getHostName(socketAddress).getKey());
 
         LocalAddress localAddress = new LocalAddress("TestPortLocal");
 
         assertEquals(String.valueOf(localAddress.id()),
-                NetconfServerSessionNegotiator.getHostName(localAddress)
-                        .getValue());
-
-        SshdSocketAddress embeddedAddress = new SshdSocketAddress(
-                "TestSshdName", 10);
+            NetconfServerSessionNegotiator.getHostName(localAddress).getValue());
 
+        SshdSocketAddress embeddedAddress = new SshdSocketAddress("TestSshdName", 10);
     }
 }
diff --git a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionTest.java
similarity index 99%
rename from protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionTest.java
rename to protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionTest.java
index 8b48cb2dc6..ae2c46be59 100644
--- a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionTest.java
+++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl;
+package org.opendaylight.netconf.server;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
diff --git a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/SendErrorExceptionUtilTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/SendErrorExceptionUtilTest.java
similarity index 98%
rename from protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/SendErrorExceptionUtilTest.java
rename to protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/SendErrorExceptionUtilTest.java
index 5dbd480f60..be45be0db2 100644
--- a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/SendErrorExceptionUtilTest.java
+++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/SendErrorExceptionUtilTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl;
+package org.opendaylight.netconf.server;
 
 import static java.util.Objects.requireNonNull;
 import static org.junit.Assert.assertEquals;
diff --git a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/mapping/operations/DefaultCloseSessionTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/mapping/operations/DefaultCloseSessionTest.java
similarity index 92%
rename from protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/mapping/operations/DefaultCloseSessionTest.java
rename to protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/mapping/operations/DefaultCloseSessionTest.java
index da4c9fb60d..e65d960dbd 100644
--- a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/mapping/operations/DefaultCloseSessionTest.java
+++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/mapping/operations/DefaultCloseSessionTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl.mapping.operations;
+package org.opendaylight.netconf.server.mapping.operations;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
@@ -31,8 +31,8 @@ import org.opendaylight.netconf.api.NetconfTerminationReason;
 import org.opendaylight.netconf.api.messages.NetconfHelloMessageAdditionalHeader;
 import org.opendaylight.netconf.api.xml.XmlElement;
 import org.opendaylight.netconf.api.xml.XmlUtil;
-import org.opendaylight.netconf.impl.NetconfServerSession;
-import org.opendaylight.netconf.impl.NetconfServerSessionListener;
+import org.opendaylight.netconf.server.NetconfServerSession;
+import org.opendaylight.netconf.server.NetconfServerSessionListener;
 import org.w3c.dom.Document;
 
 public class DefaultCloseSessionTest {
@@ -78,10 +78,10 @@ public class DefaultCloseSessionTest {
         close.setNetconfSession(session);
         close.handleWithNoSubsequentOperations(doc, elem);
         // Fake close response to trigger delayed close
-        session.sendMessage(new NetconfMessage(XmlUtil.readXmlToDocument("<rpc-reply message-id=\"101\"\n"
-                + "xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n"
-                + "<ok/>\n"
-                + "</rpc-reply>")));
+        session.sendMessage(new NetconfMessage(XmlUtil.readXmlToDocument("""
+            <rpc-reply message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+              <ok/>
+            </rpc-reply>""")));
         verify(channel).close();
         verify(listener).onSessionTerminated(any(NetconfServerSession.class), any(NetconfTerminationReason.class));
     }
diff --git a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/mapping/operations/DefaultStopExiTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/mapping/operations/DefaultStopExiTest.java
similarity index 94%
rename from protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/mapping/operations/DefaultStopExiTest.java
rename to protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/mapping/operations/DefaultStopExiTest.java
index 527006b228..318367ca4b 100644
--- a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/mapping/operations/DefaultStopExiTest.java
+++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/mapping/operations/DefaultStopExiTest.java
@@ -5,8 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
-package org.opendaylight.netconf.impl.mapping.operations;
+package org.opendaylight.netconf.server.mapping.operations;
 
 import static org.junit.Assert.assertNotNull;
 import static org.mockito.ArgumentMatchers.any;
@@ -22,7 +21,7 @@ import io.netty.channel.ChannelPipeline;
 import org.junit.Test;
 import org.opendaylight.netconf.api.xml.XmlElement;
 import org.opendaylight.netconf.api.xml.XmlUtil;
-import org.opendaylight.netconf.impl.NetconfServerSession;
+import org.opendaylight.netconf.server.NetconfServerSession;
 import org.w3c.dom.Document;
 
 public class DefaultStopExiTest {
diff --git a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/AggregatedNetconfOperationServiceFactoryTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/AggregatedNetconfOperationServiceFactoryTest.java
similarity index 99%
rename from protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/AggregatedNetconfOperationServiceFactoryTest.java
rename to protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/AggregatedNetconfOperationServiceFactoryTest.java
index 5fa86ef605..4287013897 100644
--- a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/AggregatedNetconfOperationServiceFactoryTest.java
+++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/AggregatedNetconfOperationServiceFactoryTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl.osgi;
+package org.opendaylight.netconf.server.osgi;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.doNothing;
diff --git a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringServiceTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfCapabilityMonitoringServiceTest.java
similarity index 99%
rename from protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringServiceTest.java
rename to protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfCapabilityMonitoringServiceTest.java
index 50ffb4da07..8484d71aff 100644
--- a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringServiceTest.java
+++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfCapabilityMonitoringServiceTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl.osgi;
+package org.opendaylight.netconf.server.osgi;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfOperationRouterImplTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfOperationRouterImplTest.java
similarity index 96%
rename from protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfOperationRouterImplTest.java
rename to protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfOperationRouterImplTest.java
index b9b2f28e12..d598d64967 100644
--- a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfOperationRouterImplTest.java
+++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfOperationRouterImplTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl.osgi;
+package org.opendaylight.netconf.server.osgi;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -39,9 +39,8 @@ import org.xml.sax.SAXException;
 
 @RunWith(MockitoJUnitRunner.StrictStubs.class)
 public class NetconfOperationRouterImplTest {
-
-    private static final String TEST_RPC = "<rpc message-id=\"101\" "
-            + "xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\"><test/></rpc>\n";
+    private static final String TEST_RPC =
+        "<rpc message-id=\"101\" xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\"><test/></rpc>\n";
     private static final String MAX_PRIORITY_REPLY = "<high/>";
     private static final String DEFAULT_PRIORITY_REPLY = "<default/>";
 
@@ -122,5 +121,4 @@ public class NetconfOperationRouterImplTest {
         operationRouter.close();
         verify(operationService).close();
     }
-
 }
diff --git a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfSessionMonitoringServiceTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfSessionMonitoringServiceTest.java
similarity index 99%
rename from protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfSessionMonitoringServiceTest.java
rename to protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfSessionMonitoringServiceTest.java
index 3064b0649a..54184ff57f 100644
--- a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfSessionMonitoringServiceTest.java
+++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfSessionMonitoringServiceTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl.osgi;
+package org.opendaylight.netconf.server.osgi;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -45,7 +45,6 @@ import org.opendaylight.yangtools.yang.common.Uint32;
 
 @RunWith(MockitoJUnitRunner.StrictStubs.class)
 public class NetconfSessionMonitoringServiceTest {
-
     private static final Session SESSION_1 = new SessionBuilder()
             .setSessionId(Uint32.valueOf(1))
             .setSourceHost(new Host(new IpAddress(new Ipv4Address("0.0.0.0"))))
diff --git a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/util/DeserializerExceptionHandlerTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/util/DeserializerExceptionHandlerTest.java
similarity index 97%
rename from protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/util/DeserializerExceptionHandlerTest.java
rename to protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/util/DeserializerExceptionHandlerTest.java
index 91f0b5451d..2a4a1dc558 100644
--- a/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/util/DeserializerExceptionHandlerTest.java
+++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/util/DeserializerExceptionHandlerTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.impl.util;
+package org.opendaylight.netconf.server.util;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
@@ -21,7 +21,6 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class DeserializerExceptionHandlerTest {
-
     private DeserializerExceptionHandler handler;
     private ChannelFuture channelFuture;
     private ChannelHandlerContext context;
diff --git a/protocol/netconf-impl/src/test/resources/messages/rpc.xml b/protocol/netconf-server/src/test/resources/messages/rpc.xml
similarity index 100%
rename from protocol/netconf-impl/src/test/resources/messages/rpc.xml
rename to protocol/netconf-server/src/test/resources/messages/rpc.xml
diff --git a/protocol/netconf-impl/src/test/resources/messages/rpc_ns.xml b/protocol/netconf-server/src/test/resources/messages/rpc_ns.xml
similarity index 100%
rename from protocol/netconf-impl/src/test/resources/messages/rpc_ns.xml
rename to protocol/netconf-server/src/test/resources/messages/rpc_ns.xml
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 22408d49be..50be4210a9 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -31,7 +31,7 @@
     <modules>
         <module>netconf-api</module>
         <module>netconf-client</module>
-        <module>netconf-impl</module>
+        <module>netconf-server</module>
         <module>netconf-util</module>
         <module>restconf-api</module>
     </modules>
-- 
2.36.6