diff --git a/documentation/IDTA-01001/modules/ROOT/nav.adoc b/documentation/IDTA-01001/modules/ROOT/nav.adoc
index bd0f67c93..f856edd73 100644
--- a/documentation/IDTA-01001/modules/ROOT/nav.adoc
+++ b/documentation/IDTA-01001/modules/ROOT/nav.adoc
@@ -21,7 +21,7 @@ Plattform Industrie 4.0; Anna Salari, Publik. Agentur für Kommunikation GmbH, d
 :xrefstyle: short
 
 
-include::../Constraints/constraints.adoc[]
+include::./IDTA-01001_Constraints.adoc[]
 
 
 = image:../../idta-logo.png[width=100%]
@@ -30,30 +30,30 @@ include::../Constraints/constraints.adoc[]
 include::Sections/index.adoc[]
 ////
 
-include::../Shared/Sections/IDTA-01xxx_TermsDefinitionsAbbreviations.adoc[]
+include::Shared:IDTA-01xxx_TermsDefinitionsAbbreviations.adoc[]
 
-include::Sections/IDTA-01001_Preamble.adoc[]
+include::./IDTA-01001_Preamble.adoc[]
 
 
-include::Sections/IDTA-01001.adoc[]
+include::./IDTA-01001.adoc[]
 
 
 
-include::Annex/IDTA-01001_ConceptsAAS.adoc[]
+include::./Annex/IDTA-01001_ConceptsAAS.adoc[]
 
-include::Annex/IDTA-01001_Requirements.adoc[]
+include::./Annex/IDTA-01001_Requirements.adoc[]
 
-include::../Shared/Annex/IDTA-01xxx_BackusNaurForm.adoc[]
+include::Shared:Annex/IDTA-01xxx_BackusNaurForm.adoc[]
 
-include::../Shared/Annex/IDTA-01xxx_UMLTemplates.adoc[]
+include::Shared:Annex/IDTA-01xxx_UMLTemplates.adoc[]
 
-include::../Shared/Annex/IDTA-01xxx_UML.adoc[]
+include::Shared:Annex/IDTA-01xxx_UML.adoc[]
 
-include::Annex/IDTA-01001_UsageMetamodel.adoc[]
+include::./Annex/IDTA-01001_UsageMetamodel.adoc[]
 
-include::Annex/IDTA-01001_MetamodelWithInheritance.adoc[]
+include::./Annex/IDTA-01001_MetamodelWithInheritance.adoc[]
 
-include::Annex/IDTA-01001_ChangeLog.adoc[]
+include::./Annex/IDTA-01001_ChangeLog.adoc[]
 
-include::../Shared/Annex/IDTA-01xxx_Bibliography.adoc[]
+include::Shared:Annex/IDTA-01xxx_Bibliography.adoc[]
 
diff --git a/documentation/IDTA-01001/modules/ROOT/Annex/IDTA-01001_ChangeLog.adoc b/documentation/IDTA-01001/modules/ROOT/pages/Annex/IDTA-01001_ChangeLog.adoc
similarity index 89%
rename from documentation/IDTA-01001/modules/ROOT/Annex/IDTA-01001_ChangeLog.adoc
rename to documentation/IDTA-01001/modules/ROOT/pages/Annex/IDTA-01001_ChangeLog.adoc
index 4683e746a..817417dc9 100644
--- a/documentation/IDTA-01001/modules/ROOT/Annex/IDTA-01001_ChangeLog.adoc
+++ b/documentation/IDTA-01001/modules/ROOT/pages/Annex/IDTA-01001_ChangeLog.adoc
@@ -185,12 +185,12 @@ Note: Security is still part of the Asset Administration Shell, but the Asset Ad
 |  |AssetKind/Instance |Updated description of value "Instance" of enumeration "AssetKind" conformant to IEC 63278-1
 |  |AssetKind/Type |Updated description of value "Type" of enumeration "AssetKind" conformant to IEC 63278-1
 |X |BasicEvent |Renamed to BasicEventElement and set to \<<Experimental>>
-|file:///C:/__localWork/Asset%20Administration%20Shell%20-%20Verwaltungsschale/Verwaltungsschale%20im%20Detail%20-%20part%201a%20V3.0/Change%202.0%20-%203.0.xlsx#RANGE!#REF![(x)link:#bib2[[2\]]] |xref:BlobType[BlobType |Primitive changed from "group of bytes" to Base64Binary
+|file:///C:/__localWork/Asset%20Administration%20Shell%20-%20Verwaltungsschale/Verwaltungsschale%20im%20Detail%20-%20part%201a%20V3.0/Change%202.0%20-%203.0.xlsx#RANGE!#REF![(x)link:#bib2[[2\]]] |xref:page$IDTA-01001.adoc#BlobType[BlobType |Primitive changed from "group of bytes" to Base64Binary
 |X |ConceptDictionary |Removed
 |X |Constraint |Abstract class removed. Formula now used in Security part only
-|x  |xref:DataSpecification[DataSpecification] |No longer inherits from Identifiable. However, same attribute names and types
+|x  |xref:page$IDTA-01001.adoc#DataSpecification[DataSpecification] |No longer inherits from Identifiable. However, same attribute names and types
 |x |DataSpecification/description |Type changed from LangStringSet to MultiLanguageTextType, thus adding a length constraint
-| |xref:DataSpecificationContent[DataSpecificationContent] |Stereotype \<<Template>> added
+| |xref:page$IDTA-01001.adoc#DataSpecificationContent[DataSpecificationContent] |Stereotype \<<Template>> added
 |(x) |DataTypeDef |Removed and split into DataTypeDefXsd and DataTypeDefRdf. Some types excluded and not supported because now XML Schema 1.0 reference +
  +
 Before: just string allowing any xsd simple type as string +
@@ -209,7 +209,7 @@ Formula now used in Security part only
  +
 Substituted by Identifiable/id
 |x |IdentifiableElements |Renamed to AasIdentifiables
-|x |xref:Identifier[Identifier] a|
+|x |xref:page$IDTA-01001.adoc#Identifier[Identifier] a|
 Type changed
 
 Before struct class with two attributes: id and idType. Now string data type only.
@@ -229,12 +229,12 @@ The elements remain, except for new SubmodelElementList, and renamed submodel el
 |  |LocalKeyType |Enumeration removed because no Key/idType any longer
 |x |MimeType |Type name changed to ContentType
 |x |MultiLanguageProperty/value |Type changed from LangStringSet to MultiLanguageTextType, thus adding a length constraint
-|x |xref:PathType[PathType] |Same as Identifier, i.e. length constraint added
+|x |xref:page$IDTA-01001.adoc#PathType[PathType] |Same as Identifier, i.e. length constraint added
 |  |Property/valueType |Type changed from DataTypeDef to DataTypeDefXsd
 |x |Qualifiable/qualifier |Type changed from Constraint to Qualifier
-|  |xref:Qualifier[Qualifier] |No longer inherits from abstract class "Constraint"
+|  |xref:page$IDTA-01001.adoc#Qualifier[Qualifier] |No longer inherits from abstract class "Constraint"
 |  |Qualifier/valueType |Type changed from DataTypeDef to DataTypeDefXsd
-|x |xref:QualifierType[QualifierType] |Type changed from string to NameType (i.e. length constraint added)
+|x |xref:page$IDTA-01001.adoc#QualifierType[QualifierType] |Type changed from string to NameType (i.e. length constraint added)
 |  |Range/valueType |Type changed from DataTypeDef to DataTypeDefXsd
 |x |Referable/category a|
 Type changed from string to NameType (i.e. length constraint added)
@@ -268,7 +268,7 @@ Now part of AasSubmodelElements
 |  |RelationshipElement/first |Type changes from model reference Referable to Reference (global or model reference)
 |  |RelationshipElement/second |Type changes from model reference Referable to Reference (global or model reference)
 |file:///C:/__localWork/Asset%20Administration%20Shell%20-%20Verwaltungsschale/Verwaltungsschale%20im%20Detail%20-%20part%201a%20V3.0/Change%202.0%20-%203.0.xlsx#RANGE!B79[xlink:#bib1[[1\]]] |SubmodelElement/kind |Removed. SubmodelElement no longer inheritsfrom HasKind
-|  |xref:ValueDataType[ValueDataType] |Before as specified via DataTypeDef, now any xsd atomic type as specified via DataTypeDefXsd
+|  |xref:page$IDTA-01001.adoc#ValueDataType[ValueDataType] |Before as specified via DataTypeDef, now any xsd atomic type as specified via DataTypeDefXsd
 | x |View |Removed
 |===
 
@@ -276,25 +276,25 @@ Now part of AasSubmodelElements
 [cols="5%,41%,51%",options="header",]
 |===
 | |*New Elements V3.0 vs V2.0.1* |*Comment*
-|  |xref:AasIdentifiables[AasIdentifiables] |New enumeration used for References, includes abstract Identifiable +
+|  |xref:page$IDTA-01001.adoc#AasIdentifiables[AasIdentifiables] |New enumeration used for References, includes abstract Identifiable +
  +
 Before: Identifiables
-|  |xref:AasReferableNonIdentifiables[AasReferableNonIdentifiables] |New enumeration used for References
-|  |xref:AasReferables[AasReferables] |New enumeration used for References, includes abstract Referable
-|  |xref:AasSubmodelElements[AasSubmodelElements] |New enumeration used for References +
+|  |xref:page$IDTA-01001.adoc#AasReferableNonIdentifiables[AasReferableNonIdentifiables] |New enumeration used for References
+|  |xref:page$IDTA-01001.adoc#AasReferables[AasReferables] |New enumeration used for References, includes abstract Referable
+|  |xref:page$IDTA-01001.adoc#AasSubmodelElements[AasSubmodelElements] |New enumeration used for References +
  +
 Before: ReferableElements
 |  |AdministrativeInformation/creator |New optional attribute
 |  |AdministrativeInformation/templateId |New optional attribute
 |x |AssetAdministrationShell/assetInformation |Substitute for AssetAdministrationShell/asset; no reference any longer, instead aggregation
-|  |xref:AssetInformation[AssetInformation] |with attributes/functionality from former class Asset because not specific to Asset but AAS
+|  |xref:page$IDTA-01001.adoc#AssetInformation[AssetInformation] |with attributes/functionality from former class Asset because not specific to Asset but AAS
 |  |AssetInformation/assetKind |Former Asset/assetKind
 |  |AssetInformation/assetType |New optional attribute
 |  |AssetInformation/globalAssetId |Former Asset/identification/id
 |  |AssetInformation/specificAssetId |Former Asset/assetIdentificationModel
 |  |AssetInformation/thumbnail |Optional Attribute of new class AssetInformation that was not available in Asset class before
 |  |AssetKind/NotApplicable |New enumeration value
