Split Restconf implementations (draft02 and RFC) - Prepare modules

  * rename sal-rest-connector module to restconf-nb-bierman02
  * prepared new module restconf-nb-rfc8040

Change-Id: I401a7fc595251dfd2ae08074096a4a16707c6527
Signed-off-by: Jakub Toth <jakub.toth@pantheon.tech>

diff --git a/features/restconf/odl-restconf-noauth/pom.xml b/features/restconf/odl-restconf-noauth/pom.xml
index 8bb2345a2e73b7db511e386e1ceea685f9f20ffe..ad8ad1837b51d90116742ba3c272a02d6afb5b6f 100644 (file)
--- a/features/restconf/odl-restconf-noauth/pom.xml
+++ b/features/restconf/odl-restconf-noauth/pom.xml
@@ -106,7 +106,8 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>sal-rest-connector</artifactId>
+            <artifactId>restconf-nb-bierman02</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>

diff --git a/restconf/pom.xml b/restconf/pom.xml
index dcd7605525dbd48ffe55c6f47da45c9ccfad8872..f04410fb29466c0dc3faa568d67cc41e649dc434 100644 (file)
--- a/restconf/pom.xml
+++ b/restconf/pom.xml
@@ -23,7 +23,11 @@
     <name>${project.artifactId}</name>
 
     <modules>
-        <module>sal-rest-connector</module>
+        <module>restconf-artifacts</module>
+        <module>restconf-models</module>
+        <module>restconf-common-models</module>
+        <module>restconf-nb-bierman02</module>
+        <module>restconf-nb-rfc8040</module>
         <module>sal-rest-connector-config</module>
         <module>sal-rest-docgen</module>
         <module>sal-rest-docgen-maven</module>
@@ -31,8 +35,6 @@
         FIXME: Needs to be reimplemented to not use YANGTools restconf impl
         <module>sal-restconf-broker</module>
         -->
-        <module>restconf-artifacts</module>
-        <module>models</module>
     </modules>
 
 </project>

diff --git a/restconf/restconf-artifacts/pom.xml b/restconf/restconf-artifacts/pom.xml
index 24964dfa6dd9ca9f4a5c4395807fa1c87452f99e..9cdfcdf92c21997caacdc9cccddb5076a9f6fd71 100644 (file)
--- a/restconf/restconf-artifacts/pom.xml
+++ b/restconf/restconf-artifacts/pom.xml
@@ -36,14 +36,24 @@
                 <artifactId>ietf-yang-library</artifactId>
                 <version>${project.version}</version>
             </dependency>
-             <dependency>
+            <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>ietf-restconf-monitoring</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>sal-rest-connector</artifactId>
+                <artifactId>restconf-common-models</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>restconf-nb-bierman02</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>restconf-nb-rfc8040</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>

diff --git a/restconf/restconf-common-models/pom.xml b/restconf/restconf-common-models/pom.xml
new file mode 100644 (file)
index 0000000..54fddc8
--- /dev/null
+++ b/restconf/restconf-common-models/pom.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (c) 2017 Pantheon Technologies s.r.o. and others.  All rights reserved.
+  ~
+  ~ This program and the accompanying materials are made available under the
+  ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+  ~ and is available at http://www.eclipse.org/legal/epl-v10.html
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.12.0-SNAPSHOT</version>
+    <relativePath/>
+  </parent>
+
+  <groupId>org.opendaylight.netconf</groupId>
+  <artifactId>restconf-common-models</artifactId>
+  <version>1.7.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
+  <name>${project.artifactId}</name>
+
+</project>

diff --git a/restconf/sal-rest-connector/src/main/yang/instance-identifier-patch-module.yang b/restconf/restconf-common-models/src/main/yang/instance-identifier-patch-module.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/main/yang/instance-identifier-patch-module.yang
rename to restconf/restconf-common-models/src/main/yang/instance-identifier-patch-module.yang

diff --git a/restconf/sal-rest-connector/src/main/yang/opendaylight-md-sal-remote.yang b/restconf/restconf-common-models/src/main/yang/opendaylight-md-sal-remote.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/main/yang/opendaylight-md-sal-remote.yang
rename to restconf/restconf-common-models/src/main/yang/opendaylight-md-sal-remote.yang

diff --git a/restconf/sal-rest-connector/src/main/yang/sal-remote-augment.yang b/restconf/restconf-common-models/src/main/yang/sal-remote-augment.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/main/yang/sal-remote-augment.yang
rename to restconf/restconf-common-models/src/main/yang/sal-remote-augment.yang

diff --git a/restconf/sal-rest-connector/src/main/yang/subscribe-to-notification.yang b/restconf/restconf-common-models/src/main/yang/subscribe-to-notification.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/main/yang/subscribe-to-notification.yang
rename to restconf/restconf-common-models/src/main/yang/subscribe-to-notification.yang

diff --git a/restconf/models/ietf-restconf-monitoring/pom.xml b/restconf/restconf-models/ietf-restconf-monitoring/pom.xml
similarity index 100%
rename from restconf/models/ietf-restconf-monitoring/pom.xml
rename to restconf/restconf-models/ietf-restconf-monitoring/pom.xml

diff --git a/restconf/models/ietf-restconf-monitoring/src/main/yang/ietf-restconf-monitoring@2017-01-26.yang b/restconf/restconf-models/ietf-restconf-monitoring/src/main/yang/ietf-restconf-monitoring@2017-01-26.yang
similarity index 100%
rename from restconf/models/ietf-restconf-monitoring/src/main/yang/ietf-restconf-monitoring@2017-01-26.yang
rename to restconf/restconf-models/ietf-restconf-monitoring/src/main/yang/ietf-restconf-monitoring@2017-01-26.yang

diff --git a/restconf/models/ietf-restconf/pom.xml b/restconf/restconf-models/ietf-restconf/pom.xml
similarity index 100%
rename from restconf/models/ietf-restconf/pom.xml
rename to restconf/restconf-models/ietf-restconf/pom.xml

diff --git a/restconf/models/ietf-restconf/src/main/yang/ietf-restconf@2017-01-26.yang b/restconf/restconf-models/ietf-restconf/src/main/yang/ietf-restconf@2017-01-26.yang
similarity index 100%
rename from restconf/models/ietf-restconf/src/main/yang/ietf-restconf@2017-01-26.yang
rename to restconf/restconf-models/ietf-restconf/src/main/yang/ietf-restconf@2017-01-26.yang

diff --git a/restconf/models/ietf-yang-library/pom.xml b/restconf/restconf-models/ietf-yang-library/pom.xml
similarity index 100%
rename from restconf/models/ietf-yang-library/pom.xml
rename to restconf/restconf-models/ietf-yang-library/pom.xml

diff --git a/restconf/models/ietf-yang-library/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/yang/library/rev160621/module/list/CommonLeafsRevisionBuilder.java b/restconf/restconf-models/ietf-yang-library/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/yang/library/rev160621/module/list/CommonLeafsRevisionBuilder.java
similarity index 100%
rename from restconf/models/ietf-yang-library/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/yang/library/rev160621/module/list/CommonLeafsRevisionBuilder.java
rename to restconf/restconf-models/ietf-yang-library/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/yang/library/rev160621/module/list/CommonLeafsRevisionBuilder.java

diff --git a/restconf/models/ietf-yang-library/src/main/yang/ietf-yang-library@2016-06-21.yang b/restconf/restconf-models/ietf-yang-library/src/main/yang/ietf-yang-library@2016-06-21.yang
similarity index 100%
rename from restconf/models/ietf-yang-library/src/main/yang/ietf-yang-library@2016-06-21.yang
rename to restconf/restconf-models/ietf-yang-library/src/main/yang/ietf-yang-library@2016-06-21.yang

diff --git a/restconf/models/pom.xml b/restconf/restconf-models/pom.xml
similarity index 100%
rename from restconf/models/pom.xml
rename to restconf/restconf-models/pom.xml

diff --git a/restconf/sal-rest-connector/pom.xml b/restconf/restconf-nb-bierman02/pom.xml
similarity index 97%
rename from restconf/sal-rest-connector/pom.xml
rename to restconf/restconf-nb-bierman02/pom.xml
index fdb943ed27ccb190bc861c1f4f784fae605eabf8..1ac8cc747bcc665615b9987ea9aff1ae10f4c0f9 100644 (file)
--- a/restconf/sal-rest-connector/pom.xml
+++ b/restconf/restconf-nb-bierman02/pom.xml
@@ -16,7 +16,7 @@
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
-  <artifactId>sal-rest-connector</artifactId>
+  <artifactId>restconf-nb-bierman02</artifactId>
   <version>1.7.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
