Populate parser/ hierarchy

YANG parser has a large number of artifacts, as it is highly modular.
Move them to a dedicated top-level directory.

JIRA: YANGTOOLS-1149
Change-Id: Ic8d236ec64ec044f85c52fc81ab004e6fb5fd84b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/parser/README.md b/parser/README.md
new file mode 100644 (file)
index 0000000..9fe7a05
--- /dev/null
+++ b/parser/README.md
@@ -0,0 +1,4 @@
+# YANG module parser/compiler
+
+This directory contains public API and private APIs and their implementations dealing with parsing
+and cross-referencing YANG (and YIN) modules.

diff --git a/yang/odlext-parser-support/pom.xml b/parser/odlext-parser-support/pom.xml
similarity index 100%
rename from yang/odlext-parser-support/pom.xml
rename to parser/odlext-parser-support/pom.xml

diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AbstractIdentityAwareEffectiveStatement.java b/parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AbstractIdentityAwareEffectiveStatement.java
similarity index 100%
rename from yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AbstractIdentityAwareEffectiveStatement.java
rename to parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AbstractIdentityAwareEffectiveStatement.java

diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AbstractIdentityAwareStatementSupport.java b/parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AbstractIdentityAwareStatementSupport.java
similarity index 100%
rename from yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AbstractIdentityAwareStatementSupport.java
rename to parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AbstractIdentityAwareStatementSupport.java

diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AugmentIdentifierEffectiveStatementImpl.java b/parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AugmentIdentifierEffectiveStatementImpl.java
similarity index 100%
rename from yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AugmentIdentifierEffectiveStatementImpl.java
rename to parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AugmentIdentifierEffectiveStatementImpl.java

diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AugmentIdentifierStatementImpl.java b/parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AugmentIdentifierStatementImpl.java
similarity index 100%
rename from yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AugmentIdentifierStatementImpl.java
rename to parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AugmentIdentifierStatementImpl.java

diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AugmentIdentifierStatementSupport.java b/parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AugmentIdentifierStatementSupport.java
similarity index 100%
rename from yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AugmentIdentifierStatementSupport.java
rename to parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AugmentIdentifierStatementSupport.java

diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextInstanceEffectiveStatementImpl.java b/parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextInstanceEffectiveStatementImpl.java
similarity index 100%
rename from yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextInstanceEffectiveStatementImpl.java
rename to parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextInstanceEffectiveStatementImpl.java

diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextInstanceStatementImpl.java b/parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextInstanceStatementImpl.java
similarity index 100%
rename from yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextInstanceStatementImpl.java
rename to parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextInstanceStatementImpl.java

diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextInstanceStatementSupport.java b/parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextInstanceStatementSupport.java
similarity index 100%
rename from yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextInstanceStatementSupport.java
rename to parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextInstanceStatementSupport.java

diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextReferenceEffectiveStatementImpl.java b/parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextReferenceEffectiveStatementImpl.java
similarity index 100%
rename from yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextReferenceEffectiveStatementImpl.java
rename to parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextReferenceEffectiveStatementImpl.java

diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextReferenceStatementImpl.java b/parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextReferenceStatementImpl.java
similarity index 100%
rename from yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextReferenceStatementImpl.java
rename to parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextReferenceStatementImpl.java

diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextReferenceStatementSupport.java b/parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextReferenceStatementSupport.java
similarity index 100%
rename from yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextReferenceStatementSupport.java
rename to parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/ContextReferenceStatementSupport.java

diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/InstanceTargetEffectiveStatementImpl.java b/parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/InstanceTargetEffectiveStatementImpl.java
similarity index 100%
rename from yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/InstanceTargetEffectiveStatementImpl.java
rename to parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/InstanceTargetEffectiveStatementImpl.java

diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/InstanceTargetStatementImpl.java b/parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/InstanceTargetStatementImpl.java
similarity index 100%
rename from yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/InstanceTargetStatementImpl.java
rename to parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/InstanceTargetStatementImpl.java

diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/InstanceTargetStatementSupport.java b/parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/InstanceTargetStatementSupport.java
similarity index 100%
rename from yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/InstanceTargetStatementSupport.java
rename to parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/InstanceTargetStatementSupport.java

diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RefAugmentIdentifierStatement.java b/parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RefAugmentIdentifierStatement.java
similarity index 100%
rename from yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RefAugmentIdentifierStatement.java
rename to parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RefAugmentIdentifierStatement.java

diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RefContextInstanceStatement.java b/parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RefContextInstanceStatement.java
similarity index 100%
rename from yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RefContextInstanceStatement.java
rename to parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RefContextInstanceStatement.java

diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RefContextReferenceStatement.java b/parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RefContextReferenceStatement.java
similarity index 100%
rename from yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RefContextReferenceStatement.java
rename to parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RefContextReferenceStatement.java

diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RefInstanceTargetStatement.java b/parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RefInstanceTargetStatement.java
similarity index 100%
rename from yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RefInstanceTargetStatement.java
rename to parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RefInstanceTargetStatement.java

diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RefRpcContextReferenceStatement.java b/parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RefRpcContextReferenceStatement.java
similarity index 100%
rename from yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RefRpcContextReferenceStatement.java
rename to parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RefRpcContextReferenceStatement.java

diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RpcContextReferenceEffectiveStatementImpl.java b/parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RpcContextReferenceEffectiveStatementImpl.java
similarity index 100%
rename from yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RpcContextReferenceEffectiveStatementImpl.java
rename to parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RpcContextReferenceEffectiveStatementImpl.java

diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RpcContextReferenceStatementImpl.java b/parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RpcContextReferenceStatementImpl.java
similarity index 100%
rename from yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RpcContextReferenceStatementImpl.java
rename to parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RpcContextReferenceStatementImpl.java

diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RpcContextReferenceStatementSupport.java b/parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RpcContextReferenceStatementSupport.java
similarity index 100%
rename from yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RpcContextReferenceStatementSupport.java
rename to parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/RpcContextReferenceStatementSupport.java

diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/package-info.java b/parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/package-info.java
similarity index 100%
rename from yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/package-info.java
rename to parser/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/package-info.java

diff --git a/yang/odlext-parser-support/src/test/java/org/opendaylight/yangtools/odlext/parser/ContextReferenceTest.java b/parser/odlext-parser-support/src/test/java/org/opendaylight/yangtools/odlext/parser/ContextReferenceTest.java
similarity index 100%
rename from yang/odlext-parser-support/src/test/java/org/opendaylight/yangtools/odlext/parser/ContextReferenceTest.java
rename to parser/odlext-parser-support/src/test/java/org/opendaylight/yangtools/odlext/parser/ContextReferenceTest.java

diff --git a/yang/odlext-parser-support/src/test/resources/ctxref.yang b/parser/odlext-parser-support/src/test/resources/ctxref.yang
similarity index 100%
rename from yang/odlext-parser-support/src/test/resources/ctxref.yang
rename to parser/odlext-parser-support/src/test/resources/ctxref.yang

diff --git a/yang/odlext-parser-support/src/test/resources/yang-ext.yang b/parser/odlext-parser-support/src/test/resources/yang-ext.yang
similarity index 100%
rename from yang/odlext-parser-support/src/test/resources/yang-ext.yang
rename to parser/odlext-parser-support/src/test/resources/yang-ext.yang

diff --git a/yang/openconfig-parser-support/pom.xml b/parser/openconfig-parser-support/pom.xml
similarity index 100%
rename from yang/openconfig-parser-support/pom.xml
rename to parser/openconfig-parser-support/pom.xml

diff --git a/yang/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/AbstractHashedValueStatementSupport.java b/parser/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/AbstractHashedValueStatementSupport.java
similarity index 100%
rename from yang/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/AbstractHashedValueStatementSupport.java
rename to parser/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/AbstractHashedValueStatementSupport.java

diff --git a/yang/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/EncryptedValueStatementSupport.java b/parser/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/EncryptedValueStatementSupport.java
similarity index 100%
rename from yang/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/EncryptedValueStatementSupport.java
rename to parser/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/EncryptedValueStatementSupport.java

diff --git a/yang/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/HashedValueStatementSupport.java b/parser/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/HashedValueStatementSupport.java
similarity index 100%
rename from yang/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/HashedValueStatementSupport.java
rename to parser/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/HashedValueStatementSupport.java

diff --git a/yang/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/OpenConfigHashedValueEffectiveStatementImpl.java b/parser/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/OpenConfigHashedValueEffectiveStatementImpl.java
similarity index 100%
rename from yang/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/OpenConfigHashedValueEffectiveStatementImpl.java
rename to parser/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/OpenConfigHashedValueEffectiveStatementImpl.java

diff --git a/yang/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/OpenConfigHashedValueStatementImpl.java b/parser/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/OpenConfigHashedValueStatementImpl.java
similarity index 100%
rename from yang/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/OpenConfigHashedValueStatementImpl.java
rename to parser/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/OpenConfigHashedValueStatementImpl.java

diff --git a/yang/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/RefOpenConfigHashedValueStatement.java b/parser/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/RefOpenConfigHashedValueStatement.java
similarity index 100%
rename from yang/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/RefOpenConfigHashedValueStatement.java
rename to parser/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/RefOpenConfigHashedValueStatement.java

diff --git a/yang/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/package-info.java b/parser/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/package-info.java
similarity index 100%
rename from yang/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/package-info.java
rename to parser/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/package-info.java

diff --git a/parser/pom.xml b/parser/pom.xml
new file mode 100644 (file)
index 0000000..47f8342
--- /dev/null
+++ b/parser/pom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright © 2021 PANTHEON.tech, s.r.o. and others.  All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>9.0.0</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.yangtools</groupId>
+    <artifactId>parser-aggregator</artifactId>
+    <version>7.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <properties>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <maven.install.skip>true</maven.install.skip>
+    </properties>
+
+    <modules>
+        <!-- YANG parser end-user API -->
+        <module>yang-parser-api</module>
+        <module>yang-test-util</module>
+
+        <!-- YANG parser reference implementation -->
+        <module>yang-parser-impl</module>
+
+        <!-- Metamodel statement reactor -->
+        <module>yang-parser-spi</module>
+        <module>yang-parser-reactor</module>
+
+        <!-- Combined RFC6020/RFC7960 metamodel implementation. Also includes support
+             for OpenConfig's semantic-version extension. -->
+        <module>yang-parser-antlr</module>
+        <module>yang-parser-rfc7950</module>
+
+        <!-- Support for IETF YANG extensions -->
+        <module>rfc6241-parser-support</module>
+        <module>rfc6536-parser-support</module>
+        <module>rfc6643-parser-support</module>
+        <module>rfc7952-parser-support</module>
+        <module>rfc8040-parser-support</module>
+        <module>rfc8528-parser-support</module>
+
+        <!-- Support for OpenDaylight YANG extensions -->
+        <module>odlext-parser-support</module>
+
+        <!-- Support for OpenConfig YANG extensions. -->
+        <module>openconfig-parser-support</module>
+    </modules>
+</project>

diff --git a/yang/rfc6241-parser-support/pom.xml b/parser/rfc6241-parser-support/pom.xml
similarity index 100%
rename from yang/rfc6241-parser-support/pom.xml
rename to parser/rfc6241-parser-support/pom.xml

diff --git a/yang/rfc6241-parser-support/src/main/java/org/opendaylight/yangtools/rfc6241/parser/GetFilterElementAttributesEffectiveStatementImpl.java b/parser/rfc6241-parser-support/src/main/java/org/opendaylight/yangtools/rfc6241/parser/GetFilterElementAttributesEffectiveStatementImpl.java
similarity index 100%
rename from yang/rfc6241-parser-support/src/main/java/org/opendaylight/yangtools/rfc6241/parser/GetFilterElementAttributesEffectiveStatementImpl.java
rename to parser/rfc6241-parser-support/src/main/java/org/opendaylight/yangtools/rfc6241/parser/GetFilterElementAttributesEffectiveStatementImpl.java

diff --git a/yang/rfc6241-parser-support/src/main/java/org/opendaylight/yangtools/rfc6241/parser/GetFilterElementAttributesStatementImpl.java b/parser/rfc6241-parser-support/src/main/java/org/opendaylight/yangtools/rfc6241/parser/GetFilterElementAttributesStatementImpl.java
similarity index 100%
rename from yang/rfc6241-parser-support/src/main/java/org/opendaylight/yangtools/rfc6241/parser/GetFilterElementAttributesStatementImpl.java
rename to parser/rfc6241-parser-support/src/main/java/org/opendaylight/yangtools/rfc6241/parser/GetFilterElementAttributesStatementImpl.java

diff --git a/yang/rfc6241-parser-support/src/main/java/org/opendaylight/yangtools/rfc6241/parser/GetFilterElementAttributesStatementSupport.java b/parser/rfc6241-parser-support/src/main/java/org/opendaylight/yangtools/rfc6241/parser/GetFilterElementAttributesStatementSupport.java
similarity index 100%
rename from yang/rfc6241-parser-support/src/main/java/org/opendaylight/yangtools/rfc6241/parser/GetFilterElementAttributesStatementSupport.java
rename to parser/rfc6241-parser-support/src/main/java/org/opendaylight/yangtools/rfc6241/parser/GetFilterElementAttributesStatementSupport.java

diff --git a/yang/rfc6241-parser-support/src/main/java/org/opendaylight/yangtools/rfc6241/parser/RefGetFilterElementAttributesStatement.java b/parser/rfc6241-parser-support/src/main/java/org/opendaylight/yangtools/rfc6241/parser/RefGetFilterElementAttributesStatement.java
similarity index 100%
rename from yang/rfc6241-parser-support/src/main/java/org/opendaylight/yangtools/rfc6241/parser/RefGetFilterElementAttributesStatement.java
rename to parser/rfc6241-parser-support/src/main/java/org/opendaylight/yangtools/rfc6241/parser/RefGetFilterElementAttributesStatement.java

diff --git a/yang/rfc6241-parser-support/src/main/java/org/opendaylight/yangtools/rfc6241/parser/package-info.java b/parser/rfc6241-parser-support/src/main/java/org/opendaylight/yangtools/rfc6241/parser/package-info.java
similarity index 100%
rename from yang/rfc6241-parser-support/src/main/java/org/opendaylight/yangtools/rfc6241/parser/package-info.java
rename to parser/rfc6241-parser-support/src/main/java/org/opendaylight/yangtools/rfc6241/parser/package-info.java

diff --git a/yang/rfc6241-parser-support/src/test/java/org/opendaylight/yangtools/rfc6241/parser/NetconfTest.java b/parser/rfc6241-parser-support/src/test/java/org/opendaylight/yangtools/rfc6241/parser/NetconfTest.java
similarity index 100%
rename from yang/rfc6241-parser-support/src/test/java/org/opendaylight/yangtools/rfc6241/parser/NetconfTest.java
rename to parser/rfc6241-parser-support/src/test/java/org/opendaylight/yangtools/rfc6241/parser/NetconfTest.java

diff --git a/yang/rfc6241-parser-support/src/test/resources/ietf-inet-types@2013-07-15.yang b/parser/rfc6241-parser-support/src/test/resources/ietf-inet-types@2013-07-15.yang
similarity index 100%
rename from yang/rfc6241-parser-support/src/test/resources/ietf-inet-types@2013-07-15.yang
rename to parser/rfc6241-parser-support/src/test/resources/ietf-inet-types@2013-07-15.yang

diff --git a/yang/rfc6241-parser-support/src/test/resources/ietf-netconf@2011-06-01.yang b/parser/rfc6241-parser-support/src/test/resources/ietf-netconf@2011-06-01.yang
similarity index 100%
rename from yang/rfc6241-parser-support/src/test/resources/ietf-netconf@2011-06-01.yang
rename to parser/rfc6241-parser-support/src/test/resources/ietf-netconf@2011-06-01.yang

diff --git a/yang/rfc6536-parser-support/pom.xml b/parser/rfc6536-parser-support/pom.xml
similarity index 100%
rename from yang/rfc6536-parser-support/pom.xml
rename to parser/rfc6536-parser-support/pom.xml

diff --git a/yang/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/DefaultDenyAllEffectiveStatementImpl.java b/parser/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/DefaultDenyAllEffectiveStatementImpl.java
similarity index 100%
rename from yang/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/DefaultDenyAllEffectiveStatementImpl.java
rename to parser/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/DefaultDenyAllEffectiveStatementImpl.java

diff --git a/yang/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/DefaultDenyAllStatementImpl.java b/parser/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/DefaultDenyAllStatementImpl.java
similarity index 100%
rename from yang/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/DefaultDenyAllStatementImpl.java
rename to parser/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/DefaultDenyAllStatementImpl.java

diff --git a/yang/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/DefaultDenyAllStatementSupport.java b/parser/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/DefaultDenyAllStatementSupport.java
similarity index 100%
rename from yang/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/DefaultDenyAllStatementSupport.java
rename to parser/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/DefaultDenyAllStatementSupport.java

diff --git a/yang/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/DefaultDenyWriteEffectiveStatementImpl.java b/parser/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/DefaultDenyWriteEffectiveStatementImpl.java
similarity index 100%
rename from yang/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/DefaultDenyWriteEffectiveStatementImpl.java
rename to parser/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/DefaultDenyWriteEffectiveStatementImpl.java

diff --git a/yang/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/DefaultDenyWriteStatementImpl.java b/parser/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/DefaultDenyWriteStatementImpl.java
similarity index 100%
rename from yang/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/DefaultDenyWriteStatementImpl.java
rename to parser/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/DefaultDenyWriteStatementImpl.java

diff --git a/yang/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/DefaultDenyWriteStatementSupport.java b/parser/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/DefaultDenyWriteStatementSupport.java
similarity index 100%
rename from yang/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/DefaultDenyWriteStatementSupport.java
rename to parser/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/DefaultDenyWriteStatementSupport.java

diff --git a/yang/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/RefDefaultDenyAllStatement.java b/parser/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/RefDefaultDenyAllStatement.java
similarity index 100%
rename from yang/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/RefDefaultDenyAllStatement.java
rename to parser/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/RefDefaultDenyAllStatement.java

diff --git a/yang/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/RefDefaultDenyWriteStatement.java b/parser/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/RefDefaultDenyWriteStatement.java
similarity index 100%
rename from yang/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/RefDefaultDenyWriteStatement.java
rename to parser/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/RefDefaultDenyWriteStatement.java

diff --git a/yang/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/package-info.java b/parser/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/package-info.java
similarity index 100%
rename from yang/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/package-info.java
rename to parser/rfc6536-parser-support/src/main/java/org/opendaylight/yangtools/rfc6536/parser/package-info.java

diff --git a/yang/rfc6536-parser-support/src/test/java/org/opendaylight/yangtools/rfc6536/parser/NACMTest.java b/parser/rfc6536-parser-support/src/test/java/org/opendaylight/yangtools/rfc6536/parser/NACMTest.java
similarity index 100%
rename from yang/rfc6536-parser-support/src/test/java/org/opendaylight/yangtools/rfc6536/parser/NACMTest.java
rename to parser/rfc6536-parser-support/src/test/java/org/opendaylight/yangtools/rfc6536/parser/NACMTest.java

diff --git a/yang/rfc6536-parser-support/src/test/resources/ietf-netconf-acm@2012-02-22.yang b/parser/rfc6536-parser-support/src/test/resources/ietf-netconf-acm@2012-02-22.yang
similarity index 100%
rename from yang/rfc6536-parser-support/src/test/resources/ietf-netconf-acm@2012-02-22.yang
rename to parser/rfc6536-parser-support/src/test/resources/ietf-netconf-acm@2012-02-22.yang

diff --git a/yang/rfc6536-parser-support/src/test/resources/ietf-yang-types@2013-07-15.yang b/parser/rfc6536-parser-support/src/test/resources/ietf-yang-types@2013-07-15.yang
similarity index 100%
rename from yang/rfc6536-parser-support/src/test/resources/ietf-yang-types@2013-07-15.yang
rename to parser/rfc6536-parser-support/src/test/resources/ietf-yang-types@2013-07-15.yang

diff --git a/yang/rfc6643-parser-support/pom.xml b/parser/rfc6643-parser-support/pom.xml
similarity index 100%
rename from yang/rfc6643-parser-support/pom.xml
rename to parser/rfc6643-parser-support/pom.xml

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/AliasEffectiveStatementImpl.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/AliasEffectiveStatementImpl.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/AliasEffectiveStatementImpl.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/AliasEffectiveStatementImpl.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/AliasStatementImpl.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/AliasStatementImpl.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/AliasStatementImpl.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/AliasStatementImpl.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/AliasStatementSupport.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/AliasStatementSupport.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/AliasStatementSupport.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/AliasStatementSupport.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DefValEffectiveStatementImpl.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DefValEffectiveStatementImpl.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DefValEffectiveStatementImpl.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DefValEffectiveStatementImpl.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DefValStatementImpl.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DefValStatementImpl.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DefValStatementImpl.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DefValStatementImpl.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DefValStatementSupport.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DefValStatementSupport.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DefValStatementSupport.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DefValStatementSupport.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DisplayHintEffectiveStatementImpl.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DisplayHintEffectiveStatementImpl.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DisplayHintEffectiveStatementImpl.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DisplayHintEffectiveStatementImpl.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DisplayHintStatementImpl.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DisplayHintStatementImpl.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DisplayHintStatementImpl.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DisplayHintStatementImpl.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DisplayHintStatementSupport.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DisplayHintStatementSupport.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DisplayHintStatementSupport.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DisplayHintStatementSupport.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/ImpliedEffectiveStatementImpl.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/ImpliedEffectiveStatementImpl.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/ImpliedEffectiveStatementImpl.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/ImpliedEffectiveStatementImpl.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/ImpliedStatementImpl.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/ImpliedStatementImpl.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/ImpliedStatementImpl.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/ImpliedStatementImpl.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/ImpliedStatementSupport.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/ImpliedStatementSupport.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/ImpliedStatementSupport.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/ImpliedStatementSupport.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessEffectiveStatementImpl.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessEffectiveStatementImpl.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessEffectiveStatementImpl.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessEffectiveStatementImpl.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessStatementImpl.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessStatementImpl.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessStatementImpl.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessStatementImpl.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessStatementSupport.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessStatementSupport.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessStatementSupport.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessStatementSupport.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/OidEffectiveStatementImpl.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/OidEffectiveStatementImpl.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/OidEffectiveStatementImpl.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/OidEffectiveStatementImpl.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/OidStatementImpl.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/OidStatementImpl.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/OidStatementImpl.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/OidStatementImpl.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/OidStatementSupport.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/OidStatementSupport.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/OidStatementSupport.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/OidStatementSupport.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefAliasStatement.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefAliasStatement.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefAliasStatement.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefAliasStatement.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefDefValStatement.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefDefValStatement.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefDefValStatement.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefDefValStatement.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefDisplayHintStatement.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefDisplayHintStatement.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefDisplayHintStatement.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefDisplayHintStatement.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefImpliedStatement.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefImpliedStatement.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefImpliedStatement.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefImpliedStatement.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefMaxAccessStatement.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefMaxAccessStatement.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefMaxAccessStatement.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefMaxAccessStatement.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefOidStatement.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefOidStatement.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefOidStatement.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefOidStatement.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefSubIdStatement.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefSubIdStatement.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefSubIdStatement.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/RefSubIdStatement.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdEffectiveStatementImpl.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdEffectiveStatementImpl.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdEffectiveStatementImpl.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdEffectiveStatementImpl.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdStatementImpl.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdStatementImpl.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdStatementImpl.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdStatementImpl.java

diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdStatementSupport.java b/parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdStatementSupport.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdStatementSupport.java
rename to parser/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdStatementSupport.java

diff --git a/yang/rfc6643-parser-support/src/test/java/org/opendaylight/yangtools/rfc6643/parser/IetfYangSmiv2ExtensionPluginTest.java b/parser/rfc6643-parser-support/src/test/java/org/opendaylight/yangtools/rfc6643/parser/IetfYangSmiv2ExtensionPluginTest.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/test/java/org/opendaylight/yangtools/rfc6643/parser/IetfYangSmiv2ExtensionPluginTest.java
rename to parser/rfc6643-parser-support/src/test/java/org/opendaylight/yangtools/rfc6643/parser/IetfYangSmiv2ExtensionPluginTest.java

diff --git a/yang/rfc6643-parser-support/src/test/java/org/opendaylight/yangtools/rfc6643/parser/IetfYangSmiv2ExtensionsMappingTest.java b/parser/rfc6643-parser-support/src/test/java/org/opendaylight/yangtools/rfc6643/parser/IetfYangSmiv2ExtensionsMappingTest.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/test/java/org/opendaylight/yangtools/rfc6643/parser/IetfYangSmiv2ExtensionsMappingTest.java
rename to parser/rfc6643-parser-support/src/test/java/org/opendaylight/yangtools/rfc6643/parser/IetfYangSmiv2ExtensionsMappingTest.java

diff --git a/yang/rfc6643-parser-support/src/test/java/org/opendaylight/yangtools/rfc6643/parser/ObjectIdentifierTest.java b/parser/rfc6643-parser-support/src/test/java/org/opendaylight/yangtools/rfc6643/parser/ObjectIdentifierTest.java
similarity index 100%
rename from yang/rfc6643-parser-support/src/test/java/org/opendaylight/yangtools/rfc6643/parser/ObjectIdentifierTest.java
rename to parser/rfc6643-parser-support/src/test/java/org/opendaylight/yangtools/rfc6643/parser/ObjectIdentifierTest.java

diff --git a/yang/rfc6643-parser-support/src/test/resources/foo.yang b/parser/rfc6643-parser-support/src/test/resources/foo.yang
similarity index 100%
rename from yang/rfc6643-parser-support/src/test/resources/foo.yang
rename to parser/rfc6643-parser-support/src/test/resources/foo.yang

diff --git a/yang/rfc6643-parser-support/src/test/resources/ietf-yang-smiv2.yang b/parser/rfc6643-parser-support/src/test/resources/ietf-yang-smiv2.yang
similarity index 100%
rename from yang/rfc6643-parser-support/src/test/resources/ietf-yang-smiv2.yang
rename to parser/rfc6643-parser-support/src/test/resources/ietf-yang-smiv2.yang

diff --git a/yang/rfc7952-parser-support/pom.xml b/parser/rfc7952-parser-support/pom.xml
similarity index 100%
rename from yang/rfc7952-parser-support/pom.xml
rename to parser/rfc7952-parser-support/pom.xml

diff --git a/yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationEffectiveStatementImpl.java b/parser/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationEffectiveStatementImpl.java
similarity index 100%
rename from yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationEffectiveStatementImpl.java
rename to parser/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationEffectiveStatementImpl.java

diff --git a/yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementImpl.java b/parser/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementImpl.java
similarity index 100%
rename from yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementImpl.java
rename to parser/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementImpl.java

diff --git a/yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementSupport.java b/parser/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementSupport.java
similarity index 100%
rename from yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementSupport.java
rename to parser/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementSupport.java

