Rename restconf-nb-rfc8040 to restconf-nb

We only have RFC-compliant version of the northbound plugin, ditch the
rfc8040 qualifier.

JIRA: NETCONF-893
Change-Id: I75a9a7fd59bd23063662256a9c15309fb25fd966
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 9d1a9033c28f69f3f0ac43a0b4445773c7a63a13..56a6635cc40fe232da89d8aa1232c8830671bc2c 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -493,12 +493,12 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>restconf-nb-rfc8040</artifactId>
+                <artifactId>restconf-nb</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>restconf-nb-rfc8040</artifactId>
+                <artifactId>restconf-nb</artifactId>
                 <type>cfg</type>
                 <classifier>config</classifier>
                 <version>${project.version}</version>
@@ -574,7 +574,7 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-restconf-nb-rfc8040</artifactId>
+                <artifactId>odl-restconf-nb</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>

diff --git a/features/restconf/features-restconf/pom.xml b/features/restconf/features-restconf/pom.xml
index 67d09380b8bb2aefc33fc94aed7b5f2c5935504a..b67ec4ff39ed71f8ea04e2046882da1771179bd9 100644 (file)
--- a/features/restconf/features-restconf/pom.xml
+++ b/features/restconf/features-restconf/pom.xml
@@ -52,11 +52,5 @@
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-restconf-nb-rfc8040</artifactId>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
   </dependencies>
 </project>

diff --git a/features/restconf/odl-restconf-nb-rfc8040/pom.xml b/features/restconf/odl-restconf-nb/pom.xml
similarity index 90%
rename from features/restconf/odl-restconf-nb-rfc8040/pom.xml
rename to features/restconf/odl-restconf-nb/pom.xml
index 9e366082a67e7a9e2e53a8844031cfa6e7570e09..e07d91f61ea705154c0320805aea7ea8e3481195 100644 (file)
--- a/features/restconf/odl-restconf-nb-rfc8040/pom.xml
+++ b/features/restconf/odl-restconf-nb/pom.xml
@@ -16,9 +16,9 @@
         <relativePath>../../parent</relativePath>
     </parent>
 
-    <artifactId>odl-restconf-nb-rfc8040</artifactId>
+    <artifactId>odl-restconf-nb</artifactId>
     <packaging>feature</packaging>
-    <name>OpenDaylight :: Restconf :: NB :: RFC8040</name>
+    <name>OpenDaylight :: RESTCONF :: Northbound</name>
 
     <dependencies>
         <dependency>
@@ -47,11 +47,11 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>restconf-nb-rfc8040</artifactId>
+            <artifactId>restconf-nb</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>restconf-nb-rfc8040</artifactId>
+            <artifactId>restconf-nb</artifactId>
             <type>cfg</type>
             <classifier>config</classifier>
         </dependency>

diff --git a/features/restconf/odl-restconf-nb-rfc8040/src/main/feature/feature.xml b/features/restconf/odl-restconf-nb/src/main/feature/feature.xml
similarity index 75%
rename from features/restconf/odl-restconf-nb-rfc8040/src/main/feature/feature.xml
rename to features/restconf/odl-restconf-nb/src/main/feature/feature.xml
index 0eb58dd191c7a98d433eb0a3f2fd5a477a091ee9..19883cd7861a67061c1c6f6f01d23d930f4fad68 100644 (file)
--- a/features/restconf/odl-restconf-nb-rfc8040/src/main/feature/feature.xml
+++ b/features/restconf/odl-restconf-nb/src/main/feature/feature.xml
@@ -6,12 +6,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
   -->
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-restconf-nb-rfc8040-${project.version}">
-    <feature name="odl-restconf-nb-rfc8040" version="${project.version}">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-restconf-nb-${project.version}">
+    <feature name="odl-restconf-nb" version="${project.version}">
         <feature version="[10,11)">odl-mdsal-model-rfc8072</feature>
         <feature version="[6,7)">odl-controller-exp-netty-config</feature>
         <configfile finalname="etc/org.opendaylight.restconf.nb.rfc8040.cfg">
-            mvn:org.opendaylight.netconf/restconf-nb-rfc8040/${project.version}/cfg/config
+            mvn:org.opendaylight.netconf/restconf-nb/${project.version}/cfg/config
         </configfile>
     </feature>
 </features>

diff --git a/features/restconf/odl-restconf/pom.xml b/features/restconf/odl-restconf/pom.xml
index 7d6668d81273cb6ea506d355c22950fdfb467cde..78e524116e50465b7005c2bf969acff6ca281fa2 100644 (file)
--- a/features/restconf/odl-restconf/pom.xml
+++ b/features/restconf/odl-restconf/pom.xml
@@ -23,7 +23,7 @@
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-restconf-nb-rfc8040</artifactId>
+            <artifactId>odl-restconf-nb</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml
index 6227c4002dbbcea3d26988cb32573c71b031688c..badbf1e08cefe48d9cde556844203c4e5a51f7ef 100644 (file)
--- a/features/restconf/pom.xml
+++ b/features/restconf/pom.xml
@@ -31,7 +31,7 @@
         <module>odl-mdsal-apidocs</module>
         <module>odl-restconf</module>
         <module>odl-restconf-common</module>
-        <module>odl-restconf-nb-rfc8040</module>
+        <module>odl-restconf-nb</module>
     </modules>
 
     <scm>

diff --git a/karaf-static/pom.xml b/karaf-static/pom.xml
index 3953862e6b9c2b3bf23ce503b0bc13bcd2acd798..28e761b4582b253c652b163f77b15cf18365656a 100644 (file)
--- a/karaf-static/pom.xml
+++ b/karaf-static/pom.xml
@@ -49,7 +49,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-restconf-nb-rfc8040</artifactId>
+            <artifactId>odl-restconf-nb</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
@@ -66,7 +66,7 @@
                     </startupFeatures>
                     <bootFeatures combine.children="append">
                         <feature>odl-netconf-connector-all</feature>
-                        <feature>odl-restconf-nb-rfc8040</feature>
+                        <feature>odl-restconf-nb</feature>
                     </bootFeatures>
                 </configuration>
             </plugin>

diff --git a/restconf/pom.xml b/restconf/pom.xml
index 6d0ac8afb9ad8fcf756b8e3d2d226ff6cfae668b..a0daab65d4b9b10e53a6f9380641b39aa6fa6c64 100644 (file)
--- a/restconf/pom.xml
+++ b/restconf/pom.xml
@@ -30,7 +30,7 @@
     <modules>
         <module>restconf-common-models</module>
         <module>restconf-common</module>
-        <module>restconf-nb-rfc8040</module>
+        <module>restconf-nb</module>
         <module>sal-rest-connector-config</module>
         <module>sal-rest-docgen</module>
         <module>wadl-generator</module>

diff --git a/restconf/restconf-nb-rfc8040/pom.xml b/restconf/restconf-nb/pom.xml
similarity index 99%
rename from restconf/restconf-nb-rfc8040/pom.xml
rename to restconf/restconf-nb/pom.xml
index 27894c7516999fa81f5af96bb4a68584ab5ed7c3..e8e143c419d0f13fdefbf8c2b73bfc9cad6091c9 100644 (file)
--- a/restconf/restconf-nb-rfc8040/pom.xml
+++ b/restconf/restconf-nb/pom.xml
@@ -17,7 +17,7 @@
     <relativePath>../../parent</relativePath>
   </parent>
 