-|  |xref:BasicEventElement[BasicEventElement] |Former BasicEvent +
+|  |xref:page$IDTA-01001.adoc#BasicEventElement[BasicEventElement] |Former BasicEvent +
  +
 New \<<Experimental>> submodel element for events
 |  |BasicEventElement/direction |Was part of non-normative part before
@@ -307,23 +307,23 @@ Type changed from dateTime to duration
 Type changed from dateTime to duration
 | |BasicEventElement/observed |Former name: BasicEvent/observed
 | |BasicEventElement/state |Was part of non-normative part before
-|  |xref:ContentType[ContentType] |Former name: MimeType +
+|  |xref:page$IDTA-01001.adoc#ContentType[ContentType] |Former name: MimeType +
 Maximum length defined: 100 characters
-|  |xref:DataTypeDefRdf[DataTypeDefRdf] |Enumeration for types of Rdf + added prefix rdf: to every value in enumeration
-|  |xref:DataTypeDefXsd[DataTypeDefXsd] |Enumeration that corresponds to anySimpleTypes of XML Schema 1.0 +
+|  |xref:page$IDTA-01001.adoc#DataTypeDefRdf[DataTypeDefRdf] |Enumeration for types of Rdf + added prefix rdf: to every value in enumeration
+|  |xref:page$IDTA-01001.adoc#DataTypeDefXsd[DataTypeDefXsd] |Enumeration that corresponds to anySimpleTypes of XML Schema 1.0 +
  +
 + added prefix xs: to every value in enumeration
 |  |dateTimeStamp |New data type for metamodel as used in EventPayload
 | |DataSpecification/administration |Was inherited before by Identifiable
 | |DataSpecification/id |Was inherited before by Identifiable
 | |DataSpecification/desciption |Was inherited before by Identifiable
-|  |xref:Direction[Direction] |New Enumeration for BasicEventElement
+|  |xref:page$IDTA-01001.adoc#Direction[Direction] |New Enumeration for BasicEventElement
 | |Entity/globalAssetId |Former Entity/asset was split into globalAssetId and specificAssetId
 |  |Entity/specificAssetId |Former Entity/asset was split into globalAssetId and specificAssetId
-|  |xref:Environment[Environment] |New class for entry point for Asset Administration Shells, submodels and concept descriptions.
-|  |xref:EventElement[EventElement] |Former name: Event +
+|  |xref:page$IDTA-01001.adoc#Environment[Environment] |New class for entry point for Asset Administration Shells, submodels and concept descriptions.
+|  |xref:page$IDTA-01001.adoc#EventElement[EventElement] |Former name: Event +
 Set to \<<Experimental>>
-|  |xref:EventPayload[EventPayload] |New experimental class for event payload +
+|  |xref:page$IDTA-01001.adoc#EventPayload[EventPayload] |New experimental class for event payload +
 Was part of non-normative part before
 |  |EventPayload/observableSemanticId |Was part of non-normative part before
 |  |EventPayload/payload |Was part of non-normative part before +
@@ -336,44 +336,44 @@ Type changed from ModelReference(Referable) to ModelReference(EventElement)
 Type changed from dateTimeStamp to dateTime because restriction to types of XML Schema 1.0 that does not contain dateTimeStamp. dateTimeStamp is a derived type of dateTime in XML Schema 1.1
 |  |EventPayload/topic |Was part of non-normative part before +
 Type changed from string to MessageTopicType (i.e. length constraint added, maximum 255 characters)
-|  |xref:Extension[Extension] |New class, part of new abstract class HasExtensions
+|  |xref:page$IDTA-01001.adoc#Extension[Extension] |New class, part of new abstract class HasExtensions
 | |Extension/name | 
 | |Extension/refersTo | 
 | |Extension/valueType | 
 | |Extension/valueType | 
 |  |File/contentType |Fromer File/mimeType
-|  |xref:FragmentKeys[FragmentKeys] |New enumeration used for References
-|  |xref:GenericFragmentKeys[GenericFragmentKeys] |New enumeration used for References
+|  |xref:page$IDTA-01001.adoc#FragmentKeys[FragmentKeys] |New enumeration used for References
+|  |xref:page$IDTA-01001.adoc#GenericFragmentKeys[GenericFragmentKeys] |New enumeration used for References
 |  |GenericGloballyIdentifiers |New enumeration used for References
-|  |xref:GloballyIdentifiables[GloballyIdentifiables] |New enumeration used for References
-|  |xref:HasExtensions[HasExtensions] |New abstract class, inherited by Referable
+|  |xref:page$IDTA-01001.adoc#GloballyIdentifiables[GloballyIdentifiables] |New enumeration used for References
+|  |xref:page$IDTA-01001.adoc#HasExtensions[HasExtensions] |New abstract class, inherited by Referable
 |  |HasSemantics/supplementalSemanticId |New attribute
 |  |Identifiable/id |Substitute for Identifiable/identification
-|  |xref:KeyTypes[KeyTypes] |Before: KeyElements +
+|  |xref:page$IDTA-01001.adoc#KeyTypes[KeyTypes] |Before: KeyElements +
  +
 New submodel element SubmodelElementList added, renamed submodel elements Event and BasicEvent to EventElement and BasicEventElement
-|  |xref:LabelType[LabelType] |New string type with maximum 64 characters
-|  |xref:MessageTopicType[MessageTopicType] |New string type with maximum 255 characters
-| |xref:ModellingKind[ModellingKind] |Renamed enumeration, before: ModelingKind
-|  |xref:MultiLanguageNameType[MultiLanguageNameType] |Substitute for LangStringSet with short multi-language strings, maximum 64 characters
-|  |xref:MultiLanguageTextType[MultiLanguageTextType] |Substitute for LangStringSet with long multi-language strings, maximum 64 characters
-|  |xref:NameType[NameType] |New string type with maximum 128 characters
+|  |xref:page$IDTA-01001.adoc#LabelType[LabelType] |New string type with maximum 64 characters
+|  |xref:page$IDTA-01001.adoc#MessageTopicType[MessageTopicType] |New string type with maximum 255 characters
+| |xref:page$IDTA-01001.adoc#ModellingKind[ModellingKind] |Renamed enumeration, before: ModelingKind
+|  |xref:page$IDTA-01001.adoc#MultiLanguageNameType[MultiLanguageNameType] |Substitute for LangStringSet with short multi-language strings, maximum 64 characters
+|  |xref:page$IDTA-01001.adoc#MultiLanguageTextType[MultiLanguageTextType] |Substitute for LangStringSet with long multi-language strings, maximum 64 characters
+|  |xref:page$IDTA-01001.adoc#NameType[NameType] |New string type with maximum 128 characters
 |  |Qualifier/kind |New experimental attribute for Qualifier
-|  |xref:QualifierKind[QualifierKind] |New enumeration for Qualifier/kind
+|  |xref:page$IDTA-01001.adoc#QualifierKind[QualifierKind] |New enumeration for Qualifier/kind
 |  |Referable/displayName |New optional attribute for all referables
 |  |Reference/referredSemanticId |New optional attribute for Reference
 | |Reference/type |New mandatory attribute for Reference
-|  |xref:ReferenceTypes[ReferenceTypes] |New enumeration for Reference/type
+|  |xref:page$IDTA-01001.adoc#ReferenceTypes[ReferenceTypes] |New enumeration for Reference/type
 |  |ReferenceTypes/ExternalReference |Enumeration value, was named GlobalReference before
-|  |xref:Resource[Resource] |new type for AssetInformation/defaultThumbnail
+|  |xref:page$IDTA-01001.adoc#Resource[Resource] |new type for AssetInformation/defaultThumbnail
 |  |ShortNameType |New string type with maximum 64 characters
-|  |xref:SpecificAssetId[SpecificAssetId] |New type for AssetInformation/specificAssetId
+|  |xref:page$IDTA-01001.adoc#SpecificAssetId[SpecificAssetId] |New type for AssetInformation/specificAssetId
 |  |SpecificAssetId/externalSubjectId |See Attribute Based Access Control (ABAC) for subject concept
 |  |SpecificAssetId/name |New type for AssetInformation/specificAssetId
 |  |SpecificAssetId/value |New type for AssetInformation/specificAssetId
-|  |xref:StateOfEvent[StateOfEvent] |New experimental enumeration for BasicEventElement
+|  |xref:page$IDTA-01001.adoc#StateOfEvent[StateOfEvent] |New experimental enumeration for BasicEventElement
 |  |SubmodelElementElements |Enumeration for submodel elements (split of ReferableElements)
-|  |xref:SubmodelElementList[SubmodelElementList] |Before SubmodelElementCollection was used for lists and collections
+|  |xref:page$IDTA-01001.adoc#SubmodelElementList[SubmodelElementList] |Before SubmodelElementCollection was used for lists and collections
 |  |SubmodelElementList/orderRelevant |Similar to SubmodelElementCollection/ordered
 |  |SubmodelElementList/semanticIdListElement |Attribute of new class SubmodelElementList
 |  |SubmodelElementList/typeValueListElement |Attribute of new class SubmodelElementList
@@ -534,17 +534,17 @@ Smaller changes
 [cols="5%,32%,61%",options="header",]
 |===
 |*nc* |*V3.0 Change w.r.t. V3.0RC02* |*Comment*
-| |xref:AdministrativeInformation[AdministrativeInformation] |Stereotype \<<dataType>> removed
+| |xref:page$IDTA-01001.adoc#AdministrativeInformation[AdministrativeInformation] |Stereotype \<<dataType>> removed
 | |AssetInformation/externalSubjectId |Not mandatory any longer; now optional
 |x |AssetInformation/globalAssetId |Type changed from Reference to Identifier
 | |AssetKind/Type |Updated description of value "Type" of enumeration "AssetKind" conformant to IEC 63278-1
 | |AssetKind/Instance |Updated description of value "Instance" of enumeration "AssetKind" - conformant to IEC 63278-1
-| |xref:BasicEventElement[BasicEventElement] |Set to \<<Experimental>>
+| |xref:page$IDTA-01001.adoc#BasicEventElement[BasicEventElement] |Set to \<<Experimental>>
 |x |BasicEventElement/messageTopic |Type changed from string to MessageTopicType (i.e. length constraint added, maximum 255 characters)
 |x |BasicEventElement/minInterval |Type changed from dateTime to duration
 |x |BasicEventElement/maxInterval |Type changed from dateTime to duration