@@ -60,6 +60,11 @@
   </dependencyManagement>
 
   <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>restconf-common-models</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.bundles.repackaged</groupId>
       <artifactId>jersey-guava</artifactId>

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/md/sal/rest/common/RestconfValidationUtils.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/md/sal/rest/common/RestconfValidationUtils.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/md/sal/rest/common/RestconfValidationUtils.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/md/sal/rest/common/RestconfValidationUtils.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaExportContentYangBodyWriter.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaExportContentYangBodyWriter.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaExportContentYangBodyWriter.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaExportContentYangBodyWriter.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaExportContentYinBodyWriter.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaExportContentYinBodyWriter.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaExportContentYinBodyWriter.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaExportContentYinBodyWriter.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaExportContext.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaExportContext.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaExportContext.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaExportContext.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaRetrievalService.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaRetrievalService.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaRetrievalService.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaRetrievalService.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaRetrievalServiceImpl.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaRetrievalServiceImpl.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaRetrievalServiceImpl.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaRetrievalServiceImpl.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/api/Draft02.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/api/Draft02.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/api/Draft02.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/api/Draft02.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/api/RestConnector.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/api/RestConnector.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/api/RestConnector.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/api/RestConnector.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/api/RestconfConstants.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/api/RestconfConstants.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/api/RestconfConstants.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/api/RestconfConstants.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/api/RestconfNormalizedNodeWriter.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/api/RestconfNormalizedNodeWriter.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/api/RestconfNormalizedNodeWriter.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/api/RestconfNormalizedNodeWriter.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/api/RestconfService.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/api/RestconfService.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/api/RestconfService.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/api/RestconfService.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/api/package-info.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/api/package-info.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/api/package-info.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/api/package-info.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/AbstractIdentifierAwareJaxRsProvider.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/AbstractIdentifierAwareJaxRsProvider.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/AbstractIdentifierAwareJaxRsProvider.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/AbstractIdentifierAwareJaxRsProvider.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/DepthAwareNormalizedNodeWriter.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/DepthAwareNormalizedNodeWriter.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/DepthAwareNormalizedNodeWriter.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/DepthAwareNormalizedNodeWriter.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonNormalizedNodeBodyReader.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonNormalizedNodeBodyReader.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonNormalizedNodeBodyReader.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonNormalizedNodeBodyReader.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonToPatchBodyReader.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonToPatchBodyReader.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonToPatchBodyReader.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonToPatchBodyReader.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeJsonBodyWriter.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeJsonBodyWriter.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeJsonBodyWriter.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeJsonBodyWriter.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/Patch.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/Patch.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/Patch.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/Patch.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/PatchJsonBodyWriter.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/PatchJsonBodyWriter.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/PatchJsonBodyWriter.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/PatchJsonBodyWriter.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/PatchXmlBodyWriter.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/PatchXmlBodyWriter.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/PatchXmlBodyWriter.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/PatchXmlBodyWriter.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestUtil.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestUtil.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestUtil.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestUtil.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfApplication.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfApplication.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfApplication.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfApplication.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfCompositeWrapper.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfCompositeWrapper.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfCompositeWrapper.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfCompositeWrapper.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDelegatingNormalizedNodeWriter.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDelegatingNormalizedNodeWriter.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDelegatingNormalizedNodeWriter.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDelegatingNormalizedNodeWriter.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDocumentedExceptionMapper.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDocumentedExceptionMapper.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDocumentedExceptionMapper.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDocumentedExceptionMapper.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/StringModuleInstanceIdentifierCodec.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/StringModuleInstanceIdentifierCodec.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/StringModuleInstanceIdentifierCodec.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/StringModuleInstanceIdentifierCodec.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/UnsupportedFormatException.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/UnsupportedFormatException.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/UnsupportedFormatException.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/UnsupportedFormatException.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/XmlNormalizedNodeBodyReader.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/XmlNormalizedNodeBodyReader.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/XmlNormalizedNodeBodyReader.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/XmlNormalizedNodeBodyReader.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/XmlToPatchBodyReader.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/XmlToPatchBodyReader.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/XmlToPatchBodyReader.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/XmlToPatchBodyReader.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/package-info.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/package-info.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/package-info.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/package-info.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/api/JSONRestconfService.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/api/JSONRestconfService.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/api/JSONRestconfService.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/api/JSONRestconfService.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BatchedExistenceCheck.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BatchedExistenceCheck.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BatchedExistenceCheck.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BatchedExistenceCheck.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/ControllerContext.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/ControllerContext.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/ControllerContext.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/ControllerContext.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeContainerSchemaNode.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeContainerSchemaNode.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeContainerSchemaNode.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeContainerSchemaNode.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeImportedModule.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeImportedModule.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeImportedModule.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeImportedModule.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeLeafSchemaNode.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeLeafSchemaNode.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeLeafSchemaNode.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeLeafSchemaNode.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeModuleImport.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeModuleImport.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeModuleImport.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeModuleImport.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeRestconfModule.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeRestconfModule.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeRestconfModule.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeRestconfModule.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/IdentityValuesDTO.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/IdentityValuesDTO.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/IdentityValuesDTO.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/IdentityValuesDTO.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/InstanceIdentifierContext.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/InstanceIdentifierContext.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/InstanceIdentifierContext.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/InstanceIdentifierContext.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/JSONRestconfServiceDraft18.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/JSONRestconfServiceDraft18.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/JSONRestconfServiceDraft18.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/JSONRestconfServiceDraft18.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/JSONRestconfServiceImpl.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/JSONRestconfServiceImpl.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/JSONRestconfServiceImpl.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/JSONRestconfServiceImpl.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/NormalizedDataPrunner.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/NormalizedDataPrunner.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/NormalizedDataPrunner.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/NormalizedDataPrunner.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/NormalizedNodeContext.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/NormalizedNodeContext.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/NormalizedNodeContext.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/NormalizedNodeContext.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/PatchContext.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/PatchContext.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/PatchContext.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/PatchContext.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/PatchEditOperation.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/PatchEditOperation.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/PatchEditOperation.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/PatchEditOperation.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/PatchEntity.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/PatchEntity.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/PatchEntity.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/PatchEntity.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/PatchStatusContext.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/PatchStatusContext.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/PatchStatusContext.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/PatchStatusContext.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/PatchStatusEntity.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/PatchStatusEntity.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/PatchStatusEntity.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/PatchStatusEntity.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/PutResult.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/PutResult.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/PutResult.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/PutResult.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/QueryParametersParser.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/QueryParametersParser.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/QueryParametersParser.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/QueryParametersParser.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestCodec.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestCodec.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestCodec.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestCodec.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfDocumentedException.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfDocumentedException.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfDocumentedException.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfDocumentedException.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfError.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfError.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfError.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfError.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfProviderImpl.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfProviderImpl.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfProviderImpl.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfProviderImpl.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/StatisticsRestconfServiceWrapper.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/StatisticsRestconfServiceWrapper.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/StatisticsRestconfServiceWrapper.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/StatisticsRestconfServiceWrapper.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/WriterParameters.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/WriterParameters.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/WriterParameters.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/WriterParameters.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Config.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Config.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Config.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Config.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Delete.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Delete.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Delete.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Delete.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Get.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Get.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Get.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Get.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Operational.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Operational.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Operational.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Operational.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Post.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Post.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Post.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Post.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Put.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Put.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Put.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Put.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/RestConnectorRuntimeMXBean.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/RestConnectorRuntimeMXBean.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/RestConnectorRuntimeMXBean.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/RestConnectorRuntimeMXBean.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Rpcs.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Rpcs.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Rpcs.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/Rpcs.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/package-info.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/package-info.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/package-info.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/jmx/package-info.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/package-info.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/package-info.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/package-info.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/package-info.java

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

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

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/streams/listeners/AbstractQueryParams.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/AbstractQueryParams.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/streams/listeners/AbstractQueryParams.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/AbstractQueryParams.java

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

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/streams/listeners/Event.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/Event.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/streams/listeners/Event.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/Event.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/streams/listeners/EventBusChangeRecorder.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/EventBusChangeRecorder.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/streams/listeners/EventBusChangeRecorder.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/EventBusChangeRecorder.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/streams/listeners/EventType.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/EventType.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/streams/listeners/EventType.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/EventType.java

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

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

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/streams/listeners/Notificator.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/Notificator.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/streams/listeners/Notificator.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/Notificator.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/streams/websockets/WebSocketServer.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/websockets/WebSocketServer.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/streams/websockets/WebSocketServer.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/websockets/WebSocketServer.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/streams/websockets/WebSocketServerHandler.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/websockets/WebSocketServerHandler.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/streams/websockets/WebSocketServerHandler.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/websockets/WebSocketServerHandler.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/streams/websockets/WebSocketServerInitializer.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/websockets/WebSocketServerInitializer.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/streams/websockets/WebSocketServerInitializer.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/websockets/WebSocketServerInitializer.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/RestConnectorProvider.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/RestConnectorProvider.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/RestConnectorProvider.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/RestConnectorProvider.java

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

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

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/api/BaseServicesWrapper.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/base/services/api/BaseServicesWrapper.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/api/BaseServicesWrapper.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/base/services/api/BaseServicesWrapper.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/api/RestconfOperationsService.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/base/services/api/RestconfOperationsService.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/api/RestconfOperationsService.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/base/services/api/RestconfOperationsService.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/api/RestconfSchemaService.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/base/services/api/RestconfSchemaService.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/api/RestconfSchemaService.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/base/services/api/RestconfSchemaService.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/api/RestconfService.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/base/services/api/RestconfService.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/api/RestconfService.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/base/services/api/RestconfService.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/FakeContainerSchemaNode.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/base/services/impl/FakeContainerSchemaNode.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/FakeContainerSchemaNode.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/base/services/impl/FakeContainerSchemaNode.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/FakeImportedModule.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/base/services/impl/FakeImportedModule.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/FakeImportedModule.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/base/services/impl/FakeImportedModule.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/FakeLeafSchemaNode.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/base/services/impl/FakeLeafSchemaNode.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/FakeLeafSchemaNode.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/base/services/impl/FakeLeafSchemaNode.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/FakeModuleImport.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/base/services/impl/FakeModuleImport.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/FakeModuleImport.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/base/services/impl/FakeModuleImport.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/FakeRestconfModule.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/base/services/impl/FakeRestconfModule.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/FakeRestconfModule.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/base/services/impl/FakeRestconfModule.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/RestconfImpl.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/base/services/impl/RestconfImpl.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/RestconfImpl.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/base/services/impl/RestconfImpl.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/RestconfOperationsServiceImpl.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/base/services/impl/RestconfOperationsServiceImpl.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/RestconfOperationsServiceImpl.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/base/services/impl/RestconfOperationsServiceImpl.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/RestconfSchemaServiceImpl.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/base/services/impl/RestconfSchemaServiceImpl.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/RestconfSchemaServiceImpl.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/base/services/impl/RestconfSchemaServiceImpl.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/common/references/SchemaContextRef.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/common/references/SchemaContextRef.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/common/references/SchemaContextRef.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/common/references/SchemaContextRef.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/common/wrapper/services/ServicesWrapperImpl.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/common/wrapper/services/ServicesWrapperImpl.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/common/wrapper/services/ServicesWrapperImpl.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/common/wrapper/services/ServicesWrapperImpl.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/handlers/DOMDataBrokerHandler.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/handlers/DOMDataBrokerHandler.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/handlers/DOMDataBrokerHandler.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/handlers/DOMDataBrokerHandler.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/handlers/DOMMountPointServiceHandler.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/handlers/DOMMountPointServiceHandler.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/handlers/DOMMountPointServiceHandler.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/handlers/DOMMountPointServiceHandler.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/handlers/Handler.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/handlers/Handler.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/handlers/Handler.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/handlers/Handler.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/handlers/NotificationServiceHandler.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/handlers/NotificationServiceHandler.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/handlers/NotificationServiceHandler.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/handlers/NotificationServiceHandler.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/handlers/RpcServiceHandler.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/handlers/RpcServiceHandler.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/handlers/RpcServiceHandler.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/handlers/RpcServiceHandler.java

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

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/handlers/SchemaContextListenerHandler.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/handlers/SchemaContextListenerHandler.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/handlers/SchemaContextListenerHandler.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/handlers/SchemaContextListenerHandler.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/handlers/TransactionChainHandler.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/handlers/TransactionChainHandler.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/handlers/TransactionChainHandler.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/handlers/TransactionChainHandler.java

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

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

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/AbstractToPatchBodyReader.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/jersey/providers/AbstractToPatchBodyReader.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/AbstractToPatchBodyReader.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/jersey/providers/AbstractToPatchBodyReader.java

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

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/JsonToPatchBodyReader.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/jersey/providers/JsonToPatchBodyReader.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/JsonToPatchBodyReader.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/jersey/providers/JsonToPatchBodyReader.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/NormalizedNodeJsonBodyWriter.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/jersey/providers/NormalizedNodeJsonBodyWriter.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/NormalizedNodeJsonBodyWriter.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/jersey/providers/NormalizedNodeJsonBodyWriter.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/NormalizedNodeXmlBodyWriter.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/jersey/providers/NormalizedNodeXmlBodyWriter.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/NormalizedNodeXmlBodyWriter.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/jersey/providers/NormalizedNodeXmlBodyWriter.java

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

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/StringModuleInstanceIdentifierCodec.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/jersey/providers/StringModuleInstanceIdentifierCodec.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/StringModuleInstanceIdentifierCodec.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/jersey/providers/StringModuleInstanceIdentifierCodec.java

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

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/XmlToPatchBodyReader.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/jersey/providers/XmlToPatchBodyReader.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/XmlToPatchBodyReader.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/jersey/providers/XmlToPatchBodyReader.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/parser/IdentifierCodec.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/parser/IdentifierCodec.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/parser/IdentifierCodec.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/parser/IdentifierCodec.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/parser/builder/YangInstanceIdentifierDeserializer.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/parser/builder/YangInstanceIdentifierDeserializer.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/parser/builder/YangInstanceIdentifierDeserializer.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/parser/builder/YangInstanceIdentifierDeserializer.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/parser/builder/YangInstanceIdentifierSerializer.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/parser/builder/YangInstanceIdentifierSerializer.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/parser/builder/YangInstanceIdentifierSerializer.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/parser/builder/YangInstanceIdentifierSerializer.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/services/api/RestconfDataService.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/services/api/RestconfDataService.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/services/api/RestconfDataService.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/services/api/RestconfDataService.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/services/api/RestconfInvokeOperationsService.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/services/api/RestconfInvokeOperationsService.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/services/api/RestconfInvokeOperationsService.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/services/api/RestconfInvokeOperationsService.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/services/api/RestconfStreamsSubscriptionService.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/services/api/RestconfStreamsSubscriptionService.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/services/api/RestconfStreamsSubscriptionService.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/services/api/RestconfStreamsSubscriptionService.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/services/api/TransactionServicesWrapper.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/services/api/TransactionServicesWrapper.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/services/api/TransactionServicesWrapper.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/services/api/TransactionServicesWrapper.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/services/impl/RestconfDataServiceImpl.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/services/impl/RestconfDataServiceImpl.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/services/impl/RestconfDataServiceImpl.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/services/impl/RestconfDataServiceImpl.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/services/impl/RestconfInvokeOperationsServiceImpl.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/services/impl/RestconfInvokeOperationsServiceImpl.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/services/impl/RestconfInvokeOperationsServiceImpl.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/services/impl/RestconfInvokeOperationsServiceImpl.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/services/impl/RestconfStreamsSubscriptionServiceImpl.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/services/impl/RestconfStreamsSubscriptionServiceImpl.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/services/impl/RestconfStreamsSubscriptionServiceImpl.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/services/impl/RestconfStreamsSubscriptionServiceImpl.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/transaction/TransactionVarsWrapper.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/transaction/TransactionVarsWrapper.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/transaction/TransactionVarsWrapper.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/transaction/TransactionVarsWrapper.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/CreateStreamUtil.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/CreateStreamUtil.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/CreateStreamUtil.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/CreateStreamUtil.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/DeleteDataTransactionUtil.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/DeleteDataTransactionUtil.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/DeleteDataTransactionUtil.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/DeleteDataTransactionUtil.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/FutureCallbackTx.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/FutureCallbackTx.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/FutureCallbackTx.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/FutureCallbackTx.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/FutureDataFactory.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/FutureDataFactory.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/FutureDataFactory.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/FutureDataFactory.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/NormalizedNodeFactory.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/NormalizedNodeFactory.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/NormalizedNodeFactory.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/NormalizedNodeFactory.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/ParametersUtil.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/ParametersUtil.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/ParametersUtil.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/ParametersUtil.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/PatchDataTransactionUtil.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/PatchDataTransactionUtil.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/PatchDataTransactionUtil.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/PatchDataTransactionUtil.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/PostDataTransactionUtil.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/PostDataTransactionUtil.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/PostDataTransactionUtil.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/PostDataTransactionUtil.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/PutDataTransactionUtil.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/PutDataTransactionUtil.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/PutDataTransactionUtil.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/PutDataTransactionUtil.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/ReadDataTransactionUtil.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/ReadDataTransactionUtil.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/ReadDataTransactionUtil.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/ReadDataTransactionUtil.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/ResolveEnumUtil.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/ResolveEnumUtil.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/ResolveEnumUtil.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/ResolveEnumUtil.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/ResponseFactory.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/ResponseFactory.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/ResponseFactory.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/ResponseFactory.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/RestconfDataServiceConstant.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/RestconfDataServiceConstant.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/RestconfDataServiceConstant.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/RestconfDataServiceConstant.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/RestconfInvokeOperationsUtil.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/RestconfInvokeOperationsUtil.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/RestconfInvokeOperationsUtil.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/RestconfInvokeOperationsUtil.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/RestconfStreamsConstants.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/RestconfStreamsConstants.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/RestconfStreamsConstants.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/RestconfStreamsConstants.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/RpcResultFactory.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/RpcResultFactory.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/RpcResultFactory.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/RpcResultFactory.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/SubscribeToStreamUtil.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/SubscribeToStreamUtil.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/SubscribeToStreamUtil.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/SubscribeToStreamUtil.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/TransactionUtil.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/TransactionUtil.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/TransactionUtil.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/restful/utils/TransactionUtil.java

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

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/utils/mapping/RestconfMappingNodeConstants.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/utils/mapping/RestconfMappingNodeConstants.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/utils/mapping/RestconfMappingNodeConstants.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/utils/mapping/RestconfMappingNodeConstants.java

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

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/utils/mapping/RestconfMappingStreamConstants.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/utils/mapping/RestconfMappingStreamConstants.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/utils/mapping/RestconfMappingStreamConstants.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/utils/mapping/RestconfMappingStreamConstants.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/utils/parser/ParserFieldsParameter.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/utils/parser/ParserFieldsParameter.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/utils/parser/ParserFieldsParameter.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/utils/parser/ParserFieldsParameter.java

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

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/utils/parser/builder/ParserBuilderConstants.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/utils/parser/builder/ParserBuilderConstants.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/utils/parser/builder/ParserBuilderConstants.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/utils/parser/builder/ParserBuilderConstants.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/utils/schema/context/RestconfSchemaUtil.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/utils/schema/context/RestconfSchemaUtil.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/utils/schema/context/RestconfSchemaUtil.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/utils/schema/context/RestconfSchemaUtil.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/utils/validation/RestconfValidation.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/utils/validation/RestconfValidation.java
similarity index 100%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/utils/validation/RestconfValidation.java
rename to restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/restconf/utils/validation/RestconfValidation.java

