From 33374bb6c303507a31e9e014d8ecd8db38570e67 Mon Sep 17 00:00:00 2001
From: Martin Vitez <mvitez@cisco.com>
Date: Wed, 31 Jul 2013 11:36:51 +0200
Subject: [PATCH] Added more tests. Fixed javadocs.

Changed antlr generated code directory from org.opendaylight.controller to org.opendaylight.yangtools.

Change-Id: Ief5b41b6c0200df3f6085e01d5d0060270eefc9e
Signed-off-by: Martin Vitez <mvitez@cisco.com>
---
 pom.xml                                       |   3 +-
 .../yang/data/impl/AbstractNodeTO.java        |   2 +-
 .../yang/data/impl/LazyNodeToNodeMapTest.java |   5 +-
 .../yang/data/impl/NodeFactoryTest.java       |   2 +-
 .../impl/NodeModificationBuilderImplTest.java |  20 +-
 .../yang/data/impl/NodeUtilsTest.java         |  12 +-
 .../src/test/resources/log4j-test.xml         |   4 +-
 .../yang/data/util/AbstractNode.java          |   2 +-
 .../yangtools/yang/data/util/Nodes.java       |   4 +-
 yang-ext/pom.xml                              |   2 +-
 .../plugin/it/YangToSourcesPluginTestIT.java  |  22 +-
 .../test/resources/AdditionalConfig/pom.xml   |   2 +-
 .../src/test/resources/Correct/pom.xml        |   2 +-
 .../src/test/resources/GenerateTest1/pom.xml  |   2 +-
 .../src/test/resources/GenerateTest2/pom.xml  |   2 +-
 .../src/test/resources/Generator/pom.xml      |   2 +-
 .../test/resources/MissingYangInDep/pom.xml   |   2 +-
 .../src/test/resources/NoGenerators/pom.xml   |   2 +-
 .../src/test/resources/NoOutputDir/pom.xml    |   2 +-
 .../src/test/resources/NoYangFiles/pom.xml    |   2 +-
 .../test/resources/UnknownGenerator/pom.xml   |   2 +-
 .../test/resources/YangRootNotExist/pom.xml   |   2 +-
 .../yang/model/api/package-info.java          | 356 +++++++++---------
 .../yangtools/yang/model/util/BinaryType.java |  18 +-
 .../yangtools/yang/model/util/BitsType.java   |  16 +-
 .../yang/model/util/BooleanType.java          |  16 +-
 .../yang/model/util/EnumerationType.java      |  18 +-
 .../yang/model/util/InstanceIdentifier.java   |  22 +-
 .../yangtools/yang/model/util/Int32.java      |   4 +-
 .../yangtools/yang/model/util/Int64.java      |   4 +-
 .../yangtools/yang/model/util/Int8.java       |   4 +-
 .../yangtools/yang/model/util/Leafref.java    |  20 +-
 .../yangtools/yang/model/util/StringType.java |  16 +-
 .../yangtools/yang/model/util/Uint16.java     |   4 +-
 .../yangtools/yang/model/util/Uint32.java     |   4 +-
 .../yangtools/yang/model/util/Uint64.java     |   4 +-
 .../yangtools/yang/model/util/Uint8.java      |   4 +-
 .../yang/model/util/UnknownType.java          |  26 +-
 yang-parser-impl/pom.xml                      |   4 +-
 yang-parser-impl/src/main/antlr/YangLexer.g4  |   2 +-
 yang-parser-impl/src/main/antlr/YangParser.g4 |   2 +-
 .../yang/parser/impl/YangParserImpl.java      |   4 +-
 .../parser/impl/YangParserListenerImpl.java   |  62 +--
 .../yang/parser/util/ParserListenerUtils.java | 110 +++---
 .../yang/validator/BasicValidations.java      |   2 +-
 .../yang/validator/ValidationUtil.java        |   4 +-
 .../YangModelBasicValidationListener.java     |  88 ++---
 .../parser/impl/YangParserSimpleTest.java     | 114 +++++-
 .../yang/parser/impl/YangParserTest.java      |  66 ----
 .../YangModelValidationListTest.java          |  16 +-
 .../YangModelValidationModuleTest.java        |  12 +-
 .../YangModelValidationSubModuleTest.java     |   6 +-
 .../validator/YangModelValidationTest.java    |  24 +-
 .../resources/simple-test/simple-nodes.yang   |  87 ++++-
 .../pom.xml                                   |   3 +-
 .../yang2sources/plugin/ConfigArg.java        |   0
 .../yangtools/yang2sources/plugin/Util.java   |   0
 .../plugin/YangToSourcesMojo.java             |   0
 .../plugin/YangToSourcesProcessor.java        |   0
 .../plugin/GenerateSourcesTest.java           |   0
 .../yang2sources/plugin/UtilTest.java         |   0
 .../src/test/resources/yang/mock.yang         |   0
 62 files changed, 683 insertions(+), 559 deletions(-)
 rename {yang-maven-plugin => yangtools-maven-plugin}/pom.xml (97%)
 rename {yang-maven-plugin => yangtools-maven-plugin}/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ConfigArg.java (100%)
 rename {yang-maven-plugin => yangtools-maven-plugin}/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/Util.java (100%)
 rename {yang-maven-plugin => yangtools-maven-plugin}/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojo.java (100%)
 rename {yang-maven-plugin => yangtools-maven-plugin}/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java (100%)
 rename {yang-maven-plugin => yangtools-maven-plugin}/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java (100%)
 rename {yang-maven-plugin => yangtools-maven-plugin}/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/UtilTest.java (100%)
 rename {yang-maven-plugin => yangtools-maven-plugin}/src/test/resources/yang/mock.yang (100%)

diff --git a/pom.xml b/pom.xml
index aa3b8cd87d..ad27ef81a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
         <module>yang-data-impl</module>
         <module>yang-ext</module>
         <module>yang-model-api</module>
-        <module>yang-maven-plugin</module>
+        <module>yangtools-maven-plugin</module>
         <module>yang-maven-plugin-it</module>
         <module>yang-maven-plugin-spi</module>
         <module>yang-model-util</module>
@@ -129,6 +129,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.9.1</version>
                 <configuration>
                     <stylesheet>maven</stylesheet>
                 </configuration>