diff --git a/yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/RefAnnotationStatement.java b/parser/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/RefAnnotationStatement.java
similarity index 100%
rename from yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/RefAnnotationStatement.java
rename to parser/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/RefAnnotationStatement.java

diff --git a/yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/package-info.java b/parser/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/package-info.java
similarity index 100%
rename from yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/package-info.java
rename to parser/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/package-info.java

diff --git a/yang/rfc7952-parser-support/src/test/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationTest.java b/parser/rfc7952-parser-support/src/test/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationTest.java
similarity index 100%
rename from yang/rfc7952-parser-support/src/test/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationTest.java
rename to parser/rfc7952-parser-support/src/test/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationTest.java

diff --git a/yang/rfc7952-parser-support/src/test/resources/example-last-modified.yang b/parser/rfc7952-parser-support/src/test/resources/example-last-modified.yang
similarity index 100%
rename from yang/rfc7952-parser-support/src/test/resources/example-last-modified.yang
rename to parser/rfc7952-parser-support/src/test/resources/example-last-modified.yang

diff --git a/yang/rfc7952-parser-support/src/test/resources/ietf-yang-metadata@2016-08-05.yang b/parser/rfc7952-parser-support/src/test/resources/ietf-yang-metadata@2016-08-05.yang
similarity index 100%
rename from yang/rfc7952-parser-support/src/test/resources/ietf-yang-metadata@2016-08-05.yang
rename to parser/rfc7952-parser-support/src/test/resources/ietf-yang-metadata@2016-08-05.yang

diff --git a/yang/rfc8040-parser-support/pom.xml b/parser/rfc8040-parser-support/pom.xml
similarity index 100%
rename from yang/rfc8040-parser-support/pom.xml
rename to parser/rfc8040-parser-support/pom.xml

diff --git a/yang/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/RefYangDataStatement.java b/parser/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/RefYangDataStatement.java
similarity index 100%
rename from yang/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/RefYangDataStatement.java
rename to parser/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/RefYangDataStatement.java

diff --git a/yang/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataArgumentNamespace.java b/parser/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataArgumentNamespace.java
similarity index 100%
rename from yang/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataArgumentNamespace.java
rename to parser/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataArgumentNamespace.java

diff --git a/yang/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataEffectiveStatementImpl.java b/parser/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataEffectiveStatementImpl.java
similarity index 100%
rename from yang/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataEffectiveStatementImpl.java
rename to parser/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataEffectiveStatementImpl.java

diff --git a/yang/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataStatementImpl.java b/parser/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataStatementImpl.java
similarity index 100%
rename from yang/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataStatementImpl.java
rename to parser/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataStatementImpl.java

diff --git a/yang/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataStatementSupport.java b/parser/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataStatementSupport.java
similarity index 100%
rename from yang/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataStatementSupport.java
rename to parser/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataStatementSupport.java

diff --git a/yang/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/package-info.java b/parser/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/package-info.java
similarity index 100%
rename from yang/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/package-info.java
rename to parser/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/package-info.java

diff --git a/yang/rfc8040-parser-support/src/test/java/org/opendaylight/yangtools/rfc8040/parser/YangDataExtensionTest.java b/parser/rfc8040-parser-support/src/test/java/org/opendaylight/yangtools/rfc8040/parser/YangDataExtensionTest.java
similarity index 100%
rename from yang/rfc8040-parser-support/src/test/java/org/opendaylight/yangtools/rfc8040/parser/YangDataExtensionTest.java
rename to parser/rfc8040-parser-support/src/test/java/org/opendaylight/yangtools/rfc8040/parser/YangDataExtensionTest.java

diff --git a/yang/rfc8040-parser-support/src/test/resources/yang-data-extension-test/bar.yang b/parser/rfc8040-parser-support/src/test/resources/yang-data-extension-test/bar.yang
similarity index 100%
rename from yang/rfc8040-parser-support/src/test/resources/yang-data-extension-test/bar.yang
rename to parser/rfc8040-parser-support/src/test/resources/yang-data-extension-test/bar.yang

diff --git a/yang/rfc8040-parser-support/src/test/resources/yang-data-extension-test/baz.yang b/parser/rfc8040-parser-support/src/test/resources/yang-data-extension-test/baz.yang
similarity index 100%
rename from yang/rfc8040-parser-support/src/test/resources/yang-data-extension-test/baz.yang
rename to parser/rfc8040-parser-support/src/test/resources/yang-data-extension-test/baz.yang

diff --git a/yang/rfc8040-parser-support/src/test/resources/yang-data-extension-test/foo-invalid-1.yang b/parser/rfc8040-parser-support/src/test/resources/yang-data-extension-test/foo-invalid-1.yang
similarity index 100%
rename from yang/rfc8040-parser-support/src/test/resources/yang-data-extension-test/foo-invalid-1.yang
rename to parser/rfc8040-parser-support/src/test/resources/yang-data-extension-test/foo-invalid-1.yang

diff --git a/yang/rfc8040-parser-support/src/test/resources/yang-data-extension-test/foo-invalid-2.yang b/parser/rfc8040-parser-support/src/test/resources/yang-data-extension-test/foo-invalid-2.yang
similarity index 100%
rename from yang/rfc8040-parser-support/src/test/resources/yang-data-extension-test/foo-invalid-2.yang
rename to parser/rfc8040-parser-support/src/test/resources/yang-data-extension-test/foo-invalid-2.yang

diff --git a/yang/rfc8040-parser-support/src/test/resources/yang-data-extension-test/foo-invalid-3.yang b/parser/rfc8040-parser-support/src/test/resources/yang-data-extension-test/foo-invalid-3.yang
similarity index 100%
rename from yang/rfc8040-parser-support/src/test/resources/yang-data-extension-test/foo-invalid-3.yang
rename to parser/rfc8040-parser-support/src/test/resources/yang-data-extension-test/foo-invalid-3.yang

diff --git a/yang/rfc8040-parser-support/src/test/resources/yang-data-extension-test/foo.yang b/parser/rfc8040-parser-support/src/test/resources/yang-data-extension-test/foo.yang
similarity index 100%
rename from yang/rfc8040-parser-support/src/test/resources/yang-data-extension-test/foo.yang
rename to parser/rfc8040-parser-support/src/test/resources/yang-data-extension-test/foo.yang

diff --git a/yang/rfc8040-parser-support/src/test/resources/yang-data-extension-test/foobar.yang b/parser/rfc8040-parser-support/src/test/resources/yang-data-extension-test/foobar.yang
similarity index 100%
rename from yang/rfc8040-parser-support/src/test/resources/yang-data-extension-test/foobar.yang
rename to parser/rfc8040-parser-support/src/test/resources/yang-data-extension-test/foobar.yang

diff --git a/yang/rfc8040-parser-support/src/test/resources/yang-data-extension-test/ietf-restconf.yang b/parser/rfc8040-parser-support/src/test/resources/yang-data-extension-test/ietf-restconf.yang
similarity index 100%
rename from yang/rfc8040-parser-support/src/test/resources/yang-data-extension-test/ietf-restconf.yang
rename to parser/rfc8040-parser-support/src/test/resources/yang-data-extension-test/ietf-restconf.yang

diff --git a/yang/rfc8528-parser-support/pom.xml b/parser/rfc8528-parser-support/pom.xml
similarity index 100%
rename from yang/rfc8528-parser-support/pom.xml
rename to parser/rfc8528-parser-support/pom.xml

diff --git a/yang/rfc8528-parser-support/src/main/java/org/opendaylight/yangtools/rfc8528/parser/MountPointEffectiveStatementImpl.java b/parser/rfc8528-parser-support/src/main/java/org/opendaylight/yangtools/rfc8528/parser/MountPointEffectiveStatementImpl.java
similarity index 100%
rename from yang/rfc8528-parser-support/src/main/java/org/opendaylight/yangtools/rfc8528/parser/MountPointEffectiveStatementImpl.java
rename to parser/rfc8528-parser-support/src/main/java/org/opendaylight/yangtools/rfc8528/parser/MountPointEffectiveStatementImpl.java

diff --git a/yang/rfc8528-parser-support/src/main/java/org/opendaylight/yangtools/rfc8528/parser/MountPointStatementImpl.java b/parser/rfc8528-parser-support/src/main/java/org/opendaylight/yangtools/rfc8528/parser/MountPointStatementImpl.java
similarity index 100%
rename from yang/rfc8528-parser-support/src/main/java/org/opendaylight/yangtools/rfc8528/parser/MountPointStatementImpl.java
rename to parser/rfc8528-parser-support/src/main/java/org/opendaylight/yangtools/rfc8528/parser/MountPointStatementImpl.java

diff --git a/yang/rfc8528-parser-support/src/main/java/org/opendaylight/yangtools/rfc8528/parser/MountPointStatementSupport.java b/parser/rfc8528-parser-support/src/main/java/org/opendaylight/yangtools/rfc8528/parser/MountPointStatementSupport.java
similarity index 100%
rename from yang/rfc8528-parser-support/src/main/java/org/opendaylight/yangtools/rfc8528/parser/MountPointStatementSupport.java
rename to parser/rfc8528-parser-support/src/main/java/org/opendaylight/yangtools/rfc8528/parser/MountPointStatementSupport.java

diff --git a/yang/rfc8528-parser-support/src/main/java/org/opendaylight/yangtools/rfc8528/parser/RefMountPointStatement.java b/parser/rfc8528-parser-support/src/main/java/org/opendaylight/yangtools/rfc8528/parser/RefMountPointStatement.java
similarity index 100%
rename from yang/rfc8528-parser-support/src/main/java/org/opendaylight/yangtools/rfc8528/parser/RefMountPointStatement.java
rename to parser/rfc8528-parser-support/src/main/java/org/opendaylight/yangtools/rfc8528/parser/RefMountPointStatement.java

diff --git a/yang/rfc8528-parser-support/src/main/java/org/opendaylight/yangtools/rfc8528/parser/package-info.java b/parser/rfc8528-parser-support/src/main/java/org/opendaylight/yangtools/rfc8528/parser/package-info.java
similarity index 100%
rename from yang/rfc8528-parser-support/src/main/java/org/opendaylight/yangtools/rfc8528/parser/package-info.java
rename to parser/rfc8528-parser-support/src/main/java/org/opendaylight/yangtools/rfc8528/parser/package-info.java

diff --git a/yang/rfc8528-parser-support/src/test/java/org/opendaylight/yangtools/rfc8528/parser/MountPointTest.java b/parser/rfc8528-parser-support/src/test/java/org/opendaylight/yangtools/rfc8528/parser/MountPointTest.java
similarity index 100%
rename from yang/rfc8528-parser-support/src/test/java/org/opendaylight/yangtools/rfc8528/parser/MountPointTest.java
rename to parser/rfc8528-parser-support/src/test/java/org/opendaylight/yangtools/rfc8528/parser/MountPointTest.java

diff --git a/yang/rfc8528-parser-support/src/test/resources/example-grp.yang b/parser/rfc8528-parser-support/src/test/resources/example-grp.yang
similarity index 100%
rename from yang/rfc8528-parser-support/src/test/resources/example-grp.yang
rename to parser/rfc8528-parser-support/src/test/resources/example-grp.yang

diff --git a/yang/rfc8528-parser-support/src/test/resources/example-uses.yang b/parser/rfc8528-parser-support/src/test/resources/example-uses.yang
similarity index 100%
rename from yang/rfc8528-parser-support/src/test/resources/example-uses.yang
rename to parser/rfc8528-parser-support/src/test/resources/example-uses.yang

diff --git a/yang/rfc8528-parser-support/src/test/resources/ietf-inet-types@2013-07-15.yang b/parser/rfc8528-parser-support/src/test/resources/ietf-inet-types@2013-07-15.yang
similarity index 100%
rename from yang/rfc8528-parser-support/src/test/resources/ietf-inet-types@2013-07-15.yang
rename to parser/rfc8528-parser-support/src/test/resources/ietf-inet-types@2013-07-15.yang

diff --git a/yang/rfc8528-parser-support/src/test/resources/ietf-yang-schema-mount@2019-01-14.yang b/parser/rfc8528-parser-support/src/test/resources/ietf-yang-schema-mount@2019-01-14.yang
similarity index 100%
rename from yang/rfc8528-parser-support/src/test/resources/ietf-yang-schema-mount@2019-01-14.yang
rename to parser/rfc8528-parser-support/src/test/resources/ietf-yang-schema-mount@2019-01-14.yang

diff --git a/yang/rfc8528-parser-support/src/test/resources/ietf-yang-types@2013-07-15.yang b/parser/rfc8528-parser-support/src/test/resources/ietf-yang-types@2013-07-15.yang
similarity index 100%
rename from yang/rfc8528-parser-support/src/test/resources/ietf-yang-types@2013-07-15.yang
rename to parser/rfc8528-parser-support/src/test/resources/ietf-yang-types@2013-07-15.yang

diff --git a/yang/yang-parser-antlr/pom.xml b/parser/yang-parser-antlr/pom.xml
similarity index 100%
rename from yang/yang-parser-antlr/pom.xml
rename to parser/yang-parser-antlr/pom.xml

diff --git a/yang/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/IfFeatureExpressionLexer.g4 b/parser/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/IfFeatureExpressionLexer.g4
similarity index 100%
rename from yang/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/IfFeatureExpressionLexer.g4
rename to parser/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/IfFeatureExpressionLexer.g4

diff --git a/yang/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/IfFeatureExpressionParser.g4 b/parser/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/IfFeatureExpressionParser.g4
similarity index 100%
rename from yang/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/IfFeatureExpressionParser.g4
rename to parser/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/IfFeatureExpressionParser.g4

diff --git a/yang/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/LeafRefPathLexer.g4 b/parser/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/LeafRefPathLexer.g4
similarity index 100%
rename from yang/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/LeafRefPathLexer.g4
rename to parser/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/LeafRefPathLexer.g4

diff --git a/yang/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/LeafRefPathParser.g4 b/parser/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/LeafRefPathParser.g4
similarity index 100%
rename from yang/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/LeafRefPathParser.g4
rename to parser/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/LeafRefPathParser.g4

diff --git a/yang/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/YangStatementLexer.g4 b/parser/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/YangStatementLexer.g4
similarity index 100%
rename from yang/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/YangStatementLexer.g4
rename to parser/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/YangStatementLexer.g4

diff --git a/yang/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/YangStatementParser.g4 b/parser/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/YangStatementParser.g4
similarity index 100%
rename from yang/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/YangStatementParser.g4
rename to parser/yang-parser-antlr/src/main/antlr4/org/opendaylight/yangtools/yang/parser/antlr/YangStatementParser.g4

diff --git a/yang/yang-parser-antlr/src/main/java/module-info.java b/parser/yang-parser-antlr/src/main/java/module-info.java
similarity index 100%
rename from yang/yang-parser-antlr/src/main/java/module-info.java
rename to parser/yang-parser-antlr/src/main/java/module-info.java

diff --git a/yang/yang-parser-antlr/src/main/java/org/opendaylight/yangtools/yang/parser/antlr/package-info.java b/parser/yang-parser-antlr/src/main/java/org/opendaylight/yangtools/yang/parser/antlr/package-info.java
similarity index 100%
rename from yang/yang-parser-antlr/src/main/java/org/opendaylight/yangtools/yang/parser/antlr/package-info.java
rename to parser/yang-parser-antlr/src/main/java/org/opendaylight/yangtools/yang/parser/antlr/package-info.java

diff --git a/yang/yang-parser-api/pom.xml b/parser/yang-parser-api/pom.xml
similarity index 100%
rename from yang/yang-parser-api/pom.xml
rename to parser/yang-parser-api/pom.xml

diff --git a/yang/yang-parser-api/src/main/java/module-info.java b/parser/yang-parser-api/src/main/java/module-info.java
similarity index 100%
rename from yang/yang-parser-api/src/main/java/module-info.java
rename to parser/yang-parser-api/src/main/java/module-info.java

diff --git a/yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangParser.java b/parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangParser.java
similarity index 100%
rename from yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangParser.java
rename to parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangParser.java

diff --git a/yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangParserException.java b/parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangParserException.java
similarity index 100%
rename from yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangParserException.java
rename to parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangParserException.java

diff --git a/yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangParserFactory.java b/parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangParserFactory.java
similarity index 100%
rename from yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangParserFactory.java
rename to parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangParserFactory.java

diff --git a/yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangSyntaxErrorException.java b/parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangSyntaxErrorException.java
similarity index 100%
rename from yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangSyntaxErrorException.java
rename to parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangSyntaxErrorException.java

diff --git a/yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/package-info.java b/parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/package-info.java
similarity index 100%
rename from yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/package-info.java
rename to parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/package-info.java

diff --git a/yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/ImportResolutionMode.java b/parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/ImportResolutionMode.java
similarity index 100%
rename from yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/ImportResolutionMode.java
rename to parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/ImportResolutionMode.java

diff --git a/yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/YangParser.java b/parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/YangParser.java
similarity index 100%
rename from yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/YangParser.java
rename to parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/YangParser.java

diff --git a/yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/YangParserConfiguration.java b/parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/YangParserConfiguration.java
similarity index 100%
rename from yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/YangParserConfiguration.java
rename to parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/YangParserConfiguration.java

diff --git a/yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/YangParserException.java b/parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/YangParserException.java
similarity index 100%
rename from yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/YangParserException.java
rename to parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/YangParserException.java

diff --git a/yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/YangParserFactory.java b/parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/YangParserFactory.java
similarity index 100%
rename from yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/YangParserFactory.java
rename to parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/YangParserFactory.java

diff --git a/yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/YangSyntaxErrorException.java b/parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/YangSyntaxErrorException.java
similarity index 100%
rename from yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/YangSyntaxErrorException.java
rename to parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/YangSyntaxErrorException.java

diff --git a/yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/package-info.java b/parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/package-info.java
similarity index 100%
rename from yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/package-info.java
rename to parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/package-info.java

diff --git a/yang/yang-parser-impl/pom.xml b/parser/yang-parser-impl/pom.xml
similarity index 100%
rename from yang/yang-parser-impl/pom.xml
rename to parser/yang-parser-impl/pom.xml

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultReactors.java b/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultReactors.java
similarity index 100%
rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultReactors.java
rename to parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultReactors.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultYangParser.java b/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultYangParser.java
similarity index 100%
rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultYangParser.java
rename to parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultYangParser.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultYangParserFactory.java b/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultYangParserFactory.java
similarity index 100%
rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultYangParserFactory.java
rename to parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultYangParserFactory.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserFactoryImpl.java b/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserFactoryImpl.java
similarity index 100%
rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserFactoryImpl.java
rename to parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserFactoryImpl.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java b/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java
similarity index 100%
rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java
rename to parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/package-info.java b/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/package-info.java
similarity index 100%
rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/package-info.java
rename to parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/package-info.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/AbstractYangTextSchemaSourceRegistration.java b/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/AbstractYangTextSchemaSourceRegistration.java
similarity index 100%
rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/AbstractYangTextSchemaSourceRegistration.java
rename to parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/AbstractYangTextSchemaSourceRegistration.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/AssembleSources.java b/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/AssembleSources.java
similarity index 100%
rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/AssembleSources.java
rename to parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/AssembleSources.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/DependencyResolver.java b/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/DependencyResolver.java
similarity index 100%
rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/DependencyResolver.java
rename to parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/DependencyResolver.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/RevisionDependencyResolver.java b/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/RevisionDependencyResolver.java
similarity index 100%
rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/RevisionDependencyResolver.java
rename to parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/RevisionDependencyResolver.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SemVerDependencyResolver.java b/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SemVerDependencyResolver.java
similarity index 100%
rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SemVerDependencyResolver.java
rename to parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SemVerDependencyResolver.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedEffectiveModelContextFactory.java b/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedEffectiveModelContextFactory.java
similarity index 100%
rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedEffectiveModelContextFactory.java
rename to parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedEffectiveModelContextFactory.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepository.java b/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepository.java
similarity index 100%
rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepository.java
rename to parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepository.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SourceIdMismatchDetector.java b/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SourceIdMismatchDetector.java
similarity index 100%
rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SourceIdMismatchDetector.java
rename to parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SourceIdMismatchDetector.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolver.java b/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolver.java
similarity index 100%
rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolver.java
rename to parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolver.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaSourceRegistration.java b/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaSourceRegistration.java
similarity index 100%
rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaSourceRegistration.java
rename to parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaSourceRegistration.java

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/DependencyResolverTest.java b/parser/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/DependencyResolverTest.java
similarity index 100%
rename from yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/DependencyResolverTest.java
rename to parser/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/DependencyResolverTest.java

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/MultipleRevImportBug6875Test.java b/parser/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/MultipleRevImportBug6875Test.java
similarity index 100%
rename from yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/MultipleRevImportBug6875Test.java
rename to parser/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/MultipleRevImportBug6875Test.java

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/OpenconfigVerSharedSchemaRepositoryTest.java b/parser/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/OpenconfigVerSharedSchemaRepositoryTest.java
similarity index 100%
rename from yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/OpenconfigVerSharedSchemaRepositoryTest.java
rename to parser/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/OpenconfigVerSharedSchemaRepositoryTest.java

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SchemaContextFactoryDeviationsTest.java b/parser/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SchemaContextFactoryDeviationsTest.java
similarity index 100%
rename from yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SchemaContextFactoryDeviationsTest.java
rename to parser/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SchemaContextFactoryDeviationsTest.java

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SettableSchemaProvider.java b/parser/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SettableSchemaProvider.java
similarity index 100%
rename from yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SettableSchemaProvider.java
rename to parser/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SettableSchemaProvider.java

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedEffectiveModelContextFactoryTest.java b/parser/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedEffectiveModelContextFactoryTest.java
similarity index 100%
rename from yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedEffectiveModelContextFactoryTest.java
rename to parser/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedEffectiveModelContextFactoryTest.java

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryTest.java b/parser/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryTest.java
similarity index 100%
rename from yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryTest.java
rename to parser/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryTest.java

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryWithFeaturesTest.java b/parser/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryWithFeaturesTest.java
similarity index 100%
rename from yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryWithFeaturesTest.java
rename to parser/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryWithFeaturesTest.java

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolverTest.java b/parser/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolverTest.java
similarity index 100%
rename from yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolverTest.java
rename to parser/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolverTest.java

diff --git a/yang/yang-parser-impl/src/test/resources/bug9195/bar-invalid.yang b/parser/yang-parser-impl/src/test/resources/bug9195/bar-invalid.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/bug9195/bar-invalid.yang
rename to parser/yang-parser-impl/src/test/resources/bug9195/bar-invalid.yang

diff --git a/yang/yang-parser-impl/src/test/resources/bug9195/bar.yang b/parser/yang-parser-impl/src/test/resources/bug9195/bar.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/bug9195/bar.yang
rename to parser/yang-parser-impl/src/test/resources/bug9195/bar.yang

diff --git a/yang/yang-parser-impl/src/test/resources/bug9195/baz-invalid.yang b/parser/yang-parser-impl/src/test/resources/bug9195/baz-invalid.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/bug9195/baz-invalid.yang
rename to parser/yang-parser-impl/src/test/resources/bug9195/baz-invalid.yang

diff --git a/yang/yang-parser-impl/src/test/resources/bug9195/baz.yang b/parser/yang-parser-impl/src/test/resources/bug9195/baz.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/bug9195/baz.yang
rename to parser/yang-parser-impl/src/test/resources/bug9195/baz.yang

diff --git a/yang/yang-parser-impl/src/test/resources/bug9195/foo-invalid.yang b/parser/yang-parser-impl/src/test/resources/bug9195/foo-invalid.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/bug9195/foo-invalid.yang
rename to parser/yang-parser-impl/src/test/resources/bug9195/foo-invalid.yang

diff --git a/yang/yang-parser-impl/src/test/resources/bug9195/foo.yang b/parser/yang-parser-impl/src/test/resources/bug9195/foo.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/bug9195/foo.yang
rename to parser/yang-parser-impl/src/test/resources/bug9195/foo.yang

diff --git a/yang/yang-parser-impl/src/test/resources/bug9195/foobar.yang b/parser/yang-parser-impl/src/test/resources/bug9195/foobar.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/bug9195/foobar.yang
rename to parser/yang-parser-impl/src/test/resources/bug9195/foobar.yang

diff --git a/yang/yang-parser-impl/src/test/resources/ietf/iana-timezones@2012-07-09.yang b/parser/yang-parser-impl/src/test/resources/ietf/iana-timezones@2012-07-09.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/ietf/iana-timezones@2012-07-09.yang
rename to parser/yang-parser-impl/src/test/resources/ietf/iana-timezones@2012-07-09.yang

diff --git a/yang/yang-parser-impl/src/test/resources/ietf/ietf-inet-types@2010-09-24.yang b/parser/yang-parser-impl/src/test/resources/ietf/ietf-inet-types@2010-09-24.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/ietf/ietf-inet-types@2010-09-24.yang
rename to parser/yang-parser-impl/src/test/resources/ietf/ietf-inet-types@2010-09-24.yang

diff --git a/yang/yang-parser-impl/src/test/resources/ietf/network-topology@2013-10-21.yang b/parser/yang-parser-impl/src/test/resources/ietf/network-topology@2013-10-21.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/ietf/network-topology@2013-10-21.yang
rename to parser/yang-parser-impl/src/test/resources/ietf/network-topology@2013-10-21.yang

diff --git a/yang/yang-parser-impl/src/test/resources/if-feature-resolution-test/shared-schema-repository/foobar.yang b/parser/yang-parser-impl/src/test/resources/if-feature-resolution-test/shared-schema-repository/foobar.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/if-feature-resolution-test/shared-schema-repository/foobar.yang
rename to parser/yang-parser-impl/src/test/resources/if-feature-resolution-test/shared-schema-repository/foobar.yang

diff --git a/yang/yang-parser-impl/src/test/resources/model/bar.yang b/parser/yang-parser-impl/src/test/resources/model/bar.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/model/bar.yang
rename to parser/yang-parser-impl/src/test/resources/model/bar.yang

diff --git a/yang/yang-parser-impl/src/test/resources/model/baz.yang b/parser/yang-parser-impl/src/test/resources/model/baz.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/model/baz.yang
rename to parser/yang-parser-impl/src/test/resources/model/baz.yang

diff --git a/yang/yang-parser-impl/src/test/resources/model/foo.yang b/parser/yang-parser-impl/src/test/resources/model/foo.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/model/foo.yang
rename to parser/yang-parser-impl/src/test/resources/model/foo.yang

diff --git a/yang/yang-parser-impl/src/test/resources/model/subfoo.yang b/parser/yang-parser-impl/src/test/resources/model/subfoo.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/model/subfoo.yang
rename to parser/yang-parser-impl/src/test/resources/model/subfoo.yang