diff --git a/restconf/sal-rest-connector/src/main/resources/WEB-INF/web.xml b/restconf/restconf-nb-bierman02/src/main/resources/WEB-INF/web.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/main/resources/WEB-INF/web.xml
rename to restconf/restconf-nb-bierman02/src/main/resources/WEB-INF/web.xml

diff --git a/restconf/sal-rest-connector/src/main/resources/org/opendaylight/blueprint/restconf-config.xml b/restconf/restconf-nb-bierman02/src/main/resources/org/opendaylight/blueprint/restconf-config.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/main/resources/org/opendaylight/blueprint/restconf-config.xml
rename to restconf/restconf-nb-bierman02/src/main/resources/org/opendaylight/blueprint/restconf-config.xml

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/md/sal/rest/common/TestRestconfUtils.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/md/sal/rest/common/TestRestconfUtils.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/md/sal/rest/common/TestRestconfUtils.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/md/sal/rest/common/TestRestconfUtils.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/InstanceIdentifierTypeLeafTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/InstanceIdentifierTypeLeafTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/InstanceIdentifierTypeLeafTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/InstanceIdentifierTypeLeafTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/AbstractBodyReaderTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/AbstractBodyReaderTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/AbstractBodyReaderTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/AbstractBodyReaderTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonBodyReader.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonBodyReader.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonBodyReader.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonBodyReader.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonBodyReaderMountPoint.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonBodyReaderMountPoint.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonBodyReaderMountPoint.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonBodyReaderMountPoint.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonBodyWriter.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonBodyWriter.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonBodyWriter.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonBodyWriter.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonPatchBodyReader.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonPatchBodyReader.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonPatchBodyReader.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonPatchBodyReader.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonPatchBodyReaderMountPoint.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonPatchBodyReaderMountPoint.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonPatchBodyReaderMountPoint.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonPatchBodyReaderMountPoint.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlBodyReader.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlBodyReader.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlBodyReader.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlBodyReader.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlBodyReaderMountPoint.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlBodyReaderMountPoint.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlBodyReaderMountPoint.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlBodyReaderMountPoint.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlBodyWriter.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlBodyWriter.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlBodyWriter.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlBodyWriter.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlPatchBodyReader.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlPatchBodyReader.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlPatchBodyReader.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlPatchBodyReader.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlPatchBodyReaderMountPoint.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlPatchBodyReaderMountPoint.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlPatchBodyReaderMountPoint.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlPatchBodyReaderMountPoint.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonBasicDataTypesTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonBasicDataTypesTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonBasicDataTypesTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonBasicDataTypesTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonIdentityrefTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonIdentityrefTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonIdentityrefTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonIdentityrefTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonWithDataFromSeveralModulesTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonWithDataFromSeveralModulesTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonWithDataFromSeveralModulesTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonWithDataFromSeveralModulesTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/input/to/cnsn/test/RestPutListDataTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/input/to/cnsn/test/RestPutListDataTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/input/to/cnsn/test/RestPutListDataTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/input/to/cnsn/test/RestPutListDataTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/nn/test/JsonIdentityrefToNnTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/nn/test/JsonIdentityrefToNnTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/nn/test/JsonIdentityrefToNnTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/nn/test/JsonIdentityrefToNnTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/nn/test/JsonLeafrefToNnTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/nn/test/JsonLeafrefToNnTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/nn/test/JsonLeafrefToNnTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/nn/test/JsonLeafrefToNnTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/nn/test/JsonToNnTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/nn/test/JsonToNnTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/nn/test/JsonToNnTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/nn/test/JsonToNnTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/json/test/NnJsonChoiceCaseTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/json/test/NnJsonChoiceCaseTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/json/test/NnJsonChoiceCaseTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/json/test/NnJsonChoiceCaseTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/json/test/NnToJsonLeafrefType.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/json/test/NnToJsonLeafrefType.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/json/test/NnToJsonLeafrefType.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/json/test/NnToJsonLeafrefType.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/json/test/NnToJsonWithAugmentTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/json/test/NnToJsonWithAugmentTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/json/test/NnToJsonWithAugmentTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/json/test/NnToJsonWithAugmentTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnInstanceIdentifierToXmlTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnInstanceIdentifierToXmlTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnInstanceIdentifierToXmlTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnInstanceIdentifierToXmlTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithChoiceTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithChoiceTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithChoiceTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithChoiceTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithDataFromSeveralModulesTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithDataFromSeveralModulesTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithDataFromSeveralModulesTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithDataFromSeveralModulesTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/BrokerFacadeTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/BrokerFacadeTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/BrokerFacadeTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/BrokerFacadeTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Bug3595Test.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Bug3595Test.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Bug3595Test.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Bug3595Test.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Bug8072Test.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Bug8072Test.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Bug8072Test.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Bug8072Test.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CnSnToXmlAndJsonInstanceIdentifierTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CnSnToXmlAndJsonInstanceIdentifierTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CnSnToXmlAndJsonInstanceIdentifierTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CnSnToXmlAndJsonInstanceIdentifierTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CodecsExceptionsCatchingTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CodecsExceptionsCatchingTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CodecsExceptionsCatchingTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CodecsExceptionsCatchingTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CutDataToCorrectDepthTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CutDataToCorrectDepthTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CutDataToCorrectDepthTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CutDataToCorrectDepthTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/DummyFuture.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/DummyFuture.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/DummyFuture.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/DummyFuture.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/DummyRpcResult.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/DummyRpcResult.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/DummyRpcResult.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/DummyRpcResult.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/DummyType.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/DummyType.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/DummyType.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/DummyType.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/ExpressionParserTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/ExpressionParserTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/ExpressionParserTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/ExpressionParserTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/JSONRestconfServiceDraft18Test.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/JSONRestconfServiceDraft18Test.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/JSONRestconfServiceDraft18Test.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/JSONRestconfServiceDraft18Test.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/JSONRestconfServiceImplTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/JSONRestconfServiceImplTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/JSONRestconfServiceImplTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/JSONRestconfServiceImplTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/MediaTypesTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/MediaTypesTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/MediaTypesTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/MediaTypesTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/NormalizeNodeTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/NormalizeNodeTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/NormalizeNodeTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/NormalizeNodeTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestCodecExceptionsTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestCodecExceptionsTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestCodecExceptionsTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestCodecExceptionsTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestDeleteOperationTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestDeleteOperationTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestDeleteOperationTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestDeleteOperationTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetAugmentedElementWhenEqualNamesTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetAugmentedElementWhenEqualNamesTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetAugmentedElementWhenEqualNamesTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetAugmentedElementWhenEqualNamesTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestOperationUtils.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestOperationUtils.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestOperationUtils.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestOperationUtils.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutConfigTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutConfigTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutConfigTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutConfigTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutOperationTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutOperationTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutOperationTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutOperationTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfDocumentedExceptionMapperTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfDocumentedExceptionMapperTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfDocumentedExceptionMapperTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfDocumentedExceptionMapperTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfErrorTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfErrorTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfErrorTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfErrorTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplNotificationSubscribingTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplNotificationSubscribingTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplNotificationSubscribingTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplNotificationSubscribingTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/URIParametersParsing.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/URIParametersParsing.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/URIParametersParsing.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/URIParametersParsing.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/URITest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/URITest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/URITest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/URITest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/XmlAndJsonToCnSnInstanceIdentifierTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/XmlAndJsonToCnSnInstanceIdentifierTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/XmlAndJsonToCnSnInstanceIdentifierTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/XmlAndJsonToCnSnInstanceIdentifierTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/XmlAndJsonToCnSnLeafRefTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/XmlAndJsonToCnSnLeafRefTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/XmlAndJsonToCnSnLeafRefTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/XmlAndJsonToCnSnLeafRefTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/YangAndXmlAndDataSchemaLoader.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/YangAndXmlAndDataSchemaLoader.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/YangAndXmlAndDataSchemaLoader.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/YangAndXmlAndDataSchemaLoader.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/websockets/client/IClientMessageCallback.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/websockets/client/IClientMessageCallback.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/websockets/client/IClientMessageCallback.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/websockets/client/IClientMessageCallback.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/websockets/client/WebSocketClient.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/websockets/client/WebSocketClient.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/websockets/client/WebSocketClient.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/websockets/client/WebSocketClient.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/websockets/client/WebSocketClientHandler.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/websockets/client/WebSocketClientHandler.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/websockets/client/WebSocketClientHandler.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/websockets/client/WebSocketClientHandler.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/websockets/test/RestStreamTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/websockets/test/RestStreamTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/websockets/test/RestStreamTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/websockets/test/RestStreamTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/xml/to/cnsn/test/XmlAugmentedElementToCnSnTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/xml/to/cnsn/test/XmlAugmentedElementToCnSnTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/xml/to/cnsn/test/XmlAugmentedElementToCnSnTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/xml/to/cnsn/test/XmlAugmentedElementToCnSnTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/xml/to/cnsn/test/XmlToCnSnTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/xml/to/cnsn/test/XmlToCnSnTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/xml/to/cnsn/test/XmlToCnSnTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/xml/to/cnsn/test/XmlToCnSnTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/netconf/sal/rest/impl/DepthAwareNormalizedNodeWriterTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/netconf/sal/rest/impl/DepthAwareNormalizedNodeWriterTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/netconf/sal/rest/impl/DepthAwareNormalizedNodeWriterTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/netconf/sal/rest/impl/DepthAwareNormalizedNodeWriterTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/netconf/sal/restconf/impl/InstanceIdentifierCodecImplTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/netconf/sal/restconf/impl/InstanceIdentifierCodecImplTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/netconf/sal/restconf/impl/InstanceIdentifierCodecImplTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/netconf/sal/restconf/impl/InstanceIdentifierCodecImplTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/netconf/sal/streams/listeners/NotificationListenerTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/netconf/sal/streams/listeners/NotificationListenerTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/netconf/sal/streams/listeners/NotificationListenerTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/netconf/sal/streams/listeners/NotificationListenerTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/RestConnectorProviderTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/RestConnectorProviderTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/RestConnectorProviderTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/RestConnectorProviderTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/base/services/impl/RestconfImplTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/base/services/impl/RestconfImplTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/base/services/impl/RestconfImplTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/base/services/impl/RestconfImplTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/base/services/impl/RestconfOperationsServiceTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/base/services/impl/RestconfOperationsServiceTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/base/services/impl/RestconfOperationsServiceTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/base/services/impl/RestconfOperationsServiceTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/base/services/impl/RestconfSchemaServiceTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/base/services/impl/RestconfSchemaServiceTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/base/services/impl/RestconfSchemaServiceTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/base/services/impl/RestconfSchemaServiceTest.java

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/parser/IdentifierCodecTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/parser/IdentifierCodecTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/parser/IdentifierCodecTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/parser/IdentifierCodecTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/parser/builder/YangInstanceIdentifierDeserializerTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/parser/builder/YangInstanceIdentifierDeserializerTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/parser/builder/YangInstanceIdentifierDeserializerTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/parser/builder/YangInstanceIdentifierDeserializerTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/parser/builder/YangInstanceIdentifierSerializerTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/parser/builder/YangInstanceIdentifierSerializerTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/parser/builder/YangInstanceIdentifierSerializerTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/parser/builder/YangInstanceIdentifierSerializerTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/restful/services/impl/RestconfDataServiceImplTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/restful/services/impl/RestconfDataServiceImplTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/restful/services/impl/RestconfDataServiceImplTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/restful/services/impl/RestconfDataServiceImplTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/restful/services/impl/RestconfInvokeOperationsServiceImplTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/restful/services/impl/RestconfInvokeOperationsServiceImplTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/restful/services/impl/RestconfInvokeOperationsServiceImplTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/restful/services/impl/RestconfInvokeOperationsServiceImplTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/restful/services/impl/RestconfStreamsSubscriptionServiceImplTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/restful/services/impl/RestconfStreamsSubscriptionServiceImplTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/restful/services/impl/RestconfStreamsSubscriptionServiceImplTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/restful/services/impl/RestconfStreamsSubscriptionServiceImplTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/restful/utils/CreateStreamUtilTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/restful/utils/CreateStreamUtilTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/restful/utils/CreateStreamUtilTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/restful/utils/CreateStreamUtilTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/restful/utils/DeleteDataTransactionUtilTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/restful/utils/DeleteDataTransactionUtilTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/restful/utils/DeleteDataTransactionUtilTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/restful/utils/DeleteDataTransactionUtilTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/restful/utils/ParametersUtilTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/restful/utils/ParametersUtilTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/restful/utils/ParametersUtilTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/restful/utils/ParametersUtilTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/restful/utils/PatchDataTransactionUtilTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/restful/utils/PatchDataTransactionUtilTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/restful/utils/PatchDataTransactionUtilTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/restful/utils/PatchDataTransactionUtilTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/restful/utils/PostDataTransactionUtilTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/restful/utils/PostDataTransactionUtilTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/restful/utils/PostDataTransactionUtilTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/restful/utils/PostDataTransactionUtilTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/restful/utils/PutDataTransactionUtilTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/restful/utils/PutDataTransactionUtilTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/restful/utils/PutDataTransactionUtilTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/restful/utils/PutDataTransactionUtilTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/restful/utils/ReadDataTransactionUtilTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/restful/utils/ReadDataTransactionUtilTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/restful/utils/ReadDataTransactionUtilTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/restful/utils/ReadDataTransactionUtilTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/restful/utils/RestconfInvokeOperationsUtilTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/restful/utils/RestconfInvokeOperationsUtilTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/restful/utils/RestconfInvokeOperationsUtilTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/restful/utils/RestconfInvokeOperationsUtilTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/restful/utils/TestData.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/restful/utils/TestData.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/restful/utils/TestData.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/restful/utils/TestData.java

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

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/utils/parser/ParserFieldsParameterTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/utils/parser/ParserFieldsParameterTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/utils/parser/ParserFieldsParameterTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/utils/parser/ParserFieldsParameterTest.java

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

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/utils/schema/context/RestconfSchemaUtilTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/utils/schema/context/RestconfSchemaUtilTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/utils/schema/context/RestconfSchemaUtilTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/utils/schema/context/RestconfSchemaUtilTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/utils/validation/RestconfValidationTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/utils/validation/RestconfValidationTest.java
similarity index 100%
rename from restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/utils/validation/RestconfValidationTest.java
rename to restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/restconf/utils/validation/RestconfValidationTest.java