-|(x)footnote:[Derived Schemata used Base64Binary and not hexBinary, therefore this change is considered to be backward compatible for most applications.] |xref:BlobType[BlobType] |Primitive changed from "group of bytes" to Base64Binary
-| |xref:ContentType[ContentType] |Maximum length defined: 100 characters
+|(x)footnote:[Derived Schemata used Base64Binary and not hexBinary, therefore this change is considered to be backward compatible for most applications.] |xref:page$IDTA-01001.adoc#BlobType[BlobType] |Primitive changed from "group of bytes" to Base64Binary
+| |xref:page$IDTA-01001.adoc#ContentType[ContentType] |Maximum length defined: 100 characters
 | |decimalBuildInTypes |Removed
 | |durationBuildInTypes |Removed
 |x |DataSpecification/description |Type changed from LangStringSet to MultiLanguageTextType; length constraint added
@@ -552,24 +552,24 @@ Smaller changes
 |x |DateTypeDefXsd/dateTimeStamp |Removed since not part of XML Schema 1.0
 |x |DataTypeDefXsd/dayTimeDuration |Removed since not part of XML Schema 1.0
 |x |DataTypeDefXsd/yearMonthDuration |Removed since not part of XML Schema 1.0
-| |xref:Direction[Direction] |Set to \<<Experimental>>
+| |xref:page$IDTA-01001.adoc#Direction[Direction] |Set to \<<Experimental>>
 |x |Entity/globalAssetId |Type changed from Reference to Identifier
 |x |Extension/name |Type changed from string to NameType; length constraint added
-| |xref:EventElement[EventElement] |Set to \<<Experimental>>
+| |xref:page$IDTA-01001.adoc#EventElement[EventElement] |Set to \<<Experimental>>
 | |EventElement/duration |Type changed from dateTimeStamp to dateTime
-| |xref:EventPayload[EventPayload] |Set to \<<Experimental>>
+| |xref:page$IDTA-01001.adoc#EventPayload[EventPayload] |Set to \<<Experimental>>
 | |EventPayload/payload |Type changed from string to BlobType
 | |EventPayload/source |Type changed from ModelReference(Referable) to ModelReference(EventElement)
 | |EventPayload/timestamp |Type changed from dateTimeStamp to dateTime because restriction to types of XML Schema 1.0 that does not contain dateTimeStamp. dateTimeStamp is a derived type of dateTime in XML Schema 1.1
 | |EventPayload/topic |Type changed from string to MessageTopicType (i.e. length constraint added, maximum 255 characters)
 |x |HasKind/kind |Type changed from ModelingKind to ModellingKind
-|x |xref:Identifier[Identifier] |Maximum length defined: 2,000 characters
+|x |xref:page$IDTA-01001.adoc#Identifier[Identifier] |Maximum length defined: 2,000 characters
 |x |Key/value |Type changed from string to Identifier; length constraint added
 |x |MultiLanguageProperty/value |Type changed from LangStringSet to MultiLanguageTextType; length constraint added
-|x |xref:PathType[PathType] |Same as Identifier; length constraint added
+|x |xref:page$IDTA-01001.adoc#PathType[PathType] |Same as Identifier; length constraint added
 | |PrimitiveTypes |Removed
 | |Qualifier/kind |Set to \<<Experimental>>
-|x |xref:QualifierType[QualifierType] |Type changed from string to NameType; length constraint added
+|x |xref:page$IDTA-01001.adoc#QualifierType[QualifierType] |Type changed from string to NameType; length constraint added
 | |rdfBuildInTypes |Removed
 |x |Referable/category a|
 Type changed from string to NameType; length constraint added
@@ -585,8 +585,8 @@ Text how to select a suitable display name removed; now explained in Table 2
 |x |Referable/description |Type changed from string to MultiLanguageTextType; length constraint added
 |x |Referable/idShort |Type changed from string to NameType; length constraint added
 |x |ReferenceTypes/GlobalReference |Renamed to ExternalReference
-| |xref:Resource[Resource] |Stereotype \<<DataType>> removed.
-| |xref:StateOfEvent[StateOfEvent] |Set to \<<Experimental>>
+| |xref:page$IDTA-01001.adoc#Resource[Resource] |Stereotype \<<DataType>> removed.
+| |xref:page$IDTA-01001.adoc#StateOfEvent[StateOfEvent] |Set to \<<Experimental>>
 |x |SpecificAssetId/name |Type changed from string to LabelType (a string with length constraint)
 |x |SpecificAssetId/value |Type changed from string to Identifier (because of length constraint)
 |xfootnote:[Since _HasKind/kind_ had the default _Instance,_ this change has no impact if the attribute was omitted for submodel instances.] |SubmodelElement/kind |Removed. SubmodelElement does not inherit from HasKind any longer
@@ -600,16 +600,16 @@ Text how to select a suitable display name removed; now explained in Table 2
 | |AdministrativeInformation/templateId |New optional attribute
 | |AssetInformation/assetType |New optional attribute
 | |AssetKind/NotApplicable |New enumeration value
-| |xref:LabelType[LabelType] |New string type with maximum 64 characters
-| |xref:MessageTopicType[MessageTopicType] |New string type with maximum 255 characters
-| |xref:ModellingKind[ModellingKind] |Renamed enumeration, before: ModelingKind
-| |xref:MultiLanguageNameType[MultiLanguageNameType] |Substitute for LangStringSet with short multi-language strings, maximum 64 characters
-| |xref:MultiLanguageTextType[MultiLanguageTextType] |Substitute for LangStringSet with long multi-language strings, maximum 64 characters
-| |xref:NameType[NameType] |New string type with maximum 128 characters
+| |xref:page$IDTA-01001.adoc#LabelType[LabelType] |New string type with maximum 64 characters
+| |xref:page$IDTA-01001.adoc#MessageTopicType[MessageTopicType] |New string type with maximum 255 characters
+| |xref:page$IDTA-01001.adoc#ModellingKind[ModellingKind] |Renamed enumeration, before: ModelingKind
+| |xref:page$IDTA-01001.adoc#MultiLanguageNameType[MultiLanguageNameType] |Substitute for LangStringSet with short multi-language strings, maximum 64 characters
+| |xref:page$IDTA-01001.adoc#MultiLanguageTextType[MultiLanguageTextType] |Substitute for LangStringSet with long multi-language strings, maximum 64 characters
+| |xref:page$IDTA-01001.adoc#NameType[NameType] |New string type with maximum 128 characters
 | |ReferenceTypes/ExternalReference |Enumeration value: before: GlobalReference
-| |xref:RevisionType[RevisionType] |New type for _AdministrativeInformation/version_ with length constraints and regular expression
+| |xref:page$IDTA-01001.adoc#RevisionType[RevisionType] |New type for _AdministrativeInformation/version_ with length constraints and regular expression
 | |ShortNameType |New string type with maximum 64 characters
-| |xref:VersionType[VersionType] |New type for _AdministrativeInformation/revision_ with length constraints and regular expression
+| |xref:page$IDTA-01001.adoc#VersionType[VersionType] |New type for _AdministrativeInformation/revision_ with length constraints and regular expression
 |===
 
 .New, Changed or Removed Constraints
@@ -739,8 +739,8 @@ Note: ReferableElements was substituted by AasSubmodelElements and Aas Identifia
 [cols="5%,43%,50%",options="header",]
 |===
 |*nc* |*V3.0RC02 Change w.r.t. V2.0.1* |*Comment*
-| |xref:AdministrativeInformation[AdministrativeInformation] |Bugfix: Stereotype "DataType" added
-| |AnnotatedRelationship/annotation |Bugfix: Type changed from ModelReference<xref:DataElement[DataElement]> to DataElement
+| |xref:page$IDTA-01001.adoc#AdministrativeInformation[AdministrativeInformation] |Bugfix: Stereotype "DataType" added
+| |AnnotatedRelationship/annotation |Bugfix: Type changed from ModelReference<xref:page$IDTA-01001.adoc#DataElement[DataElement]> to DataElement
 | |anySimpleTypeDef |Type removed, was no longer used in any class definition, was mentioned in text only
 |x |Asset |Removed, asset referenced via AssetInformation/globalAssetId only
 |x |AssetAdministrationShell/asset |Removed, substituted by AssetAdministrationShell/assetInformation (no reference any longer, instead now aggregation)
@@ -780,7 +780,7 @@ Removed
 Substituted by Identifiable/id
 
 |x |IdentifiableElements |Renamed to AasIdentifiables
-|x |xref:Identifier[Identifier] a|
+|x |xref:page$IDTA-01001.adoc#Identifier[Identifier] a|
 Type changed
 
 Before struct class with two attributes: id and idType; now string data type only
@@ -802,7 +802,7 @@ Note: the elements remain, except for new SubmodelElementList and renamed submod
 |x |MimeType |Type name changed to ContentType
 | |Property/valueType |Type changed from DataTypeDef to DataTypeDefXsd
 |x |Qualifiable/qualifier |Type changed from Constraint to Qualifier
-| |xref:Qualifier[Qualifier] |No longer inherits from abstract class "Constraint"
+| |xref:page$IDTA-01001.adoc#Qualifier[Qualifier] |No longer inherits from abstract class "Constraint"
 | |Qualifier/valueType |Type changed from DataTypeDef to DataTypeDefXsd
 | |Range/valueType |Type changed from DataTypeDef to DataTypeDefXsd
 | |Referable/idShort |Now optional, was mandatory
@@ -830,7 +830,7 @@ Now part of AasSubmodelElements
 
 | |RelationshipElement/first |Type changes from model reference Referable to Reference (global or model reference)
 | |RelationshipElement/second |Type changes from model reference Referable to Reference (global or model reference)
-| |xref:ValueDataType[ValueDataType] |Before as specified via DataTypeDef, now any xsd atomic type as specified via DataTypeDefXsd
+| |xref:page$IDTA-01001.adoc#ValueDataType[ValueDataType] |Before as specified via DataTypeDef, now any xsd atomic type as specified via DataTypeDefXsd
 | x |View |Removed
 |===
 
@@ -848,15 +848,15 @@ New enumeration used for References, includes abstract Identifiable
 
 Before: Identifiables
 
-| |xref:AasReferableNonIdentifiables[AasReferableNonIdentifiables] |New enumeration used for References
-| |xref:AasReferables[AasReferables] |New enumeration used for References, includes abstract Referable
+| |xref:page$IDTA-01001.adoc#AasReferableNonIdentifiables[AasReferableNonIdentifiables] |New enumeration used for References
+| |xref:page$IDTA-01001.adoc#AasReferables[AasReferables] |New enumeration used for References, includes abstract Referable
 |x |AssetAdministrationShell/assetInformation |substitute for AssetAdministrationShell/asset; no reference any longer, instead now aggregation
-| |xref:AssetInformation[AssetInformation] |with attributes/functionality from former class Asset, because not specific to Asset but to AAS
+| |xref:page$IDTA-01001.adoc#AssetInformation[AssetInformation] |with attributes/functionality from former class Asset, because not specific to Asset but to AAS
 | |AssetInformation/assetKind |Former Asset/assetKind
 | |AssetInformation/globalAssetId |Former Asset/identification/id
 | |AssetInformation/specificAssetId |Former Asset/assetIdentificationModel
 | |AssetInformation/thumbnail |Optional Attribute of new class AssetInformation that was not available in Asset class before