diff --git a/yang/yang-parser-impl/src/test/resources/no-revision/imported.yang b/parser/yang-parser-impl/src/test/resources/no-revision/imported.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/no-revision/imported.yang
rename to parser/yang-parser-impl/src/test/resources/no-revision/imported.yang

diff --git a/yang/yang-parser-impl/src/test/resources/no-revision/imported@2012-12-12.yang b/parser/yang-parser-impl/src/test/resources/no-revision/imported@2012-12-12.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/no-revision/imported@2012-12-12.yang
rename to parser/yang-parser-impl/src/test/resources/no-revision/imported@2012-12-12.yang

diff --git a/yang/yang-parser-impl/src/test/resources/no-revision/module-without-revision.yang b/parser/yang-parser-impl/src/test/resources/no-revision/module-without-revision.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/no-revision/module-without-revision.yang
rename to parser/yang-parser-impl/src/test/resources/no-revision/module-without-revision.yang

diff --git a/yang/yang-parser-impl/src/test/resources/no-revision/top@2012-10-10.yang b/parser/yang-parser-impl/src/test/resources/no-revision/top@2012-10-10.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/no-revision/top@2012-10-10.yang
rename to parser/yang-parser-impl/src/test/resources/no-revision/top@2012-10-10.yang

diff --git a/yang/yang-parser-impl/src/test/resources/openconfig-version/openconfigver-shared-schema-repository/bar@2016-01-01.yang b/parser/yang-parser-impl/src/test/resources/openconfig-version/openconfigver-shared-schema-repository/bar@2016-01-01.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/openconfig-version/openconfigver-shared-schema-repository/bar@2016-01-01.yang
rename to parser/yang-parser-impl/src/test/resources/openconfig-version/openconfigver-shared-schema-repository/bar@2016-01-01.yang

diff --git a/yang/yang-parser-impl/src/test/resources/openconfig-version/openconfigver-shared-schema-repository/foo.yang b/parser/yang-parser-impl/src/test/resources/openconfig-version/openconfigver-shared-schema-repository/foo.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/openconfig-version/openconfigver-shared-schema-repository/foo.yang
rename to parser/yang-parser-impl/src/test/resources/openconfig-version/openconfigver-shared-schema-repository/foo.yang

diff --git a/yang/yang-parser-impl/src/test/resources/openconfig-version/openconfigver-shared-schema-repository/openconfig-extensions.yang b/parser/yang-parser-impl/src/test/resources/openconfig-version/openconfigver-shared-schema-repository/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/openconfig-version/openconfigver-shared-schema-repository/openconfig-extensions.yang
rename to parser/yang-parser-impl/src/test/resources/openconfig-version/openconfigver-shared-schema-repository/openconfig-extensions.yang

diff --git a/yang/yang-parser-impl/src/test/resources/openconfig-version/shared-schema-repository/bar@2016-01-01.yang b/parser/yang-parser-impl/src/test/resources/openconfig-version/shared-schema-repository/bar@2016-01-01.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/openconfig-version/shared-schema-repository/bar@2016-01-01.yang
rename to parser/yang-parser-impl/src/test/resources/openconfig-version/shared-schema-repository/bar@2016-01-01.yang

diff --git a/yang/yang-parser-impl/src/test/resources/openconfig-version/shared-schema-repository/foo.yang b/parser/yang-parser-impl/src/test/resources/openconfig-version/shared-schema-repository/foo.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/openconfig-version/shared-schema-repository/foo.yang
rename to parser/yang-parser-impl/src/test/resources/openconfig-version/shared-schema-repository/foo.yang

diff --git a/yang/yang-parser-impl/src/test/resources/openconfig-version/shared-schema-repository/openconfig-extensions.yang b/parser/yang-parser-impl/src/test/resources/openconfig-version/shared-schema-repository/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/openconfig-version/shared-schema-repository/openconfig-extensions.yang
rename to parser/yang-parser-impl/src/test/resources/openconfig-version/shared-schema-repository/openconfig-extensions.yang

diff --git a/yang/yang-parser-impl/src/test/resources/parse-methods/dependencies/m2@2013-09-30.yang b/parser/yang-parser-impl/src/test/resources/parse-methods/dependencies/m2@2013-09-30.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/parse-methods/dependencies/m2@2013-09-30.yang
rename to parser/yang-parser-impl/src/test/resources/parse-methods/dependencies/m2@2013-09-30.yang

diff --git a/yang/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-0/bar@1999-01-01.yang b/parser/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-0/bar@1999-01-01.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-0/bar@1999-01-01.yang
rename to parser/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-0/bar@1999-01-01.yang

diff --git a/yang/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-0/bar@2017-02-06.yang b/parser/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-0/bar@2017-02-06.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-0/bar@2017-02-06.yang
rename to parser/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-0/bar@2017-02-06.yang

diff --git a/yang/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-0/foo.yang b/parser/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-0/foo.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-0/foo.yang
rename to parser/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-0/foo.yang

diff --git a/yang/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-1/bar@1970-01-01.yang b/parser/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-1/bar@1970-01-01.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-1/bar@1970-01-01.yang
rename to parser/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-1/bar@1970-01-01.yang

diff --git a/yang/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-1/bar@1999-01-01.yang b/parser/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-1/bar@1999-01-01.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-1/bar@1999-01-01.yang
rename to parser/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-1/bar@1999-01-01.yang

diff --git a/yang/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-1/bar@2017-02-06.yang b/parser/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-1/bar@2017-02-06.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-1/bar@2017-02-06.yang
rename to parser/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-1/bar@2017-02-06.yang

diff --git a/yang/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-1/foo.yang b/parser/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-1/foo.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-1/foo.yang
rename to parser/yang-parser-impl/src/test/resources/rfc7950/bug6875/yang1-1/foo.yang

diff --git a/yang/yang-parser-impl/src/test/resources/yang-text-schema-context-resolver-test/bar.yang b/parser/yang-parser-impl/src/test/resources/yang-text-schema-context-resolver-test/bar.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/yang-text-schema-context-resolver-test/bar.yang
rename to parser/yang-parser-impl/src/test/resources/yang-text-schema-context-resolver-test/bar.yang

diff --git a/yang/yang-parser-impl/src/test/resources/yang-text-schema-context-resolver-test/baz.yang b/parser/yang-parser-impl/src/test/resources/yang-text-schema-context-resolver-test/baz.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/yang-text-schema-context-resolver-test/baz.yang
rename to parser/yang-parser-impl/src/test/resources/yang-text-schema-context-resolver-test/baz.yang

diff --git a/yang/yang-parser-impl/src/test/resources/yang-text-schema-context-resolver-test/foo.yang b/parser/yang-parser-impl/src/test/resources/yang-text-schema-context-resolver-test/foo.yang
similarity index 100%
rename from yang/yang-parser-impl/src/test/resources/yang-text-schema-context-resolver-test/foo.yang
rename to parser/yang-parser-impl/src/test/resources/yang-text-schema-context-resolver-test/foo.yang

diff --git a/yang/yang-parser-reactor/pom.xml b/parser/yang-parser-reactor/pom.xml
similarity index 100%
rename from yang/yang-parser-reactor/pom.xml
rename to parser/yang-parser-reactor/pom.xml

diff --git a/yang/yang-parser-reactor/src/main/java/module-info.java b/parser/yang-parser-reactor/src/main/java/module-info.java
similarity index 100%
rename from yang/yang-parser-reactor/src/main/java/module-info.java
rename to parser/yang-parser-reactor/src/main/java/module-info.java

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/AbstractResumedStatement.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/AbstractResumedStatement.java
similarity index 100%
rename from yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/AbstractResumedStatement.java
rename to parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/AbstractResumedStatement.java

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java
similarity index 100%
rename from yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java
rename to parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/CrossSourceStatementReactor.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/CrossSourceStatementReactor.java
similarity index 100%
rename from yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/CrossSourceStatementReactor.java
rename to parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/CrossSourceStatementReactor.java

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/EffectiveSchemaContext.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/EffectiveSchemaContext.java
similarity index 100%
rename from yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/EffectiveSchemaContext.java
rename to parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/EffectiveSchemaContext.java

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/InferredStatementContext.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/InferredStatementContext.java
similarity index 100%
rename from yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/InferredStatementContext.java
rename to parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/InferredStatementContext.java

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java
similarity index 100%
rename from yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java
rename to parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/NamespaceBehaviourWithListeners.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/NamespaceBehaviourWithListeners.java
similarity index 100%
rename from yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/NamespaceBehaviourWithListeners.java
rename to parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/NamespaceBehaviourWithListeners.java

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/NamespaceStorageSupport.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/NamespaceStorageSupport.java
similarity index 100%
rename from yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/NamespaceStorageSupport.java
rename to parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/NamespaceStorageSupport.java

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorDeclaredModel.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorDeclaredModel.java
similarity index 100%
rename from yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorDeclaredModel.java
rename to parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorDeclaredModel.java

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java
similarity index 100%
rename from yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java
rename to parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReplicaStatementContext.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReplicaStatementContext.java
similarity index 100%
rename from yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReplicaStatementContext.java
rename to parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReplicaStatementContext.java

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/RootStatementContext.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/RootStatementContext.java
similarity index 100%
rename from yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/RootStatementContext.java
rename to parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/RootStatementContext.java

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SimpleNamespaceContext.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SimpleNamespaceContext.java
similarity index 100%
rename from yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SimpleNamespaceContext.java
rename to parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SimpleNamespaceContext.java

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SourceSpecificContext.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SourceSpecificContext.java
similarity index 100%
rename from yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SourceSpecificContext.java
rename to parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SourceSpecificContext.java

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java
similarity index 100%
rename from yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java
rename to parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextWriter.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextWriter.java
similarity index 100%
rename from yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextWriter.java
rename to parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextWriter.java

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementDefinitionContext.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementDefinitionContext.java
similarity index 100%
rename from yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementDefinitionContext.java
rename to parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementDefinitionContext.java

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementMap.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementMap.java
similarity index 100%
rename from yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementMap.java
rename to parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementMap.java

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SubstatementContext.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SubstatementContext.java
similarity index 100%
rename from yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SubstatementContext.java
rename to parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SubstatementContext.java

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SweptNamespace.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SweptNamespace.java
similarity index 100%
rename from yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SweptNamespace.java
rename to parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SweptNamespace.java

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/VirtualNamespaceContext.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/VirtualNamespaceContext.java
similarity index 100%
rename from yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/VirtualNamespaceContext.java
rename to parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/VirtualNamespaceContext.java

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/package-info.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/package-info.java
similarity index 100%
rename from yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/package-info.java
rename to parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/package-info.java

diff --git a/yang/yang-parser-rfc7950/pom.xml b/parser/yang-parser-rfc7950/pom.xml
similarity index 100%
rename from yang/yang-parser-rfc7950/pom.xml
rename to parser/yang-parser-rfc7950/pom.xml

diff --git a/yang/yang-parser-rfc7950/src/main/java/module-info.java b/parser/yang-parser-rfc7950/src/main/java/module-info.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/module-info.java
rename to parser/yang-parser-rfc7950/src/main/java/module-info.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionEffectiveStatementImpl.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionEffectiveStatementImpl.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionEffectiveStatementImpl.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionEffectiveStatementImpl.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionStatementImpl.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionStatementImpl.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionStatementImpl.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionStatementImpl.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/RefOpenConfigVersionStatement.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/RefOpenConfigVersionStatement.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/RefOpenConfigVersionStatement.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/RefOpenConfigVersionStatement.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/AbstractParserErrorListener.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/AbstractParserErrorListener.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/AbstractParserErrorListener.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/AbstractParserErrorListener.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/AbstractSourceToken.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/AbstractSourceToken.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/AbstractSourceToken.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/AbstractSourceToken.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/AbstractToken.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/AbstractToken.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/AbstractToken.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/AbstractToken.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/CompactTokenFactory.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/CompactTokenFactory.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/CompactTokenFactory.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/CompactTokenFactory.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/CompactYangStatementLexer.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/CompactYangStatementLexer.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/CompactYangStatementLexer.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/CompactYangStatementLexer.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/ExplicitTextToken.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/ExplicitTextToken.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/ExplicitTextToken.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/ExplicitTextToken.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/SourceExceptionParser.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/SourceExceptionParser.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/SourceExceptionParser.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/SourceExceptionParser.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/Token12122.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/Token12122.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/Token12122.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/Token12122.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/Token12144.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/Token12144.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/Token12144.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/Token12144.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/Token44444.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/Token44444.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/Token44444.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/antlr/Token44444.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/AbstractIRObject.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/AbstractIRObject.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/AbstractIRObject.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/AbstractIRObject.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/AntlrSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/AntlrSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/AntlrSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/AntlrSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRArgument.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRArgument.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRArgument.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRArgument.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRKeyword.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRKeyword.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRKeyword.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRKeyword.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRSchemaSource.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRSchemaSource.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRSchemaSource.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRSchemaSource.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRStatement.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRStatement.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRStatement.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRStatement.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRStatement022.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRStatement022.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRStatement022.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRStatement022.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRStatement031.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRStatement031.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRStatement031.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRStatement031.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRStatement044.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRStatement044.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRStatement044.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRStatement044.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRStatement144.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRStatement144.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRStatement144.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRStatement144.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRStatementL44.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRStatementL44.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRStatementL44.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/IRStatementL44.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/package-info.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/package-info.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/package-info.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/package-info.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/namespace/ModuleQNameToPrefix.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/namespace/ModuleQNameToPrefix.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/namespace/ModuleQNameToPrefix.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/namespace/ModuleQNameToPrefix.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/namespace/StmtNamespaceContext.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/namespace/StmtNamespaceContext.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/namespace/StmtNamespaceContext.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/namespace/StmtNamespaceContext.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/namespace/YangNamespaceContextNamespace.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/namespace/YangNamespaceContextNamespace.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/namespace/YangNamespaceContextNamespace.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/namespace/YangNamespaceContextNamespace.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/namespace/package-info.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/namespace/package-info.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/namespace/package-info.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/namespace/package-info.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/CustomCrossSourceStatementReactorBuilder.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/CustomCrossSourceStatementReactorBuilder.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/CustomCrossSourceStatementReactorBuilder.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/CustomCrossSourceStatementReactorBuilder.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/RFC7950Reactors.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/RFC7950Reactors.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/RFC7950Reactors.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/RFC7950Reactors.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/ServiceLoaderState.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/ServiceLoaderState.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/ServiceLoaderState.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/ServiceLoaderState.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/YangValidationBundles.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/YangValidationBundles.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/YangValidationBundles.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/YangValidationBundles.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/package-info.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/package-info.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/package-info.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/package-info.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/ArgumentContextUtils.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/ArgumentContextUtils.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/ArgumentContextUtils.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/ArgumentContextUtils.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/StatementContextVisitor.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/StatementContextVisitor.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/StatementContextVisitor.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/StatementContextVisitor.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/StatementSourceReferenceHandler.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/StatementSourceReferenceHandler.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/StatementSourceReferenceHandler.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/StatementSourceReferenceHandler.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/TextToIRTransformer.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/TextToIRTransformer.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/TextToIRTransformer.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/TextToIRTransformer.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangErrorListener.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangErrorListener.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangErrorListener.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangErrorListener.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangStatementStreamSource.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangStatementStreamSource.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangStatementStreamSource.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangStatementStreamSource.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YinStatementStreamSource.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YinStatementStreamSource.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YinStatementStreamSource.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YinStatementStreamSource.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YinTextToDomTransformer.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YinTextToDomTransformer.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YinTextToDomTransformer.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YinTextToDomTransformer.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveModule.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveModule.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveModule.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveModule.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/ArgumentUtils.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/ArgumentUtils.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/ArgumentUtils.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/ArgumentUtils.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/EffectiveStmtUtils.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/EffectiveStmtUtils.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/EffectiveStmtUtils.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/EffectiveStmtUtils.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/UnknownEffectiveStatementBase.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/UnknownEffectiveStatementBase.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/UnknownEffectiveStatementBase.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/UnknownEffectiveStatementBase.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AugmentImplicitHandlingNamespace.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AugmentImplicitHandlingNamespace.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AugmentImplicitHandlingNamespace.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AugmentImplicitHandlingNamespace.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AugmentInferenceAction.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AugmentInferenceAction.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AugmentInferenceAction.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AugmentInferenceAction.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AugmentStatementRFC6020Support.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AugmentStatementRFC6020Support.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AugmentStatementRFC6020Support.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AugmentStatementRFC6020Support.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AugmentStatementRFC7950Support.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AugmentStatementRFC7950Support.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AugmentStatementRFC7950Support.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AugmentStatementRFC7950Support.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/AbstractDeviateStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/AbstractDeviateStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/AbstractDeviateStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/AbstractDeviateStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/DeviateStatementRFC6020Support.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/DeviateStatementRFC6020Support.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/DeviateStatementRFC6020Support.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/DeviateStatementRFC6020Support.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/DeviateStatementRFC7950Support.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/DeviateStatementRFC7950Support.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/DeviateStatementRFC7950Support.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/DeviateStatementRFC7950Support.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ModelDefinedStatementDefinition.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ModelDefinedStatementDefinition.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ModelDefinedStatementDefinition.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ModelDefinedStatementDefinition.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedEffectiveStatement.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedEffectiveStatement.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedEffectiveStatement.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedEffectiveStatement.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/AbstractIfFeatureStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/AbstractIfFeatureStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/AbstractIfFeatureStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/AbstractIfFeatureStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/IfFeaturePredicateVisitor.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/IfFeaturePredicateVisitor.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/IfFeaturePredicateVisitor.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/IfFeaturePredicateVisitor.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/IfFeatureStatementRFC6020Support.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/IfFeatureStatementRFC6020Support.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/IfFeatureStatementRFC6020Support.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/IfFeatureStatementRFC6020Support.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/IfFeatureStatementRFC7950Support.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/IfFeatureStatementRFC7950Support.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/IfFeatureStatementRFC7950Support.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/IfFeatureStatementRFC7950Support.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/ImportStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/ImportStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/ImportStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/ImportStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/ImportedVersionNamespace.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/ImportedVersionNamespace.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/ImportedVersionNamespace.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/ImportedVersionNamespace.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/RevisionImport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/RevisionImport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/RevisionImport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/RevisionImport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/SemanticVersionImport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/SemanticVersionImport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/SemanticVersionImport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/SemanticVersionImport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListEffectiveStatement.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListEffectiveStatement.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListEffectiveStatement.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListEffectiveStatement.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractNonEmptyLeafListEffectiveStatement.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractNonEmptyLeafListEffectiveStatement.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractNonEmptyLeafListEffectiveStatement.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractNonEmptyLeafListEffectiveStatement.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/EmptyLeafListEffectiveStatement.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/EmptyLeafListEffectiveStatement.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/EmptyLeafListEffectiveStatement.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/EmptyLeafListEffectiveStatement.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/LeafListStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/LeafListStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/LeafListStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/LeafListStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/RegularLeafListEffectiveStatement.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/RegularLeafListEffectiveStatement.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/RegularLeafListEffectiveStatement.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/RegularLeafListEffectiveStatement.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/SlimLeafListEffectiveStatement.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/SlimLeafListEffectiveStatement.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/SlimLeafListEffectiveStatement.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/SlimLeafListEffectiveStatement.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/AbstractListEffectiveStatement.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/AbstractListEffectiveStatement.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/AbstractListEffectiveStatement.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/AbstractListEffectiveStatement.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/ConfigListWarningNamespace.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/ConfigListWarningNamespace.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/ConfigListWarningNamespace.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/ConfigListWarningNamespace.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/EmptyListEffectiveStatement.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/EmptyListEffectiveStatement.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/EmptyListEffectiveStatement.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/EmptyListEffectiveStatement.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/ListStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/ListStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/ListStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/ListStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/RegularListEffectiveStatement.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/RegularListEffectiveStatement.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/RegularListEffectiveStatement.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/RegularListEffectiveStatement.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/AbstractImplicitStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/AbstractImplicitStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/AbstractImplicitStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/AbstractImplicitStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/AbstractOperationContainerStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/AbstractOperationContainerStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/AbstractOperationContainerStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/AbstractOperationContainerStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ActionStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ActionStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ActionStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ActionStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/AnydataStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/AnydataStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/AnydataStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/AnydataStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/AnyxmlStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/AnyxmlStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/AnyxmlStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/AnyxmlStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ArgumentStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ArgumentStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ArgumentStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ArgumentStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/BaseStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/BaseStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/BaseStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/BaseStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/BelongsToStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/BelongsToStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/BelongsToStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/BelongsToStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/BitStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/BitStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/BitStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/BitStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/CaseStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/CaseStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/CaseStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/CaseStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ChoiceStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ChoiceStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ChoiceStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ChoiceStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ConfigStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ConfigStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ConfigStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ConfigStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ContactStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ContactStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ContactStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ContactStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ContainerStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ContainerStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ContainerStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ContainerStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/DefaultStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/DefaultStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/DefaultStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/DefaultStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/DescriptionStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/DescriptionStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/DescriptionStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/DescriptionStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/DeviationStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/DeviationStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/DeviationStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/DeviationStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/EnumStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/EnumStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/EnumStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/EnumStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ErrorAppTagStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ErrorAppTagStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ErrorAppTagStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ErrorAppTagStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ErrorMessageStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ErrorMessageStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ErrorMessageStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ErrorMessageStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/FeatureStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/FeatureStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/FeatureStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/FeatureStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/FractionDigitsStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/FractionDigitsStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/FractionDigitsStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/FractionDigitsStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/GroupingStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/GroupingStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/GroupingStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/GroupingStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/IdentityStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/IdentityStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/IdentityStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/IdentityStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/IncludeStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/IncludeStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/IncludeStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/IncludeStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/InputStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/InputStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/InputStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/InputStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/KeyStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/KeyStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/KeyStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/KeyStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/LeafStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/LeafStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/LeafStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/LeafStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/LengthStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/LengthStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/LengthStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/LengthStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/MandatoryStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/MandatoryStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/MandatoryStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/MandatoryStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/MaxElementsStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/MaxElementsStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/MaxElementsStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/MaxElementsStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/MinElementsStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/MinElementsStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/MinElementsStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/MinElementsStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ModifierStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ModifierStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ModifierStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ModifierStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/MustStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/MustStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/MustStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/MustStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/NamespaceStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/NamespaceStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/NamespaceStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/NamespaceStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/OrderedByStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/OrderedByStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/OrderedByStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/OrderedByStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/OrganizationStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/OrganizationStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/OrganizationStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/OrganizationStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/OutputStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/OutputStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/OutputStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/OutputStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/PositionStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/PositionStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/PositionStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/PositionStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/PrefixStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/PrefixStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/PrefixStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/PrefixStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/PresenceStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/PresenceStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/PresenceStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/PresenceStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/RangeStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/RangeStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/RangeStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/RangeStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ReferenceStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ReferenceStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ReferenceStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ReferenceStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/RequireInstanceStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/RequireInstanceStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/RequireInstanceStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/RequireInstanceStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/RevisionDateStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/RevisionDateStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/RevisionDateStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/RevisionDateStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/RevisionStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/RevisionStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/RevisionStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/RevisionStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/RpcStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/RpcStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/RpcStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/RpcStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/StatusStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/StatusStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/StatusStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/StatusStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/TypedefStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/TypedefStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/TypedefStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/TypedefStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/UniqueStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/UniqueStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/UniqueStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/UniqueStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/UnitsStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/UnitsStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/UnitsStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/UnitsStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ValueStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ValueStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ValueStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/ValueStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/WhenStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/WhenStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/WhenStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/WhenStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/XPathSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/XPathSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/XPathSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/XPathSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/YangVersionStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/YangVersionStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/YangVersionStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/YangVersionStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/YinElementStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/YinElementStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/YinElementStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/YinElementStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/package-info.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/package-info.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/package-info.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/package-info.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleEffectiveStatementImpl.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleEffectiveStatementImpl.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleEffectiveStatementImpl.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleEffectiveStatementImpl.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/QNameModuleNamespace.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/QNameModuleNamespace.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/QNameModuleNamespace.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/QNameModuleNamespace.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/notification/AbstractNotificationStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/notification/AbstractNotificationStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/notification/AbstractNotificationStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/notification/AbstractNotificationStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/notification/NotificationStatementRFC6020Support.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/notification/NotificationStatementRFC6020Support.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/notification/NotificationStatementRFC6020Support.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/notification/NotificationStatementRFC6020Support.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/notification/NotificationStatementRFC7950Support.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/notification/NotificationStatementRFC7950Support.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/notification/NotificationStatementRFC7950Support.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/notification/NotificationStatementRFC7950Support.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/package-info.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/package-info.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/package-info.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/package-info.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/ParsedPathExpression.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/ParsedPathExpression.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/ParsedPathExpression.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/ParsedPathExpression.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathExpressionParser.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathExpressionParser.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathExpressionParser.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathExpressionParser.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/UnparsedPathExpression.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/UnparsedPathExpression.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/UnparsedPathExpression.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/UnparsedPathExpression.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/PatternStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/PatternStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/PatternStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/PatternStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/RegexUtils.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/RegexUtils.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/RegexUtils.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/RegexUtils.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/RefineEffectiveStatementImpl.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/RefineEffectiveStatementImpl.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/RefineEffectiveStatementImpl.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/RefineEffectiveStatementImpl.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/RefineStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/RefineStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/RefineStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/RefineStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/RefineTargetNamespace.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/RefineTargetNamespace.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/RefineTargetNamespace.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/RefineTargetNamespace.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/submodule/SubmoduleEffectiveStatementImpl.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/submodule/SubmoduleEffectiveStatementImpl.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/submodule/SubmoduleEffectiveStatementImpl.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/submodule/SubmoduleEffectiveStatementImpl.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/submodule/SubmoduleStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/submodule/SubmoduleStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/submodule/SubmoduleStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/submodule/SubmoduleStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BaseTypeNamespace.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BaseTypeNamespace.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BaseTypeNamespace.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BaseTypeNamespace.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationImpl.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationImpl.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationImpl.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationImpl.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinTypeStatement.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinTypeStatement.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinTypeStatement.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinTypeStatement.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/Decimal64SpecificationImpl.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/Decimal64SpecificationImpl.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/Decimal64SpecificationImpl.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/Decimal64SpecificationImpl.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/Decimal64SpecificationSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/Decimal64SpecificationSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/Decimal64SpecificationSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/Decimal64SpecificationSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EffectiveTypeUtil.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EffectiveTypeUtil.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EffectiveTypeUtil.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EffectiveTypeUtil.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EmptyIdentifierSpecification.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EmptyIdentifierSpecification.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EmptyIdentifierSpecification.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EmptyIdentifierSpecification.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumSpecificationImpl.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumSpecificationImpl.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumSpecificationImpl.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumSpecificationImpl.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumSpecificationSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumSpecificationSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumSpecificationSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumSpecificationSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/IdentityRefSpecificationImpl.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/IdentityRefSpecificationImpl.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/IdentityRefSpecificationImpl.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/IdentityRefSpecificationImpl.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/IdentityRefSpecificationSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/IdentityRefSpecificationSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/IdentityRefSpecificationSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/IdentityRefSpecificationSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierSpecificationSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierSpecificationSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierSpecificationSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierSpecificationSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/LeafrefSpecificationImpl.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/LeafrefSpecificationImpl.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/LeafrefSpecificationImpl.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/LeafrefSpecificationImpl.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/LeafrefSpecificationSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/LeafrefSpecificationSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/LeafrefSpecificationSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/LeafrefSpecificationSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefBitsSpecification.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefBitsSpecification.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefBitsSpecification.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefBitsSpecification.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefDecimal64Specification.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefDecimal64Specification.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefDecimal64Specification.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefDecimal64Specification.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefEnumSpecification.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefEnumSpecification.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefEnumSpecification.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefEnumSpecification.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefIdentityRefSpecification.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefIdentityRefSpecification.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefIdentityRefSpecification.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefIdentityRefSpecification.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefInstanceIdentifierSpecification.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefInstanceIdentifierSpecification.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefInstanceIdentifierSpecification.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefInstanceIdentifierSpecification.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefLeafrefSpecification.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefLeafrefSpecification.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefLeafrefSpecification.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefLeafrefSpecification.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefUnionSpecification.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefUnionSpecification.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefUnionSpecification.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RefUnionSpecification.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RegularInstanceIdentifierSpecification.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RegularInstanceIdentifierSpecification.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RegularInstanceIdentifierSpecification.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/RegularInstanceIdentifierSpecification.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/TypeEffectiveStatementImpl.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/TypeEffectiveStatementImpl.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/TypeEffectiveStatementImpl.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/TypeEffectiveStatementImpl.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/TypeStatementRFC6020Support.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/TypeStatementRFC6020Support.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/TypeStatementRFC6020Support.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/TypeStatementRFC6020Support.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/TypeStatementRFC7950Support.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/TypeStatementRFC7950Support.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/TypeStatementRFC7950Support.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/TypeStatementRFC7950Support.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationImpl.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationImpl.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationImpl.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationImpl.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/EmptyLocalUsesEffectiveStatement.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/EmptyLocalUsesEffectiveStatement.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/EmptyLocalUsesEffectiveStatement.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/EmptyLocalUsesEffectiveStatement.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/FullCopiedUsesEffectiveStatement.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/FullCopiedUsesEffectiveStatement.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/FullCopiedUsesEffectiveStatement.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/FullCopiedUsesEffectiveStatement.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/RegularLocalUsesEffectiveStatement.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/RegularLocalUsesEffectiveStatement.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/RegularLocalUsesEffectiveStatement.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/RegularLocalUsesEffectiveStatement.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/SimpleCopiedUsesEffectiveStatement.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/SimpleCopiedUsesEffectiveStatement.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/SimpleCopiedUsesEffectiveStatement.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/SimpleCopiedUsesEffectiveStatement.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/SourceGroupingNamespace.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/SourceGroupingNamespace.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/SourceGroupingNamespace.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/SourceGroupingNamespace.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java
rename to parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/AntlrSupportTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/AntlrSupportTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/AntlrSupportTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/ir/AntlrSupportTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/ArgumentContextUtilsTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/ArgumentContextUtilsTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/ArgumentContextUtilsTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/ArgumentContextUtilsTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfoTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfoTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfoTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfoTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathExpressionParserTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathExpressionParserTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathExpressionParserTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathExpressionParserTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/Bug4079Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/Bug4079Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/Bug4079Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/Bug4079Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/Bug5410Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/Bug5410Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/Bug5410Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/Bug5410Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Bug5410Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Bug5410Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Bug5410Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Bug5410Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YT826Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YT826Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YT826Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YT826Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ElementCountConstraintsTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ElementCountConstraintsTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ElementCountConstraintsTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ElementCountConstraintsTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ActionStatementTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ActionStatementTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ActionStatementTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ActionStatementTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6867BasicTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6867BasicTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6867BasicTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6867BasicTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6868Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6868Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6868Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6868Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6869Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6869Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6869Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6869Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6870Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6870Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6870Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6870Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6871Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6871Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6871Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6871Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6874Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6874Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6874Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6874Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6876Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6876Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6876Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6876Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6878Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6878Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6878Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6878Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6880Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6880Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6880Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6880Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6883Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6883Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6883Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6883Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6884Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6884Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6884Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6884Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6885Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6885Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6885Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6885Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6886Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6886Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6886Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6886Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6887Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6887Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6887Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6887Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6897Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6897Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6897Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6897Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6901Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6901Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6901Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6901Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug9241Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug9241Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug9241Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug9241Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/IdentityStatementTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/IdentityStatementTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/IdentityStatementTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/IdentityStatementTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/IdentityrefStatementTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/IdentityrefStatementTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/IdentityrefStatementTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/IdentityrefStatementTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/LeafrefStatementTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/LeafrefStatementTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/LeafrefStatementTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/LeafrefStatementTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentArgumentParsingTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentArgumentParsingTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentArgumentParsingTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentArgumentParsingTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentProcessTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentProcessTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentProcessTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentProcessTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentSimplestTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentSimplestTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentSimplestTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentSimplestTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentToExtensionTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentToExtensionTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentToExtensionTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentToExtensionTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug1412Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug1412Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug1412Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug1412Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug1413Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug1413Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug1413Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug1413Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug2291Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug2291Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug2291Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug2291Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug2872Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug2872Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug2872Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug2872Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3799Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3799Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3799Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3799Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3859Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3859Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3859Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3859Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug394Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug394Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug394Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug394Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4231Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4231Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4231Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4231Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4410Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4410Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4410Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4410Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4456Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4456Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4456Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4456Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4610Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4610Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4610Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4610Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4623Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4623Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4623Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4623Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4933Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4933Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4933Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4933Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5059Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5059Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5059Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5059Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5101Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5101Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5101Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5101Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5335Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5335Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5335Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5335Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5396Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5396Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5396Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5396Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5481Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5481Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5481Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5481Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5518Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5518Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5518Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5518Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5550Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5550Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5550Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5550Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5693Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5693Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5693Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5693Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5712Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5712Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5712Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5712Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5884Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5884Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5884Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5884Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5899Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5899Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5899Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5899Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5942Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5942Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5942Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5942Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5946Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5946Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5946Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5946Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6131Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6131Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6131Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6131Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6150Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6150Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6150Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6150Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6180Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6180Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6180Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6180Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6183Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6183Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6183Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6183Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6240Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6240Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6240Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6240Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6316Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6316Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6316Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6316Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6410Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6410Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6410Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6410Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6491Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6491Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6491Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6491Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6669Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6669Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6669Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6669Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6771Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6771Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6771Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6771Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6972Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6972Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6972Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6972Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7037Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7037Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7037Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7037Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7038Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7038Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7038Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7038Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7146Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7146Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7146Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7146Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7424Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7424Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7424Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7424Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7440Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7440Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7440Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7440Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7480Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7480Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7480Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7480Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7865Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7865Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7865Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7865Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7879Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7879Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7879Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7879Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7954Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7954Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7954Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7954Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8126Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8126Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8126Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8126Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8307Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8307Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8307Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8307Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8597Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8597Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8597Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8597Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8831Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8831Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8831Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8831Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8922Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8922Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8922Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8922Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9005Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9005Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9005Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9005Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9242Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9242Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9242Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9242Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9244Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9244Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9244Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9244Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/CaseStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/CaseStmtTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/CaseStmtTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/CaseStmtTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ChoiceStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ChoiceStmtTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ChoiceStmtTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ChoiceStmtTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ControllerStmtParserTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ControllerStmtParserTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ControllerStmtParserTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ControllerStmtParserTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeclaredStatementsTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeclaredStatementsTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeclaredStatementsTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeclaredStatementsTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationResolutionTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationResolutionTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationResolutionTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationResolutionTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationStmtTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationStmtTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationStmtTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveBuildTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveBuildTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveBuildTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveBuildTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveIdentityTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveIdentityTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveIdentityTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveIdentityTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModuleTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModuleTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModuleTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModuleTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveSchemaContextTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveSchemaContextTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveSchemaContextTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveSchemaContextTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveStatementTypeTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveStatementTypeTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveStatementTypeTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveStatementTypeTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveUsesRefineAndConstraintsTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveUsesRefineAndConstraintsTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveUsesRefineAndConstraintsTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveUsesRefineAndConstraintsTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ExtensionStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ExtensionStmtTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ExtensionStmtTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ExtensionStmtTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingAndUsesStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingAndUsesStmtTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingAndUsesStmtTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingAndUsesStmtTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IdentityIssueIetfRoutingTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IdentityIssueIetfRoutingTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IdentityIssueIetfRoutingTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IdentityIssueIetfRoutingTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IdentityStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IdentityStmtTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IdentityStmtTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IdentityStmtTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IfFeatureResolutionTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IfFeatureResolutionTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IfFeatureResolutionTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IfFeatureResolutionTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ImportResolutionBasicTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ImportResolutionBasicTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ImportResolutionBasicTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ImportResolutionBasicTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ImportRevisionsTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ImportRevisionsTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ImportRevisionsTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ImportRevisionsTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeResolutionTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeResolutionTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeResolutionTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeResolutionTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeRevisionsTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeRevisionsTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeRevisionsTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeRevisionsTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludedStmtsTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludedStmtsTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludedStmtsTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludedStmtsTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/KeyTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/KeyTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/KeyTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/KeyTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ListKeysTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ListKeysTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ListKeysTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ListKeysTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ListTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ListTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ListTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ListTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/MustAndWhenStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/MustAndWhenStmtTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/MustAndWhenStmtTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/MustAndWhenStmtTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/NameCollisionWithinCaseTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/NameCollisionWithinCaseTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/NameCollisionWithinCaseTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/NameCollisionWithinCaseTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/NotificationStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/NotificationStmtTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/NotificationStmtTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/NotificationStmtTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/OrderingTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/OrderingTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/OrderingTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/OrderingTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ParsingExtensionValueTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ParsingExtensionValueTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ParsingExtensionValueTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ParsingExtensionValueTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/SubstatementValidatorTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/SubstatementValidatorTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/SubstatementValidatorTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/SubstatementValidatorTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TwoRevisionsTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TwoRevisionsTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TwoRevisionsTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TwoRevisionsTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefConstraintsTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefConstraintsTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefConstraintsTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefConstraintsTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefSubStmtsTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefSubStmtsTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefSubStmtsTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefSubStmtsTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/UsesAugmentTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/UsesAugmentTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/UsesAugmentTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/UsesAugmentTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1039Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1039Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1039Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1039Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1042Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1042Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1042Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1042Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1089Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1089Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1089Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1089Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1133Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1133Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1133Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1133Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1189Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1189Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1189Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1189Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1195Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1195Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1195Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1195Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1200Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1200Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1200Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1200Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1201Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1201Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1201Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1201Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1208Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1208Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1208Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1208Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1209Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1209Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1209Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1209Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1212Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1212Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1212Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1212Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT838Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT838Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT838Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT838Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT841Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT841Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT841Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT841Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT857Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT857Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT857Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT857Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT859Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT859Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT859Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT859Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT893Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT893Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT893Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT893Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT911Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT911Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT911Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT911Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT956Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT956Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT956Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT956Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT971Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT971Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT971Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT971Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT983Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT983Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT983Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT983Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangFileStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangFileStmtTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangFileStmtTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangFileStmtTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserIdentityTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserIdentityTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserIdentityTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserIdentityTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserNegativeTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserNegativeTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserNegativeTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserNegativeTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserSimpleTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserSimpleTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserSimpleTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserSimpleTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserWithContextTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserWithContextTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserWithContextTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserWithContextTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypes2StmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypes2StmtTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypes2StmtTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypes2StmtTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypesStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypesStmtTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypesStmtTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypesStmtTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionBorderCaseTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionBorderCaseTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionBorderCaseTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionBorderCaseTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionComplexTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionComplexTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionComplexTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionComplexTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionDefaultsTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionDefaultsTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionDefaultsTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionDefaultsTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionIgnoringRevisionTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionIgnoringRevisionTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionIgnoringRevisionTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionIgnoringRevisionTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionImportTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionImportTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionImportTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionImportTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionMultipleImportTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionMultipleImportTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionMultipleImportTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionMultipleImportTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionPositionTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionPositionTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionPositionTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionPositionTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/yin/YinOpenconfigVersionTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/yin/YinOpenconfigVersionTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/yin/YinOpenconfigVersionTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/yin/YinOpenconfigVersionTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/test/Bug5200Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/test/Bug5200Test.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/test/Bug5200Test.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/test/Bug5200Test.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/AbstractYinModulesTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/AbstractYinModulesTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/AbstractYinModulesTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/AbstractYinModulesTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileAugmentStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileAugmentStmtTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileAugmentStmtTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileAugmentStmtTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileChoiceStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileChoiceStmtTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileChoiceStmtTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileChoiceStmtTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileExtensionStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileExtensionStmtTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileExtensionStmtTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileExtensionStmtTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileFeatureStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileFeatureStmtTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileFeatureStmtTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileFeatureStmtTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileGroupingStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileGroupingStmtTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileGroupingStmtTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileGroupingStmtTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileHeaderStmtsTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileHeaderStmtsTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileHeaderStmtsTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileHeaderStmtsTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileIdentityStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileIdentityStmtTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileIdentityStmtTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileIdentityStmtTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileImportStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileImportStmtTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileImportStmtTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileImportStmtTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileIncludeStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileIncludeStmtTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileIncludeStmtTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileIncludeStmtTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileLeafListStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileLeafListStmtTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileLeafListStmtTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileLeafListStmtTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileListStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileListStmtTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileListStmtTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileListStmtTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileMetaStmtsTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileMetaStmtsTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileMetaStmtsTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileMetaStmtsTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileRpcStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileRpcStmtTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileRpcStmtTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileRpcStmtTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileStmtTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileStmtTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileStmtTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileTypeDefStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileTypeDefStmtTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileTypeDefStmtTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileTypeDefStmtTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileUsesStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileUsesStmtTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileUsesStmtTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileUsesStmtTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/RefThirdPartyExtensionStatement.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/RefThirdPartyExtensionStatement.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/RefThirdPartyExtensionStatement.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/RefThirdPartyExtensionStatement.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionEffectiveStatement.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionEffectiveStatement.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionEffectiveStatement.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionEffectiveStatement.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionEffectiveStatementImpl.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionEffectiveStatementImpl.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionEffectiveStatementImpl.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionEffectiveStatementImpl.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionPluginTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionPluginTest.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionPluginTest.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionPluginTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionStatement.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionStatement.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionStatement.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionStatement.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionStatementImpl.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionStatementImpl.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionStatementImpl.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionStatementImpl.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionSupport.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionSupport.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionSupport.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionSupport.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionsMapping.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionsMapping.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionsMapping.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionsMapping.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyNamespace.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyNamespace.java
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyNamespace.java
rename to parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyNamespace.java