diff --git a/restconf/sal-rest-connector/src/test/resources/common/augment/json/dataa.json b/restconf/restconf-nb-bierman02/src/test/resources/common/augment/json/dataa.json
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/common/augment/json/dataa.json
rename to restconf/restconf-nb-bierman02/src/test/resources/common/augment/json/dataa.json

diff --git a/restconf/sal-rest-connector/src/test/resources/common/augment/json/datab.json b/restconf/restconf-nb-bierman02/src/test/resources/common/augment/json/datab.json
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/common/augment/json/datab.json
rename to restconf/restconf-nb-bierman02/src/test/resources/common/augment/json/datab.json

diff --git a/restconf/sal-rest-connector/src/test/resources/common/augment/xml/dataa.xml b/restconf/restconf-nb-bierman02/src/test/resources/common/augment/xml/dataa.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/common/augment/xml/dataa.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/common/augment/xml/dataa.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/common/augment/xml/datab.xml b/restconf/restconf-nb-bierman02/src/test/resources/common/augment/xml/datab.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/common/augment/xml/datab.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/common/augment/xml/datab.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/common/augment/yang/augment-main-a.yang b/restconf/restconf-nb-bierman02/src/test/resources/common/augment/yang/augment-main-a.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/common/augment/yang/augment-main-a.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/common/augment/yang/augment-main-a.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/common/augment/yang/augment-main-b.yang b/restconf/restconf-nb-bierman02/src/test/resources/common/augment/yang/augment-main-b.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/common/augment/yang/augment-main-b.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/common/augment/yang/augment-main-b.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/common/augment/yang/main.yang b/restconf/restconf-nb-bierman02/src/test/resources/common/augment/yang/main.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/common/augment/yang/main.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/common/augment/yang/main.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/datastore-and-scope-specification/opendaylight-inventory.yang b/restconf/restconf-nb-bierman02/src/test/resources/datastore-and-scope-specification/opendaylight-inventory.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/datastore-and-scope-specification/opendaylight-inventory.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/datastore-and-scope-specification/opendaylight-inventory.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/datastore-and-scope-specification/sal-remote-augment.yang b/restconf/restconf-nb-bierman02/src/test/resources/datastore-and-scope-specification/sal-remote-augment.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/datastore-and-scope-specification/sal-remote-augment.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/datastore-and-scope-specification/sal-remote-augment.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/datastore-and-scope-specification/sal-remote@2014-01-14.yang b/restconf/restconf-nb-bierman02/src/test/resources/datastore-and-scope-specification/sal-remote@2014-01-14.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/datastore-and-scope-specification/sal-remote@2014-01-14.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/datastore-and-scope-specification/sal-remote@2014-01-14.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/decoding-exception/yang/number.yang b/restconf/restconf-nb-bierman02/src/test/resources/decoding-exception/yang/number.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/decoding-exception/yang/number.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/decoding-exception/yang/number.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/equal-data-node-names/equal-name-data-for-container.json b/restconf/restconf-nb-bierman02/src/test/resources/equal-data-node-names/equal-name-data-for-container.json
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/equal-data-node-names/equal-name-data-for-container.json
rename to restconf/restconf-nb-bierman02/src/test/resources/equal-data-node-names/equal-name-data-for-container.json