-| |xref:BasicEventElement[BasicEventElement] a|
+| |xref:page$IDTA-01001.adoc#BasicEventElement[BasicEventElement] a|
 Former name: BasicEvent
 
 Was part of non-normative part before
@@ -873,30 +873,30 @@ Was part of non-normative part before
 | |BasicEventElement/maxInterval |Was part of non-normative part before
 | |BasicEventElement/observed |Was part of non-normative part before
 | |BasicEventElement/state |Was part of non-normative part before
-| |xref:ContentType[ContentType] |Former name: MimeType
+| |xref:page$IDTA-01001.adoc#ContentType[ContentType] |Former name: MimeType
 | |dateTimeStamp |New data type for metamodel as used in EventPayload
-| |xref:DataTypeDefRdf[DataTypeDefRdf] |Enumeration for types of Rdf + prefix rdf: added to every value in enumeration
+| |xref:page$IDTA-01001.adoc#DataTypeDefRdf[DataTypeDefRdf] |Enumeration for types of Rdf + prefix rdf: added to every value in enumeration
 | |DataTypeDefXsd a|
 Enumeration consisting of enumerations
 
 decimalBuildInTypes, durationBuildInTypes, PrimitiveTypes that correspond to anySimpleTypes of xsd. + added prefix xs: to every value in enumeration
 
-| |xref:Direction[Direction] |New enumeration for BasicEventElement
-| |xref:Environment[Environment] |New class for entry point for Asset Administration Shells, submodels and concept descriptions
-| |xref:EventElement[EventElement] |Former name: Event
-| |xref:EventPayload[EventPayload] |New class for event payload
+| |xref:page$IDTA-01001.adoc#Direction[Direction] |New enumeration for BasicEventElement
+| |xref:page$IDTA-01001.adoc#Environment[Environment] |New class for entry point for Asset Administration Shells, submodels and concept descriptions
+| |xref:page$IDTA-01001.adoc#EventElement[EventElement] |Former name: Event
+| |xref:page$IDTA-01001.adoc#EventPayload[EventPayload] |New class for event payload
 | |EventPayload/observableSemanticId |Was part of non-normative part before
 | |EventPayload/payload |Was part of non-normative part before
 | |EventPayload/source |Was part of non-normative part before
 | |EventPayload/sourceSemanticId |Was part of non-normative part before
 | |EventPayload/subjectId |Was part of non-normative part before
 | |EventPayload/timestamp |Was part of non-normative part before
-| |xref:Extension[Extension] |New class, part of new abstract class HasExtensions
-| |xref:FragmentKeys[FragmentKeys] |New enumeration used for References
-| |xref:GenericFragmentKeys[GenericFragmentKeys] |New enumeration used for References
+| |xref:page$IDTA-01001.adoc#Extension[Extension] |New class, part of new abstract class HasExtensions
+| |xref:page$IDTA-01001.adoc#FragmentKeys[FragmentKeys] |New enumeration used for References
+| |xref:page$IDTA-01001.adoc#GenericFragmentKeys[GenericFragmentKeys] |New enumeration used for References
 | |GenericGloballyIdentifiers |New enumeration used for References
-| |xref:GloballyIdentifiables[GloballyIdentifiables] |New enumeration used for References
-| |xref:HasExtensions[HasExtensions] |New abstract class, inherited by Referable
+| |xref:page$IDTA-01001.adoc#GloballyIdentifiables[GloballyIdentifiables] |New enumeration used for References
+| |xref:page$IDTA-01001.adoc#HasExtensions[HasExtensions] |New abstract class, inherited by Referable
 | |HasSemantics/supplementalSemanticId |New attribute
 | |Identifiable/id |Substitute for Identifiable/identification
 | |IdentifierKeyValuePair |New class for AssetInformation/specificAssetId
@@ -906,15 +906,15 @@ Before: KeyElements
 New submodel element SubmodelElementList added, submodel elements Event and BasicEvent to EventElement and BasicEventElement renamed
 
 | |Qualifier/kind |New attribute for Qualifier
-| |xref:QualifierKind[QualifierKind] |New enumeration for Qualifier/kind
+| |xref:page$IDTA-01001.adoc#QualifierKind[QualifierKind] |New enumeration for Qualifier/kind
 |  |PrimitiveTypes |Enumeration for DataTypeDefXsd
 | |Referable/checksum |New optional attribute for all referables
 | |Referable/displayName |New optional attribute for all referables
 | |Reference/referredSemanticId |New optional attribute for Reference
 |x |Reference/type |New mandatory attribute for Reference
-| |xref:ReferenceTypes[ReferenceTypes] |New enumeration for Reference/type
-| |xref:StateOfEvent[StateOfEvent] |New enumeration for BasicEventElement
-| |xref:SpecificAssetId[SpecificAssetId] |New type for AssetInformation/specificAssetId
+| |xref:page$IDTA-01001.adoc#ReferenceTypes[ReferenceTypes] |New enumeration for Reference/type
+| |xref:page$IDTA-01001.adoc#StateOfEvent[StateOfEvent] |New enumeration for BasicEventElement
+| |xref:page$IDTA-01001.adoc#SpecificAssetId[SpecificAssetId] |New type for AssetInformation/specificAssetId
 | |SpecificAssetId/name |New type for AssetInformation/specificAssetId
 | |SpecificAssetId/value |New type for AssetInformation/specificAssetId
 | |SpecificAssetId/externalSubjectId a|
@@ -923,7 +923,7 @@ New type for AssetInformation/specificAssetId
 See Attribute Based Access Control (ABAC) for subject concept
 
 | |SubmodelElementElements |Enumeration for submodel elements (split of ReferableElements)
-|  |xref:SubmodelElementList[SubmodelElementList] |Before SubmodelElementCollection was used for lists and structs
+|  |xref:page$IDTA-01001.adoc#SubmodelElementList[SubmodelElementList] |Before SubmodelElementCollection was used for lists and structs
 | |SubmodelElementList/orderRelevant |Similar to SubmodelElementCollection/ordered
 | |SubmodelElementList/value |Similar to SubmodelElementCollection/value but ordered and with all elements having the same semanticId
 | |SubmodelElementList/semanticIdListElement |Attribute of new class SubmodelElementList
@@ -1015,7 +1015,7 @@ Constraint AASD-120: idShort of submodel elements within a SubmodelElementList s
 [cols="5%,46%,43%",options="header",]
 |===
 |*nc* |*V3.0RC02 Change w.r.t. V2.0.1* |*Comment*
-| |xref:DataSpecification[DataSpecification] a|
+| |xref:page$IDTA-01001.adoc#DataSpecification[DataSpecification] a|
 Stereotype \<<Template>> added + does not inherit from Identifiable any longer because Data Specification are handled in a different way
 
 Some attributes are added to DataSpecification as new attributes like id, administration and description.(see separate entries)
@@ -1025,7 +1025,7 @@ Some attributes are added to DataSpecification as new attributes like id, admini
 | |DataSpecification/idShort |Removed, was inherited before by Identifiable
 |x |DataSpecificationIEC61360/value |Type changed from ValueDataType to string
 | |DataSpecificationIEC61360/valueId |Removed, the valueId is identical to the ID of the concept description
-| |xref:DataSpecificationContent[DataSpecificationContent] |Stereotype \<<Template>> added
+| |xref:page$IDTA-01001.adoc#DataSpecificationContent[DataSpecificationContent] |Stereotype \<<Template>> added
 |x |DataTypeIEC61360 |Some new values were added: BLOB, FILE, HTML, IRDI. URL renamed to IRI. +
  +
 See separate entries for individual changes.
@@ -1171,8 +1171,8 @@ Bugfixes:
 [cols="5%,45%,51%",options="header",]
 |===
 |*nc* |*V3.0RC02 Change w.r.t. V3.0RC01* |*Comment*
-| |xref:AdministrativeInformation[AdministrativeInformation] |Bugfix: Stereotype "DataType" added
-| |AnnotatedRelationship/annotation |Type changed from ModelReference<xref:DataElement[DataElement]> to DataElement
+| |xref:page$IDTA-01001.adoc#AdministrativeInformation[AdministrativeInformation] |Bugfix: Stereotype "DataType" added
+| |AnnotatedRelationship/annotation |Type changed from ModelReference<xref:page$IDTA-01001.adoc#DataElement[DataElement]> to DataElement
 |x |Asset |Removed, asset referenced via globalAssetId only
 |x |AssetAdministrationShell/security a|
 Removed
@@ -1200,7 +1200,7 @@ Bugfix:
 Type change from reference of Reference to Reference (from Reference* to Reference)
 
 |x |Event |Renamed to EventElement
-|x |Extension/refersTo |Type changed from Reference to ModelReference<xref:Referable[Referable]>
+|x |Extension/refersTo |Type changed from Reference to ModelReference<xref:page$IDTA-01001.adoc#Referable[Referable]>
 |x |File/mimeType |Renamed to contentType + Type name changed from MimeType to ContentType
 |x |Formula |Now abstract class now used in Security part only
 |x |Formula/dependsOn |Removed since formula language not yet defined
@@ -1210,7 +1210,7 @@ Removed
 Substituted by Identifiable/id
 
 |(x) |IdentifiableElements |Renamed to AasIdentifiables
-|x |xref:Identifier[Identifier] a|
+|x |xref:page$IDTA-01001.adoc#Identifier[Identifier] a|
 Type changed
 
 Before struct class with two attributes: id and idType; now string data type only
@@ -1232,7 +1232,7 @@ Note: the elements remain, except for new SubmodelElementList and renamed submod
 |x |MimeType |Type name changed to ContentType
 | |Property/valueType |Type changed from DataTypeDef to DataTypeDefXsd
 |x |Qualifiable/qualifier |Type changed from Constraint to Qualifier
-| |xref:Qualifier[Qualifier] |Does not inherit from abstract class "Constraint" any longer
+| |xref:page$IDTA-01001.adoc#Qualifier[Qualifier] |Does not inherit from abstract class "Constraint" any longer
 | |Qualifier/valueType |Type changed from DataTypeDef to DataTypeDefXsd
 | |Range/valueType |Type changed from DataTypeDef to DataTypeDefXsd
 | |Referable/idShort |Now optional, was mandatory
@@ -1259,7 +1259,7 @@ Now part of AasSubmodelElements
 
 | |RelationshipElement/first |Type changes from model reference Referable to Reference (global or model reference)
 | |RelationshipElement/second |Type changes from model reference Referable to Reference (global or model reference)