-  <artifactId>restconf-nb-rfc8040</artifactId>
+  <artifactId>restconf-nb</artifactId>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/AbstractReplayParam.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/AbstractReplayParam.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/AbstractReplayParam.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/AbstractReplayParam.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/AbstractRestconfApplication.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/AbstractRestconfApplication.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/AbstractRestconfApplication.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/AbstractRestconfApplication.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/ApiPath.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/ApiPath.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/ApiPath.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/ApiPath.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/ApiPathParser.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/ApiPathParser.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/ApiPathParser.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/ApiPathParser.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/ContentParam.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/ContentParam.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/ContentParam.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/ContentParam.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/DataStreamApplication.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/DataStreamApplication.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/DataStreamApplication.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/DataStreamApplication.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/DepthParam.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/DepthParam.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/DepthParam.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/DepthParam.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/FieldsParam.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/FieldsParam.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/FieldsParam.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/FieldsParam.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/FieldsParameterParser.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/FieldsParameterParser.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/FieldsParameterParser.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/FieldsParameterParser.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/FilterParam.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/FilterParam.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/FilterParam.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/FilterParam.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/InsertParam.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/InsertParam.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/InsertParam.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/InsertParam.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/LeafNodesOnlyParam.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/LeafNodesOnlyParam.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/LeafNodesOnlyParam.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/LeafNodesOnlyParam.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/MediaTypes.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/MediaTypes.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/MediaTypes.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/MediaTypes.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/NotificationQueryParams.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/NotificationQueryParams.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/NotificationQueryParams.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/NotificationQueryParams.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/PointParam.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/PointParam.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/PointParam.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/PointParam.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/PrettyPrintParam.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/PrettyPrintParam.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/PrettyPrintParam.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/PrettyPrintParam.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/ReadDataParams.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/ReadDataParams.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/ReadDataParams.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/ReadDataParams.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/RestconfApplication.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/RestconfApplication.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/RestconfApplication.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/RestconfApplication.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/RestconfQueryParam.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/RestconfQueryParam.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/RestconfQueryParam.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/RestconfQueryParam.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/Rfc8040.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/Rfc8040.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/Rfc8040.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/Rfc8040.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/RootFoundApplication.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/RootFoundApplication.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/RootFoundApplication.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/RootFoundApplication.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/SkipNotificationDataParam.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/SkipNotificationDataParam.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/SkipNotificationDataParam.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/SkipNotificationDataParam.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/StartTimeParam.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/StartTimeParam.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/StartTimeParam.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/StartTimeParam.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/StopTimeParam.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/StopTimeParam.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/StopTimeParam.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/StopTimeParam.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/Utf8Buffer.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/Utf8Buffer.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/Utf8Buffer.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/Utf8Buffer.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/WithDefaultsParam.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/WithDefaultsParam.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/WithDefaultsParam.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/WithDefaultsParam.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/WriteDataParams.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/WriteDataParams.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/WriteDataParams.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/WriteDataParams.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/QueryParams.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/QueryParams.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/QueryParams.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/QueryParams.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/package-info.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/package-info.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/package-info.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/package-info.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/handlers/SchemaContextHandler.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/handlers/SchemaContextHandler.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/handlers/SchemaContextHandler.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/handlers/SchemaContextHandler.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/AbstractNormalizedNodeBodyReader.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/AbstractNormalizedNodeBodyReader.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/AbstractNormalizedNodeBodyReader.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/AbstractNormalizedNodeBodyReader.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/AbstractNormalizedNodeBodyWriter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/AbstractNormalizedNodeBodyWriter.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/AbstractNormalizedNodeBodyWriter.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/AbstractNormalizedNodeBodyWriter.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/AbstractSchemaExportBodyWriter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/AbstractSchemaExportBodyWriter.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/AbstractSchemaExportBodyWriter.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/AbstractSchemaExportBodyWriter.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonNormalizedNodeBodyReader.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonNormalizedNodeBodyReader.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonNormalizedNodeBodyReader.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonNormalizedNodeBodyReader.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonNormalizedNodeBodyWriter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonNormalizedNodeBodyWriter.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonNormalizedNodeBodyWriter.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonNormalizedNodeBodyWriter.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriter.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriter.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriter.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyReader.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyReader.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyReader.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyReader.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyWriter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyWriter.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyWriter.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyWriter.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/YangSchemaExportBodyWriter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/YangSchemaExportBodyWriter.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/YangSchemaExportBodyWriter.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/YangSchemaExportBodyWriter.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/YinSchemaExportBodyWriter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/YinSchemaExportBodyWriter.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/YinSchemaExportBodyWriter.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/YinSchemaExportBodyWriter.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/api/RestconfNormalizedNodeWriter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/api/RestconfNormalizedNodeWriter.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/api/RestconfNormalizedNodeWriter.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/api/RestconfNormalizedNodeWriter.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/JsonStreamWriterWithDisabledValidation.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/JsonStreamWriterWithDisabledValidation.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/JsonStreamWriterWithDisabledValidation.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/JsonStreamWriterWithDisabledValidation.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/RestconfDocumentedExceptionMapper.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/RestconfDocumentedExceptionMapper.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/RestconfDocumentedExceptionMapper.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/RestconfDocumentedExceptionMapper.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/StreamWriterWithDisabledValidation.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/StreamWriterWithDisabledValidation.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/StreamWriterWithDisabledValidation.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/StreamWriterWithDisabledValidation.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/XmlStreamWriterWithDisabledValidation.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/XmlStreamWriterWithDisabledValidation.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/XmlStreamWriterWithDisabledValidation.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/XmlStreamWriterWithDisabledValidation.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/AbstractPatchBodyReader.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/AbstractPatchBodyReader.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/AbstractPatchBodyReader.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/AbstractPatchBodyReader.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/AbstractPatchStatusBodyWriter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/AbstractPatchStatusBodyWriter.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/AbstractPatchStatusBodyWriter.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/AbstractPatchStatusBodyWriter.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/JsonPatchBodyReader.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/JsonPatchBodyReader.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/JsonPatchBodyReader.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/JsonPatchBodyReader.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/JsonPatchStatusBodyWriter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/JsonPatchStatusBodyWriter.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/JsonPatchStatusBodyWriter.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/JsonPatchStatusBodyWriter.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchBodyReader.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchBodyReader.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchBodyReader.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchBodyReader.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchStatusBodyWriter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchStatusBodyWriter.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchStatusBodyWriter.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchStatusBodyWriter.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/spi/AbstractIdentifierAwareJaxRsProvider.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/spi/AbstractIdentifierAwareJaxRsProvider.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/spi/AbstractIdentifierAwareJaxRsProvider.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/spi/AbstractIdentifierAwareJaxRsProvider.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/NormalizedNodePayload.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/NormalizedNodePayload.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/NormalizedNodePayload.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/NormalizedNodePayload.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/QueryParameters.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/QueryParameters.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/QueryParameters.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/QueryParameters.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/package-info.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/package-info.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/package-info.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/package-info.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfDataService.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfDataService.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfDataService.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfDataService.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfDataStreamService.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfDataStreamService.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfDataStreamService.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfDataStreamService.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfInvokeOperationsService.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfInvokeOperationsService.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfInvokeOperationsService.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfInvokeOperationsService.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfOperationsService.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfOperationsService.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfOperationsService.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfOperationsService.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfSchemaService.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfSchemaService.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfSchemaService.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfSchemaService.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfService.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfService.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfService.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfService.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfStreamsSubscriptionService.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfStreamsSubscriptionService.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfStreamsSubscriptionService.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RestconfStreamsSubscriptionService.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RootResourceDiscoveryService.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RootResourceDiscoveryService.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RootResourceDiscoveryService.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/RootResourceDiscoveryService.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/SchemaExportContext.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/SchemaExportContext.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/SchemaExportContext.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/api/SchemaExportContext.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/AbstractOperationDataSchemaNode.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/AbstractOperationDataSchemaNode.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/AbstractOperationDataSchemaNode.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/AbstractOperationDataSchemaNode.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/AbstractOperationsModule.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/AbstractOperationsModule.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/AbstractOperationsModule.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/AbstractOperationsModule.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtil.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtil.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtil.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtil.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/OperationsContainerSchemaNode.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/OperationsContainerSchemaNode.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/OperationsContainerSchemaNode.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/OperationsContainerSchemaNode.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/OperationsContent.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/OperationsContent.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/OperationsContent.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/OperationsContent.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/OperationsEffectiveModuleContext.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/OperationsEffectiveModuleContext.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/OperationsEffectiveModuleContext.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/OperationsEffectiveModuleContext.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/OperationsImportedModule.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/OperationsImportedModule.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/OperationsImportedModule.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/OperationsImportedModule.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/OperationsLeafSchemaNode.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/OperationsLeafSchemaNode.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/OperationsLeafSchemaNode.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/OperationsLeafSchemaNode.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/OperationsRestconfModule.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/OperationsRestconfModule.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/OperationsRestconfModule.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/OperationsRestconfModule.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImpl.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImpl.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImpl.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImpl.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataStreamServiceImpl.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataStreamServiceImpl.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataStreamServiceImpl.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataStreamServiceImpl.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfImpl.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfImpl.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfImpl.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfImpl.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfInvokeOperationsServiceImpl.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfInvokeOperationsServiceImpl.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfInvokeOperationsServiceImpl.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfInvokeOperationsServiceImpl.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfOperationsServiceImpl.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfOperationsServiceImpl.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfOperationsServiceImpl.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfOperationsServiceImpl.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfSchemaServiceImpl.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfSchemaServiceImpl.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfSchemaServiceImpl.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfSchemaServiceImpl.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfStreamsSubscriptionServiceImpl.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfStreamsSubscriptionServiceImpl.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfStreamsSubscriptionServiceImpl.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfStreamsSubscriptionServiceImpl.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RootResourceDiscoveryServiceImpl.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RootResourceDiscoveryServiceImpl.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RootResourceDiscoveryServiceImpl.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RootResourceDiscoveryServiceImpl.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/SubscribeToStreamUtil.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/SubscribeToStreamUtil.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/SubscribeToStreamUtil.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/SubscribeToStreamUtil.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/BatchedExistenceCheck.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/BatchedExistenceCheck.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/BatchedExistenceCheck.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/BatchedExistenceCheck.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/MdsalRestconfStrategy.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/MdsalRestconfStrategy.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/MdsalRestconfStrategy.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/MdsalRestconfStrategy.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/MdsalRestconfTransaction.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/MdsalRestconfTransaction.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/MdsalRestconfTransaction.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/MdsalRestconfTransaction.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/NetconfRestconfStrategy.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/NetconfRestconfStrategy.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/NetconfRestconfStrategy.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/NetconfRestconfStrategy.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/NetconfRestconfTransaction.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/NetconfRestconfTransaction.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/NetconfRestconfTransaction.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/NetconfRestconfTransaction.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/RestconfStrategy.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/RestconfStrategy.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/RestconfStrategy.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/RestconfStrategy.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/RestconfTransaction.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/RestconfTransaction.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/RestconfTransaction.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/RestconfTransaction.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/DeleteDataTransactionUtil.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/DeleteDataTransactionUtil.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/DeleteDataTransactionUtil.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/DeleteDataTransactionUtil.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/FutureCallbackTx.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/FutureCallbackTx.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/FutureCallbackTx.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/FutureCallbackTx.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/FutureDataFactory.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/FutureDataFactory.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/FutureDataFactory.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/FutureDataFactory.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/NormalizedNodeFactory.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/NormalizedNodeFactory.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/NormalizedNodeFactory.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/NormalizedNodeFactory.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PatchDataTransactionUtil.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PatchDataTransactionUtil.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PatchDataTransactionUtil.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PatchDataTransactionUtil.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PlainPatchDataTransactionUtil.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PlainPatchDataTransactionUtil.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PlainPatchDataTransactionUtil.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PlainPatchDataTransactionUtil.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtil.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtil.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtil.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtil.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtil.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtil.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtil.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtil.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtil.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtil.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtil.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtil.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ResponseFactory.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ResponseFactory.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ResponseFactory.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ResponseFactory.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/RestconfStreamsConstants.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/RestconfStreamsConstants.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/RestconfStreamsConstants.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/RestconfStreamsConstants.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/TransactionUtil.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/TransactionUtil.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/TransactionUtil.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/TransactionUtil.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/Configuration.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/Configuration.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/Configuration.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/Configuration.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/SSESessionHandler.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/SSESessionHandler.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/SSESessionHandler.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/SSESessionHandler.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/StreamSessionHandler.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/StreamSessionHandler.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/StreamSessionHandler.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/StreamSessionHandler.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/WebSocketInitializer.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/WebSocketInitializer.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/WebSocketInitializer.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/WebSocketInitializer.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/WebSocketSessionHandler.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/WebSocketSessionHandler.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/WebSocketSessionHandler.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/WebSocketSessionHandler.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/AbstractCommonSubscriber.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/AbstractCommonSubscriber.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/AbstractCommonSubscriber.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/AbstractCommonSubscriber.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/AbstractNotificationsData.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/AbstractNotificationsData.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/AbstractNotificationsData.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/AbstractNotificationsData.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/AbstractWebsocketSerializer.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/AbstractWebsocketSerializer.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/AbstractWebsocketSerializer.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/AbstractWebsocketSerializer.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/BaseListenerInterface.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/BaseListenerInterface.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/BaseListenerInterface.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/BaseListenerInterface.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/DataTreeCandidateFormatter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/DataTreeCandidateFormatter.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/DataTreeCandidateFormatter.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/DataTreeCandidateFormatter.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/DataTreeCandidateFormatterFactory.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/DataTreeCandidateFormatterFactory.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/DataTreeCandidateFormatterFactory.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/DataTreeCandidateFormatterFactory.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/EventFormatter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/EventFormatter.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/EventFormatter.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/EventFormatter.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/EventFormatterFactory.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/EventFormatterFactory.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/EventFormatterFactory.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/EventFormatterFactory.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/JSONDataTreeCandidateFormatter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/JSONDataTreeCandidateFormatter.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/JSONDataTreeCandidateFormatter.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/JSONDataTreeCandidateFormatter.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/JSONNotificationFormatter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/JSONNotificationFormatter.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/JSONNotificationFormatter.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/JSONNotificationFormatter.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/JsonDataTreeCandidateSerializer.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/JsonDataTreeCandidateSerializer.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/JsonDataTreeCandidateSerializer.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/JsonDataTreeCandidateSerializer.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapter.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapter.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapter.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenersBroker.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenersBroker.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenersBroker.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenersBroker.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationFormatter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationFormatter.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationFormatter.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationFormatter.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationFormatterFactory.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationFormatterFactory.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationFormatterFactory.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationFormatterFactory.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationListenerAdapter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationListenerAdapter.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationListenerAdapter.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationListenerAdapter.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/XMLDataTreeCandidateFormatter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/XMLDataTreeCandidateFormatter.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/XMLDataTreeCandidateFormatter.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/XMLDataTreeCandidateFormatter.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/XMLNotificationFormatter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/XMLNotificationFormatter.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/XMLNotificationFormatter.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/XMLNotificationFormatter.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/XmlDataTreeCandidateSerializer.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/XmlDataTreeCandidateSerializer.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/XmlDataTreeCandidateSerializer.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/XmlDataTreeCandidateSerializer.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/RestconfConstants.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/RestconfConstants.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/RestconfConstants.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/RestconfConstants.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtil.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtil.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtil.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtil.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/AbstractFieldsTranslator.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/AbstractFieldsTranslator.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/AbstractFieldsTranslator.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/AbstractFieldsTranslator.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/IdentifierCodec.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/IdentifierCodec.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/IdentifierCodec.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/IdentifierCodec.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/NetconfFieldsTranslator.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/NetconfFieldsTranslator.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/NetconfFieldsTranslator.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/NetconfFieldsTranslator.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserConstants.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserConstants.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserConstants.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserConstants.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifier.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifier.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifier.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifier.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/StringModuleInstanceIdentifierCodec.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/StringModuleInstanceIdentifierCodec.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/StringModuleInstanceIdentifierCodec.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/StringModuleInstanceIdentifierCodec.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/WriterFieldsTranslator.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/WriterFieldsTranslator.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/WriterFieldsTranslator.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/WriterFieldsTranslator.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializer.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializer.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializer.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializer.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierSerializer.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierSerializer.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierSerializer.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierSerializer.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/web/WebInitializer.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/web/WebInitializer.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/web/WebInitializer.java
rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/web/WebInitializer.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/resources/OSGI-INF/blueprint/restconf-bp.xml b/restconf/restconf-nb/src/main/resources/OSGI-INF/blueprint/restconf-bp.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/resources/OSGI-INF/blueprint/restconf-bp.xml
rename to restconf/restconf-nb/src/main/resources/OSGI-INF/blueprint/restconf-bp.xml