diff --git a/restconf/sal-rest-connector/src/test/resources/equal-data-node-names/equal-name-data-for-container.xml b/restconf/restconf-nb-bierman02/src/test/resources/equal-data-node-names/equal-name-data-for-container.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/equal-data-node-names/equal-name-data-for-container.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/equal-data-node-names/equal-name-data-for-container.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/equal-data-node-names/equal-name-data-for-leaf.json b/restconf/restconf-nb-bierman02/src/test/resources/equal-data-node-names/equal-name-data-for-leaf.json
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/equal-data-node-names/equal-name-data-for-leaf.json
rename to restconf/restconf-nb-bierman02/src/test/resources/equal-data-node-names/equal-name-data-for-leaf.json

diff --git a/restconf/sal-rest-connector/src/test/resources/equal-data-node-names/equal-name-data-for-leaf.xml b/restconf/restconf-nb-bierman02/src/test/resources/equal-data-node-names/equal-name-data-for-leaf.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/equal-data-node-names/equal-name-data-for-leaf.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/equal-data-node-names/equal-name-data-for-leaf.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/equal-data-node-names/yang/equal-data-node-names.yang b/restconf/restconf-nb-bierman02/src/test/resources/equal-data-node-names/yang/equal-data-node-names.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/equal-data-node-names/yang/equal-data-node-names.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/equal-data-node-names/yang/equal-data-node-names.yang

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

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

diff --git a/restconf/sal-rest-connector/src/test/resources/full-versions/make-toast-rpc-input.json b/restconf/restconf-nb-bierman02/src/test/resources/full-versions/make-toast-rpc-input.json
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/full-versions/make-toast-rpc-input.json
rename to restconf/restconf-nb-bierman02/src/test/resources/full-versions/make-toast-rpc-input.json

diff --git a/restconf/sal-rest-connector/src/test/resources/full-versions/test-data2/data-rpc-input.json b/restconf/restconf-nb-bierman02/src/test/resources/full-versions/test-data2/data-rpc-input.json
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/full-versions/test-data2/data-rpc-input.json
rename to restconf/restconf-nb-bierman02/src/test/resources/full-versions/test-data2/data-rpc-input.json

diff --git a/restconf/sal-rest-connector/src/test/resources/full-versions/test-data2/data-rpc-input.xml b/restconf/restconf-nb-bierman02/src/test/resources/full-versions/test-data2/data-rpc-input.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/full-versions/test-data2/data-rpc-input.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/full-versions/test-data2/data-rpc-input.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/full-versions/test-data2/data2.xml b/restconf/restconf-nb-bierman02/src/test/resources/full-versions/test-data2/data2.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/full-versions/test-data2/data2.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/full-versions/test-data2/data2.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/full-versions/test-data2/data3.xml b/restconf/restconf-nb-bierman02/src/test/resources/full-versions/test-data2/data3.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/full-versions/test-data2/data3.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/full-versions/test-data2/data3.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/full-versions/test-data2/data4.xml b/restconf/restconf-nb-bierman02/src/test/resources/full-versions/test-data2/data4.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/full-versions/test-data2/data4.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/full-versions/test-data2/data4.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/full-versions/test-data2/data5.xml b/restconf/restconf-nb-bierman02/src/test/resources/full-versions/test-data2/data5.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/full-versions/test-data2/data5.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/full-versions/test-data2/data5.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/full-versions/test-data2/data6.xml b/restconf/restconf-nb-bierman02/src/test/resources/full-versions/test-data2/data6.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/full-versions/test-data2/data6.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/full-versions/test-data2/data6.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/full-versions/test-data2/data7.xml b/restconf/restconf-nb-bierman02/src/test/resources/full-versions/test-data2/data7.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/full-versions/test-data2/data7.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/full-versions/test-data2/data7.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/full-versions/test-module/test-module.yang b/restconf/restconf-nb-bierman02/src/test/resources/full-versions/test-module/test-module.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/full-versions/test-module/test-module.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/full-versions/test-module/test-module.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/full-versions/testCont1Data.json b/restconf/restconf-nb-bierman02/src/test/resources/full-versions/testCont1Data.json
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/full-versions/testCont1Data.json
rename to restconf/restconf-nb-bierman02/src/test/resources/full-versions/testCont1Data.json