diff --git a/yang/yang-parser-rfc7950/src/test/resources/added-by-uses-leaf-test/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/added-by-uses-leaf-test/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/added-by-uses-leaf-test/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/added-by-uses-leaf-test/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/added-by-uses-leaf-test/import-module.yang b/parser/yang-parser-rfc7950/src/test/resources/added-by-uses-leaf-test/import-module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/added-by-uses-leaf-test/import-module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/added-by-uses-leaf-test/import-module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/augment-test/augment-in-augment/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/augment-test/augment-in-augment/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/augment-test/augment-in-augment/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/augment-test/augment-in-augment/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/augment-test/augment-in-augment/baz.yang b/parser/yang-parser-rfc7950/src/test/resources/augment-test/augment-in-augment/baz.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/augment-test/augment-in-augment/baz.yang
rename to parser/yang-parser-rfc7950/src/test/resources/augment-test/augment-in-augment/baz.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/augment-test/augment-in-augment/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/augment-test/augment-in-augment/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/augment-test/augment-in-augment/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/augment-test/augment-in-augment/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/augment-test/augment-in-uses/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/augment-test/augment-in-uses/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/augment-test/augment-in-uses/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/augment-test/augment-in-uses/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/augment-test/rpc/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/augment-test/rpc/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/augment-test/rpc/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/augment-test/rpc/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/augment-test/rpc/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/augment-test/rpc/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/augment-test/rpc/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/augment-test/rpc/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/augment-to-extension-test/correct-augment/augment-module.yang b/parser/yang-parser-rfc7950/src/test/resources/augment-to-extension-test/correct-augment/augment-module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/augment-to-extension-test/correct-augment/augment-module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/augment-to-extension-test/correct-augment/augment-module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/augment-to-extension-test/correct-augment/extension-module.yang b/parser/yang-parser-rfc7950/src/test/resources/augment-to-extension-test/correct-augment/extension-module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/augment-to-extension-test/correct-augment/extension-module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/augment-to-extension-test/correct-augment/extension-module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/augment-to-extension-test/correct-path-into-unsupported-target/augment-module.yang b/parser/yang-parser-rfc7950/src/test/resources/augment-to-extension-test/correct-path-into-unsupported-target/augment-module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/augment-to-extension-test/correct-path-into-unsupported-target/augment-module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/augment-to-extension-test/correct-path-into-unsupported-target/augment-module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/augment-to-extension-test/correct-path-into-unsupported-target/extension-module.yang b/parser/yang-parser-rfc7950/src/test/resources/augment-to-extension-test/correct-path-into-unsupported-target/extension-module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/augment-to-extension-test/correct-path-into-unsupported-target/extension-module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/augment-to-extension-test/correct-path-into-unsupported-target/extension-module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/augment-to-extension-test/incorrect-path/augment-module.yang b/parser/yang-parser-rfc7950/src/test/resources/augment-to-extension-test/incorrect-path/augment-module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/augment-to-extension-test/incorrect-path/augment-module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/augment-to-extension-test/incorrect-path/augment-module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/augment-to-extension-test/incorrect-path/extension-module.yang b/parser/yang-parser-rfc7950/src/test/resources/augment-to-extension-test/incorrect-path/extension-module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/augment-to-extension-test/incorrect-path/extension-module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/augment-to-extension-test/incorrect-path/extension-module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT1039/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1039/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT1039/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT1039/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT1039/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1039/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT1039/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT1039/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT1042/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1042/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT1042/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT1042/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT1042/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1042/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT1042/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT1042/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT1089/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1089/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT1089/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT1089/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT1133/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1133/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT1133/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT1133/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT1133/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1133/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT1133/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT1133/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT1189/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1189/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT1189/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT1189/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT1189/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1189/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT1189/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT1189/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT1195/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1195/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT1195/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT1195/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT1195/key.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1195/key.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT1195/key.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT1195/key.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT1200/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1200/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT1200/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT1200/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT1201/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1201/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT1201/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT1201/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT1201/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1201/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT1201/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT1201/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT1208/augment.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1208/augment.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT1208/augment.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT1208/augment.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT1208/case.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1208/case.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT1208/case.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT1208/case.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT1208/choice.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1208/choice.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT1208/choice.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT1208/choice.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT1208/grouping.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1208/grouping.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT1208/grouping.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT1208/grouping.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT1208/leaf.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1208/leaf.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT1208/leaf.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT1208/leaf.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT1208/leaflist.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1208/leaflist.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT1208/leaflist.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT1208/leaflist.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT1208/list.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1208/list.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT1208/list.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT1208/list.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT1208/typedef.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1208/typedef.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT1208/typedef.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT1208/typedef.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT1208/uses.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1208/uses.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT1208/uses.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT1208/uses.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT1209/when.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1209/when.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT1209/when.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT1209/when.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT1212/anyxml.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1212/anyxml.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT1212/anyxml.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT1212/anyxml.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT1212/container.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1212/container.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT1212/container.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT1212/container.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT1212/leaf.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT1212/leaf.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT1212/leaf.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT1212/leaf.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT827/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT827/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT827/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT827/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT838/grouping-post.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT838/grouping-post.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT838/grouping-post.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT838/grouping-post.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT838/grouping.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT838/grouping.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT838/grouping.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT838/grouping.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT838/typedef-post.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT838/typedef-post.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT838/typedef-post.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT838/typedef-post.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT838/typedef.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT838/typedef.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT838/typedef.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT838/typedef.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT841/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT841/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT841/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT841/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT857/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT857/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT857/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT857/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT859/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT859/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT859/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT859/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT859/baz.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT859/baz.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT859/baz.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT859/baz.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT859/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT859/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT859/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT859/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT859/xyzzy.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT859/xyzzy.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT859/xyzzy.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT859/xyzzy.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT893/cr.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT893/cr.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT893/cr.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT893/cr.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT893/crlf.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT893/crlf.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT893/crlf.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT893/crlf.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT893/ht.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT893/ht.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT893/ht.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT893/ht.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT893/lf.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT893/lf.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT893/lf.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT893/lf.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT911/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT911/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT911/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT911/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT956/another-module.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT956/another-module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT956/another-module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT956/another-module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT956/mainmodule.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT956/mainmodule.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT956/mainmodule.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT956/mainmodule.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT956/sub-module-1.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT956/sub-module-1.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT956/sub-module-1.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT956/sub-module-1.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT956/sub-module-2.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT956/sub-module-2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT956/sub-module-2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT956/sub-module-2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT971/test.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT971/test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT971/test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT971/test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/YT983/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/YT983/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/YT983/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/YT983/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug1412/bug1412.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug1412/bug1412.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug1412/bug1412.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug1412/bug1412.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug1412/extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug1412/extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug1412/extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug1412/extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug1413/bug1413.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug1413/bug1413.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug1413/bug1413.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug1413/bug1413.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug1413/extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug1413/extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug1413/extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug1413/extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug2291/bug2291-ext.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug2291/bug2291-ext.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug2291/bug2291-ext.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug2291/bug2291-ext.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug2291/bug2291.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug2291/bug2291.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug2291/bug2291.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug2291/bug2291.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug2872/bug2872.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug2872/bug2872.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug2872/bug2872.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug2872/bug2872.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug3799/test_module.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug3799/test_module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug3799/test_module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug3799/test_module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug3799/test_submodule.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug3799/test_submodule.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug3799/test_submodule.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug3799/test_submodule.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug3859/bug3859.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug3859/bug3859.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug3859/bug3859.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug3859/bug3859.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug394-retest/bug394-ext.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug394-retest/bug394-ext.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug394-retest/bug394-ext.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug394-retest/bug394-ext.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug394-retest/bug394.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug394-retest/bug394.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug394-retest/bug394.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug394-retest/bug394.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug394-retest/ietf-yang-types@2010-09-24.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug394-retest/ietf-yang-types@2010-09-24.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug394-retest/ietf-yang-types@2010-09-24.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug394-retest/ietf-yang-types@2010-09-24.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug394/bug394-ext.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug394/bug394-ext.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug394/bug394-ext.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug394/bug394-ext.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug394/bug394.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug394/bug394.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug394/bug394.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug394/bug394.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug4079/bug4079-test.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug4079/bug4079-test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug4079/bug4079-test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug4079/bug4079-test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug4231.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug4231.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug4231.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug4231.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug4410/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug4410/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug4410/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug4410/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug4456/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug4456/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug4456/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug4456/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug4459/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug4459/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug4459/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug4459/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug4610/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug4610/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug4610/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug4610/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug4610/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug4610/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug4610/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug4610/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug4623/extension-def.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug4623/extension-def.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug4623/extension-def.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug4623/extension-def.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug4623/string-with-ext.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug4623/string-with-ext.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug4623/string-with-ext.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug4623/string-with-ext.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug4933/correct/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug4933/correct/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug4933/correct/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug4933/correct/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug4933/correct/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug4933/correct/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug4933/correct/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug4933/correct/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug4933/incorrect/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug4933/incorrect/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug4933/incorrect/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug4933/incorrect/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug4933/incorrect/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug4933/incorrect/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug4933/incorrect/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug4933/incorrect/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5059/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5059/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5059/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5059/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5101.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5101.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5101.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5101.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5200/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5200/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5200/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5200/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-1/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-1/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-1/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-1/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-1/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-1/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-1/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-1/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-1/sub-bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-1/sub-bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-1/sub-bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-1/sub-bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-2/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-2/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-2/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-2/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-2/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-2/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-2/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-2/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-2/sub-bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-2/sub-bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-2/sub-bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-2/sub-bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-3/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-3/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-3/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-3/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-3/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-3/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-3/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-3/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-4/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-4/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-4/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/correct/case-4/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-1/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-1/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-1/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-1/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-1/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-1/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-1/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-1/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-1/sub-bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-1/sub-bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-1/sub-bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-1/sub-bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-2/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-2/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-2/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-2/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-2/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-2/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-2/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-2/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-3/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-3/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-3/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-3/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-3/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-3/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-3/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-3/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-3/sub-bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-3/sub-bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-3/sub-bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5335/incorrect/case-3/sub-bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5396/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5396/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5396/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5396/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5410/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5410/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5410/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5410/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5481/module1.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5481/module1.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5481/module1.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5481/module1.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5481/module2.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5481/module2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5481/module2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5481/module2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5518/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5518/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5518/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5518/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5550/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5550/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5550/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5550/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5693/foo.yin b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5693/foo.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5693/foo.yin
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5693/foo.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5712/bad.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5712/bad.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5712/bad.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5712/bad.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5884/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5884/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5884/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5884/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5899/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5899/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5899/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5899/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5942/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5942/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5942/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5942/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5946/foo-invalid.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5946/foo-invalid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5946/foo-invalid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5946/foo-invalid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug5946/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug5946/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug5946/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug5946/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6131/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6131/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6131/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6131/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6150/aug-first.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6150/aug-first.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6150/aug-first.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6150/aug-first.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6150/aug-second.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6150/aug-second.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6150/aug-second.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6150/aug-second.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6150/target.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6150/target.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6150/target.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6150/target.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6180/double-quotes-single-inside.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6180/double-quotes-single-inside.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6180/double-quotes-single-inside.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6180/double-quotes-single-inside.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6180/double-quotes.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6180/double-quotes.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6180/double-quotes.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6180/double-quotes.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6180/single-quotes.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6180/single-quotes.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6180/single-quotes.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6180/single-quotes.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6180/string-test.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6180/string-test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6180/string-test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6180/string-test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6183/yang10/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6183/yang10/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6183/yang10/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6183/yang10/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6183/yang11/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6183/yang11/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6183/yang11/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6183/yang11/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6240/correct/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6240/correct/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6240/correct/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6240/correct/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6240/correct/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6240/correct/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6240/correct/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6240/correct/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6240/correct/sub-bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6240/correct/sub-bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6240/correct/sub-bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6240/correct/sub-bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6240/correct/sub-foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6240/correct/sub-foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6240/correct/sub-foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6240/correct/sub-foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6240/incorrect/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6240/incorrect/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6240/incorrect/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6240/incorrect/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6240/incorrect/foo-imp.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6240/incorrect/foo-imp.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6240/incorrect/foo-imp.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6240/incorrect/foo-imp.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6240/incorrect/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6240/incorrect/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6240/incorrect/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6240/incorrect/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6240/incorrect/sub-foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6240/incorrect/sub-foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6240/incorrect/sub-foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6240/incorrect/sub-foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6316/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6316/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6316/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6316/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6410/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6410/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6410/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6410/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6410/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6410/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6410/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6410/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6491/importedModuleRevisionOnly/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6491/importedModuleRevisionOnly/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6491/importedModuleRevisionOnly/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6491/importedModuleRevisionOnly/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6491/importedModuleRevisionOnly/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6491/importedModuleRevisionOnly/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6491/importedModuleRevisionOnly/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6491/importedModuleRevisionOnly/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6491/moduleRevisionOnly/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6491/moduleRevisionOnly/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6491/moduleRevisionOnly/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6491/moduleRevisionOnly/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6491/moduleRevisionOnly/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6491/moduleRevisionOnly/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6491/moduleRevisionOnly/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6491/moduleRevisionOnly/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6491/withRevision/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6491/withRevision/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6491/withRevision/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6491/withRevision/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6491/withRevision/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6491/withRevision/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6491/withRevision/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6491/withRevision/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6491/withoutRevision/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6491/withoutRevision/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6491/withoutRevision/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6491/withoutRevision/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6491/withoutRevision/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6491/withoutRevision/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6491/withoutRevision/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6491/withoutRevision/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6669/invalid/test1/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6669/invalid/test1/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6669/invalid/test1/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6669/invalid/test1/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6669/invalid/test1/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6669/invalid/test1/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6669/invalid/test1/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6669/invalid/test1/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6669/invalid/test2/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6669/invalid/test2/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6669/invalid/test2/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6669/invalid/test2/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6669/invalid/test2/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6669/invalid/test2/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6669/invalid/test2/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6669/invalid/test2/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6669/invalid/test3/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6669/invalid/test3/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6669/invalid/test3/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6669/invalid/test3/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6669/invalid/test3/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6669/invalid/test3/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6669/invalid/test3/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6669/invalid/test3/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6669/valid/test1/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6669/valid/test1/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6669/valid/test1/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6669/valid/test1/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6669/valid/test1/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6669/valid/test1/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6669/valid/test1/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6669/valid/test1/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6669/valid/test2/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6669/valid/test2/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6669/valid/test2/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6669/valid/test2/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6669/valid/test2/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6669/valid/test2/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6669/valid/test2/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6669/valid/test2/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6669/valid/test3/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6669/valid/test3/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6669/valid/test3/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6669/valid/test3/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6669/valid/test3/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6669/valid/test3/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6669/valid/test3/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6669/valid/test3/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6771/augment.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6771/augment.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6771/augment.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6771/augment.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6771/choice-case.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6771/choice-case.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6771/choice-case.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6771/choice-case.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6771/grouping.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6771/grouping.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6771/grouping.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6771/grouping.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6883/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6883/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6883/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6883/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6883/sub-foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6883/sub-foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6883/sub-foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6883/sub-foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6972/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6972/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6972/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6972/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6972/baz.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6972/baz.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6972/baz.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6972/baz.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug6972/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug6972/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug6972/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug6972/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7037/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7037/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7037/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7037/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7037/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7037/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7037/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7037/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7038/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7038/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7038/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7038/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7038/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7038/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7038/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7038/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7038/yang10/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7038/yang10/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7038/yang10/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7038/yang10/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7038/yang11/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7038/yang11/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7038/yang11/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7038/yang11/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7146/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7146/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7146/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7146/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7424/foo-data.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7424/foo-data.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7424/foo-data.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7424/foo-data.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7424/foo-notification.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7424/foo-notification.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7424/foo-notification.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7424/foo-notification.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7424/foo-rpc-uses.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7424/foo-rpc-uses.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7424/foo-rpc-uses.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7424/foo-rpc-uses.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7424/foo-rpc.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7424/foo-rpc.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7424/foo-rpc.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7424/foo-rpc.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7440/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7440/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7440/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7440/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7440/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7440/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7440/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7440/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/files-2/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/files-2/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/files-2/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/files-2/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/files-2/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/files-2/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/files-2/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/files-2/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/files/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/files/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/files/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/files/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/files/baz.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/files/baz.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/files/baz.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/files/baz.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/files/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/files/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/files/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/files/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/files/sub-mod.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/files/sub-mod.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/files/sub-mod.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/files/sub-mod.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/foo-imp-1.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/foo-imp-1.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/foo-imp-1.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/foo-imp-1.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/foo-imp-1@2017-01-22.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/foo-imp-1@2017-01-22.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/foo-imp-1@2017-01-22.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/foo-imp-1@2017-01-22.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/foo-imp-2.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/foo-imp-2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/foo-imp-2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/foo-imp-2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/foo-imp-imp-1.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/foo-imp-imp-1.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/foo-imp-imp-1.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/foo-imp-imp-1.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/lib-1.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/lib-1.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/lib-1.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/lib-1.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/lib-2.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/lib-2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/lib-2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/lib-2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/sub-foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/sub-foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/sub-foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib-2/sub-foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/baz-imp@2000-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/baz-imp@2000-01-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/baz-imp@2000-01-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/baz-imp@2000-01-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/baz-imp@2001-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/baz-imp@2001-01-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/baz-imp@2001-01-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/baz-imp@2001-01-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/baz-imp@2002-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/baz-imp@2002-01-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/baz-imp@2002-01-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/baz-imp@2002-01-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/foo-imp-1.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/foo-imp-1.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/foo-imp-1.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/foo-imp-1.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/foo-imp-1@2017-01-22.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/foo-imp-1@2017-01-22.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/foo-imp-1@2017-01-22.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/foo-imp-1@2017-01-22.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/foo-imp-2.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/foo-imp-2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/foo-imp-2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/foo-imp-2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/foo-imp-imp-1.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/foo-imp-imp-1.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/foo-imp-imp-1.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/foo-imp-imp-1.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/lib-1.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/lib-1.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/lib-1.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/lib-1.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/lib-2.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/lib-2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/lib-2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/lib-2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/lib-3.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/lib-3.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/lib-3.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/lib-3.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/parent-mod.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/parent-mod.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/parent-mod.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/parent-mod.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/sub-foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/sub-foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/sub-foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/lib/sub-foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/main-source-lib-source-conflict-test/child-module.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/main-source-lib-source-conflict-test/child-module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/main-source-lib-source-conflict-test/child-module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/main-source-lib-source-conflict-test/child-module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/main-source-lib-source-conflict-test/parent-module.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/main-source-lib-source-conflict-test/parent-module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7480/main-source-lib-source-conflict-test/parent-module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7480/main-source-lib-source-conflict-test/parent-module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7865/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7865/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7865/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7865/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7879/my-event-types.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7879/my-event-types.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7879/my-event-types.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7879/my-event-types.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7879/my-model-alarms.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7879/my-model-alarms.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7879/my-model-alarms.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7879/my-model-alarms.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7879/my-model.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7879/my-model.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7879/my-model.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7879/my-model.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7879/my-notification-types.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7879/my-notification-types.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7879/my-notification-types.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7879/my-notification-types.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7954/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7954/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7954/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7954/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7954/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7954/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7954/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7954/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug7954/subbar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug7954/subbar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug7954/subbar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug7954/subbar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug8126/inv-choice/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug8126/inv-choice/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug8126/inv-choice/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug8126/inv-choice/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug8126/inv-choice/ill1.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug8126/inv-choice/ill1.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug8126/inv-choice/ill1.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug8126/inv-choice/ill1.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug8126/inv-cont/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug8126/inv-cont/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug8126/inv-cont/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug8126/inv-cont/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug8126/inv-cont/ill3.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug8126/inv-cont/ill3.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug8126/inv-cont/ill3.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug8126/inv-cont/ill3.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug8126/inv-list/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug8126/inv-list/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug8126/inv-list/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug8126/inv-list/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug8126/inv-list/ill2.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug8126/inv-list/ill2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug8126/inv-list/ill2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug8126/inv-list/ill2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug8126/valid/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug8126/valid/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug8126/valid/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug8126/valid/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug8126/valid/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug8126/valid/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug8126/valid/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug8126/valid/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug8307/bar-invalid.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug8307/bar-invalid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug8307/bar-invalid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug8307/bar-invalid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug8307/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug8307/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug8307/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug8307/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug8307/baz-invalid.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug8307/baz-invalid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug8307/baz-invalid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug8307/baz-invalid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug8307/baz.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug8307/baz.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug8307/baz.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug8307/baz.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug8307/foo-invalid.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug8307/foo-invalid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug8307/foo-invalid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug8307/foo-invalid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug8307/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug8307/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug8307/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug8307/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug8307/foobar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug8307/foobar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug8307/foobar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug8307/foobar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug8597/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug8597/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug8597/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug8597/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug8597/bar@2010-10-10.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug8597/bar@2010-10-10.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug8597/bar@2010-10-10.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug8597/bar@2010-10-10.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug8597/baz.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug8597/baz.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug8597/baz.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug8597/baz.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug8597/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug8597/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug8597/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug8597/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug8831/invalid/inv-model.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug8831/invalid/inv-model.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug8831/invalid/inv-model.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug8831/invalid/inv-model.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug8831/invalid/inv-model2.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug8831/invalid/inv-model2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug8831/invalid/inv-model2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug8831/invalid/inv-model2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug8831/valid/example-model.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug8831/valid/example-model.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug8831/valid/example-model.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug8831/valid/example-model.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug8831/valid/example-model2.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug8831/valid/example-model2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug8831/valid/example-model2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug8831/valid/example-model2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug8922/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug8922/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug8922/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug8922/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug9005/bar-1@2000-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug9005/bar-1@2000-01-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug9005/bar-1@2000-01-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug9005/bar-1@2000-01-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug9005/bar-2@2000-01-02.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug9005/bar-2@2000-01-02.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug9005/bar-2@2000-01-02.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug9005/bar-2@2000-01-02.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug9005/foo@2017-07-07.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug9005/foo@2017-07-07.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug9005/foo@2017-07-07.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug9005/foo@2017-07-07.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug9005/sub-foo@2017-07-07.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug9005/sub-foo@2017-07-07.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug9005/sub-foo@2017-07-07.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug9005/sub-foo@2017-07-07.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug9242/imp-module-2.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug9242/imp-module-2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug9242/imp-module-2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug9242/imp-module-2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug9242/imp-module.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug9242/imp-module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug9242/imp-module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug9242/imp-module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug9242/root-module.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug9242/root-module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug9242/root-module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug9242/root-module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug9244/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug9244/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug9244/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug9244/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/bug9244/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/bug9244/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/bug9244/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/bug9244/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/identity-ietf-routing-test/ietf-interfaces@2014-05-08.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/identity-ietf-routing-test/ietf-interfaces@2014-05-08.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/identity-ietf-routing-test/ietf-interfaces@2014-05-08.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/identity-ietf-routing-test/ietf-interfaces@2014-05-08.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/identity-ietf-routing-test/ietf-routing@2016-11-04.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/identity-ietf-routing-test/ietf-routing@2016-11-04.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/identity-ietf-routing-test/ietf-routing@2016-11-04.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/identity-ietf-routing-test/ietf-routing@2016-11-04.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/identity-ietf-routing-test/ietf-yang-types@2013-07-15.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/identity-ietf-routing-test/ietf-yang-types@2013-07-15.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/identity-ietf-routing-test/ietf-yang-types@2013-07-15.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/identity-ietf-routing-test/ietf-yang-types@2013-07-15.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/name-collision-within-case/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/name-collision-within-case/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/name-collision-within-case/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/name-collision-within-case/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/name-collision-within-case/baz.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/name-collision-within-case/baz.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/name-collision-within-case/baz.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/name-collision-within-case/baz.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/name-collision-within-case/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/name-collision-within-case/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/name-collision-within-case/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/name-collision-within-case/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/qnameDuplicity/augment/two-cases.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/qnameDuplicity/augment/two-cases.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/qnameDuplicity/augment/two-cases.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/qnameDuplicity/augment/two-cases.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/qnameDuplicity/two-same-node-in-choice/two-same-nodes-in-choice-case.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/qnameDuplicity/two-same-node-in-choice/two-same-nodes-in-choice-case.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/qnameDuplicity/two-same-node-in-choice/two-same-nodes-in-choice-case.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/qnameDuplicity/two-same-node-in-choice/two-same-nodes-in-choice-case.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/bugs/yangtools826/example.yang b/parser/yang-parser-rfc7950/src/test/resources/bugs/yangtools826/example.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/bugs/yangtools826/example.yang
rename to parser/yang-parser-rfc7950/src/test/resources/bugs/yangtools826/example.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/case-test/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/case-test/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/case-test/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/case-test/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/case-test/case-test-exceptions/case/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/case-test/case-test-exceptions/case/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/case-test/case-test-exceptions/case/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/case-test/case-test-exceptions/case/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/case-test/case-test-exceptions/choice/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/case-test/case-test-exceptions/choice/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/case-test/case-test-exceptions/choice/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/case-test/case-test-exceptions/choice/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/case-test/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/case-test/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/case-test/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/case-test/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/choice-case-type-test-models/augment-monitoring@2013-07-01.yang b/parser/yang-parser-rfc7950/src/test/resources/choice-case-type-test-models/augment-monitoring@2013-07-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/choice-case-type-test-models/augment-monitoring@2013-07-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/choice-case-type-test-models/augment-monitoring@2013-07-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/choice-case-type-test-models/choice-monitoring@2013-07-01.yang b/parser/yang-parser-rfc7950/src/test/resources/choice-case-type-test-models/choice-monitoring@2013-07-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/choice-case-type-test-models/choice-monitoring@2013-07-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/choice-case-type-test-models/choice-monitoring@2013-07-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/constraint-definitions-test/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/constraint-definitions-test/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/constraint-definitions-test/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/constraint-definitions-test/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/context-augment-test/test1.yang b/parser/yang-parser-rfc7950/src/test/resources/context-augment-test/test1.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/context-augment-test/test1.yang
rename to parser/yang-parser-rfc7950/src/test/resources/context-augment-test/test1.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/context-augment-test/test2.yang b/parser/yang-parser-rfc7950/src/test/resources/context-augment-test/test2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/context-augment-test/test2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/context-augment-test/test2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/context-augment-test/test3.yang b/parser/yang-parser-rfc7950/src/test/resources/context-augment-test/test3.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/context-augment-test/test3.yang
rename to parser/yang-parser-rfc7950/src/test/resources/context-augment-test/test3.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/context-augment-test/test4.yang b/parser/yang-parser-rfc7950/src/test/resources/context-augment-test/test4.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/context-augment-test/test4.yang
rename to parser/yang-parser-rfc7950/src/test/resources/context-augment-test/test4.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/context-test/deviation-test.yang b/parser/yang-parser-rfc7950/src/test/resources/context-test/deviation-test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/context-test/deviation-test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/context-test/deviation-test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/context-test/test1.yang b/parser/yang-parser-rfc7950/src/test/resources/context-test/test1.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/context-test/test1.yang
rename to parser/yang-parser-rfc7950/src/test/resources/context-test/test1.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/context-test/test2.yang b/parser/yang-parser-rfc7950/src/test/resources/context-test/test2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/context-test/test2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/context-test/test2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/context-test/test3.yang b/parser/yang-parser-rfc7950/src/test/resources/context-test/test3.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/context-test/test3.yang
rename to parser/yang-parser-rfc7950/src/test/resources/context-test/test3.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/declared-statements-test/anyxml-declared-test.yang b/parser/yang-parser-rfc7950/src/test/resources/declared-statements-test/anyxml-declared-test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/declared-statements-test/anyxml-declared-test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/declared-statements-test/anyxml-declared-test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/declared-statements-test/augment-declared-test.yang b/parser/yang-parser-rfc7950/src/test/resources/declared-statements-test/augment-declared-test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/declared-statements-test/augment-declared-test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/declared-statements-test/augment-declared-test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/declared-statements-test/child-module-declared-test.yang b/parser/yang-parser-rfc7950/src/test/resources/declared-statements-test/child-module-declared-test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/declared-statements-test/child-module-declared-test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/declared-statements-test/child-module-declared-test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/declared-statements-test/choice-declared-test.yang b/parser/yang-parser-rfc7950/src/test/resources/declared-statements-test/choice-declared-test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/declared-statements-test/choice-declared-test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/declared-statements-test/choice-declared-test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/declared-statements-test/container-declared-test.yang b/parser/yang-parser-rfc7950/src/test/resources/declared-statements-test/container-declared-test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/declared-statements-test/container-declared-test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/declared-statements-test/container-declared-test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/declared-statements-test/imported-module-declared-test.yang b/parser/yang-parser-rfc7950/src/test/resources/declared-statements-test/imported-module-declared-test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/declared-statements-test/imported-module-declared-test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/declared-statements-test/imported-module-declared-test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/declared-statements-test/parent-module-declared-test.yang b/parser/yang-parser-rfc7950/src/test/resources/declared-statements-test/parent-module-declared-test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/declared-statements-test/parent-module-declared-test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/declared-statements-test/parent-module-declared-test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/declared-statements-test/root-module-declared-test.yang b/parser/yang-parser-rfc7950/src/test/resources/declared-statements-test/root-module-declared-test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/declared-statements-test/root-module-declared-test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/declared-statements-test/root-module-declared-test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/depinfo-malformed/malformed-import-rev.yang b/parser/yang-parser-rfc7950/src/test/resources/depinfo-malformed/malformed-import-rev.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/depinfo-malformed/malformed-import-rev.yang
rename to parser/yang-parser-rfc7950/src/test/resources/depinfo-malformed/malformed-import-rev.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/depinfo-malformed/malformed-import.yang b/parser/yang-parser-rfc7950/src/test/resources/depinfo-malformed/malformed-import.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/depinfo-malformed/malformed-import.yang
rename to parser/yang-parser-rfc7950/src/test/resources/depinfo-malformed/malformed-import.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/depinfo-malformed/malformed-module.yang b/parser/yang-parser-rfc7950/src/test/resources/depinfo-malformed/malformed-module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/depinfo-malformed/malformed-module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/depinfo-malformed/malformed-module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/depinfo-malformed/malformed-rev.yang b/parser/yang-parser-rfc7950/src/test/resources/depinfo-malformed/malformed-rev.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/depinfo-malformed/malformed-rev.yang
rename to parser/yang-parser-rfc7950/src/test/resources/depinfo-malformed/malformed-rev.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/bar-invalid-2.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/bar-invalid-2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/bar-invalid-2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/bar-invalid-2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/bar-invalid-3.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/bar-invalid-3.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/bar-invalid-3.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/bar-invalid-3.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/bar-invalid-4.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/bar-invalid-4.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/bar-invalid-4.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/bar-invalid-4.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/bar-invalid.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/bar-invalid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/bar-invalid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/bar-invalid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/bar10-invalid.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/bar10-invalid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/bar10-invalid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/bar10-invalid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/foo-invalid-2.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/foo-invalid-2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/foo-invalid-2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/foo-invalid-2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/foo-invalid-3.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/foo-invalid-3.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/foo-invalid-3.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/foo-invalid-3.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/foo-invalid-4.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/foo-invalid-4.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/foo-invalid-4.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/foo-invalid-4.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/foo-invalid.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/foo-invalid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/foo-invalid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/foo-invalid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/foo10-invalid.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/foo10-invalid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/foo10-invalid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-add/foo10-invalid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/bar-invalid-2.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/bar-invalid-2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/bar-invalid-2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/bar-invalid-2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/bar-invalid.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/bar-invalid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/bar-invalid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/bar-invalid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/bar10-invalid.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/bar10-invalid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/bar10-invalid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/bar10-invalid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/foo-invalid-2.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/foo-invalid-2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/foo-invalid-2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/foo-invalid-2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/foo-invalid.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/foo-invalid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/foo-invalid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/foo-invalid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/foo10-invalid.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/foo10-invalid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/foo10-invalid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-delete/foo10-invalid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-not-supported/imported.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-not-supported/imported.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-not-supported/imported.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-not-supported/imported.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-not-supported/root.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-not-supported/root.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-not-supported/root.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-not-supported/root.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/bar-invalid-2.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/bar-invalid-2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/bar-invalid-2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/bar-invalid-2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/bar-invalid-3.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/bar-invalid-3.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/bar-invalid-3.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/bar-invalid-3.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/bar-invalid.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/bar-invalid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/bar-invalid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/bar-invalid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/foo-invalid-2.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/foo-invalid-2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/foo-invalid-2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/foo-invalid-2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/foo-invalid-3.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/foo-invalid-3.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/foo-invalid-3.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/foo-invalid-3.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/foo-invalid.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/foo-invalid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/foo-invalid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/foo-invalid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/deviation-replace/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/foo-invalid-deviation-path.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/foo-invalid-deviation-path.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/foo-invalid-deviation-path.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/foo-invalid-deviation-path.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/foo-invalid-deviation-target.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/foo-invalid-deviation-target.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/foo-invalid-deviation-target.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-resolution-test/foo-invalid-deviation-target.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-stmt-test/bar-imp.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-stmt-test/bar-imp.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-stmt-test/bar-imp.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-stmt-test/bar-imp.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-stmt-test/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-stmt-test/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-stmt-test/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-stmt-test/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-stmt-test/foo-imp.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-stmt-test/foo-imp.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-stmt-test/foo-imp.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-stmt-test/foo-imp.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/deviation-stmt-test/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/deviation-stmt-test/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/deviation-stmt-test/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/deviation-stmt-test/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/effective-schema-context-test/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/effective-schema-context-test/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/effective-schema-context-test/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/effective-schema-context-test/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/effective-schema-context-test/baz.yang b/parser/yang-parser-rfc7950/src/test/resources/effective-schema-context-test/baz.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/effective-schema-context-test/baz.yang
rename to parser/yang-parser-rfc7950/src/test/resources/effective-schema-context-test/baz.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/effective-schema-context-test/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/effective-schema-context-test/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/effective-schema-context-test/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/effective-schema-context-test/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/extensions/ext-typedef.yang b/parser/yang-parser-rfc7950/src/test/resources/extensions/ext-typedef.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/extensions/ext-typedef.yang
rename to parser/yang-parser-rfc7950/src/test/resources/extensions/ext-typedef.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/extensions/ext-use.yang b/parser/yang-parser-rfc7950/src/test/resources/extensions/ext-use.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/extensions/ext-use.yang
rename to parser/yang-parser-rfc7950/src/test/resources/extensions/ext-use.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/grouping-test/cascade-uses.yang b/parser/yang-parser-rfc7950/src/test/resources/grouping-test/cascade-uses.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/grouping-test/cascade-uses.yang
rename to parser/yang-parser-rfc7950/src/test/resources/grouping-test/cascade-uses.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/grouping-test/grouping-definitions.yang b/parser/yang-parser-rfc7950/src/test/resources/grouping-test/grouping-definitions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/grouping-test/grouping-definitions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/grouping-test/grouping-definitions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/grouping-test/uses-grouping.yang b/parser/yang-parser-rfc7950/src/test/resources/grouping-test/uses-grouping.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/grouping-test/uses-grouping.yang
rename to parser/yang-parser-rfc7950/src/test/resources/grouping-test/uses-grouping.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/identity/duplicate-identity-test.yang b/parser/yang-parser-rfc7950/src/test/resources/identity/duplicate-identity-test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/identity/duplicate-identity-test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/identity/duplicate-identity-test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/identity/identitytest.yang b/parser/yang-parser-rfc7950/src/test/resources/identity/identitytest.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/identity/identitytest.yang
rename to parser/yang-parser-rfc7950/src/test/resources/identity/identitytest.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/identity/illegal-chained-identity-test.yang b/parser/yang-parser-rfc7950/src/test/resources/identity/illegal-chained-identity-test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/identity/illegal-chained-identity-test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/identity/illegal-chained-identity-test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/identity/import/dummy.yang b/parser/yang-parser-rfc7950/src/test/resources/identity/import/dummy.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/identity/import/dummy.yang
rename to parser/yang-parser-rfc7950/src/test/resources/identity/import/dummy.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/identity/import/prefiximportidentitytest.yang b/parser/yang-parser-rfc7950/src/test/resources/identity/import/prefiximportidentitytest.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/identity/import/prefiximportidentitytest.yang
rename to parser/yang-parser-rfc7950/src/test/resources/identity/import/prefiximportidentitytest.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/identity/legal-chained-identity-test.yang b/parser/yang-parser-rfc7950/src/test/resources/identity/legal-chained-identity-test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/identity/legal-chained-identity-test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/identity/legal-chained-identity-test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/identity/prefixidentitytest.yang b/parser/yang-parser-rfc7950/src/test/resources/identity/prefixidentitytest.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/identity/prefixidentitytest.yang
rename to parser/yang-parser-rfc7950/src/test/resources/identity/prefixidentitytest.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/ietf/iana-afn-safi@2012-06-04.yang b/parser/yang-parser-rfc7950/src/test/resources/ietf/iana-afn-safi@2012-06-04.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/ietf/iana-afn-safi@2012-06-04.yang
rename to parser/yang-parser-rfc7950/src/test/resources/ietf/iana-afn-safi@2012-06-04.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/ietf/iana-if-type@2012-06-05.yang b/parser/yang-parser-rfc7950/src/test/resources/ietf/iana-if-type@2012-06-05.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/ietf/iana-if-type@2012-06-05.yang
rename to parser/yang-parser-rfc7950/src/test/resources/ietf/iana-if-type@2012-06-05.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/ietf/iana-timezones@2012-07-09.yang b/parser/yang-parser-rfc7950/src/test/resources/ietf/iana-timezones@2012-07-09.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/ietf/iana-timezones@2012-07-09.yang
rename to parser/yang-parser-rfc7950/src/test/resources/ietf/iana-timezones@2012-07-09.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/ietf/ietf-inet-types@2010-09-24.yang b/parser/yang-parser-rfc7950/src/test/resources/ietf/ietf-inet-types@2010-09-24.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/ietf/ietf-inet-types@2010-09-24.yang
rename to parser/yang-parser-rfc7950/src/test/resources/ietf/ietf-inet-types@2010-09-24.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/ietf/ietf-yang-types@2010-09-24.yang b/parser/yang-parser-rfc7950/src/test/resources/ietf/ietf-yang-types@2010-09-24.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/ietf/ietf-yang-types@2010-09-24.yang
rename to parser/yang-parser-rfc7950/src/test/resources/ietf/ietf-yang-types@2010-09-24.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/ietf/network-topology@2013-07-12.yang b/parser/yang-parser-rfc7950/src/test/resources/ietf/network-topology@2013-07-12.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/ietf/network-topology@2013-07-12.yang
rename to parser/yang-parser-rfc7950/src/test/resources/ietf/network-topology@2013-07-12.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/ietf/network-topology@2013-10-21.yang b/parser/yang-parser-rfc7950/src/test/resources/ietf/network-topology@2013-10-21.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/ietf/network-topology@2013-10-21.yang
rename to parser/yang-parser-rfc7950/src/test/resources/ietf/network-topology@2013-10-21.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/if-feature-resolution-test/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/if-feature-resolution-test/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/if-feature-resolution-test/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/if-feature-resolution-test/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/if-feature-resolution-test/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/if-feature-resolution-test/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/if-feature-resolution-test/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/if-feature-resolution-test/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/if-feature-resolution-test/shared-schema-repository/foobar.yang b/parser/yang-parser-rfc7950/src/test/resources/if-feature-resolution-test/shared-schema-repository/foobar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/if-feature-resolution-test/shared-schema-repository/foobar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/if-feature-resolution-test/shared-schema-repository/foobar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/import-revision-date-test/imported-module-with-equal-revision-date.yang b/parser/yang-parser-rfc7950/src/test/resources/import-revision-date-test/imported-module-with-equal-revision-date.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/import-revision-date-test/imported-module-with-equal-revision-date.yang
rename to parser/yang-parser-rfc7950/src/test/resources/import-revision-date-test/imported-module-with-equal-revision-date.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/import-revision-date-test/imported-module-with-no-revision-date.yang b/parser/yang-parser-rfc7950/src/test/resources/import-revision-date-test/imported-module-with-no-revision-date.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/import-revision-date-test/imported-module-with-no-revision-date.yang
rename to parser/yang-parser-rfc7950/src/test/resources/import-revision-date-test/imported-module-with-no-revision-date.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/import-revision-date-test/imported-module-with-revision-date.yang b/parser/yang-parser-rfc7950/src/test/resources/import-revision-date-test/imported-module-with-revision-date.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/import-revision-date-test/imported-module-with-revision-date.yang
rename to parser/yang-parser-rfc7950/src/test/resources/import-revision-date-test/imported-module-with-revision-date.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/import-revision-date-test/imported-module-with-unequal-revision-date.yang b/parser/yang-parser-rfc7950/src/test/resources/import-revision-date-test/imported-module-with-unequal-revision-date.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/import-revision-date-test/imported-module-with-unequal-revision-date.yang
rename to parser/yang-parser-rfc7950/src/test/resources/import-revision-date-test/imported-module-with-unequal-revision-date.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/import-revision-date-test/imported-module-without-revision-date.yang b/parser/yang-parser-rfc7950/src/test/resources/import-revision-date-test/imported-module-without-revision-date.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/import-revision-date-test/imported-module-without-revision-date.yang
rename to parser/yang-parser-rfc7950/src/test/resources/import-revision-date-test/imported-module-without-revision-date.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/import-revision-date-test/root-with-equal-revision-date.yang b/parser/yang-parser-rfc7950/src/test/resources/import-revision-date-test/root-with-equal-revision-date.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/import-revision-date-test/root-with-equal-revision-date.yang
rename to parser/yang-parser-rfc7950/src/test/resources/import-revision-date-test/root-with-equal-revision-date.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/import-revision-date-test/root-with-no-revision-date.yang b/parser/yang-parser-rfc7950/src/test/resources/import-revision-date-test/root-with-no-revision-date.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/import-revision-date-test/root-with-no-revision-date.yang
rename to parser/yang-parser-rfc7950/src/test/resources/import-revision-date-test/root-with-no-revision-date.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/import-revision-date-test/root-with-revision-date.yang b/parser/yang-parser-rfc7950/src/test/resources/import-revision-date-test/root-with-revision-date.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/import-revision-date-test/root-with-revision-date.yang
rename to parser/yang-parser-rfc7950/src/test/resources/import-revision-date-test/root-with-revision-date.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/import-revision-date-test/root-with-unequal-revision-date.yang b/parser/yang-parser-rfc7950/src/test/resources/import-revision-date-test/root-with-unequal-revision-date.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/import-revision-date-test/root-with-unequal-revision-date.yang
rename to parser/yang-parser-rfc7950/src/test/resources/import-revision-date-test/root-with-unequal-revision-date.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/import-revision-date-test/root-without-revision-date.yang b/parser/yang-parser-rfc7950/src/test/resources/import-revision-date-test/root-without-revision-date.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/import-revision-date-test/root-without-revision-date.yang
rename to parser/yang-parser-rfc7950/src/test/resources/import-revision-date-test/root-without-revision-date.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/included-statements-test/child-module.yang b/parser/yang-parser-rfc7950/src/test/resources/included-statements-test/child-module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/included-statements-test/child-module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/included-statements-test/child-module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/included-statements-test/root-module.yang b/parser/yang-parser-rfc7950/src/test/resources/included-statements-test/root-module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/included-statements-test/root-module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/included-statements-test/root-module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/list-keys-test/correct-list-keys-test.yang b/parser/yang-parser-rfc7950/src/test/resources/list-keys-test/correct-list-keys-test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/list-keys-test/correct-list-keys-test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/list-keys-test/correct-list-keys-test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/list-keys-test/incorrect-list-keys-test.yang b/parser/yang-parser-rfc7950/src/test/resources/list-keys-test/incorrect-list-keys-test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/list-keys-test/incorrect-list-keys-test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/list-keys-test/incorrect-list-keys-test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/list-keys-test/incorrect-list-keys-test2.yang b/parser/yang-parser-rfc7950/src/test/resources/list-keys-test/incorrect-list-keys-test2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/list-keys-test/incorrect-list-keys-test2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/list-keys-test/incorrect-list-keys-test2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/list-keys-test/incorrect-list-keys-test3.yang b/parser/yang-parser-rfc7950/src/test/resources/list-keys-test/incorrect-list-keys-test3.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/list-keys-test/incorrect-list-keys-test3.yang
rename to parser/yang-parser-rfc7950/src/test/resources/list-keys-test/incorrect-list-keys-test3.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/list-keys-test/incorrect-list-keys-test4.yang b/parser/yang-parser-rfc7950/src/test/resources/list-keys-test/incorrect-list-keys-test4.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/list-keys-test/incorrect-list-keys-test4.yang
rename to parser/yang-parser-rfc7950/src/test/resources/list-keys-test/incorrect-list-keys-test4.yang

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