-| |xref:ValueDataType[ValueDataType] |Before as specified via DataTypeDef, now any xsd atomic type as specified via DataTypeDefXsd + Prefix xs: added to every value in list
+| |xref:page$IDTA-01001.adoc#ValueDataType[ValueDataType] |Before as specified via DataTypeDef, now any xsd atomic type as specified via DataTypeDefXsd + Prefix xs: added to every value in list
 |x |ValueList/valueReferencePairType |Bugfix: renamed to ValueList/valueReferencePairs
 | x |View |removed
 |===
@@ -1278,9 +1278,9 @@ New enumeration used for References, includes abstract Identifiable
 
 Before: Identifiables
 
-| |xref:AasReferableNonIdentifiables[AasReferableNonIdentifiables] |New enumeration used for References
-| |xref:AasReferables[AasReferables] |New enumeration used for References, includes abstract Referable
-| |xref:BasicEventElement[BasicEventElement] |Former name: BasicEvent
+| |xref:page$IDTA-01001.adoc#AasReferableNonIdentifiables[AasReferableNonIdentifiables] |New enumeration used for References
+| |xref:page$IDTA-01001.adoc#AasReferables[AasReferables] |New enumeration used for References, includes abstract Referable
+| |xref:page$IDTA-01001.adoc#BasicEventElement[BasicEventElement] |Former name: BasicEvent
 | |BasicEventElement/direction |
 | |BasicEventElement/lastUpdate |
 | |BasicEventElement/messageBroker |
@@ -1289,16 +1289,16 @@ Before: Identifiables
 | |BasicEventElement/maxInterval |
 | |BasicEventElement/observed |Former name: BasicEvent/observed
 | |BasicEventElement/state |
-| |xref:ContentType[ContentType] |Former name: MimeType
-| |xref:DataTypeDefRdf[DataTypeDefRdf] |Enumeration for types of Rdf + prefix rdf: added to every value in enumeration
-| |xref:DataTypeDefXsd[DataTypeDefXsd] |Enumeration consisting of enumerations decimalBuildInTypes, durationBuildInTypes, PrimitiveTypes that correspond to anySimpleTypes of xsd. + prefix xs: added to every value in enumeration
+| |xref:page$IDTA-01001.adoc#ContentType[ContentType] |Former name: MimeType
+| |xref:page$IDTA-01001.adoc#DataTypeDefRdf[DataTypeDefRdf] |Enumeration for types of Rdf + prefix rdf: added to every value in enumeration
+| |xref:page$IDTA-01001.adoc#DataTypeDefXsd[DataTypeDefXsd] |Enumeration consisting of enumerations decimalBuildInTypes, durationBuildInTypes, PrimitiveTypes that correspond to anySimpleTypes of xsd. + prefix xs: added to every value in enumeration
 | |dateTimeStamp |New data type for metamodel as used in EventPayload
 |  |decimalBuildInTypes |Enumeration for DataTypeDef
-| |xref:Direction[Direction] |New enumeration for BasicEventElement
+| |xref:page$IDTA-01001.adoc#Direction[Direction] |New enumeration for BasicEventElement
 |  |durationBuildInTypes |Enumeration for DataTypeDef
-| |xref:Environment[Environment] |New class for entry point for Asset Administration Shells, submodels and concept descriptions
-| |xref:EventElement[EventElement] |Former name: Event
-| |xref:EventPayload[EventPayload] |New class for event payload
+| |xref:page$IDTA-01001.adoc#Environment[Environment] |New class for entry point for Asset Administration Shells, submodels and concept descriptions
+| |xref:page$IDTA-01001.adoc#EventElement[EventElement] |Former name: Event
+| |xref:page$IDTA-01001.adoc#EventPayload[EventPayload] |New class for event payload
 | |EventPayload/observableReference |
 | |EventPayload/observableSemanticId |
 | |EventPayload/payload |
@@ -1308,10 +1308,10 @@ Before: Identifiables
 | |EventPayload/timestamp |
 | |EventPayload/topic |
 | |File/contentType |Former name: mimeType
-| |xref:FragmentKeys[FragmentKeys] |New enumeration used for References
-| |xref:GenericFragmentKeys[GenericFragmentKeys] |New enumeration used for References
+| |xref:page$IDTA-01001.adoc#FragmentKeys[FragmentKeys] |New enumeration used for References
+| |xref:page$IDTA-01001.adoc#GenericFragmentKeys[GenericFragmentKeys] |New enumeration used for References
 | |GenericGloballyIdentifiers |New enumeration used for References
-| |xref:GloballyIdentifiables[GloballyIdentifiables] |New enumeration used for References
+| |xref:page$IDTA-01001.adoc#GloballyIdentifiables[GloballyIdentifiables] |New enumeration used for References
 | |HasSemantics/supplementalSemanticId |New attribute
 | |Identifiable/id |Substitute for Identifiable/identification
 | |KeyTypes a|
@@ -1324,15 +1324,15 @@ New submodel element SubmodelElementList added, renamed submodel elements Event
 | |Reference/referredSemanticId |New optional attribute of Reference
 |  |PrimitiveTypes |Enumeration for DataTypeDefXsd
 | |Qualifier/kind |New attribute for Qualifier
-| |xref:QualifierKind[QualifierKind] |New enumeration for Qualifier/kind
+| |xref:page$IDTA-01001.adoc#QualifierKind[QualifierKind] |New enumeration for Qualifier/kind
 | |Referable/checksum |
-| |xref:SpecificAssetId[SpecificAssetId] |Before: IdentifierKeyValuePair, was renamed
+| |xref:page$IDTA-01001.adoc#SpecificAssetId[SpecificAssetId] |Before: IdentifierKeyValuePair, was renamed
 | |SpecificAssetId/name |Before: IdentifierKeyValuePair/key, was renamed
 | |SpecificAssetId/value |Before: IdentifierKeyValuePair/value
 | |SpecificAssetId/externalSubjectId |Before: IdentifierKeyValuePair/externalSubjectId
-| |xref:StateOfEvent[StateOfEvent] |New enumeration for BasicEventElement
+| |xref:page$IDTA-01001.adoc#StateOfEvent[StateOfEvent] |New enumeration for BasicEventElement
 | |SubmodelElementElements |Enumeration for submodel elements (split of ReferableElements into SubmodelElementElements and IdentifiableElements)
-|  |xref:SubmodelElementList[SubmodelElementList] |Before SubmodelElementCollection was used for lists and structs
+|  |xref:page$IDTA-01001.adoc#SubmodelElementList[SubmodelElementList] |Before SubmodelElementCollection was used for lists and structs
 | |SubmodelElementList/orderRelevant |Similar to SubmodelElementCollection/ordered
 | |SubmodelElementList/value |Similar to SubmodelElementCollection/value but ordered and with all elements having the same semanticId
 | |SubmodelElementList/semanticIdListElement |Attribute for new class SubmodelElementList
@@ -1544,7 +1544,7 @@ Constraint AASD-120: idShort of submodel elements within a SubmodelElementList s
 [cols="5%,46%,43%",options="header",]
 |===
 |*nc* |*V3.0RC02 Change w.r.t. V3.0RC01* |*Comment*
-| |xref:DataSpecification[DataSpecification] a|
+| |xref:page$IDTA-01001.adoc#DataSpecification[DataSpecification] a|
 Stereotype \<<Template>> added + does not inherit from Identifiable any longer because Data Specification are handled differently
 
 Some attributes are added to DataSpecification as new attributes like id, administration and description
@@ -1555,7 +1555,7 @@ Some attributes are added to DataSpecification as new attributes like id, admini
 | |DataSpecificationIEC61360/unitId |Type changes from Reference to GlobalReference
 |x |DataSpecificationIEC61360/value |Type changed from ValueDataType to string
 | |DataSpecificationIEC61360/valueId |Removed, the valueId is identical to the ID of the concept description
-| |xref:DataSpecificationContent[DataSpecificationContent] |Stereotype \<<Template>> added
+| |xref:page$IDTA-01001.adoc#DataSpecificationContent[DataSpecificationContent] |Stereotype \<<Template>> added
 |x |DataTypeIEC61360 a|
 Some new values were added: BLOB, FILE, HTML, IRDI; URL renamed to IRI
 
@@ -1691,12 +1691,12 @@ Major changes:
 |===
 |*nc* |*V3.0RC01 vs. V2.0.1* |*Comment*
 |x |AssetAdministrationShell/assetInformation |Substitute for AssetAdministrationShell/asset (no reference any longer, instead aggregation)
-| |xref:AssetInformation[AssetInformation] |with attributes/functionality from former class Asset because not specific to Asset but AAS
+| |xref:page$IDTA-01001.adoc#AssetInformation[AssetInformation] |with attributes/functionality from former class Asset because not specific to Asset but AAS
 | |AssetInformation/thumbnail |Optional Attribute of new class AssetInformation that was not available in Asset class before
 |x |Entity/globalAssetId |Substitute for Entity/asset (together with Entity/specificAssetId)
 |x |Entity/specificAssetId |Substitute for Entity/asset (together with Entity/globalAssetId)
-| |xref:Extension[Extension] |New class, part of new abstract class HasExtensions
-| |xref:HasExtensions[HasExtensions] |New abstract class, inherited by Referable
+| |xref:page$IDTA-01001.adoc#Extension[Extension] |New class, part of new abstract class HasExtensions
+| |xref:page$IDTA-01001.adoc#HasExtensions[HasExtensions] |New abstract class, inherited by Referable
 | |IdentifierKeyValuePair |New class for AssetInformation/specificAssetId
 | |Referable/displayName |New optional attribute for all referables
 |===
@@ -1815,7 +1815,7 @@ Major changes:
 | |DataTypeIEC61360/INTEGER_MEASURE |Bugfix, was missing
 | |DataTypeIEC61360/INTEGER_CURRENCY |Bugfix, was missing
 | |hasDataSpecification |Bugfix, is abstract class – was mixed up with DataSpecification class that is not abstract
-| |xref:DataSpecification[DataSpecification] |Bugfix, is not abstract
+| |xref:page$IDTA-01001.adoc#DataSpecification[DataSpecification] |Bugfix, is not abstract
 | |AnnotatedRelationshipElement/annotation |Bugfix, Annotation ist not a reference to Data Elements
 |===
 
@@ -1874,14 +1874,14 @@ Cardinality changed from mandatory to optional
 
 |x |DataSpecificationIEC61360/code |Attribute code removed
 | |DataSpecificationIEC61360/definition |Cardinality changed from mandatory to optional