diff --git a/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/AbstractNodeTO.java b/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/AbstractNodeTO.java
index 679530e90a..d84696d13d 100644
--- a/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/AbstractNodeTO.java
+++ b/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/AbstractNodeTO.java
@@ -88,7 +88,7 @@ public abstract class AbstractNodeTO<T> implements Node<T>, NodeModification {
 
     /**
      * @return modification action
-     * @see org.opendaylight.controller.yang.data.impl.NodeModificationSupport#getModificationAction()
+     * @see org.opendaylight.yangtools.yang.data.impl.NodeModificationSupport#getModificationAction()
      */
     @Override
     public ModifyAction getModificationAction() {
diff --git a/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMapTest.java b/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMapTest.java
index 35fa18a02c..656cfb949d 100755
--- a/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMapTest.java
+++ b/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMapTest.java
@@ -17,7 +17,6 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.CompositeNode;
 import org.opendaylight.yangtools.yang.data.api.MutableCompositeNode;
 import org.opendaylight.yangtools.yang.data.api.Node;
-import org.opendaylight.yangtools.yang.data.impl.LazyNodeToNodeMap;
 
 /**
  * @author michal.rehak
@@ -44,7 +43,7 @@ public class LazyNodeToNodeMapTest {
     }
 
     /**
-     * Test method for {@link org.opendaylight.controller.yang.data.impl.LazyNodeToNodeMap#getMutableEquivalent(org.opendaylight.controller.yang.data.api.Node)}.
+     * Test method for {@link org.opendaylight.yangtools.yang.data.impl.LazyNodeToNodeMap#getMutableEquivalent(org.opendaylight.yangtools.yang.data.api.Node)}.
      */
     @Test
     public void testGetMutableEquivalent() {
@@ -67,7 +66,7 @@ public class LazyNodeToNodeMapTest {
     }
 
     /**
-     * Test method for {@link org.opendaylight.controller.yang.data.impl.LazyNodeToNodeMap#getMutableRoot()}.
+     * Test method for {@link org.opendaylight.yangtools.yang.data.impl.LazyNodeToNodeMap#getMutableRoot()}.
      */
     @Test
     public void testGetMutableRoot() {
diff --git a/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeFactoryTest.java b/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeFactoryTest.java
index 22fbe76c23..32611bb3b6 100644
--- a/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeFactoryTest.java
+++ b/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeFactoryTest.java
@@ -55,7 +55,7 @@ public class NodeFactoryTest {
 
     /**
      * Test method for methods creating immutable nodes in
-     * {@link org.opendaylight.controller.yang.data.impl.NodeFactory}.
+     * {@link org.opendaylight.yangtools.yang.data.impl.NodeFactory}.
      * @throws Exception
      */
     @Test
diff --git a/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImplTest.java b/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImplTest.java
index 2a92197248..c6558f6227 100644
--- a/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImplTest.java
+++ b/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImplTest.java
@@ -71,7 +71,7 @@ public class NodeModificationBuilderImplTest {
 
     /**
      * Test method for
-     * {@link org.opendaylight.controller.yang.data.impl.NodeModificationBuilderImpl#getMutableEquivalent(org.opendaylight.controller.yang.data.api.Node)}
+     * {@link org.opendaylight.yangtools.yang.data.impl.NodeModificationBuilderImpl#getMutableEquivalent(org.opendaylight.yangtools.yang.data.api.Node)}
      * .
      */
     @Test
@@ -88,7 +88,7 @@ public class NodeModificationBuilderImplTest {
 
     /**
      * Test method for
-     * {@link org.opendaylight.controller.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}
+     * {@link org.opendaylight.yangtools.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}
      * .
      * @throws Exception
      */
@@ -112,7 +112,7 @@ public class NodeModificationBuilderImplTest {
 
     /**
      * Test method for
-     * {@link org.opendaylight.controller.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}
+     * {@link org.opendaylight.yangtools.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}
      * .
      * @throws Exception
      */
@@ -142,7 +142,7 @@ public class NodeModificationBuilderImplTest {
 
     /**
      * Test method for
-     * {@link org.opendaylight.controller.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}
+     * {@link org.opendaylight.yangtools.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}
      * .
      * @throws Exception
      */
@@ -164,7 +164,7 @@ public class NodeModificationBuilderImplTest {
 
     /**
      * Test method for
-     * {@link org.opendaylight.controller.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}
+     * {@link org.opendaylight.yangtools.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}
      * .
      * @throws Exception
      */
@@ -186,7 +186,7 @@ public class NodeModificationBuilderImplTest {
 
     /**
      * Test method for
-     * {@link org.opendaylight.controller.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}
+     * {@link org.opendaylight.yangtools.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}
      * .
      * @throws Exception
      */
@@ -209,7 +209,7 @@ public class NodeModificationBuilderImplTest {
 
     /**
      * Test method for
-     * {@link org.opendaylight.controller.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}
+     * {@link org.opendaylight.yangtools.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}
      * .
      * @throws Exception
      */
@@ -231,7 +231,7 @@ public class NodeModificationBuilderImplTest {
 
     /**
      * Test method for
-     * {@link org.opendaylight.controller.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}
+     * {@link org.opendaylight.yangtools.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}
      * .
      * @throws Exception
      */
@@ -253,7 +253,7 @@ public class NodeModificationBuilderImplTest {
 
     /**
      * Test method for
-     * {@link org.opendaylight.controller.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}
+     * {@link org.opendaylight.yangtools.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}
      * .
      * @throws Exception
      */
@@ -276,7 +276,7 @@ public class NodeModificationBuilderImplTest {
 
     /**
      * Test method for
-     * {@link org.opendaylight.controller.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}
+     * {@link org.opendaylight.yangtools.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}
      * .
      * @throws Exception
      */
diff --git a/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java b/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java
index 994eac6652..61f5632b67 100644
--- a/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java
+++ b/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java
@@ -55,7 +55,7 @@ public class NodeUtilsTest {
     }
 
     /**
-     * Test method for {@link org.opendaylight.controller.yang.data.impl.NodeUtils#buildPath(org.opendaylight.controller.yang.data.api.Node)}.
+     * Test method for {@link org.opendaylight.yangtools.yang.data.impl.NodeUtils#buildPath(org.opendaylight.yangtools.yang.data.api.Node)}.
      * @throws Exception
      */
     @Test
@@ -69,7 +69,7 @@ public class NodeUtilsTest {
     }
 
     /**
-     * Test method for {@link org.opendaylight.controller.yang.data.impl.NodeUtils#buildShadowDomTree(org.opendaylight.controller.yang.data.api.CompositeNode)}.
+     * Test method for {@link org.opendaylight.yangtools.yang.data.impl.NodeUtils#buildShadowDomTree(org.opendaylight.yangtools.yang.data.api.CompositeNode)}.
      * @throws Exception
      */
     @Test
@@ -84,7 +84,7 @@ public class NodeUtilsTest {
     }
 
     /**
-     * Test method for {@link org.opendaylight.controller.yang.data.impl.NodeUtils#findNodeByXpath(org.w3c.dom.Document, java.lang.String)}.
+     * Test method for {@link org.opendaylight.yangtools.yang.data.impl.NodeUtils#findNodeByXpath(org.w3c.dom.Document, java.lang.String)}.
      * @throws Exception
      */
     @Test
@@ -104,7 +104,7 @@ public class NodeUtilsTest {
     }
 
     /**
-     * Test method for {@link org.opendaylight.controller.yang.data.impl.NodeUtils#buildNodeMap(java.util.List)}.
+     * Test method for {@link org.opendaylight.yangtools.yang.data.impl.NodeUtils#buildNodeMap(java.util.List)}.
      */
     @Test
     public void testBuildNodeMap() {
@@ -116,7 +116,7 @@ public class NodeUtilsTest {
     }
 
     /**
-     * Test method for {@link org.opendaylight.controller.yang.data.impl.NodeUtils#buildMapOfListNodes(org.opendaylight.controller.yang.model.api.SchemaContext)}.
+     * Test method for {@link org.opendaylight.yangtools.yang.data.impl.NodeUtils#buildMapOfListNodes(org.opendaylight.yangtools.yang.model.api.SchemaContext)}.
      */
     @Test
     public void testBuildMapOfListNodes() {
@@ -126,7 +126,7 @@ public class NodeUtilsTest {
     }
 
     /**
-     * Test method for {@link org.opendaylight.controller.yang.data.impl.NodeUtils#buildMapOfListNodes(org.opendaylight.controller.yang.model.api.SchemaContext)}.
+     * Test method for {@link org.opendaylight.yangtools.yang.data.impl.NodeUtils#buildMapOfListNodes(org.opendaylight.yangtools.yang.model.api.SchemaContext)}.
      * @throws Exception
      * @throws IOException
      */
diff --git a/yang-data-impl/src/test/resources/log4j-test.xml b/yang-data-impl/src/test/resources/log4j-test.xml
index 189236a783..5895f8ce2a 100755
--- a/yang-data-impl/src/test/resources/log4j-test.xml
+++ b/yang-data-impl/src/test/resources/log4j-test.xml
@@ -8,11 +8,11 @@
        </layout>
     </appender>	
 
-    <logger name="org.opendaylight.controller.yang.data.impl" additivity="false">
+    <logger name="org.opendaylight.yangtools.yang.data.impl" additivity="false">
 	    <level value="DEBUG" />
 	    <appender-ref ref="console"/>
 	</logger>
-    <logger name="org.opendaylight.controller.yang.data.impl.MyNodeBuilder" additivity="false">
+    <logger name="org.opendaylight.yangtools.yang.data.impl.MyNodeBuilder" additivity="false">
         <level value="INFO" />
         <appender-ref ref="console"/>
     </logger>   
diff --git a/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNode.java b/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNode.java
index 86195af68c..72b8bbc812 100644
--- a/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNode.java
+++ b/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNode.java
@@ -33,7 +33,7 @@ public abstract class AbstractNode<T> implements Node<T> {
     /* (non-Javadoc)
      */
     /**
-     * @see org.opendaylight.controller.yang.data.api.NodeModification#getModificationAction()
+     * @see org.opendaylight.yangtools.yang.data.api.NodeModification#getModificationAction()
      */
     public ModifyAction getModificationAction() {
         // TODO Auto-generated method stub
diff --git a/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/Nodes.java b/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/Nodes.java
index d9c2b45135..6626e1ba0f 100644
--- a/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/Nodes.java
+++ b/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/Nodes.java
@@ -75,7 +75,7 @@ public class Nodes {
         }
 
         /* (non-Javadoc)
-         * @see org.opendaylight.controller.yang.data.api.CompositeNode#asMutable()
+         * @see org.opendaylight.yangtools.yang.data.api.CompositeNode#asMutable()
          */
         @Override
         public MutableCompositeNode asMutable() {
@@ -102,7 +102,7 @@ public class Nodes {
         }
 
         /* (non-Javadoc)
-         * @see org.opendaylight.controller.yang.data.api.SimpleNode#asMutable()
+         * @see org.opendaylight.yangtools.yang.data.api.SimpleNode#asMutable()
          */
         @Override
         public MutableSimpleNode<T> asMutable() {
diff --git a/yang-ext/pom.xml b/yang-ext/pom.xml
index 8724d3dbe8..0d580dbe9e 100644
--- a/yang-ext/pom.xml
+++ b/yang-ext/pom.xml
@@ -17,7 +17,7 @@
         <plugins>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
+                <artifactId>yangtools-maven-plugin</artifactId>
                 <version>0.5.4-SNAPSHOT</version>
                 <executions>
                     <execution>
diff --git a/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java b/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java
index 2660a2cd4e..3aef2f4378 100644
--- a/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java
+++ b/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java
@@ -15,10 +15,8 @@ import java.net.URL;
 
 import org.apache.maven.it.VerificationException;
 import org.apache.maven.it.Verifier;
-import org.junit.Ignore;
 import org.junit.Test;
 
-@Ignore
 public class YangToSourcesPluginTestIT {
 
     // TODO Test yang files in transitive dependencies
@@ -48,13 +46,13 @@ public class YangToSourcesPluginTestIT {
     @Test
     public void testAdditionalConfiguration() throws VerificationException {
         Verifier v = setUp("AdditionalConfig/", false);
-        v.verifyTextInLog("[DEBUG] yang-to-sources: Additional configuration picked up for : org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl: {nm1=abcd=a.b.c.d, nm2=abcd2=a.b.c.d.2}");
-        v.verifyTextInLog("[DEBUG] yang-to-sources: Additional configuration picked up for : org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl: {c1=config}");
+        v.verifyTextInLog("[DEBUG] yang-to-sources: Additional configuration picked up for : org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl: {nm1=abcd=a.b.c.d, nm2=abcd2=a.b.c.d.2}");
+        v.verifyTextInLog("[DEBUG] yang-to-sources: Additional configuration picked up for : org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl: {c1=config}");
         v.verifyTextInLog(File.separator
                 + "files marked as resources: META-INF/yang");
         v.verifyTextInLog("target"
                 + File.separator
-                + "generated-resources marked as resources for generator: org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl");
+                + "generated-resources marked as resources for generator: org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl");
     }
 
     @Test
@@ -64,7 +62,7 @@ public class YangToSourcesPluginTestIT {
         } catch (VerificationException e) {
             assertVerificationException(
                     e,
-                    "org.opendaylight.controller.yang.parser.util.YangValidationException: Not existing module imported:unknownDep:2013-02-27 by:private:2013-02-27");
+                    "org.opendaylight.yangtools.yang.parser.util.YangValidationException: Not existing module imported:unknownDep:2013-02-27 by:private:2013-02-27");
             return;
         }
 
@@ -74,8 +72,8 @@ public class YangToSourcesPluginTestIT {
     static void verifyCorrectLog(Verifier v) throws VerificationException {
         v.verifyErrorFreeLog();
         v.verifyTextInLog("[INFO] yang-to-sources: YANG files parsed from");
-        v.verifyTextInLog("[INFO] yang-to-sources: Code generator instantiated from org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl");
-        v.verifyTextInLog("[INFO] yang-to-sources: Sources generated by org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl: null");
+        v.verifyTextInLog("[INFO] yang-to-sources: Code generator instantiated from org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl");
+        v.verifyTextInLog("[INFO] yang-to-sources: Sources generated by org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl: null");
     }
 
     @Test
@@ -90,8 +88,8 @@ public class YangToSourcesPluginTestIT {
         Verifier v = setUp("UnknownGenerator/", true);
         v.verifyTextInLog("[ERROR] yang-to-sources: Unable to generate sources with unknown generator");
         v.verifyTextInLog("java.lang.ClassNotFoundException: unknown");
-        v.verifyTextInLog("[INFO] yang-to-sources: Code generator instantiated from org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl");
-        v.verifyTextInLog("[INFO] yang-to-sources: Sources generated by org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl: null");
+        v.verifyTextInLog("[INFO] yang-to-sources: Code generator instantiated from org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl");
+        v.verifyTextInLog("[INFO] yang-to-sources: Sources generated by org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl: null");
         v.verifyTextInLog("[ERROR] yang-to-sources: One or more code generators failed, including failed list(generatorClass=exception) {unknown=java.lang.ClassNotFoundException}");
     }
 
@@ -99,8 +97,8 @@ public class YangToSourcesPluginTestIT {
     public void testNoYangFiles() throws VerificationException {
         Verifier v = setUp("NoYangFiles/", false);
         v.verifyTextInLog("[INFO] yang-to-sources: YANG files parsed from []");
-        v.verifyTextInLog("[INFO] yang-to-sources: Code generator instantiated from org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl");
-        v.verifyTextInLog("[INFO] yang-to-sources: Sources generated by org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl: null");
+        v.verifyTextInLog("[INFO] yang-to-sources: Code generator instantiated from org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl");
+        v.verifyTextInLog("[INFO] yang-to-sources: Sources generated by org.opendaylight.yangtools.yang2sources.spi.CodeGeneratorTestImpl: null");
     }
 
     static void assertVerificationException(VerificationException e,
diff --git a/yang-maven-plugin-it/src/test/resources/AdditionalConfig/pom.xml b/yang-maven-plugin-it/src/test/resources/AdditionalConfig/pom.xml
index 80b7c165d2..8088f27846 100644
--- a/yang-maven-plugin-it/src/test/resources/AdditionalConfig/pom.xml
+++ b/yang-maven-plugin-it/src/test/resources/AdditionalConfig/pom.xml
@@ -18,7 +18,7 @@
         <plugins>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
+                <artifactId>yangtools-maven-plugin</artifactId>
                 <version>0.5.4-SNAPSHOT</version>
                 <executions>
                     <execution>
diff --git a/yang-maven-plugin-it/src/test/resources/Correct/pom.xml b/yang-maven-plugin-it/src/test/resources/Correct/pom.xml
index fb8f67d4f7..d13f93632a 100644
--- a/yang-maven-plugin-it/src/test/resources/Correct/pom.xml
+++ b/yang-maven-plugin-it/src/test/resources/Correct/pom.xml
@@ -18,7 +18,7 @@
         <plugins>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
+                <artifactId>yangtools-maven-plugin</artifactId>
                 <version>0.5.4-SNAPSHOT</version>
                 <executions>
                     <execution>
diff --git a/yang-maven-plugin-it/src/test/resources/GenerateTest1/pom.xml b/yang-maven-plugin-it/src/test/resources/GenerateTest1/pom.xml
index 260ec39829..a828bbef12 100644
--- a/yang-maven-plugin-it/src/test/resources/GenerateTest1/pom.xml
+++ b/yang-maven-plugin-it/src/test/resources/GenerateTest1/pom.xml
@@ -10,7 +10,7 @@
         <plugins>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
+                <artifactId>yangtools-maven-plugin</artifactId>
                 <version>0.5.4-SNAPSHOT</version>
                 <executions>
                     <execution>
diff --git a/yang-maven-plugin-it/src/test/resources/GenerateTest2/pom.xml b/yang-maven-plugin-it/src/test/resources/GenerateTest2/pom.xml
index ca209d935b..bb004ba31b 100644
--- a/yang-maven-plugin-it/src/test/resources/GenerateTest2/pom.xml
+++ b/yang-maven-plugin-it/src/test/resources/GenerateTest2/pom.xml
@@ -21,7 +21,7 @@
         <plugins>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
+                <artifactId>yangtools-maven-plugin</artifactId>
                 <version>0.5.4-SNAPSHOT</version>
                 <executions>
                     <execution>
diff --git a/yang-maven-plugin-it/src/test/resources/Generator/pom.xml b/yang-maven-plugin-it/src/test/resources/Generator/pom.xml
index d76ac2d51b..b81ab8ef69 100644
--- a/yang-maven-plugin-it/src/test/resources/Generator/pom.xml
+++ b/yang-maven-plugin-it/src/test/resources/Generator/pom.xml
@@ -12,7 +12,7 @@
         <plugins>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
+                <artifactId>yangtools-maven-plugin</artifactId>
                 <version>0.5.4-SNAPSHOT</version>
                 <executions>
                     <execution>
diff --git a/yang-maven-plugin-it/src/test/resources/MissingYangInDep/pom.xml b/yang-maven-plugin-it/src/test/resources/MissingYangInDep/pom.xml
index a9f5b51304..ec30ceb060 100644
--- a/yang-maven-plugin-it/src/test/resources/MissingYangInDep/pom.xml
+++ b/yang-maven-plugin-it/src/test/resources/MissingYangInDep/pom.xml
@@ -11,7 +11,7 @@
         <plugins>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
+                <artifactId>yangtools-maven-plugin</artifactId>
                 <version>0.5.4-SNAPSHOT</version>
                 <executions>
                     <execution>
diff --git a/yang-maven-plugin-it/src/test/resources/NoGenerators/pom.xml b/yang-maven-plugin-it/src/test/resources/NoGenerators/pom.xml
index f98e6a5d90..fb18c394ce 100644
--- a/yang-maven-plugin-it/src/test/resources/NoGenerators/pom.xml
+++ b/yang-maven-plugin-it/src/test/resources/NoGenerators/pom.xml
@@ -10,7 +10,7 @@
         <plugins>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
+                <artifactId>yangtools-maven-plugin</artifactId>
                 <version>0.5.4-SNAPSHOT</version>
                 <executions>
                     <execution>
diff --git a/yang-maven-plugin-it/src/test/resources/NoOutputDir/pom.xml b/yang-maven-plugin-it/src/test/resources/NoOutputDir/pom.xml
index fe95c07a2f..bfffa1aba7 100644
--- a/yang-maven-plugin-it/src/test/resources/NoOutputDir/pom.xml
+++ b/yang-maven-plugin-it/src/test/resources/NoOutputDir/pom.xml
@@ -11,7 +11,7 @@
         <plugins>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
+                <artifactId>yangtools-maven-plugin</artifactId>
                 <version>0.5.4-SNAPSHOT</version>
                 <executions>
                     <execution>
diff --git a/yang-maven-plugin-it/src/test/resources/NoYangFiles/pom.xml b/yang-maven-plugin-it/src/test/resources/NoYangFiles/pom.xml
index d16fca0723..ad60905aa9 100644
--- a/yang-maven-plugin-it/src/test/resources/NoYangFiles/pom.xml
+++ b/yang-maven-plugin-it/src/test/resources/NoYangFiles/pom.xml
@@ -11,7 +11,7 @@
         <plugins>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
+                <artifactId>yangtools-maven-plugin</artifactId>
                 <version>0.5.4-SNAPSHOT</version>
                 <executions>
                     <execution>
diff --git a/yang-maven-plugin-it/src/test/resources/UnknownGenerator/pom.xml b/yang-maven-plugin-it/src/test/resources/UnknownGenerator/pom.xml
index 3ac4e5c735..2aa5090c25 100644
--- a/yang-maven-plugin-it/src/test/resources/UnknownGenerator/pom.xml
+++ b/yang-maven-plugin-it/src/test/resources/UnknownGenerator/pom.xml
@@ -11,7 +11,7 @@
         <plugins>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
+                <artifactId>yangtools-maven-plugin</artifactId>
                 <version>0.5.4-SNAPSHOT</version>
                 <executions>
                     <execution>
diff --git a/yang-maven-plugin-it/src/test/resources/YangRootNotExist/pom.xml b/yang-maven-plugin-it/src/test/resources/YangRootNotExist/pom.xml
index d11c857d15..749f46662c 100644
--- a/yang-maven-plugin-it/src/test/resources/YangRootNotExist/pom.xml
+++ b/yang-maven-plugin-it/src/test/resources/YangRootNotExist/pom.xml
@@ -11,7 +11,7 @@
         <plugins>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
+                <artifactId>yangtools-maven-plugin</artifactId>
                 <version>0.5.4-SNAPSHOT</version>
                 <executions>
                     <execution>
diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java b/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java
index 57074f4484..82764762ce 100644
--- a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java
+++ b/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java
@@ -8,304 +8,304 @@
 
 /**
  * Definition of structures and DOM Like API of processed YANG schema
- * 
+ *
  * <h3>YANG Statement mapping</h3>
- * 
+ *
  * <dl>
  * <dt>anyxml
- *   <dd>{@link org.opendaylight.controller.yang.model.api.AnyXmlSchemaNode}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode}
+ *
  * <dt>argument
- *   <dd>{@link org.opendaylight.controller.yang.model.api.ExtensionDefinition#getArgumentName()}
- * 
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.ExtensionDefinition#getArgumentName()}
+ *
+ *
  * <dt>augment
- *   <dd>{@link org.opendaylight.controller.yang.model.api.AugmentationSchema}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.AugmentationSchema}
+ *
  * <dt>base
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.IdentityrefTypeDefinition#getIdentity()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.IdentityrefTypeDefinition#getIdentity()}
+ *
  * <dt>belongs-to
  *   <dd>
- * 
+ *
  * <dt>bit
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.BitsTypeDefinition.Bit}
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.BitsTypeDefinition#getBits()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition.Bit}
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition#getBits()}
+ *
  * <dt>case
- *   <dd>{@link org.opendaylight.controller.yang.model.api.ChoiceCaseNode}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode}
+ *
  * <dt>choice
- *   <dd>{@link org.opendaylight.controller.yang.model.api.ChoiceNode}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.ChoiceNode}
+ *
  * <dt>config
- *   <dd>{@link org.opendaylight.controller.yang.model.api.DataSchemaNode#isConfiguration()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.DataSchemaNode#isConfiguration()}
+ *
  * <dt>contact
- *   <dd>{@link org.opendaylight.controller.yang.model.api.Module#getContact()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.Module#getContact()}
+ *
  * <dt>container
- *   <dd>{@link org.opendaylight.controller.yang.model.api.ContainerSchemaNode}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode}
+ *
  * <dt>default
  *   <dd>
- * 
+ *
  * <dt>description
- *   <dd>{@link org.opendaylight.controller.yang.model.api.SchemaNode#getDescription()}
- *   <dd>{@link org.opendaylight.controller.yang.model.api.ConstraintMetaDefinition#getDescription()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.SchemaNode#getDescription()}
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.ConstraintMetaDefinition#getDescription()}
+ *
  * <dt>enum
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.EnumTypeDefinition.EnumPair}
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.EnumTypeDefinition#getValues()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition.EnumPair}
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition#getValues()}
+ *
  * <dt>error-app-tag
- *   <dd>{@link org.opendaylight.controller.yang.model.api.ConstraintMetaDefinition#getErrorAppTag()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.ConstraintMetaDefinition#getErrorAppTag()}
+ *
  * <dt>error-message
- *   <dd>{@link org.opendaylight.controller.yang.model.api.ConstraintMetaDefinition#getErrorMessage()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.ConstraintMetaDefinition#getErrorMessage()}
+ *
  * <dt>extension
- *   <dd>{@link org.opendaylight.controller.yang.model.api.ExtensionDefinition}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.ExtensionDefinition}
+ *
  * <dt>deviation
- *   <dd>{@link org.opendaylight.controller.yang.model.api.Deviation}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.Deviation}
+ *
  * <dt>deviate
  *   <dd>
- * 
+ *
  * <dt>feature
- *   <dd>{@link org.opendaylight.controller.yang.model.api.FeatureDefinition}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.FeatureDefinition}
+ *
  * <dt>fraction-digits
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.DecimalTypeDefinition#getFractionDigits()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.DecimalTypeDefinition#getFractionDigits()}
+ *
  * <dt>grouping
- *   <dd>{@link org.opendaylight.controller.yang.model.api.GroupingDefinition}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.GroupingDefinition}
+ *
  * <dt>identity
  *   <dd>
- * 
+ *
  * <dt>if-feature
  *   <dd>
- * 
+ *
  * <dt>import
- *   <dd>{@link org.opendaylight.controller.yang.model.api.ModuleImport}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.ModuleImport}
+ *
  * <dt>include
  *   <dd>
- * 
+ *
  * <dt>input
- *   <dd>{@link org.opendaylight.controller.yang.model.api.RpcDefinition#getInput()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.RpcDefinition#getInput()}
+ *
  * <dt>key
- *   <dd>{@link org.opendaylight.controller.yang.model.api.ListSchemaNode#getKeyDefinition()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.ListSchemaNode#getKeyDefinition()}
+ *
  * <dt>leaf
- *   <dd>{@link org.opendaylight.controller.yang.model.api.LeafSchemaNode}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.LeafSchemaNode}
+ *
  * <dt>leaf-list
- *   <dd>{@link org.opendaylight.controller.yang.model.api.LeafListSchemaNode}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode}
+ *
  * <dt>length
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.LengthConstraint}
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.StringTypeDefinition#getLengthStatements()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.LengthConstraint}
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition#getLengthStatements()}
+ *
  * <dt>list
- *   <dd>{@link org.opendaylight.controller.yang.model.api.ListSchemaNode}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.ListSchemaNode}
+ *
  * <dt>mandatory
- *   <dd>{@link org.opendaylight.controller.yang.model.api.ConstraintDefinition#isMandatory()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.ConstraintDefinition#isMandatory()}
+ *
  * <dt>max-elements
- *   <dd>{@link org.opendaylight.controller.yang.model.api.ConstraintDefinition#getMinElements()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.ConstraintDefinition#getMinElements()}
+ *
  * <dt>min-elements
- *   <dd>{@link org.opendaylight.controller.yang.model.api.ConstraintDefinition#getMaxElements()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.ConstraintDefinition#getMaxElements()}
+ *
  * <dt>module
- *   <dd>{@link org.opendaylight.controller.yang.model.api.Module}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.Module}
+ *
  * <dt>must
- *   <dd>{@link org.opendaylight.controller.yang.model.api.ConstraintDefinition#getMustConstraints()}
- *   <dd>{@link org.opendaylight.controller.yang.model.api.MustDefinition}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.ConstraintDefinition#getMustConstraints()}
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.MustDefinition}
+ *
  * <dt>namespace
- *   <dd>{@link org.opendaylight.controller.yang.model.api.Module#getNamespace()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.Module#getNamespace()}
+ *
  * <dt>notification
- *   <dd>{@link org.opendaylight.controller.yang.model.api.NotificationDefinition}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.NotificationDefinition}
+ *
  * <dt>ordered-by
- *   <dd>{@link org.opendaylight.controller.yang.model.api.ListSchemaNode#isUserOrdered()}
- *   <dd>{@link org.opendaylight.controller.yang.model.api.LeafListSchemaNode#isUserOrdered()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.ListSchemaNode#isUserOrdered()}
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode#isUserOrdered()}
+ *
  * <dt>organization
- *   <dd>{@link org.opendaylight.controller.yang.model.api.Module#getOrganization()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.Module#getOrganization()}
+ *
  * <dt>output
- *   <dd>{@link org.opendaylight.controller.yang.model.api.RpcDefinition#getOutput()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.RpcDefinition#getOutput()}
+ *
  * <dt>path
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.LeafrefTypeDefinition#getPathStatement()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.LeafrefTypeDefinition#getPathStatement()}
+ *
  * <dt>pattern
- *   <dd>{@link org.opendaylight.controller.yang.model.base.type.api.PatternConstraint}
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.StringTypeDefinition}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.base.type.api.PatternConstraint}
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition}
+ *
  * <dt>position
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.BitsTypeDefinition.Bit#getPosition()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition.Bit#getPosition()}
+ *
  * <dt>prefix
- *   <dd>{@link org.opendaylight.controller.yang.model.api.Module#getPrefix()}
- *   <dd>{@link org.opendaylight.controller.yang.model.api.ModuleImport#getPrefix()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.Module#getPrefix()}
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.ModuleImport#getPrefix()}
+ *
  * <dt>presence
- *   <dd>{@link org.opendaylight.controller.yang.model.api.ContainerSchemaNode#isPresenceContainer()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode#isPresenceContainer()}
+ *
  * <dt>range
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.RangeConstraint}
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.IntegerTypeDefinition#getRangeStatements()}
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.UnsignedIntegerTypeDefinition#getRangeStatements()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.RangeConstraint}
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition#getRangeStatements()}
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition#getRangeStatements()}
+ *
  * <dt>reference
- *   <dd>{@link org.opendaylight.controller.yang.model.api.SchemaNode#getReference()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.SchemaNode#getReference()}
+ *
  * <dt>refine
  *   <dd>
- * 
+ *
  * <dt>require-instance
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.InstanceIdentifierTypeDefinition#requireInstance()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.InstanceIdentifierTypeDefinition#requireInstance()}
+ *
  * <dt>revision
- *   <dd>{@link org.opendaylight.controller.yang.model.api.Module#getRevision()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.Module#getRevision()}
+ *
  * <dt>revision-date
- *   <dd>{@link org.opendaylight.controller.yang.model.api.ModuleImport#getRevision()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.ModuleImport#getRevision()}
+ *
  * <dt>rpc
- *   <dd>{@link org.opendaylight.controller.yang.model.api.RpcDefinition}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.RpcDefinition}
+ *
  * <dt>status
- *   <dd>{@link org.opendaylight.controller.yang.model.api.SchemaNode#getStatus()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.SchemaNode#getStatus()}
+ *
  * <dt>submodule
  *   <dd>
- * 
+ *
  * <dt>type
- *   <dd>{@link org.opendaylight.controller.yang.model.api.TypeDefinition}
- *   <dd>{@link org.opendaylight.controller.yang.model.api.LeafSchemaNode#getType()}
- *   <dd>{@link org.opendaylight.controller.yang.model.api.LeafListSchemaNode#getType()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.TypeDefinition}
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.LeafSchemaNode#getType()}
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode#getType()}
+ *
  * <dt>typedef
- *   <dd>{@link org.opendaylight.controller.yang.model.api.TypeDefinition}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.TypeDefinition}
+ *
  * <dt>unique
  *   <dd>
- * 
+ *
  * <dt>units
- *   <dd>{@link org.opendaylight.controller.yang.model.api.TypeDefinition#getUnits()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.TypeDefinition#getUnits()}
+ *
  * <dt>uses
- *   <dd>{@link org.opendaylight.controller.yang.model.api.UsesNode}
- *   <dd>{@link org.opendaylight.controller.yang.model.api.DataNodeContainere#getUses()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.UsesNode}
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.DataNodeContainere#getUses()}
+ *
  * <dt>value
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.EnumTypeDefinition.EnumPair#getValue()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition.EnumPair#getValue()}
+ *
  * <dt>when
- *   <dd>{@link org.opendaylight.controller.yang.model.api.ConstraintDefinition#getWhenCondition()}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.ConstraintDefinition#getWhenCondition()}
+ *
  * <dt>yang-version
- * 
+ *
  * <dt>yin-element
  *   <dd>
- * 
- * 
- * 
- * 
+ *
+ *
+ *
+ *
  * <dt>add
  *   <dd>
- * 
+ *
  * <dt>current
  *   <dd>
- * 
+ *
  * <dt>delete
  *   <dd>
- * 
+ *
  * <dt>deprecated
  *   <dd>
- * 
+ *
  * <dt>false
  *   <dd>
- * 
+ *
  * <dt>max
  *   <dd>
- * 
+ *
  * <dt>min
  *   <dd>
- * 
+ *
  * <dt>not-supported
  *   <dd>
- * 
+ *
  * <dt>obsolete
  *   <dd>
- * 
+ *
  * <dt>replace
  *   <dd>
- * 
+ *
  * <dt>system
  *   <dd>
- * 
+ *
  * <dt>true
  *   <dd>
- * 
+ *
  * <dt>unbounded
  *   <dd>
- * 
+ *
  * <dt>user
  *   <dd>
  * </dl>
- * 
- * 
+ *
+ *
  * <h3>YANG Base Type Mapping</h3>
- * 
- * 
+ *
+ *
  * <dl>
  * <dt>Integer built-in type
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.IntegerTypeDefinition}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition}
+ *
  * <dt>Unsigned integer built-in type
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.UnsignedIntegerTypeDefinition}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition}
+ *
  * <dt>Decimal64 built-ib type
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.DecimalTypeDefinition}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.DecimalTypeDefinition}
+ *
  * <dt>Boolean built-in type
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.BooleanTypeDefinition}
- *   
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.BooleanTypeDefinition}
+ *
  * <dt>Enumeration built-in type
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.EnumTypeDefinition}
- *   
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition}
+ *
  * <dt>Bits Built-In Type
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.BitsTypeDefinition}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition}
+ *
  * <dt>The binary Built-In Type
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.BinaryTypeDefinition}
- *   
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.BinaryTypeDefinition}
+ *
  * <dt>The leafref Built-In Type
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.LeafrefTypeDefinition}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.LeafrefTypeDefinition}
+ *
  * <dt>The identityref Built-In Type
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.IdentityrefTypeDefinition}
- *   
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.IdentityrefTypeDefinition}
+ *
  * <dt>The empty Built-In Type
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.EmptyTypeDefinition}
- *   
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.EmptyTypeDefinition}
+ *
  * <dt>The union Built-In Type
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.UnionTypeDefinition}
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition}
  * <dt>The instance-identifier Built-In Type
- *   <dd>{@link org.opendaylight.controller.yang.model.api.type.InstanceIdentifierTypeDefinition}
- * 
+ *   <dd>{@link org.opendaylight.yangtools.yang.model.api.type.InstanceIdentifierTypeDefinition}
+ *
  * </dl>
  */
 package org.opendaylight.yangtools.yang.model.api;
diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BinaryType.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BinaryType.java
index 9b03a96f4e..de7a3058ea 100644
--- a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BinaryType.java
+++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BinaryType.java
@@ -57,7 +57,7 @@ public final class BinaryType implements BinaryTypeDefinition {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.TypeDefinition#getBaseType()
+     * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getBaseType()
      */
     @Override
     public BinaryTypeDefinition getBaseType() {
@@ -67,7 +67,7 @@ public final class BinaryType implements BinaryTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.TypeDefinition#getUnits()
+     * @see org.opendaylight.yangtools.yang.model.api.TypeDefinition#getUnits()
      */
     @Override
     public String getUnits() {
@@ -78,7 +78,7 @@ public final class BinaryType implements BinaryTypeDefinition {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.TypeDefinition#getDefaultValue
+     * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getDefaultValue
      * ()
      */
     @Override
@@ -89,7 +89,7 @@ public final class BinaryType implements BinaryTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getQName()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getQName()
      */
     @Override
     public QName getQName() {
@@ -99,7 +99,7 @@ public final class BinaryType implements BinaryTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getPath()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getPath()
      */
     @Override
     public SchemaPath getPath() {
@@ -110,7 +110,7 @@ public final class BinaryType implements BinaryTypeDefinition {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.SchemaNode#getDescription()
+     * org.opendaylight.yangtools.yang.model.api.SchemaNode#getDescription()
      */
     @Override
     public String getDescription() {
@@ -120,7 +120,7 @@ public final class BinaryType implements BinaryTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getReference()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getReference()
      */
     @Override
     public String getReference() {
@@ -130,7 +130,7 @@ public final class BinaryType implements BinaryTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getStatus()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getStatus()
      */
     @Override
     public Status getStatus() {
@@ -141,7 +141,7 @@ public final class BinaryType implements BinaryTypeDefinition {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.base.type.api.BinaryTypeDefinition
+     * org.opendaylight.yangtools.yang.model.base.type.api.BinaryTypeDefinition
      * #getLengthConstraint ()
      */
     @Override
diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java
index bab2196408..6fa221df6e 100644
--- a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java
+++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java
@@ -63,7 +63,7 @@ public final class BitsType implements BitsTypeDefinition {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.TypeDefinition#getBaseType()
+     * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getBaseType()
      */
     @Override
     public BitsTypeDefinition getBaseType() {
@@ -73,7 +73,7 @@ public final class BitsType implements BitsTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.TypeDefinition#getUnits()
+     * @see org.opendaylight.yangtools.yang.model.api.TypeDefinition#getUnits()
      */
     @Override
     public String getUnits() {
@@ -84,7 +84,7 @@ public final class BitsType implements BitsTypeDefinition {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.TypeDefinition#getDefaultValue
+     * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getDefaultValue
      * ()
      */
     @Override
@@ -95,7 +95,7 @@ public final class BitsType implements BitsTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getQName()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getQName()
      */
     @Override
     public QName getQName() {
@@ -105,7 +105,7 @@ public final class BitsType implements BitsTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getPath()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getPath()
      */
     @Override
     public SchemaPath getPath() {
@@ -116,7 +116,7 @@ public final class BitsType implements BitsTypeDefinition {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.SchemaNode#getDescription()
+     * org.opendaylight.yangtools.yang.model.api.SchemaNode#getDescription()
      */
     @Override
     public String getDescription() {
@@ -126,7 +126,7 @@ public final class BitsType implements BitsTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getReference()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getReference()
      */
     @Override
     public String getReference() {
@@ -136,7 +136,7 @@ public final class BitsType implements BitsTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getStatus()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getStatus()
      */
     @Override
     public Status getStatus() {
diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java
index 58b5b96c76..b20be97b39 100644
--- a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java
+++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java
@@ -57,7 +57,7 @@ public final class BooleanType implements BooleanTypeDefinition {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.TypeDefinition#getBaseType()
+     * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getBaseType()
      */
     @Override
     public BooleanTypeDefinition getBaseType() {
@@ -67,7 +67,7 @@ public final class BooleanType implements BooleanTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.TypeDefinition#getUnits()
+     * @see org.opendaylight.yangtools.yang.model.api.TypeDefinition#getUnits()
      */
     @Override
     public String getUnits() {
@@ -78,7 +78,7 @@ public final class BooleanType implements BooleanTypeDefinition {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.TypeDefinition#getDefaultValue
+     * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getDefaultValue
      * ()
      */
     @Override
@@ -89,7 +89,7 @@ public final class BooleanType implements BooleanTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getQName()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getQName()
      */
     @Override
     public QName getQName() {
@@ -99,7 +99,7 @@ public final class BooleanType implements BooleanTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getPath()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getPath()
      */
     @Override
     public SchemaPath getPath() {
@@ -110,7 +110,7 @@ public final class BooleanType implements BooleanTypeDefinition {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.SchemaNode#getDescription()
+     * org.opendaylight.yangtools.yang.model.api.SchemaNode#getDescription()
      */
     @Override
     public String getDescription() {
@@ -120,7 +120,7 @@ public final class BooleanType implements BooleanTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getReference()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getReference()
      */
     @Override
     public String getReference() {
@@ -130,7 +130,7 @@ public final class BooleanType implements BooleanTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getStatus()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getStatus()
      */
     @Override
     public Status getStatus() {
diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java
index e6b5f1cb3b..472bc69517 100644
--- a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java
+++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java
@@ -52,7 +52,7 @@ public final class EnumerationType implements EnumTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.TypeDefinition#getBaseType()
+     * @see org.opendaylight.yangtools.yang.model.api.TypeDefinition#getBaseType()
      */
     @Override
     public EnumTypeDefinition getBaseType() {
@@ -62,7 +62,7 @@ public final class EnumerationType implements EnumTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.TypeDefinition#getUnits()
+     * @see org.opendaylight.yangtools.yang.model.api.TypeDefinition#getUnits()
      */
     @Override
     public String getUnits() {
@@ -72,7 +72,7 @@ public final class EnumerationType implements EnumTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.TypeDefinition#getDefaultValue()
+     * @see org.opendaylight.yangtools.yang.model.api.TypeDefinition#getDefaultValue()
      */
     @Override
     public Object getDefaultValue() {
@@ -82,7 +82,7 @@ public final class EnumerationType implements EnumTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getQName()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getQName()
      */
     @Override
     public QName getQName() {
@@ -92,7 +92,7 @@ public final class EnumerationType implements EnumTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getPath()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getPath()
      */
     @Override
     public SchemaPath getPath() {
@@ -102,7 +102,7 @@ public final class EnumerationType implements EnumTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getDescription()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getDescription()
      */
     @Override
     public String getDescription() {
@@ -112,7 +112,7 @@ public final class EnumerationType implements EnumTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getReference()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getReference()
      */
     @Override
     public String getReference() {
@@ -122,7 +122,7 @@ public final class EnumerationType implements EnumTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getStatus()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getStatus()
      */
     @Override
     public Status getStatus() {
@@ -132,7 +132,7 @@ public final class EnumerationType implements EnumTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.base.type.api.EnumTypeDefinition#getValues()
+     * @see org.opendaylight.yangtools.yang.model.base.type.api.EnumTypeDefinition#getValues()
      */
     @Override
     public List<EnumPair> getValues() {
diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/InstanceIdentifier.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/InstanceIdentifier.java
index 47405ebff8..608c35c891 100644
--- a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/InstanceIdentifier.java
+++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/InstanceIdentifier.java
@@ -54,7 +54,7 @@ public final class InstanceIdentifier implements InstanceIdentifierTypeDefinitio
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.TypeDefinition#getBaseType()
+     * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getBaseType()
      */
     @Override
     public InstanceIdentifierTypeDefinition getBaseType() {
@@ -64,7 +64,7 @@ public final class InstanceIdentifier implements InstanceIdentifierTypeDefinitio
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.TypeDefinition#getUnits()
+     * @see org.opendaylight.yangtools.yang.model.api.TypeDefinition#getUnits()
      */
     @Override
     public String getUnits() {
@@ -75,7 +75,7 @@ public final class InstanceIdentifier implements InstanceIdentifierTypeDefinitio
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.TypeDefinition#getDefaultValue
+     * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getDefaultValue
      * ()
      */
     @Override
@@ -86,7 +86,7 @@ public final class InstanceIdentifier implements InstanceIdentifierTypeDefinitio
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getQName()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getQName()
      */
     @Override
     public QName getQName() {
@@ -96,7 +96,7 @@ public final class InstanceIdentifier implements InstanceIdentifierTypeDefinitio
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getPath()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getPath()
      */
     @Override
     public SchemaPath getPath() {
@@ -107,7 +107,7 @@ public final class InstanceIdentifier implements InstanceIdentifierTypeDefinitio
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.SchemaNode#getDescription()
+     * org.opendaylight.yangtools.yang.model.api.SchemaNode#getDescription()
      */
     @Override
     public String getDescription() {
@@ -117,7 +117,7 @@ public final class InstanceIdentifier implements InstanceIdentifierTypeDefinitio
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getReference()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getReference()
      */
     @Override
     public String getReference() {
@@ -127,7 +127,7 @@ public final class InstanceIdentifier implements InstanceIdentifierTypeDefinitio
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getStatus()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getStatus()
      */
     @Override
     public Status getStatus() {
@@ -138,7 +138,7 @@ public final class InstanceIdentifier implements InstanceIdentifierTypeDefinitio
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.SchemaNode#getExtensionSchemaNodes
+     * org.opendaylight.yangtools.yang.model.api.SchemaNode#getExtensionSchemaNodes
      * ()
      */
     @Override
@@ -149,7 +149,7 @@ public final class InstanceIdentifier implements InstanceIdentifierTypeDefinitio
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.type.
+     * @see org.opendaylight.yangtools.yang.model.api.type.
      * InstanceIdentifierTypeDefinition# getPathStatement()
      */
     @Override
@@ -160,7 +160,7 @@ public final class InstanceIdentifier implements InstanceIdentifierTypeDefinitio
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.type.
+     * @see org.opendaylight.yangtools.yang.model.api.type.
      * InstanceIdentifierTypeDefinition# requireInstance()
      */
     @Override
diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int32.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int32.java
index 05dbaf956e..bafce08d97 100644
--- a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int32.java
+++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int32.java
@@ -35,7 +35,7 @@ public final class Int32 extends AbstractSignedInteger {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.TypeDefinition#getBaseType()
+     * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getBaseType()
      */
     @Override
     public IntegerTypeDefinition getBaseType() {
@@ -46,7 +46,7 @@ public final class Int32 extends AbstractSignedInteger {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.TypeDefinition#getDefaultValue
+     * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getDefaultValue
      * ()
      */
     @Override
diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int64.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int64.java
index fc10b94068..eb733b21fa 100644
--- a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int64.java
+++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int64.java
@@ -33,7 +33,7 @@ public final class Int64 extends AbstractSignedInteger {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.TypeDefinition#getBaseType()
+     * @see org.opendaylight.yangtools.yang.model.api.TypeDefinition#getBaseType()
      */
     @Override
     public IntegerTypeDefinition getBaseType() {
@@ -43,7 +43,7 @@ public final class Int64 extends AbstractSignedInteger {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.TypeDefinition#getDefaultValue()
+     * @see org.opendaylight.yangtools.yang.model.api.TypeDefinition#getDefaultValue()
      */
     @Override
     public Object getDefaultValue() {
diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int8.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int8.java
index 08e5423b67..cd295f1440 100644
--- a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int8.java
+++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int8.java
@@ -33,7 +33,7 @@ public final class Int8 extends AbstractSignedInteger {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.TypeDefinition#getBaseType()
+     * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getBaseType()
      */
     @Override
     public IntegerTypeDefinition getBaseType() {
@@ -44,7 +44,7 @@ public final class Int8 extends AbstractSignedInteger {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.TypeDefinition#getDefaultValue
+     * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getDefaultValue
      * ()
      */
     @Override
diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java
index 9136a94478..2a52b0f453 100644
--- a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java
+++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java
@@ -43,7 +43,7 @@ public final class Leafref implements LeafrefTypeDefinition {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.TypeDefinition#getBaseType()
+     * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getBaseType()
      */
     @Override
     public LeafrefTypeDefinition getBaseType() {
@@ -53,7 +53,7 @@ public final class Leafref implements LeafrefTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.TypeDefinition#getUnits()
+     * @see org.opendaylight.yangtools.yang.model.api.TypeDefinition#getUnits()
      */
     @Override
     public String getUnits() {
@@ -64,7 +64,7 @@ public final class Leafref implements LeafrefTypeDefinition {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.TypeDefinition#getDefaultValue
+     * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getDefaultValue
      * ()
      */
     @Override
@@ -75,7 +75,7 @@ public final class Leafref implements LeafrefTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getQName()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getQName()
      */
     @Override
     public QName getQName() {
@@ -85,7 +85,7 @@ public final class Leafref implements LeafrefTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getPath()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getPath()
      */
     @Override
     public SchemaPath getPath() {
@@ -96,7 +96,7 @@ public final class Leafref implements LeafrefTypeDefinition {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.SchemaNode#getDescription()
+     * org.opendaylight.yangtools.yang.model.api.SchemaNode#getDescription()
      */
     @Override
     public String getDescription() {
@@ -106,7 +106,7 @@ public final class Leafref implements LeafrefTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getReference()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getReference()
      */
     @Override
     public String getReference() {
@@ -116,7 +116,7 @@ public final class Leafref implements LeafrefTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getStatus()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getStatus()
      */
     @Override
     public Status getStatus() {
@@ -127,7 +127,7 @@ public final class Leafref implements LeafrefTypeDefinition {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.SchemaNode#getExtensionSchemaNodes
+     * org.opendaylight.yangtools.yang.model.api.SchemaNode#getExtensionSchemaNodes
      * ()
      */
     @Override
@@ -139,7 +139,7 @@ public final class Leafref implements LeafrefTypeDefinition {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.type.LeafrefTypeDefinition
+     * org.opendaylight.yangtools.yang.model.api.type.LeafrefTypeDefinition
      * #getPathStatement()
      */
     @Override
diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java
index a3f98d962e..6be448956b 100644
--- a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java
+++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java
@@ -51,7 +51,7 @@ public final class StringType implements StringTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.TypeDefinition#getBaseType()
+     * @see org.opendaylight.yangtools.yang.model.api.TypeDefinition#getBaseType()
      */
     @Override
     public StringTypeDefinition getBaseType() {
@@ -61,7 +61,7 @@ public final class StringType implements StringTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.TypeDefinition#getUnits()
+     * @see org.opendaylight.yangtools.yang.model.api.TypeDefinition#getUnits()
      */
     @Override
     public String getUnits() {
@@ -71,7 +71,7 @@ public final class StringType implements StringTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.TypeDefinition#getDefaultValue()
+     * @see org.opendaylight.yangtools.yang.model.api.TypeDefinition#getDefaultValue()
      */
     @Override
     public Object getDefaultValue() {
@@ -81,7 +81,7 @@ public final class StringType implements StringTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getQName()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getQName()
      */
     @Override
     public QName getQName() {
@@ -91,7 +91,7 @@ public final class StringType implements StringTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getPath()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getPath()
      */
     @Override
     public SchemaPath getPath() {
@@ -101,7 +101,7 @@ public final class StringType implements StringTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getDescription()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getDescription()
      */
     @Override
     public String getDescription() {
@@ -111,7 +111,7 @@ public final class StringType implements StringTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getReference()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getReference()
      */
     @Override
     public String getReference() {
@@ -121,7 +121,7 @@ public final class StringType implements StringTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getStatus()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getStatus()
      */
     @Override
     public Status getStatus() {
diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint16.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint16.java
index 6187d4d1f2..0a45f8aa0b 100644
--- a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint16.java
+++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint16.java
@@ -33,7 +33,7 @@ public final class Uint16 extends AbstractUnsignedInteger {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.TypeDefinition#getBaseType()
+     * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getBaseType()
      */
     @Override
     public UnsignedIntegerTypeDefinition getBaseType() {
@@ -44,7 +44,7 @@ public final class Uint16 extends AbstractUnsignedInteger {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.TypeDefinition#getDefaultValue
+     * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getDefaultValue
      * ()
      */
     @Override
diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint32.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint32.java
index f13d395d16..d104e4c596 100644
--- a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint32.java
+++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint32.java
@@ -32,7 +32,7 @@ public final class Uint32 extends AbstractUnsignedInteger {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.TypeDefinition#getBaseType()
+     * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getBaseType()
      */
     @Override
     public UnsignedIntegerTypeDefinition getBaseType() {
@@ -43,7 +43,7 @@ public final class Uint32 extends AbstractUnsignedInteger {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.TypeDefinition#getDefaultValue
+     * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getDefaultValue
      * ()
      */
     @Override
diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint64.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint64.java
index c0de51cf7a..7f9dc65605 100644
--- a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint64.java
+++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint64.java
@@ -36,7 +36,7 @@ public final class Uint64 extends AbstractUnsignedInteger {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.TypeDefinition#getBaseType()
+     * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getBaseType()
      */
     @Override
     public UnsignedIntegerTypeDefinition getBaseType() {
@@ -47,7 +47,7 @@ public final class Uint64 extends AbstractUnsignedInteger {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.TypeDefinition#getDefaultValue
+     * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getDefaultValue
      * ()
      */
     @Override
diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint8.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint8.java
index 0516e88196..ff8485cd79 100644
--- a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint8.java
+++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint8.java
@@ -33,7 +33,7 @@ public final class Uint8 extends AbstractUnsignedInteger {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.TypeDefinition#getBaseType()
+     * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getBaseType()
      */
     @Override
     public UnsignedIntegerTypeDefinition getBaseType() {
@@ -44,7 +44,7 @@ public final class Uint8 extends AbstractUnsignedInteger {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.TypeDefinition#getDefaultValue
+     * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getDefaultValue
      * ()
      */
     @Override
diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnknownType.java b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnknownType.java
index 5a6de305bf..691fadc281 100644
--- a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnknownType.java
+++ b/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnknownType.java
@@ -151,7 +151,7 @@ public class UnknownType implements UnknownTypeDefinition {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.TypeDefinition#getBaseType()
+     * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getBaseType()
      */
     @Override
     public UnknownTypeDefinition getBaseType() {
@@ -161,7 +161,7 @@ public class UnknownType implements UnknownTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.TypeDefinition#getUnits()
+     * @see org.opendaylight.yangtools.yang.model.api.TypeDefinition#getUnits()
      */
     @Override
     public String getUnits() {
@@ -172,7 +172,7 @@ public class UnknownType implements UnknownTypeDefinition {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.TypeDefinition#getDefaultValue
+     * org.opendaylight.yangtools.yang.model.api.TypeDefinition#getDefaultValue
      * ()
      */
     @Override
@@ -183,7 +183,7 @@ public class UnknownType implements UnknownTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getQName()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getQName()
      */
     @Override
     public QName getQName() {
@@ -193,7 +193,7 @@ public class UnknownType implements UnknownTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getPath()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getPath()
      */
     @Override
     public SchemaPath getPath() {
@@ -204,7 +204,7 @@ public class UnknownType implements UnknownTypeDefinition {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.SchemaNode#getDescription()
+     * org.opendaylight.yangtools.yang.model.api.SchemaNode#getDescription()
      */
     @Override
     public String getDescription() {
@@ -214,7 +214,7 @@ public class UnknownType implements UnknownTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getReference()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getReference()
      */
     @Override
     public String getReference() {
@@ -224,7 +224,7 @@ public class UnknownType implements UnknownTypeDefinition {
     /*
      * (non-Javadoc)
      *
-     * @see org.opendaylight.controller.yang.model.api.SchemaNode#getStatus()
+     * @see org.opendaylight.yangtools.yang.model.api.SchemaNode#getStatus()
      */
     @Override
     public Status getStatus() {
@@ -235,7 +235,7 @@ public class UnknownType implements UnknownTypeDefinition {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.SchemaNode#getExtensionSchemaNodes
+     * org.opendaylight.yangtools.yang.model.api.SchemaNode#getExtensionSchemaNodes
      * ()
      */
     @Override
@@ -247,7 +247,7 @@ public class UnknownType implements UnknownTypeDefinition {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.type.UnknownTypeDefinition
+     * org.opendaylight.yangtools.yang.model.api.type.UnknownTypeDefinition
      * #getRangeStatements()
      */
     @Override
@@ -259,7 +259,7 @@ public class UnknownType implements UnknownTypeDefinition {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.type.UnknownTypeDefinition
+     * org.opendaylight.yangtools.yang.model.api.type.UnknownTypeDefinition
      * #getLengthStatements()
      */
     @Override
@@ -271,7 +271,7 @@ public class UnknownType implements UnknownTypeDefinition {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.type.UnknownTypeDefinition
+     * org.opendaylight.yangtools.yang.model.api.type.UnknownTypeDefinition
      * #getPatterns()
      */
     @Override
@@ -283,7 +283,7 @@ public class UnknownType implements UnknownTypeDefinition {
      * (non-Javadoc)
      *
      * @see
-     * org.opendaylight.controller.yang.model.api.type.UnknownTypeDefinition
+     * org.opendaylight.yangtools.yang.model.api.type.UnknownTypeDefinition
      * #getLengthConstraint()
      */
     @Override
diff --git a/yang-parser-impl/pom.xml b/yang-parser-impl/pom.xml
index 145807a6a7..8702241652 100644
--- a/yang-parser-impl/pom.xml
+++ b/yang-parser-impl/pom.xml
@@ -70,7 +70,7 @@
                 </executions>
                 <configuration>
                     <sourceDirectory>src/main/antlr</sourceDirectory>
-                    <outputDirectory>target/generated-sources/parser/org/opendaylight/controller/antlrv4/code/gen</outputDirectory>
+                    <outputDirectory>target/generated-sources/parser/org/opendaylight/yangtools/antlrv4/code/gen</outputDirectory>
                     <visitor>true</visitor>
                     <listener>true</listener>
                 </configuration>
@@ -98,7 +98,7 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
                     <excludePackageNames>
-                        *.opendaylight.controller.antlrv4.code.gen
+                        *.opendaylight.yangtools.antlrv4.code.gen
                     </excludePackageNames>
                 </configuration>
             </plugin>
diff --git a/yang-parser-impl/src/main/antlr/YangLexer.g4 b/yang-parser-impl/src/main/antlr/YangLexer.g4
index 2fa4843bd5..0395f78273 100644
--- a/yang-parser-impl/src/main/antlr/YangLexer.g4
+++ b/yang-parser-impl/src/main/antlr/YangLexer.g4
@@ -1,7 +1,7 @@
 lexer grammar YangLexer;
 
 @header {
-package org.opendaylight.controller.antlrv4.code.gen;
+package org.opendaylight.yangtools.antlrv4.code.gen;
 }
 
 tokens{
diff --git a/yang-parser-impl/src/main/antlr/YangParser.g4 b/yang-parser-impl/src/main/antlr/YangParser.g4
index cd47dced2a..9e67cd85f0 100644
--- a/yang-parser-impl/src/main/antlr/YangParser.g4
+++ b/yang-parser-impl/src/main/antlr/YangParser.g4
@@ -1,7 +1,7 @@
 parser grammar YangParser;
 
 @header {
-package org.opendaylight.controller.antlrv4.code.gen;
+package org.opendaylight.yangtools.antlrv4.code.gen;
 }
 
 options{
diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java
index be0d4ee0fa..cb927bcf09 100644
--- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java
+++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java
@@ -34,8 +34,8 @@ import org.antlr.v4.runtime.ANTLRInputStream;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.ParseTreeWalker;
-import org.opendaylight.controller.antlrv4.code.gen.YangLexer;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangLexer;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ChoiceNode;
diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java
index 96682ef6cd..3358ea8e3e 100644
--- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java
+++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java
@@ -18,37 +18,37 @@ import java.util.List;
 import java.util.Stack;
 
 import org.antlr.v4.runtime.tree.ParseTree;
-import org.opendaylight.controller.antlrv4.code.gen.*;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Argument_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Base_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Contact_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Container_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Default_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Description_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Deviate_add_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Deviate_delete_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Deviate_not_supported_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Deviate_replace_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Import_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Key_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Leaf_list_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Leaf_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.List_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Module_header_stmtsContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Namespace_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Ordered_by_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Organization_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Prefix_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Presence_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Reference_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Revision_date_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Revision_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Revision_stmtsContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Status_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Type_body_stmtsContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Units_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.When_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Yang_version_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.*;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Argument_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Base_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Contact_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Container_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Default_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Description_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Deviate_add_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Deviate_delete_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Deviate_not_supported_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Deviate_replace_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Import_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Key_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Leaf_list_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Leaf_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.List_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Module_header_stmtsContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Namespace_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Ordered_by_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Organization_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Prefix_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Presence_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Reference_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Revision_date_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Revision_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Revision_stmtsContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Status_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Type_body_stmtsContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Units_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.When_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Yang_version_stmtContext;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserListenerUtils.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserListenerUtils.java
index 2e4972232a..99d3012f2e 100644
--- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserListenerUtils.java
+++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserListenerUtils.java
@@ -15,61 +15,61 @@ import java.util.List;
 import java.util.Stack;
 
 import org.antlr.v4.runtime.tree.ParseTree;
-import org.opendaylight.controller.antlrv4.code.gen.*;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Argument_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Base_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Bit_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Bits_specificationContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Config_argContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Config_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Decimal64_specificationContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Default_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Description_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Enum_specificationContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Enum_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Error_app_tag_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Error_message_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Fraction_digits_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Identityref_specificationContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Instance_identifier_specificationContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Leafref_specificationContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Length_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Mandatory_argContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Mandatory_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Max_elements_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Max_value_argContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Min_elements_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Min_value_argContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Must_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Numerical_restrictionsContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Ordered_by_argContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Ordered_by_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Path_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Pattern_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Position_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Presence_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Range_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Reference_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Refine_anyxml_stmtsContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Refine_choice_stmtsContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Refine_container_stmtsContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Refine_leaf_list_stmtsContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Refine_leaf_stmtsContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Refine_list_stmtsContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Refine_pomContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Refine_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Require_instance_argContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Require_instance_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Status_argContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Status_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.StringContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.String_restrictionsContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Type_body_stmtsContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Units_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Value_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.When_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Yin_element_argContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Yin_element_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.*;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Argument_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Base_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Bit_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Bits_specificationContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Config_argContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Config_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Decimal64_specificationContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Default_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Description_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Enum_specificationContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Enum_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Error_app_tag_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Error_message_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Fraction_digits_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Identityref_specificationContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Instance_identifier_specificationContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Leafref_specificationContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Length_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Mandatory_argContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Mandatory_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Max_elements_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Max_value_argContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Min_elements_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Min_value_argContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Must_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Numerical_restrictionsContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Ordered_by_argContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Ordered_by_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Path_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Pattern_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Position_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Presence_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Range_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Reference_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Refine_anyxml_stmtsContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Refine_choice_stmtsContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Refine_container_stmtsContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Refine_leaf_list_stmtsContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Refine_leaf_stmtsContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Refine_list_stmtsContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Refine_pomContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Refine_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Require_instance_argContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Require_instance_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Status_argContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Status_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.StringContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.String_restrictionsContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Type_body_stmtsContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Units_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Value_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.When_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Yin_element_argContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Yin_element_stmtContext;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.MustDefinition;
 import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/BasicValidations.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/BasicValidations.java
index 1d69a9a6ac..444fe2cc0c 100644
--- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/BasicValidations.java
+++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/BasicValidations.java
@@ -17,7 +17,7 @@ import java.util.regex.Pattern;
 
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ParseTree;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Yang_version_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Yang_version_stmtContext;
 import org.opendaylight.yangtools.yang.parser.impl.YangParserListenerImpl;
 import org.opendaylight.yangtools.yang.parser.util.YangValidationException;
 
diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/ValidationUtil.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/ValidationUtil.java
index 6c0e320b9e..515e92ece9 100644
--- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/ValidationUtil.java
+++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/ValidationUtil.java
@@ -14,8 +14,8 @@ import java.util.List;
 import java.util.Set;
 
 import org.antlr.v4.runtime.tree.ParseTree;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Module_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Submodule_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Module_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Submodule_stmtContext;
 import org.opendaylight.yangtools.yang.parser.util.ParserListenerUtils;
 import org.opendaylight.yangtools.yang.parser.util.YangValidationException;
 
diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/YangModelBasicValidationListener.java b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/YangModelBasicValidationListener.java
index de15c14183..61305f1447 100644
--- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/YangModelBasicValidationListener.java
+++ b/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/YangModelBasicValidationListener.java
@@ -12,50 +12,50 @@ import java.net.URISyntaxException;
 import java.util.Set;
 
 import org.antlr.v4.runtime.tree.ParseTree;
-import org.opendaylight.controller.antlrv4.code.gen.*;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Anyxml_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Argument_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Augment_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Base_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Belongs_to_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Case_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Choice_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Config_argContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Container_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Default_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Deviate_add_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Deviation_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Extension_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Feature_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Grouping_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Identity_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.If_feature_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Import_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Include_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Key_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Leaf_list_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Leaf_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.List_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Mandatory_argContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Mandatory_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Module_header_stmtsContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Module_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Namespace_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Notification_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Ordered_by_argContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Prefix_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Refine_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Revision_date_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Revision_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Rpc_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Status_argContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Submodule_header_stmtsContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Submodule_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Type_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Typedef_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Unique_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Uses_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Yin_element_argContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.*;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Anyxml_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Argument_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Augment_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Base_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Belongs_to_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Case_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Choice_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Config_argContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Container_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Default_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Deviate_add_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Deviation_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Extension_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Feature_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Grouping_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Identity_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.If_feature_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Import_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Include_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Key_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Leaf_list_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Leaf_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.List_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Mandatory_argContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Mandatory_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Module_header_stmtsContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Module_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Namespace_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Notification_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Ordered_by_argContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Prefix_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Refine_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Revision_date_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Revision_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Rpc_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Status_argContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Submodule_header_stmtsContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Submodule_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Type_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Typedef_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Unique_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Uses_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Yin_element_argContext;
 import org.opendaylight.yangtools.yang.parser.impl.YangParserListenerImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserSimpleTest.java b/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserSimpleTest.java
index 8a0863936d..484b18bc38 100644
--- a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserSimpleTest.java
+++ b/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserSimpleTest.java
@@ -21,15 +21,25 @@ import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.ChoiceNode;
 import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition;
+import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
+import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.MustDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.UsesNode;
 
 public class YangParserSimpleTest {
 
     private final URI snNS = URI.create("urn:opendaylight:simple-nodes");
     private Date snRev;
+    private final String snPref = "sn";
 
     private final DateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
     private Set<Module> modules;
@@ -41,7 +51,7 @@ public class YangParserSimpleTest {
     }
 
     @Test
-    public void testAnyXml() {
+    public void testParseAnyXml() {
         Module testModule = TestUtils.findModule(modules, "simple-nodes");
         AnyXmlSchemaNode data = (AnyXmlSchemaNode) testModule.getDataChildByName("data");
         assertNotNull("'anyxml data not found'", data);
@@ -49,7 +59,7 @@ public class YangParserSimpleTest {
         // test SchemaNode args
         QName qname = data.getQName();
         assertEquals("data", qname.getLocalName());
-        assertEquals("sn", qname.getPrefix());
+        assertEquals(snPref, qname.getPrefix());
         assertEquals(snNS, qname.getNamespace());
         assertEquals(snRev, qname.getRevision());
         assertEquals("anyxml desc", data.getDescription());
@@ -71,9 +81,7 @@ public class YangParserSimpleTest {
 
         boolean found1 = false;
         boolean found2 = false;
-
         for (MustDefinition must : mustConstraints) {
-            System.out.println(must);
             if (must1.equals(must.toString())) {
                 found1 = true;
                 assertEquals(errMsg1, must.getErrorMessage());
@@ -93,4 +101,102 @@ public class YangParserSimpleTest {
         assertNull(constraints.getMaxElements());
     }
 
+    @Test
+    public void testParseContainer() {
+        Module test = TestUtils.findModule(modules, "simple-nodes");
+
+        ContainerSchemaNode nodes = (ContainerSchemaNode) test.getDataChildByName("nodes");
+        // test SchemaNode args
+        QName expectedQName = new QName(snNS, snRev, snPref, "nodes");
+        assertEquals(expectedQName, nodes.getQName());
+        SchemaPath expectedPath = TestUtils.createPath(true, snNS, snRev, snPref, "nodes");
+        assertEquals(expectedPath, nodes.getPath());
+        assertEquals("nodes collection", nodes.getDescription());
+        assertEquals("nodes ref", nodes.getReference());
+        assertEquals(Status.CURRENT, nodes.getStatus());
+        assertEquals(0, nodes.getUnknownSchemaNodes().size());
+        // test DataSchemaNode args
+        assertFalse(nodes.isAugmenting());
+        assertFalse(nodes.isConfiguration());
+
+        // constraints
+        ConstraintDefinition constraints = nodes.getConstraints();
+        assertEquals("class != 'wheel'", constraints.getWhenCondition().toString());
+        Set<MustDefinition> mustConstraints = constraints.getMustConstraints();
+        assertEquals(2, constraints.getMustConstraints().size());
+
+        String must1 = "\"ifType != 'atm' or (ifType = 'atm' and ifMTU <= 17966 and ifMTU >= 64)\"";
+        String errMsg1 = "An atm MTU must be  64 .. 17966";
+        String must2 = "ifId != 0";
+
+        boolean found1 = false;
+        boolean found2 = false;
+        for (MustDefinition must : mustConstraints) {
+            if (must1.equals(must.toString())) {
+                found1 = true;
+                assertEquals(errMsg1, must.getErrorMessage());
+            } else if (must2.equals(must.toString())) {
+                found2 = true;
+                assertNull(must.getErrorMessage());
+                assertNull(must.getErrorAppTag());
+                assertNull(must.getDescription());
+                assertNull(must.getReference());
+            }
+        }
+        assertTrue(found1);
+        assertTrue(found2);
+
+        assertFalse(constraints.isMandatory());
+        assertNull(constraints.getMinElements());
+        assertNull(constraints.getMaxElements());
+        assertTrue(nodes.isPresenceContainer());
+
+        // typedef
+        Set<TypeDefinition<?>> typedefs = nodes.getTypeDefinitions();
+        assertEquals(1, typedefs.size());
+        TypeDefinition<?> nodesType = typedefs.iterator().next();
+        QName typedefQName = new QName(snNS, snRev, snPref, "nodes-type");
+        assertEquals(typedefQName, nodesType.getQName());
+        SchemaPath nodesTypePath = TestUtils.createPath(true, snNS, snRev, snPref, "nodes", "nodes-type");
+        assertEquals(nodesTypePath, nodesType.getPath());
+        assertNull(nodesType.getDescription());
+        assertNull(nodesType.getReference());
+        assertEquals(Status.CURRENT, nodesType.getStatus());
+        assertEquals(0, nodesType.getUnknownSchemaNodes().size());
+
+        // child nodes
+        // total size = 8: defined 6, inserted by uses 2
+        assertEquals(8, nodes.getChildNodes().size());
+        AnyXmlSchemaNode text = (AnyXmlSchemaNode)nodes.getDataChildByName("text");
+        assertNotNull(text);
+        ChoiceNode level = (ChoiceNode)nodes.getDataChildByName("level");
+        assertNotNull(level);
+        ContainerSchemaNode node = (ContainerSchemaNode)nodes.getDataChildByName("node");
+        assertNotNull(node);
+        LeafSchemaNode nodesId = (LeafSchemaNode)nodes.getDataChildByName("nodes-id");
+        assertNotNull(nodesId);
+        LeafListSchemaNode added = (LeafListSchemaNode)nodes.getDataChildByName("added");
+        assertNotNull(added);
+        ListSchemaNode links = (ListSchemaNode) nodes.getDataChildByName("links");
+        assertNotNull(links);
+        assertFalse(links.isUserOrdered());
+        LeafSchemaNode source = (LeafSchemaNode)nodes.getDataChildByName("source");
+        assertNotNull(source);
+        LeafSchemaNode target = (LeafSchemaNode)nodes.getDataChildByName("target");
+        assertNotNull(target);
+
+        Set<GroupingDefinition> groupings = nodes.getGroupings();
+        assertEquals(1, groupings.size());
+        GroupingDefinition nodeGroup = groupings.iterator().next();
+        QName groupQName = new QName(snNS, snRev, snPref, "node-group");
+        assertEquals(groupQName, nodeGroup.getQName());
+        SchemaPath nodeGroupPath = TestUtils.createPath(true, snNS, snRev, snPref, "nodes", "node-group");
+        assertEquals(nodeGroupPath, nodeGroup.getPath());
+
+        Set<UsesNode> uses = nodes.getUses();
+        assertEquals(1, uses.size());
+        UsesNode use = uses.iterator().next();
+        assertEquals(nodeGroupPath, use.getGroupingPath());
+    }
+
 }
diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java b/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java
index c7af385f99..54fa4ba94d 100644
--- a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java
+++ b/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java
@@ -181,45 +181,6 @@ public class YangParserTest {
         assertArrayEquals(expectedOrder, actualOrder);
     }
 
-    @Test
-    public void testParseContainer() {
-        Module test = TestUtils.findModule(modules, "types");
-        URI expectedNamespace = URI.create("urn:simple.types.test");
-        String expectedPrefix = "t";
-
-        ContainerSchemaNode interfaces = (ContainerSchemaNode) test.getDataChildByName("interfaces");
-        // test SchemaNode args
-        QName expectedQName = new QName(expectedNamespace, typesRev, expectedPrefix, "interfaces");
-        assertEquals(expectedQName, interfaces.getQName());
-        SchemaPath expectedPath = TestUtils.createPath(true, expectedNamespace, typesRev, expectedPrefix, "interfaces");
-        assertEquals(expectedPath, interfaces.getPath());
-        assertNull(interfaces.getDescription());
-        assertNull(interfaces.getReference());
-        assertEquals(Status.CURRENT, interfaces.getStatus());
-        assertEquals(0, interfaces.getUnknownSchemaNodes().size());
-        // test DataSchemaNode args
-        assertFalse(interfaces.isAugmenting());
-        assertTrue(interfaces.isConfiguration());
-        ConstraintDefinition constraints = interfaces.getConstraints();
-        assertNull(constraints.getWhenCondition());
-        assertEquals(0, constraints.getMustConstraints().size());
-        assertFalse(constraints.isMandatory());
-        assertNull(constraints.getMinElements());
-        assertNull(constraints.getMaxElements());
-        // test AugmentationTarget args
-        assertEquals(0, interfaces.getAvailableAugmentations().size());
-        // test ContainerSchemaNode args
-        assertFalse(interfaces.isPresenceContainer());
-        // test DataNodeContainer args
-        assertEquals(0, interfaces.getTypeDefinitions().size());
-        assertEquals(1, interfaces.getChildNodes().size());
-        assertEquals(1, interfaces.getGroupings().size());
-        assertEquals(0, interfaces.getUses().size());
-
-        ListSchemaNode ifEntry = (ListSchemaNode) interfaces.getDataChildByName("ifEntry");
-        assertNotNull(ifEntry);
-    }
-
     @Test
     public void testParseList() {
         Module test = TestUtils.findModule(modules, "types");
@@ -703,33 +664,6 @@ public class YangParserTest {
         assertNotNull(output.getPath());
     }
 
-    @Test
-    public void testAnyXml() {
-        Module testModule = TestUtils.findModule(modules, "nodes");
-        AnyXmlSchemaNode data = (AnyXmlSchemaNode) testModule.getDataChildByName("datas");
-        assertNotNull("anyxml data not found", data);
-
-        // test SchemaNode args
-        QName qname = data.getQName();
-        assertEquals("datas", qname.getLocalName());
-        assertEquals("n", qname.getPrefix());
-        assertEquals(nodesNS, qname.getNamespace());
-        assertEquals(nodesRev, qname.getRevision());
-        assertTrue(data.getDescription().contains("Copy of the source typesstore subset that matched"));
-        assertNull(data.getReference());
-        assertEquals(Status.OBSOLETE, data.getStatus());
-        assertEquals(0, data.getUnknownSchemaNodes().size());
-        // test DataSchemaNode args
-        assertFalse(data.isAugmenting());
-        assertTrue(data.isConfiguration());
-        ConstraintDefinition constraints = data.getConstraints();
-        assertNull(constraints.getWhenCondition());
-        assertEquals(0, constraints.getMustConstraints().size());
-        assertFalse(constraints.isMandatory());
-        assertNull(constraints.getMinElements());
-        assertNull(constraints.getMaxElements());
-    }
-
     @Test
     public void testDeviation() {
         Module testModule = TestUtils.findModule(modules, "nodes");
diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationListTest.java b/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationListTest.java
index 4c72b006a2..88be5d8b0b 100644
--- a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationListTest.java
+++ b/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationListTest.java
@@ -12,14 +12,14 @@ import static org.junit.matchers.JUnitMatchers.containsString;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Default_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Key_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Leaf_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.List_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Mandatory_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Ordered_by_argContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Type_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Unique_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Default_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Key_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Leaf_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.List_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Mandatory_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Ordered_by_argContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Type_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Unique_stmtContext;
 import org.opendaylight.yangtools.yang.parser.util.YangValidationException;
 
 public class YangModelValidationListTest {
diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationModuleTest.java b/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationModuleTest.java
index 6a8bd9df27..19a3f60439 100644
--- a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationModuleTest.java
+++ b/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationModuleTest.java
@@ -13,12 +13,12 @@ import static org.mockito.Mockito.*;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Module_header_stmtsContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Module_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Namespace_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Revision_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Revision_stmtsContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Yang_version_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Module_header_stmtsContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Module_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Namespace_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Revision_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Revision_stmtsContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Yang_version_stmtContext;
 import org.opendaylight.yangtools.yang.parser.util.YangValidationException;
 
 public class YangModelValidationModuleTest {
diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationSubModuleTest.java b/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationSubModuleTest.java
index e6e0e3eb75..518d348e2d 100644
--- a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationSubModuleTest.java
+++ b/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationSubModuleTest.java
@@ -14,9 +14,9 @@ import static org.mockito.Mockito.mock;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Belongs_to_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Submodule_header_stmtsContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Submodule_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Belongs_to_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Submodule_header_stmtsContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Submodule_stmtContext;
 import org.opendaylight.yangtools.yang.parser.util.YangValidationException;
 
 public class YangModelValidationSubModuleTest {
diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationTest.java b/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationTest.java
index 114dd900f6..54000c21f9 100644
--- a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationTest.java
+++ b/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationTest.java
@@ -21,18 +21,18 @@ import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Augment_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Deviate_add_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Deviate_delete_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Deviation_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Import_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Include_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Module_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Namespace_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Prefix_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Revision_date_stmtContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Status_argContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.StringContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Augment_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Deviate_add_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Deviate_delete_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Deviation_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Import_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Include_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Module_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Namespace_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Prefix_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Revision_date_stmtContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Status_argContext;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.StringContext;
 import org.opendaylight.yangtools.yang.parser.impl.YangParserListenerImpl;
 import org.opendaylight.yangtools.yang.parser.util.YangValidationException;
 
diff --git a/yang-parser-impl/src/test/resources/simple-test/simple-nodes.yang b/yang-parser-impl/src/test/resources/simple-test/simple-nodes.yang
index f0dedd4d9b..9c3fd1a39a 100644
--- a/yang-parser-impl/src/test/resources/simple-test/simple-nodes.yang
+++ b/yang-parser-impl/src/test/resources/simple-test/simple-nodes.yang
@@ -31,10 +31,95 @@ module simple-nodes {
              error-message "An atm MTU must be  64 .. 17966";
              description "an error occured in data";
              reference "data must ref";
-        }     
+        }
         reference "data ref";
         status obsolete;
         when "class != 'wheel'";
     }
 
+    container nodes {
+        anyxml text;
+        choice level;
+        config false;
+        container node;
+        description "nodes collection";
+        grouping node-group {
+            leaf source {
+                type int8;
+            }
+            leaf target {
+                type int16;
+            }
+        }
+        if-feature has-name;
+        leaf nodes-id {
+            type int32;
+        }
+        leaf-list added {
+            type int64;
+        }
+        list links {
+        }
+        must "ifType != 'atm' or " +
+              "(ifType = 'atm' and ifMTU <= 17966 and ifMTU >= 64)" {
+             error-app-tag "anyxml data error-app-tag";
+             error-message "An atm MTU must be  64 .. 17966";
+             description "an error occured in data";
+             reference "data must ref";
+        }
+        must "ifId != 0";
+        presence "required";
+        reference "nodes ref";
+        status current;
+        typedef nodes-type {
+            type string;
+        }
+        uses node-group;
+        when "class != 'wheel'";
+    }
+
+    list links {
+        anyxml text;
+        choice level;
+        config false;
+        container link;
+        description "links collection";
+        grouping link-group {
+            leaf source {
+                type int8;
+            }
+            leaf target {
+                type int16;
+            }
+        }
+        if-feature has-name;
+        key links-id;
+        leaf links-id {
+            type int32;
+        }
+        leaf-list added {
+            type int64;
+        }
+        list nodes {
+        }
+        max-elements 100;
+        min-elements 1;
+        must "ifType != 'atm' or " +
+              "(ifType = 'atm' and ifMTU <= 17966 and ifMTU >= 64)" {
+             error-app-tag "anyxml data error-app-tag";
+             error-message "An atm MTU must be  64 .. 17966";
+             description "an error occured in data";
+             reference "data must ref";
+        }
+        must "ifId != 0";
+        ordered-by user;
+        reference "links ref";
+        status current;
+        typedef nodes-type {
+            type string;
+        }
+        uses link-group;
+        when "class != 'wheel'";
+    }
+
 }
diff --git a/yang-maven-plugin/pom.xml b/yangtools-maven-plugin/pom.xml
similarity index 97%
rename from yang-maven-plugin/pom.xml
rename to yangtools-maven-plugin/pom.xml
index a64ad1ed8b..55c1198329 100644
--- a/yang-maven-plugin/pom.xml
+++ b/yangtools-maven-plugin/pom.xml
@@ -8,7 +8,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>yang-maven-plugin</artifactId>
+    <artifactId>yangtools-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
     <description>
         This plugin is a wrapper for "yang to source code" generation.
@@ -94,6 +94,7 @@
                 <artifactId>maven-plugin-plugin</artifactId>
                 <version>3.2</version>
                 <configuration>
+                    <goalPrefix>yangtools</goalPrefix>
                     <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
                 </configuration>
                 <executions>
diff --git a/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ConfigArg.java b/yangtools-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ConfigArg.java
similarity index 100%
rename from yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ConfigArg.java
rename to yangtools-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ConfigArg.java
diff --git a/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/Util.java b/yangtools-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/Util.java
similarity index 100%
rename from yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/Util.java
rename to yangtools-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/Util.java
diff --git a/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojo.java b/yangtools-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojo.java
similarity index 100%
rename from yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojo.java
rename to yangtools-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojo.java
diff --git a/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java b/yangtools-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java
similarity index 100%
rename from yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java
rename to yangtools-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java
diff --git a/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java b/yangtools-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java
similarity index 100%
rename from yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java
rename to yangtools-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java
diff --git a/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/UtilTest.java b/yangtools-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/UtilTest.java
similarity index 100%
rename from yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/UtilTest.java
rename to yangtools-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/UtilTest.java
diff --git a/yang-maven-plugin/src/test/resources/yang/mock.yang b/yangtools-maven-plugin/src/test/resources/yang/mock.yang
similarity index 100%
rename from yang-maven-plugin/src/test/resources/yang/mock.yang
rename to yangtools-maven-plugin/src/test/resources/yang/mock.yang
-- 
2.36.6