diff --git a/yang/yang-parser-rfc7950/src/test/resources/mapped-build/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/mapped-build/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/mapped-build/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/mapped-build/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/mapped-build/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/mapped-build/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/mapped-build/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/mapped-build/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/mapped-build/sub-bar.yang b/parser/yang-parser-rfc7950/src/test/resources/mapped-build/sub-bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/mapped-build/sub-bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/mapped-build/sub-bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/mapped-build/sub-foo.yang b/parser/yang-parser-rfc7950/src/test/resources/mapped-build/sub-foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/mapped-build/sub-foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/mapped-build/sub-foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/model-new/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/model-new/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/model-new/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/model-new/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/model-new/baz.yang b/parser/yang-parser-rfc7950/src/test/resources/model-new/baz.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/model-new/baz.yang
rename to parser/yang-parser-rfc7950/src/test/resources/model-new/baz.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/model-new/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/model-new/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/model-new/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/model-new/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/model-new/subfoo.yang b/parser/yang-parser-rfc7950/src/test/resources/model-new/subfoo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/model-new/subfoo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/model-new/subfoo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/model/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/model/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/model/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/model/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/model/baz.yang b/parser/yang-parser-rfc7950/src/test/resources/model/baz.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/model/baz.yang
rename to parser/yang-parser-rfc7950/src/test/resources/model/baz.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/model/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/model/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/model/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/model/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/model/subfoo.yang b/parser/yang-parser-rfc7950/src/test/resources/model/subfoo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/model/subfoo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/model/subfoo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/module-source/simple-module.yang b/parser/yang-parser-rfc7950/src/test/resources/module-source/simple-module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/module-source/simple-module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/module-source/simple-module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/must-when-stmt-test/must-test.yang b/parser/yang-parser-rfc7950/src/test/resources/must-when-stmt-test/must-test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/must-when-stmt-test/must-test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/must-when-stmt-test/must-test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/must-when-stmt-test/when-test.yang b/parser/yang-parser-rfc7950/src/test/resources/must-when-stmt-test/when-test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/must-when-stmt-test/when-test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/must-when-stmt-test/when-test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/augment0.yang b/parser/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/augment0.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/augment0.yang
rename to parser/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/augment0.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/augment1.yang b/parser/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/augment1.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/augment1.yang
rename to parser/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/augment1.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/augment2.yang b/parser/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/augment2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/augment2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/augment2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/container-leaf.yang b/parser/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/container-leaf.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/container-leaf.yang
rename to parser/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/container-leaf.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/container-list.yang b/parser/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/container-list.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/container-list.yang
rename to parser/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/container-list.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/container.yang b/parser/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/container.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/container.yang
rename to parser/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/container.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/identity.yang b/parser/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/identity.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/identity.yang
rename to parser/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/identity.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/typedef.yang b/parser/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/typedef.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/typedef.yang
rename to parser/yang-parser-rfc7950/src/test/resources/negative-scenario/duplicity/typedef.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/negative-scenario/invalid-list-key-def.yang b/parser/yang-parser-rfc7950/src/test/resources/negative-scenario/invalid-list-key-def.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/negative-scenario/invalid-list-key-def.yang
rename to parser/yang-parser-rfc7950/src/test/resources/negative-scenario/invalid-list-key-def.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile0.yang b/parser/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile0.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile0.yang
rename to parser/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile0.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile1.yang b/parser/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile1.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile1.yang
rename to parser/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile1.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile2.yang b/parser/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile3.yang b/parser/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile3.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile3.yang
rename to parser/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile3.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile4.yang b/parser/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile4.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile4.yang
rename to parser/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile4.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile5.yang b/parser/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile5.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile5.yang
rename to parser/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile5.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile6.yang b/parser/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile6.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile6.yang
rename to parser/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile6.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile7.yang b/parser/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile7.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile7.yang
rename to parser/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile7.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile8.yang b/parser/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile8.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile8.yang
rename to parser/yang-parser-rfc7950/src/test/resources/negative-scenario/testfile8.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/no-revision/imported.yang b/parser/yang-parser-rfc7950/src/test/resources/no-revision/imported.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/no-revision/imported.yang
rename to parser/yang-parser-rfc7950/src/test/resources/no-revision/imported.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/no-revision/imported@2012-12-12.yang b/parser/yang-parser-rfc7950/src/test/resources/no-revision/imported@2012-12-12.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/no-revision/imported@2012-12-12.yang
rename to parser/yang-parser-rfc7950/src/test/resources/no-revision/imported@2012-12-12.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/no-revision/module-without-revision.yang b/parser/yang-parser-rfc7950/src/test/resources/no-revision/module-without-revision.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/no-revision/module-without-revision.yang
rename to parser/yang-parser-rfc7950/src/test/resources/no-revision/module-without-revision.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/no-revision/top@2012-10-10.yang b/parser/yang-parser-rfc7950/src/test/resources/no-revision/top@2012-10-10.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/no-revision/top@2012-10-10.yang
rename to parser/yang-parser-rfc7950/src/test/resources/no-revision/top@2012-10-10.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-2/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-2/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-2/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-2/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-2/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-2/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-2/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-2/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-2/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-2/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-2/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-2/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-3/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-3/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-3/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-3/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-3/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-3/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-3/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-3/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/bar@2016-01-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/bar@2016-01-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/bar@2016-01-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/bar@2016-01-31.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/bar@2016-01-31.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/bar@2016-01-31.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/bar@2016-01-31.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/bar@2016-01-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/bar@2016-01-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/bar@2016-01-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/bar@2016-01-31.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/bar@2016-01-31.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/bar@2016-01-31.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/bar@2016-01-31.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-2/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-2/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-2/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-2/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-2/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-2/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-2/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-2/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-2/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-2/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-2/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-2/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/basic/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/bar@2016-01-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/bar@2016-01-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/bar@2016-01-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/bar@2016-01-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/bar@2016-01-02.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/bar@2016-01-02.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/bar@2016-01-02.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/bar@2016-01-03.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/bar@2016-01-03.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/bar@2016-01-03.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/bar@2016-01-03.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/bar@2016-01-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/bar@2016-01-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/bar@2016-01-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/bar@2016-01-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/bar@2016-01-02.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/bar@2016-01-02.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/bar@2016-01-02.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/bar@2016-01-03.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/bar@2016-01-03.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/bar@2016-01-03.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/bar@2016-01-03.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/bar@2016-01-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/bar@2016-01-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/bar@2016-01-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/bar@2016-01-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/bar@2016-01-02.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/bar@2016-01-02.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/bar@2016-01-02.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/bar@2016-01-03.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/bar@2016-01-03.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/bar@2016-01-03.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/bar@2016-01-03.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/bar@2016-01-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/bar@2016-01-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/bar@2016-01-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/bar@2016-01-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/bar@2016-01-02.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/bar@2016-01-02.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/bar@2016-01-02.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/bar@2016-01-03.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/bar@2016-01-03.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/bar@2016-01-03.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/bar@2016-01-03.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/bar@2016-01-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/bar@2016-01-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/bar@2016-01-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/bar@2016-01-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/bar@2016-01-02.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/bar@2016-01-02.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/bar@2016-01-02.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/bar@2016-01-03.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/bar@2016-01-03.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/bar@2016-01-03.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/bar@2016-01-03.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/bar@2016-01-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/bar@2016-01-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/bar@2016-01-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/bar@2016-01-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/bar@2016-01-02.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/bar@2016-01-02.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/bar@2016-01-02.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/bar@2016-01-03.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/bar@2016-01-03.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/bar@2016-01-03.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/bar@2016-01-03.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/bar@2016-01-03.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/bar@2016-01-03.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/bar@2016-01-03.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/bar@2016-01-03.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/bar@2016-01-04.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/bar@2016-01-04.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/bar@2016-01-04.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/bar@2016-01-04.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foobar@2016-01-31.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foobar@2016-01-31.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foobar@2016-01-31.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foobar@2016-01-31.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foobar@2016-02-28.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foobar@2016-02-28.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foobar@2016-02-28.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foobar@2016-02-28.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/bar@2016-01-03.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/bar@2016-01-03.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/bar@2016-01-03.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/bar@2016-01-03.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/bar@2016-01-04.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/bar@2016-01-04.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/bar@2016-01-04.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/bar@2016-01-04.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/foobar@2016-01-31.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/foobar@2016-01-31.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/foobar@2016-01-31.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/foobar@2016-01-31.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/foobar@2016-02-28.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/foobar@2016-02-28.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/foobar@2016-02-28.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/foobar@2016-02-28.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/bar@2016-01-03.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/bar@2016-01-03.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/bar@2016-01-03.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/bar@2016-01-03.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/bar@2016-01-04.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/bar@2016-01-04.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/bar@2016-01-04.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/bar@2016-01-04.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-01-31.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-01-31.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-01-31.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-01-31.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-02-27.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-02-27.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-02-27.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-02-27.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-02-28.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-02-28.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-02-28.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-02-28.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/bar@2016-01-03.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/bar@2016-01-03.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/bar@2016-01-03.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/bar@2016-01-03.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/bar@2016-01-04.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/bar@2016-01-04.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/bar@2016-01-04.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/bar@2016-01-04.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foobar@2016-01-31.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foobar@2016-01-31.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foobar@2016-01-31.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foobar@2016-01-31.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foobar@2016-02-27.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foobar@2016-02-27.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foobar@2016-02-27.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foobar@2016-02-27.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foobar@2016-02-28.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foobar@2016-02-28.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foobar@2016-02-28.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foobar@2016-02-28.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-invalid/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-invalid/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-invalid/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-invalid/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-invalid/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-invalid/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-invalid/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-invalid/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-invalid/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-invalid/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-invalid/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-invalid/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-valid/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-valid/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-valid/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-valid/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-valid/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-valid/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-valid/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-valid/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-valid/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-valid/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-valid/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-valid/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/defaults/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/defaults/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/defaults/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/defaults/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/defaults/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/defaults/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/defaults/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/defaults/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/bar@2016-01-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/bar@2016-01-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/bar@2016-01-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/bar@2016-01-31.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/bar@2016-01-31.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/bar@2016-01-31.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/bar@2016-01-31.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision/bar@2016-01-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision/bar@2016-01-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision/bar@2016-01-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-1/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-1/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-1/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-1/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-1/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-1/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-1/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-1/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-2/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-2/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-2/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-2/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-2/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-2/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-2/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-2/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-1/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-1/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-1/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-1/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-1/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-1/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-1/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-1/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-2/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-2/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-2/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-2/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-2/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-2/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-2/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-2/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-valid/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-valid/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-valid/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-valid/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-valid/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-valid/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-valid/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-valid/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-02.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-02.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-02.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-03.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-03.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-03.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-03.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-04.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-04.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-04.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-04.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-31.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-31.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-31.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-31.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-02-28.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-02-28.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-02-28.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-02-28.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-01-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-01-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-01-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-01-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-01-02.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-01-02.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-01-02.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-02-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-02-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-02-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-02-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-02-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-02-02.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-02-02.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-02-02.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-01-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-01-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-01-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-01-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-01-02.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-01-02.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-01-02.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-02-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-02-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-02-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-02-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-02-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-02-02.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-02-02.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-02-02.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-01-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-01-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-01-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-01-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-01-02.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-01-02.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-01-02.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-02-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-02-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-02-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-02-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-02-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-02-02.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-02-02.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-02-02.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-01-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-01-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-01-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-01-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-01-02.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-01-02.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-01-02.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-02-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-02-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-02-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-02-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-02-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-02-02.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-02-02.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-02-02.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2016-04-04.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2016-04-04.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2016-04-04.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2016-04-04.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2016-04-05.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2016-04-05.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2016-04-05.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2016-04-05.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2016-04-06.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2016-04-06.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2016-04-06.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2016-04-06.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2017-04-06.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2017-04-06.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2017-04-06.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2017-04-06.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-head/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-head/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-head/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-head/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-head/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-head/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-head/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-head/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-head/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-head/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-head/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-head/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-middle/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-middle/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-middle/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-middle/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-middle/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-middle/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-middle/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-middle/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-middle/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-middle/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-middle/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-middle/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-tail/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-tail/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-tail/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-tail/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-tail/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-tail/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-tail/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-tail/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-tail/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-tail/openconfig-extensions.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-tail/openconfig-extensions.yang
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-tail/openconfig-extensions.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/bar@2016-01-01.yin b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/bar@2016-01-01.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/bar@2016-01-01.yin
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/bar@2016-01-01.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/bar@2016-01-31.yin b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/bar@2016-01-31.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/bar@2016-01-31.yin
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/bar@2016-01-31.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/foo@2016-02-01.yin b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/foo@2016-02-01.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/foo@2016-02-01.yin
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/foo@2016-02-01.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/openconfig-extensions@2017-01-29.yin b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/openconfig-extensions@2017-01-29.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/openconfig-extensions@2017-01-29.yin
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/openconfig-extensions@2017-01-29.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/bar@2016-01-01.yin b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/bar@2016-01-01.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/bar@2016-01-01.yin
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/bar@2016-01-01.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/bar@2016-01-31.yin b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/bar@2016-01-31.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/bar@2016-01-31.yin
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/bar@2016-01-31.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/foo@2016-02-01.yin b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/foo@2016-02-01.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/foo@2016-02-01.yin
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/foo@2016-02-01.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/openconfig-extensions@2016-01-29.yin b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/openconfig-extensions@2016-01-29.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/openconfig-extensions@2016-01-29.yin
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/openconfig-extensions@2016-01-29.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic/bar@2016-01-31.yin b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic/bar@2016-01-31.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic/bar@2016-01-31.yin
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic/bar@2016-01-31.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic/foo@2016-02-01.yin b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic/foo@2016-02-01.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic/foo@2016-02-01.yin
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic/foo@2016-02-01.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic/openconfig-extensions@2017-01-29.yin b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic/openconfig-extensions@2017-01-29.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic/openconfig-extensions@2017-01-29.yin
rename to parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic/openconfig-extensions@2017-01-29.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/ordering/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/ordering/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/ordering/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/ordering/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/m2@2013-09-30.yang b/parser/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/m2@2013-09-30.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/m2@2013-09-30.yang
rename to parser/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/m2@2013-09-30.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/m2@2013-10-01.yang b/parser/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/m2@2013-10-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/m2@2013-10-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/m2@2013-10-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/m3.yang b/parser/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/m3.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/m3.yang
rename to parser/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/m3.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/m4.yang b/parser/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/m4.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/m4.yang
rename to parser/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/m4.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/m5.yang b/parser/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/m5.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/m5.yang
rename to parser/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/m5.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/m6.yang b/parser/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/m6.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/m6.yang
rename to parser/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/m6.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/unused.yang b/parser/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/unused.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/unused.yang
rename to parser/yang-parser-rfc7950/src/test/resources/parse-methods/dependencies/unused.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/parse-methods/m1.yang b/parser/yang-parser-rfc7950/src/test/resources/parse-methods/m1.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/parse-methods/m1.yang
rename to parser/yang-parser-rfc7950/src/test/resources/parse-methods/m1.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/parse-methods/m2@2013-09-30.yang b/parser/yang-parser-rfc7950/src/test/resources/parse-methods/m2@2013-09-30.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/parse-methods/m2@2013-09-30.yang
rename to parser/yang-parser-rfc7950/src/test/resources/parse-methods/m2@2013-09-30.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/parse-methods/m2@2013-10-01.yang b/parser/yang-parser-rfc7950/src/test/resources/parse-methods/m2@2013-10-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/parse-methods/m2@2013-10-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/parse-methods/m2@2013-10-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/parse-methods/m3.yang b/parser/yang-parser-rfc7950/src/test/resources/parse-methods/m3.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/parse-methods/m3.yang
rename to parser/yang-parser-rfc7950/src/test/resources/parse-methods/m3.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/parse-methods/m4.yang b/parser/yang-parser-rfc7950/src/test/resources/parse-methods/m4.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/parse-methods/m4.yang
rename to parser/yang-parser-rfc7950/src/test/resources/parse-methods/m4.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/parse-methods/m5.yang b/parser/yang-parser-rfc7950/src/test/resources/parse-methods/m5.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/parse-methods/m5.yang
rename to parser/yang-parser-rfc7950/src/test/resources/parse-methods/m5.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/parse-methods/m6.yang b/parser/yang-parser-rfc7950/src/test/resources/parse-methods/m6.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/parse-methods/m6.yang
rename to parser/yang-parser-rfc7950/src/test/resources/parse-methods/m6.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/parse-methods/unused.yang b/parser/yang-parser-rfc7950/src/test/resources/parse-methods/unused.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/parse-methods/unused.yang
rename to parser/yang-parser-rfc7950/src/test/resources/parse-methods/unused.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/plugin-test/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/plugin-test/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/plugin-test/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/plugin-test/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/revisions/equal-rev.yang b/parser/yang-parser-rfc7950/src/test/resources/revisions/equal-rev.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/revisions/equal-rev.yang
rename to parser/yang-parser-rfc7950/src/test/resources/revisions/equal-rev.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/revisions/equal-root.yang b/parser/yang-parser-rfc7950/src/test/resources/revisions/equal-root.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/revisions/equal-root.yang
rename to parser/yang-parser-rfc7950/src/test/resources/revisions/equal-root.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/revisions/mod-only-rev.yang b/parser/yang-parser-rfc7950/src/test/resources/revisions/mod-only-rev.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/revisions/mod-only-rev.yang
rename to parser/yang-parser-rfc7950/src/test/resources/revisions/mod-only-rev.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/revisions/mod-only-root.yang b/parser/yang-parser-rfc7950/src/test/resources/revisions/mod-only-root.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/revisions/mod-only-root.yang
rename to parser/yang-parser-rfc7950/src/test/resources/revisions/mod-only-root.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/revisions/nowhere-rev.yang b/parser/yang-parser-rfc7950/src/test/resources/revisions/nowhere-rev.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/revisions/nowhere-rev.yang
rename to parser/yang-parser-rfc7950/src/test/resources/revisions/nowhere-rev.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/revisions/nowhere-root.yang b/parser/yang-parser-rfc7950/src/test/resources/revisions/nowhere-root.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/revisions/nowhere-root.yang
rename to parser/yang-parser-rfc7950/src/test/resources/revisions/nowhere-root.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/revisions/submod-only-rev.yang b/parser/yang-parser-rfc7950/src/test/resources/revisions/submod-only-rev.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/revisions/submod-only-rev.yang
rename to parser/yang-parser-rfc7950/src/test/resources/revisions/submod-only-rev.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/revisions/submod-only-root.yang b/parser/yang-parser-rfc7950/src/test/resources/revisions/submod-only-root.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/revisions/submod-only-root.yang
rename to parser/yang-parser-rfc7950/src/test/resources/revisions/submod-only-root.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/revisions/unequal-rev.yang b/parser/yang-parser-rfc7950/src/test/resources/revisions/unequal-rev.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/revisions/unequal-rev.yang
rename to parser/yang-parser-rfc7950/src/test/resources/revisions/unequal-rev.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/revisions/unequal-root.yang b/parser/yang-parser-rfc7950/src/test/resources/revisions/unequal-root.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/revisions/unequal-root.yang
rename to parser/yang-parser-rfc7950/src/test/resources/revisions/unequal-root.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/action-stmt/bar-invalid.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/action-stmt/bar-invalid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/action-stmt/bar-invalid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/action-stmt/bar-invalid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/action-stmt/baz-invalid.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/action-stmt/baz-invalid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/action-stmt/baz-invalid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/action-stmt/baz-invalid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/action-stmt/foo-invalid.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/action-stmt/foo-invalid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/action-stmt/foo-invalid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/action-stmt/foo-invalid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/action-stmt/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/action-stmt/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/action-stmt/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/action-stmt/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/action-stmt/foo10.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/action-stmt/foo10.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/action-stmt/foo10.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/action-stmt/foo10.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/action-stmt/foobar-invalid.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/action-stmt/foobar-invalid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/action-stmt/foobar-invalid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/action-stmt/foobar-invalid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/anydata-10.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/anydata-10.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/anydata-10.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/anydata-10.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/anydata-11.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/anydata-11.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/anydata-11.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/anydata-11.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/invalid-10.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/invalid-10.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/invalid-10.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/invalid-10.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/invalid-11.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/invalid-11.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/invalid-11.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/invalid-11.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/unsupported-version.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/unsupported-version.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/unsupported-version.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/unsupported-version.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/valid-10.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/valid-10.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/valid-10.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/valid-10.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/valid-11.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/valid-11.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/valid-11.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/basic-test/valid-11.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6868/invalid10.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6868/invalid10.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6868/invalid10.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6868/invalid10.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6868/yang11/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6868/yang11/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6868/yang11/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6868/yang11/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6868/yang11/imported.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6868/yang11/imported.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6868/yang11/imported.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6868/yang11/imported.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6869/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6869/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6869/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6869/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6869/invalid10.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6869/invalid10.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6869/invalid10.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6869/invalid10.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6870/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6870/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6870/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6870/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6870/invalid10.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6870/invalid10.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6870/invalid10.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6870/invalid10.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6870/invalid11.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6870/invalid11.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6870/invalid11.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6870/invalid11.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6871/bar10.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6871/bar10.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6871/bar10.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6871/bar10.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6871/baz10.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6871/baz10.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6871/baz10.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6871/baz10.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6871/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6871/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6871/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6871/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6871/foo10.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6871/foo10.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6871/foo10.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6871/foo10.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-0/bar@1999-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-0/bar@1999-01-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-0/bar@1999-01-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-0/bar@1999-01-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-0/bar@2017-02-06.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-0/bar@2017-02-06.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-0/bar@2017-02-06.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-0/bar@2017-02-06.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-0/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-0/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-0/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-0/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-1/bar@1970-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-1/bar@1970-01-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-1/bar@1970-01-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-1/bar@1970-01-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-1/bar@1999-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-1/bar@1999-01-01.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-1/bar@1999-01-01.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-1/bar@1999-01-01.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-1/bar@2017-02-06.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-1/bar@2017-02-06.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-1/bar@2017-02-06.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-1/bar@2017-02-06.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-1/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-1/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-1/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6875/yang1-1/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6876/yang10/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6876/yang10/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6876/yang10/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6876/yang10/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6876/yang10/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6876/yang10/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6876/yang10/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6876/yang10/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6876/yang11/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6876/yang11/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6876/yang11/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6876/yang11/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6876/yang11/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6876/yang11/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6876/yang11/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6876/yang11/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6878/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6878/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6878/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6878/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6878/foo10-invalid-2.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6878/foo10-invalid-2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6878/foo10-invalid-2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6878/foo10-invalid-2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6878/foo10-invalid.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6878/foo10-invalid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6878/foo10-invalid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6878/foo10-invalid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6880/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6880/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6880/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6880/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6880/invalid10.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6880/invalid10.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6880/invalid10.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6880/invalid10.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6884/circular-includes/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6884/circular-includes/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6884/circular-includes/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6884/circular-includes/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6884/circular-includes/sub-foo-2.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6884/circular-includes/sub-foo-2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6884/circular-includes/sub-foo-2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6884/circular-includes/sub-foo-2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6884/circular-includes/sub-foo.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6884/circular-includes/sub-foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6884/circular-includes/sub-foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6884/circular-includes/sub-foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6884/yang1-1/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6884/yang1-1/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6884/yang1-1/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6884/yang1-1/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6884/yang1-1/sub-foo-2.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6884/yang1-1/sub-foo-2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6884/yang1-1/sub-foo-2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6884/yang1-1/sub-foo-2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6884/yang1-1/sub-foo.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6884/yang1-1/sub-foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6884/yang1-1/sub-foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6884/yang1-1/sub-foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6886/yang10/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6886/yang10/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6886/yang10/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6886/yang10/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6886/yang10/foo2.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6886/yang10/foo2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6886/yang10/foo2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6886/yang10/foo2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6886/yang10/foo3.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6886/yang10/foo3.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6886/yang10/foo3.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6886/yang10/foo3.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6886/yang11/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6886/yang11/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6886/yang11/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6886/yang11/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6886/yang11/foo2.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6886/yang11/foo2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6886/yang11/foo2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6886/yang11/foo2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6886/yang11/foo3.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6886/yang11/foo3.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6886/yang11/foo3.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6886/yang11/foo3.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar-invalid-2.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar-invalid-2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar-invalid-2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar-invalid-2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar-invalid-3.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar-invalid-3.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar-invalid-3.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar-invalid-3.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar-invalid-4.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar-invalid-4.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar-invalid-4.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar-invalid-4.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar-invalid.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar-invalid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar-invalid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar-invalid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar10-invalid-2.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar10-invalid-2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar10-invalid-2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar10-invalid-2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar10-invalid.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar10-invalid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar10-invalid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar10-invalid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar10-valid.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar10-valid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar10-valid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/bar10-valid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo-invalid-2.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo-invalid-2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo-invalid-2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo-invalid-2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo-invalid-3.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo-invalid-3.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo-invalid-3.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo-invalid-3.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo-invalid-4.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo-invalid-4.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo-invalid-4.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo-invalid-4.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo-invalid.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo-invalid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo-invalid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo-invalid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo10-invalid-2.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo10-invalid-2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo10-invalid-2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo10-invalid-2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo10-invalid.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo10-invalid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo10-invalid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo10-invalid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo10-valid.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo10-valid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo10-valid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6887/foo10-valid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-10-bit.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-10-bit.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-10-bit.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-10-bit.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-10-enum.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-10-enum.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-10-enum.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-10-enum.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-bit.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-bit.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-bit.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-bit.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-enum-2.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-enum-2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-enum-2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-enum-2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-enum-3.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-enum-3.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-enum-3.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-enum-3.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-enum.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-enum.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-enum.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-enum.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-union.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-union.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-union.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug6901/invalid-foo-union.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug9241/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug9241/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/bug9241/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/bug9241/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/identity-stmt/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/identity-stmt/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/identity-stmt/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/identity-stmt/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/identity-stmt/foo10.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/identity-stmt/foo10.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/identity-stmt/foo10.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/identity-stmt/foo10.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/identityref-stmt/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/identityref-stmt/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/identityref-stmt/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/identityref-stmt/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/identityref-stmt/foo10.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/identityref-stmt/foo10.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/identityref-stmt/foo10.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/identityref-stmt/foo10.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/invalid-import-10/import-test-imported.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/invalid-import-10/import-test-imported.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/invalid-import-10/import-test-imported.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/invalid-import-10/import-test-imported.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/invalid-import-10/import-test-root.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/invalid-import-10/import-test-root.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/invalid-import-10/import-test-root.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/invalid-import-10/import-test-root.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/invalid-include-10/child-module.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/invalid-include-10/child-module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/invalid-include-10/child-module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/invalid-include-10/child-module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/invalid-include-10/root-module.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/invalid-include-10/root-module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/invalid-include-10/root-module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/invalid-include-10/root-module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/valid-11/child-module-1.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/valid-11/child-module-1.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/valid-11/child-module-1.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/valid-11/child-module-1.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/valid-11/child-module.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/valid-11/child-module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/valid-11/child-module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/valid-11/child-module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/valid-11/imported-module.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/valid-11/imported-module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/valid-11/imported-module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/valid-11/imported-module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/valid-11/root-module.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/valid-11/root-module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/valid-11/root-module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/include-import-stmt-test/valid-11/root-module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/leafref-stmt/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/leafref-stmt/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/leafref-stmt/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/leafref-stmt/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/leafref-stmt/foo10.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/leafref-stmt/foo10.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/leafref-stmt/foo10.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/leafref-stmt/foo10.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/correct-list-keys-test.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/correct-list-keys-test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/correct-list-keys-test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/correct-list-keys-test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/incorrect-list-keys-test.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/incorrect-list-keys-test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/incorrect-list-keys-test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/incorrect-list-keys-test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/incorrect-list-keys-test1.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/incorrect-list-keys-test1.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/incorrect-list-keys-test1.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/incorrect-list-keys-test1.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/incorrect-list-keys-test2.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/incorrect-list-keys-test2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/incorrect-list-keys-test2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/incorrect-list-keys-test2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/incorrect-list-keys-test3.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/incorrect-list-keys-test3.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/incorrect-list-keys-test3.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/incorrect-list-keys-test3.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/incorrect-list-keys-test4.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/incorrect-list-keys-test4.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/incorrect-list-keys-test4.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/incorrect-list-keys-test4.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/incorrect-list-keys-test5.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/incorrect-list-keys-test5.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/incorrect-list-keys-test5.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/list-keys-test/incorrect-list-keys-test5.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/model/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/model/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/model/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/model/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/model/baz.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/model/baz.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/model/baz.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/model/baz.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/model/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/model/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/model/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/model/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/model/subfoo.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/model/subfoo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/model/subfoo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/model/subfoo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/notifications-in-data-nodes/bar-invalid.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/notifications-in-data-nodes/bar-invalid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/notifications-in-data-nodes/bar-invalid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/notifications-in-data-nodes/bar-invalid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/notifications-in-data-nodes/baz-invalid.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/notifications-in-data-nodes/baz-invalid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/notifications-in-data-nodes/baz-invalid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/notifications-in-data-nodes/baz-invalid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/notifications-in-data-nodes/foo-invalid.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/notifications-in-data-nodes/foo-invalid.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/notifications-in-data-nodes/foo-invalid.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/notifications-in-data-nodes/foo-invalid.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/notifications-in-data-nodes/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/notifications-in-data-nodes/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/notifications-in-data-nodes/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/notifications-in-data-nodes/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rfc7950/notifications-in-data-nodes/foo10.yang b/parser/yang-parser-rfc7950/src/test/resources/rfc7950/notifications-in-data-nodes/foo10.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rfc7950/notifications-in-data-nodes/foo10.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rfc7950/notifications-in-data-nodes/foo10.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rpc-stmt-test/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/rpc-stmt-test/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rpc-stmt-test/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rpc-stmt-test/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/rpc-stmt-test/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/rpc-stmt-test/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/rpc-stmt-test/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/rpc-stmt-test/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/sal-broker-impl/config.yang b/parser/yang-parser-rfc7950/src/test/resources/sal-broker-impl/config.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/sal-broker-impl/config.yang
rename to parser/yang-parser-rfc7950/src/test/resources/sal-broker-impl/config.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/sal-broker-impl/ietf-yang-types.yang b/parser/yang-parser-rfc7950/src/test/resources/sal-broker-impl/ietf-yang-types.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/sal-broker-impl/ietf-yang-types.yang
rename to parser/yang-parser-rfc7950/src/test/resources/sal-broker-impl/ietf-yang-types.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/sal-broker-impl/opendaylight-config-dom-datastore.yang b/parser/yang-parser-rfc7950/src/test/resources/sal-broker-impl/opendaylight-config-dom-datastore.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/sal-broker-impl/opendaylight-config-dom-datastore.yang
rename to parser/yang-parser-rfc7950/src/test/resources/sal-broker-impl/opendaylight-config-dom-datastore.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/sal-broker-impl/opendaylight-dom-broker-impl.yang b/parser/yang-parser-rfc7950/src/test/resources/sal-broker-impl/opendaylight-dom-broker-impl.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/sal-broker-impl/opendaylight-dom-broker-impl.yang
rename to parser/yang-parser-rfc7950/src/test/resources/sal-broker-impl/opendaylight-dom-broker-impl.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/sal-broker-impl/opendaylight-md-sal-common.yang b/parser/yang-parser-rfc7950/src/test/resources/sal-broker-impl/opendaylight-md-sal-common.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/sal-broker-impl/opendaylight-md-sal-common.yang
rename to parser/yang-parser-rfc7950/src/test/resources/sal-broker-impl/opendaylight-md-sal-common.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/sal-broker-impl/opendaylight-md-sal-dom.yang b/parser/yang-parser-rfc7950/src/test/resources/sal-broker-impl/opendaylight-md-sal-dom.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/sal-broker-impl/opendaylight-md-sal-dom.yang
rename to parser/yang-parser-rfc7950/src/test/resources/sal-broker-impl/opendaylight-md-sal-dom.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/sal-broker-impl/opendaylight-operational-dom-datastore.yang b/parser/yang-parser-rfc7950/src/test/resources/sal-broker-impl/opendaylight-operational-dom-datastore.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/sal-broker-impl/opendaylight-operational-dom-datastore.yang
rename to parser/yang-parser-rfc7950/src/test/resources/sal-broker-impl/opendaylight-operational-dom-datastore.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/sal-broker-impl/opendaylight-pingpong-broker.yang b/parser/yang-parser-rfc7950/src/test/resources/sal-broker-impl/opendaylight-pingpong-broker.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/sal-broker-impl/opendaylight-pingpong-broker.yang
rename to parser/yang-parser-rfc7950/src/test/resources/sal-broker-impl/opendaylight-pingpong-broker.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/sal-broker-impl/rpc-context.yang b/parser/yang-parser-rfc7950/src/test/resources/sal-broker-impl/rpc-context.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/sal-broker-impl/rpc-context.yang
rename to parser/yang-parser-rfc7950/src/test/resources/sal-broker-impl/rpc-context.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/imported.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/imported.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/imported.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/imported.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-invalid-abs-no-imp.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-invalid-abs-no-imp.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-invalid-abs-no-imp.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-invalid-abs-no-imp.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-invalid-abs.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-invalid-abs.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-invalid-abs.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-invalid-abs.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-invalid-empty.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-invalid-empty.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-invalid-empty.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-invalid-empty.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-invalid-rel1.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-invalid-rel1.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-invalid-rel1.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-invalid-rel1.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-invalid-rel2.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-invalid-rel2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-invalid-rel2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-invalid-rel2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-invalid-xpath.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-invalid-xpath.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-invalid-xpath.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-invalid-xpath.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-valid-aug-args.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-valid-aug-args.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-valid-aug-args.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augment-arg-parsing/root-valid-aug-args.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augmented.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augmented.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augmented.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/augmented.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/bug2649/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/bug2649/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/bug2649/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/bug2649/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/bug2649/import-module.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/bug2649/import-module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/bug2649/import-module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/bug2649/import-module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/effective-module/imported.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/effective-module/imported.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/effective-module/imported.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/effective-module/imported.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/effective-module/root.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/effective-module/root.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/effective-module/root.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/effective-module/root.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/effective-module/submod.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/effective-module/submod.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/effective-module/submod.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/effective-module/submod.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/ext-typedef.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/ext-typedef.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/ext-typedef.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/ext-typedef.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/ext-use.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/ext-use.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/ext-use.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/ext-use.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/foobar.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/foobar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/foobar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/foobar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/identityreftest.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/identityreftest.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/identityreftest.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/identityreftest.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/import-arg-parsing/cycle-yang.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/import-arg-parsing/cycle-yang.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/import-arg-parsing/cycle-yang.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/import-arg-parsing/cycle-yang.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/import-arg-parsing/cycle-yin.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/import-arg-parsing/cycle-yin.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/import-arg-parsing/cycle-yin.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/import-arg-parsing/cycle-yin.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/import-arg-parsing/egocentric.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/import-arg-parsing/egocentric.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/import-arg-parsing/egocentric.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/import-arg-parsing/egocentric.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/import-arg-parsing/human.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/import-arg-parsing/human.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/import-arg-parsing/human.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/import-arg-parsing/human.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/import-arg-parsing/mammal.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/import-arg-parsing/mammal.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/import-arg-parsing/mammal.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/import-arg-parsing/mammal.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/import-arg-parsing/nature.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/import-arg-parsing/nature.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/import-arg-parsing/nature.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/import-arg-parsing/nature.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/importedtest.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/importedtest.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/importedtest.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/importedtest.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/include-arg-parsing/error-module.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/include-arg-parsing/error-module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/include-arg-parsing/error-module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/include-arg-parsing/error-module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/include-arg-parsing/error-submodule.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/include-arg-parsing/error-submodule.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/include-arg-parsing/error-submodule.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/include-arg-parsing/error-submodule.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/include-arg-parsing/missing-parent.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/include-arg-parsing/missing-parent.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/include-arg-parsing/missing-parent.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/include-arg-parsing/missing-parent.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/include-arg-parsing/root-module.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/include-arg-parsing/root-module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/include-arg-parsing/root-module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/include-arg-parsing/root-module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/include-arg-parsing/submodule-1.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/include-arg-parsing/submodule-1.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/include-arg-parsing/submodule-1.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/include-arg-parsing/submodule-1.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/include-arg-parsing/submodule-2.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/include-arg-parsing/submodule-2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/include-arg-parsing/submodule-2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/include-arg-parsing/submodule-2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/key-arg-parsing/key-comp-duplicate.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/key-arg-parsing/key-comp-duplicate.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/key-arg-parsing/key-comp-duplicate.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/key-arg-parsing/key-comp-duplicate.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/key-arg-parsing/key-simple-and-comp.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/key-arg-parsing/key-simple-and-comp.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/key-arg-parsing/key-simple-and-comp.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/key-arg-parsing/key-simple-and-comp.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/model/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/model/bar.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/model/bar.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/model/bar.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/model/baz.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/model/baz.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/model/baz.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/model/baz.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/model/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/model/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/model/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/model/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/model/subfoo.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/model/subfoo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/model/subfoo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/model/subfoo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/full/ietf-inet-types.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/full/ietf-inet-types.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/full/ietf-inet-types.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/full/ietf-inet-types.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/full/ietf-interfaces.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/full/ietf-interfaces.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/full/ietf-interfaces.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/full/ietf-interfaces.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/full/ietf-netconf-monitoring.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/full/ietf-netconf-monitoring.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/full/ietf-netconf-monitoring.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/full/ietf-netconf-monitoring.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/full/ietf-yang-types.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/full/ietf-yang-types.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/full/ietf-yang-types.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/full/ietf-yang-types.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/full/ietf-yang-types@2013-05-16.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/full/ietf-yang-types@2013-05-16.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/full/ietf-yang-types@2013-05-16.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/full/ietf-yang-types@2013-05-16.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/full/ietf-yang-types@2013-07-15.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/full/ietf-yang-types@2013-07-15.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/full/ietf-yang-types@2013-07-15.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/full/ietf-yang-types@2013-07-15.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/importedtestrev@2015-04-02.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/importedtestrev@2015-04-02.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/importedtestrev@2015-04-02.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/importedtestrev@2015-04-02.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/importedtestrev@2015-05-02.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/importedtestrev@2015-05-02.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/importedtestrev@2015-05-02.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/importedtestrev@2015-05-02.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/importedtestrev@2015-06-02.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/importedtestrev@2015-06-02.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/importedtestrev@2015-06-02.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/importedtestrev@2015-06-02.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/importedtestrev@2015-08-02.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/importedtestrev@2015-08-02.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/importedtestrev@2015-08-02.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/importedtestrev@2015-08-02.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/importedtestrev@2015-09-02.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/importedtestrev@2015-09-02.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/importedtestrev@2015-09-02.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/importedtestrev@2015-09-02.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/node-test/bar@2016-04-04.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/node-test/bar@2016-04-04.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/node-test/bar@2016-04-04.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/node-test/bar@2016-04-04.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/node-test/bar@2016-04-05.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/node-test/bar@2016-04-05.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/node-test/bar@2016-04-05.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/node-test/bar@2016-04-05.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/node-test/bar@2016-04-06.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/node-test/bar@2016-04-06.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/node-test/bar@2016-04-06.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/node-test/bar@2016-04-06.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/node-test/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/node-test/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/node-test/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/node-test/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/simple/ietf-interfaces.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/simple/ietf-interfaces.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/simple/ietf-interfaces.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/simple/ietf-interfaces.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/simple/ietf-netconf-monitoring.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/simple/ietf-netconf-monitoring.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/simple/ietf-netconf-monitoring.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/simple/ietf-netconf-monitoring.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/simple/ietf-yang-types.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/simple/ietf-yang-types.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/simple/ietf-yang-types.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/simple/ietf-yang-types.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/simple/ietf-yang-types@2013-05-16.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/simple/ietf-yang-types@2013-05-16.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/simple/ietf-yang-types@2013-05-16.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/simple/ietf-yang-types@2013-05-16.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/simple/ietf-yang-types@2013-07-15.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/simple/ietf-yang-types@2013-07-15.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/simple/ietf-yang-types@2013-07-15.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/simple/ietf-yang-types@2013-07-15.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/testrev.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/testrev.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/testrev.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/multiple-revisions/testrev.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/revisions/more-revisions-test.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/revisions/more-revisions-test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/revisions/more-revisions-test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/revisions/more-revisions-test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/root.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/root.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/root.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/root.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/simple-nodes-semantic.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/simple-nodes-semantic.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/simple-nodes-semantic.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/simple-nodes-semantic.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/simple-types.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/simple-types.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/simple-types.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/simple-types.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/test.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/two-revisions/isis-topology@2013-07-12.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/two-revisions/isis-topology@2013-07-12.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/two-revisions/isis-topology@2013-07-12.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/two-revisions/isis-topology@2013-07-12.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/two-revisions/isis-topology@2013-10-21.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/two-revisions/isis-topology@2013-10-21.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/two-revisions/isis-topology@2013-10-21.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/two-revisions/isis-topology@2013-10-21.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/two-revisions/l3-unicast-igp-topology@2013-07-12.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/two-revisions/l3-unicast-igp-topology@2013-07-12.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/two-revisions/l3-unicast-igp-topology@2013-07-12.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/two-revisions/l3-unicast-igp-topology@2013-07-12.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/two-revisions/l3-unicast-igp-topology@2013-10-21.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/two-revisions/l3-unicast-igp-topology@2013-10-21.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/two-revisions/l3-unicast-igp-topology@2013-10-21.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/two-revisions/l3-unicast-igp-topology@2013-10-21.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/two-revisions/ted@2013-07-12.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/two-revisions/ted@2013-07-12.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/two-revisions/ted@2013-07-12.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/two-revisions/ted@2013-07-12.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/two-revisions/ted@2013-10-21.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/two-revisions/ted@2013-10-21.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/two-revisions/ted@2013-10-21.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/two-revisions/ted@2013-10-21.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/types.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/types.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/types.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/types.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/types2.yang b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/types2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/types2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/types2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/extension-use.yin b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/extension-use.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/extension-use.yin
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/extension-use.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/extension.yin b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/extension.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/extension.yin
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/extension.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/feature-test/yang-with-features.yin b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/feature-test/yang-with-features.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/feature-test/yang-with-features.yin
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/feature-test/yang-with-features.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/include-belongs-to-test/child.yin b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/include-belongs-to-test/child.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/include-belongs-to-test/child.yin
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/include-belongs-to-test/child.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/include-belongs-to-test/parent.yin b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/include-belongs-to-test/parent.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/include-belongs-to-test/parent.yin
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/include-belongs-to-test/parent.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/incorrect-bar.yin b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/incorrect-bar.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/incorrect-bar.yin
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/incorrect-bar.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/incorrect-foo.yin b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/incorrect-foo.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/incorrect-foo.yin
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/incorrect-foo.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/config.yin b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/config.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/config.yin
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/config.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/iana-if-type.yin b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/iana-if-type.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/iana-if-type.yin
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/iana-if-type.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/ietf-inet-types.yin b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/ietf-inet-types.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/ietf-inet-types.yin
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/ietf-inet-types.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/ietf-netconf-monitoring.yin b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/ietf-netconf-monitoring.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/ietf-netconf-monitoring.yin
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/ietf-netconf-monitoring.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/ietf-yang-types.yin b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/ietf-yang-types.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/ietf-yang-types.yin
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/ietf-yang-types.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/ietf-yang-types@2013-05-16.yin b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/ietf-yang-types@2013-05-16.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/ietf-yang-types@2013-05-16.yin
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/ietf-yang-types@2013-05-16.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/ietf-yang-types@2013-07-15.yin b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/ietf-yang-types@2013-07-15.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/ietf-yang-types@2013-07-15.yin
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/ietf-yang-types@2013-07-15.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/main-impl.yin b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/main-impl.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/main-impl.yin
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/main-impl.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/opendaylight-md-sal-binding.yin b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/opendaylight-md-sal-binding.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/opendaylight-md-sal-binding.yin
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/modules/opendaylight-md-sal-binding.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/test.yin b/parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/test.yin
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/test.yin
rename to parser/yang-parser-rfc7950/src/test/resources/semantic-statement-parser/yin/test.yin