diff --git a/restconf/restconf-nb-rfc8040/src/main/resources/restconf8040.cfg b/restconf/restconf-nb/src/main/resources/restconf8040.cfg
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/main/resources/restconf8040.cfg
rename to restconf/restconf-nb/src/main/resources/restconf8040.cfg

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/ApiPathTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/ApiPathTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/ApiPathTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/ApiPathTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/FieldsParamTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/FieldsParamTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/FieldsParamTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/FieldsParamTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestRestconfUtils.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestRestconfUtils.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestRestconfUtils.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestRestconfUtils.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestUtils.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestUtils.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestUtils.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestUtils.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/QueryParamsTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/QueryParamsTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/QueryParamsTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/QueryParamsTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/handlers/SchemaContextHandlerTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/handlers/SchemaContextHandlerTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/handlers/SchemaContextHandlerTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/handlers/SchemaContextHandlerTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterDepthTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterDepthTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterDepthTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterDepthTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterFieldsTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterFieldsTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterFieldsTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterFieldsTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterParametersTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterParametersTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterParametersTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterParametersTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlBodyReaderMountPointTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlBodyReaderMountPointTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlBodyReaderMountPointTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlBodyReaderMountPointTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyWriterTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyWriterTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyWriterTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyWriterTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/RestconfDocumentedExceptionMapperTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/RestconfDocumentedExceptionMapperTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/RestconfDocumentedExceptionMapperTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/RestconfDocumentedExceptionMapperTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/JsonPatchBodyReaderMountPointTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/JsonPatchBodyReaderMountPointTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/JsonPatchBodyReaderMountPointTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/JsonPatchBodyReaderMountPointTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/JsonPatchBodyReaderTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/JsonPatchBodyReaderTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/JsonPatchBodyReaderTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/JsonPatchBodyReaderTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchBodyReaderMountPointTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchBodyReaderMountPointTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchBodyReaderMountPointTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchBodyReaderMountPointTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchBodyReaderTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchBodyReaderTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchBodyReaderTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchBodyReaderTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/test/AbstractBodyReaderTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/test/AbstractBodyReaderTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/test/AbstractBodyReaderTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/test/AbstractBodyReaderTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/test/JsonBodyReaderTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/test/JsonBodyReaderTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/test/JsonBodyReaderTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/test/JsonBodyReaderTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/test/XmlBodyReaderTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/test/XmlBodyReaderTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/test/XmlBodyReaderTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/test/XmlBodyReaderTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtilTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtilTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtilTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtilTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/LocalUriInfo.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/LocalUriInfo.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/LocalUriInfo.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/LocalUriInfo.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/Netconf799Test.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/Netconf799Test.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/Netconf799Test.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/Netconf799Test.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/Netconf822Test.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/Netconf822Test.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/Netconf822Test.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/Netconf822Test.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImplTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImplTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImplTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImplTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfImplTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfImplTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfImplTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfImplTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfInvokeOperationsServiceImplTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfInvokeOperationsServiceImplTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfInvokeOperationsServiceImplTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfInvokeOperationsServiceImplTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfOperationsServiceTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfOperationsServiceTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfOperationsServiceTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfOperationsServiceTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfSchemaServiceTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfSchemaServiceTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfSchemaServiceTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfSchemaServiceTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfStreamsSubscriptionServiceImplTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfStreamsSubscriptionServiceImplTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfStreamsSubscriptionServiceImplTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfStreamsSubscriptionServiceImplTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RootResourceDiscoveryServiceTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RootResourceDiscoveryServiceTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RootResourceDiscoveryServiceTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RootResourceDiscoveryServiceTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/DeleteDataTransactionUtilTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/DeleteDataTransactionUtilTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/DeleteDataTransactionUtilTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/DeleteDataTransactionUtilTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PatchDataTransactionUtilTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PatchDataTransactionUtilTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PatchDataTransactionUtilTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PatchDataTransactionUtilTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PlainPatchDataTransactionUtilTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PlainPatchDataTransactionUtilTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PlainPatchDataTransactionUtilTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PlainPatchDataTransactionUtilTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtilTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtilTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtilTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtilTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtilTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtilTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtilTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtilTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtilTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtilTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtilTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtilTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/TestData.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/TestData.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/TestData.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/TestData.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/SSESessionHandlerTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/SSESessionHandlerTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/SSESessionHandlerTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/SSESessionHandlerTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/WebSocketFactoryTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/WebSocketFactoryTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/WebSocketFactoryTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/WebSocketFactoryTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/WebSocketSessionHandlerTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/WebSocketSessionHandlerTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/WebSocketSessionHandlerTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/WebSocketSessionHandlerTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/JsonNotificationListenerTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/JsonNotificationListenerTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/JsonNotificationListenerTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/JsonNotificationListenerTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapterTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapterTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapterTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapterTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/XmlNotificationListenerTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/XmlNotificationListenerTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/XmlNotificationListenerTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/XmlNotificationListenerTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/test/incubate/InMemoryMdsalModule.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/test/incubate/InMemoryMdsalModule.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/test/incubate/InMemoryMdsalModule.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/test/incubate/InMemoryMdsalModule.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtilTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtilTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtilTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtilTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/AbstractFieldsTranslatorTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/AbstractFieldsTranslatorTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/AbstractFieldsTranslatorTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/AbstractFieldsTranslatorTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/IdentifierCodecTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/IdentifierCodecTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/IdentifierCodecTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/IdentifierCodecTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/NetconfFieldsTranslatorTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/NetconfFieldsTranslatorTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/NetconfFieldsTranslatorTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/NetconfFieldsTranslatorTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifierTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifierTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifierTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifierTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/RestconfValidationTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/RestconfValidationTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/RestconfValidationTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/RestconfValidationTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/WriterFieldsTranslatorTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/WriterFieldsTranslatorTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/WriterFieldsTranslatorTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/WriterFieldsTranslatorTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializerTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializerTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializerTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializerTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierSerializerTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierSerializerTest.java
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierSerializerTest.java
rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierSerializerTest.java

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/foo-xml-test/foo.xml b/restconf/restconf-nb/src/test/resources/foo-xml-test/foo.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/foo-xml-test/foo.xml
rename to restconf/restconf-nb/src/test/resources/foo-xml-test/foo.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/foo-xml-test/yang/foo.yang b/restconf/restconf-nb/src/test/resources/foo-xml-test/yang/foo.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/foo-xml-test/yang/foo.yang
rename to restconf/restconf-nb/src/test/resources/foo-xml-test/yang/foo.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/iid-value.yang b/restconf/restconf-nb/src/test/resources/instanceidentifier/iid-value.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/iid-value.yang
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/iid-value.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/jsonPATCHMergeOperationOnContainer.json b/restconf/restconf-nb/src/test/resources/instanceidentifier/json/jsonPATCHMergeOperationOnContainer.json
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/jsonPATCHMergeOperationOnContainer.json
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/json/jsonPATCHMergeOperationOnContainer.json

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/jsonPATCHMergeOperationOnList.json b/restconf/restconf-nb/src/test/resources/instanceidentifier/json/jsonPATCHMergeOperationOnList.json
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/jsonPATCHMergeOperationOnList.json
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/json/jsonPATCHMergeOperationOnList.json

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/jsonPATCHSimpleLeafValue.json b/restconf/restconf-nb/src/test/resources/instanceidentifier/json/jsonPATCHSimpleLeafValue.json
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/jsonPATCHSimpleLeafValue.json
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/json/jsonPATCHSimpleLeafValue.json

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/jsonPATCHTargetTopLevelContainerWithEmptyURI.json b/restconf/restconf-nb/src/test/resources/instanceidentifier/json/jsonPATCHTargetTopLevelContainerWithEmptyURI.json
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/jsonPATCHTargetTopLevelContainerWithEmptyURI.json
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/json/jsonPATCHTargetTopLevelContainerWithEmptyURI.json

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/jsonPATCHdata.json b/restconf/restconf-nb/src/test/resources/instanceidentifier/json/jsonPATCHdata.json
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/jsonPATCHdata.json
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/json/jsonPATCHdata.json

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/jsonPATCHdataCompleteTargetInURI.json b/restconf/restconf-nb/src/test/resources/instanceidentifier/json/jsonPATCHdataCompleteTargetInURI.json
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/jsonPATCHdataCompleteTargetInURI.json
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/json/jsonPATCHdataCompleteTargetInURI.json

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/jsonPATCHdataCreateAndDelete.json b/restconf/restconf-nb/src/test/resources/instanceidentifier/json/jsonPATCHdataCreateAndDelete.json
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/jsonPATCHdataCreateAndDelete.json
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/json/jsonPATCHdataCreateAndDelete.json

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/jsonPATCHdataValueMissing.json b/restconf/restconf-nb/src/test/resources/instanceidentifier/json/jsonPATCHdataValueMissing.json
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/jsonPATCHdataValueMissing.json
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/json/jsonPATCHdataValueMissing.json

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/jsonPATCHdataValueNotSupported.json b/restconf/restconf-nb/src/test/resources/instanceidentifier/json/jsonPATCHdataValueNotSupported.json
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/jsonPATCHdataValueNotSupported.json
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/json/jsonPATCHdataValueNotSupported.json

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/json_augment_choice_container.json b/restconf/restconf-nb/src/test/resources/instanceidentifier/json/json_augment_choice_container.json
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/json_augment_choice_container.json
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/json/json_augment_choice_container.json

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/json_augment_container.json b/restconf/restconf-nb/src/test/resources/instanceidentifier/json/json_augment_container.json
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/json_augment_container.json
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/json/json_augment_container.json

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/json_cont_action.json b/restconf/restconf-nb/src/test/resources/instanceidentifier/json/json_cont_action.json
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/json_cont_action.json
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/json/json_cont_action.json

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/json_sub_container.json b/restconf/restconf-nb/src/test/resources/instanceidentifier/json/json_sub_container.json
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/json_sub_container.json
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/json/json_sub_container.json

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/jsondata.json b/restconf/restconf-nb/src/test/resources/instanceidentifier/json/jsondata.json
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/jsondata.json
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/json/jsondata.json

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/jsondata_leaf_list.json b/restconf/restconf-nb/src/test/resources/instanceidentifier/json/jsondata_leaf_list.json
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/json/jsondata_leaf_list.json
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/json/jsondata_leaf_list.json

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/bug7933.xml b/restconf/restconf-nb/src/test/resources/instanceidentifier/xml/bug7933.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/bug7933.xml
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/xml/bug7933.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xmlDataFindBarContainer.xml b/restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xmlDataFindBarContainer.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xmlDataFindBarContainer.xml
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xmlDataFindBarContainer.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xmlDataFindFooContainer.xml b/restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xmlDataFindFooContainer.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xmlDataFindFooContainer.xml
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xmlDataFindFooContainer.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xmlPATCHTargetTopLevelContainerWithEmptyURI.xml b/restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xmlPATCHTargetTopLevelContainerWithEmptyURI.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xmlPATCHTargetTopLevelContainerWithEmptyURI.xml
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xmlPATCHTargetTopLevelContainerWithEmptyURI.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xmlPATCHdata.xml b/restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xmlPATCHdata.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xmlPATCHdata.xml
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xmlPATCHdata.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xmlPATCHdataAbsoluteTargetPath.xml b/restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xmlPATCHdataAbsoluteTargetPath.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xmlPATCHdataAbsoluteTargetPath.xml
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xmlPATCHdataAbsoluteTargetPath.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xmlPATCHdataCompleteTargetInURI.xml b/restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xmlPATCHdataCompleteTargetInURI.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xmlPATCHdataCompleteTargetInURI.xml
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xmlPATCHdataCompleteTargetInURI.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xmlPATCHdataMergeOperationOnContainer.xml b/restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xmlPATCHdataMergeOperationOnContainer.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xmlPATCHdataMergeOperationOnContainer.xml
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xmlPATCHdataMergeOperationOnContainer.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xmlPATCHdataMergeOperationOnList.xml b/restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xmlPATCHdataMergeOperationOnList.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xmlPATCHdataMergeOperationOnList.xml
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xmlPATCHdataMergeOperationOnList.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xmlPATCHdataValueMissing.xml b/restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xmlPATCHdataValueMissing.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xmlPATCHdataValueMissing.xml
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xmlPATCHdataValueMissing.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xmlPATCHdataValueNotSupported.xml b/restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xmlPATCHdataValueNotSupported.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xmlPATCHdataValueNotSupported.xml
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xmlPATCHdataValueNotSupported.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xml_augment_choice_container.xml b/restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xml_augment_choice_container.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xml_augment_choice_container.xml
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xml_augment_choice_container.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xml_augment_container.xml b/restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xml_augment_container.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xml_augment_container.xml
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xml_augment_container.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xml_cont_action.xml b/restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xml_cont_action.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xml_cont_action.xml
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xml_cont_action.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xml_sub_container.xml b/restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xml_sub_container.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xml_sub_container.xml
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xml_sub_container.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xmldata.xml b/restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xmldata.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xmldata.xml
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xmldata.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xmldata_leaf_list.xml b/restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xmldata_leaf_list.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/xml/xmldata_leaf_list.xml
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/xml/xmldata_leaf_list.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/yang/augment-augment-module.yang b/restconf/restconf-nb/src/test/resources/instanceidentifier/yang/augment-augment-module.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/yang/augment-augment-module.yang
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/yang/augment-augment-module.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/yang/augment-iip-module.yang b/restconf/restconf-nb/src/test/resources/instanceidentifier/yang/augment-iip-module.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/yang/augment-iip-module.yang
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/yang/augment-iip-module.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/yang/augment-module-leaf-list.yang b/restconf/restconf-nb/src/test/resources/instanceidentifier/yang/augment-module-leaf-list.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/yang/augment-module-leaf-list.yang
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/yang/augment-module-leaf-list.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/yang/augment-module.yang b/restconf/restconf-nb/src/test/resources/instanceidentifier/yang/augment-module.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/yang/augment-module.yang
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/yang/augment-module.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/yang/bar-module.yang b/restconf/restconf-nb/src/test/resources/instanceidentifier/yang/bar-module.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/yang/bar-module.yang
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/yang/bar-module.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/yang/foo-module.yang b/restconf/restconf-nb/src/test/resources/instanceidentifier/yang/foo-module.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/yang/foo-module.yang
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/yang/foo-module.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/yang/instance-identifier-module.yang b/restconf/restconf-nb/src/test/resources/instanceidentifier/yang/instance-identifier-module.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/yang/instance-identifier-module.yang
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/yang/instance-identifier-module.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/yang/instance-identifier-patch-module.yang b/restconf/restconf-nb/src/test/resources/instanceidentifier/yang/instance-identifier-patch-module.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/instanceidentifier/yang/instance-identifier-patch-module.yang
rename to restconf/restconf-nb/src/test/resources/instanceidentifier/yang/instance-identifier-patch-module.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/invoke-rpc/ietf-inet-types.yang b/restconf/restconf-nb/src/test/resources/invoke-rpc/ietf-inet-types.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/invoke-rpc/ietf-inet-types.yang
rename to restconf/restconf-nb/src/test/resources/invoke-rpc/ietf-inet-types.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/invoke-rpc/ietf-restconf-monitoring@2017-01-26.yang b/restconf/restconf-nb/src/test/resources/invoke-rpc/ietf-restconf-monitoring@2017-01-26.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/invoke-rpc/ietf-restconf-monitoring@2017-01-26.yang
rename to restconf/restconf-nb/src/test/resources/invoke-rpc/ietf-restconf-monitoring@2017-01-26.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/invoke-rpc/ietf-yang-library@2016-06-21.yang b/restconf/restconf-nb/src/test/resources/invoke-rpc/ietf-yang-library@2016-06-21.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/invoke-rpc/ietf-yang-library@2016-06-21.yang
rename to restconf/restconf-nb/src/test/resources/invoke-rpc/ietf-yang-library@2016-06-21.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/invoke-rpc/ietf-yang-types.yang b/restconf/restconf-nb/src/test/resources/invoke-rpc/ietf-yang-types.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/invoke-rpc/ietf-yang-types.yang
rename to restconf/restconf-nb/src/test/resources/invoke-rpc/ietf-yang-types.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/invoke-rpc/invoke-rpc-module.yang b/restconf/restconf-nb/src/test/resources/invoke-rpc/invoke-rpc-module.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/invoke-rpc/invoke-rpc-module.yang
rename to restconf/restconf-nb/src/test/resources/invoke-rpc/invoke-rpc-module.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/invoke-rpc/json/rpc-input.json b/restconf/restconf-nb/src/test/resources/invoke-rpc/json/rpc-input.json
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/invoke-rpc/json/rpc-input.json
rename to restconf/restconf-nb/src/test/resources/invoke-rpc/json/rpc-input.json

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/invoke-rpc/json/rpc-output.json b/restconf/restconf-nb/src/test/resources/invoke-rpc/json/rpc-output.json
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/invoke-rpc/json/rpc-output.json
rename to restconf/restconf-nb/src/test/resources/invoke-rpc/json/rpc-output.json

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/invoke-rpc/xml/rpc-input.xml b/restconf/restconf-nb/src/test/resources/invoke-rpc/xml/rpc-input.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/invoke-rpc/xml/rpc-input.xml
rename to restconf/restconf-nb/src/test/resources/invoke-rpc/xml/rpc-input.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/invoke-rpc/xml/rpc-output.xml b/restconf/restconf-nb/src/test/resources/invoke-rpc/xml/rpc-output.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/invoke-rpc/xml/rpc-output.xml
rename to restconf/restconf-nb/src/test/resources/invoke-rpc/xml/rpc-output.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/jukebox/augmented-jukebox@2016-05-05.yang b/restconf/restconf-nb/src/test/resources/jukebox/augmented-jukebox@2016-05-05.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/jukebox/augmented-jukebox@2016-05-05.yang
rename to restconf/restconf-nb/src/test/resources/jukebox/augmented-jukebox@2016-05-05.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/jukebox/example-jukebox@2015-04-04.yang b/restconf/restconf-nb/src/test/resources/jukebox/example-jukebox@2015-04-04.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/jukebox/example-jukebox@2015-04-04.yang
rename to restconf/restconf-nb/src/test/resources/jukebox/example-jukebox@2015-04-04.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/jukebox/ietf-inet-types.yang b/restconf/restconf-nb/src/test/resources/jukebox/ietf-inet-types.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/jukebox/ietf-inet-types.yang
rename to restconf/restconf-nb/src/test/resources/jukebox/ietf-inet-types.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/jukebox/ietf-restconf-monitoring@2017-01-26.yang b/restconf/restconf-nb/src/test/resources/jukebox/ietf-restconf-monitoring@2017-01-26.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/jukebox/ietf-restconf-monitoring@2017-01-26.yang
rename to restconf/restconf-nb/src/test/resources/jukebox/ietf-restconf-monitoring@2017-01-26.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/jukebox/ietf-yang-library@2016-06-21.yang b/restconf/restconf-nb/src/test/resources/jukebox/ietf-yang-library@2016-06-21.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/jukebox/ietf-yang-library@2016-06-21.yang
rename to restconf/restconf-nb/src/test/resources/jukebox/ietf-yang-library@2016-06-21.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/jukebox/ietf-yang-types.yang b/restconf/restconf-nb/src/test/resources/jukebox/ietf-yang-types.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/jukebox/ietf-yang-types.yang
rename to restconf/restconf-nb/src/test/resources/jukebox/ietf-yang-types.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-create.json b/restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-create.json
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-create.json
rename to restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-create.json

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-create.xml b/restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-create.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-create.xml
rename to restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-create.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-del.json b/restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-del.json
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-del.json
rename to restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-del.json

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-delete.xml b/restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-delete.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-delete.xml
rename to restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-delete.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-leaves-create.json b/restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-leaves-create.json
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-leaves-create.json
rename to restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-leaves-create.json

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-leaves-create.xml b/restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-leaves-create.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-leaves-create.xml
rename to restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-leaves-create.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-leaves-del.json b/restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-leaves-del.json
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-leaves-del.json
rename to restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-leaves-del.json

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-leaves-delete.xml b/restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-leaves-delete.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-leaves-delete.xml
rename to restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-leaves-delete.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-leaves-update.json b/restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-leaves-update.json
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-leaves-update.json
rename to restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-leaves-update.json

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-leaves-update.xml b/restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-leaves-update.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-leaves-update.xml
rename to restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-leaves-update.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-update.json b/restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-update.json
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-update.json
rename to restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-update.json

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-update.xml b/restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-update.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-update.xml
rename to restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-update.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-without-data-create.json b/restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-without-data-create.json
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-without-data-create.json
rename to restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-without-data-create.json

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-without-data-create.xml b/restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-without-data-create.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-without-data-create.xml
rename to restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-without-data-create.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-without-data-del.json b/restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-without-data-del.json
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-without-data-del.json
rename to restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-without-data-del.json

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-without-data-delete.xml b/restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-without-data-delete.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-without-data-delete.xml
rename to restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-without-data-delete.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-without-data-update.json b/restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-without-data-update.json
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-without-data-update.json
rename to restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-without-data-update.json

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-without-data-update.xml b/restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-without-data-update.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/listener-adapter-test/notif-without-data-update.xml
rename to restconf/restconf-nb/src/test/resources/listener-adapter-test/notif-without-data-update.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/iana-if-type.yang b/restconf/restconf-nb/src/test/resources/modules/iana-if-type.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/iana-if-type.yang
rename to restconf/restconf-nb/src/test/resources/modules/iana-if-type.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/ietf-inet-types.yang b/restconf/restconf-nb/src/test/resources/modules/ietf-inet-types.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/ietf-inet-types.yang
rename to restconf/restconf-nb/src/test/resources/modules/ietf-inet-types.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/ietf-interfaces@2013-07-04.yang b/restconf/restconf-nb/src/test/resources/modules/ietf-interfaces@2013-07-04.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/ietf-interfaces@2013-07-04.yang
rename to restconf/restconf-nb/src/test/resources/modules/ietf-interfaces@2013-07-04.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/ietf-restconf-monitoring@2017-01-26.yang b/restconf/restconf-nb/src/test/resources/modules/ietf-restconf-monitoring@2017-01-26.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/ietf-restconf-monitoring@2017-01-26.yang
rename to restconf/restconf-nb/src/test/resources/modules/ietf-restconf-monitoring@2017-01-26.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/ietf-yang-library@2016-06-21.yang b/restconf/restconf-nb/src/test/resources/modules/ietf-yang-library@2016-06-21.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/ietf-yang-library@2016-06-21.yang
rename to restconf/restconf-nb/src/test/resources/modules/ietf-yang-library@2016-06-21.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/ietf-yang-types.yang b/restconf/restconf-nb/src/test/resources/modules/ietf-yang-types.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/ietf-yang-types.yang
rename to restconf/restconf-nb/src/test/resources/modules/ietf-yang-types.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/module1.yang b/restconf/restconf-nb/src/test/resources/modules/module1.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/module1.yang
rename to restconf/restconf-nb/src/test/resources/modules/module1.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/module2.yang b/restconf/restconf-nb/src/test/resources/modules/module2.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/module2.yang
rename to restconf/restconf-nb/src/test/resources/modules/module2.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/module3.yang b/restconf/restconf-nb/src/test/resources/modules/module3.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/module3.yang
rename to restconf/restconf-nb/src/test/resources/modules/module3.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/modules-behind-mount-point/iana-if-type.yang b/restconf/restconf-nb/src/test/resources/modules/modules-behind-mount-point/iana-if-type.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/modules-behind-mount-point/iana-if-type.yang
rename to restconf/restconf-nb/src/test/resources/modules/modules-behind-mount-point/iana-if-type.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/modules-behind-mount-point/ietf-inet-types.yang b/restconf/restconf-nb/src/test/resources/modules/modules-behind-mount-point/ietf-inet-types.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/modules-behind-mount-point/ietf-inet-types.yang
rename to restconf/restconf-nb/src/test/resources/modules/modules-behind-mount-point/ietf-inet-types.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/modules-behind-mount-point/ietf-interfaces@2013-07-04.yang b/restconf/restconf-nb/src/test/resources/modules/modules-behind-mount-point/ietf-interfaces@2013-07-04.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/modules-behind-mount-point/ietf-interfaces@2013-07-04.yang
rename to restconf/restconf-nb/src/test/resources/modules/modules-behind-mount-point/ietf-interfaces@2013-07-04.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/modules-behind-mount-point/ietf-restconf-monitoring@2017-01-26.yang b/restconf/restconf-nb/src/test/resources/modules/modules-behind-mount-point/ietf-restconf-monitoring@2017-01-26.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/modules-behind-mount-point/ietf-restconf-monitoring@2017-01-26.yang
rename to restconf/restconf-nb/src/test/resources/modules/modules-behind-mount-point/ietf-restconf-monitoring@2017-01-26.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/modules-behind-mount-point/ietf-yang-library@2016-06-21.yang b/restconf/restconf-nb/src/test/resources/modules/modules-behind-mount-point/ietf-yang-library@2016-06-21.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/modules-behind-mount-point/ietf-yang-library@2016-06-21.yang
rename to restconf/restconf-nb/src/test/resources/modules/modules-behind-mount-point/ietf-yang-library@2016-06-21.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/modules-behind-mount-point/ietf-yang-types.yang b/restconf/restconf-nb/src/test/resources/modules/modules-behind-mount-point/ietf-yang-types.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/modules-behind-mount-point/ietf-yang-types.yang
rename to restconf/restconf-nb/src/test/resources/modules/modules-behind-mount-point/ietf-yang-types.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/modules-behind-mount-point/module1-behind-mount-point.yang b/restconf/restconf-nb/src/test/resources/modules/modules-behind-mount-point/module1-behind-mount-point.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/modules-behind-mount-point/module1-behind-mount-point.yang
rename to restconf/restconf-nb/src/test/resources/modules/modules-behind-mount-point/module1-behind-mount-point.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/modules-behind-mount-point/module2-behind-mount-point.yang b/restconf/restconf-nb/src/test/resources/modules/modules-behind-mount-point/module2-behind-mount-point.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/modules-behind-mount-point/module2-behind-mount-point.yang
rename to restconf/restconf-nb/src/test/resources/modules/modules-behind-mount-point/module2-behind-mount-point.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/modules-without-restconf-module/module1.yang b/restconf/restconf-nb/src/test/resources/modules/modules-without-restconf-module/module1.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/modules-without-restconf-module/module1.yang
rename to restconf/restconf-nb/src/test/resources/modules/modules-without-restconf-module/module1.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/modules-without-restconf-module/module2.yang b/restconf/restconf-nb/src/test/resources/modules/modules-without-restconf-module/module2.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/modules-without-restconf-module/module2.yang
rename to restconf/restconf-nb/src/test/resources/modules/modules-without-restconf-module/module2.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/modules-without-restconf-module/module3.yang b/restconf/restconf-nb/src/test/resources/modules/modules-without-restconf-module/module3.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/modules-without-restconf-module/module3.yang
rename to restconf/restconf-nb/src/test/resources/modules/modules-without-restconf-module/module3.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/modules-without-restconf-module/mount-point-1.yang b/restconf/restconf-nb/src/test/resources/modules/modules-without-restconf-module/mount-point-1.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/modules-without-restconf-module/mount-point-1.yang
rename to restconf/restconf-nb/src/test/resources/modules/modules-without-restconf-module/mount-point-1.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/mount-points/mount-point-1.yang b/restconf/restconf-nb/src/test/resources/modules/mount-points/mount-point-1.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/mount-points/mount-point-1.yang
rename to restconf/restconf-nb/src/test/resources/modules/mount-points/mount-point-1.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/mount-points/mount-point-2.yang b/restconf/restconf-nb/src/test/resources/modules/mount-points/mount-point-2.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/mount-points/mount-point-2.yang
rename to restconf/restconf-nb/src/test/resources/modules/mount-points/mount-point-2.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/nested-module.yang b/restconf/restconf-nb/src/test/resources/modules/nested-module.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/nested-module.yang
rename to restconf/restconf-nb/src/test/resources/modules/nested-module.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/netconf786.yang b/restconf/restconf-nb/src/test/resources/modules/netconf786.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/netconf786.yang
rename to restconf/restconf-nb/src/test/resources/modules/netconf786.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing-mount-point/ietf-inet-types.yang b/restconf/restconf-nb/src/test/resources/modules/restconf-module-testing-mount-point/ietf-inet-types.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing-mount-point/ietf-inet-types.yang
rename to restconf/restconf-nb/src/test/resources/modules/restconf-module-testing-mount-point/ietf-inet-types.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing-mount-point/ietf-yang-types.yang b/restconf/restconf-nb/src/test/resources/modules/restconf-module-testing-mount-point/ietf-yang-types.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing-mount-point/ietf-yang-types.yang
rename to restconf/restconf-nb/src/test/resources/modules/restconf-module-testing-mount-point/ietf-yang-types.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing-mount-point/mount-point-1.yang b/restconf/restconf-nb/src/test/resources/modules/restconf-module-testing-mount-point/mount-point-1.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing-mount-point/mount-point-1.yang
rename to restconf/restconf-nb/src/test/resources/modules/restconf-module-testing-mount-point/mount-point-1.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing-mount-point/restconf-module-with-illegal-container-modules/restconf-module-with-illegal-container-modules.yang b/restconf/restconf-nb/src/test/resources/modules/restconf-module-testing-mount-point/restconf-module-with-illegal-container-modules/restconf-module-with-illegal-container-modules.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing-mount-point/restconf-module-with-illegal-container-modules/restconf-module-with-illegal-container-modules.yang
rename to restconf/restconf-nb/src/test/resources/modules/restconf-module-testing-mount-point/restconf-module-with-illegal-container-modules/restconf-module-with-illegal-container-modules.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing-mount-point/restconf-module-with-illegal-list-module/restconf-module-with-illegal-list-module.yang b/restconf/restconf-nb/src/test/resources/modules/restconf-module-testing-mount-point/restconf-module-with-illegal-list-module/restconf-module-with-illegal-list-module.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing-mount-point/restconf-module-with-illegal-list-module/restconf-module-with-illegal-list-module.yang
rename to restconf/restconf-nb/src/test/resources/modules/restconf-module-testing-mount-point/restconf-module-with-illegal-list-module/restconf-module-with-illegal-list-module.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing-mount-point/restconf-module-with-missing-container-modules/restconf-module-with-missing-container-modules.yang b/restconf/restconf-nb/src/test/resources/modules/restconf-module-testing-mount-point/restconf-module-with-missing-container-modules/restconf-module-with-missing-container-modules.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing-mount-point/restconf-module-with-missing-container-modules/restconf-module-with-missing-container-modules.yang
rename to restconf/restconf-nb/src/test/resources/modules/restconf-module-testing-mount-point/restconf-module-with-missing-container-modules/restconf-module-with-missing-container-modules.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing-mount-point/restconf-module-with-missing-list-module/restconf-module-with-missing-list-module.yang b/restconf/restconf-nb/src/test/resources/modules/restconf-module-testing-mount-point/restconf-module-with-missing-list-module/restconf-module-with-missing-list-module.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing-mount-point/restconf-module-with-missing-list-module/restconf-module-with-missing-list-module.yang
rename to restconf/restconf-nb/src/test/resources/modules/restconf-module-testing-mount-point/restconf-module-with-missing-list-module/restconf-module-with-missing-list-module.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing/deviatee-test@2019-06-11.yang b/restconf/restconf-nb/src/test/resources/modules/restconf-module-testing/deviatee-test@2019-06-11.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing/deviatee-test@2019-06-11.yang
rename to restconf/restconf-nb/src/test/resources/modules/restconf-module-testing/deviatee-test@2019-06-11.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing/deviator-test@2019-06-11.yang b/restconf/restconf-nb/src/test/resources/modules/restconf-module-testing/deviator-test@2019-06-11.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing/deviator-test@2019-06-11.yang
rename to restconf/restconf-nb/src/test/resources/modules/restconf-module-testing/deviator-test@2019-06-11.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing/ietf-datastores@2018-02-14.yang b/restconf/restconf-nb/src/test/resources/modules/restconf-module-testing/ietf-datastores@2018-02-14.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing/ietf-datastores@2018-02-14.yang
rename to restconf/restconf-nb/src/test/resources/modules/restconf-module-testing/ietf-datastores@2018-02-14.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing/ietf-inet-types@2013-07-15.yang b/restconf/restconf-nb/src/test/resources/modules/restconf-module-testing/ietf-inet-types@2013-07-15.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing/ietf-inet-types@2013-07-15.yang
rename to restconf/restconf-nb/src/test/resources/modules/restconf-module-testing/ietf-inet-types@2013-07-15.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing/ietf-restconf@2013-10-19.yang b/restconf/restconf-nb/src/test/resources/modules/restconf-module-testing/ietf-restconf@2013-10-19.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing/ietf-restconf@2013-10-19.yang
rename to restconf/restconf-nb/src/test/resources/modules/restconf-module-testing/ietf-restconf@2013-10-19.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing/ietf-yang-library@2019-01-04.yang b/restconf/restconf-nb/src/test/resources/modules/restconf-module-testing/ietf-yang-library@2019-01-04.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing/ietf-yang-library@2019-01-04.yang
rename to restconf/restconf-nb/src/test/resources/modules/restconf-module-testing/ietf-yang-library@2019-01-04.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing/ietf-yang-types@2013-07-15.yang b/restconf/restconf-nb/src/test/resources/modules/restconf-module-testing/ietf-yang-types@2013-07-15.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/modules/restconf-module-testing/ietf-yang-types@2013-07-15.yang
rename to restconf/restconf-nb/src/test/resources/modules/restconf-module-testing/ietf-yang-types@2013-07-15.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/nc822/foo@2021-09-29.yang b/restconf/restconf-nb/src/test/resources/nc822/foo@2021-09-29.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/nc822/foo@2021-09-29.yang
rename to restconf/restconf-nb/src/test/resources/nc822/foo@2021-09-29.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/nc822/foo@2021-09-30.yang b/restconf/restconf-nb/src/test/resources/nc822/foo@2021-09-30.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/nc822/foo@2021-09-30.yang
rename to restconf/restconf-nb/src/test/resources/nc822/foo@2021-09-30.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/notifications/ietf-inet-types.yang b/restconf/restconf-nb/src/test/resources/notifications/ietf-inet-types.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/notifications/ietf-inet-types.yang
rename to restconf/restconf-nb/src/test/resources/notifications/ietf-inet-types.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/notifications/ietf-restconf-monitoring@2017-01-26.yang b/restconf/restconf-nb/src/test/resources/notifications/ietf-restconf-monitoring@2017-01-26.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/notifications/ietf-restconf-monitoring@2017-01-26.yang
rename to restconf/restconf-nb/src/test/resources/notifications/ietf-restconf-monitoring@2017-01-26.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/notifications/ietf-yang-library@2016-06-21.yang b/restconf/restconf-nb/src/test/resources/notifications/ietf-yang-library@2016-06-21.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/notifications/ietf-yang-library@2016-06-21.yang
rename to restconf/restconf-nb/src/test/resources/notifications/ietf-yang-library@2016-06-21.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/notifications/ietf-yang-types.yang b/restconf/restconf-nb/src/test/resources/notifications/ietf-yang-types.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/notifications/ietf-yang-types.yang
rename to restconf/restconf-nb/src/test/resources/notifications/ietf-yang-types.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/notifications/notifi-module.yang b/restconf/restconf-nb/src/test/resources/notifications/notifi-module.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/notifications/notifi-module.yang
rename to restconf/restconf-nb/src/test/resources/notifications/notifi-module.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/notifications/subscribe-to-notification.yang b/restconf/restconf-nb/src/test/resources/notifications/subscribe-to-notification.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/notifications/subscribe-to-notification.yang
rename to restconf/restconf-nb/src/test/resources/notifications/subscribe-to-notification.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/notifications/toaster.yang b/restconf/restconf-nb/src/test/resources/notifications/toaster.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/notifications/toaster.yang
rename to restconf/restconf-nb/src/test/resources/notifications/toaster.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/notifications/xml/output/data_change_notification_toaster_status_DOWN.xml b/restconf/restconf-nb/src/test/resources/notifications/xml/output/data_change_notification_toaster_status_DOWN.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/notifications/xml/output/data_change_notification_toaster_status_DOWN.xml
rename to restconf/restconf-nb/src/test/resources/notifications/xml/output/data_change_notification_toaster_status_DOWN.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/notifications/xml/output/data_change_notification_toaster_status_NUMBER.xml b/restconf/restconf-nb/src/test/resources/notifications/xml/output/data_change_notification_toaster_status_NUMBER.xml
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/notifications/xml/output/data_change_notification_toaster_status_NUMBER.xml
rename to restconf/restconf-nb/src/test/resources/notifications/xml/output/data_change_notification_toaster_status_NUMBER.xml

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/parser-identifier/example-actions.yang b/restconf/restconf-nb/src/test/resources/parser-identifier/example-actions.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/parser-identifier/example-actions.yang
rename to restconf/restconf-nb/src/test/resources/parser-identifier/example-actions.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/parser-identifier/invoke-rpc-module.yang b/restconf/restconf-nb/src/test/resources/parser-identifier/invoke-rpc-module.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/parser-identifier/invoke-rpc-module.yang
rename to restconf/restconf-nb/src/test/resources/parser-identifier/invoke-rpc-module.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/parser-identifier/mount-point.yang b/restconf/restconf-nb/src/test/resources/parser-identifier/mount-point.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/parser-identifier/mount-point.yang
rename to restconf/restconf-nb/src/test/resources/parser-identifier/mount-point.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/parser-identifier/parser-identifier-test-included.yang b/restconf/restconf-nb/src/test/resources/parser-identifier/parser-identifier-test-included.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/parser-identifier/parser-identifier-test-included.yang
rename to restconf/restconf-nb/src/test/resources/parser-identifier/parser-identifier-test-included.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/parser-identifier/parser-identifier-test.yang b/restconf/restconf-nb/src/test/resources/parser-identifier/parser-identifier-test.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/parser-identifier/parser-identifier-test.yang
rename to restconf/restconf-nb/src/test/resources/parser-identifier/parser-identifier-test.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/parser-identifier/test-module.yang b/restconf/restconf-nb/src/test/resources/parser-identifier/test-module.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/parser-identifier/test-module.yang
rename to restconf/restconf-nb/src/test/resources/parser-identifier/test-module.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/restconf/impl/ietf-inet-types.yang b/restconf/restconf-nb/src/test/resources/restconf/impl/ietf-inet-types.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/restconf/impl/ietf-inet-types.yang
rename to restconf/restconf-nb/src/test/resources/restconf/impl/ietf-inet-types.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/restconf/impl/ietf-restconf-monitoring@2017-01-26.yang b/restconf/restconf-nb/src/test/resources/restconf/impl/ietf-restconf-monitoring@2017-01-26.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/restconf/impl/ietf-restconf-monitoring@2017-01-26.yang
rename to restconf/restconf-nb/src/test/resources/restconf/impl/ietf-restconf-monitoring@2017-01-26.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/restconf/impl/ietf-restconf@2017-01-26.yang b/restconf/restconf-nb/src/test/resources/restconf/impl/ietf-restconf@2017-01-26.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/restconf/impl/ietf-restconf@2017-01-26.yang
rename to restconf/restconf-nb/src/test/resources/restconf/impl/ietf-restconf@2017-01-26.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/restconf/impl/ietf-yang-library@2016-06-21.yang b/restconf/restconf-nb/src/test/resources/restconf/impl/ietf-yang-library@2016-06-21.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/restconf/impl/ietf-yang-library@2016-06-21.yang
rename to restconf/restconf-nb/src/test/resources/restconf/impl/ietf-yang-library@2016-06-21.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/restconf/impl/ietf-yang-types.yang b/restconf/restconf-nb/src/test/resources/restconf/impl/ietf-yang-types.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/restconf/impl/ietf-yang-types.yang
rename to restconf/restconf-nb/src/test/resources/restconf/impl/ietf-yang-types.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/restconf/parser/deserializer/deserializer-test-included.yang b/restconf/restconf-nb/src/test/resources/restconf/parser/deserializer/deserializer-test-included.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/restconf/parser/deserializer/deserializer-test-included.yang
rename to restconf/restconf-nb/src/test/resources/restconf/parser/deserializer/deserializer-test-included.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/restconf/parser/deserializer/deserializer-test.yang b/restconf/restconf-nb/src/test/resources/restconf/parser/deserializer/deserializer-test.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/restconf/parser/deserializer/deserializer-test.yang
rename to restconf/restconf-nb/src/test/resources/restconf/parser/deserializer/deserializer-test.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/restconf/parser/deserializer/example-actions.yang b/restconf/restconf-nb/src/test/resources/restconf/parser/deserializer/example-actions.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/restconf/parser/deserializer/example-actions.yang
rename to restconf/restconf-nb/src/test/resources/restconf/parser/deserializer/example-actions.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/restconf/parser/list-test.yang b/restconf/restconf-nb/src/test/resources/restconf/parser/list-test.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/restconf/parser/list-test.yang
rename to restconf/restconf-nb/src/test/resources/restconf/parser/list-test.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/restconf/parser/serializer/serializer-test-included.yang b/restconf/restconf-nb/src/test/resources/restconf/parser/serializer/serializer-test-included.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/restconf/parser/serializer/serializer-test-included.yang
rename to restconf/restconf-nb/src/test/resources/restconf/parser/serializer/serializer-test-included.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/restconf/parser/serializer/serializer-test.yang b/restconf/restconf-nb/src/test/resources/restconf/parser/serializer/serializer-test.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/restconf/parser/serializer/serializer-test.yang
rename to restconf/restconf-nb/src/test/resources/restconf/parser/serializer/serializer-test.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/streams/sal-remote@2014-01-14.yang b/restconf/restconf-nb/src/test/resources/streams/sal-remote@2014-01-14.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/streams/sal-remote@2014-01-14.yang
rename to restconf/restconf-nb/src/test/resources/streams/sal-remote@2014-01-14.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/streams/toaster.yang b/restconf/restconf-nb/src/test/resources/streams/toaster.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/streams/toaster.yang
rename to restconf/restconf-nb/src/test/resources/streams/toaster.yang

diff --git a/restconf/restconf-nb-rfc8040/src/test/resources/test-services/test-services@2019-03-25.yang b/restconf/restconf-nb/src/test/resources/test-services/test-services@2019-03-25.yang
similarity index 100%
rename from restconf/restconf-nb-rfc8040/src/test/resources/test-services/test-services@2019-03-25.yang
rename to restconf/restconf-nb/src/test/resources/test-services/test-services@2019-03-25.yang