-| |xref:HasDataSpecification[HasDataSpecification] |Was abstract before
+| |xref:page$IDTA-01001.adoc#HasDataSpecification[HasDataSpecification] |Was abstract before
 | |HasDataSpecification/hasDataSpecification |Renamed to HasDataSpecification/dataSpecification
 |x |HasKind/kind |Now of type "ModellingKind" instead of "Kind". Values changed: Type now Template; Instance remains
 |x |File/value |File name not without but with extension
 |x |Identifiable/description |Type changed from langString to LangStringSet
 |x |IdentifierType/URI |URI renamed to IRI
 | |Kind |Type Kind removed and substituted by types AssetKind and ModellingKind
-|x |xref:OperationVariable[OperationVariable] |No longer inherits from SubmodelElement
+|x |xref:page$IDTA-01001.adoc#OperationVariable[OperationVariable] |No longer inherits from SubmodelElement
 | |Property/value |Type changed from anySimpleTypeDef to ValueDataType
 |x |Qualifier/qualifierType |Renamed to Qualifier/type
 |x |Qualifier/qualifierValue a|
@@ -1898,35 +1898,35 @@ Type changed from AnySimpleTypeDef to ValueDataType
 [cols="43%,57%",options="header",]
 |===
 |*V2.0* |*Comment*
-|xref:AnnotatedRelationshipElement[AnnotatedRelationshipElement] |New submodel element, inheriting from RelationshipElement
+|xref:page$IDTA-01001.adoc#AnnotatedRelationshipElement[AnnotatedRelationshipElement] |New submodel element, inheriting from RelationshipElement
 |Asset/billOfMaterial |New attribute
-|xref:AssetKind[AssetKind] |New enumeration type
+|xref:page$IDTA-01001.adoc#AssetKind[AssetKind] |New enumeration type
 |BasicEvent |New submodel element, inherits from Event
-|xref:Capability[Capability] |New submodel element
+|xref:page$IDTA-01001.adoc#Capability[Capability] |New submodel element
 |DataSpecificationIEC61360/valueList |For value lists (string)
 |DataSpecificationIEC61360/value |For coded and explicit values
 |DataSpecificationIEC61360/valueId |For coded values
 |DataSpecificationIEC61360/levelType |For Ranges
 |DataSpecificationPhysicalUnit |New data specification template
 |DataTypeIEC61360 |New enumeration type
-|xref:Entity[Entity] |New submodel Element
-|xref:EntityType[EntityType] |New enumeration type
+|xref:page$IDTA-01001.adoc#Entity[Entity] |New submodel Element
+|xref:page$IDTA-01001.adoc#EntityType[EntityType] |New enumeration type
 |IdentifierType |Is a subset of KeyType Enumeration
 |KeyElements/FragmentReference |New value FragmentReference as part of KeyElements Enumeration
 |LocalKeyType |Is a subset of KeyType Enumeration
 |LocalKeyType/FragmentId |New value for KeyType Enumeration (via subset LocalKeyType)
-|xref:LangStringSet[LangStringSet] |New type, used for example in MultiLanguageProperty
+|xref:page$IDTA-01001.adoc#LangStringSet[LangStringSet] |New type, used for example in MultiLanguageProperty
 |LevelType |New enumeration type
-|xref:ModellingKind[ModellingKind] |New enumeration type
-|xref:MultiLanguageProperty[MultiLanguageProperty] |New submodel element
+|xref:page$IDTA-01001.adoc#ModellingKind[ModellingKind] |New enumeration type
+|xref:page$IDTA-01001.adoc#MultiLanguageProperty[MultiLanguageProperty] |New submodel element
 |Qualifier/valueType |New attribute to be consistent with valueType of Property etc.
-|xref:Range[Range] |New submodel element
+|xref:page$IDTA-01001.adoc#Range[Range] |New submodel element
 |ReferableElements/BasicEvent |New enumeration value
 |ReferableElements/Capability |New enumeration value
 |ReferableElements/Event |New enumeration value
 |ReferableElements/MultiLanguageProperty |New enumeration value
 |ReferableElements/Range |New enumeration value
-|xref:ValueDataType[ValueDataType] |New type, used for example for Property value
+|xref:page$IDTA-01001.adoc#ValueDataType[ValueDataType] |New type, used for example for Property value
 |ValueList |New class
 |ValueReferencePairType |New class
 |===
diff --git a/documentation/IDTA-01001/modules/ROOT/Annex/IDTA-01001_ConceptsAAS.adoc b/documentation/IDTA-01001/modules/ROOT/pages/Annex/IDTA-01001_ConceptsAAS.adoc
similarity index 99%
rename from documentation/IDTA-01001/modules/ROOT/Annex/IDTA-01001_ConceptsAAS.adoc
rename to documentation/IDTA-01001/modules/ROOT/pages/Annex/IDTA-01001_ConceptsAAS.adoc
index 77575cb8b..4bf7f7277 100644
--- a/documentation/IDTA-01001/modules/ROOT/Annex/IDTA-01001_ConceptsAAS.adoc
+++ b/documentation/IDTA-01001/modules/ROOT/pages/Annex/IDTA-01001_ConceptsAAS.adoc
@@ -11,8 +11,6 @@ Plattform Industrie 4.0; Anna Salari, Publik. Agentur für Kommunikation GmbH, d
 ////
 
 
-:imagesdir: ../images/
-
 
 [appendix]
 == Concepts of the Administration Shell
diff --git a/documentation/IDTA-01001/modules/ROOT/Annex/IDTA-01001_MetamodelWithInheritance.adoc b/documentation/IDTA-01001/modules/ROOT/pages/Annex/IDTA-01001_MetamodelWithInheritance.adoc
similarity index 97%
rename from documentation/IDTA-01001/modules/ROOT/Annex/IDTA-01001_MetamodelWithInheritance.adoc
rename to documentation/IDTA-01001/modules/ROOT/pages/Annex/IDTA-01001_MetamodelWithInheritance.adoc
index 70ec22b38..c49d0b5a3 100644
--- a/documentation/IDTA-01001/modules/ROOT/Annex/IDTA-01001_MetamodelWithInheritance.adoc
+++ b/documentation/IDTA-01001/modules/ROOT/pages/Annex/IDTA-01001_MetamodelWithInheritance.adoc
@@ -10,7 +10,6 @@ Illustrations:
 Plattform Industrie 4.0; Anna Salari, Publik. Agentur für Kommunikation GmbH, designed by Publik. Agentur für Kommunikation GmbH
 ////
 
-:imagesdir: ../images/
 
 [appendix]
 == Metamodel UML with Inherited Attributes
diff --git a/documentation/IDTA-01001/modules/ROOT/Annex/IDTA-01001_Requirements.adoc b/documentation/IDTA-01001/modules/ROOT/pages/Annex/IDTA-01001_Requirements.adoc
similarity index 99%
rename from documentation/IDTA-01001/modules/ROOT/Annex/IDTA-01001_Requirements.adoc
rename to documentation/IDTA-01001/modules/ROOT/pages/Annex/IDTA-01001_Requirements.adoc
index ac577e577..e1ac6bfcd 100644
--- a/documentation/IDTA-01001/modules/ROOT/Annex/IDTA-01001_Requirements.adoc
+++ b/documentation/IDTA-01001/modules/ROOT/pages/Annex/IDTA-01001_Requirements.adoc
@@ -10,7 +10,6 @@ Illustrations:
 Plattform Industrie 4.0; Anna Salari, Publik. Agentur für Kommunikation GmbH, designed by Publik. Agentur für Kommunikation GmbH
 ////
 
-:imagesdir: ../images/
 
 [appendix]
 == Requirements
diff --git a/documentation/IDTA-01001/modules/ROOT/Annex/IDTA-01001_UsageMetamodel.adoc b/documentation/IDTA-01001/modules/ROOT/pages/Annex/IDTA-01001_UsageMetamodel.adoc
similarity index 99%
rename from documentation/IDTA-01001/modules/ROOT/Annex/IDTA-01001_UsageMetamodel.adoc
rename to documentation/IDTA-01001/modules/ROOT/pages/Annex/IDTA-01001_UsageMetamodel.adoc
index 62a43daa1..1e04dd686 100644
--- a/documentation/IDTA-01001/modules/ROOT/Annex/IDTA-01001_UsageMetamodel.adoc
+++ b/documentation/IDTA-01001/modules/ROOT/pages/Annex/IDTA-01001_UsageMetamodel.adoc
@@ -11,8 +11,6 @@ Plattform Industrie 4.0; Anna Salari, Publik. Agentur für Kommunikation GmbH, d
 ////
 
 
-:imagesdir: ../images/
-
 
 [appendix]
 == How to Use the Metamodel
diff --git a/documentation/IDTA-01001/modules/ROOT/Sections/IDTA-01001.adoc b/documentation/IDTA-01001/modules/ROOT/pages/IDTA-01001.adoc
similarity index 99%
rename from documentation/IDTA-01001/modules/ROOT/Sections/IDTA-01001.adoc
rename to documentation/IDTA-01001/modules/ROOT/pages/IDTA-01001.adoc
index 5d0344ab2..a1659352f 100644
--- a/documentation/IDTA-01001/modules/ROOT/Sections/IDTA-01001.adoc
+++ b/documentation/IDTA-01001/modules/ROOT/pages/IDTA-01001.adoc
@@ -17,11 +17,10 @@ Plattform Industrie 4.0; Anna Salari, Publik. Agentur für Kommunikation GmbH, d
 :toc-title: Specification of the Asset Administration Shell. Part 1: Metamodel
 :sectlinks:
 :sectnums:
-:imagesdir: ../images/
 :nofooter:
 
 
-include::../../Constraints/constraints.adoc[]
+include::IDTA-01001_Constraints.adoc[]
 
 
 
@@ -2348,8 +2347,9 @@ image::image49.png[]
 
 Keys are used to define references (_Reference_).
 
-Figure 49 presents a logical model of key types. These logical enumerations are used to formulate constraints.
+<<model_for_refs_keys>> presents a logical model of key types. These logical enumerations are used to formulate constraints.
 
+[#model_for_refs_keys]
 .Logical Model for Keys of References (non-normative)
 image::image50.png[]
 
@@ -2469,7 +2469,7 @@ Note: not used as type but in constraints.
 ====
 
 
-|Set of: |xref:AASReferableNonIdentifiables[AASReferableNonIdentifiables], xref:GenericFragmentKeys[GenericFragmentKeys]
+|Set of: |xref:AasReferableNonIdentifiables[AASReferableNonIdentifiables], xref:GenericFragmentKeys[GenericFragmentKeys]
 |===
 [cols="30%,70%"],options="header"]
 |===
@@ -2678,7 +2678,7 @@ Note: not used as type but in constraints.
 ====
 
 
-|Set of: |xref:AASReferableNonIdentifiables[AASReferableNonIdentifiables], xref:AasIdentifiables[AasIdentifiables]
+|Set of: |xref:AasReferableNonIdentifiables[AASReferableNonIdentifiables], xref:AasIdentifiables[AasIdentifiables]
 |===
 [cols="30%,70%"],options="header"]
 |===