diff --git a/yang/yang-parser-rfc7950/src/test/resources/simple-test/simple-nodes.yang b/parser/yang-parser-rfc7950/src/test/resources/simple-test/simple-nodes.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/simple-test/simple-nodes.yang
rename to parser/yang-parser-rfc7950/src/test/resources/simple-test/simple-nodes.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/sorting-test/m1.yang b/parser/yang-parser-rfc7950/src/test/resources/sorting-test/m1.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/sorting-test/m1.yang
rename to parser/yang-parser-rfc7950/src/test/resources/sorting-test/m1.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/sorting-test/m2.yang b/parser/yang-parser-rfc7950/src/test/resources/sorting-test/m2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/sorting-test/m2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/sorting-test/m2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/sorting-test/m3.yang b/parser/yang-parser-rfc7950/src/test/resources/sorting-test/m3.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/sorting-test/m3.yang
rename to parser/yang-parser-rfc7950/src/test/resources/sorting-test/m3.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/sorting-test/m4.yang b/parser/yang-parser-rfc7950/src/test/resources/sorting-test/m4.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/sorting-test/m4.yang
rename to parser/yang-parser-rfc7950/src/test/resources/sorting-test/m4.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/sorting-test/m5.yang b/parser/yang-parser-rfc7950/src/test/resources/sorting-test/m5.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/sorting-test/m5.yang
rename to parser/yang-parser-rfc7950/src/test/resources/sorting-test/m5.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/sorting-test/m6.yang b/parser/yang-parser-rfc7950/src/test/resources/sorting-test/m6.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/sorting-test/m6.yang
rename to parser/yang-parser-rfc7950/src/test/resources/sorting-test/m6.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/sorting-test/m7.yang b/parser/yang-parser-rfc7950/src/test/resources/sorting-test/m7.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/sorting-test/m7.yang
rename to parser/yang-parser-rfc7950/src/test/resources/sorting-test/m7.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/sorting-test/m8.yang b/parser/yang-parser-rfc7950/src/test/resources/sorting-test/m8.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/sorting-test/m8.yang
rename to parser/yang-parser-rfc7950/src/test/resources/sorting-test/m8.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/stmt-test/augments/aug-root.yang b/parser/yang-parser-rfc7950/src/test/resources/stmt-test/augments/aug-root.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/stmt-test/augments/aug-root.yang
rename to parser/yang-parser-rfc7950/src/test/resources/stmt-test/augments/aug-root.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/stmt-test/augments/augmented.yang b/parser/yang-parser-rfc7950/src/test/resources/stmt-test/augments/augmented.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/stmt-test/augments/augmented.yang
rename to parser/yang-parser-rfc7950/src/test/resources/stmt-test/augments/augmented.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/stmt-test/augments/multiple-augment-imported.yang b/parser/yang-parser-rfc7950/src/test/resources/stmt-test/augments/multiple-augment-imported.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/stmt-test/augments/multiple-augment-imported.yang
rename to parser/yang-parser-rfc7950/src/test/resources/stmt-test/augments/multiple-augment-imported.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/stmt-test/augments/multiple-augment-incorrect.yang b/parser/yang-parser-rfc7950/src/test/resources/stmt-test/augments/multiple-augment-incorrect.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/stmt-test/augments/multiple-augment-incorrect.yang
rename to parser/yang-parser-rfc7950/src/test/resources/stmt-test/augments/multiple-augment-incorrect.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/stmt-test/augments/multiple-augment-incorrect2.yang b/parser/yang-parser-rfc7950/src/test/resources/stmt-test/augments/multiple-augment-incorrect2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/stmt-test/augments/multiple-augment-incorrect2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/stmt-test/augments/multiple-augment-incorrect2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/stmt-test/augments/multiple-augment-root.yang b/parser/yang-parser-rfc7950/src/test/resources/stmt-test/augments/multiple-augment-root.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/stmt-test/augments/multiple-augment-root.yang
rename to parser/yang-parser-rfc7950/src/test/resources/stmt-test/augments/multiple-augment-root.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/stmt-test/augments/multiple-augment-submodule.yang b/parser/yang-parser-rfc7950/src/test/resources/stmt-test/augments/multiple-augment-submodule.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/stmt-test/augments/multiple-augment-submodule.yang
rename to parser/yang-parser-rfc7950/src/test/resources/stmt-test/augments/multiple-augment-submodule.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/stmt-test/augments/multiple-augment-test.yang b/parser/yang-parser-rfc7950/src/test/resources/stmt-test/augments/multiple-augment-test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/stmt-test/augments/multiple-augment-test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/stmt-test/augments/multiple-augment-test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/stmt-test/constraints/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/stmt-test/constraints/foo.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/stmt-test/constraints/foo.yang
rename to parser/yang-parser-rfc7950/src/test/resources/stmt-test/constraints/foo.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/stmt-test/effective-build/simple-module.yang b/parser/yang-parser-rfc7950/src/test/resources/stmt-test/effective-build/simple-module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/stmt-test/effective-build/simple-module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/stmt-test/effective-build/simple-module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/stmt-test/extensions/mock.yang b/parser/yang-parser-rfc7950/src/test/resources/stmt-test/extensions/mock.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/stmt-test/extensions/mock.yang
rename to parser/yang-parser-rfc7950/src/test/resources/stmt-test/extensions/mock.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/stmt-test/extensions/yang-ext.yang b/parser/yang-parser-rfc7950/src/test/resources/stmt-test/extensions/yang-ext.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/stmt-test/extensions/yang-ext.yang
rename to parser/yang-parser-rfc7950/src/test/resources/stmt-test/extensions/yang-ext.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/stmt-test/identity/cyclic-identity-test.yang b/parser/yang-parser-rfc7950/src/test/resources/stmt-test/identity/cyclic-identity-test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/stmt-test/identity/cyclic-identity-test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/stmt-test/identity/cyclic-identity-test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/stmt-test/identity/identity-test.yang b/parser/yang-parser-rfc7950/src/test/resources/stmt-test/identity/identity-test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/stmt-test/identity/identity-test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/stmt-test/identity/identity-test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/stmt-test/submodules/imported-module.yang b/parser/yang-parser-rfc7950/src/test/resources/stmt-test/submodules/imported-module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/stmt-test/submodules/imported-module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/stmt-test/submodules/imported-module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/stmt-test/submodules/root-module.yang b/parser/yang-parser-rfc7950/src/test/resources/stmt-test/submodules/root-module.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/stmt-test/submodules/root-module.yang
rename to parser/yang-parser-rfc7950/src/test/resources/stmt-test/submodules/root-module.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/stmt-test/submodules/submodule-1.yang b/parser/yang-parser-rfc7950/src/test/resources/stmt-test/submodules/submodule-1.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/stmt-test/submodules/submodule-1.yang
rename to parser/yang-parser-rfc7950/src/test/resources/stmt-test/submodules/submodule-1.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/stmt-test/submodules/submodule-2.yang b/parser/yang-parser-rfc7950/src/test/resources/stmt-test/submodules/submodule-2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/stmt-test/submodules/submodule-2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/stmt-test/submodules/submodule-2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/stmt-test/submodules/submodule-to-submodule-1.yang b/parser/yang-parser-rfc7950/src/test/resources/stmt-test/submodules/submodule-to-submodule-1.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/stmt-test/submodules/submodule-to-submodule-1.yang
rename to parser/yang-parser-rfc7950/src/test/resources/stmt-test/submodules/submodule-to-submodule-1.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/stmt-test/uses/refine-test.yang b/parser/yang-parser-rfc7950/src/test/resources/stmt-test/uses/refine-test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/stmt-test/uses/refine-test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/stmt-test/uses/refine-test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/substatement-validator/bug-4310/bug4310.yang b/parser/yang-parser-rfc7950/src/test/resources/substatement-validator/bug-4310/bug4310.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/substatement-validator/bug-4310/bug4310.yang
rename to parser/yang-parser-rfc7950/src/test/resources/substatement-validator/bug-4310/bug4310.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/substatement-validator/empty-element/empty.yang b/parser/yang-parser-rfc7950/src/test/resources/substatement-validator/empty-element/empty.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/substatement-validator/empty-element/empty.yang
rename to parser/yang-parser-rfc7950/src/test/resources/substatement-validator/empty-element/empty.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/substatement-validator/maximal-element/baz.yang b/parser/yang-parser-rfc7950/src/test/resources/substatement-validator/maximal-element/baz.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/substatement-validator/maximal-element/baz.yang
rename to parser/yang-parser-rfc7950/src/test/resources/substatement-validator/maximal-element/baz.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/substatement-validator/maximal-element/maximal.yang b/parser/yang-parser-rfc7950/src/test/resources/substatement-validator/maximal-element/maximal.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/substatement-validator/maximal-element/maximal.yang
rename to parser/yang-parser-rfc7950/src/test/resources/substatement-validator/maximal-element/maximal.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/substatement-validator/missing-element/baz.yang b/parser/yang-parser-rfc7950/src/test/resources/substatement-validator/missing-element/baz.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/substatement-validator/missing-element/baz.yang
rename to parser/yang-parser-rfc7950/src/test/resources/substatement-validator/missing-element/baz.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/substatement-validator/missing-element/missing.yang b/parser/yang-parser-rfc7950/src/test/resources/substatement-validator/missing-element/missing.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/substatement-validator/missing-element/missing.yang
rename to parser/yang-parser-rfc7950/src/test/resources/substatement-validator/missing-element/missing.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/substatement-validator/undesirable-element/undesirable.yang b/parser/yang-parser-rfc7950/src/test/resources/substatement-validator/undesirable-element/undesirable.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/substatement-validator/undesirable-element/undesirable.yang
rename to parser/yang-parser-rfc7950/src/test/resources/substatement-validator/undesirable-element/undesirable.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/type-tests/types.yang b/parser/yang-parser-rfc7950/src/test/resources/type-tests/types.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/type-tests/types.yang
rename to parser/yang-parser-rfc7950/src/test/resources/type-tests/types.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/typedef-substmts-test/typedef-substmts-test.yang b/parser/yang-parser-rfc7950/src/test/resources/typedef-substmts-test/typedef-substmts-test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/typedef-substmts-test/typedef-substmts-test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/typedef-substmts-test/typedef-substmts-test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/types/custom-types-test@2012-04-04.yang b/parser/yang-parser-rfc7950/src/test/resources/types/custom-types-test@2012-04-04.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/types/custom-types-test@2012-04-04.yang
rename to parser/yang-parser-rfc7950/src/test/resources/types/custom-types-test@2012-04-04.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/types/union-in-list/unioninlisttest.yang b/parser/yang-parser-rfc7950/src/test/resources/types/union-in-list/unioninlisttest.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/types/union-in-list/unioninlisttest.yang
rename to parser/yang-parser-rfc7950/src/test/resources/types/union-in-list/unioninlisttest.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/types/union-with-bits/union-bits-model.yang b/parser/yang-parser-rfc7950/src/test/resources/types/union-with-bits/union-bits-model.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/types/union-with-bits/union-bits-model.yang
rename to parser/yang-parser-rfc7950/src/test/resources/types/union-with-bits/union-bits-model.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/types/union-with-ext/extdef.yang b/parser/yang-parser-rfc7950/src/test/resources/types/union-with-ext/extdef.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/types/union-with-ext/extdef.yang
rename to parser/yang-parser-rfc7950/src/test/resources/types/union-with-ext/extdef.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/types/union-with-ext/unionbug.yang b/parser/yang-parser-rfc7950/src/test/resources/types/union-with-ext/unionbug.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/types/union-with-ext/unionbug.yang
rename to parser/yang-parser-rfc7950/src/test/resources/types/union-with-ext/unionbug.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/unescape/string-test.yang b/parser/yang-parser-rfc7950/src/test/resources/unescape/string-test.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/unescape/string-test.yang
rename to parser/yang-parser-rfc7950/src/test/resources/unescape/string-test.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/yang-grammar-test/revisions-extension.yang b/parser/yang-parser-rfc7950/src/test/resources/yang-grammar-test/revisions-extension.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/yang-grammar-test/revisions-extension.yang
rename to parser/yang-parser-rfc7950/src/test/resources/yang-grammar-test/revisions-extension.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/yang-grammar-test/stmtsep-in-statements-sub.yang b/parser/yang-parser-rfc7950/src/test/resources/yang-grammar-test/stmtsep-in-statements-sub.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/yang-grammar-test/stmtsep-in-statements-sub.yang
rename to parser/yang-parser-rfc7950/src/test/resources/yang-grammar-test/stmtsep-in-statements-sub.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/yang-grammar-test/stmtsep-in-statements.yang b/parser/yang-parser-rfc7950/src/test/resources/yang-grammar-test/stmtsep-in-statements.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/yang-grammar-test/stmtsep-in-statements.yang
rename to parser/yang-parser-rfc7950/src/test/resources/yang-grammar-test/stmtsep-in-statements.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/yang-grammar-test/stmtsep-in-statements2.yang b/parser/yang-parser-rfc7950/src/test/resources/yang-grammar-test/stmtsep-in-statements2.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/yang-grammar-test/stmtsep-in-statements2.yang
rename to parser/yang-parser-rfc7950/src/test/resources/yang-grammar-test/stmtsep-in-statements2.yang