diff --git a/restconf/sal-rest-connector/src/test/resources/full-versions/testData.json b/restconf/restconf-nb-bierman02/src/test/resources/full-versions/testData.json
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/full-versions/testData.json
rename to restconf/restconf-nb-bierman02/src/test/resources/full-versions/testData.json

diff --git a/restconf/sal-rest-connector/src/test/resources/full-versions/testData.xml b/restconf/restconf-nb-bierman02/src/test/resources/full-versions/testData.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/full-versions/testData.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/full-versions/testData.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/full-versions/yangs/ex-vlan.yang b/restconf/restconf-nb-bierman02/src/test/resources/full-versions/yangs/ex-vlan.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/full-versions/yangs/ex-vlan.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/full-versions/yangs/ex-vlan.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/full-versions/yangs/iana-if-type.yang b/restconf/restconf-nb-bierman02/src/test/resources/full-versions/yangs/iana-if-type.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/full-versions/yangs/iana-if-type.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/full-versions/yangs/iana-if-type.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/full-versions/yangs/ietf-interfaces@2013-07-04.yang b/restconf/restconf-nb-bierman02/src/test/resources/full-versions/yangs/ietf-interfaces@2013-07-04.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/full-versions/yangs/ietf-interfaces@2013-07-04.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/full-versions/yangs/ietf-interfaces@2013-07-04.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/full-versions/yangs/ietf-yang-types@2013-05-16.yang b/restconf/restconf-nb-bierman02/src/test/resources/full-versions/yangs/ietf-yang-types@2013-05-16.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/full-versions/yangs/ietf-yang-types@2013-05-16.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/full-versions/yangs/ietf-yang-types@2013-05-16.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/full-versions/yangs/sal-remote@2014-01-14.yang b/restconf/restconf-nb-bierman02/src/test/resources/full-versions/yangs/sal-remote@2014-01-14.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/full-versions/yangs/sal-remote@2014-01-14.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/full-versions/yangs/sal-remote@2014-01-14.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/full-versions/yangs/simple-nodes.yang b/restconf/restconf-nb-bierman02/src/test/resources/full-versions/yangs/simple-nodes.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/full-versions/yangs/simple-nodes.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/full-versions/yangs/simple-nodes.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/full-versions/yangs/subscribe-to-notification.yang b/restconf/restconf-nb-bierman02/src/test/resources/full-versions/yangs/subscribe-to-notification.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/full-versions/yangs/subscribe-to-notification.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/full-versions/yangs/subscribe-to-notification.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/full-versions/yangs/toaster.yang b/restconf/restconf-nb-bierman02/src/test/resources/full-versions/yangs/toaster.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/full-versions/yangs/toaster.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/full-versions/yangs/toaster.yang

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/restconf/sal-rest-connector/src/test/resources/json-to-nn/array-with-null.json b/restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/array-with-null.json
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/json-to-nn/array-with-null.json
rename to restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/array-with-null.json

diff --git a/restconf/sal-rest-connector/src/test/resources/json-to-nn/empty-data.json b/restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/empty-data.json
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/json-to-nn/empty-data.json
rename to restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/empty-data.json

diff --git a/restconf/sal-rest-connector/src/test/resources/json-to-nn/empty-data1.json b/restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/empty-data1.json
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/json-to-nn/empty-data1.json
rename to restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/empty-data1.json

diff --git a/restconf/sal-rest-connector/src/test/resources/json-to-nn/identityref/identity-module.yang b/restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/identityref/identity-module.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/json-to-nn/identityref/identity-module.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/identityref/identity-module.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/json-to-nn/identityref/identityref-module.yang b/restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/identityref/identityref-module.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/json-to-nn/identityref/identityref-module.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/identityref/identityref-module.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/json-to-nn/identityref/json/data.json b/restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/identityref/json/data.json
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/json-to-nn/identityref/json/data.json
rename to restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/identityref/json/data.json

diff --git a/restconf/sal-rest-connector/src/test/resources/json-to-nn/invalid-uri-character-in-value.json b/restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/invalid-uri-character-in-value.json
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/json-to-nn/invalid-uri-character-in-value.json
rename to restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/invalid-uri-character-in-value.json

diff --git a/restconf/sal-rest-connector/src/test/resources/json-to-nn/leafref/augment-leafref-module.yang b/restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/leafref/augment-leafref-module.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/json-to-nn/leafref/augment-leafref-module.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/leafref/augment-leafref-module.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/json-to-nn/leafref/json/data.json b/restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/leafref/json/data.json
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/json-to-nn/leafref/json/data.json
rename to restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/leafref/json/data.json

diff --git a/restconf/sal-rest-connector/src/test/resources/json-to-nn/leafref/leafref-module.yang b/restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/leafref/leafref-module.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/json-to-nn/leafref/leafref-module.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/leafref/leafref-module.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/json-to-nn/multiple-items-in-list.json b/restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/multiple-items-in-list.json
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/json-to-nn/multiple-items-in-list.json
rename to restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/multiple-items-in-list.json

diff --git a/restconf/sal-rest-connector/src/test/resources/json-to-nn/multiple-leaflist-items.json b/restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/multiple-leaflist-items.json
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/json-to-nn/multiple-leaflist-items.json
rename to restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/multiple-leaflist-items.json

diff --git a/restconf/sal-rest-connector/src/test/resources/json-to-nn/simple-container-yang/simple-container.yang b/restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/simple-container-yang/simple-container.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/json-to-nn/simple-container-yang/simple-container.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/simple-container-yang/simple-container.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/json-to-nn/simple-container.json b/restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/simple-container.json
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/json-to-nn/simple-container.json
rename to restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/simple-container.json

diff --git a/restconf/sal-rest-connector/src/test/resources/json-to-nn/simple-list-yang/1/simple-list1.yang b/restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/simple-list-yang/1/simple-list1.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/json-to-nn/simple-list-yang/1/simple-list1.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/simple-list-yang/1/simple-list1.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/json-to-nn/simple-list-yang/2/simple-list2.yang b/restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/simple-list-yang/2/simple-list2.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/json-to-nn/simple-list-yang/2/simple-list2.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/simple-list-yang/2/simple-list2.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/json-to-nn/simple-list-yang/3/multiple-items.yang b/restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/simple-list-yang/3/multiple-items.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/json-to-nn/simple-list-yang/3/multiple-items.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/simple-list-yang/3/multiple-items.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/json-to-nn/simple-list-yang/4/array-with-null.yang b/restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/simple-list-yang/4/array-with-null.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/json-to-nn/simple-list-yang/4/array-with-null.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/simple-list-yang/4/array-with-null.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/json-to-nn/simple-list.json b/restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/simple-list.json
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/json-to-nn/simple-list.json
rename to restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/simple-list.json

diff --git a/restconf/sal-rest-connector/src/test/resources/json-to-nn/unsupported-json-format.json b/restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/unsupported-json-format.json
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/json-to-nn/unsupported-json-format.json
rename to restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/unsupported-json-format.json

diff --git a/restconf/sal-rest-connector/src/test/resources/json-to-nn/wrong-top-level1.json b/restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/wrong-top-level1.json
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/json-to-nn/wrong-top-level1.json
rename to restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/wrong-top-level1.json

diff --git a/restconf/sal-rest-connector/src/test/resources/json-to-nn/wrong-top-level2.json b/restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/wrong-top-level2.json
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/json-to-nn/wrong-top-level2.json
rename to restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/wrong-top-level2.json

diff --git a/restconf/sal-rest-connector/src/test/resources/json-to-nn/wrong-top-level3.json b/restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/wrong-top-level3.json
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/json-to-nn/wrong-top-level3.json
rename to restconf/restconf-nb-bierman02/src/test/resources/json-to-nn/wrong-top-level3.json

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

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

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

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

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

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

diff --git a/restconf/sal-rest-connector/src/test/resources/leafref/json/jsondata.json b/restconf/restconf-nb-bierman02/src/test/resources/leafref/json/jsondata.json
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/leafref/json/jsondata.json
rename to restconf/restconf-nb-bierman02/src/test/resources/leafref/json/jsondata.json

diff --git a/restconf/sal-rest-connector/src/test/resources/leafref/xml/xmldata.xml b/restconf/restconf-nb-bierman02/src/test/resources/leafref/xml/xmldata.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/leafref/xml/xmldata.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/leafref/xml/xmldata.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/leafref/yang/leafref-module.yang b/restconf/restconf-nb-bierman02/src/test/resources/leafref/yang/leafref-module.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/leafref/yang/leafref-module.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/leafref/yang/leafref-module.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/leafref/yang/referenced-module.yang b/restconf/restconf-nb-bierman02/src/test/resources/leafref/yang/referenced-module.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/leafref/yang/referenced-module.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/leafref/yang/referenced-module.yang

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

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

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

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

diff --git a/restconf/sal-rest-connector/src/test/resources/modules/ietf-restconf@2013-10-19.yang b/restconf/restconf-nb-bierman02/src/test/resources/modules/ietf-restconf@2013-10-19.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/modules/ietf-restconf@2013-10-19.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/modules/ietf-restconf@2013-10-19.yang

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

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

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

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

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

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

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

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

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

