From b67b827e357ae40ae26e4bfec35b76ef5ee67967 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 25 Apr 2021 11:05:58 +0200 Subject: [PATCH] Populate model/ hierarchy Move yang-model-api and all the other *model-* artifacts own model/ top-level directory. This will make it easier to navigate and more approachable. JIRA: YANGTOOLS-1149 Change-Id: I259419798f07ebf9fdd94f808d38867956132c09 Signed-off-by: Robert Varga --- model/README.md | 19 +++++++ {yang => model}/odlext-model-api/pom.xml | 0 .../src/main/java/module-info.java | 0 .../AugmentIdentifierEffectiveStatement.java | 0 .../model/api/AugmentIdentifierStatement.java | 0 .../ContextInstanceEffectiveStatement.java | 0 .../model/api/ContextInstanceStatement.java | 0 .../ContextReferenceEffectiveStatement.java | 0 .../model/api/ContextReferenceStatement.java | 0 .../api/InstanceTargetEffectiveStatement.java | 0 .../model/api/InstanceTargetStatement.java | 0 .../api/OpenDaylightExtensionsConstants.java | 0 .../api/OpenDaylightExtensionsStatements.java | 0 ...RpcContextReferenceEffectiveStatement.java | 0 .../api/RpcContextReferenceStatement.java | 0 .../odlext/model/api/package-info.java | 0 {yang => model}/openconfig-model-api/pom.xml | 0 .../src/main/java/module-info.java | 0 .../model/api/OpenConfigConstants.java | 0 ...enConfigHashedValueEffectiveStatement.java | 0 .../api/OpenConfigHashedValueSchemaNode.java | 0 .../api/OpenConfigHashedValueStatement.java | 0 ...nConfigPosixPatternEffectiveStatement.java | 0 .../api/OpenConfigPosixPatternStatement.java | 0 ...enConfigRegexpPosixEffectiveStatement.java | 0 .../api/OpenConfigRegexpPosixStatement.java | 0 .../model/api/OpenConfigStatements.java | 0 .../OpenConfigVersionEffectiveStatement.java | 0 .../model/api/OpenConfigVersionStatement.java | 0 .../openconfig/model/api/package-info.java | 0 model/pom.xml | 54 +++++++++++++++++++ {yang => model}/rfc6241-model-api/pom.xml | 0 .../src/main/java/module-info.java | 0 ...erElementAttributesEffectiveStatement.java | 0 .../GetFilterElementAttributesSchemaNode.java | 0 .../GetFilterElementAttributesStatement.java | 0 .../rfc6241/model/api/NetconfConstants.java | 0 .../rfc6241/model/api/NetconfStatements.java | 0 .../rfc6241/model/api/package-info.java | 0 {yang => model}/rfc6536-model-api/pom.xml | 0 .../src/main/java/module-info.java | 0 .../api/DefaultDenyAllEffectiveStatement.java | 0 .../model/api/DefaultDenyAllSchemaNode.java | 0 .../model/api/DefaultDenyAllStatement.java | 0 .../DefaultDenyWriteEffectiveStatement.java | 0 .../model/api/DefaultDenyWriteSchemaNode.java | 0 .../model/api/DefaultDenyWriteStatement.java | 0 .../rfc6536/model/api/NACMConstants.java | 0 .../rfc6536/model/api/NACMStatements.java | 0 .../rfc6536/model/api/package-info.java | 0 {yang => model}/rfc6643-model-api/pom.xml | 0 .../src/main/java/module-info.java | 0 .../model/api/AliasEffectiveStatement.java | 0 .../rfc6643/model/api/AliasSchemaNode.java | 0 .../rfc6643/model/api/AliasStatement.java | 0 .../model/api/DefValEffectiveStatement.java | 0 .../rfc6643/model/api/DefValSchemaNode.java | 0 .../rfc6643/model/api/DefValStatement.java | 0 .../api/DisplayHintEffectiveStatement.java | 0 .../model/api/DisplayHintSchemaNode.java | 0 .../model/api/DisplayHintStatement.java | 0 .../model/api/IetfYangSmiv2Constants.java | 0 .../api/IetfYangSmiv2ExtensionsMapping.java | 0 .../model/api/ImpliedEffectiveStatement.java | 0 .../rfc6643/model/api/ImpliedSchemaNode.java | 0 .../rfc6643/model/api/ImpliedStatement.java | 0 .../rfc6643/model/api/MaxAccess.java | 0 .../api/MaxAccessEffectiveStatement.java | 0 .../model/api/MaxAccessSchemaNode.java | 0 .../rfc6643/model/api/MaxAccessStatement.java | 0 .../rfc6643/model/api/ObjectIdentifier.java | 0 .../model/api/OidEffectiveStatement.java | 0 .../rfc6643/model/api/OidSchemaNode.java | 0 .../rfc6643/model/api/OidStatement.java | 0 .../model/api/SubIdEffectiveStatement.java | 0 .../rfc6643/model/api/SubIdSchemaNode.java | 0 .../rfc6643/model/api/SubIdStatement.java | 0 {yang => model}/rfc7952-model-api/pom.xml | 0 .../src/main/java/module-info.java | 0 .../api/AnnotationEffectiveStatement.java | 0 .../model/api/AnnotationSchemaNode.java | 0 .../model/api/AnnotationSchemaNodeAware.java | 0 ...nnotationSchemaNodeAwareSchemaContext.java | 0 .../model/api/AnnotationStatement.java | 0 .../rfc7952/model/api/MetadataConstants.java | 0 .../rfc7952/model/api/MetadataStatements.java | 0 .../rfc7952/model/api/package-info.java | 0 {yang => model}/rfc8040-model-api/pom.xml | 0 .../src/main/java/module-info.java | 0 .../rfc8040/model/api/YangDataConstants.java | 0 .../model/api/YangDataEffectiveStatement.java | 0 .../rfc8040/model/api/YangDataSchemaNode.java | 0 .../rfc8040/model/api/YangDataStatement.java | 0 .../rfc8040/model/api/YangDataStatements.java | 0 {yang => model}/rfc8528-model-api/pom.xml | 0 .../src/main/java/module-info.java | 0 .../api/MountPointEffectiveStatement.java | 0 .../model/api/MountPointSchemaNode.java | 0 .../model/api/MountPointStatement.java | 0 .../model/api/SchemaMountConstants.java | 0 .../model/api/SchemaMountStatements.java | 0 .../rfc8528/model/api/package-info.java | 0 {yang => model}/yang-model-api/pom.xml | 0 .../src/main/java/module-info.java | 0 .../yang/model/api/ActionDefinition.java | 0 .../yang/model/api/ActionNodeContainer.java | 0 .../yang/model/api/AddedByUsesAware.java | 0 .../yang/model/api/AnydataSchemaNode.java | 0 .../yang/model/api/AnyxmlSchemaNode.java | 0 .../model/api/AugmentationSchemaNode.java | 0 .../yang/model/api/AugmentationTarget.java | 0 .../yang/model/api/CaseSchemaNode.java | 0 .../yang/model/api/ChoiceSchemaNode.java | 0 .../model/api/ConstraintMetaDefinition.java | 0 .../yang/model/api/ContainerLike.java | 0 .../yang/model/api/ContainerSchemaNode.java | 0 .../yang/model/api/CopyableNode.java | 0 .../yang/model/api/DataNodeContainer.java | 0 .../yang/model/api/DataSchemaNode.java | 0 .../yang/model/api/DerivableSchemaNode.java | 0 .../yang/model/api/DeviateDefinition.java | 0 .../yangtools/yang/model/api/DeviateKind.java | 0 .../yangtools/yang/model/api/Deviation.java | 0 .../yang/model/api/DocumentedNode.java | 0 .../yang/model/api/EffectiveModelContext.java | 0 .../api/EffectiveModelContextListener.java | 0 .../api/EffectiveModelContextProvider.java | 0 .../api/EffectiveStatementEquivalent.java | 0 .../api/EffectiveStatementInference.java | 0 .../model/api/ElementCountConstraint.java | 0 .../api/ElementCountConstraintAware.java | 0 .../yang/model/api/ExtensionDefinition.java | 0 .../yang/model/api/FeatureDefinition.java | 0 .../yang/model/api/GroupingDefinition.java | 0 .../yang/model/api/HelperMethods.java | 0 .../yang/model/api/IdentitySchemaNode.java | 0 .../yang/model/api/InputSchemaNode.java | 0 .../yang/model/api/LeafListSchemaNode.java | 0 .../yang/model/api/LeafSchemaNode.java | 0 .../yang/model/api/ListSchemaNode.java | 0 .../yang/model/api/MandatoryAware.java | 0 .../yangtools/yang/model/api/Module.java | 0 .../yang/model/api/ModuleImport.java | 0 .../yangtools/yang/model/api/ModuleLike.java | 0 .../yang/model/api/MustConstraintAware.java | 0 .../yang/model/api/MustDefinition.java | 0 .../model/api/NotificationDefinition.java | 0 .../model/api/NotificationNodeContainer.java | 0 .../yang/model/api/OperationDefinition.java | 0 .../yang/model/api/OutputSchemaNode.java | 0 .../yang/model/api/PathExpression.java | 0 .../yang/model/api/PathFromRoot.java | 0 .../yang/model/api/QNameModuleAware.java | 0 .../yang/model/api/RpcDefinition.java | 0 .../yang/model/api/SchemaContext.java | 0 .../yang/model/api/SchemaContextListener.java | 0 .../yangtools/yang/model/api/SchemaNode.java | 0 .../yang/model/api/SchemaNodeDefaults.java | 0 .../yangtools/yang/model/api/SchemaPath.java | 0 .../yang/model/api/SchemaTreeInference.java | 0 .../yangtools/yang/model/api/Status.java | 0 .../yangtools/yang/model/api/Submodule.java | 0 .../yangtools/yang/model/api/TypeAware.java | 0 .../yang/model/api/TypeDefinition.java | 0 .../yang/model/api/TypedDataSchemaNode.java | 0 .../yang/model/api/UnknownSchemaNode.java | 0 .../yangtools/yang/model/api/UsesNode.java | 0 .../yang/model/api/WhenConditionAware.java | 0 .../yang/model/api/YangStmtMapping.java | 0 .../api/meta/AbstractStatementDefinition.java | 0 .../model/api/meta/ArgumentDefinition.java | 0 .../model/api/meta/DeclarationInFile.java | 0 .../model/api/meta/DeclarationInText.java | 0 .../model/api/meta/DeclarationReference.java | 0 .../model/api/meta/DeclaredStatement.java | 0 .../api/meta/DefaultStatementDefinition.java | 0 .../model/api/meta/EffectiveStatement.java | 0 .../model/api/meta/IdentifierNamespace.java | 0 .../yang/model/api/meta/ModelStatement.java | 0 .../model/api/meta/StatementDefinition.java | 0 .../yang/model/api/meta/StatementOrigin.java | 0 .../yang/model/api/meta/package-info.java | 0 .../yang/model/api/package-info.java | 0 .../api/stmt/ActionEffectiveStatement.java | 0 .../yang/model/api/stmt/ActionStatement.java | 0 ...ActionStatementAwareDeclaredStatement.java | 0 .../api/stmt/AnydataEffectiveStatement.java | 0 .../yang/model/api/stmt/AnydataStatement.java | 0 .../api/stmt/AnyxmlEffectiveStatement.java | 0 .../yang/model/api/stmt/AnyxmlStatement.java | 0 .../api/stmt/ArgumentEffectiveStatement.java | 0 .../model/api/stmt/ArgumentStatement.java | 0 .../api/stmt/AugmentEffectiveStatement.java | 0 .../yang/model/api/stmt/AugmentStatement.java | 0 .../api/stmt/BaseEffectiveStatement.java | 0 .../yang/model/api/stmt/BaseStatement.java | 0 .../api/stmt/BelongsToEffectiveStatement.java | 0 .../model/api/stmt/BelongsToStatement.java | 0 .../model/api/stmt/BitEffectiveStatement.java | 0 .../yang/model/api/stmt/BitStatement.java | 0 .../model/api/stmt/BodyDeclaredStatement.java | 0 .../api/stmt/CaseEffectiveStatement.java | 0 .../stmt/CaseEffectiveStatementNamespace.java | 0 .../yang/model/api/stmt/CaseStatement.java | 0 .../api/stmt/ChoiceEffectiveStatement.java | 0 .../yang/model/api/stmt/ChoiceStatement.java | 0 .../api/stmt/ConfigEffectiveStatement.java | 0 .../yang/model/api/stmt/ConfigStatement.java | 0 ...ConfigStatementAwareDeclaredStatement.java | 0 ...onstrainedDocumentedDeclaredStatement.java | 0 .../api/stmt/ContactEffectiveStatement.java | 0 .../yang/model/api/stmt/ContactStatement.java | 0 .../api/stmt/ContainerEffectiveStatement.java | 0 .../model/api/stmt/ContainerStatement.java | 0 .../DataDefinitionAwareDeclaredStatement.java | 0 .../api/stmt/DataDefinitionStatement.java | 0 .../stmt/DataTreeAwareEffectiveStatement.java | 0 .../api/stmt/DataTreeEffectiveStatement.java | 0 .../api/stmt/DefaultEffectiveStatement.java | 0 .../model/api/stmt/DefaultMethodHelpers.java | 0 .../yang/model/api/stmt/DefaultStatement.java | 0 ...efaultStatementAwareDeclaredStatement.java | 0 .../stmt/DescriptionEffectiveStatement.java | 0 .../model/api/stmt/DescriptionStatement.java | 0 .../api/stmt/DeviateEffectiveStatement.java | 0 .../yang/model/api/stmt/DeviateStatement.java | 0 .../api/stmt/DeviationEffectiveStatement.java | 0 .../model/api/stmt/DeviationStatement.java | 0 .../api/stmt/DocumentedDeclaredStatement.java | 0 .../api/stmt/EffectiveStatementNamespace.java | 0 .../api/stmt/EnumEffectiveStatement.java | 0 .../yang/model/api/stmt/EnumStatement.java | 0 .../stmt/ErrorAppTagEffectiveStatement.java | 0 .../model/api/stmt/ErrorAppTagStatement.java | 0 .../stmt/ErrorMessageEffectiveStatement.java | 0 .../model/api/stmt/ErrorMessageStatement.java | 0 .../api/stmt/ExtensionEffectiveStatement.java | 0 .../ExtensionEffectiveStatementNamespace.java | 0 .../model/api/stmt/ExtensionStatement.java | 0 .../api/stmt/FeatureEffectiveStatement.java | 0 .../FeatureEffectiveStatementNamespace.java | 0 .../yang/model/api/stmt/FeatureStatement.java | 0 .../FractionDigitsEffectiveStatement.java | 0 .../api/stmt/FractionDigitsStatement.java | 0 .../api/stmt/GroupingEffectiveStatement.java | 0 .../model/api/stmt/GroupingStatement.java | 0 .../api/stmt/IdentityEffectiveStatement.java | 0 .../IdentityEffectiveStatementNamespace.java | 0 .../model/api/stmt/IdentityStatement.java | 0 .../stmt/IfFeatureAwareDeclaredStatement.java | 0 .../api/stmt/IfFeatureEffectiveStatement.java | 0 .../yang/model/api/stmt/IfFeatureExpr.java | 0 .../model/api/stmt/IfFeatureStatement.java | 0 .../api/stmt/ImportEffectiveStatement.java | 0 .../yang/model/api/stmt/ImportStatement.java | 0 .../api/stmt/IncludeEffectiveStatement.java | 0 .../yang/model/api/stmt/IncludeStatement.java | 0 .../api/stmt/InputEffectiveStatement.java | 0 .../yang/model/api/stmt/InputStatement.java | 0 .../model/api/stmt/KeyEffectiveStatement.java | 0 .../yang/model/api/stmt/KeyStatement.java | 0 .../api/stmt/LeafEffectiveStatement.java | 0 .../api/stmt/LeafListEffectiveStatement.java | 0 .../model/api/stmt/LeafListStatement.java | 0 .../yang/model/api/stmt/LeafStatement.java | 0 .../api/stmt/LengthEffectiveStatement.java | 0 .../yang/model/api/stmt/LengthStatement.java | 0 .../api/stmt/LinkageDeclaredStatement.java | 0 .../api/stmt/ListEffectiveStatement.java | 0 .../yang/model/api/stmt/ListStatement.java | 0 .../api/stmt/MandatoryEffectiveStatement.java | 0 .../model/api/stmt/MandatoryStatement.java | 0 ...datoryStatementAwareDeclaredStatement.java | 0 .../stmt/MaxElementsEffectiveStatement.java | 0 .../model/api/stmt/MaxElementsStatement.java | 0 .../model/api/stmt/MetaDeclaredStatement.java | 0 .../stmt/MinElementsEffectiveStatement.java | 0 .../model/api/stmt/MinElementsStatement.java | 0 .../api/stmt/ModifierEffectiveStatement.java | 0 .../model/api/stmt/ModifierStatement.java | 0 .../api/stmt/ModuleEffectiveStatement.java | 0 .../model/api/stmt/ModuleHeaderGroup.java | 0 .../yang/model/api/stmt/ModuleStatement.java | 0 .../MultipleElementsDeclaredStatement.java | 0 .../api/stmt/MustEffectiveStatement.java | 0 .../yang/model/api/stmt/MustStatement.java | 0 .../MustStatementAwareDeclaredStatement.java | 0 .../api/stmt/NamespaceEffectiveStatement.java | 0 .../model/api/stmt/NamespaceStatement.java | 0 .../stmt/NamespacedEffectiveStatement.java | 0 .../stmt/NotificationEffectiveStatement.java | 0 .../model/api/stmt/NotificationStatement.java | 0 ...cationStatementAwareDeclaredStatement.java | 0 .../api/stmt/OperationDeclaredStatement.java | 0 .../api/stmt/OrderedByEffectiveStatement.java | 0 .../model/api/stmt/OrderedByStatement.java | 0 .../stmt/OrganizationEffectiveStatement.java | 0 .../model/api/stmt/OrganizationStatement.java | 0 .../api/stmt/OutputEffectiveStatement.java | 0 .../yang/model/api/stmt/OutputStatement.java | 0 .../api/stmt/PathEffectiveStatement.java | 0 .../yang/model/api/stmt/PathStatement.java | 0 .../api/stmt/PatternEffectiveStatement.java | 0 .../model/api/stmt/PatternExpression.java | 0 .../yang/model/api/stmt/PatternStatement.java | 0 .../api/stmt/PositionEffectiveStatement.java | 0 .../model/api/stmt/PositionStatement.java | 0 .../api/stmt/PrefixEffectiveStatement.java | 0 .../yang/model/api/stmt/PrefixStatement.java | 0 .../api/stmt/PresenceEffectiveStatement.java | 0 .../model/api/stmt/PresenceStatement.java | 0 .../api/stmt/RangeEffectiveStatement.java | 0 .../yang/model/api/stmt/RangeStatement.java | 0 .../api/stmt/ReferenceEffectiveStatement.java | 0 .../model/api/stmt/ReferenceStatement.java | 0 .../api/stmt/RefineEffectiveStatement.java | 0 .../yang/model/api/stmt/RefineStatement.java | 0 .../RequireInstanceEffectiveStatement.java | 0 .../api/stmt/RequireInstanceStatement.java | 0 .../stmt/RevisionAwareDeclaredStatement.java | 0 .../stmt/RevisionDateEffectiveStatement.java | 0 .../model/api/stmt/RevisionDateStatement.java | 0 .../api/stmt/RevisionEffectiveStatement.java | 0 .../model/api/stmt/RevisionStatement.java | 0 .../yang/model/api/stmt/Rfc6020AbnfRule.java | 0 .../model/api/stmt/RpcEffectiveStatement.java | 0 .../yang/model/api/stmt/RpcStatement.java | 0 .../model/api/stmt/SchemaNodeIdentifier.java | 0 .../SchemaTreeAwareEffectiveStatement.java | 0 .../stmt/SchemaTreeEffectiveStatement.java | 0 .../yang/model/api/stmt/SchemaTreeRoot.java | 0 .../api/stmt/StatusEffectiveStatement.java | 0 .../yang/model/api/stmt/StatusStatement.java | 0 .../api/stmt/SubmoduleEffectiveStatement.java | 0 .../model/api/stmt/SubmoduleStatement.java | 0 .../api/stmt/TypeAwareDeclaredStatement.java | 0 .../model/api/stmt/TypeDefinitionAware.java | 0 .../api/stmt/TypeEffectiveStatement.java | 0 .../yang/model/api/stmt/TypeStatement.java | 0 .../api/stmt/TypedefEffectiveStatement.java | 0 .../yang/model/api/stmt/TypedefNamespace.java | 0 .../yang/model/api/stmt/TypedefStatement.java | 0 .../api/stmt/UniqueEffectiveStatement.java | 0 .../yang/model/api/stmt/UniqueStatement.java | 0 .../api/stmt/UnitsEffectiveStatement.java | 0 .../yang/model/api/stmt/UnitsStatement.java | 0 .../api/stmt/UnknownEffectiveStatement.java | 0 .../yang/model/api/stmt/UnknownStatement.java | 0 .../model/api/stmt/UnrecognizedStatement.java | 0 .../yang/model/api/stmt/UnresolvedNumber.java | 0 .../api/stmt/UsesEffectiveStatement.java | 0 .../yang/model/api/stmt/UsesStatement.java | 0 .../api/stmt/ValueEffectiveStatement.java | 0 .../yang/model/api/stmt/ValueRange.java | 0 .../yang/model/api/stmt/ValueStatement.java | 0 .../api/stmt/WhenEffectiveStatement.java | 0 .../yang/model/api/stmt/WhenStatement.java | 0 .../WhenStatementAwareDeclaredStatement.java | 0 .../stmt/YangVersionEffectiveStatement.java | 0 .../model/api/stmt/YangVersionStatement.java | 0 .../stmt/YinElementEffectiveStatement.java | 0 .../model/api/stmt/YinElementStatement.java | 0 .../compat/ActionNodeContainerCompat.java | 0 .../NotificationNodeContainerCompat.java | 0 .../model/api/stmt/compat/package-info.java | 0 .../model/api/type/BinaryTypeDefinition.java | 0 .../model/api/type/BitsTypeDefinition.java | 0 .../model/api/type/BooleanTypeDefinition.java | 0 .../model/api/type/DecimalTypeDefinition.java | 0 .../model/api/type/EmptyTypeDefinition.java | 0 .../model/api/type/EnumTypeDefinition.java | 0 .../api/type/IdentityTypeDefinition.java | 0 .../api/type/IdentityrefTypeDefinition.java | 0 .../InstanceIdentifierTypeDefinition.java | 0 .../model/api/type/Int16TypeDefinition.java | 0 .../model/api/type/Int32TypeDefinition.java | 0 .../model/api/type/Int64TypeDefinition.java | 0 .../model/api/type/Int8TypeDefinition.java | 0 .../model/api/type/LeafrefTypeDefinition.java | 0 .../yang/model/api/type/LengthConstraint.java | 0 .../type/LengthRestrictedTypeDefinition.java | 0 .../yang/model/api/type/ModifierKind.java | 0 .../model/api/type/PatternConstraint.java | 0 .../yang/model/api/type/RangeConstraint.java | 0 .../type/RangeRestrictedTypeDefinition.java | 0 ...quireInstanceRestrictedTypeDefinition.java | 0 .../model/api/type/StringTypeDefinition.java | 0 .../yang/model/api/type/TypeDefinitions.java | 0 .../model/api/type/Uint16TypeDefinition.java | 0 .../model/api/type/Uint32TypeDefinition.java | 0 .../model/api/type/Uint64TypeDefinition.java | 0 .../model/api/type/Uint8TypeDefinition.java | 0 .../model/api/type/UnionTypeDefinition.java | 0 .../model/api/type/UnknownTypeDefinition.java | 0 .../model/api/meta/DeclaredStatement1.java | 0 .../model/api/meta/DeclaredStatement2.java | 0 .../model/api/meta/DeclaredStatementTest.java | 0 .../model/api/meta/EffectiveStatement1.java | 0 .../api/meta/EffectiveStatementTest.java | 0 .../model/api/meta/Effectivestatement2.java | 0 ...onStatementAwareDeclaredStatementTest.java | 0 {yang => model}/yang-model-export/pom.xml | 0 .../export/DeclaredStatementFormatter.java | 0 .../model/export/ModuleNamespaceContext.java | 0 .../model/export/StatementPrefixResolver.java | 0 .../yang/model/export/YangTextSnippet.java | 0 .../model/export/YangTextSnippetIterator.java | 0 .../yang/model/export/YinExportUtils.java | 0 .../yang/model/export/YinXMLEventReader.java | 0 .../export/YinXMLEventReaderFactory.java | 0 .../model/export/AbstractYinExportTest.java | 0 .../yang/model/export/Bug2444Test.java | 0 .../yang/model/export/Bug4504Test.java | 0 .../yang/model/export/Bug5531Test.java | 0 .../yang/model/export/Bug6856Test.java | 0 .../export/SchemaContextEmitterTest.java | 0 .../yang/model/export/SimpleModuleTest.java | 0 .../model/export/YangTextSnippetTest.java | 0 .../yang/model/export/YinExportTestUtils.java | 0 .../resources/bugs/bug2444/yang/action.yang | 0 .../resources/bugs/bug2444/yang/anydata.yang | 0 .../bugs/bug2444/yang/binary-spec.yang | 0 .../resources/bugs/bug2444/yang/default.yang | 0 .../bugs/bug2444/yang/deviation-target.yang | 0 .../bugs/bug2444/yang/deviation.yang | 0 .../bugs/bug2444/yang/identities.yang | 0 .../bugs/bug2444/yang/import-yang1.yang | 0 .../resources/bugs/bug2444/yang/import.yang | 0 .../resources/bugs/bug2444/yang/include.yang | 0 .../bugs/bug2444/yang/leafref-yang1.yang | 0 .../resources/bugs/bug2444/yang/leafref.yang | 0 .../bugs/bug2444/yang/modifier-yang1.yang | 0 .../resources/bugs/bug2444/yang/modifier.yang | 0 .../bugs/bug2444/yang/must-yang1.yang | 0 .../resources/bugs/bug2444/yang/must.yang | 0 .../bugs/bug2444/yang/notification.yang | 0 .../bugs/bug2444/yang/submodule.yang | 0 .../resources/bugs/bug2444/yang/unique.yang | 0 .../yin-effective-emitter/notification.yin | 0 .../resources/bugs/bug2444/yin/action.yin | 0 .../resources/bugs/bug2444/yin/anydata.yin | 0 .../bugs/bug2444/yin/binary-spec.yin | 0 .../resources/bugs/bug2444/yin/default.yin | 0 .../yin/deviation-target@2017-01-20.yin | 0 .../bugs/bug2444/yin/deviation@2017-01-20.yin | 0 .../resources/bugs/bug2444/yin/identities.yin | 0 .../bug2444/yin/import-yang1@1970-01-01.yin | 0 .../resources/bugs/bug2444/yin/import.yin | 0 .../bugs/bug2444/yin/include@2017-06-26.yin | 0 .../bugs/bug2444/yin/leafref-yang1.yin | 0 .../resources/bugs/bug2444/yin/leafref.yin | 0 .../bugs/bug2444/yin/modifier-yang1.yin | 0 .../resources/bugs/bug2444/yin/modifier.yin | 0 .../resources/bugs/bug2444/yin/must-yang1.yin | 0 .../test/resources/bugs/bug2444/yin/must.yin | 0 .../bugs/bug2444/yin/notification.yin | 0 .../resources/bugs/bug2444/yin/submodule.yin | 0 .../resources/bugs/bug2444/yin/unique.yin | 0 .../src/test/resources/bugs/bug4504/bar.yang | 0 .../src/test/resources/bugs/bug4504/foo.yang | 0 .../src/test/resources/bugs/bug5531/foo.yang | 0 .../src/test/resources/bugs/bug6856/bar.yang | 0 .../src/test/resources/bugs/bug6856/foo.yang | 0 .../bugs/yt992/module1@2019-05-17.yang | 0 .../yt992/module1submodule1@2019-05-17.yang | 0 .../bugs/yt992/module2@2019-05-17.yang | 0 .../foo@2016-08-05.yang | 0 .../foo@2016-08-05.yin | 0 .../yang/ietf-inet-types@2010-09-24.yang | 0 {yang => model}/yang-model-ri/pom.xml | 0 .../src/main/java/module-info.java | 0 .../ri/stmt/DeclaredStatementDecorators.java | 0 .../model/ri/stmt/DeclaredStatements.java | 0 .../model/ri/stmt/EffectiveStatements.java | 0 .../model/ri/stmt/ImplicitStatements.java | 0 ...bstractDeclaredEffectiveRootStatement.java | 0 .../stmt/impl/decl/AbstractKeyStatement.java | 0 .../impl/decl/AbstractOrderedByStatement.java | 0 .../impl/decl/AbstractStatusStatement.java | 0 .../stmt/impl/decl/DeviateStatementImpl.java | 0 .../impl/decl/DeviationStatementImpl.java | 0 .../stmt/impl/decl/EmptyActionStatement.java | 0 .../stmt/impl/decl/EmptyAnydataStatement.java | 0 .../stmt/impl/decl/EmptyAnyxmlStatement.java | 0 .../impl/decl/EmptyArgumentStatement.java | 0 .../stmt/impl/decl/EmptyAugmentStatement.java | 0 .../ri/stmt/impl/decl/EmptyBaseStatement.java | 0 .../impl/decl/EmptyBelongsToStatement.java | 0 .../ri/stmt/impl/decl/EmptyBitStatement.java | 0 .../ri/stmt/impl/decl/EmptyCaseStatement.java | 0 .../stmt/impl/decl/EmptyChoiceStatement.java | 0 .../stmt/impl/decl/EmptyConfigStatement.java | 0 .../stmt/impl/decl/EmptyContactStatement.java | 0 .../impl/decl/EmptyContainerStatement.java | 0 .../stmt/impl/decl/EmptyDefaultStatement.java | 0 .../impl/decl/EmptyDescriptionStatement.java | 0 .../ri/stmt/impl/decl/EmptyEnumStatement.java | 0 .../impl/decl/EmptyErrorAppTagStatement.java | 0 .../impl/decl/EmptyErrorMessageStatement.java | 0 .../impl/decl/EmptyExtensionStatement.java | 0 .../stmt/impl/decl/EmptyFeatureStatement.java | 0 .../decl/EmptyFractionDigitsStatement.java | 0 .../impl/decl/EmptyGroupingStatement.java | 0 .../impl/decl/EmptyIdentityStatement.java | 0 .../impl/decl/EmptyIfFeatureStatement.java | 0 .../stmt/impl/decl/EmptyIncludeStatement.java | 0 .../stmt/impl/decl/EmptyInputStatement.java | 0 .../ri/stmt/impl/decl/EmptyKeyStatement.java | 0 .../impl/decl/EmptyLeafListStatement.java | 0 .../ri/stmt/impl/decl/EmptyLeafStatement.java | 0 .../stmt/impl/decl/EmptyLengthStatement.java | 0 .../ri/stmt/impl/decl/EmptyListStatement.java | 0 .../impl/decl/EmptyMandatoryStatement.java | 0 .../impl/decl/EmptyMaxElementsStatement.java | 0 .../impl/decl/EmptyMinElementsStatement.java | 0 .../impl/decl/EmptyModifierStatement.java | 0 .../ri/stmt/impl/decl/EmptyMustStatement.java | 0 .../impl/decl/EmptyNamespaceStatement.java | 0 .../impl/decl/EmptyNotificationStatement.java | 0 .../impl/decl/EmptyOrderedByStatement.java | 0 .../impl/decl/EmptyOrganizationStatement.java | 0 .../stmt/impl/decl/EmptyOutputStatement.java | 0 .../ri/stmt/impl/decl/EmptyPathStatement.java | 0 .../stmt/impl/decl/EmptyPatternStatement.java | 0 .../impl/decl/EmptyPositionStatement.java | 0 .../stmt/impl/decl/EmptyPrefixStatement.java | 0 .../impl/decl/EmptyPresenceStatement.java | 0 .../stmt/impl/decl/EmptyRangeStatement.java | 0 .../impl/decl/EmptyReferenceStatement.java | 0 .../decl/EmptyRequireInstanceStatement.java | 0 .../impl/decl/EmptyRevisionDateStatement.java | 0 .../impl/decl/EmptyRevisionStatement.java | 0 .../ri/stmt/impl/decl/EmptyRpcStatement.java | 0 .../stmt/impl/decl/EmptyStatusStatement.java | 0 .../ri/stmt/impl/decl/EmptyTypeStatement.java | 0 .../stmt/impl/decl/EmptyTypedefStatement.java | 0 .../decl/EmptyUndeclaredCaseStatement.java | 0 .../decl/EmptyUndeclaredInputStatement.java | 0 .../decl/EmptyUndeclaredOutputStatement.java | 0 .../stmt/impl/decl/EmptyUniqueStatement.java | 0 .../stmt/impl/decl/EmptyUnitsStatement.java | 0 .../ri/stmt/impl/decl/EmptyUsesStatement.java | 0 .../stmt/impl/decl/EmptyValueStatement.java | 0 .../ri/stmt/impl/decl/EmptyWhenStatement.java | 0 .../impl/decl/EmptyYangVersionStatement.java | 0 .../impl/decl/EmptyYinElementStatement.java | 0 .../stmt/impl/decl/ImportStatementImpl.java | 0 .../stmt/impl/decl/ModuleStatementImpl.java | 0 .../stmt/impl/decl/RefineStatementImpl.java | 0 .../impl/decl/RegularActionStatement.java | 0 .../impl/decl/RegularAnydataStatement.java | 0 .../impl/decl/RegularAnyxmlStatement.java | 0 .../impl/decl/RegularArgumentStatement.java | 0 .../impl/decl/RegularAugmentStatement.java | 0 .../stmt/impl/decl/RegularBaseStatement.java | 0 .../impl/decl/RegularBelongsToStatement.java | 0 .../stmt/impl/decl/RegularBitStatement.java | 0 .../stmt/impl/decl/RegularCaseStatement.java | 0 .../impl/decl/RegularChoiceStatement.java | 0 .../impl/decl/RegularConfigStatement.java | 0 .../impl/decl/RegularContactStatement.java | 0 .../impl/decl/RegularContainerStatement.java | 0 .../impl/decl/RegularDefaultStatement.java | 0 .../decl/RegularDescriptionStatement.java | 0 .../stmt/impl/decl/RegularEnumStatement.java | 0 .../decl/RegularErrorAppTagStatement.java | 0 .../decl/RegularErrorMessageStatement.java | 0 .../impl/decl/RegularExtensionStatement.java | 0 .../impl/decl/RegularFeatureStatement.java | 0 .../decl/RegularFractionDigitsStatement.java | 0 .../impl/decl/RegularGroupingStatement.java | 0 .../impl/decl/RegularIdentityStatement.java | 0 .../impl/decl/RegularIfFeatureStatement.java | 0 .../impl/decl/RegularIncludeStatement.java | 0 .../stmt/impl/decl/RegularInputStatement.java | 0 .../stmt/impl/decl/RegularKeyStatement.java | 0 .../impl/decl/RegularLeafListStatement.java | 0 .../stmt/impl/decl/RegularLeafStatement.java | 0 .../impl/decl/RegularLengthStatement.java | 0 .../stmt/impl/decl/RegularListStatement.java | 0 .../impl/decl/RegularMandatoryStatement.java | 0 .../decl/RegularMaxElementsStatement.java | 0 .../decl/RegularMinElementsStatement.java | 0 .../impl/decl/RegularModifierStatement.java | 0 .../stmt/impl/decl/RegularMustStatement.java | 0 .../impl/decl/RegularNamespaceStatement.java | 0 .../decl/RegularNotificationStatement.java | 0 .../impl/decl/RegularOrderedByStatement.java | 0 .../decl/RegularOrganizationStatement.java | 0 .../impl/decl/RegularOutputStatement.java | 0 .../stmt/impl/decl/RegularPathStatement.java | 0 .../impl/decl/RegularPatternStatement.java | 0 .../impl/decl/RegularPositionStatement.java | 0 .../impl/decl/RegularPrefixStatement.java | 0 .../impl/decl/RegularPresenceStatement.java | 0 .../stmt/impl/decl/RegularRangeStatement.java | 0 .../impl/decl/RegularReferenceStatement.java | 0 .../decl/RegularRequireInstanceStatement.java | 0 .../decl/RegularRevisionDateStatement.java | 0 .../impl/decl/RegularRevisionStatement.java | 0 .../stmt/impl/decl/RegularRpcStatement.java | 0 .../impl/decl/RegularStatusStatement.java | 0 .../stmt/impl/decl/RegularTypeStatement.java | 0 .../impl/decl/RegularTypedefStatement.java | 0 .../decl/RegularUndeclaredCaseStatement.java | 0 .../decl/RegularUndeclaredInputStatement.java | 0 .../RegularUndeclaredOutputStatement.java | 0 .../impl/decl/RegularUniqueStatement.java | 0 .../stmt/impl/decl/RegularUnitsStatement.java | 0 .../stmt/impl/decl/RegularUsesStatement.java | 0 .../stmt/impl/decl/RegularValueStatement.java | 0 .../stmt/impl/decl/RegularWhenStatement.java | 0 .../decl/RegularYangVersionStatement.java | 0 .../impl/decl/RegularYinElementStatement.java | 0 .../impl/decl/SubmoduleStatementImpl.java | 0 .../impl/decl/UnrecognizedStatementImpl.java | 0 .../impl/eff/AbstractDataNodeContainer.java | 0 .../AbstractIdentityEffectiveStatement.java | 0 .../eff/AbstractKeyEffectiveStatement.java | 0 .../eff/AbstractLeafEffectiveStatement.java | 0 .../eff/ActionEffectiveStatementImpl.java | 0 .../eff/AugmentEffectiveStatementImpl.java | 0 .../impl/eff/CaseEffectiveStatementMixin.java | 0 .../eff/ChoiceEffectiveStatementImpl.java | 0 .../eff/ContainerEffectiveStatementImpl.java | 0 .../eff/DeclaredCaseEffectiveStatement.java | 0 .../eff/DeclaredInputEffectiveStatement.java | 0 .../eff/DeclaredOutputEffectiveStatement.java | 0 .../eff/DeviateEffectiveStatementImpl.java | 0 .../eff/DeviationEffectiveStatementImpl.java | 0 .../eff/EmptyAnydataEffectiveStatement.java | 0 .../eff/EmptyAnyxmlEffectiveStatement.java | 0 .../eff/EmptyArgumentEffectiveStatement.java | 0 .../impl/eff/EmptyBaseEffectiveStatement.java | 0 .../eff/EmptyBelongsToEffectiveStatement.java | 0 .../impl/eff/EmptyBitEffectiveStatement.java | 0 .../eff/EmptyConfigEffectiveStatement.java | 0 .../eff/EmptyContactEffectiveStatement.java | 0 .../eff/EmptyDefaultEffectiveStatement.java | 0 .../EmptyDescriptionEffectiveStatement.java | 0 .../impl/eff/EmptyEnumEffectiveStatement.java | 0 .../EmptyErrorAppTagEffectiveStatement.java | 0 .../EmptyErrorMessageEffectiveStatement.java | 0 .../eff/EmptyFeatureEffectiveStatement.java | 0 .../EmptyForeignKeyEffectiveStatement.java | 0 ...EmptyFractionDigitsEffectiveStatement.java | 0 .../eff/EmptyIdentityEffectiveStatement.java | 0 .../eff/EmptyIfFeatureEffectiveStatement.java | 0 .../eff/EmptyIncludeEffectiveStatement.java | 0 .../impl/eff/EmptyLeafEffectiveStatement.java | 0 .../eff/EmptyLengthEffectiveStatement.java | 0 .../eff/EmptyLocalKeyEffectiveStatement.java | 0 .../eff/EmptyMandatoryEffectiveStatement.java | 0 .../EmptyMaxElementsEffectiveStatement.java | 0 .../EmptyMinElementsEffectiveStatement.java | 0 .../eff/EmptyModifierEffectiveStatement.java | 0 .../impl/eff/EmptyMustEffectiveStatement.java | 0 .../eff/EmptyNamespaceEffectiveStatement.java | 0 .../eff/EmptyOrderedByEffectiveStatement.java | 0 .../EmptyOrganizationEffectiveStatement.java | 0 .../impl/eff/EmptyPathEffectiveStatement.java | 0 .../eff/EmptyPatternEffectiveStatement.java | 0 .../eff/EmptyPositionEffectiveStatement.java | 0 .../eff/EmptyPrefixEffectiveStatement.java | 0 .../eff/EmptyPresenceEffectiveStatement.java | 0 .../eff/EmptyRangeEffectiveStatement.java | 0 .../eff/EmptyReferenceEffectiveStatement.java | 0 ...mptyRequireInstanceEffectiveStatement.java | 0 .../EmptyRevisionDateEffectiveStatement.java | 0 .../eff/EmptyRevisionEffectiveStatement.java | 0 .../eff/EmptyStatusEffectiveStatement.java | 0 .../eff/EmptyUniqueEffectiveStatement.java | 0 .../eff/EmptyUnitsEffectiveStatement.java | 0 .../eff/EmptyValueEffectiveStatement.java | 0 .../impl/eff/EmptyWhenEffectiveStatement.java | 0 .../EmptyYangVersionEffectiveStatement.java | 0 .../EmptyYinElementEffectiveStatement.java | 0 .../eff/ExtensionEffectiveStatementImpl.java | 0 .../eff/GroupingEffectiveStatementImpl.java | 0 .../eff/ImportEffectiveStatementImpl.java | 0 .../ri/stmt/impl/eff/MustDefinitionMixin.java | 0 .../NotificationEffectiveStatementImpl.java | 0 .../eff/RegularAnydataEffectiveStatement.java | 0 .../eff/RegularAnyxmlEffectiveStatement.java | 0 .../RegularArgumentEffectiveStatement.java | 0 .../eff/RegularBaseEffectiveStatement.java | 0 .../RegularBelongsToEffectiveStatement.java | 0 .../eff/RegularBitEffectiveStatement.java | 0 .../eff/RegularConfigEffectiveStatement.java | 0 .../eff/RegularContactEffectiveStatement.java | 0 .../eff/RegularDefaultEffectiveStatement.java | 0 .../RegularDescriptionEffectiveStatement.java | 0 .../eff/RegularEnumEffectiveStatement.java | 0 .../RegularErrorAppTagEffectiveStatement.java | 0 ...RegularErrorMessageEffectiveStatement.java | 0 .../eff/RegularFeatureEffectiveStatement.java | 0 .../RegularForeignKeyEffectiveStatement.java | 0 ...gularFractionDigitsEffectiveStatement.java | 0 .../RegularIdentityEffectiveStatement.java | 0 .../RegularIfFeatureEffectiveStatement.java | 0 .../eff/RegularIncludeEffectiveStatement.java | 0 .../eff/RegularLeafEffectiveStatement.java | 0 .../eff/RegularLengthEffectiveStatement.java | 0 .../RegularLocalKeyEffectiveStatement.java | 0 .../RegularMandatoryEffectiveStatement.java | 0 .../RegularMaxElementsEffectiveStatement.java | 0 .../RegularMinElementsEffectiveStatement.java | 0 .../RegularModifierEffectiveStatement.java | 0 .../eff/RegularMustEffectiveStatement.java | 0 .../RegularNamespaceEffectiveStatement.java | 0 .../RegularOrderedByEffectiveStatement.java | 0 ...RegularOrganizationEffectiveStatement.java | 0 .../eff/RegularPathEffectiveStatement.java | 0 .../eff/RegularPatternEffectiveStatement.java | 0 .../RegularPositionEffectiveStatement.java | 0 .../eff/RegularPrefixEffectiveStatement.java | 0 .../RegularPresenceEffectiveStatement.java | 0 .../eff/RegularRangeEffectiveStatement.java | 0 .../RegularReferenceEffectiveStatement.java | 0 ...ularRequireInstanceEffectiveStatement.java | 0 ...RegularRevisionDateEffectiveStatement.java | 0 .../RegularRevisionEffectiveStatement.java | 0 .../eff/RegularStatusEffectiveStatement.java | 0 .../eff/RegularUniqueEffectiveStatement.java | 0 .../eff/RegularUnitsEffectiveStatement.java | 0 .../eff/RegularValueEffectiveStatement.java | 0 .../eff/RegularWhenEffectiveStatement.java | 0 .../RegularYangVersionEffectiveStatement.java | 0 .../RegularYinElementEffectiveStatement.java | 0 .../impl/eff/RpcEffectiveStatementImpl.java | 0 .../eff/TypedefEffectiveStatementImpl.java | 0 .../eff/UndeclaredCaseEffectiveStatement.java | 0 .../UndeclaredInputEffectiveStatement.java | 0 .../UndeclaredOutputEffectiveStatement.java | 0 .../ri/stmt/impl/ref/RefActionStatement.java | 0 .../ri/stmt/impl/ref/RefAnydataStatement.java | 0 .../ri/stmt/impl/ref/RefAnyxmlStatement.java | 0 .../stmt/impl/ref/RefArgumentStatement.java | 0 .../ri/stmt/impl/ref/RefAugmentStatement.java | 0 .../ri/stmt/impl/ref/RefBaseStatement.java | 0 .../stmt/impl/ref/RefBelongsToStatement.java | 0 .../ri/stmt/impl/ref/RefBitStatement.java | 0 .../ri/stmt/impl/ref/RefCaseStatement.java | 0 .../ri/stmt/impl/ref/RefChoiceStatement.java | 0 .../ri/stmt/impl/ref/RefConfigStatement.java | 0 .../ri/stmt/impl/ref/RefContactStatement.java | 0 .../stmt/impl/ref/RefContainerStatement.java | 0 .../ri/stmt/impl/ref/RefDefaultStatement.java | 0 .../impl/ref/RefDescriptionStatement.java | 0 .../ri/stmt/impl/ref/RefDeviateStatement.java | 0 .../stmt/impl/ref/RefDeviationStatement.java | 0 .../ri/stmt/impl/ref/RefEnumStatement.java | 0 .../impl/ref/RefErrorAppTagStatement.java | 0 .../impl/ref/RefErrorMessageStatement.java | 0 .../stmt/impl/ref/RefExtensionStatement.java | 0 .../ri/stmt/impl/ref/RefFeatureStatement.java | 0 .../impl/ref/RefFractionDigitsStatement.java | 0 .../stmt/impl/ref/RefGroupingStatement.java | 0 .../stmt/impl/ref/RefIdentityStatement.java | 0 .../stmt/impl/ref/RefIfFeatureStatement.java | 0 .../ri/stmt/impl/ref/RefImportStatement.java | 0 .../ri/stmt/impl/ref/RefIncludeStatement.java | 0 .../ri/stmt/impl/ref/RefInputStatement.java | 0 .../ri/stmt/impl/ref/RefKeyStatement.java | 0 .../stmt/impl/ref/RefLeafListStatement.java | 0 .../ri/stmt/impl/ref/RefLeafStatement.java | 0 .../ri/stmt/impl/ref/RefLengthStatement.java | 0 .../ri/stmt/impl/ref/RefListStatement.java | 0 .../stmt/impl/ref/RefMandatoryStatement.java | 0 .../impl/ref/RefMaxElementsStatement.java | 0 .../impl/ref/RefMinElementsStatement.java | 0 .../stmt/impl/ref/RefModifierStatement.java | 0 .../ri/stmt/impl/ref/RefModuleStatement.java | 0 .../ri/stmt/impl/ref/RefMustStatement.java | 0 .../stmt/impl/ref/RefNamespaceStatement.java | 0 .../impl/ref/RefNotificationStatement.java | 0 .../stmt/impl/ref/RefOrderedByStatement.java | 0 .../impl/ref/RefOrganizationStatement.java | 0 .../ri/stmt/impl/ref/RefOutputStatement.java | 0 .../ri/stmt/impl/ref/RefPathStatement.java | 0 .../ri/stmt/impl/ref/RefPatternStatement.java | 0 .../stmt/impl/ref/RefPositionStatement.java | 0 .../ri/stmt/impl/ref/RefPrefixStatement.java | 0 .../stmt/impl/ref/RefPresenceStatement.java | 0 .../ri/stmt/impl/ref/RefRangeStatement.java | 0 .../stmt/impl/ref/RefReferenceStatement.java | 0 .../ri/stmt/impl/ref/RefRefineStatement.java | 0 .../impl/ref/RefRequireInstanceStatement.java | 0 .../impl/ref/RefRevisionDateStatement.java | 0 .../stmt/impl/ref/RefRevisionStatement.java | 0 .../ri/stmt/impl/ref/RefRpcStatement.java | 0 .../ri/stmt/impl/ref/RefStatusStatement.java | 0 .../stmt/impl/ref/RefSubmoduleStatement.java | 0 .../ri/stmt/impl/ref/RefTypeStatement.java | 0 .../ri/stmt/impl/ref/RefTypedefStatement.java | 0 .../ri/stmt/impl/ref/RefUniqueStatement.java | 0 .../ri/stmt/impl/ref/RefUnitsStatement.java | 0 .../impl/ref/RefUnrecognizedStatement.java | 0 .../ri/stmt/impl/ref/RefUsesStatement.java | 0 .../ri/stmt/impl/ref/RefValueStatement.java | 0 .../ri/stmt/impl/ref/RefWhenStatement.java | 0 .../impl/ref/RefYangVersionStatement.java | 0 .../stmt/impl/ref/RefYinElementStatement.java | 0 .../yang/model/ri/type/AbstractBaseType.java | 0 .../model/ri/type/AbstractDerivedType.java | 0 .../AbstractLengthRestrictedBaseType.java | 0 .../AbstractLengthRestrictedDerivedType.java | 0 .../ri/type/AbstractLengthRestrictedType.java | 0 .../type/AbstractRangeRestrictedBaseType.java | 0 .../AbstractRangeRestrictedDerivedType.java | 0 .../ri/type/AbstractRangeRestrictedType.java | 0 .../model/ri/type/AbstractRestrictedType.java | 0 .../type/AbstractRestrictedTypeBuilder.java | 0 .../model/ri/type/AbstractTypeDefinition.java | 0 .../yang/model/ri/type/BaseBinaryType.java | 0 .../yang/model/ri/type/BaseBitsType.java | 0 .../yang/model/ri/type/BaseBooleanType.java | 0 .../yang/model/ri/type/BaseDecimalType.java | 0 .../yang/model/ri/type/BaseEmptyType.java | 0 .../model/ri/type/BaseEnumerationType.java | 0 .../model/ri/type/BaseIdentityrefType.java | 0 .../ri/type/BaseInstanceIdentifierType.java | 0 .../yang/model/ri/type/BaseInt16Type.java | 0 .../yang/model/ri/type/BaseInt32Type.java | 0 .../yang/model/ri/type/BaseInt64Type.java | 0 .../yang/model/ri/type/BaseInt8Type.java | 0 .../yang/model/ri/type/BaseLeafrefType.java | 0 .../yang/model/ri/type/BaseStringType.java | 0 .../yang/model/ri/type/BaseTypes.java | 0 .../yang/model/ri/type/BaseUint16Type.java | 0 .../yang/model/ri/type/BaseUint32Type.java | 0 .../yang/model/ri/type/BaseUint64Type.java | 0 .../yang/model/ri/type/BaseUint8Type.java | 0 .../yang/model/ri/type/BaseUnionType.java | 0 .../yang/model/ri/type/BitBuilder.java | 0 .../yangtools/yang/model/ri/type/BitImpl.java | 0 .../yang/model/ri/type/BitsTypeBuilder.java | 0 .../model/ri/type/ConcreteTypeBuilder.java | 0 .../yang/model/ri/type/ConcreteTypes.java | 0 .../model/ri/type/DecimalTypeBuilder.java | 0 .../yang/model/ri/type/DerivedBinaryType.java | 0 .../yang/model/ri/type/DerivedBitsType.java | 0 .../model/ri/type/DerivedBooleanType.java | 0 .../model/ri/type/DerivedDecimalType.java | 0 .../yang/model/ri/type/DerivedEmptyType.java | 0 .../model/ri/type/DerivedEnumerationType.java | 0 .../model/ri/type/DerivedIdentityrefType.java | 0 .../type/DerivedInstanceIdentifierType.java | 0 .../yang/model/ri/type/DerivedInt16Type.java | 0 .../yang/model/ri/type/DerivedInt32Type.java | 0 .../yang/model/ri/type/DerivedInt64Type.java | 0 .../yang/model/ri/type/DerivedInt8Type.java | 0 .../model/ri/type/DerivedLeafrefType.java | 0 .../yang/model/ri/type/DerivedStringType.java | 0 .../model/ri/type/DerivedTypeBuilder.java | 0 .../yang/model/ri/type/DerivedTypes.java | 0 .../yang/model/ri/type/DerivedUint16Type.java | 0 .../yang/model/ri/type/DerivedUint32Type.java | 0 .../yang/model/ri/type/DerivedUint64Type.java | 0 .../yang/model/ri/type/DerivedUint8Type.java | 0 .../yang/model/ri/type/DerivedUnionType.java | 0 .../yang/model/ri/type/EnumPairBuilder.java | 0 .../yang/model/ri/type/EnumPairImpl.java | 0 .../model/ri/type/EnumerationTypeBuilder.java | 0 .../model/ri/type/IdentityrefTypeBuilder.java | 0 .../type/InstanceIdentifierTypeBuilder.java | 0 .../type/InvalidBitDefinitionException.java | 0 .../type/InvalidEnumDefinitionException.java | 0 .../InvalidLengthConstraintException.java | 0 .../type/InvalidRangeConstraintException.java | 0 .../model/ri/type/JavaLengthConstraints.java | 0 .../model/ri/type/LeafrefTypeBuilder.java | 0 .../ri/type/LengthRestrictedTypeBuilder.java | 0 .../yang/model/ri/type/NumberUtil.java | 0 .../ri/type/RangeRestrictedTypeBuilder.java | 0 .../RangeRestrictedTypeBuilderWithBase.java | 0 .../RequireInstanceRestrictedTypeBuilder.java | 0 .../ri/type/ResolvedLengthConstraint.java | 0 .../ri/type/ResolvedRangeConstraint.java | 0 .../model/ri/type/RestrictedBinaryType.java | 0 .../model/ri/type/RestrictedBitsType.java | 0 .../model/ri/type/RestrictedBooleanType.java | 0 .../model/ri/type/RestrictedDecimalType.java | 0 .../model/ri/type/RestrictedEmptyType.java | 0 .../ri/type/RestrictedEnumerationType.java | 0 .../ri/type/RestrictedIdentityrefType.java | 0 .../RestrictedInstanceIdentifierType.java | 0 .../model/ri/type/RestrictedInt16Type.java | 0 .../model/ri/type/RestrictedInt32Type.java | 0 .../model/ri/type/RestrictedInt64Type.java | 0 .../model/ri/type/RestrictedInt8Type.java | 0 .../model/ri/type/RestrictedLeafrefType.java | 0 .../model/ri/type/RestrictedStringType.java | 0 .../yang/model/ri/type/RestrictedTypes.java | 0 .../model/ri/type/RestrictedUint16Type.java | 0 .../model/ri/type/RestrictedUint32Type.java | 0 .../model/ri/type/RestrictedUint64Type.java | 0 .../model/ri/type/RestrictedUint8Type.java | 0 .../model/ri/type/RestrictedUnionType.java | 0 .../yang/model/ri/type/StringTypeBuilder.java | 0 .../yang/model/ri/type/TypeBuilder.java | 0 .../yang/model/ri/type/UnionTypeBuilder.java | 0 .../yang/model/ri/type/BinaryTypeTest.java | 0 .../yang/model/ri/type/BitImplTest.java | 0 .../yang/model/ri/type/BitsTypeTest.java | 0 .../yang/model/ri/type/BooleanTypeTest.java | 0 .../yang/model/ri/type/EmptyTypeTest.java | 0 .../yang/model/ri/type/EnumPairImplTest.java | 0 .../yang/model/ri/type/Int8Test.java | 0 .../yang/model/ri/type/LeafrefTest.java | 0 .../yang/model/ri/type/NumberUtilTest.java | 0 .../yang/model/ri/type/TypeTest.java | 0 {yang => model}/yang-model-spi/pom.xml | 0 .../src/main/java/module-info.java | 0 ...AbstractEffectiveModelContextProvider.java | 0 .../AbstractEffectiveStatementInference.java | 0 .../model/spi/AbstractPathExpression.java | 0 .../yang/model/spi/AbstractSchemaContext.java | 0 .../model/spi/DefaultSchemaTreeInference.java | 0 .../yang/model/spi/ModuleDependencySort.java | 0 .../yang/model/spi/SimpleSchemaContext.java | 0 .../AbstractDeclaredEffectiveStatement.java | 0 .../spi/meta/AbstractDeclaredStatement.java | 0 ...ractEffectiveDocumentedNodeWithStatus.java | 0 .../spi/meta/AbstractEffectiveStatement.java | 0 .../spi/meta/AbstractModelStatement.java | 0 .../model/spi/meta/AbstractRefStatement.java | 0 .../AbstractUndeclaredEffectiveStatement.java | 0 .../spi/meta/EffectiveStatementMixins.java | 0 .../spi/meta/ForwardingDeclaredStatement.java | 0 .../spi/meta/ForwardingModelStatement.java | 0 .../meta/SubstatementIndexingException.java | 0 .../model/spi/ModuleDependencySortTest.java | 0 {yang => model}/yang-model-util/pom.xml | 0 .../src/main/java/module-info.java | 0 .../yang/model/util/DataNodeAggregator.java | 0 .../util/EffectiveAugmentationSchema.java | 0 .../util/FilteringSchemaContextProxy.java | 0 .../yang/model/util/LeafrefResolver.java | 0 .../util/ModuleNameNamespaceContext.java | 0 .../yang/model/util/SchemaContextUtil.java | 0 .../yang/model/util/SchemaInferenceStack.java | 0 .../yang/model/util/SchemaNodeUtils.java | 0 .../yang/model/util/package-info.java | 0 .../model/util/LeafrefStaticAnalysisTest.java | 0 .../model/util/SchemaContextProxyTest.java | 0 .../model/util/SchemaInferenceStackTest.java | 0 .../yang/model/util/SchemaNodeUtilsTest.java | 0 .../model/util/SimpleSchemaContextTest.java | 0 .../yangtools/yang/model/util/YT1050Test.java | 0 .../yangtools/yang/model/util/YT1060Test.java | 0 .../yangtools/yang/model/util/YT1100Test.java | 0 .../yangtools/yang/model/util/YT1127Test.java | 0 .../yangtools/yang/model/util/YT1231Test.java | 0 .../yangtools/yang/model/util/YT1233Test.java | 0 .../yangtools/yang/model/util/YT588Test.java | 0 .../yangtools/yang/model/util/YT691Test.java | 0 .../src/test/resources/leafrefs.yang | 0 .../schema-context-util/imported-module.yang | 0 .../schema-context-util/my-module.yang | 0 .../src/test/resources/yt1050.yang | 0 .../src/test/resources/yt1060/child.yang | 0 .../src/test/resources/yt1060/imported.yang | 0 .../src/test/resources/yt1060/parent.yang | 0 .../src/test/resources/yt1100.yang | 0 .../src/test/resources/yt1127.yang | 0 .../src/test/resources/yt1231.yang | 0 .../src/test/resources/yt1233.yang | 0 .../src/test/resources/yt588.yang | 0 .../src/test/resources/yt691/bar-sub1.yang | 0 .../src/test/resources/yt691/bar.yang | 0 .../src/test/resources/yt691/baz.yang | 0 .../src/test/resources/yt691/foo-sub1.yang | 0 .../src/test/resources/yt691/foo-sub2.yang | 0 .../src/test/resources/yt691/foo.yang | 0 pom.xml | 1 + yang/pom.xml | 16 ------ 977 files changed, 74 insertions(+), 16 deletions(-) create mode 100644 model/README.md rename {yang => model}/odlext-model-api/pom.xml (100%) rename {yang => model}/odlext-model-api/src/main/java/module-info.java (100%) rename {yang => model}/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/AugmentIdentifierEffectiveStatement.java (100%) rename {yang => model}/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/AugmentIdentifierStatement.java (100%) rename {yang => model}/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/ContextInstanceEffectiveStatement.java (100%) rename {yang => model}/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/ContextInstanceStatement.java (100%) rename {yang => model}/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/ContextReferenceEffectiveStatement.java (100%) rename {yang => model}/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/ContextReferenceStatement.java (100%) rename {yang => model}/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/InstanceTargetEffectiveStatement.java (100%) rename {yang => model}/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/InstanceTargetStatement.java (100%) rename {yang => model}/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/OpenDaylightExtensionsConstants.java (100%) rename {yang => model}/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/OpenDaylightExtensionsStatements.java (100%) rename {yang => model}/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/RpcContextReferenceEffectiveStatement.java (100%) rename {yang => model}/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/RpcContextReferenceStatement.java (100%) rename {yang => model}/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/package-info.java (100%) rename {yang => model}/openconfig-model-api/pom.xml (100%) rename {yang => model}/openconfig-model-api/src/main/java/module-info.java (100%) rename {yang => model}/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigConstants.java (100%) rename {yang => model}/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigHashedValueEffectiveStatement.java (100%) rename {yang => model}/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigHashedValueSchemaNode.java (100%) rename {yang => model}/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigHashedValueStatement.java (100%) rename {yang => model}/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigPosixPatternEffectiveStatement.java (100%) rename {yang => model}/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigPosixPatternStatement.java (100%) rename {yang => model}/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigRegexpPosixEffectiveStatement.java (100%) rename {yang => model}/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigRegexpPosixStatement.java (100%) rename {yang => model}/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigStatements.java (100%) rename {yang => model}/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigVersionEffectiveStatement.java (100%) rename {yang => model}/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigVersionStatement.java (100%) rename {yang => model}/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/package-info.java (100%) create mode 100644 model/pom.xml rename {yang => model}/rfc6241-model-api/pom.xml (100%) rename {yang => model}/rfc6241-model-api/src/main/java/module-info.java (100%) rename {yang => model}/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/GetFilterElementAttributesEffectiveStatement.java (100%) rename {yang => model}/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/GetFilterElementAttributesSchemaNode.java (100%) rename {yang => model}/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/GetFilterElementAttributesStatement.java (100%) rename {yang => model}/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/NetconfConstants.java (100%) rename {yang => model}/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/NetconfStatements.java (100%) rename {yang => model}/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/package-info.java (100%) rename {yang => model}/rfc6536-model-api/pom.xml (100%) rename {yang => model}/rfc6536-model-api/src/main/java/module-info.java (100%) rename {yang => model}/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyAllEffectiveStatement.java (100%) rename {yang => model}/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyAllSchemaNode.java (100%) rename {yang => model}/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyAllStatement.java (100%) rename {yang => model}/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyWriteEffectiveStatement.java (100%) rename {yang => model}/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyWriteSchemaNode.java (100%) rename {yang => model}/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyWriteStatement.java (100%) rename {yang => model}/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/NACMConstants.java (100%) rename {yang => model}/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/NACMStatements.java (100%) rename {yang => model}/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/package-info.java (100%) rename {yang => model}/rfc6643-model-api/pom.xml (100%) rename {yang => model}/rfc6643-model-api/src/main/java/module-info.java (100%) rename {yang => model}/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/AliasEffectiveStatement.java (100%) rename {yang => model}/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/AliasSchemaNode.java (100%) rename {yang => model}/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/AliasStatement.java (100%) rename {yang => model}/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DefValEffectiveStatement.java (100%) rename {yang => model}/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DefValSchemaNode.java (100%) rename {yang => model}/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DefValStatement.java (100%) rename {yang => model}/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DisplayHintEffectiveStatement.java (100%) rename {yang => model}/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DisplayHintSchemaNode.java (100%) rename {yang => model}/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DisplayHintStatement.java (100%) rename {yang => model}/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/IetfYangSmiv2Constants.java (100%) rename {yang => model}/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/IetfYangSmiv2ExtensionsMapping.java (100%) rename {yang => model}/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/ImpliedEffectiveStatement.java (100%) rename {yang => model}/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/ImpliedSchemaNode.java (100%) rename {yang => model}/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/ImpliedStatement.java (100%) rename {yang => model}/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/MaxAccess.java (100%) rename {yang => model}/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/MaxAccessEffectiveStatement.java (100%) rename {yang => model}/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/MaxAccessSchemaNode.java (100%) rename {yang => model}/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/MaxAccessStatement.java (100%) rename {yang => model}/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/ObjectIdentifier.java (100%) rename {yang => model}/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/OidEffectiveStatement.java (100%) rename {yang => model}/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/OidSchemaNode.java (100%) rename {yang => model}/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/OidStatement.java (100%) rename {yang => model}/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/SubIdEffectiveStatement.java (100%) rename {yang => model}/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/SubIdSchemaNode.java (100%) rename {yang => model}/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/SubIdStatement.java (100%) rename {yang => model}/rfc7952-model-api/pom.xml (100%) rename {yang => model}/rfc7952-model-api/src/main/java/module-info.java (100%) rename {yang => model}/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/AnnotationEffectiveStatement.java (100%) rename {yang => model}/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/AnnotationSchemaNode.java (100%) rename {yang => model}/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/AnnotationSchemaNodeAware.java (100%) rename {yang => model}/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/AnnotationSchemaNodeAwareSchemaContext.java (100%) rename {yang => model}/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/AnnotationStatement.java (100%) rename {yang => model}/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/MetadataConstants.java (100%) rename {yang => model}/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/MetadataStatements.java (100%) rename {yang => model}/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/package-info.java (100%) rename {yang => model}/rfc8040-model-api/pom.xml (100%) rename {yang => model}/rfc8040-model-api/src/main/java/module-info.java (100%) rename {yang => model}/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataConstants.java (100%) rename {yang => model}/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataEffectiveStatement.java (100%) rename {yang => model}/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataSchemaNode.java (100%) rename {yang => model}/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataStatement.java (100%) rename {yang => model}/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataStatements.java (100%) rename {yang => model}/rfc8528-model-api/pom.xml (100%) rename {yang => model}/rfc8528-model-api/src/main/java/module-info.java (100%) rename {yang => model}/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/MountPointEffectiveStatement.java (100%) rename {yang => model}/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/MountPointSchemaNode.java (100%) rename {yang => model}/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/MountPointStatement.java (100%) rename {yang => model}/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/SchemaMountConstants.java (100%) rename {yang => model}/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/SchemaMountStatements.java (100%) rename {yang => model}/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/package-info.java (100%) rename {yang => model}/yang-model-api/pom.xml (100%) rename {yang => model}/yang-model-api/src/main/java/module-info.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ActionDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ActionNodeContainer.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AddedByUsesAware.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnydataSchemaNode.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnyxmlSchemaNode.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationSchemaNode.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationTarget.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/CaseSchemaNode.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceSchemaNode.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ConstraintMetaDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ContainerLike.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ContainerSchemaNode.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/CopyableNode.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataSchemaNode.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DerivableSchemaNode.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DeviateDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DeviateKind.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Deviation.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DocumentedNode.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveModelContext.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveModelContextListener.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveModelContextProvider.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveStatementEquivalent.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveStatementInference.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ElementCountConstraint.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ElementCountConstraintAware.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ExtensionDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/FeatureDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/GroupingDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/HelperMethods.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/IdentitySchemaNode.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/InputSchemaNode.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafListSchemaNode.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafSchemaNode.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ListSchemaNode.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MandatoryAware.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Module.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleLike.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MustConstraintAware.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MustDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NotificationDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NotificationNodeContainer.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/OperationDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/OutputSchemaNode.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/PathExpression.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/PathFromRoot.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/QNameModuleAware.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RpcDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContext.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContextListener.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaNode.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaNodeDefaults.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaTreeInference.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Status.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Submodule.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/TypeAware.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/TypeDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/TypedDataSchemaNode.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UnknownSchemaNode.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UsesNode.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/WhenConditionAware.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/YangStmtMapping.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/AbstractStatementDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/ArgumentDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DeclarationInFile.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DeclarationInText.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DeclarationReference.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DefaultStatementDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/EffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/IdentifierNamespace.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/ModelStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/StatementDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/StatementOrigin.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/package-info.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatementAwareDeclaredStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnydataEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnydataStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnyxmlEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnyxmlStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ArgumentEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ArgumentStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AugmentEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AugmentStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BaseEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BaseStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BelongsToEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BelongsToStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BitEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BitStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BodyDeclaredStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/CaseEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/CaseEffectiveStatementNamespace.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/CaseStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ChoiceEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ChoiceStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigStatementAwareDeclaredStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConstrainedDocumentedDeclaredStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContactEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContactStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContainerEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContainerStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataDefinitionAwareDeclaredStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataDefinitionStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataTreeAwareEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataTreeEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DefaultEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DefaultMethodHelpers.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DefaultStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DefaultStatementAwareDeclaredStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DescriptionEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DescriptionStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviateEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviateStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviationEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviationStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DocumentedDeclaredStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/EffectiveStatementNamespace.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/EnumEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/EnumStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorAppTagEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorAppTagStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorMessageEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorMessageStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ExtensionEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ExtensionEffectiveStatementNamespace.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ExtensionStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FeatureEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FeatureEffectiveStatementNamespace.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FeatureStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FractionDigitsEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FractionDigitsStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/GroupingEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/GroupingStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IdentityEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IdentityEffectiveStatementNamespace.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IdentityStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureAwareDeclaredStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureExpr.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ImportEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ImportStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IncludeEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IncludeStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/InputEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/InputStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/KeyEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/KeyStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafListEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafListStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LengthEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LengthStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LinkageDeclaredStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ListEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ListStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MandatoryEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MandatoryStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MandatoryStatementAwareDeclaredStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MaxElementsEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MaxElementsStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MetaDeclaredStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MinElementsEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MinElementsStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModifierEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModifierStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleHeaderGroup.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MultipleElementsDeclaredStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MustEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MustStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MustStatementAwareDeclaredStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NamespaceEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NamespaceStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NamespacedEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NotificationEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NotificationStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NotificationStatementAwareDeclaredStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OperationDeclaredStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrderedByEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrderedByStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrganizationEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrganizationStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OutputEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OutputStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PathEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PathStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PatternEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PatternExpression.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PatternStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PositionEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PositionStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PrefixEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PrefixStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PresenceEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PresenceStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RangeEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RangeStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ReferenceEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ReferenceStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RefineEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RefineStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RequireInstanceEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RequireInstanceStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionAwareDeclaredStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionDateEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionDateStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/Rfc6020AbnfRule.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RpcEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RpcStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaNodeIdentifier.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeAwareEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeRoot.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/StatusEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/StatusStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SubmoduleEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SubmoduleStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeAwareDeclaredStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeDefinitionAware.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypedefEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypedefNamespace.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypedefStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UniqueEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UniqueStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnitsEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnitsStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnknownEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnknownStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnrecognizedStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnresolvedNumber.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UsesEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UsesStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ValueEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ValueRange.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ValueStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/WhenEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/WhenStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/WhenStatementAwareDeclaredStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YangVersionEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YangVersionStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YinElementEffectiveStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YinElementStatement.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/compat/ActionNodeContainerCompat.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/compat/NotificationNodeContainerCompat.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/compat/package-info.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BinaryTypeDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BooleanTypeDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/DecimalTypeDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EmptyTypeDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EnumTypeDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityTypeDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/InstanceIdentifierTypeDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int16TypeDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int32TypeDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int64TypeDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int8TypeDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LeafrefTypeDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LengthConstraint.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LengthRestrictedTypeDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/ModifierKind.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/PatternConstraint.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/RangeConstraint.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/RangeRestrictedTypeDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/RequireInstanceRestrictedTypeDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/StringTypeDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/TypeDefinitions.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint16TypeDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint32TypeDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint64TypeDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint8TypeDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnionTypeDefinition.java (100%) rename {yang => model}/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnknownTypeDefinition.java (100%) rename {yang => model}/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatement1.java (100%) rename {yang => model}/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatement2.java (100%) rename {yang => model}/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatementTest.java (100%) rename {yang => model}/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/EffectiveStatement1.java (100%) rename {yang => model}/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/EffectiveStatementTest.java (100%) rename {yang => model}/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/Effectivestatement2.java (100%) rename {yang => model}/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatementAwareDeclaredStatementTest.java (100%) rename {yang => model}/yang-model-export/pom.xml (100%) rename {yang => model}/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/DeclaredStatementFormatter.java (100%) rename {yang => model}/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/ModuleNamespaceContext.java (100%) rename {yang => model}/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/StatementPrefixResolver.java (100%) rename {yang => model}/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YangTextSnippet.java (100%) rename {yang => model}/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YangTextSnippetIterator.java (100%) rename {yang => model}/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinExportUtils.java (100%) rename {yang => model}/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinXMLEventReader.java (100%) rename {yang => model}/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinXMLEventReaderFactory.java (100%) rename {yang => model}/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/AbstractYinExportTest.java (100%) rename {yang => model}/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug2444Test.java (100%) rename {yang => model}/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug4504Test.java (100%) rename {yang => model}/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug5531Test.java (100%) rename {yang => model}/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug6856Test.java (100%) rename {yang => model}/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/SchemaContextEmitterTest.java (100%) rename {yang => model}/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/SimpleModuleTest.java (100%) rename {yang => model}/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/YangTextSnippetTest.java (100%) rename {yang => model}/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/YinExportTestUtils.java (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yang/action.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yang/anydata.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yang/binary-spec.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yang/default.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yang/deviation-target.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yang/deviation.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yang/identities.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yang/import-yang1.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yang/import.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yang/include.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yang/leafref-yang1.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yang/leafref.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yang/modifier-yang1.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yang/modifier.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yang/must-yang1.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yang/must.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yang/notification.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yang/submodule.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yang/unique.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yin-effective-emitter/notification.yin (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yin/action.yin (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yin/anydata.yin (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yin/binary-spec.yin (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yin/default.yin (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yin/deviation-target@2017-01-20.yin (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yin/deviation@2017-01-20.yin (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yin/identities.yin (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yin/import-yang1@1970-01-01.yin (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yin/import.yin (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yin/include@2017-06-26.yin (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yin/leafref-yang1.yin (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yin/leafref.yin (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yin/modifier-yang1.yin (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yin/modifier.yin (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yin/must-yang1.yin (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yin/must.yin (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yin/notification.yin (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yin/submodule.yin (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug2444/yin/unique.yin (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug4504/bar.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug4504/foo.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug5531/foo.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug6856/bar.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/bug6856/foo.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/yt992/module1@2019-05-17.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/yt992/module1submodule1@2019-05-17.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/bugs/yt992/module2@2019-05-17.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/schema-context-emitter-test/foo@2016-08-05.yang (100%) rename {yang => model}/yang-model-export/src/test/resources/schema-context-emitter-test/foo@2016-08-05.yin (100%) rename {yang => model}/yang-model-export/src/test/resources/yang/ietf-inet-types@2010-09-24.yang (100%) rename {yang => model}/yang-model-ri/pom.xml (100%) rename {yang => model}/yang-model-ri/src/main/java/module-info.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/DeclaredStatementDecorators.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/DeclaredStatements.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/EffectiveStatements.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/ImplicitStatements.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractDeclaredEffectiveRootStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractKeyStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractOrderedByStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractStatusStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/DeviateStatementImpl.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/DeviationStatementImpl.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyActionStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyAnydataStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyAnyxmlStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyArgumentStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyAugmentStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyBaseStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyBelongsToStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyBitStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyCaseStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyChoiceStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyConfigStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyContactStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyContainerStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyDefaultStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyDescriptionStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyEnumStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyErrorAppTagStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyErrorMessageStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyExtensionStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyFeatureStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyFractionDigitsStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyGroupingStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyIdentityStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyIfFeatureStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyIncludeStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyInputStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyKeyStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyLeafListStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyLeafStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyLengthStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyListStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMandatoryStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMaxElementsStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMinElementsStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyModifierStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMustStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyNamespaceStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyNotificationStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyOrderedByStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyOrganizationStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyOutputStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPathStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPatternStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPositionStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPrefixStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPresenceStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRangeStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyReferenceStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRequireInstanceStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRevisionDateStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRevisionStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRpcStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyStatusStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyTypeStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyTypedefStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredCaseStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredInputStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredOutputStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUniqueStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUnitsStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUsesStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyValueStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyWhenStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyYangVersionStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyYinElementStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/ImportStatementImpl.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/ModuleStatementImpl.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RefineStatementImpl.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularActionStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularAnydataStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularAnyxmlStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularArgumentStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularAugmentStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularBaseStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularBelongsToStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularBitStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularCaseStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularChoiceStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularConfigStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularContactStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularContainerStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularDefaultStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularDescriptionStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularEnumStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularErrorAppTagStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularErrorMessageStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularExtensionStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularFeatureStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularFractionDigitsStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularGroupingStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularIdentityStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularIfFeatureStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularIncludeStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularInputStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularKeyStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularLeafListStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularLeafStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularLengthStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularListStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMandatoryStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMaxElementsStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMinElementsStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularModifierStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMustStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularNamespaceStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularNotificationStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularOrderedByStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularOrganizationStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularOutputStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPathStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPatternStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPositionStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPrefixStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPresenceStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRangeStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularReferenceStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRequireInstanceStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRevisionDateStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRevisionStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRpcStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularStatusStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularTypeStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularTypedefStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredCaseStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredInputStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredOutputStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUniqueStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUnitsStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUsesStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularValueStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularWhenStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularYangVersionStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularYinElementStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/SubmoduleStatementImpl.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/UnrecognizedStatementImpl.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractDataNodeContainer.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractIdentityEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractKeyEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractLeafEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ActionEffectiveStatementImpl.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AugmentEffectiveStatementImpl.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/CaseEffectiveStatementMixin.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ChoiceEffectiveStatementImpl.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ContainerEffectiveStatementImpl.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeclaredCaseEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeclaredInputEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeclaredOutputEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeviateEffectiveStatementImpl.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeviationEffectiveStatementImpl.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyAnydataEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyAnyxmlEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyArgumentEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyBaseEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyBelongsToEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyBitEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyConfigEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyContactEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyDefaultEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyDescriptionEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyEnumEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyErrorAppTagEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyErrorMessageEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyFeatureEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyForeignKeyEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyFractionDigitsEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyIdentityEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyIfFeatureEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyIncludeEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyLeafEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyLengthEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyLocalKeyEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMandatoryEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMaxElementsEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMinElementsEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyModifierEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMustEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyNamespaceEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyOrderedByEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyOrganizationEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPathEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPatternEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPositionEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPrefixEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPresenceEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyRangeEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyReferenceEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyRequireInstanceEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyRevisionDateEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyRevisionEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyStatusEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyUniqueEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyUnitsEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyValueEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyWhenEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyYangVersionEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyYinElementEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ExtensionEffectiveStatementImpl.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/GroupingEffectiveStatementImpl.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ImportEffectiveStatementImpl.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/MustDefinitionMixin.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/NotificationEffectiveStatementImpl.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularAnydataEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularAnyxmlEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularArgumentEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularBaseEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularBelongsToEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularBitEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularConfigEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularContactEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularDefaultEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularDescriptionEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularEnumEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularErrorAppTagEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularErrorMessageEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularFeatureEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularForeignKeyEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularFractionDigitsEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularIdentityEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularIfFeatureEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularIncludeEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularLeafEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularLengthEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularLocalKeyEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMandatoryEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMaxElementsEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMinElementsEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularModifierEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMustEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularNamespaceEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularOrderedByEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularOrganizationEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPathEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPatternEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPositionEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPrefixEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPresenceEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularRangeEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularReferenceEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularRequireInstanceEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularRevisionDateEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularRevisionEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularStatusEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularUniqueEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularUnitsEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularValueEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularWhenEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularYangVersionEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularYinElementEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RpcEffectiveStatementImpl.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/TypedefEffectiveStatementImpl.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/UndeclaredCaseEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/UndeclaredInputEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/UndeclaredOutputEffectiveStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefActionStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefAnydataStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefAnyxmlStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefArgumentStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefAugmentStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefBaseStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefBelongsToStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefBitStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefCaseStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefChoiceStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefConfigStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefContactStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefContainerStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefDefaultStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefDescriptionStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefDeviateStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefDeviationStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefEnumStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefErrorAppTagStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefErrorMessageStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefExtensionStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefFeatureStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefFractionDigitsStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefGroupingStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefIdentityStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefIfFeatureStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefImportStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefIncludeStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefInputStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefKeyStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefLeafListStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefLeafStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefLengthStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefListStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefMandatoryStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefMaxElementsStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefMinElementsStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefModifierStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefModuleStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefMustStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefNamespaceStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefNotificationStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefOrderedByStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefOrganizationStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefOutputStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefPathStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefPatternStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefPositionStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefPrefixStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefPresenceStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRangeStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefReferenceStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRefineStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRequireInstanceStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRevisionDateStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRevisionStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRpcStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefStatusStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefSubmoduleStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefTypeStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefTypedefStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefUniqueStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefUnitsStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefUnrecognizedStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefUsesStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefValueStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefWhenStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefYangVersionStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefYinElementStatement.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractBaseType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractDerivedType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractLengthRestrictedBaseType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractLengthRestrictedDerivedType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractLengthRestrictedType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRangeRestrictedBaseType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRangeRestrictedDerivedType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRangeRestrictedType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRestrictedType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRestrictedTypeBuilder.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractTypeDefinition.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseBinaryType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseBitsType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseBooleanType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseDecimalType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseEmptyType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseEnumerationType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseIdentityrefType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInstanceIdentifierType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt16Type.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt32Type.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt64Type.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt8Type.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseLeafrefType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseStringType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseTypes.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint16Type.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint32Type.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint64Type.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint8Type.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUnionType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BitBuilder.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BitImpl.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BitsTypeBuilder.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ConcreteTypeBuilder.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ConcreteTypes.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DecimalTypeBuilder.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedBinaryType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedBitsType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedBooleanType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedDecimalType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedEmptyType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedEnumerationType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedIdentityrefType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInstanceIdentifierType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt16Type.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt32Type.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt64Type.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt8Type.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedLeafrefType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedStringType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedTypeBuilder.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedTypes.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint16Type.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint32Type.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint64Type.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint8Type.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUnionType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/EnumPairBuilder.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/EnumPairImpl.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/EnumerationTypeBuilder.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/IdentityrefTypeBuilder.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InstanceIdentifierTypeBuilder.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidBitDefinitionException.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidEnumDefinitionException.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidLengthConstraintException.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidRangeConstraintException.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/JavaLengthConstraints.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/LeafrefTypeBuilder.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/LengthRestrictedTypeBuilder.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/NumberUtil.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RangeRestrictedTypeBuilder.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RangeRestrictedTypeBuilderWithBase.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RequireInstanceRestrictedTypeBuilder.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ResolvedLengthConstraint.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ResolvedRangeConstraint.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedBinaryType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedBitsType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedBooleanType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedDecimalType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedEmptyType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedEnumerationType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedIdentityrefType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInstanceIdentifierType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt16Type.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt32Type.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt64Type.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt8Type.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedLeafrefType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedStringType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedTypes.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint16Type.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint32Type.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint64Type.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint8Type.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUnionType.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/StringTypeBuilder.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/TypeBuilder.java (100%) rename {yang => model}/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/UnionTypeBuilder.java (100%) rename {yang => model}/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BinaryTypeTest.java (100%) rename {yang => model}/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BitImplTest.java (100%) rename {yang => model}/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BitsTypeTest.java (100%) rename {yang => model}/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BooleanTypeTest.java (100%) rename {yang => model}/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/EmptyTypeTest.java (100%) rename {yang => model}/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/EnumPairImplTest.java (100%) rename {yang => model}/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/Int8Test.java (100%) rename {yang => model}/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/LeafrefTest.java (100%) rename {yang => model}/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/NumberUtilTest.java (100%) rename {yang => model}/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/TypeTest.java (100%) rename {yang => model}/yang-model-spi/pom.xml (100%) rename {yang => model}/yang-model-spi/src/main/java/module-info.java (100%) rename {yang => model}/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/AbstractEffectiveModelContextProvider.java (100%) rename {yang => model}/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/AbstractEffectiveStatementInference.java (100%) rename {yang => model}/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/AbstractPathExpression.java (100%) rename {yang => model}/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/AbstractSchemaContext.java (100%) rename {yang => model}/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/DefaultSchemaTreeInference.java (100%) rename {yang => model}/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/ModuleDependencySort.java (100%) rename {yang => model}/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/SimpleSchemaContext.java (100%) rename {yang => model}/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractDeclaredEffectiveStatement.java (100%) rename {yang => model}/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractDeclaredStatement.java (100%) rename {yang => model}/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractEffectiveDocumentedNodeWithStatus.java (100%) rename {yang => model}/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractEffectiveStatement.java (100%) rename {yang => model}/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractModelStatement.java (100%) rename {yang => model}/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractRefStatement.java (100%) rename {yang => model}/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractUndeclaredEffectiveStatement.java (100%) rename {yang => model}/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/EffectiveStatementMixins.java (100%) rename {yang => model}/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/ForwardingDeclaredStatement.java (100%) rename {yang => model}/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/ForwardingModelStatement.java (100%) rename {yang => model}/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/SubstatementIndexingException.java (100%) rename {yang => model}/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/ModuleDependencySortTest.java (100%) rename {yang => model}/yang-model-util/pom.xml (100%) rename {yang => model}/yang-model-util/src/main/java/module-info.java (100%) rename {yang => model}/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DataNodeAggregator.java (100%) rename {yang => model}/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EffectiveAugmentationSchema.java (100%) rename {yang => model}/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/FilteringSchemaContextProxy.java (100%) rename {yang => model}/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/LeafrefResolver.java (100%) rename {yang => model}/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ModuleNameNamespaceContext.java (100%) rename {yang => model}/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java (100%) rename {yang => model}/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaInferenceStack.java (100%) rename {yang => model}/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtils.java (100%) rename {yang => model}/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/package-info.java (100%) rename {yang => model}/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/LeafrefStaticAnalysisTest.java (100%) rename {yang => model}/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java (100%) rename {yang => model}/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaInferenceStackTest.java (100%) rename {yang => model}/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtilsTest.java (100%) rename {yang => model}/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SimpleSchemaContextTest.java (100%) rename {yang => model}/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1050Test.java (100%) rename {yang => model}/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1060Test.java (100%) rename {yang => model}/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1100Test.java (100%) rename {yang => model}/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1127Test.java (100%) rename {yang => model}/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1231Test.java (100%) rename {yang => model}/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1233Test.java (100%) rename {yang => model}/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT588Test.java (100%) rename {yang => model}/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT691Test.java (100%) rename {yang => model}/yang-model-util/src/test/resources/leafrefs.yang (100%) rename {yang => model}/yang-model-util/src/test/resources/schema-context-util/imported-module.yang (100%) rename {yang => model}/yang-model-util/src/test/resources/schema-context-util/my-module.yang (100%) rename {yang => model}/yang-model-util/src/test/resources/yt1050.yang (100%) rename {yang => model}/yang-model-util/src/test/resources/yt1060/child.yang (100%) rename {yang => model}/yang-model-util/src/test/resources/yt1060/imported.yang (100%) rename {yang => model}/yang-model-util/src/test/resources/yt1060/parent.yang (100%) rename {yang => model}/yang-model-util/src/test/resources/yt1100.yang (100%) rename {yang => model}/yang-model-util/src/test/resources/yt1127.yang (100%) rename {yang => model}/yang-model-util/src/test/resources/yt1231.yang (100%) rename {yang => model}/yang-model-util/src/test/resources/yt1233.yang (100%) rename {yang => model}/yang-model-util/src/test/resources/yt588.yang (100%) rename {yang => model}/yang-model-util/src/test/resources/yt691/bar-sub1.yang (100%) rename {yang => model}/yang-model-util/src/test/resources/yt691/bar.yang (100%) rename {yang => model}/yang-model-util/src/test/resources/yt691/baz.yang (100%) rename {yang => model}/yang-model-util/src/test/resources/yt691/foo-sub1.yang (100%) rename {yang => model}/yang-model-util/src/test/resources/yt691/foo-sub2.yang (100%) rename {yang => model}/yang-model-util/src/test/resources/yt691/foo.yang (100%) diff --git a/model/README.md b/model/README.md new file mode 100644 index 0000000000..74b3f524c6 --- /dev/null +++ b/model/README.md @@ -0,0 +1,19 @@ +# YANG language model and extension + +This directory contains the model of YANG language itself, as defined in [RFC6020] and [RFC7950], +as well as various standard extensions: +* [RFC6241] NETCONF's **get-filter-element-attributes** extension +* [RFC6536] NETCONF Access Control Model +* [RFC6643] SMIv2 MIB Modules to YANG Modules translation +* [RFC7952] YANG metadata +* [RFC8040] RESTCONF's **yang-data** extension +* [RFC8528] YANG Schema Mount + +[RFC6020]:https://tools.ietf.org/html/rfc6020 +[RFC6241]:https://tools.ietf.org/html/rfc6241 +[RFC6536]:https://tools.ietf.org/html/rfc6536 +[RFC6643]:https://tools.ietf.org/html/rfc6643 +[RFC7950]:https://tools.ietf.org/html/rfc7950 +[RFC7952]:https://tools.ietf.org/html/rfc7952 +[RFC8040]:https://tools.ietf.org/html/rfc8040 +[RFC8528]:https://tools.ietf.org/html/rfc8528 diff --git a/yang/odlext-model-api/pom.xml b/model/odlext-model-api/pom.xml similarity index 100% rename from yang/odlext-model-api/pom.xml rename to model/odlext-model-api/pom.xml diff --git a/yang/odlext-model-api/src/main/java/module-info.java b/model/odlext-model-api/src/main/java/module-info.java similarity index 100% rename from yang/odlext-model-api/src/main/java/module-info.java rename to model/odlext-model-api/src/main/java/module-info.java diff --git a/yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/AugmentIdentifierEffectiveStatement.java b/model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/AugmentIdentifierEffectiveStatement.java similarity index 100% rename from yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/AugmentIdentifierEffectiveStatement.java rename to model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/AugmentIdentifierEffectiveStatement.java diff --git a/yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/AugmentIdentifierStatement.java b/model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/AugmentIdentifierStatement.java similarity index 100% rename from yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/AugmentIdentifierStatement.java rename to model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/AugmentIdentifierStatement.java diff --git a/yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/ContextInstanceEffectiveStatement.java b/model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/ContextInstanceEffectiveStatement.java similarity index 100% rename from yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/ContextInstanceEffectiveStatement.java rename to model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/ContextInstanceEffectiveStatement.java diff --git a/yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/ContextInstanceStatement.java b/model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/ContextInstanceStatement.java similarity index 100% rename from yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/ContextInstanceStatement.java rename to model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/ContextInstanceStatement.java diff --git a/yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/ContextReferenceEffectiveStatement.java b/model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/ContextReferenceEffectiveStatement.java similarity index 100% rename from yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/ContextReferenceEffectiveStatement.java rename to model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/ContextReferenceEffectiveStatement.java diff --git a/yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/ContextReferenceStatement.java b/model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/ContextReferenceStatement.java similarity index 100% rename from yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/ContextReferenceStatement.java rename to model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/ContextReferenceStatement.java diff --git a/yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/InstanceTargetEffectiveStatement.java b/model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/InstanceTargetEffectiveStatement.java similarity index 100% rename from yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/InstanceTargetEffectiveStatement.java rename to model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/InstanceTargetEffectiveStatement.java diff --git a/yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/InstanceTargetStatement.java b/model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/InstanceTargetStatement.java similarity index 100% rename from yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/InstanceTargetStatement.java rename to model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/InstanceTargetStatement.java diff --git a/yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/OpenDaylightExtensionsConstants.java b/model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/OpenDaylightExtensionsConstants.java similarity index 100% rename from yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/OpenDaylightExtensionsConstants.java rename to model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/OpenDaylightExtensionsConstants.java diff --git a/yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/OpenDaylightExtensionsStatements.java b/model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/OpenDaylightExtensionsStatements.java similarity index 100% rename from yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/OpenDaylightExtensionsStatements.java rename to model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/OpenDaylightExtensionsStatements.java diff --git a/yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/RpcContextReferenceEffectiveStatement.java b/model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/RpcContextReferenceEffectiveStatement.java similarity index 100% rename from yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/RpcContextReferenceEffectiveStatement.java rename to model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/RpcContextReferenceEffectiveStatement.java diff --git a/yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/RpcContextReferenceStatement.java b/model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/RpcContextReferenceStatement.java similarity index 100% rename from yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/RpcContextReferenceStatement.java rename to model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/RpcContextReferenceStatement.java diff --git a/yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/package-info.java b/model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/package-info.java similarity index 100% rename from yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/package-info.java rename to model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/package-info.java diff --git a/yang/openconfig-model-api/pom.xml b/model/openconfig-model-api/pom.xml similarity index 100% rename from yang/openconfig-model-api/pom.xml rename to model/openconfig-model-api/pom.xml diff --git a/yang/openconfig-model-api/src/main/java/module-info.java b/model/openconfig-model-api/src/main/java/module-info.java similarity index 100% rename from yang/openconfig-model-api/src/main/java/module-info.java rename to model/openconfig-model-api/src/main/java/module-info.java diff --git a/yang/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigConstants.java b/model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigConstants.java similarity index 100% rename from yang/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigConstants.java rename to model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigConstants.java diff --git a/yang/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigHashedValueEffectiveStatement.java b/model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigHashedValueEffectiveStatement.java similarity index 100% rename from yang/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigHashedValueEffectiveStatement.java rename to model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigHashedValueEffectiveStatement.java diff --git a/yang/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigHashedValueSchemaNode.java b/model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigHashedValueSchemaNode.java similarity index 100% rename from yang/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigHashedValueSchemaNode.java rename to model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigHashedValueSchemaNode.java diff --git a/yang/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigHashedValueStatement.java b/model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigHashedValueStatement.java similarity index 100% rename from yang/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigHashedValueStatement.java rename to model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigHashedValueStatement.java diff --git a/yang/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigPosixPatternEffectiveStatement.java b/model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigPosixPatternEffectiveStatement.java similarity index 100% rename from yang/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigPosixPatternEffectiveStatement.java rename to model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigPosixPatternEffectiveStatement.java diff --git a/yang/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigPosixPatternStatement.java b/model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigPosixPatternStatement.java similarity index 100% rename from yang/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigPosixPatternStatement.java rename to model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigPosixPatternStatement.java diff --git a/yang/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigRegexpPosixEffectiveStatement.java b/model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigRegexpPosixEffectiveStatement.java similarity index 100% rename from yang/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigRegexpPosixEffectiveStatement.java rename to model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigRegexpPosixEffectiveStatement.java diff --git a/yang/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigRegexpPosixStatement.java b/model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigRegexpPosixStatement.java similarity index 100% rename from yang/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigRegexpPosixStatement.java rename to model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigRegexpPosixStatement.java diff --git a/yang/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigStatements.java b/model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigStatements.java similarity index 100% rename from yang/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigStatements.java rename to model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigStatements.java diff --git a/yang/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigVersionEffectiveStatement.java b/model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigVersionEffectiveStatement.java similarity index 100% rename from yang/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigVersionEffectiveStatement.java rename to model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigVersionEffectiveStatement.java diff --git a/yang/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigVersionStatement.java b/model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigVersionStatement.java similarity index 100% rename from yang/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigVersionStatement.java rename to model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigVersionStatement.java diff --git a/yang/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/package-info.java b/model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/package-info.java similarity index 100% rename from yang/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/package-info.java rename to model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/package-info.java diff --git a/model/pom.xml b/model/pom.xml new file mode 100644 index 0000000000..450997957f --- /dev/null +++ b/model/pom.xml @@ -0,0 +1,54 @@ + + + + + 4.0.0 + + + org.opendaylight.odlparent + odlparent-lite + 9.0.0 + + + + org.opendaylight.yangtools + model-aggregator + 7.0.0-SNAPSHOT + pom + + + true + true + + + + + yang-model-api + yang-model-ri + yang-model-spi + yang-model-util + + + yang-model-export + + + rfc6241-model-api + rfc6536-model-api + rfc6643-model-api + rfc7952-model-api + rfc8040-model-api + rfc8528-model-api + + + odlext-model-api + + + openconfig-model-api + + diff --git a/yang/rfc6241-model-api/pom.xml b/model/rfc6241-model-api/pom.xml similarity index 100% rename from yang/rfc6241-model-api/pom.xml rename to model/rfc6241-model-api/pom.xml diff --git a/yang/rfc6241-model-api/src/main/java/module-info.java b/model/rfc6241-model-api/src/main/java/module-info.java similarity index 100% rename from yang/rfc6241-model-api/src/main/java/module-info.java rename to model/rfc6241-model-api/src/main/java/module-info.java diff --git a/yang/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/GetFilterElementAttributesEffectiveStatement.java b/model/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/GetFilterElementAttributesEffectiveStatement.java similarity index 100% rename from yang/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/GetFilterElementAttributesEffectiveStatement.java rename to model/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/GetFilterElementAttributesEffectiveStatement.java diff --git a/yang/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/GetFilterElementAttributesSchemaNode.java b/model/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/GetFilterElementAttributesSchemaNode.java similarity index 100% rename from yang/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/GetFilterElementAttributesSchemaNode.java rename to model/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/GetFilterElementAttributesSchemaNode.java diff --git a/yang/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/GetFilterElementAttributesStatement.java b/model/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/GetFilterElementAttributesStatement.java similarity index 100% rename from yang/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/GetFilterElementAttributesStatement.java rename to model/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/GetFilterElementAttributesStatement.java diff --git a/yang/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/NetconfConstants.java b/model/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/NetconfConstants.java similarity index 100% rename from yang/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/NetconfConstants.java rename to model/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/NetconfConstants.java diff --git a/yang/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/NetconfStatements.java b/model/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/NetconfStatements.java similarity index 100% rename from yang/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/NetconfStatements.java rename to model/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/NetconfStatements.java diff --git a/yang/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/package-info.java b/model/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/package-info.java similarity index 100% rename from yang/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/package-info.java rename to model/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/package-info.java diff --git a/yang/rfc6536-model-api/pom.xml b/model/rfc6536-model-api/pom.xml similarity index 100% rename from yang/rfc6536-model-api/pom.xml rename to model/rfc6536-model-api/pom.xml diff --git a/yang/rfc6536-model-api/src/main/java/module-info.java b/model/rfc6536-model-api/src/main/java/module-info.java similarity index 100% rename from yang/rfc6536-model-api/src/main/java/module-info.java rename to model/rfc6536-model-api/src/main/java/module-info.java diff --git a/yang/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyAllEffectiveStatement.java b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyAllEffectiveStatement.java similarity index 100% rename from yang/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyAllEffectiveStatement.java rename to model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyAllEffectiveStatement.java diff --git a/yang/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyAllSchemaNode.java b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyAllSchemaNode.java similarity index 100% rename from yang/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyAllSchemaNode.java rename to model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyAllSchemaNode.java diff --git a/yang/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyAllStatement.java b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyAllStatement.java similarity index 100% rename from yang/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyAllStatement.java rename to model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyAllStatement.java diff --git a/yang/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyWriteEffectiveStatement.java b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyWriteEffectiveStatement.java similarity index 100% rename from yang/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyWriteEffectiveStatement.java rename to model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyWriteEffectiveStatement.java diff --git a/yang/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyWriteSchemaNode.java b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyWriteSchemaNode.java similarity index 100% rename from yang/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyWriteSchemaNode.java rename to model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyWriteSchemaNode.java diff --git a/yang/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyWriteStatement.java b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyWriteStatement.java similarity index 100% rename from yang/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyWriteStatement.java rename to model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyWriteStatement.java diff --git a/yang/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/NACMConstants.java b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/NACMConstants.java similarity index 100% rename from yang/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/NACMConstants.java rename to model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/NACMConstants.java diff --git a/yang/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/NACMStatements.java b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/NACMStatements.java similarity index 100% rename from yang/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/NACMStatements.java rename to model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/NACMStatements.java diff --git a/yang/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/package-info.java b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/package-info.java similarity index 100% rename from yang/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/package-info.java rename to model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/package-info.java diff --git a/yang/rfc6643-model-api/pom.xml b/model/rfc6643-model-api/pom.xml similarity index 100% rename from yang/rfc6643-model-api/pom.xml rename to model/rfc6643-model-api/pom.xml diff --git a/yang/rfc6643-model-api/src/main/java/module-info.java b/model/rfc6643-model-api/src/main/java/module-info.java similarity index 100% rename from yang/rfc6643-model-api/src/main/java/module-info.java rename to model/rfc6643-model-api/src/main/java/module-info.java diff --git a/yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/AliasEffectiveStatement.java b/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/AliasEffectiveStatement.java similarity index 100% rename from yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/AliasEffectiveStatement.java rename to model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/AliasEffectiveStatement.java diff --git a/yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/AliasSchemaNode.java b/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/AliasSchemaNode.java similarity index 100% rename from yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/AliasSchemaNode.java rename to model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/AliasSchemaNode.java diff --git a/yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/AliasStatement.java b/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/AliasStatement.java similarity index 100% rename from yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/AliasStatement.java rename to model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/AliasStatement.java diff --git a/yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DefValEffectiveStatement.java b/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DefValEffectiveStatement.java similarity index 100% rename from yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DefValEffectiveStatement.java rename to model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DefValEffectiveStatement.java diff --git a/yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DefValSchemaNode.java b/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DefValSchemaNode.java similarity index 100% rename from yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DefValSchemaNode.java rename to model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DefValSchemaNode.java diff --git a/yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DefValStatement.java b/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DefValStatement.java similarity index 100% rename from yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DefValStatement.java rename to model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DefValStatement.java diff --git a/yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DisplayHintEffectiveStatement.java b/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DisplayHintEffectiveStatement.java similarity index 100% rename from yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DisplayHintEffectiveStatement.java rename to model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DisplayHintEffectiveStatement.java diff --git a/yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DisplayHintSchemaNode.java b/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DisplayHintSchemaNode.java similarity index 100% rename from yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DisplayHintSchemaNode.java rename to model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DisplayHintSchemaNode.java diff --git a/yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DisplayHintStatement.java b/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DisplayHintStatement.java similarity index 100% rename from yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DisplayHintStatement.java rename to model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/DisplayHintStatement.java diff --git a/yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/IetfYangSmiv2Constants.java b/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/IetfYangSmiv2Constants.java similarity index 100% rename from yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/IetfYangSmiv2Constants.java rename to model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/IetfYangSmiv2Constants.java diff --git a/yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/IetfYangSmiv2ExtensionsMapping.java b/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/IetfYangSmiv2ExtensionsMapping.java similarity index 100% rename from yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/IetfYangSmiv2ExtensionsMapping.java rename to model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/IetfYangSmiv2ExtensionsMapping.java diff --git a/yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/ImpliedEffectiveStatement.java b/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/ImpliedEffectiveStatement.java similarity index 100% rename from yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/ImpliedEffectiveStatement.java rename to model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/ImpliedEffectiveStatement.java diff --git a/yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/ImpliedSchemaNode.java b/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/ImpliedSchemaNode.java similarity index 100% rename from yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/ImpliedSchemaNode.java rename to model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/ImpliedSchemaNode.java diff --git a/yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/ImpliedStatement.java b/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/ImpliedStatement.java similarity index 100% rename from yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/ImpliedStatement.java rename to model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/ImpliedStatement.java diff --git a/yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/MaxAccess.java b/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/MaxAccess.java similarity index 100% rename from yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/MaxAccess.java rename to model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/MaxAccess.java diff --git a/yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/MaxAccessEffectiveStatement.java b/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/MaxAccessEffectiveStatement.java similarity index 100% rename from yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/MaxAccessEffectiveStatement.java rename to model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/MaxAccessEffectiveStatement.java diff --git a/yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/MaxAccessSchemaNode.java b/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/MaxAccessSchemaNode.java similarity index 100% rename from yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/MaxAccessSchemaNode.java rename to model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/MaxAccessSchemaNode.java diff --git a/yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/MaxAccessStatement.java b/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/MaxAccessStatement.java similarity index 100% rename from yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/MaxAccessStatement.java rename to model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/MaxAccessStatement.java diff --git a/yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/ObjectIdentifier.java b/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/ObjectIdentifier.java similarity index 100% rename from yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/ObjectIdentifier.java rename to model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/ObjectIdentifier.java diff --git a/yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/OidEffectiveStatement.java b/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/OidEffectiveStatement.java similarity index 100% rename from yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/OidEffectiveStatement.java rename to model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/OidEffectiveStatement.java diff --git a/yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/OidSchemaNode.java b/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/OidSchemaNode.java similarity index 100% rename from yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/OidSchemaNode.java rename to model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/OidSchemaNode.java diff --git a/yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/OidStatement.java b/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/OidStatement.java similarity index 100% rename from yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/OidStatement.java rename to model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/OidStatement.java diff --git a/yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/SubIdEffectiveStatement.java b/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/SubIdEffectiveStatement.java similarity index 100% rename from yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/SubIdEffectiveStatement.java rename to model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/SubIdEffectiveStatement.java diff --git a/yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/SubIdSchemaNode.java b/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/SubIdSchemaNode.java similarity index 100% rename from yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/SubIdSchemaNode.java rename to model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/SubIdSchemaNode.java diff --git a/yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/SubIdStatement.java b/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/SubIdStatement.java similarity index 100% rename from yang/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/SubIdStatement.java rename to model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/SubIdStatement.java diff --git a/yang/rfc7952-model-api/pom.xml b/model/rfc7952-model-api/pom.xml similarity index 100% rename from yang/rfc7952-model-api/pom.xml rename to model/rfc7952-model-api/pom.xml diff --git a/yang/rfc7952-model-api/src/main/java/module-info.java b/model/rfc7952-model-api/src/main/java/module-info.java similarity index 100% rename from yang/rfc7952-model-api/src/main/java/module-info.java rename to model/rfc7952-model-api/src/main/java/module-info.java diff --git a/yang/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/AnnotationEffectiveStatement.java b/model/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/AnnotationEffectiveStatement.java similarity index 100% rename from yang/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/AnnotationEffectiveStatement.java rename to model/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/AnnotationEffectiveStatement.java diff --git a/yang/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/AnnotationSchemaNode.java b/model/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/AnnotationSchemaNode.java similarity index 100% rename from yang/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/AnnotationSchemaNode.java rename to model/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/AnnotationSchemaNode.java diff --git a/yang/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/AnnotationSchemaNodeAware.java b/model/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/AnnotationSchemaNodeAware.java similarity index 100% rename from yang/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/AnnotationSchemaNodeAware.java rename to model/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/AnnotationSchemaNodeAware.java diff --git a/yang/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/AnnotationSchemaNodeAwareSchemaContext.java b/model/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/AnnotationSchemaNodeAwareSchemaContext.java similarity index 100% rename from yang/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/AnnotationSchemaNodeAwareSchemaContext.java rename to model/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/AnnotationSchemaNodeAwareSchemaContext.java diff --git a/yang/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/AnnotationStatement.java b/model/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/AnnotationStatement.java similarity index 100% rename from yang/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/AnnotationStatement.java rename to model/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/AnnotationStatement.java diff --git a/yang/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/MetadataConstants.java b/model/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/MetadataConstants.java similarity index 100% rename from yang/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/MetadataConstants.java rename to model/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/MetadataConstants.java diff --git a/yang/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/MetadataStatements.java b/model/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/MetadataStatements.java similarity index 100% rename from yang/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/MetadataStatements.java rename to model/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/MetadataStatements.java diff --git a/yang/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/package-info.java b/model/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/package-info.java similarity index 100% rename from yang/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/package-info.java rename to model/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/package-info.java diff --git a/yang/rfc8040-model-api/pom.xml b/model/rfc8040-model-api/pom.xml similarity index 100% rename from yang/rfc8040-model-api/pom.xml rename to model/rfc8040-model-api/pom.xml diff --git a/yang/rfc8040-model-api/src/main/java/module-info.java b/model/rfc8040-model-api/src/main/java/module-info.java similarity index 100% rename from yang/rfc8040-model-api/src/main/java/module-info.java rename to model/rfc8040-model-api/src/main/java/module-info.java diff --git a/yang/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataConstants.java b/model/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataConstants.java similarity index 100% rename from yang/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataConstants.java rename to model/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataConstants.java diff --git a/yang/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataEffectiveStatement.java b/model/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataEffectiveStatement.java similarity index 100% rename from yang/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataEffectiveStatement.java rename to model/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataEffectiveStatement.java diff --git a/yang/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataSchemaNode.java b/model/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataSchemaNode.java similarity index 100% rename from yang/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataSchemaNode.java rename to model/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataSchemaNode.java diff --git a/yang/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataStatement.java b/model/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataStatement.java similarity index 100% rename from yang/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataStatement.java rename to model/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataStatement.java diff --git a/yang/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataStatements.java b/model/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataStatements.java similarity index 100% rename from yang/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataStatements.java rename to model/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataStatements.java diff --git a/yang/rfc8528-model-api/pom.xml b/model/rfc8528-model-api/pom.xml similarity index 100% rename from yang/rfc8528-model-api/pom.xml rename to model/rfc8528-model-api/pom.xml diff --git a/yang/rfc8528-model-api/src/main/java/module-info.java b/model/rfc8528-model-api/src/main/java/module-info.java similarity index 100% rename from yang/rfc8528-model-api/src/main/java/module-info.java rename to model/rfc8528-model-api/src/main/java/module-info.java diff --git a/yang/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/MountPointEffectiveStatement.java b/model/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/MountPointEffectiveStatement.java similarity index 100% rename from yang/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/MountPointEffectiveStatement.java rename to model/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/MountPointEffectiveStatement.java diff --git a/yang/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/MountPointSchemaNode.java b/model/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/MountPointSchemaNode.java similarity index 100% rename from yang/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/MountPointSchemaNode.java rename to model/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/MountPointSchemaNode.java diff --git a/yang/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/MountPointStatement.java b/model/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/MountPointStatement.java similarity index 100% rename from yang/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/MountPointStatement.java rename to model/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/MountPointStatement.java diff --git a/yang/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/SchemaMountConstants.java b/model/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/SchemaMountConstants.java similarity index 100% rename from yang/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/SchemaMountConstants.java rename to model/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/SchemaMountConstants.java diff --git a/yang/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/SchemaMountStatements.java b/model/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/SchemaMountStatements.java similarity index 100% rename from yang/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/SchemaMountStatements.java rename to model/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/SchemaMountStatements.java diff --git a/yang/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/package-info.java b/model/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/package-info.java similarity index 100% rename from yang/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/package-info.java rename to model/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/package-info.java diff --git a/yang/yang-model-api/pom.xml b/model/yang-model-api/pom.xml similarity index 100% rename from yang/yang-model-api/pom.xml rename to model/yang-model-api/pom.xml diff --git a/yang/yang-model-api/src/main/java/module-info.java b/model/yang-model-api/src/main/java/module-info.java similarity index 100% rename from yang/yang-model-api/src/main/java/module-info.java rename to model/yang-model-api/src/main/java/module-info.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ActionDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ActionDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ActionDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ActionDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ActionNodeContainer.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ActionNodeContainer.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ActionNodeContainer.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ActionNodeContainer.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AddedByUsesAware.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AddedByUsesAware.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AddedByUsesAware.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AddedByUsesAware.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnydataSchemaNode.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnydataSchemaNode.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnydataSchemaNode.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnydataSchemaNode.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnyxmlSchemaNode.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnyxmlSchemaNode.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnyxmlSchemaNode.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnyxmlSchemaNode.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationSchemaNode.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationSchemaNode.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationSchemaNode.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationSchemaNode.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationTarget.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationTarget.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationTarget.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationTarget.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/CaseSchemaNode.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/CaseSchemaNode.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/CaseSchemaNode.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/CaseSchemaNode.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceSchemaNode.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceSchemaNode.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceSchemaNode.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceSchemaNode.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ConstraintMetaDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ConstraintMetaDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ConstraintMetaDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ConstraintMetaDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ContainerLike.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ContainerLike.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ContainerLike.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ContainerLike.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ContainerSchemaNode.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ContainerSchemaNode.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ContainerSchemaNode.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ContainerSchemaNode.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/CopyableNode.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/CopyableNode.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/CopyableNode.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/CopyableNode.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataSchemaNode.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataSchemaNode.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataSchemaNode.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataSchemaNode.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DerivableSchemaNode.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DerivableSchemaNode.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DerivableSchemaNode.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DerivableSchemaNode.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DeviateDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DeviateDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DeviateDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DeviateDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DeviateKind.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DeviateKind.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DeviateKind.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DeviateKind.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Deviation.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Deviation.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Deviation.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Deviation.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DocumentedNode.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DocumentedNode.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DocumentedNode.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DocumentedNode.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveModelContext.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveModelContext.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveModelContext.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveModelContext.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveModelContextListener.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveModelContextListener.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveModelContextListener.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveModelContextListener.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveModelContextProvider.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveModelContextProvider.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveModelContextProvider.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveModelContextProvider.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveStatementEquivalent.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveStatementEquivalent.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveStatementEquivalent.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveStatementEquivalent.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveStatementInference.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveStatementInference.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveStatementInference.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/EffectiveStatementInference.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ElementCountConstraint.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ElementCountConstraint.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ElementCountConstraint.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ElementCountConstraint.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ElementCountConstraintAware.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ElementCountConstraintAware.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ElementCountConstraintAware.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ElementCountConstraintAware.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ExtensionDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ExtensionDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ExtensionDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ExtensionDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/FeatureDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/FeatureDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/FeatureDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/FeatureDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/GroupingDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/GroupingDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/GroupingDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/GroupingDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/HelperMethods.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/HelperMethods.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/HelperMethods.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/HelperMethods.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/IdentitySchemaNode.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/IdentitySchemaNode.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/IdentitySchemaNode.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/IdentitySchemaNode.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/InputSchemaNode.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/InputSchemaNode.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/InputSchemaNode.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/InputSchemaNode.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafListSchemaNode.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafListSchemaNode.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafListSchemaNode.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafListSchemaNode.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafSchemaNode.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafSchemaNode.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafSchemaNode.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafSchemaNode.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ListSchemaNode.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ListSchemaNode.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ListSchemaNode.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ListSchemaNode.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MandatoryAware.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MandatoryAware.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MandatoryAware.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MandatoryAware.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Module.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Module.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Module.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Module.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleLike.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleLike.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleLike.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleLike.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MustConstraintAware.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MustConstraintAware.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MustConstraintAware.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MustConstraintAware.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MustDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MustDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MustDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MustDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NotificationDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NotificationDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NotificationDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NotificationDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NotificationNodeContainer.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NotificationNodeContainer.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NotificationNodeContainer.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NotificationNodeContainer.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/OperationDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/OperationDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/OperationDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/OperationDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/OutputSchemaNode.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/OutputSchemaNode.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/OutputSchemaNode.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/OutputSchemaNode.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/PathExpression.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/PathExpression.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/PathExpression.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/PathExpression.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/PathFromRoot.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/PathFromRoot.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/PathFromRoot.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/PathFromRoot.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/QNameModuleAware.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/QNameModuleAware.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/QNameModuleAware.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/QNameModuleAware.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RpcDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RpcDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RpcDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RpcDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContext.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContext.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContext.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContext.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContextListener.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContextListener.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContextListener.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContextListener.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaNode.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaNode.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaNode.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaNode.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaNodeDefaults.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaNodeDefaults.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaNodeDefaults.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaNodeDefaults.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaTreeInference.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaTreeInference.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaTreeInference.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaTreeInference.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Status.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Status.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Status.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Status.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Submodule.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Submodule.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Submodule.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Submodule.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/TypeAware.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/TypeAware.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/TypeAware.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/TypeAware.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/TypeDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/TypeDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/TypeDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/TypeDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/TypedDataSchemaNode.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/TypedDataSchemaNode.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/TypedDataSchemaNode.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/TypedDataSchemaNode.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UnknownSchemaNode.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UnknownSchemaNode.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UnknownSchemaNode.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UnknownSchemaNode.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UsesNode.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UsesNode.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UsesNode.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UsesNode.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/WhenConditionAware.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/WhenConditionAware.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/WhenConditionAware.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/WhenConditionAware.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/YangStmtMapping.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/YangStmtMapping.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/YangStmtMapping.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/YangStmtMapping.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/AbstractStatementDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/AbstractStatementDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/AbstractStatementDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/AbstractStatementDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/ArgumentDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/ArgumentDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/ArgumentDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/ArgumentDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DeclarationInFile.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DeclarationInFile.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DeclarationInFile.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DeclarationInFile.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DeclarationInText.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DeclarationInText.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DeclarationInText.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DeclarationInText.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DeclarationReference.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DeclarationReference.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DeclarationReference.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DeclarationReference.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DefaultStatementDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DefaultStatementDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DefaultStatementDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/DefaultStatementDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/EffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/EffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/EffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/EffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/IdentifierNamespace.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/IdentifierNamespace.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/IdentifierNamespace.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/IdentifierNamespace.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/ModelStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/ModelStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/ModelStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/ModelStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/StatementDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/StatementDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/StatementDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/StatementDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/StatementOrigin.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/StatementOrigin.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/StatementOrigin.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/StatementOrigin.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/package-info.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/package-info.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/package-info.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/package-info.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatementAwareDeclaredStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatementAwareDeclaredStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatementAwareDeclaredStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatementAwareDeclaredStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnydataEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnydataEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnydataEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnydataEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnydataStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnydataStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnydataStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnydataStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnyxmlEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnyxmlEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnyxmlEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnyxmlEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnyxmlStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnyxmlStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnyxmlStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnyxmlStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ArgumentEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ArgumentEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ArgumentEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ArgumentEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ArgumentStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ArgumentStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ArgumentStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ArgumentStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AugmentEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AugmentEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AugmentEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AugmentEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AugmentStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AugmentStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AugmentStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AugmentStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BaseEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BaseEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BaseEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BaseEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BaseStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BaseStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BaseStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BaseStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BelongsToEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BelongsToEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BelongsToEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BelongsToEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BelongsToStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BelongsToStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BelongsToStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BelongsToStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BitEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BitEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BitEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BitEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BitStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BitStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BitStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BitStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BodyDeclaredStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BodyDeclaredStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BodyDeclaredStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BodyDeclaredStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/CaseEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/CaseEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/CaseEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/CaseEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/CaseEffectiveStatementNamespace.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/CaseEffectiveStatementNamespace.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/CaseEffectiveStatementNamespace.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/CaseEffectiveStatementNamespace.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/CaseStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/CaseStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/CaseStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/CaseStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ChoiceEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ChoiceEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ChoiceEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ChoiceEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ChoiceStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ChoiceStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ChoiceStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ChoiceStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigStatementAwareDeclaredStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigStatementAwareDeclaredStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigStatementAwareDeclaredStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigStatementAwareDeclaredStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConstrainedDocumentedDeclaredStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConstrainedDocumentedDeclaredStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConstrainedDocumentedDeclaredStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConstrainedDocumentedDeclaredStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContactEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContactEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContactEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContactEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContactStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContactStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContactStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContactStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContainerEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContainerEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContainerEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContainerEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContainerStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContainerStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContainerStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContainerStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataDefinitionAwareDeclaredStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataDefinitionAwareDeclaredStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataDefinitionAwareDeclaredStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataDefinitionAwareDeclaredStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataDefinitionStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataDefinitionStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataDefinitionStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataDefinitionStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataTreeAwareEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataTreeAwareEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataTreeAwareEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataTreeAwareEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataTreeEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataTreeEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataTreeEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataTreeEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DefaultEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DefaultEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DefaultEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DefaultEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DefaultMethodHelpers.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DefaultMethodHelpers.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DefaultMethodHelpers.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DefaultMethodHelpers.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DefaultStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DefaultStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DefaultStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DefaultStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DefaultStatementAwareDeclaredStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DefaultStatementAwareDeclaredStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DefaultStatementAwareDeclaredStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DefaultStatementAwareDeclaredStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DescriptionEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DescriptionEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DescriptionEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DescriptionEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DescriptionStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DescriptionStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DescriptionStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DescriptionStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviateEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviateEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviateEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviateEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviateStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviateStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviateStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviateStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviationEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviationEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviationEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviationEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviationStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviationStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviationStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviationStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DocumentedDeclaredStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DocumentedDeclaredStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DocumentedDeclaredStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DocumentedDeclaredStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/EffectiveStatementNamespace.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/EffectiveStatementNamespace.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/EffectiveStatementNamespace.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/EffectiveStatementNamespace.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/EnumEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/EnumEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/EnumEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/EnumEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/EnumStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/EnumStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/EnumStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/EnumStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorAppTagEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorAppTagEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorAppTagEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorAppTagEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorAppTagStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorAppTagStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorAppTagStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorAppTagStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorMessageEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorMessageEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorMessageEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorMessageEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorMessageStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorMessageStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorMessageStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorMessageStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ExtensionEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ExtensionEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ExtensionEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ExtensionEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ExtensionEffectiveStatementNamespace.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ExtensionEffectiveStatementNamespace.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ExtensionEffectiveStatementNamespace.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ExtensionEffectiveStatementNamespace.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ExtensionStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ExtensionStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ExtensionStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ExtensionStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FeatureEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FeatureEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FeatureEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FeatureEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FeatureEffectiveStatementNamespace.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FeatureEffectiveStatementNamespace.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FeatureEffectiveStatementNamespace.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FeatureEffectiveStatementNamespace.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FeatureStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FeatureStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FeatureStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FeatureStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FractionDigitsEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FractionDigitsEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FractionDigitsEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FractionDigitsEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FractionDigitsStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FractionDigitsStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FractionDigitsStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FractionDigitsStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/GroupingEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/GroupingEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/GroupingEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/GroupingEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/GroupingStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/GroupingStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/GroupingStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/GroupingStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IdentityEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IdentityEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IdentityEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IdentityEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IdentityEffectiveStatementNamespace.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IdentityEffectiveStatementNamespace.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IdentityEffectiveStatementNamespace.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IdentityEffectiveStatementNamespace.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IdentityStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IdentityStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IdentityStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IdentityStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureAwareDeclaredStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureAwareDeclaredStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureAwareDeclaredStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureAwareDeclaredStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureExpr.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureExpr.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureExpr.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureExpr.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ImportEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ImportEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ImportEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ImportEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ImportStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ImportStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ImportStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ImportStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IncludeEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IncludeEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IncludeEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IncludeEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IncludeStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IncludeStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IncludeStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IncludeStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/InputEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/InputEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/InputEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/InputEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/InputStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/InputStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/InputStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/InputStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/KeyEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/KeyEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/KeyEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/KeyEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/KeyStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/KeyStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/KeyStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/KeyStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafListEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafListEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafListEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafListEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafListStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafListStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafListStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafListStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LengthEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LengthEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LengthEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LengthEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LengthStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LengthStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LengthStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LengthStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LinkageDeclaredStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LinkageDeclaredStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LinkageDeclaredStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LinkageDeclaredStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ListEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ListEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ListEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ListEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ListStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ListStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ListStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ListStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MandatoryEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MandatoryEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MandatoryEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MandatoryEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MandatoryStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MandatoryStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MandatoryStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MandatoryStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MandatoryStatementAwareDeclaredStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MandatoryStatementAwareDeclaredStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MandatoryStatementAwareDeclaredStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MandatoryStatementAwareDeclaredStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MaxElementsEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MaxElementsEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MaxElementsEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MaxElementsEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MaxElementsStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MaxElementsStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MaxElementsStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MaxElementsStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MetaDeclaredStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MetaDeclaredStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MetaDeclaredStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MetaDeclaredStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MinElementsEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MinElementsEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MinElementsEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MinElementsEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MinElementsStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MinElementsStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MinElementsStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MinElementsStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModifierEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModifierEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModifierEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModifierEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModifierStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModifierStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModifierStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModifierStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleHeaderGroup.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleHeaderGroup.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleHeaderGroup.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleHeaderGroup.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MultipleElementsDeclaredStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MultipleElementsDeclaredStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MultipleElementsDeclaredStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MultipleElementsDeclaredStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MustEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MustEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MustEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MustEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MustStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MustStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MustStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MustStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MustStatementAwareDeclaredStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MustStatementAwareDeclaredStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MustStatementAwareDeclaredStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MustStatementAwareDeclaredStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NamespaceEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NamespaceEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NamespaceEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NamespaceEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NamespaceStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NamespaceStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NamespaceStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NamespaceStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NamespacedEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NamespacedEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NamespacedEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NamespacedEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NotificationEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NotificationEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NotificationEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NotificationEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NotificationStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NotificationStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NotificationStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NotificationStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NotificationStatementAwareDeclaredStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NotificationStatementAwareDeclaredStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NotificationStatementAwareDeclaredStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NotificationStatementAwareDeclaredStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OperationDeclaredStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OperationDeclaredStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OperationDeclaredStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OperationDeclaredStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrderedByEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrderedByEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrderedByEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrderedByEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrderedByStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrderedByStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrderedByStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrderedByStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrganizationEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrganizationEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrganizationEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrganizationEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrganizationStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrganizationStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrganizationStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrganizationStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OutputEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OutputEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OutputEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OutputEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OutputStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OutputStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OutputStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OutputStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PathEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PathEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PathEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PathEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PathStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PathStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PathStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PathStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PatternEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PatternEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PatternEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PatternEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PatternExpression.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PatternExpression.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PatternExpression.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PatternExpression.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PatternStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PatternStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PatternStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PatternStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PositionEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PositionEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PositionEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PositionEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PositionStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PositionStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PositionStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PositionStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PrefixEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PrefixEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PrefixEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PrefixEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PrefixStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PrefixStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PrefixStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PrefixStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PresenceEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PresenceEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PresenceEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PresenceEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PresenceStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PresenceStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PresenceStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PresenceStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RangeEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RangeEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RangeEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RangeEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RangeStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RangeStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RangeStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RangeStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ReferenceEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ReferenceEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ReferenceEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ReferenceEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ReferenceStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ReferenceStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ReferenceStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ReferenceStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RefineEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RefineEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RefineEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RefineEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RefineStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RefineStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RefineStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RefineStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RequireInstanceEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RequireInstanceEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RequireInstanceEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RequireInstanceEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RequireInstanceStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RequireInstanceStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RequireInstanceStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RequireInstanceStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionAwareDeclaredStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionAwareDeclaredStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionAwareDeclaredStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionAwareDeclaredStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionDateEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionDateEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionDateEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionDateEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionDateStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionDateStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionDateStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionDateStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/Rfc6020AbnfRule.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/Rfc6020AbnfRule.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/Rfc6020AbnfRule.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/Rfc6020AbnfRule.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RpcEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RpcEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RpcEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RpcEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RpcStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RpcStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RpcStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RpcStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaNodeIdentifier.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaNodeIdentifier.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaNodeIdentifier.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaNodeIdentifier.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeAwareEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeAwareEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeAwareEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeAwareEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeRoot.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeRoot.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeRoot.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeRoot.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/StatusEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/StatusEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/StatusEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/StatusEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/StatusStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/StatusStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/StatusStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/StatusStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SubmoduleEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SubmoduleEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SubmoduleEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SubmoduleEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SubmoduleStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SubmoduleStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SubmoduleStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SubmoduleStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeAwareDeclaredStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeAwareDeclaredStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeAwareDeclaredStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeAwareDeclaredStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeDefinitionAware.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeDefinitionAware.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeDefinitionAware.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeDefinitionAware.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypedefEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypedefEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypedefEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypedefEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypedefNamespace.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypedefNamespace.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypedefNamespace.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypedefNamespace.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypedefStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypedefStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypedefStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypedefStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UniqueEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UniqueEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UniqueEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UniqueEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UniqueStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UniqueStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UniqueStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UniqueStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnitsEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnitsEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnitsEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnitsEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnitsStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnitsStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnitsStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnitsStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnknownEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnknownEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnknownEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnknownEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnknownStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnknownStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnknownStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnknownStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnrecognizedStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnrecognizedStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnrecognizedStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnrecognizedStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnresolvedNumber.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnresolvedNumber.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnresolvedNumber.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnresolvedNumber.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UsesEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UsesEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UsesEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UsesEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UsesStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UsesStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UsesStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UsesStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ValueEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ValueEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ValueEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ValueEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ValueRange.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ValueRange.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ValueRange.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ValueRange.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ValueStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ValueStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ValueStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ValueStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/WhenEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/WhenEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/WhenEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/WhenEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/WhenStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/WhenStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/WhenStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/WhenStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/WhenStatementAwareDeclaredStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/WhenStatementAwareDeclaredStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/WhenStatementAwareDeclaredStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/WhenStatementAwareDeclaredStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YangVersionEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YangVersionEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YangVersionEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YangVersionEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YangVersionStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YangVersionStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YangVersionStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YangVersionStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YinElementEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YinElementEffectiveStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YinElementEffectiveStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YinElementEffectiveStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YinElementStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YinElementStatement.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YinElementStatement.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YinElementStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/compat/ActionNodeContainerCompat.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/compat/ActionNodeContainerCompat.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/compat/ActionNodeContainerCompat.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/compat/ActionNodeContainerCompat.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/compat/NotificationNodeContainerCompat.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/compat/NotificationNodeContainerCompat.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/compat/NotificationNodeContainerCompat.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/compat/NotificationNodeContainerCompat.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/compat/package-info.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/compat/package-info.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/compat/package-info.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/compat/package-info.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BinaryTypeDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BinaryTypeDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BinaryTypeDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BinaryTypeDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BooleanTypeDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BooleanTypeDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BooleanTypeDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BooleanTypeDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/DecimalTypeDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/DecimalTypeDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/DecimalTypeDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/DecimalTypeDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EmptyTypeDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EmptyTypeDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EmptyTypeDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EmptyTypeDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EnumTypeDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EnumTypeDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EnumTypeDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EnumTypeDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityTypeDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityTypeDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityTypeDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityTypeDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/InstanceIdentifierTypeDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/InstanceIdentifierTypeDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/InstanceIdentifierTypeDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/InstanceIdentifierTypeDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int16TypeDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int16TypeDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int16TypeDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int16TypeDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int32TypeDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int32TypeDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int32TypeDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int32TypeDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int64TypeDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int64TypeDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int64TypeDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int64TypeDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int8TypeDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int8TypeDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int8TypeDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Int8TypeDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LeafrefTypeDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LeafrefTypeDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LeafrefTypeDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LeafrefTypeDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LengthConstraint.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LengthConstraint.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LengthConstraint.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LengthConstraint.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LengthRestrictedTypeDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LengthRestrictedTypeDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LengthRestrictedTypeDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LengthRestrictedTypeDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/ModifierKind.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/ModifierKind.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/ModifierKind.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/ModifierKind.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/PatternConstraint.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/PatternConstraint.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/PatternConstraint.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/PatternConstraint.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/RangeConstraint.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/RangeConstraint.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/RangeConstraint.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/RangeConstraint.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/RangeRestrictedTypeDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/RangeRestrictedTypeDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/RangeRestrictedTypeDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/RangeRestrictedTypeDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/RequireInstanceRestrictedTypeDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/RequireInstanceRestrictedTypeDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/RequireInstanceRestrictedTypeDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/RequireInstanceRestrictedTypeDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/StringTypeDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/StringTypeDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/StringTypeDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/StringTypeDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/TypeDefinitions.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/TypeDefinitions.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/TypeDefinitions.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/TypeDefinitions.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint16TypeDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint16TypeDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint16TypeDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint16TypeDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint32TypeDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint32TypeDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint32TypeDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint32TypeDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint64TypeDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint64TypeDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint64TypeDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint64TypeDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint8TypeDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint8TypeDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint8TypeDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/Uint8TypeDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnionTypeDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnionTypeDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnionTypeDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnionTypeDefinition.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnknownTypeDefinition.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnknownTypeDefinition.java similarity index 100% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnknownTypeDefinition.java rename to model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnknownTypeDefinition.java diff --git a/yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatement1.java b/model/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatement1.java similarity index 100% rename from yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatement1.java rename to model/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatement1.java diff --git a/yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatement2.java b/model/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatement2.java similarity index 100% rename from yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatement2.java rename to model/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatement2.java diff --git a/yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatementTest.java b/model/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatementTest.java similarity index 100% rename from yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatementTest.java rename to model/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatementTest.java diff --git a/yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/EffectiveStatement1.java b/model/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/EffectiveStatement1.java similarity index 100% rename from yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/EffectiveStatement1.java rename to model/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/EffectiveStatement1.java diff --git a/yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/EffectiveStatementTest.java b/model/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/EffectiveStatementTest.java similarity index 100% rename from yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/EffectiveStatementTest.java rename to model/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/EffectiveStatementTest.java diff --git a/yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/Effectivestatement2.java b/model/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/Effectivestatement2.java similarity index 100% rename from yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/Effectivestatement2.java rename to model/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/Effectivestatement2.java diff --git a/yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatementAwareDeclaredStatementTest.java b/model/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatementAwareDeclaredStatementTest.java similarity index 100% rename from yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatementAwareDeclaredStatementTest.java rename to model/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatementAwareDeclaredStatementTest.java diff --git a/yang/yang-model-export/pom.xml b/model/yang-model-export/pom.xml similarity index 100% rename from yang/yang-model-export/pom.xml rename to model/yang-model-export/pom.xml diff --git a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/DeclaredStatementFormatter.java b/model/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/DeclaredStatementFormatter.java similarity index 100% rename from yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/DeclaredStatementFormatter.java rename to model/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/DeclaredStatementFormatter.java diff --git a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/ModuleNamespaceContext.java b/model/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/ModuleNamespaceContext.java similarity index 100% rename from yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/ModuleNamespaceContext.java rename to model/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/ModuleNamespaceContext.java diff --git a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/StatementPrefixResolver.java b/model/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/StatementPrefixResolver.java similarity index 100% rename from yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/StatementPrefixResolver.java rename to model/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/StatementPrefixResolver.java diff --git a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YangTextSnippet.java b/model/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YangTextSnippet.java similarity index 100% rename from yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YangTextSnippet.java rename to model/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YangTextSnippet.java diff --git a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YangTextSnippetIterator.java b/model/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YangTextSnippetIterator.java similarity index 100% rename from yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YangTextSnippetIterator.java rename to model/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YangTextSnippetIterator.java diff --git a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinExportUtils.java b/model/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinExportUtils.java similarity index 100% rename from yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinExportUtils.java rename to model/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinExportUtils.java diff --git a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinXMLEventReader.java b/model/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinXMLEventReader.java similarity index 100% rename from yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinXMLEventReader.java rename to model/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinXMLEventReader.java diff --git a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinXMLEventReaderFactory.java b/model/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinXMLEventReaderFactory.java similarity index 100% rename from yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinXMLEventReaderFactory.java rename to model/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinXMLEventReaderFactory.java diff --git a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/AbstractYinExportTest.java b/model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/AbstractYinExportTest.java similarity index 100% rename from yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/AbstractYinExportTest.java rename to model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/AbstractYinExportTest.java diff --git a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug2444Test.java b/model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug2444Test.java similarity index 100% rename from yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug2444Test.java rename to model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug2444Test.java diff --git a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug4504Test.java b/model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug4504Test.java similarity index 100% rename from yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug4504Test.java rename to model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug4504Test.java diff --git a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug5531Test.java b/model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug5531Test.java similarity index 100% rename from yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug5531Test.java rename to model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug5531Test.java diff --git a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug6856Test.java b/model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug6856Test.java similarity index 100% rename from yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug6856Test.java rename to model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/Bug6856Test.java diff --git a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/SchemaContextEmitterTest.java b/model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/SchemaContextEmitterTest.java similarity index 100% rename from yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/SchemaContextEmitterTest.java rename to model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/SchemaContextEmitterTest.java diff --git a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/SimpleModuleTest.java b/model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/SimpleModuleTest.java similarity index 100% rename from yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/SimpleModuleTest.java rename to model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/SimpleModuleTest.java diff --git a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/YangTextSnippetTest.java b/model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/YangTextSnippetTest.java similarity index 100% rename from yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/YangTextSnippetTest.java rename to model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/YangTextSnippetTest.java diff --git a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/YinExportTestUtils.java b/model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/YinExportTestUtils.java similarity index 100% rename from yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/YinExportTestUtils.java rename to model/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/YinExportTestUtils.java diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yang/action.yang b/model/yang-model-export/src/test/resources/bugs/bug2444/yang/action.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yang/action.yang rename to model/yang-model-export/src/test/resources/bugs/bug2444/yang/action.yang diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yang/anydata.yang b/model/yang-model-export/src/test/resources/bugs/bug2444/yang/anydata.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yang/anydata.yang rename to model/yang-model-export/src/test/resources/bugs/bug2444/yang/anydata.yang diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yang/binary-spec.yang b/model/yang-model-export/src/test/resources/bugs/bug2444/yang/binary-spec.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yang/binary-spec.yang rename to model/yang-model-export/src/test/resources/bugs/bug2444/yang/binary-spec.yang diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yang/default.yang b/model/yang-model-export/src/test/resources/bugs/bug2444/yang/default.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yang/default.yang rename to model/yang-model-export/src/test/resources/bugs/bug2444/yang/default.yang diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yang/deviation-target.yang b/model/yang-model-export/src/test/resources/bugs/bug2444/yang/deviation-target.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yang/deviation-target.yang rename to model/yang-model-export/src/test/resources/bugs/bug2444/yang/deviation-target.yang diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yang/deviation.yang b/model/yang-model-export/src/test/resources/bugs/bug2444/yang/deviation.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yang/deviation.yang rename to model/yang-model-export/src/test/resources/bugs/bug2444/yang/deviation.yang diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yang/identities.yang b/model/yang-model-export/src/test/resources/bugs/bug2444/yang/identities.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yang/identities.yang rename to model/yang-model-export/src/test/resources/bugs/bug2444/yang/identities.yang diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yang/import-yang1.yang b/model/yang-model-export/src/test/resources/bugs/bug2444/yang/import-yang1.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yang/import-yang1.yang rename to model/yang-model-export/src/test/resources/bugs/bug2444/yang/import-yang1.yang diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yang/import.yang b/model/yang-model-export/src/test/resources/bugs/bug2444/yang/import.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yang/import.yang rename to model/yang-model-export/src/test/resources/bugs/bug2444/yang/import.yang diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yang/include.yang b/model/yang-model-export/src/test/resources/bugs/bug2444/yang/include.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yang/include.yang rename to model/yang-model-export/src/test/resources/bugs/bug2444/yang/include.yang diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yang/leafref-yang1.yang b/model/yang-model-export/src/test/resources/bugs/bug2444/yang/leafref-yang1.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yang/leafref-yang1.yang rename to model/yang-model-export/src/test/resources/bugs/bug2444/yang/leafref-yang1.yang diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yang/leafref.yang b/model/yang-model-export/src/test/resources/bugs/bug2444/yang/leafref.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yang/leafref.yang rename to model/yang-model-export/src/test/resources/bugs/bug2444/yang/leafref.yang diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yang/modifier-yang1.yang b/model/yang-model-export/src/test/resources/bugs/bug2444/yang/modifier-yang1.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yang/modifier-yang1.yang rename to model/yang-model-export/src/test/resources/bugs/bug2444/yang/modifier-yang1.yang diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yang/modifier.yang b/model/yang-model-export/src/test/resources/bugs/bug2444/yang/modifier.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yang/modifier.yang rename to model/yang-model-export/src/test/resources/bugs/bug2444/yang/modifier.yang diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yang/must-yang1.yang b/model/yang-model-export/src/test/resources/bugs/bug2444/yang/must-yang1.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yang/must-yang1.yang rename to model/yang-model-export/src/test/resources/bugs/bug2444/yang/must-yang1.yang diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yang/must.yang b/model/yang-model-export/src/test/resources/bugs/bug2444/yang/must.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yang/must.yang rename to model/yang-model-export/src/test/resources/bugs/bug2444/yang/must.yang diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yang/notification.yang b/model/yang-model-export/src/test/resources/bugs/bug2444/yang/notification.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yang/notification.yang rename to model/yang-model-export/src/test/resources/bugs/bug2444/yang/notification.yang diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yang/submodule.yang b/model/yang-model-export/src/test/resources/bugs/bug2444/yang/submodule.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yang/submodule.yang rename to model/yang-model-export/src/test/resources/bugs/bug2444/yang/submodule.yang diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yang/unique.yang b/model/yang-model-export/src/test/resources/bugs/bug2444/yang/unique.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yang/unique.yang rename to model/yang-model-export/src/test/resources/bugs/bug2444/yang/unique.yang diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yin-effective-emitter/notification.yin b/model/yang-model-export/src/test/resources/bugs/bug2444/yin-effective-emitter/notification.yin similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yin-effective-emitter/notification.yin rename to model/yang-model-export/src/test/resources/bugs/bug2444/yin-effective-emitter/notification.yin diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yin/action.yin b/model/yang-model-export/src/test/resources/bugs/bug2444/yin/action.yin similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yin/action.yin rename to model/yang-model-export/src/test/resources/bugs/bug2444/yin/action.yin diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yin/anydata.yin b/model/yang-model-export/src/test/resources/bugs/bug2444/yin/anydata.yin similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yin/anydata.yin rename to model/yang-model-export/src/test/resources/bugs/bug2444/yin/anydata.yin diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yin/binary-spec.yin b/model/yang-model-export/src/test/resources/bugs/bug2444/yin/binary-spec.yin similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yin/binary-spec.yin rename to model/yang-model-export/src/test/resources/bugs/bug2444/yin/binary-spec.yin diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yin/default.yin b/model/yang-model-export/src/test/resources/bugs/bug2444/yin/default.yin similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yin/default.yin rename to model/yang-model-export/src/test/resources/bugs/bug2444/yin/default.yin diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yin/deviation-target@2017-01-20.yin b/model/yang-model-export/src/test/resources/bugs/bug2444/yin/deviation-target@2017-01-20.yin similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yin/deviation-target@2017-01-20.yin rename to model/yang-model-export/src/test/resources/bugs/bug2444/yin/deviation-target@2017-01-20.yin diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yin/deviation@2017-01-20.yin b/model/yang-model-export/src/test/resources/bugs/bug2444/yin/deviation@2017-01-20.yin similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yin/deviation@2017-01-20.yin rename to model/yang-model-export/src/test/resources/bugs/bug2444/yin/deviation@2017-01-20.yin diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yin/identities.yin b/model/yang-model-export/src/test/resources/bugs/bug2444/yin/identities.yin similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yin/identities.yin rename to model/yang-model-export/src/test/resources/bugs/bug2444/yin/identities.yin diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yin/import-yang1@1970-01-01.yin b/model/yang-model-export/src/test/resources/bugs/bug2444/yin/import-yang1@1970-01-01.yin similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yin/import-yang1@1970-01-01.yin rename to model/yang-model-export/src/test/resources/bugs/bug2444/yin/import-yang1@1970-01-01.yin diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yin/import.yin b/model/yang-model-export/src/test/resources/bugs/bug2444/yin/import.yin similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yin/import.yin rename to model/yang-model-export/src/test/resources/bugs/bug2444/yin/import.yin diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yin/include@2017-06-26.yin b/model/yang-model-export/src/test/resources/bugs/bug2444/yin/include@2017-06-26.yin similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yin/include@2017-06-26.yin rename to model/yang-model-export/src/test/resources/bugs/bug2444/yin/include@2017-06-26.yin diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yin/leafref-yang1.yin b/model/yang-model-export/src/test/resources/bugs/bug2444/yin/leafref-yang1.yin similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yin/leafref-yang1.yin rename to model/yang-model-export/src/test/resources/bugs/bug2444/yin/leafref-yang1.yin diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yin/leafref.yin b/model/yang-model-export/src/test/resources/bugs/bug2444/yin/leafref.yin similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yin/leafref.yin rename to model/yang-model-export/src/test/resources/bugs/bug2444/yin/leafref.yin diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yin/modifier-yang1.yin b/model/yang-model-export/src/test/resources/bugs/bug2444/yin/modifier-yang1.yin similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yin/modifier-yang1.yin rename to model/yang-model-export/src/test/resources/bugs/bug2444/yin/modifier-yang1.yin diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yin/modifier.yin b/model/yang-model-export/src/test/resources/bugs/bug2444/yin/modifier.yin similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yin/modifier.yin rename to model/yang-model-export/src/test/resources/bugs/bug2444/yin/modifier.yin diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yin/must-yang1.yin b/model/yang-model-export/src/test/resources/bugs/bug2444/yin/must-yang1.yin similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yin/must-yang1.yin rename to model/yang-model-export/src/test/resources/bugs/bug2444/yin/must-yang1.yin diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yin/must.yin b/model/yang-model-export/src/test/resources/bugs/bug2444/yin/must.yin similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yin/must.yin rename to model/yang-model-export/src/test/resources/bugs/bug2444/yin/must.yin diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yin/notification.yin b/model/yang-model-export/src/test/resources/bugs/bug2444/yin/notification.yin similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yin/notification.yin rename to model/yang-model-export/src/test/resources/bugs/bug2444/yin/notification.yin diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yin/submodule.yin b/model/yang-model-export/src/test/resources/bugs/bug2444/yin/submodule.yin similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yin/submodule.yin rename to model/yang-model-export/src/test/resources/bugs/bug2444/yin/submodule.yin diff --git a/yang/yang-model-export/src/test/resources/bugs/bug2444/yin/unique.yin b/model/yang-model-export/src/test/resources/bugs/bug2444/yin/unique.yin similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug2444/yin/unique.yin rename to model/yang-model-export/src/test/resources/bugs/bug2444/yin/unique.yin diff --git a/yang/yang-model-export/src/test/resources/bugs/bug4504/bar.yang b/model/yang-model-export/src/test/resources/bugs/bug4504/bar.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug4504/bar.yang rename to model/yang-model-export/src/test/resources/bugs/bug4504/bar.yang diff --git a/yang/yang-model-export/src/test/resources/bugs/bug4504/foo.yang b/model/yang-model-export/src/test/resources/bugs/bug4504/foo.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug4504/foo.yang rename to model/yang-model-export/src/test/resources/bugs/bug4504/foo.yang diff --git a/yang/yang-model-export/src/test/resources/bugs/bug5531/foo.yang b/model/yang-model-export/src/test/resources/bugs/bug5531/foo.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug5531/foo.yang rename to model/yang-model-export/src/test/resources/bugs/bug5531/foo.yang diff --git a/yang/yang-model-export/src/test/resources/bugs/bug6856/bar.yang b/model/yang-model-export/src/test/resources/bugs/bug6856/bar.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug6856/bar.yang rename to model/yang-model-export/src/test/resources/bugs/bug6856/bar.yang diff --git a/yang/yang-model-export/src/test/resources/bugs/bug6856/foo.yang b/model/yang-model-export/src/test/resources/bugs/bug6856/foo.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/bug6856/foo.yang rename to model/yang-model-export/src/test/resources/bugs/bug6856/foo.yang diff --git a/yang/yang-model-export/src/test/resources/bugs/yt992/module1@2019-05-17.yang b/model/yang-model-export/src/test/resources/bugs/yt992/module1@2019-05-17.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/yt992/module1@2019-05-17.yang rename to model/yang-model-export/src/test/resources/bugs/yt992/module1@2019-05-17.yang diff --git a/yang/yang-model-export/src/test/resources/bugs/yt992/module1submodule1@2019-05-17.yang b/model/yang-model-export/src/test/resources/bugs/yt992/module1submodule1@2019-05-17.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/yt992/module1submodule1@2019-05-17.yang rename to model/yang-model-export/src/test/resources/bugs/yt992/module1submodule1@2019-05-17.yang diff --git a/yang/yang-model-export/src/test/resources/bugs/yt992/module2@2019-05-17.yang b/model/yang-model-export/src/test/resources/bugs/yt992/module2@2019-05-17.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/bugs/yt992/module2@2019-05-17.yang rename to model/yang-model-export/src/test/resources/bugs/yt992/module2@2019-05-17.yang diff --git a/yang/yang-model-export/src/test/resources/schema-context-emitter-test/foo@2016-08-05.yang b/model/yang-model-export/src/test/resources/schema-context-emitter-test/foo@2016-08-05.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/schema-context-emitter-test/foo@2016-08-05.yang rename to model/yang-model-export/src/test/resources/schema-context-emitter-test/foo@2016-08-05.yang diff --git a/yang/yang-model-export/src/test/resources/schema-context-emitter-test/foo@2016-08-05.yin b/model/yang-model-export/src/test/resources/schema-context-emitter-test/foo@2016-08-05.yin similarity index 100% rename from yang/yang-model-export/src/test/resources/schema-context-emitter-test/foo@2016-08-05.yin rename to model/yang-model-export/src/test/resources/schema-context-emitter-test/foo@2016-08-05.yin diff --git a/yang/yang-model-export/src/test/resources/yang/ietf-inet-types@2010-09-24.yang b/model/yang-model-export/src/test/resources/yang/ietf-inet-types@2010-09-24.yang similarity index 100% rename from yang/yang-model-export/src/test/resources/yang/ietf-inet-types@2010-09-24.yang rename to model/yang-model-export/src/test/resources/yang/ietf-inet-types@2010-09-24.yang diff --git a/yang/yang-model-ri/pom.xml b/model/yang-model-ri/pom.xml similarity index 100% rename from yang/yang-model-ri/pom.xml rename to model/yang-model-ri/pom.xml diff --git a/yang/yang-model-ri/src/main/java/module-info.java b/model/yang-model-ri/src/main/java/module-info.java similarity index 100% rename from yang/yang-model-ri/src/main/java/module-info.java rename to model/yang-model-ri/src/main/java/module-info.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/DeclaredStatementDecorators.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/DeclaredStatementDecorators.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/DeclaredStatementDecorators.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/DeclaredStatementDecorators.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/DeclaredStatements.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/DeclaredStatements.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/DeclaredStatements.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/DeclaredStatements.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/EffectiveStatements.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/EffectiveStatements.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/EffectiveStatements.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/EffectiveStatements.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/ImplicitStatements.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/ImplicitStatements.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/ImplicitStatements.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/ImplicitStatements.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractDeclaredEffectiveRootStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractDeclaredEffectiveRootStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractDeclaredEffectiveRootStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractDeclaredEffectiveRootStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractKeyStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractKeyStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractKeyStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractKeyStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractOrderedByStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractOrderedByStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractOrderedByStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractOrderedByStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractStatusStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractStatusStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractStatusStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/AbstractStatusStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/DeviateStatementImpl.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/DeviateStatementImpl.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/DeviateStatementImpl.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/DeviateStatementImpl.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/DeviationStatementImpl.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/DeviationStatementImpl.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/DeviationStatementImpl.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/DeviationStatementImpl.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyActionStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyActionStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyActionStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyActionStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyAnydataStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyAnydataStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyAnydataStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyAnydataStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyAnyxmlStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyAnyxmlStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyAnyxmlStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyAnyxmlStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyArgumentStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyArgumentStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyArgumentStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyArgumentStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyAugmentStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyAugmentStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyAugmentStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyAugmentStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyBaseStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyBaseStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyBaseStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyBaseStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyBelongsToStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyBelongsToStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyBelongsToStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyBelongsToStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyBitStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyBitStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyBitStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyBitStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyCaseStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyCaseStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyCaseStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyCaseStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyChoiceStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyChoiceStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyChoiceStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyChoiceStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyConfigStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyConfigStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyConfigStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyConfigStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyContactStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyContactStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyContactStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyContactStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyContainerStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyContainerStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyContainerStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyContainerStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyDefaultStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyDefaultStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyDefaultStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyDefaultStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyDescriptionStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyDescriptionStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyDescriptionStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyDescriptionStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyEnumStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyEnumStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyEnumStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyEnumStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyErrorAppTagStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyErrorAppTagStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyErrorAppTagStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyErrorAppTagStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyErrorMessageStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyErrorMessageStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyErrorMessageStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyErrorMessageStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyExtensionStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyExtensionStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyExtensionStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyExtensionStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyFeatureStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyFeatureStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyFeatureStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyFeatureStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyFractionDigitsStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyFractionDigitsStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyFractionDigitsStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyFractionDigitsStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyGroupingStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyGroupingStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyGroupingStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyGroupingStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyIdentityStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyIdentityStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyIdentityStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyIdentityStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyIfFeatureStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyIfFeatureStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyIfFeatureStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyIfFeatureStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyIncludeStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyIncludeStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyIncludeStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyIncludeStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyInputStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyInputStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyInputStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyInputStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyKeyStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyKeyStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyKeyStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyKeyStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyLeafListStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyLeafListStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyLeafListStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyLeafListStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyLeafStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyLeafStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyLeafStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyLeafStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyLengthStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyLengthStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyLengthStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyLengthStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyListStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyListStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyListStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyListStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMandatoryStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMandatoryStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMandatoryStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMandatoryStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMaxElementsStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMaxElementsStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMaxElementsStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMaxElementsStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMinElementsStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMinElementsStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMinElementsStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMinElementsStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyModifierStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyModifierStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyModifierStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyModifierStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMustStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMustStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMustStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyMustStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyNamespaceStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyNamespaceStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyNamespaceStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyNamespaceStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyNotificationStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyNotificationStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyNotificationStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyNotificationStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyOrderedByStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyOrderedByStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyOrderedByStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyOrderedByStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyOrganizationStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyOrganizationStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyOrganizationStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyOrganizationStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyOutputStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyOutputStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyOutputStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyOutputStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPathStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPathStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPathStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPathStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPatternStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPatternStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPatternStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPatternStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPositionStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPositionStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPositionStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPositionStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPrefixStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPrefixStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPrefixStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPrefixStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPresenceStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPresenceStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPresenceStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyPresenceStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRangeStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRangeStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRangeStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRangeStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyReferenceStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyReferenceStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyReferenceStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyReferenceStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRequireInstanceStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRequireInstanceStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRequireInstanceStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRequireInstanceStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRevisionDateStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRevisionDateStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRevisionDateStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRevisionDateStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRevisionStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRevisionStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRevisionStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRevisionStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRpcStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRpcStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRpcStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyRpcStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyStatusStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyStatusStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyStatusStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyStatusStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyTypeStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyTypeStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyTypeStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyTypeStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyTypedefStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyTypedefStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyTypedefStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyTypedefStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredCaseStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredCaseStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredCaseStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredCaseStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredInputStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredInputStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredInputStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredInputStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredOutputStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredOutputStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredOutputStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredOutputStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUniqueStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUniqueStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUniqueStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUniqueStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUnitsStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUnitsStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUnitsStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUnitsStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUsesStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUsesStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUsesStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUsesStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyValueStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyValueStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyValueStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyValueStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyWhenStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyWhenStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyWhenStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyWhenStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyYangVersionStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyYangVersionStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyYangVersionStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyYangVersionStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyYinElementStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyYinElementStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyYinElementStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyYinElementStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/ImportStatementImpl.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/ImportStatementImpl.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/ImportStatementImpl.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/ImportStatementImpl.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/ModuleStatementImpl.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/ModuleStatementImpl.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/ModuleStatementImpl.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/ModuleStatementImpl.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RefineStatementImpl.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RefineStatementImpl.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RefineStatementImpl.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RefineStatementImpl.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularActionStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularActionStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularActionStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularActionStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularAnydataStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularAnydataStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularAnydataStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularAnydataStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularAnyxmlStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularAnyxmlStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularAnyxmlStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularAnyxmlStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularArgumentStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularArgumentStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularArgumentStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularArgumentStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularAugmentStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularAugmentStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularAugmentStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularAugmentStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularBaseStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularBaseStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularBaseStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularBaseStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularBelongsToStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularBelongsToStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularBelongsToStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularBelongsToStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularBitStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularBitStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularBitStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularBitStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularCaseStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularCaseStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularCaseStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularCaseStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularChoiceStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularChoiceStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularChoiceStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularChoiceStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularConfigStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularConfigStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularConfigStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularConfigStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularContactStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularContactStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularContactStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularContactStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularContainerStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularContainerStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularContainerStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularContainerStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularDefaultStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularDefaultStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularDefaultStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularDefaultStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularDescriptionStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularDescriptionStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularDescriptionStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularDescriptionStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularEnumStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularEnumStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularEnumStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularEnumStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularErrorAppTagStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularErrorAppTagStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularErrorAppTagStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularErrorAppTagStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularErrorMessageStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularErrorMessageStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularErrorMessageStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularErrorMessageStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularExtensionStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularExtensionStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularExtensionStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularExtensionStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularFeatureStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularFeatureStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularFeatureStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularFeatureStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularFractionDigitsStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularFractionDigitsStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularFractionDigitsStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularFractionDigitsStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularGroupingStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularGroupingStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularGroupingStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularGroupingStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularIdentityStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularIdentityStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularIdentityStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularIdentityStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularIfFeatureStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularIfFeatureStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularIfFeatureStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularIfFeatureStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularIncludeStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularIncludeStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularIncludeStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularIncludeStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularInputStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularInputStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularInputStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularInputStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularKeyStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularKeyStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularKeyStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularKeyStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularLeafListStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularLeafListStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularLeafListStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularLeafListStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularLeafStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularLeafStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularLeafStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularLeafStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularLengthStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularLengthStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularLengthStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularLengthStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularListStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularListStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularListStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularListStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMandatoryStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMandatoryStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMandatoryStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMandatoryStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMaxElementsStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMaxElementsStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMaxElementsStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMaxElementsStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMinElementsStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMinElementsStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMinElementsStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMinElementsStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularModifierStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularModifierStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularModifierStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularModifierStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMustStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMustStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMustStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularMustStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularNamespaceStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularNamespaceStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularNamespaceStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularNamespaceStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularNotificationStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularNotificationStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularNotificationStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularNotificationStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularOrderedByStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularOrderedByStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularOrderedByStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularOrderedByStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularOrganizationStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularOrganizationStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularOrganizationStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularOrganizationStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularOutputStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularOutputStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularOutputStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularOutputStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPathStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPathStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPathStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPathStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPatternStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPatternStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPatternStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPatternStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPositionStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPositionStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPositionStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPositionStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPrefixStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPrefixStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPrefixStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPrefixStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPresenceStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPresenceStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPresenceStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularPresenceStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRangeStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRangeStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRangeStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRangeStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularReferenceStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularReferenceStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularReferenceStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularReferenceStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRequireInstanceStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRequireInstanceStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRequireInstanceStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRequireInstanceStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRevisionDateStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRevisionDateStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRevisionDateStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRevisionDateStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRevisionStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRevisionStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRevisionStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRevisionStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRpcStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRpcStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRpcStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularRpcStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularStatusStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularStatusStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularStatusStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularStatusStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularTypeStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularTypeStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularTypeStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularTypeStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularTypedefStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularTypedefStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularTypedefStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularTypedefStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredCaseStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredCaseStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredCaseStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredCaseStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredInputStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredInputStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredInputStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredInputStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredOutputStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredOutputStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredOutputStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredOutputStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUniqueStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUniqueStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUniqueStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUniqueStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUnitsStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUnitsStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUnitsStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUnitsStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUsesStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUsesStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUsesStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUsesStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularValueStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularValueStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularValueStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularValueStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularWhenStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularWhenStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularWhenStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularWhenStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularYangVersionStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularYangVersionStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularYangVersionStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularYangVersionStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularYinElementStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularYinElementStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularYinElementStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularYinElementStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/SubmoduleStatementImpl.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/SubmoduleStatementImpl.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/SubmoduleStatementImpl.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/SubmoduleStatementImpl.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/UnrecognizedStatementImpl.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/UnrecognizedStatementImpl.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/UnrecognizedStatementImpl.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/UnrecognizedStatementImpl.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractDataNodeContainer.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractDataNodeContainer.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractDataNodeContainer.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractDataNodeContainer.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractIdentityEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractIdentityEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractIdentityEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractIdentityEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractKeyEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractKeyEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractKeyEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractKeyEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractLeafEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractLeafEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractLeafEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractLeafEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ActionEffectiveStatementImpl.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ActionEffectiveStatementImpl.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ActionEffectiveStatementImpl.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ActionEffectiveStatementImpl.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AugmentEffectiveStatementImpl.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AugmentEffectiveStatementImpl.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AugmentEffectiveStatementImpl.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AugmentEffectiveStatementImpl.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/CaseEffectiveStatementMixin.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/CaseEffectiveStatementMixin.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/CaseEffectiveStatementMixin.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/CaseEffectiveStatementMixin.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ChoiceEffectiveStatementImpl.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ChoiceEffectiveStatementImpl.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ChoiceEffectiveStatementImpl.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ChoiceEffectiveStatementImpl.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ContainerEffectiveStatementImpl.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ContainerEffectiveStatementImpl.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ContainerEffectiveStatementImpl.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ContainerEffectiveStatementImpl.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeclaredCaseEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeclaredCaseEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeclaredCaseEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeclaredCaseEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeclaredInputEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeclaredInputEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeclaredInputEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeclaredInputEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeclaredOutputEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeclaredOutputEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeclaredOutputEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeclaredOutputEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeviateEffectiveStatementImpl.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeviateEffectiveStatementImpl.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeviateEffectiveStatementImpl.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeviateEffectiveStatementImpl.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeviationEffectiveStatementImpl.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeviationEffectiveStatementImpl.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeviationEffectiveStatementImpl.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeviationEffectiveStatementImpl.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyAnydataEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyAnydataEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyAnydataEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyAnydataEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyAnyxmlEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyAnyxmlEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyAnyxmlEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyAnyxmlEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyArgumentEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyArgumentEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyArgumentEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyArgumentEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyBaseEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyBaseEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyBaseEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyBaseEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyBelongsToEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyBelongsToEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyBelongsToEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyBelongsToEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyBitEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyBitEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyBitEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyBitEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyConfigEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyConfigEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyConfigEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyConfigEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyContactEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyContactEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyContactEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyContactEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyDefaultEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyDefaultEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyDefaultEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyDefaultEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyDescriptionEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyDescriptionEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyDescriptionEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyDescriptionEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyEnumEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyEnumEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyEnumEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyEnumEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyErrorAppTagEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyErrorAppTagEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyErrorAppTagEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyErrorAppTagEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyErrorMessageEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyErrorMessageEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyErrorMessageEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyErrorMessageEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyFeatureEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyFeatureEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyFeatureEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyFeatureEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyForeignKeyEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyForeignKeyEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyForeignKeyEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyForeignKeyEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyFractionDigitsEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyFractionDigitsEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyFractionDigitsEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyFractionDigitsEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyIdentityEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyIdentityEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyIdentityEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyIdentityEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyIfFeatureEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyIfFeatureEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyIfFeatureEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyIfFeatureEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyIncludeEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyIncludeEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyIncludeEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyIncludeEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyLeafEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyLeafEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyLeafEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyLeafEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyLengthEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyLengthEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyLengthEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyLengthEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyLocalKeyEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyLocalKeyEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyLocalKeyEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyLocalKeyEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMandatoryEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMandatoryEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMandatoryEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMandatoryEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMaxElementsEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMaxElementsEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMaxElementsEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMaxElementsEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMinElementsEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMinElementsEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMinElementsEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMinElementsEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyModifierEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyModifierEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyModifierEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyModifierEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMustEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMustEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMustEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyMustEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyNamespaceEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyNamespaceEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyNamespaceEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyNamespaceEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyOrderedByEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyOrderedByEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyOrderedByEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyOrderedByEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyOrganizationEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyOrganizationEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyOrganizationEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyOrganizationEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPathEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPathEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPathEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPathEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPatternEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPatternEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPatternEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPatternEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPositionEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPositionEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPositionEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPositionEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPrefixEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPrefixEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPrefixEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPrefixEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPresenceEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPresenceEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPresenceEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyPresenceEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyRangeEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyRangeEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyRangeEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyRangeEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyReferenceEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyReferenceEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyReferenceEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyReferenceEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyRequireInstanceEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyRequireInstanceEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyRequireInstanceEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyRequireInstanceEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyRevisionDateEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyRevisionDateEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyRevisionDateEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyRevisionDateEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyRevisionEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyRevisionEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyRevisionEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyRevisionEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyStatusEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyStatusEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyStatusEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyStatusEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyUniqueEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyUniqueEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyUniqueEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyUniqueEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyUnitsEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyUnitsEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyUnitsEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyUnitsEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyValueEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyValueEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyValueEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyValueEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyWhenEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyWhenEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyWhenEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyWhenEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyYangVersionEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyYangVersionEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyYangVersionEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyYangVersionEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyYinElementEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyYinElementEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyYinElementEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyYinElementEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ExtensionEffectiveStatementImpl.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ExtensionEffectiveStatementImpl.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ExtensionEffectiveStatementImpl.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ExtensionEffectiveStatementImpl.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/GroupingEffectiveStatementImpl.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/GroupingEffectiveStatementImpl.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/GroupingEffectiveStatementImpl.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/GroupingEffectiveStatementImpl.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ImportEffectiveStatementImpl.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ImportEffectiveStatementImpl.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ImportEffectiveStatementImpl.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ImportEffectiveStatementImpl.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/MustDefinitionMixin.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/MustDefinitionMixin.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/MustDefinitionMixin.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/MustDefinitionMixin.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/NotificationEffectiveStatementImpl.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/NotificationEffectiveStatementImpl.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/NotificationEffectiveStatementImpl.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/NotificationEffectiveStatementImpl.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularAnydataEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularAnydataEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularAnydataEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularAnydataEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularAnyxmlEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularAnyxmlEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularAnyxmlEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularAnyxmlEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularArgumentEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularArgumentEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularArgumentEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularArgumentEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularBaseEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularBaseEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularBaseEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularBaseEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularBelongsToEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularBelongsToEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularBelongsToEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularBelongsToEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularBitEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularBitEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularBitEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularBitEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularConfigEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularConfigEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularConfigEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularConfigEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularContactEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularContactEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularContactEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularContactEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularDefaultEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularDefaultEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularDefaultEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularDefaultEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularDescriptionEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularDescriptionEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularDescriptionEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularDescriptionEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularEnumEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularEnumEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularEnumEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularEnumEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularErrorAppTagEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularErrorAppTagEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularErrorAppTagEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularErrorAppTagEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularErrorMessageEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularErrorMessageEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularErrorMessageEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularErrorMessageEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularFeatureEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularFeatureEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularFeatureEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularFeatureEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularForeignKeyEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularForeignKeyEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularForeignKeyEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularForeignKeyEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularFractionDigitsEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularFractionDigitsEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularFractionDigitsEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularFractionDigitsEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularIdentityEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularIdentityEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularIdentityEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularIdentityEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularIfFeatureEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularIfFeatureEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularIfFeatureEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularIfFeatureEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularIncludeEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularIncludeEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularIncludeEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularIncludeEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularLeafEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularLeafEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularLeafEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularLeafEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularLengthEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularLengthEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularLengthEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularLengthEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularLocalKeyEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularLocalKeyEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularLocalKeyEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularLocalKeyEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMandatoryEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMandatoryEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMandatoryEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMandatoryEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMaxElementsEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMaxElementsEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMaxElementsEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMaxElementsEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMinElementsEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMinElementsEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMinElementsEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMinElementsEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularModifierEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularModifierEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularModifierEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularModifierEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMustEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMustEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMustEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularMustEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularNamespaceEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularNamespaceEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularNamespaceEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularNamespaceEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularOrderedByEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularOrderedByEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularOrderedByEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularOrderedByEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularOrganizationEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularOrganizationEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularOrganizationEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularOrganizationEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPathEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPathEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPathEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPathEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPatternEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPatternEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPatternEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPatternEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPositionEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPositionEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPositionEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPositionEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPrefixEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPrefixEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPrefixEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPrefixEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPresenceEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPresenceEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPresenceEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularPresenceEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularRangeEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularRangeEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularRangeEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularRangeEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularReferenceEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularReferenceEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularReferenceEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularReferenceEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularRequireInstanceEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularRequireInstanceEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularRequireInstanceEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularRequireInstanceEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularRevisionDateEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularRevisionDateEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularRevisionDateEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularRevisionDateEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularRevisionEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularRevisionEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularRevisionEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularRevisionEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularStatusEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularStatusEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularStatusEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularStatusEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularUniqueEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularUniqueEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularUniqueEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularUniqueEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularUnitsEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularUnitsEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularUnitsEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularUnitsEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularValueEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularValueEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularValueEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularValueEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularWhenEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularWhenEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularWhenEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularWhenEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularYangVersionEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularYangVersionEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularYangVersionEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularYangVersionEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularYinElementEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularYinElementEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularYinElementEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularYinElementEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RpcEffectiveStatementImpl.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RpcEffectiveStatementImpl.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RpcEffectiveStatementImpl.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RpcEffectiveStatementImpl.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/TypedefEffectiveStatementImpl.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/TypedefEffectiveStatementImpl.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/TypedefEffectiveStatementImpl.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/TypedefEffectiveStatementImpl.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/UndeclaredCaseEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/UndeclaredCaseEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/UndeclaredCaseEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/UndeclaredCaseEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/UndeclaredInputEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/UndeclaredInputEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/UndeclaredInputEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/UndeclaredInputEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/UndeclaredOutputEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/UndeclaredOutputEffectiveStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/UndeclaredOutputEffectiveStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/UndeclaredOutputEffectiveStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefActionStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefActionStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefActionStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefActionStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefAnydataStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefAnydataStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefAnydataStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefAnydataStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefAnyxmlStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefAnyxmlStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefAnyxmlStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefAnyxmlStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefArgumentStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefArgumentStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefArgumentStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefArgumentStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefAugmentStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefAugmentStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefAugmentStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefAugmentStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefBaseStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefBaseStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefBaseStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefBaseStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefBelongsToStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefBelongsToStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefBelongsToStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefBelongsToStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefBitStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefBitStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefBitStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefBitStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefCaseStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefCaseStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefCaseStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefCaseStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefChoiceStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefChoiceStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefChoiceStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefChoiceStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefConfigStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefConfigStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefConfigStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefConfigStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefContactStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefContactStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefContactStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefContactStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefContainerStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefContainerStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefContainerStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefContainerStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefDefaultStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefDefaultStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefDefaultStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefDefaultStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefDescriptionStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefDescriptionStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefDescriptionStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefDescriptionStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefDeviateStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefDeviateStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefDeviateStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefDeviateStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefDeviationStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefDeviationStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefDeviationStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefDeviationStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefEnumStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefEnumStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefEnumStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefEnumStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefErrorAppTagStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefErrorAppTagStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefErrorAppTagStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefErrorAppTagStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefErrorMessageStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefErrorMessageStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefErrorMessageStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefErrorMessageStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefExtensionStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefExtensionStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefExtensionStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefExtensionStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefFeatureStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefFeatureStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefFeatureStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefFeatureStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefFractionDigitsStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefFractionDigitsStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefFractionDigitsStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefFractionDigitsStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefGroupingStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefGroupingStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefGroupingStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefGroupingStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefIdentityStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefIdentityStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefIdentityStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefIdentityStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefIfFeatureStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefIfFeatureStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefIfFeatureStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefIfFeatureStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefImportStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefImportStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefImportStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefImportStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefIncludeStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefIncludeStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefIncludeStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefIncludeStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefInputStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefInputStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefInputStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefInputStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefKeyStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefKeyStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefKeyStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefKeyStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefLeafListStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefLeafListStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefLeafListStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefLeafListStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefLeafStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefLeafStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefLeafStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefLeafStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefLengthStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefLengthStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefLengthStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefLengthStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefListStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefListStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefListStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefListStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefMandatoryStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefMandatoryStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefMandatoryStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefMandatoryStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefMaxElementsStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefMaxElementsStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefMaxElementsStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefMaxElementsStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefMinElementsStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefMinElementsStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefMinElementsStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefMinElementsStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefModifierStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefModifierStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefModifierStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefModifierStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefModuleStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefModuleStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefModuleStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefModuleStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefMustStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefMustStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefMustStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefMustStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefNamespaceStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefNamespaceStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefNamespaceStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefNamespaceStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefNotificationStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefNotificationStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefNotificationStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefNotificationStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefOrderedByStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefOrderedByStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefOrderedByStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefOrderedByStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefOrganizationStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefOrganizationStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefOrganizationStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefOrganizationStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefOutputStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefOutputStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefOutputStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefOutputStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefPathStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefPathStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefPathStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefPathStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefPatternStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefPatternStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefPatternStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefPatternStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefPositionStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefPositionStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefPositionStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefPositionStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefPrefixStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefPrefixStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefPrefixStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefPrefixStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefPresenceStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefPresenceStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefPresenceStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefPresenceStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRangeStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRangeStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRangeStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRangeStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefReferenceStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefReferenceStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefReferenceStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefReferenceStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRefineStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRefineStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRefineStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRefineStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRequireInstanceStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRequireInstanceStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRequireInstanceStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRequireInstanceStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRevisionDateStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRevisionDateStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRevisionDateStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRevisionDateStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRevisionStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRevisionStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRevisionStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRevisionStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRpcStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRpcStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRpcStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefRpcStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefStatusStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefStatusStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefStatusStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefStatusStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefSubmoduleStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefSubmoduleStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefSubmoduleStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefSubmoduleStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefTypeStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefTypeStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefTypeStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefTypeStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefTypedefStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefTypedefStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefTypedefStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefTypedefStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefUniqueStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefUniqueStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefUniqueStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefUniqueStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefUnitsStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefUnitsStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefUnitsStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefUnitsStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefUnrecognizedStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefUnrecognizedStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefUnrecognizedStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefUnrecognizedStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefUsesStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefUsesStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefUsesStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefUsesStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefValueStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefValueStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefValueStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefValueStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefWhenStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefWhenStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefWhenStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefWhenStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefYangVersionStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefYangVersionStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefYangVersionStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefYangVersionStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefYinElementStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefYinElementStatement.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefYinElementStatement.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/ref/RefYinElementStatement.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractBaseType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractBaseType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractBaseType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractBaseType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractDerivedType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractDerivedType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractDerivedType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractDerivedType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractLengthRestrictedBaseType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractLengthRestrictedBaseType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractLengthRestrictedBaseType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractLengthRestrictedBaseType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractLengthRestrictedDerivedType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractLengthRestrictedDerivedType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractLengthRestrictedDerivedType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractLengthRestrictedDerivedType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractLengthRestrictedType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractLengthRestrictedType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractLengthRestrictedType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractLengthRestrictedType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRangeRestrictedBaseType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRangeRestrictedBaseType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRangeRestrictedBaseType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRangeRestrictedBaseType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRangeRestrictedDerivedType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRangeRestrictedDerivedType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRangeRestrictedDerivedType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRangeRestrictedDerivedType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRangeRestrictedType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRangeRestrictedType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRangeRestrictedType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRangeRestrictedType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRestrictedType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRestrictedType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRestrictedType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRestrictedType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRestrictedTypeBuilder.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRestrictedTypeBuilder.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRestrictedTypeBuilder.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractRestrictedTypeBuilder.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractTypeDefinition.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractTypeDefinition.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractTypeDefinition.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractTypeDefinition.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseBinaryType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseBinaryType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseBinaryType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseBinaryType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseBitsType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseBitsType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseBitsType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseBitsType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseBooleanType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseBooleanType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseBooleanType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseBooleanType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseDecimalType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseDecimalType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseDecimalType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseDecimalType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseEmptyType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseEmptyType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseEmptyType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseEmptyType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseEnumerationType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseEnumerationType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseEnumerationType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseEnumerationType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseIdentityrefType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseIdentityrefType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseIdentityrefType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseIdentityrefType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInstanceIdentifierType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInstanceIdentifierType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInstanceIdentifierType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInstanceIdentifierType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt16Type.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt16Type.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt16Type.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt16Type.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt32Type.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt32Type.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt32Type.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt32Type.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt64Type.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt64Type.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt64Type.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt64Type.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt8Type.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt8Type.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt8Type.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseInt8Type.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseLeafrefType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseLeafrefType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseLeafrefType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseLeafrefType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseStringType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseStringType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseStringType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseStringType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseTypes.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseTypes.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseTypes.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseTypes.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint16Type.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint16Type.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint16Type.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint16Type.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint32Type.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint32Type.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint32Type.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint32Type.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint64Type.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint64Type.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint64Type.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint64Type.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint8Type.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint8Type.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint8Type.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUint8Type.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUnionType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUnionType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUnionType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseUnionType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BitBuilder.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BitBuilder.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BitBuilder.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BitBuilder.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BitImpl.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BitImpl.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BitImpl.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BitImpl.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BitsTypeBuilder.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BitsTypeBuilder.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BitsTypeBuilder.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BitsTypeBuilder.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ConcreteTypeBuilder.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ConcreteTypeBuilder.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ConcreteTypeBuilder.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ConcreteTypeBuilder.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ConcreteTypes.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ConcreteTypes.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ConcreteTypes.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ConcreteTypes.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DecimalTypeBuilder.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DecimalTypeBuilder.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DecimalTypeBuilder.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DecimalTypeBuilder.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedBinaryType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedBinaryType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedBinaryType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedBinaryType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedBitsType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedBitsType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedBitsType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedBitsType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedBooleanType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedBooleanType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedBooleanType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedBooleanType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedDecimalType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedDecimalType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedDecimalType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedDecimalType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedEmptyType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedEmptyType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedEmptyType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedEmptyType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedEnumerationType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedEnumerationType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedEnumerationType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedEnumerationType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedIdentityrefType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedIdentityrefType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedIdentityrefType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedIdentityrefType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInstanceIdentifierType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInstanceIdentifierType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInstanceIdentifierType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInstanceIdentifierType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt16Type.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt16Type.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt16Type.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt16Type.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt32Type.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt32Type.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt32Type.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt32Type.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt64Type.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt64Type.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt64Type.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt64Type.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt8Type.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt8Type.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt8Type.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedInt8Type.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedLeafrefType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedLeafrefType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedLeafrefType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedLeafrefType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedStringType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedStringType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedStringType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedStringType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedTypeBuilder.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedTypeBuilder.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedTypeBuilder.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedTypeBuilder.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedTypes.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedTypes.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedTypes.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedTypes.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint16Type.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint16Type.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint16Type.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint16Type.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint32Type.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint32Type.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint32Type.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint32Type.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint64Type.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint64Type.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint64Type.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint64Type.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint8Type.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint8Type.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint8Type.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUint8Type.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUnionType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUnionType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUnionType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/DerivedUnionType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/EnumPairBuilder.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/EnumPairBuilder.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/EnumPairBuilder.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/EnumPairBuilder.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/EnumPairImpl.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/EnumPairImpl.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/EnumPairImpl.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/EnumPairImpl.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/EnumerationTypeBuilder.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/EnumerationTypeBuilder.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/EnumerationTypeBuilder.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/EnumerationTypeBuilder.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/IdentityrefTypeBuilder.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/IdentityrefTypeBuilder.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/IdentityrefTypeBuilder.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/IdentityrefTypeBuilder.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InstanceIdentifierTypeBuilder.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InstanceIdentifierTypeBuilder.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InstanceIdentifierTypeBuilder.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InstanceIdentifierTypeBuilder.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidBitDefinitionException.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidBitDefinitionException.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidBitDefinitionException.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidBitDefinitionException.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidEnumDefinitionException.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidEnumDefinitionException.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidEnumDefinitionException.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidEnumDefinitionException.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidLengthConstraintException.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidLengthConstraintException.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidLengthConstraintException.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidLengthConstraintException.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidRangeConstraintException.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidRangeConstraintException.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidRangeConstraintException.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/InvalidRangeConstraintException.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/JavaLengthConstraints.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/JavaLengthConstraints.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/JavaLengthConstraints.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/JavaLengthConstraints.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/LeafrefTypeBuilder.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/LeafrefTypeBuilder.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/LeafrefTypeBuilder.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/LeafrefTypeBuilder.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/LengthRestrictedTypeBuilder.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/LengthRestrictedTypeBuilder.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/LengthRestrictedTypeBuilder.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/LengthRestrictedTypeBuilder.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/NumberUtil.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/NumberUtil.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/NumberUtil.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/NumberUtil.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RangeRestrictedTypeBuilder.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RangeRestrictedTypeBuilder.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RangeRestrictedTypeBuilder.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RangeRestrictedTypeBuilder.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RangeRestrictedTypeBuilderWithBase.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RangeRestrictedTypeBuilderWithBase.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RangeRestrictedTypeBuilderWithBase.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RangeRestrictedTypeBuilderWithBase.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RequireInstanceRestrictedTypeBuilder.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RequireInstanceRestrictedTypeBuilder.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RequireInstanceRestrictedTypeBuilder.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RequireInstanceRestrictedTypeBuilder.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ResolvedLengthConstraint.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ResolvedLengthConstraint.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ResolvedLengthConstraint.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ResolvedLengthConstraint.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ResolvedRangeConstraint.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ResolvedRangeConstraint.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ResolvedRangeConstraint.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/ResolvedRangeConstraint.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedBinaryType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedBinaryType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedBinaryType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedBinaryType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedBitsType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedBitsType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedBitsType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedBitsType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedBooleanType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedBooleanType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedBooleanType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedBooleanType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedDecimalType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedDecimalType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedDecimalType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedDecimalType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedEmptyType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedEmptyType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedEmptyType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedEmptyType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedEnumerationType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedEnumerationType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedEnumerationType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedEnumerationType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedIdentityrefType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedIdentityrefType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedIdentityrefType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedIdentityrefType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInstanceIdentifierType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInstanceIdentifierType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInstanceIdentifierType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInstanceIdentifierType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt16Type.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt16Type.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt16Type.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt16Type.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt32Type.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt32Type.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt32Type.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt32Type.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt64Type.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt64Type.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt64Type.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt64Type.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt8Type.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt8Type.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt8Type.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedInt8Type.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedLeafrefType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedLeafrefType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedLeafrefType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedLeafrefType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedStringType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedStringType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedStringType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedStringType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedTypes.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedTypes.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedTypes.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedTypes.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint16Type.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint16Type.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint16Type.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint16Type.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint32Type.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint32Type.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint32Type.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint32Type.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint64Type.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint64Type.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint64Type.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint64Type.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint8Type.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint8Type.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint8Type.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUint8Type.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUnionType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUnionType.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUnionType.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/RestrictedUnionType.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/StringTypeBuilder.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/StringTypeBuilder.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/StringTypeBuilder.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/StringTypeBuilder.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/TypeBuilder.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/TypeBuilder.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/TypeBuilder.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/TypeBuilder.java diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/UnionTypeBuilder.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/UnionTypeBuilder.java similarity index 100% rename from yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/UnionTypeBuilder.java rename to model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/UnionTypeBuilder.java diff --git a/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BinaryTypeTest.java b/model/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BinaryTypeTest.java similarity index 100% rename from yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BinaryTypeTest.java rename to model/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BinaryTypeTest.java diff --git a/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BitImplTest.java b/model/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BitImplTest.java similarity index 100% rename from yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BitImplTest.java rename to model/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BitImplTest.java diff --git a/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BitsTypeTest.java b/model/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BitsTypeTest.java similarity index 100% rename from yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BitsTypeTest.java rename to model/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BitsTypeTest.java diff --git a/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BooleanTypeTest.java b/model/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BooleanTypeTest.java similarity index 100% rename from yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BooleanTypeTest.java rename to model/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/BooleanTypeTest.java diff --git a/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/EmptyTypeTest.java b/model/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/EmptyTypeTest.java similarity index 100% rename from yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/EmptyTypeTest.java rename to model/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/EmptyTypeTest.java diff --git a/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/EnumPairImplTest.java b/model/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/EnumPairImplTest.java similarity index 100% rename from yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/EnumPairImplTest.java rename to model/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/EnumPairImplTest.java diff --git a/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/Int8Test.java b/model/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/Int8Test.java similarity index 100% rename from yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/Int8Test.java rename to model/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/Int8Test.java diff --git a/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/LeafrefTest.java b/model/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/LeafrefTest.java similarity index 100% rename from yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/LeafrefTest.java rename to model/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/LeafrefTest.java diff --git a/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/NumberUtilTest.java b/model/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/NumberUtilTest.java similarity index 100% rename from yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/NumberUtilTest.java rename to model/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/NumberUtilTest.java diff --git a/yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/TypeTest.java b/model/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/TypeTest.java similarity index 100% rename from yang/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/TypeTest.java rename to model/yang-model-ri/src/test/java/org/opendaylight/yangtools/yang/model/ri/type/TypeTest.java diff --git a/yang/yang-model-spi/pom.xml b/model/yang-model-spi/pom.xml similarity index 100% rename from yang/yang-model-spi/pom.xml rename to model/yang-model-spi/pom.xml diff --git a/yang/yang-model-spi/src/main/java/module-info.java b/model/yang-model-spi/src/main/java/module-info.java similarity index 100% rename from yang/yang-model-spi/src/main/java/module-info.java rename to model/yang-model-spi/src/main/java/module-info.java diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/AbstractEffectiveModelContextProvider.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/AbstractEffectiveModelContextProvider.java similarity index 100% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/AbstractEffectiveModelContextProvider.java rename to model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/AbstractEffectiveModelContextProvider.java diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/AbstractEffectiveStatementInference.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/AbstractEffectiveStatementInference.java similarity index 100% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/AbstractEffectiveStatementInference.java rename to model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/AbstractEffectiveStatementInference.java diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/AbstractPathExpression.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/AbstractPathExpression.java similarity index 100% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/AbstractPathExpression.java rename to model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/AbstractPathExpression.java diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/AbstractSchemaContext.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/AbstractSchemaContext.java similarity index 100% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/AbstractSchemaContext.java rename to model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/AbstractSchemaContext.java diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/DefaultSchemaTreeInference.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/DefaultSchemaTreeInference.java similarity index 100% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/DefaultSchemaTreeInference.java rename to model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/DefaultSchemaTreeInference.java diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/ModuleDependencySort.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/ModuleDependencySort.java similarity index 100% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/ModuleDependencySort.java rename to model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/ModuleDependencySort.java diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/SimpleSchemaContext.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/SimpleSchemaContext.java similarity index 100% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/SimpleSchemaContext.java rename to model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/SimpleSchemaContext.java diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractDeclaredEffectiveStatement.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractDeclaredEffectiveStatement.java similarity index 100% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractDeclaredEffectiveStatement.java rename to model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractDeclaredEffectiveStatement.java diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractDeclaredStatement.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractDeclaredStatement.java similarity index 100% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractDeclaredStatement.java rename to model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractDeclaredStatement.java diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractEffectiveDocumentedNodeWithStatus.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractEffectiveDocumentedNodeWithStatus.java similarity index 100% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractEffectiveDocumentedNodeWithStatus.java rename to model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractEffectiveDocumentedNodeWithStatus.java diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractEffectiveStatement.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractEffectiveStatement.java similarity index 100% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractEffectiveStatement.java rename to model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractEffectiveStatement.java diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractModelStatement.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractModelStatement.java similarity index 100% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractModelStatement.java rename to model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractModelStatement.java diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractRefStatement.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractRefStatement.java similarity index 100% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractRefStatement.java rename to model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractRefStatement.java diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractUndeclaredEffectiveStatement.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractUndeclaredEffectiveStatement.java similarity index 100% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractUndeclaredEffectiveStatement.java rename to model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractUndeclaredEffectiveStatement.java diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/EffectiveStatementMixins.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/EffectiveStatementMixins.java similarity index 100% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/EffectiveStatementMixins.java rename to model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/EffectiveStatementMixins.java diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/ForwardingDeclaredStatement.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/ForwardingDeclaredStatement.java similarity index 100% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/ForwardingDeclaredStatement.java rename to model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/ForwardingDeclaredStatement.java diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/ForwardingModelStatement.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/ForwardingModelStatement.java similarity index 100% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/ForwardingModelStatement.java rename to model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/ForwardingModelStatement.java diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/SubstatementIndexingException.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/SubstatementIndexingException.java similarity index 100% rename from yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/SubstatementIndexingException.java rename to model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/SubstatementIndexingException.java diff --git a/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/ModuleDependencySortTest.java b/model/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/ModuleDependencySortTest.java similarity index 100% rename from yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/ModuleDependencySortTest.java rename to model/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/ModuleDependencySortTest.java diff --git a/yang/yang-model-util/pom.xml b/model/yang-model-util/pom.xml similarity index 100% rename from yang/yang-model-util/pom.xml rename to model/yang-model-util/pom.xml diff --git a/yang/yang-model-util/src/main/java/module-info.java b/model/yang-model-util/src/main/java/module-info.java similarity index 100% rename from yang/yang-model-util/src/main/java/module-info.java rename to model/yang-model-util/src/main/java/module-info.java diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DataNodeAggregator.java b/model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DataNodeAggregator.java similarity index 100% rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DataNodeAggregator.java rename to model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DataNodeAggregator.java diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EffectiveAugmentationSchema.java b/model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EffectiveAugmentationSchema.java similarity index 100% rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EffectiveAugmentationSchema.java rename to model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EffectiveAugmentationSchema.java diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/FilteringSchemaContextProxy.java b/model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/FilteringSchemaContextProxy.java similarity index 100% rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/FilteringSchemaContextProxy.java rename to model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/FilteringSchemaContextProxy.java diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/LeafrefResolver.java b/model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/LeafrefResolver.java similarity index 100% rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/LeafrefResolver.java rename to model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/LeafrefResolver.java diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ModuleNameNamespaceContext.java b/model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ModuleNameNamespaceContext.java similarity index 100% rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ModuleNameNamespaceContext.java rename to model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ModuleNameNamespaceContext.java diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java b/model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java similarity index 100% rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java rename to model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaInferenceStack.java b/model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaInferenceStack.java similarity index 100% rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaInferenceStack.java rename to model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaInferenceStack.java diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtils.java b/model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtils.java similarity index 100% rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtils.java rename to model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtils.java diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/package-info.java b/model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/package-info.java similarity index 100% rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/package-info.java rename to model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/package-info.java diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/LeafrefStaticAnalysisTest.java b/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/LeafrefStaticAnalysisTest.java similarity index 100% rename from yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/LeafrefStaticAnalysisTest.java rename to model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/LeafrefStaticAnalysisTest.java diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java b/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java similarity index 100% rename from yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java rename to model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaInferenceStackTest.java b/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaInferenceStackTest.java similarity index 100% rename from yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaInferenceStackTest.java rename to model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaInferenceStackTest.java diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtilsTest.java b/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtilsTest.java similarity index 100% rename from yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtilsTest.java rename to model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtilsTest.java diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SimpleSchemaContextTest.java b/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SimpleSchemaContextTest.java similarity index 100% rename from yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SimpleSchemaContextTest.java rename to model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SimpleSchemaContextTest.java diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1050Test.java b/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1050Test.java similarity index 100% rename from yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1050Test.java rename to model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1050Test.java diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1060Test.java b/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1060Test.java similarity index 100% rename from yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1060Test.java rename to model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1060Test.java diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1100Test.java b/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1100Test.java similarity index 100% rename from yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1100Test.java rename to model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1100Test.java diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1127Test.java b/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1127Test.java similarity index 100% rename from yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1127Test.java rename to model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1127Test.java diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1231Test.java b/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1231Test.java similarity index 100% rename from yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1231Test.java rename to model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1231Test.java diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1233Test.java b/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1233Test.java similarity index 100% rename from yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1233Test.java rename to model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT1233Test.java diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT588Test.java b/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT588Test.java similarity index 100% rename from yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT588Test.java rename to model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT588Test.java diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT691Test.java b/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT691Test.java similarity index 100% rename from yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT691Test.java rename to model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/YT691Test.java diff --git a/yang/yang-model-util/src/test/resources/leafrefs.yang b/model/yang-model-util/src/test/resources/leafrefs.yang similarity index 100% rename from yang/yang-model-util/src/test/resources/leafrefs.yang rename to model/yang-model-util/src/test/resources/leafrefs.yang diff --git a/yang/yang-model-util/src/test/resources/schema-context-util/imported-module.yang b/model/yang-model-util/src/test/resources/schema-context-util/imported-module.yang similarity index 100% rename from yang/yang-model-util/src/test/resources/schema-context-util/imported-module.yang rename to model/yang-model-util/src/test/resources/schema-context-util/imported-module.yang diff --git a/yang/yang-model-util/src/test/resources/schema-context-util/my-module.yang b/model/yang-model-util/src/test/resources/schema-context-util/my-module.yang similarity index 100% rename from yang/yang-model-util/src/test/resources/schema-context-util/my-module.yang rename to model/yang-model-util/src/test/resources/schema-context-util/my-module.yang diff --git a/yang/yang-model-util/src/test/resources/yt1050.yang b/model/yang-model-util/src/test/resources/yt1050.yang similarity index 100% rename from yang/yang-model-util/src/test/resources/yt1050.yang rename to model/yang-model-util/src/test/resources/yt1050.yang diff --git a/yang/yang-model-util/src/test/resources/yt1060/child.yang b/model/yang-model-util/src/test/resources/yt1060/child.yang similarity index 100% rename from yang/yang-model-util/src/test/resources/yt1060/child.yang rename to model/yang-model-util/src/test/resources/yt1060/child.yang diff --git a/yang/yang-model-util/src/test/resources/yt1060/imported.yang b/model/yang-model-util/src/test/resources/yt1060/imported.yang similarity index 100% rename from yang/yang-model-util/src/test/resources/yt1060/imported.yang rename to model/yang-model-util/src/test/resources/yt1060/imported.yang diff --git a/yang/yang-model-util/src/test/resources/yt1060/parent.yang b/model/yang-model-util/src/test/resources/yt1060/parent.yang similarity index 100% rename from yang/yang-model-util/src/test/resources/yt1060/parent.yang rename to model/yang-model-util/src/test/resources/yt1060/parent.yang diff --git a/yang/yang-model-util/src/test/resources/yt1100.yang b/model/yang-model-util/src/test/resources/yt1100.yang similarity index 100% rename from yang/yang-model-util/src/test/resources/yt1100.yang rename to model/yang-model-util/src/test/resources/yt1100.yang diff --git a/yang/yang-model-util/src/test/resources/yt1127.yang b/model/yang-model-util/src/test/resources/yt1127.yang similarity index 100% rename from yang/yang-model-util/src/test/resources/yt1127.yang rename to model/yang-model-util/src/test/resources/yt1127.yang diff --git a/yang/yang-model-util/src/test/resources/yt1231.yang b/model/yang-model-util/src/test/resources/yt1231.yang similarity index 100% rename from yang/yang-model-util/src/test/resources/yt1231.yang rename to model/yang-model-util/src/test/resources/yt1231.yang diff --git a/yang/yang-model-util/src/test/resources/yt1233.yang b/model/yang-model-util/src/test/resources/yt1233.yang similarity index 100% rename from yang/yang-model-util/src/test/resources/yt1233.yang rename to model/yang-model-util/src/test/resources/yt1233.yang diff --git a/yang/yang-model-util/src/test/resources/yt588.yang b/model/yang-model-util/src/test/resources/yt588.yang similarity index 100% rename from yang/yang-model-util/src/test/resources/yt588.yang rename to model/yang-model-util/src/test/resources/yt588.yang diff --git a/yang/yang-model-util/src/test/resources/yt691/bar-sub1.yang b/model/yang-model-util/src/test/resources/yt691/bar-sub1.yang similarity index 100% rename from yang/yang-model-util/src/test/resources/yt691/bar-sub1.yang rename to model/yang-model-util/src/test/resources/yt691/bar-sub1.yang diff --git a/yang/yang-model-util/src/test/resources/yt691/bar.yang b/model/yang-model-util/src/test/resources/yt691/bar.yang similarity index 100% rename from yang/yang-model-util/src/test/resources/yt691/bar.yang rename to model/yang-model-util/src/test/resources/yt691/bar.yang diff --git a/yang/yang-model-util/src/test/resources/yt691/baz.yang b/model/yang-model-util/src/test/resources/yt691/baz.yang similarity index 100% rename from yang/yang-model-util/src/test/resources/yt691/baz.yang rename to model/yang-model-util/src/test/resources/yt691/baz.yang diff --git a/yang/yang-model-util/src/test/resources/yt691/foo-sub1.yang b/model/yang-model-util/src/test/resources/yt691/foo-sub1.yang similarity index 100% rename from yang/yang-model-util/src/test/resources/yt691/foo-sub1.yang rename to model/yang-model-util/src/test/resources/yt691/foo-sub1.yang diff --git a/yang/yang-model-util/src/test/resources/yt691/foo-sub2.yang b/model/yang-model-util/src/test/resources/yt691/foo-sub2.yang similarity index 100% rename from yang/yang-model-util/src/test/resources/yt691/foo-sub2.yang rename to model/yang-model-util/src/test/resources/yt691/foo-sub2.yang diff --git a/yang/yang-model-util/src/test/resources/yt691/foo.yang b/model/yang-model-util/src/test/resources/yt691/foo.yang similarity index 100% rename from yang/yang-model-util/src/test/resources/yt691/foo.yang rename to model/yang-model-util/src/test/resources/yt691/foo.yang diff --git a/pom.xml b/pom.xml index 9b5f7f9473..997a9ea180 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,7 @@ bundle-parent common data + model plugin tools diff --git a/yang/pom.xml b/yang/pom.xml index 69ce8784f9..9c60883649 100644 --- a/yang/pom.xml +++ b/yang/pom.xml @@ -34,7 +34,6 @@ yang-data-codec-binfmt yang-data-codec-gson yang-data-codec-xml - yang-model-export yang-xpath-api @@ -42,12 +41,6 @@ yang-xpath-impl - - yang-model-api - yang-model-spi - yang-model-ri - yang-model-util - yang-parser-api yang-test-util @@ -68,42 +61,33 @@ yang-parser-antlr yang-parser-rfc7950 - - openconfig-model-api openconfig-parser-support - odlext-model-api odlext-parser-support - rfc6241-model-api rfc6241-parser-support - rfc6536-model-api rfc6536-parser-support - rfc6643-model-api rfc6643-parser-support rfc7952-data-api rfc7952-data-util - rfc7952-model-api rfc7952-parser-support - rfc8040-model-api rfc8040-parser-support rfc8528-data-api rfc8528-data-util - rfc8528-model-api rfc8528-parser-support -- 2.36.6