@@ -2846,7 +2846,7 @@ identifiers for the corresponding resource referenced.
 {aasd128}
 
 In the following examples for valid und invalid model references and external references are given.
-The notation follows the grammar as defined in section xref:#trueserialization-of-values-of-type-reference[].
+The notation follows the grammar as defined in section xref:#_serialization_of_values_of_type_reference[].
 
 [.underline]#Examples for valid references:#
 
@@ -3532,7 +3532,7 @@ Blobs require the following encoding: base64 string.
 
 ====  Serialization of Values of Type "Reference"
 
-include::IDTA-01001_GrammarSerializationReference.adoc[] 
+include::IDTA-01001_GrammarSerializationReference.adoc[]
 
 
 ====  Semantic Identifiers for Metamodel and Data Specifications
diff --git a/documentation/IDTA-01001/modules/Constraints/constraints.adoc b/documentation/IDTA-01001/modules/ROOT/pages/IDTA-01001_Constraints.adoc
similarity index 100%
rename from documentation/IDTA-01001/modules/Constraints/constraints.adoc
rename to documentation/IDTA-01001/modules/ROOT/pages/IDTA-01001_Constraints.adoc
diff --git a/documentation/IDTA-01001/modules/ROOT/Sections/IDTA-01001_DataSpecifications.adoc b/documentation/IDTA-01001/modules/ROOT/pages/IDTA-01001_DataSpecifications.adoc
similarity index 88%
rename from documentation/IDTA-01001/modules/ROOT/Sections/IDTA-01001_DataSpecifications.adoc
rename to documentation/IDTA-01001/modules/ROOT/pages/IDTA-01001_DataSpecifications.adoc
index 828107351..d0f0d53b2 100644
--- a/documentation/IDTA-01001/modules/ROOT/Sections/IDTA-01001_DataSpecifications.adoc
+++ b/documentation/IDTA-01001/modules/ROOT/pages/IDTA-01001_DataSpecifications.adoc
@@ -2,7 +2,6 @@
 == Data Specification Templates (normative)
 ////
 
-:imagesdir: ../images/
 
 === Introduction
 
@@ -41,9 +40,9 @@ A template consists of the _DataSpecificationContent_ containing the additional
 |===
 |Attribute |Explanation |Type |Card.
 
-|idShort | Name of the data specification |xref:NameType[NameType] |0..1
+|idShort | Name of the data specification |xref:page$IDTA-01001.adoc#NameType[NameType] |0..1
 
-|description |Description of how and in which context the data specification template is applicable; can be provided in several languages. |xref:MultiLanguageTextType[MultiLanguageTextType] |0..1
+|description |Description of how and in which context the data specification template is applicable; can be provided in several languages. |xref:page$IDTA-01001.adoc#MultiLanguageTextType[MultiLanguageTextType] |0..1
 
 |administration a|
 Administrative information of an identifiable element
@@ -53,17 +52,17 @@ Administrative information of an identifiable element
 Note: some of the administrative information like the version number might need to be part of the identification.
 ====
 
-|xref:AdministrativeInformation[AdministrativeInformation] |0..1
+|xref:page$IDTA-01001.adoc#AdministrativeInformation[AdministrativeInformation] |0..1
 
 |id a|
 The globally unique identification of the data specification
 
 
 ====
-Note: This identifier is used as value for xref:HasDataSpecification[HasDataSpecification/dataSpecification] 
+Note: This identifier is used as value for xref:page$IDTA-01001.adoc#HasDataSpecification[HasDataSpecification/dataSpecification]
 ====
 
-|xref:Identifier[Identifier] |1
+|xref:page$IDTA-01001.adoc#Identifier[Identifier] |1
 
 |dataSpecificationContent |The content of the template without meta data
 |xref:DataSpecificationContent[DataSpecificationContent] |1
diff --git a/documentation/IDTA-01001/modules/ROOT/Sections/IDTA-01001_EmbeddedDataSpecifications.adoc b/documentation/IDTA-01001/modules/ROOT/pages/IDTA-01001_EmbeddedDataSpecifications.adoc
similarity index 98%
rename from documentation/IDTA-01001/modules/ROOT/Sections/IDTA-01001_EmbeddedDataSpecifications.adoc
rename to documentation/IDTA-01001/modules/ROOT/pages/IDTA-01001_EmbeddedDataSpecifications.adoc
index 90b278c78..123d362c9 100644
--- a/documentation/IDTA-01001/modules/ROOT/Sections/IDTA-01001_EmbeddedDataSpecifications.adoc
+++ b/documentation/IDTA-01001/modules/ROOT/pages/IDTA-01001_EmbeddedDataSpecifications.adoc
@@ -2,7 +2,6 @@
 ====  Embedded Data Specifications
 ////
 
-:imagesdir: ../images/
 
 The document series "Specification Asset Administration Shell" predefines data specifications that can be used within an Asset Administration Shell to ensure interoperability (see Part 3 documents).
 
diff --git a/documentation/IDTA-01001/modules/ROOT/Sections/IDTA-01001_GrammarSemanticIdsMetamodel.adoc b/documentation/IDTA-01001/modules/ROOT/pages/IDTA-01001_GrammarSemanticIdsMetamodel.adoc
similarity index 99%
rename from documentation/IDTA-01001/modules/ROOT/Sections/IDTA-01001_GrammarSemanticIdsMetamodel.adoc
rename to documentation/IDTA-01001/modules/ROOT/pages/IDTA-01001_GrammarSemanticIdsMetamodel.adoc
index 7661fe454..28e7e4bdf 100644
--- a/documentation/IDTA-01001/modules/ROOT/Sections/IDTA-01001_GrammarSemanticIdsMetamodel.adoc
+++ b/documentation/IDTA-01001/modules/ROOT/pages/IDTA-01001_GrammarSemanticIdsMetamodel.adoc
@@ -2,7 +2,6 @@
 ====  Semantic Identifiers for Metamodel and Data Specifications
 ////
 
-:imagesdir: ../images/
 
 Rules for creating identifiers are defined to enable the unique identification of concepts as used and defined in the metamodel of the Asset Administration Shell.
 
diff --git a/documentation/IDTA-01001/modules/ROOT/Sections/IDTA-01001_GrammarSerializationReference.adoc b/documentation/IDTA-01001/modules/ROOT/pages/IDTA-01001_GrammarSerializationReference.adoc
similarity index 98%
rename from documentation/IDTA-01001/modules/ROOT/Sections/IDTA-01001_GrammarSerializationReference.adoc
rename to documentation/IDTA-01001/modules/ROOT/pages/IDTA-01001_GrammarSerializationReference.adoc
index 2e23d957a..8c7b7a5d4 100644
--- a/documentation/IDTA-01001/modules/ROOT/Sections/IDTA-01001_GrammarSerializationReference.adoc
+++ b/documentation/IDTA-01001/modules/ROOT/pages/IDTA-01001_GrammarSerializationReference.adoc
@@ -2,7 +2,6 @@
 ====  Serialization of Values of Type "Reference"
 ////
 
-:imagesdir: ../images/
 
 Some mappings or serializations convert the type "Reference" into a single string. In this case, the following serialization is required:
 
diff --git a/documentation/IDTA-01001/modules/ROOT/Sections/IDTA-01001_Preamble.adoc b/documentation/IDTA-01001/modules/ROOT/pages/IDTA-01001_Preamble.adoc
similarity index 98%
rename from documentation/IDTA-01001/modules/ROOT/Sections/IDTA-01001_Preamble.adoc
rename to documentation/IDTA-01001/modules/ROOT/pages/IDTA-01001_Preamble.adoc
index 5690a5670..1a746fd22 100644
--- a/documentation/IDTA-01001/modules/ROOT/Sections/IDTA-01001_Preamble.adoc
+++ b/documentation/IDTA-01001/modules/ROOT/pages/IDTA-01001_Preamble.adoc
@@ -10,7 +10,6 @@ Illustrations:
 Plattform Industrie 4.0; Anna Salari, Publik. Agentur für Kommunikation GmbH, designed by Publik. Agentur für Kommunikation GmbH
 ////
 
-:imagesdir: ../images/
 
 == Preamble
 
@@ -34,9 +33,9 @@ The first version of this document was produced September 2017 to July 2018 by a
 
 For better readability the abbreviation "I4.0" is consistently used for "Industrie 4.0" in compound terms. The term "Industrie 4.0" continues to be used when standing on its own.
 
-include::../../Shared/Sections/IDTA-01xxx_Versioning.adoc[]
+include::../../Shared/pages/IDTA-01xxx_Versioning.adoc[]
 
-include::../../Shared/Sections/IDTA-01xxx_Conformance.adoc[]
+include::../../Shared/pages/IDTA-01xxx_Conformance.adoc[]
 
 
 ===  Scope of this Document
diff --git a/documentation/IDTA-01001/modules/ROOT/Sections/index.adoc b/documentation/IDTA-01001/modules/ROOT/pages/index.adoc
similarity index 100%
rename from documentation/IDTA-01001/modules/ROOT/Sections/index.adoc
rename to documentation/IDTA-01001/modules/ROOT/pages/index.adoc
diff --git a/documentation/IDTA-01001/modules/ROOT/images/image81.png b/documentation/IDTA-01001/modules/Shared/images/image81.png
similarity index 100%
rename from documentation/IDTA-01001/modules/ROOT/images/image81.png
rename to documentation/IDTA-01001/modules/Shared/images/image81.png
diff --git a/documentation/IDTA-01001/modules/ROOT/images/image82.png b/documentation/IDTA-01001/modules/Shared/images/image82.png
similarity index 100%
rename from documentation/IDTA-01001/modules/ROOT/images/image82.png
rename to documentation/IDTA-01001/modules/Shared/images/image82.png
diff --git a/documentation/IDTA-01001/modules/ROOT/images/image83.png b/documentation/IDTA-01001/modules/Shared/images/image83.png
similarity index 100%
rename from documentation/IDTA-01001/modules/ROOT/images/image83.png
rename to documentation/IDTA-01001/modules/Shared/images/image83.png
diff --git a/documentation/IDTA-01001/modules/ROOT/images/image84.png b/documentation/IDTA-01001/modules/Shared/images/image84.png
similarity index 100%
rename from documentation/IDTA-01001/modules/ROOT/images/image84.png
rename to documentation/IDTA-01001/modules/Shared/images/image84.png
diff --git a/documentation/IDTA-01001/modules/ROOT/images/image85.png b/documentation/IDTA-01001/modules/Shared/images/image85.png
similarity index 100%
rename from documentation/IDTA-01001/modules/ROOT/images/image85.png
rename to documentation/IDTA-01001/modules/Shared/images/image85.png
diff --git a/documentation/IDTA-01001/modules/ROOT/images/image86.png b/documentation/IDTA-01001/modules/Shared/images/image86.png
similarity index 100%
rename from documentation/IDTA-01001/modules/ROOT/images/image86.png
rename to documentation/IDTA-01001/modules/Shared/images/image86.png
diff --git a/documentation/IDTA-01001/modules/Shared/Annex/IDTA-01xxx_BackusNaurForm.adoc b/documentation/IDTA-01001/modules/Shared/pages/Annex/IDTA-01xxx_BackusNaurForm.adoc
similarity index 99%
rename from documentation/IDTA-01001/modules/Shared/Annex/IDTA-01xxx_BackusNaurForm.adoc
rename to documentation/IDTA-01001/modules/Shared/pages/Annex/IDTA-01xxx_BackusNaurForm.adoc
index 8cca504c2..4d47e82a8 100644
--- a/documentation/IDTA-01001/modules/Shared/Annex/IDTA-01xxx_BackusNaurForm.adoc
+++ b/documentation/IDTA-01001/modules/Shared/pages/Annex/IDTA-01xxx_BackusNaurForm.adoc
@@ -10,7 +10,6 @@ Illustrations:
 Plattform Industrie 4.0; Anna Salari, Publik. Agentur für Kommunikation GmbH, designed by Publik. Agentur für Kommunikation GmbH
 ////
 