diff --git a/yang/yang-parser-rfc7950/src/test/resources/yang-grammar-test/submodule-header-extension.yang b/parser/yang-parser-rfc7950/src/test/resources/yang-grammar-test/submodule-header-extension.yang
similarity index 100%
rename from yang/yang-parser-rfc7950/src/test/resources/yang-grammar-test/submodule-header-extension.yang
rename to parser/yang-parser-rfc7950/src/test/resources/yang-grammar-test/submodule-header-extension.yang

diff --git a/yang/yang-parser-spi/pom.xml b/parser/yang-parser-spi/pom.xml
similarity index 100%
rename from yang/yang-parser-spi/pom.xml
rename to parser/yang-parser-spi/pom.xml

diff --git a/yang/yang-parser-spi/src/main/java/module-info.java b/parser/yang-parser-spi/src/main/java/module-info.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/module-info.java
rename to parser/yang-parser-spi/src/main/java/module-info.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/ExtensionNamespace.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/ExtensionNamespace.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/ExtensionNamespace.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/ExtensionNamespace.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/FeatureNamespace.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/FeatureNamespace.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/FeatureNamespace.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/FeatureNamespace.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/GroupingNamespace.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/GroupingNamespace.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/GroupingNamespace.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/GroupingNamespace.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/IdentityNamespace.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/IdentityNamespace.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/IdentityNamespace.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/IdentityNamespace.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/ModuleNamespace.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/ModuleNamespace.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/ModuleNamespace.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/ModuleNamespace.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/NamespaceToModule.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/NamespaceToModule.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/NamespaceToModule.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/NamespaceToModule.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/PreLinkageModuleNamespace.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/PreLinkageModuleNamespace.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/PreLinkageModuleNamespace.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/PreLinkageModuleNamespace.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/SchemaTreeNamespace.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/SchemaTreeNamespace.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/SchemaTreeNamespace.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/SchemaTreeNamespace.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/SubmoduleNamespace.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/SubmoduleNamespace.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/SubmoduleNamespace.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/SubmoduleNamespace.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/TypeNamespace.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/TypeNamespace.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/TypeNamespace.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/TypeNamespace.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractBooleanStatementSupport.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractBooleanStatementSupport.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractBooleanStatementSupport.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractBooleanStatementSupport.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractEmptyStatementSupport.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractEmptyStatementSupport.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractEmptyStatementSupport.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractEmptyStatementSupport.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractInternedStatementSupport.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractInternedStatementSupport.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractInternedStatementSupport.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractInternedStatementSupport.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractInternedStringStatementSupport.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractInternedStringStatementSupport.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractInternedStringStatementSupport.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractInternedStringStatementSupport.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractQNameStatementSupport.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractQNameStatementSupport.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractQNameStatementSupport.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractQNameStatementSupport.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractSchemaTreeStatementSupport.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractSchemaTreeStatementSupport.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractSchemaTreeStatementSupport.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractSchemaTreeStatementSupport.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractStatementSupport.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractStatementSupport.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractStatementSupport.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractStatementSupport.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractStringStatementSupport.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractStringStatementSupport.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractStringStatementSupport.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractStringStatementSupport.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/BoundStmtCtx.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/BoundStmtCtx.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/BoundStmtCtx.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/BoundStmtCtx.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/BoundStmtCtxCompat.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/BoundStmtCtxCompat.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/BoundStmtCtxCompat.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/BoundStmtCtxCompat.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/CommonStmtCtx.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/CommonStmtCtx.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/CommonStmtCtx.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/CommonStmtCtx.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/CopyHistory.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/CopyHistory.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/CopyHistory.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/CopyHistory.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/CopyType.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/CopyType.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/CopyType.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/CopyType.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/DerivedNamespaceBehaviour.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/DerivedNamespaceBehaviour.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/DerivedNamespaceBehaviour.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/DerivedNamespaceBehaviour.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/EffectiveStmtCtx.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/EffectiveStmtCtx.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/EffectiveStmtCtx.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/EffectiveStmtCtx.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ForwardingStatementSupport.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ForwardingStatementSupport.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ForwardingStatementSupport.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ForwardingStatementSupport.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ImplicitParentAwareStatementSupport.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ImplicitParentAwareStatementSupport.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ImplicitParentAwareStatementSupport.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ImplicitParentAwareStatementSupport.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ImportedNamespaceContext.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ImportedNamespaceContext.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ImportedNamespaceContext.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ImportedNamespaceContext.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/InferenceException.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/InferenceException.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/InferenceException.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/InferenceException.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/InvalidSubstatementException.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/InvalidSubstatementException.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/InvalidSubstatementException.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/InvalidSubstatementException.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/MissingSubstatementException.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/MissingSubstatementException.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/MissingSubstatementException.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/MissingSubstatementException.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelActionBuilder.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelActionBuilder.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelActionBuilder.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelActionBuilder.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelProcessingPhase.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelProcessingPhase.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelProcessingPhase.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelProcessingPhase.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/MutableStatement.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/MutableStatement.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/MutableStatement.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/MutableStatement.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceBehaviour.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceBehaviour.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceBehaviour.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceBehaviour.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceKeyCriterion.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceKeyCriterion.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceKeyCriterion.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceKeyCriterion.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceNotAvailableException.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceNotAvailableException.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceNotAvailableException.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceNotAvailableException.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceStmtCtx.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceStmtCtx.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceStmtCtx.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceStmtCtx.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/OverrideChildStatementSupport.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/OverrideChildStatementSupport.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/OverrideChildStatementSupport.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/OverrideChildStatementSupport.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ParserNamespace.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ParserNamespace.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ParserNamespace.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ParserNamespace.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ReactorException.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ReactorException.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ReactorException.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ReactorException.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/RootStmtContext.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/RootStmtContext.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/RootStmtContext.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/RootStmtContext.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SchemaPathSupport.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SchemaPathSupport.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SchemaPathSupport.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SchemaPathSupport.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SemanticVersionModuleNamespace.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SemanticVersionModuleNamespace.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SemanticVersionModuleNamespace.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SemanticVersionModuleNamespace.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SemanticVersionNamespace.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SemanticVersionNamespace.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SemanticVersionNamespace.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SemanticVersionNamespace.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SomeModifiersUnresolvedException.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SomeModifiersUnresolvedException.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SomeModifiersUnresolvedException.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SomeModifiersUnresolvedException.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementDefinitionNamespace.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementDefinitionNamespace.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementDefinitionNamespace.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementDefinitionNamespace.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementFactory.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementFactory.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementFactory.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementFactory.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementNamespace.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementNamespace.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementNamespace.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementNamespace.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementSupport.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementSupport.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementSupport.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementSupport.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementSupportBundle.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementSupportBundle.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementSupportBundle.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementSupportBundle.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextCompat.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextCompat.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextCompat.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextCompat.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SubstatementValidator.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SubstatementValidator.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SubstatementValidator.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SubstatementValidator.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/package-info.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/package-info.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/package-info.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/package-info.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/package-info.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/package-info.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/package-info.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/package-info.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/BelongsToModuleContext.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/BelongsToModuleContext.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/BelongsToModuleContext.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/BelongsToModuleContext.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/BelongsToPrefixToModuleCtx.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/BelongsToPrefixToModuleCtx.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/BelongsToPrefixToModuleCtx.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/BelongsToPrefixToModuleCtx.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/BelongsToPrefixToModuleName.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/BelongsToPrefixToModuleName.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/BelongsToPrefixToModuleName.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/BelongsToPrefixToModuleName.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ExplicitStatement.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ExplicitStatement.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ExplicitStatement.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ExplicitStatement.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ImpPrefixToNamespace.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ImpPrefixToNamespace.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ImpPrefixToNamespace.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ImpPrefixToNamespace.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ImplicitSubstatement.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ImplicitSubstatement.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ImplicitSubstatement.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ImplicitSubstatement.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ImportPrefixToModuleCtx.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ImportPrefixToModuleCtx.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ImportPrefixToModuleCtx.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ImportPrefixToModuleCtx.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ImportPrefixToSemVerSourceIdentifier.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ImportPrefixToSemVerSourceIdentifier.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ImportPrefixToSemVerSourceIdentifier.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ImportPrefixToSemVerSourceIdentifier.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ImportedModuleContext.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ImportedModuleContext.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ImportedModuleContext.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ImportedModuleContext.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/IncludedModuleContext.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/IncludedModuleContext.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/IncludedModuleContext.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/IncludedModuleContext.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/IncludedSubmoduleNameToModuleCtx.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/IncludedSubmoduleNameToModuleCtx.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/IncludedSubmoduleNameToModuleCtx.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/IncludedSubmoduleNameToModuleCtx.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModuleCtxToModuleQName.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModuleCtxToModuleQName.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModuleCtxToModuleQName.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModuleCtxToModuleQName.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModuleCtxToSourceIdentifier.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModuleCtxToSourceIdentifier.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModuleCtxToSourceIdentifier.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModuleCtxToSourceIdentifier.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModuleNameToModuleQName.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModuleNameToModuleQName.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModuleNameToModuleQName.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModuleNameToModuleQName.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModuleNameToNamespace.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModuleNameToNamespace.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModuleNameToNamespace.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModuleNameToNamespace.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModuleNamespaceForBelongsTo.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModuleNamespaceForBelongsTo.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModuleNamespaceForBelongsTo.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModuleNamespaceForBelongsTo.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModuleQNameToModuleName.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModuleQNameToModuleName.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModuleQNameToModuleName.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModuleQNameToModuleName.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModulesDeviatedByModules.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModulesDeviatedByModules.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModulesDeviatedByModules.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ModulesDeviatedByModules.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/PrefixToModule.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/PrefixToModule.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/PrefixToModule.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/PrefixToModule.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/PrefixToModuleMap.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/PrefixToModuleMap.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/PrefixToModuleMap.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/PrefixToModuleMap.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/QNameToStatementDefinition.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/QNameToStatementDefinition.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/QNameToStatementDefinition.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/QNameToStatementDefinition.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/QNameToStatementDefinitionMap.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/QNameToStatementDefinitionMap.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/QNameToStatementDefinitionMap.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/QNameToStatementDefinitionMap.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/SourceException.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/SourceException.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/SourceException.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/SourceException.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/StatementSourceReference.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/StatementSourceReference.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/StatementSourceReference.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/StatementSourceReference.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/StatementStreamSource.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/StatementStreamSource.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/StatementStreamSource.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/StatementStreamSource.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/StatementWriter.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/StatementWriter.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/StatementWriter.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/StatementWriter.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/SupportedFeaturesNamespace.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/SupportedFeaturesNamespace.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/SupportedFeaturesNamespace.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/SupportedFeaturesNamespace.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/package-info.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/package-info.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/package-info.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/package-info.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/validation/ValidationBundlesNamespace.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/validation/ValidationBundlesNamespace.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/validation/ValidationBundlesNamespace.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/validation/ValidationBundlesNamespace.java

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/validation/package-info.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/validation/package-info.java
similarity index 100%
rename from yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/validation/package-info.java
rename to parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/validation/package-info.java