diff --git a/restconf/sal-rest-connector/src/test/resources/modules/modules-behind-mount-point/ietf-restconf@2013-10-19.yang b/restconf/restconf-nb-bierman02/src/test/resources/modules/modules-behind-mount-point/ietf-restconf@2013-10-19.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/modules/modules-behind-mount-point/ietf-restconf@2013-10-19.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/modules/modules-behind-mount-point/ietf-restconf@2013-10-19.yang

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/restconf/sal-rest-connector/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-bierman02/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/sal-rest-connector/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-bierman02/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/sal-rest-connector/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-bierman02/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/sal-rest-connector/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-bierman02/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/sal-rest-connector/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-bierman02/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/sal-rest-connector/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-bierman02/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/sal-rest-connector/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-bierman02/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/sal-rest-connector/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-bierman02/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/sal-rest-connector/src/test/resources/modules/restconf-module-testing/ietf-inet-types.yang b/restconf/restconf-nb-bierman02/src/test/resources/modules/restconf-module-testing/ietf-inet-types.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/modules/restconf-module-testing/ietf-inet-types.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/modules/restconf-module-testing/ietf-inet-types.yang

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

diff --git a/restconf/sal-rest-connector/src/test/resources/modules/restconf-module-testing/ietf-yang-library@2016-06-21.yang b/restconf/restconf-nb-bierman02/src/test/resources/modules/restconf-module-testing/ietf-yang-library@2016-06-21.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/modules/restconf-module-testing/ietf-yang-library@2016-06-21.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/modules/restconf-module-testing/ietf-yang-library@2016-06-21.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/modules/restconf-module-testing/ietf-yang-types.yang b/restconf/restconf-nb-bierman02/src/test/resources/modules/restconf-module-testing/ietf-yang-types.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/modules/restconf-module-testing/ietf-yang-types.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/modules/restconf-module-testing/ietf-yang-types.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/multiple-nodes/multiple-nodes.yang b/restconf/restconf-nb-bierman02/src/test/resources/multiple-nodes/multiple-nodes.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/multiple-nodes/multiple-nodes.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/multiple-nodes/multiple-nodes.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/augmentation/augment-container.yang b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/augmentation/augment-container.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/augmentation/augment-container.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/augmentation/augment-container.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/augmentation/augment-leaf.yang b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/augmentation/augment-leaf.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/augmentation/augment-leaf.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/augmentation/augment-leaf.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/augmentation/augment-leaflist.yang b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/augmentation/augment-leaflist.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/augmentation/augment-leaflist.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/augmentation/augment-leaflist.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/augmentation/augment-list.yang b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/augmentation/augment-list.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/augmentation/augment-list.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/augmentation/augment-list.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/augmentation/xml/data.xml b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/augmentation/xml/data.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/augmentation/xml/data.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/augmentation/xml/data.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/augmentation/yang.yang b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/augmentation/yang.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/augmentation/yang.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/augmentation/yang.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/choice/choice.yang b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/choice/choice.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/choice/choice.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/choice/choice.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/choice/xml/data_case_defined_without_case.xml b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/choice/xml/data_case_defined_without_case.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/choice/xml/data_case_defined_without_case.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/choice/xml/data_case_defined_without_case.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/choice/xml/data_container.xml b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/choice/xml/data_container.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/choice/xml/data_container.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/choice/xml/data_container.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/choice/xml/data_leaflist.xml b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/choice/xml/data_leaflist.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/choice/xml/data_leaflist.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/choice/xml/data_leaflist.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/choice/xml/data_list.xml b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/choice/xml/data_list.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/choice/xml/data_list.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/choice/xml/data_list.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/choice/xml/data_more_choices_same_level.xml b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/choice/xml/data_more_choices_same_level.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/choice/xml/data_more_choices_same_level.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/choice/xml/data_more_choices_same_level.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/choice/xml/data_more_choices_same_level_various_paths_err.xml b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/choice/xml/data_more_choices_same_level_various_paths_err.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/choice/xml/data_more_choices_same_level_various_paths_err.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/choice/xml/data_more_choices_same_level_various_paths_err.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/choice/xml/data_no_first_case.xml b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/choice/xml/data_no_first_case.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/choice/xml/data_no_first_case.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/choice/xml/data_no_first_case.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/choice/xml/data_random_level.xml b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/choice/xml/data_random_level.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/choice/xml/data_random_level.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/choice/xml/data_random_level.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/choice/xml/data_three_choices_same_level.xml b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/choice/xml/data_three_choices_same_level.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/choice/xml/data_three_choices_same_level.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/choice/xml/data_three_choices_same_level.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/choice/xml/data_various_path_err.xml b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/choice/xml/data_various_path_err.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/choice/xml/data_various_path_err.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/choice/xml/data_various_path_err.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/data-of-several-modules/yang/module1.yang b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/data-of-several-modules/yang/module1.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/data-of-several-modules/yang/module1.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/data-of-several-modules/yang/module1.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/data-of-several-modules/yang/module2.yang b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/data-of-several-modules/yang/module2.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/data-of-several-modules/yang/module2.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/data-of-several-modules/yang/module2.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/identityref/identity-module.yang b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/identityref/identity-module.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/identityref/identity-module.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/identityref/identity-module.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/identityref/identityref-module.yang b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/identityref/identityref-module.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/identityref/identityref-module.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/identityref/identityref-module.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/invalid-top-level-element/invalid-top-level-element.yang b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/invalid-top-level-element/invalid-top-level-element.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/invalid-top-level-element/invalid-top-level-element.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/invalid-top-level-element/invalid-top-level-element.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/leafref/cont-augment-module.yang b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/leafref/cont-augment-module.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/leafref/cont-augment-module.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/leafref/cont-augment-module.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/leafref/main-module.yang b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/leafref/main-module.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/leafref/main-module.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/leafref/main-module.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/leafref/xml/data_absolut_ref_to_existing_leaf.xml b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/leafref/xml/data_absolut_ref_to_existing_leaf.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/leafref/xml/data_absolut_ref_to_existing_leaf.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/leafref/xml/data_absolut_ref_to_existing_leaf.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/leafref/xml/data_from_leafref_to_leafref.xml b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/leafref/xml/data_from_leafref_to_leafref.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/leafref/xml/data_from_leafref_to_leafref.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/leafref/xml/data_from_leafref_to_leafref.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/leafref/xml/data_ref_to_non_existing_leaf.xml b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/leafref/xml/data_ref_to_non_existing_leaf.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/leafref/xml/data_ref_to_non_existing_leaf.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/leafref/xml/data_ref_to_non_existing_leaf.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/leafref/xml/data_ref_to_not_leaf.xml b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/leafref/xml/data_ref_to_not_leaf.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/leafref/xml/data_ref_to_not_leaf.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/leafref/xml/data_ref_to_not_leaf.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/leafref/xml/data_relativ_ref_from_leaflist_to_existing_leaf.xml b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/leafref/xml/data_relativ_ref_from_leaflist_to_existing_leaf.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/leafref/xml/data_relativ_ref_from_leaflist_to_existing_leaf.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/leafref/xml/data_relativ_ref_from_leaflist_to_existing_leaf.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/leafref/xml/data_relativ_ref_to_existing_leaf.xml b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/leafref/xml/data_relativ_ref_to_existing_leaf.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/leafref/xml/data_relativ_ref_to_existing_leaf.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/leafref/xml/data_relativ_ref_to_existing_leaf.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/list/list-types-module b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/list/list-types-module
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/list/list-types-module
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/list/list-types-module

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/simple-data-types/simple-data-types.yang b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/simple-data-types/simple-data-types.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/simple-data-types/simple-data-types.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/simple-data-types/simple-data-types.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/simple-data-types/xml/bad-data.xml b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/simple-data-types/xml/bad-data.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/simple-data-types/xml/bad-data.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/simple-data-types/xml/bad-data.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/simple-data-types/xml/data.xml b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/simple-data-types/xml/data.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/simple-data-types/xml/data.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/simple-data-types/xml/data.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/simple-yang-types/simple-yang-types.yang b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/simple-yang-types/simple-yang-types.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/simple-yang-types/simple-yang-types.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/simple-yang-types/simple-yang-types.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/simple-yang-types/xml/awaited_output_data.json b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/simple-yang-types/xml/awaited_output_data.json
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/simple-yang-types/xml/awaited_output_data.json
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/simple-yang-types/xml/awaited_output_data.json

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/simple-yang-types/xml/awaited_output_empty_data.json b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/simple-yang-types/xml/awaited_output_empty_data.json
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/simple-yang-types/xml/awaited_output_empty_data.json
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/simple-yang-types/xml/awaited_output_empty_data.json

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/simple-yang-types/xml/data.xml b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/simple-yang-types/xml/data.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/simple-yang-types/xml/data.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/simple-yang-types/xml/data.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-json/simple-yang-types/xml/empty_data.xml b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/simple-yang-types/xml/empty_data.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-json/simple-yang-types/xml/empty_data.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-json/simple-yang-types/xml/empty_data.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-xml/choice/module-with-choice.yang b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-xml/choice/module-with-choice.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-xml/choice/module-with-choice.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-xml/choice/module-with-choice.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-xml/data-of-several-modules/yang/module1.yang b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-xml/data-of-several-modules/yang/module1.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-xml/data-of-several-modules/yang/module1.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-xml/data-of-several-modules/yang/module1.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-xml/data-of-several-modules/yang/module2.yang b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-xml/data-of-several-modules/yang/module2.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-xml/data-of-several-modules/yang/module2.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-xml/data-of-several-modules/yang/module2.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-xml/instance_identifier/aug-referenced-elements-module.yang b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-xml/instance_identifier/aug-referenced-elements-module.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-xml/instance_identifier/aug-referenced-elements-module.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-xml/instance_identifier/aug-referenced-elements-module.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-xml/instance_identifier/eferenced-elements-module.yang b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-xml/instance_identifier/eferenced-elements-module.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-xml/instance_identifier/eferenced-elements-module.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-xml/instance_identifier/eferenced-elements-module.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-xml/instance_identifier/rinstance-identifier-module.yang b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-xml/instance_identifier/rinstance-identifier-module.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-xml/instance_identifier/rinstance-identifier-module.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-xml/instance_identifier/rinstance-identifier-module.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-xml/yang/basic-module.yang b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-xml/yang/basic-module.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-xml/yang/basic-module.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-xml/yang/basic-module.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/nn-to-xml/yang/referenced-module.yang b/restconf/restconf-nb-bierman02/src/test/resources/nn-to-xml/yang/referenced-module.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/nn-to-xml/yang/referenced-module.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/nn-to-xml/yang/referenced-module.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/normalize-node/yang/normalize-node-module b/restconf/restconf-nb-bierman02/src/test/resources/normalize-node/yang/normalize-node-module
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/normalize-node/yang/normalize-node-module
rename to restconf/restconf-nb-bierman02/src/test/resources/normalize-node/yang/normalize-node-module

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

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

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

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

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

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

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

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

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