-:imagesdir: ../images/
 
 [appendix]
 == Backus-Naur-Form
diff --git a/documentation/IDTA-01001/modules/Shared/Annex/IDTA-01xxx_Bibliography.adoc b/documentation/IDTA-01001/modules/Shared/pages/Annex/IDTA-01xxx_Bibliography.adoc
similarity index 100%
rename from documentation/IDTA-01001/modules/Shared/Annex/IDTA-01xxx_Bibliography.adoc
rename to documentation/IDTA-01001/modules/Shared/pages/Annex/IDTA-01xxx_Bibliography.adoc
diff --git a/documentation/IDTA-01001/modules/Shared/Annex/IDTA-01xxx_UML.adoc b/documentation/IDTA-01001/modules/Shared/pages/Annex/IDTA-01xxx_UML.adoc
similarity index 99%
rename from documentation/IDTA-01001/modules/Shared/Annex/IDTA-01xxx_UML.adoc
rename to documentation/IDTA-01001/modules/Shared/pages/Annex/IDTA-01xxx_UML.adoc
index 52f13739a..49dfc72c3 100644
--- a/documentation/IDTA-01001/modules/Shared/Annex/IDTA-01xxx_UML.adoc
+++ b/documentation/IDTA-01001/modules/Shared/pages/Annex/IDTA-01xxx_UML.adoc
@@ -10,8 +10,6 @@ Illustrations:
 Plattform Industrie 4.0; Anna Salari, Publik. Agentur für Kommunikation GmbH, designed by Publik. Agentur für Kommunikation GmbH
 ////
 
-:imagesdir: ../images/
-
 
 [appendix]
 == Legend for UML Modelling
diff --git a/documentation/IDTA-01001/modules/Shared/Annex/IDTA-01xxx_UMLTemplates.adoc b/documentation/IDTA-01001/modules/Shared/pages/Annex/IDTA-01xxx_UMLTemplates.adoc
similarity index 90%
rename from documentation/IDTA-01001/modules/Shared/Annex/IDTA-01xxx_UMLTemplates.adoc
rename to documentation/IDTA-01001/modules/Shared/pages/Annex/IDTA-01xxx_UMLTemplates.adoc
index cb7ae36ea..316f245f9 100644
--- a/documentation/IDTA-01001/modules/Shared/Annex/IDTA-01xxx_UMLTemplates.adoc
+++ b/documentation/IDTA-01001/modules/Shared/pages/Annex/IDTA-01xxx_UMLTemplates.adoc
@@ -10,7 +10,6 @@ Illustrations:
 Plattform Industrie 4.0; Anna Salari, Publik. Agentur für Kommunikation GmbH, designed by Publik. Agentur für Kommunikation GmbH
 ////
 
-:imagesdir: ../images/
 
 [appendix]
 == Templates for UML Tables
@@ -74,11 +73,11 @@ Note 3: optional lists, i.e. attributes with cardinality > 1 and minimum 0, are
 
 [.underline]#Examples for valid model references#
 
-If class type equal to "ModelReference<xref:Submodel[Submodel]>", the following reference would be a valid reference (using the text serialization as defined in Clause 7.2.3):
+If class type equal to "ModelReference<Submodel>", the following reference would be a valid reference (using the text serialization as defined in Clause 7.2.3):
 
 *(Submodel)https://example.com/aas/1/1/1234859590*
 
-If class type equal to "ModelReference<xref:Referable[Referable]>", the following references would be valid references (using the text serialization as defined in Clause 7.2.3):
+If class type equal to "ModelReference<Referable>", the following references would be valid references (using the text serialization as defined in Clause 7.2.3):
 
 *(Submodel)https://example.com/aas/1/1/1234859590*
 
@@ -86,11 +85,11 @@ If class type equal to "ModelReference<xref:Referable[Referable]>", the followin
 
 *(Submodel)https://example.com/aas/1/1/1234859590, (File)myDocument*
 
-This would be an invalid reference for "ModelReference<xref:Referable[Referable]>", instead type "Reference" shall be used:
+This would be an invalid reference for "ModelReference<Referable>", instead type "Reference" shall be used:
 
 *(Submodel)https://example.com/aas/1/1/1234859590, (File)myDocument (FragmentReference)Hints*
 
-This would be an invalid reference for "ModelReference<xref:Submodel[Submodel]>"
+This would be an invalid reference for "ModelReference<Submodel>"
 
 *(Submodel)https://example.com/aas/1/1/1234859590, (Property)temperature*
 
diff --git a/documentation/IDTA-01001/modules/Shared/Sections/IDTA-01xxx_Conformance.adoc b/documentation/IDTA-01001/modules/Shared/pages/IDTA-01xxx_Conformance.adoc
similarity index 98%
rename from documentation/IDTA-01001/modules/Shared/Sections/IDTA-01xxx_Conformance.adoc
rename to documentation/IDTA-01001/modules/Shared/pages/IDTA-01xxx_Conformance.adoc
index 2dcf60d31..ebda8d2f0 100644
--- a/documentation/IDTA-01001/modules/Shared/Sections/IDTA-01xxx_Conformance.adoc
+++ b/documentation/IDTA-01001/modules/Shared/pages/IDTA-01xxx_Conformance.adoc
@@ -10,8 +10,6 @@ Illustrations:
 Plattform Industrie 4.0; Anna Salari, Publik. Agentur für Kommunikation GmbH, designed by Publik. Agentur für Kommunikation GmbH
 ////
 
-:imagesdir: ../images/
-
 
 === Conformance
 
diff --git a/documentation/IDTA-01001/modules/Shared/Sections/IDTA-01xxx_TermsDefinitionsAbbreviations.adoc b/documentation/IDTA-01001/modules/Shared/pages/IDTA-01xxx_TermsDefinitionsAbbreviations.adoc
similarity index 95%
rename from documentation/IDTA-01001/modules/Shared/Sections/IDTA-01xxx_TermsDefinitionsAbbreviations.adoc
rename to documentation/IDTA-01001/modules/Shared/pages/IDTA-01xxx_TermsDefinitionsAbbreviations.adoc
index b99af62d4..bac2c992f 100644
--- a/documentation/IDTA-01001/modules/Shared/Sections/IDTA-01xxx_TermsDefinitionsAbbreviations.adoc
+++ b/documentation/IDTA-01001/modules/Shared/pages/IDTA-01xxx_TermsDefinitionsAbbreviations.adoc
@@ -486,28 +486,28 @@ The following abbreviations are not used in the document but may be used as abbr
 [cols="33%,67%",options=header]
 |===
 |*Abbreviation* |*Description*
-|AAS |xref:AssetAdministrationShell[]
-|Cap |xref:Capability[]
-|CD |xref:ConceptDescription[]
-|DE |xref:DataElement[]
-|DST |xref:DataSpecification[] Template
-|InOut |xref:inoutputVariable[]
-|In |xref:inputVariable[]
-|Prop |xref:Property[]
-|MLP |xref:MultiLanguageProperty[]
-|Range |xref:Range[]
-|Ent |xref:Entity[]
-|Evt |xref:Event[]
-|File |xref:File[]
-|Blob |xref:Blob[]
-|Opr |xref:Operation[]
-|Out |xref:outputVariable[]
-|Qfr |xref:Qualifier[]
-|Ref |xref:ReferenceElement[]
-|Rel |xref:RelationshipElement[]
-|RelA |xref:AnnotatedRelationshipElement[]
-|SM |xref:Submodel[]
-|SMC |xref:SubmodelElementCollection[]
-|SME |xref:SubmodelElement[]
-|SML |xref:SubmodelElementList[]
+|AAS |AssetAdministrationShell
+|Cap |Capability
+|CD |ConceptDescription
+|DE |DataElement
+|DST |DataSpecification Template
+|InOut |inoutputVariable
+|In |inputVariable
+|Prop |Property
+|MLP |MultiLanguageProperty
+|Range |Range
+|Ent |Entity
+|Evt |Event
+|File |File
+|Blob |Blob
+|Opr |Operation
+|Out |outputVariable
+|Qfr |Qualifier
+|Ref |ReferenceElement
+|Rel |RelationshipElement
+|RelA |AnnotatedRelationshipElement
+|SM |Submodel
+|SMC |SubmodelElementCollection
+|SME |SubmodelElement
+|SML |SubmodelElementList
 |===
\ No newline at end of file
diff --git a/documentation/IDTA-01001/modules/Shared/Sections/IDTA-01xxx_Versioning.adoc b/documentation/IDTA-01001/modules/Shared/pages/IDTA-01xxx_Versioning.adoc
similarity index 95%
rename from documentation/IDTA-01001/modules/Shared/Sections/IDTA-01xxx_Versioning.adoc
rename to documentation/IDTA-01001/modules/Shared/pages/IDTA-01xxx_Versioning.adoc
index f4ab8aff0..9d1cb9de5 100644
--- a/documentation/IDTA-01001/modules/Shared/Sections/IDTA-01xxx_Versioning.adoc
+++ b/documentation/IDTA-01001/modules/Shared/pages/IDTA-01xxx_Versioning.adoc
@@ -10,8 +10,6 @@ Illustrations:
 Plattform Industrie 4.0; Anna Salari, Publik. Agentur für Kommunikation GmbH, designed by Publik. Agentur für Kommunikation GmbH
 ////
 
-:imagesdir: ../images/
-
 
 === Versioning