diff --git a/yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/NamespaceTest.java b/parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/NamespaceTest.java
similarity index 100%
rename from yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/NamespaceTest.java
rename to parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/NamespaceTest.java

diff --git a/yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelProcessingPhaseTest.java b/parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelProcessingPhaseTest.java
similarity index 100%
rename from yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelProcessingPhaseTest.java
rename to parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelProcessingPhaseTest.java

diff --git a/yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceTest.java b/parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceTest.java
similarity index 100%
rename from yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceTest.java
rename to parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceTest.java

diff --git a/yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/ExplicitStatementTest.java b/parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/ExplicitStatementTest.java
similarity index 100%
rename from yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/ExplicitStatementTest.java
rename to parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/ExplicitStatementTest.java

diff --git a/yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/ImplicitStatementTest.java b/parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/ImplicitStatementTest.java
similarity index 100%
rename from yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/ImplicitStatementTest.java
rename to parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/ImplicitStatementTest.java

diff --git a/yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/NamespaceTest.java b/parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/NamespaceTest.java
similarity index 100%
rename from yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/NamespaceTest.java
rename to parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/NamespaceTest.java

diff --git a/yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/QNameToStatementDefinitionMapTest.java b/parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/QNameToStatementDefinitionMapTest.java
similarity index 100%
rename from yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/QNameToStatementDefinitionMapTest.java
rename to parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/QNameToStatementDefinitionMapTest.java

diff --git a/yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/SourceExceptionTest.java b/parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/SourceExceptionTest.java
similarity index 100%
rename from yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/SourceExceptionTest.java
rename to parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/SourceExceptionTest.java

diff --git a/yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/validation/ValidationBundlesNamespaceTest.java b/parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/validation/ValidationBundlesNamespaceTest.java
similarity index 100%
rename from yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/validation/ValidationBundlesNamespaceTest.java
rename to parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/validation/ValidationBundlesNamespaceTest.java

diff --git a/yang/yang-test-util/pom.xml b/parser/yang-test-util/pom.xml
similarity index 100%
rename from yang/yang-test-util/pom.xml
rename to parser/yang-test-util/pom.xml

diff --git a/yang/yang-test-util/src/main/java/org/opendaylight/yangtools/yang/test/util/YangParserTestUtils.java b/parser/yang-test-util/src/main/java/org/opendaylight/yangtools/yang/test/util/YangParserTestUtils.java
similarity index 100%
rename from yang/yang-test-util/src/main/java/org/opendaylight/yangtools/yang/test/util/YangParserTestUtils.java
rename to parser/yang-test-util/src/main/java/org/opendaylight/yangtools/yang/test/util/YangParserTestUtils.java

diff --git a/pom.xml b/pom.xml
index d681e128520c5a01f5e1a33ece96d2b861475ab2..d4d33dbbcfcb95e86865812fb473f5fa789129e5 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,7 @@
         <module>common</module>
         <module>data</module>
         <module>model</module>
+        <module>parser</module>
         <module>plugin</module>
         <module>tools</module>
         <module>xpath</module>

diff --git a/yang/pom.xml b/yang/pom.xml
index 305b9dbcea31aa245349ec02c7f764319ba5bcba..9bd4aedafd4172eb5db72d9d647cb2bb7d44eb35 100644 (file)
--- a/yang/pom.xml
+++ b/yang/pom.xml
@@ -31,58 +31,22 @@
         <!-- FIXME: organize these into groups -->
         <module>yang-common</module>
         <module>yang-common-netty</module>
+
         <module>yang-data-codec-binfmt</module>
         <module>yang-data-codec-gson</module>
         <module>yang-data-codec-xml</module>
 
-        <!-- YANG parser end-user API -->
-        <module>yang-parser-api</module>
-        <module>yang-test-util</module>
-
-        <!-- YANG parser reference implementation -->
-        <module>yang-parser-impl</module>
-
         <!-- YANG repository API and implementions -->
         <module>yang-repo-api</module>
         <module>yang-repo-spi</module>
         <module>yang-repo-fs</module>
 
-        <!-- Metamodel statement reactor -->
-        <module>yang-parser-spi</module>
-        <module>yang-parser-reactor</module>
-
-        <!-- Combined RFC6020/RFC7960 metamodel implementation -->
-        <module>yang-parser-antlr</module>
-        <module>yang-parser-rfc7950</module>
-
-        <!-- OpenConfig hashed value parser support. Semantic version support
-             is integrated in yang-parser-rfc7950. -->
-        <module>openconfig-parser-support</module>
-
-        <!-- OpenDaylight messy extensions -->
-        <module>odlext-parser-support</module>
-
-        <!-- NETCONF messy extensions -->
-        <module>rfc6241-parser-support</module>
-
-        <!-- NACM metamodel support -->
-        <module>rfc6536-parser-support</module>
-
-        <!-- SMIv2-to-YANG translations support -->
-        <module>rfc6643-parser-support</module>
-
         <!-- Metadata (annotation) metamodel support -->
         <module>rfc7952-data-api</module>
         <module>rfc7952-data-util</module>
-        <module>rfc7952-parser-support</module>
-
-        <!-- RFC8040 (yang-data) metamodel support -->
-        <module>rfc8040-parser-support</module>
 
         <!-- RFC8528 (mount-point) metamodel support -->
         <module>rfc8528-data-api</module>
         <module>rfc8528-data-util</module>
-        <module>rfc8528-parser-support</module>
     </modules>
-
 </project>