diff --git a/restconf/sal-rest-connector/src/test/resources/ordered/by/user/ordered-by-user-example.yang b/restconf/restconf-nb-bierman02/src/test/resources/ordered/by/user/ordered-by-user-example.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/ordered/by/user/ordered-by-user-example.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/ordered/by/user/ordered-by-user-example.yang

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

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

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

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

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

diff --git a/restconf/sal-rest-connector/src/test/resources/parts/ietf-interfaces_interfaces.json b/restconf/restconf-nb-bierman02/src/test/resources/parts/ietf-interfaces_interfaces.json
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/parts/ietf-interfaces_interfaces.json
rename to restconf/restconf-nb-bierman02/src/test/resources/parts/ietf-interfaces_interfaces.json

diff --git a/restconf/sal-rest-connector/src/test/resources/parts/ietf-interfaces_interfaces.xml b/restconf/restconf-nb-bierman02/src/test/resources/parts/ietf-interfaces_interfaces.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/parts/ietf-interfaces_interfaces.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/parts/ietf-interfaces_interfaces.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/parts/ietf-interfaces_interfaces2.xml b/restconf/restconf-nb-bierman02/src/test/resources/parts/ietf-interfaces_interfaces2.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/parts/ietf-interfaces_interfaces2.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/parts/ietf-interfaces_interfaces2.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/parts/ietf-interfaces_interfaces_absolute_path.json b/restconf/restconf-nb-bierman02/src/test/resources/parts/ietf-interfaces_interfaces_absolute_path.json
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/parts/ietf-interfaces_interfaces_absolute_path.json
rename to restconf/restconf-nb-bierman02/src/test/resources/parts/ietf-interfaces_interfaces_absolute_path.json

diff --git a/restconf/sal-rest-connector/src/test/resources/parts/ietf-interfaces_interfaces_absolute_path.xml b/restconf/restconf-nb-bierman02/src/test/resources/parts/ietf-interfaces_interfaces_absolute_path.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/parts/ietf-interfaces_interfaces_absolute_path.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/parts/ietf-interfaces_interfaces_absolute_path.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/parts/ietf-interfaces_interfaces_absolute_path2.xml b/restconf/restconf-nb-bierman02/src/test/resources/parts/ietf-interfaces_interfaces_absolute_path2.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/parts/ietf-interfaces_interfaces_absolute_path2.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/parts/ietf-interfaces_interfaces_absolute_path2.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/parts/ietf-interfaces_interfaces_interface_absolute_path.xml b/restconf/restconf-nb-bierman02/src/test/resources/parts/ietf-interfaces_interfaces_interface_absolute_path.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/parts/ietf-interfaces_interfaces_interface_absolute_path.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/parts/ietf-interfaces_interfaces_interface_absolute_path.xml

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/restconf/sal-rest-connector/src/test/resources/test-config-data/test-mount-point/yang/test-interface.yang b/restconf/restconf-nb-bierman02/src/test/resources/test-config-data/test-mount-point/yang/test-interface.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/test-config-data/test-mount-point/yang/test-interface.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/test-config-data/test-mount-point/yang/test-interface.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/test-config-data/test-mount-point/yang/test-interface2.yang b/restconf/restconf-nb-bierman02/src/test/resources/test-config-data/test-mount-point/yang/test-interface2.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/test-config-data/test-mount-point/yang/test-interface2.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/test-config-data/test-mount-point/yang/test-interface2.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/test-config-data/xml/block-data.xml b/restconf/restconf-nb-bierman02/src/test/resources/test-config-data/xml/block-data.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/test-config-data/xml/block-data.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/test-config-data/xml/block-data.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/test-config-data/xml/data2.xml b/restconf/restconf-nb-bierman02/src/test/resources/test-config-data/xml/data2.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/test-config-data/xml/data2.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/test-config-data/xml/data2.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/test-config-data/xml/test-interface.xml b/restconf/restconf-nb-bierman02/src/test/resources/test-config-data/xml/test-interface.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/test-config-data/xml/test-interface.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/test-config-data/xml/test-interface.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/test-config-data/xml/test-interface2.xml b/restconf/restconf-nb-bierman02/src/test/resources/test-config-data/xml/test-interface2.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/test-config-data/xml/test-interface2.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/test-config-data/xml/test-interface2.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/test-config-data/xml/test-interface3.xml b/restconf/restconf-nb-bierman02/src/test/resources/test-config-data/xml/test-interface3.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/test-config-data/xml/test-interface3.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/test-config-data/xml/test-interface3.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/test-config-data/yang1/test-interface.yang b/restconf/restconf-nb-bierman02/src/test/resources/test-config-data/yang1/test-interface.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/test-config-data/yang1/test-interface.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/test-config-data/yang1/test-interface.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/test-config-data/yang2/test-interface2.yang b/restconf/restconf-nb-bierman02/src/test/resources/test-config-data/yang2/test-interface2.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/test-config-data/yang2/test-interface2.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/test-config-data/yang2/test-interface2.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/varioustest/xmldata.xml b/restconf/restconf-nb-bierman02/src/test/resources/varioustest/xmldata.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/varioustest/xmldata.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/varioustest/xmldata.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/data-container-yang/data-container.yang b/restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/data-container-yang/data-container.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/data-container-yang/data-container.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/data-container-yang/data-container.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/data-container.xml b/restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/data-container.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/data-container.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/data-container.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/data-list-yang/data-container.yang b/restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/data-list-yang/data-container.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/data-list-yang/data-container.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/data-list-yang/data-container.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/data-list-yang/data-list.yang b/restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/data-list-yang/data-list.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/data-list-yang/data-list.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/data-list-yang/data-list.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/data-list.xml b/restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/data-list.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/data-list.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/data-list.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/data-nmspc-in-attributes.xml b/restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/data-nmspc-in-attributes.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/data-nmspc-in-attributes.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/data-nmspc-in-attributes.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/data-of-several-modules/yang/module1.yang b/restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/data-of-several-modules/yang/module1.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/data-of-several-modules/yang/module1.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/data-of-several-modules/yang/module1.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/data-of-several-modules/yang/module2.yang b/restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/data-of-several-modules/yang/module2.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/data-of-several-modules/yang/module2.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/data-of-several-modules/yang/module2.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/empty-data.xml b/restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/empty-data.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/empty-data.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/empty-data.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/identity-module.yang b/restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/identityref/identity-module.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/identity-module.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/identityref/identity-module.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/identityref-module.yang b/restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/identityref/identityref-module.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/identityref-module.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/identityref/identityref-module.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-default-nmspc-in-element.xml b/restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/identityref/xml/data-default-nmspc-in-element.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-default-nmspc-in-element.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/identityref/xml/data-default-nmspc-in-element.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-default-nmspc-in-parrent-element.xml b/restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/identityref/xml/data-default-nmspc-in-parrent-element.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-default-nmspc-in-parrent-element.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/identityref/xml/data-default-nmspc-in-parrent-element.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-nmspc-in-element.xml b/restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/identityref/xml/data-nmspc-in-element.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-nmspc-in-element.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/identityref/xml/data-nmspc-in-element.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-nmspc-in-parrent-element.xml b/restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/identityref/xml/data-nmspc-in-parrent-element.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-nmspc-in-parrent-element.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/identityref/xml/data-nmspc-in-parrent-element.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-no-nmspc-value-with-prefix.xml b/restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/identityref/xml/data-no-nmspc-value-with-prefix.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-no-nmspc-value-with-prefix.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/identityref/xml/data-no-nmspc-value-with-prefix.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-no-nmspc-value-without-prefix.xml b/restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/identityref/xml/data-no-nmspc-value-without-prefix.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-no-nmspc-value-without-prefix.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/identityref/xml/data-no-nmspc-value-without-prefix.xml

diff --git a/restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/yang-augments/general-module.yang b/restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/identityref/yang-augments/general-module.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/yang-augments/general-module.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/identityref/yang-augments/general-module.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/yang-augments/identity-module.yang b/restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/identityref/yang-augments/identity-module.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/yang-augments/identity-module.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/identityref/yang-augments/identity-module.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/yang-augments/identityref-module.yang b/restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/identityref/yang-augments/identityref-module.yang
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/yang-augments/identityref-module.yang
rename to restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/identityref/yang-augments/identityref-module.yang

diff --git a/restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/leafref/leafref-module b/restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/leafref/leafref-module
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/leafref/leafref-module
rename to restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/leafref/leafref-module

diff --git a/restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/leafref/xml/data.xml b/restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/leafref/xml/data.xml
similarity index 100%
rename from restconf/sal-rest-connector/src/test/resources/xml-to-cnsn/leafref/xml/data.xml
rename to restconf/restconf-nb-bierman02/src/test/resources/xml-to-cnsn/leafref/xml/data.xml

diff --git a/restconf/restconf-nb-rfc8040/pom.xml b/restconf/restconf-nb-rfc8040/pom.xml
new file mode 100644 (file)
index 0000000..3752e0b
--- /dev/null
+++ b/restconf/restconf-nb-rfc8040/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Pantheon Technologies s.r.o. and others.  All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.12.0-SNAPSHOT</version>
+    <relativePath/>
+  </parent>
+
+  <groupId>org.opendaylight.netconf</groupId>
+  <artifactId>restconf-nb-rfc8040</artifactId>
+  <version>1.7.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
+</project>