refactor: clean up file structure

International-Data-Spaces-Association · Feb 17, 2023 · 6950efe · 6950efe
1 parent c4bee2a
commit 6950efe
Show file tree

Hide file tree

Showing 83 changed files with 41 additions and 41 deletions.
diff --git a/SUMMARY.md b/SUMMARY.md
@@ -32,9 +32,9 @@
 * [Figure (source): Entities and relationships to DCAT and ODRL](./model/m.participant.entities.drawio)
 * [Section 3 Catalog protocol](./catalog/catalog.protocol.md)
 * [Catalog HTTPS Binding](./catalog/catalog.binding.https.md)
-* [Example: DCAT Distribution (json)](./catalog/example/dcat.distribution.example.json)
-* [Example: DCAT Distribution option 1 (json)](./catalog/example/dcat.distribution.example.option1.json)
-* [Example: DCAT Distribution option 2 (json)](./catalog/example/dcat.distribution.example.option2.json)
+* [Example: DCAT Distribution (json)](./catalog/message/example/dcat.distribution.example.json)
+* [Example: DCAT Distribution option 1 (json)](./catalog/message/example/dcat.distribution.example.option1.json)
+* [Example: DCAT Distribution option 2 (json)](./catalog/message/example/dcat.distribution.example.option2.json)
 * [Catalog Error Message (json)](./catalog/message/catalog-error-message.json)
 * [Catalog Message (json)](./catalog/message/catalog.json)
 * [Catalog Request Message (json)](./catalog/message/catalog-request-message.json)
@@ -62,10 +62,10 @@
 * [Transfer Start Message (json)](./transfer/message/transfer-start-message.json)
 * [Transfer Suspension Message (json)](./transfer/message/transfer-suspension-message.json)
 * [Transfer Termination Message (json)](./transfer/message/transfer-termination-message.json)
-* [Common Schema (json)](./common/definitions.schema.json)
-* [Shape: Contract Agreement Message (ttl)](./schemas/contract-agreement-message-shape.ttl)
-* [Shape: Contract Agreement Verification message (ttl)](./schemas/contract-agreement-verification-message-shape.ttl)
-* [Shape: Contract Negotiation Event Message (ttl)](./schemas/contract-negotiation-event-message-shape.ttl)
-* [Shape: Contract Negotiation Termination Message (ttl)](./schemas/contract-negotiation-termination-message-shape.ttl)
-* [Shape: Contract Request Message (ttl)](./schemas/contract-request-message-shape.ttl)
-* [diagram.styles.puml](./diagrams/diagram.styles.puml)
+* [Common Schema (json)](./common/schema/definitions.schema.json)
+* [Shape: Contract Agreement Message (ttl)](./negotiation/message/shape/contract-agreement-message-shape.ttl)
+* [Shape: Contract Agreement Verification message (ttl)](./negotiation/message/shape/contract-agreement-verification-message-shape.ttl)
+* [Shape: Contract Negotiation Event Message (ttl)](./negotiation/message/shape/contract-negotiation-event-message-shape.ttl)
+* [Shape: Contract Negotiation Termination Message (ttl)](./negotiation/message/shape/contract-negotiation-termination-message-shape.ttl)
+* [Shape: Contract Request Message (ttl)](./negotiation/message/shape/contract-request-message-shape.ttl)
+* [diagram.styles.puml](./common/style/diagram.styles.puml)
diff --git a/catalog/catalog.protocol.md b/catalog/catalog.protocol.md
@@ -20,15 +20,15 @@ Future IDS specifications may define additional optional serialization formats.
 
 ### 2.1 CatalogRequestMessage
 
-![](./images/catalog-request-message.png)
+![](./message/diagram/catalog-request-message.png)
 
 **Sent by**: Consumer
 
 **Example**: [CatalogRequestMessage](./message/catalog-request-message.json)
 
 **Response**: [Catalog](#22-catalog) containing the [DCAT catalog](https://www.w3.org/TR/vocab-dcat-3/#Class:Catalog).
 
-**Schema**: [CatalogRequestMessageShape](../schemas/catalog-request-message-shape.ttl) and the [CatalogRequestMessage JSON Schema](../schemas/catalog-request-message-schema.json)
+**Schema**: [CatalogRequestMessageShape](./message/shape/catalog-request-message-shape.ttl) and the [CatalogRequestMessage JSON Schema](./message/schema/catalog-request-message-schema.json)
 
 #### Description
 
@@ -43,7 +43,7 @@ be defined in the relevant catalog binding specification.
 
 ### 2.2 Catalog
 
-![](./images/catalog.png)
+![](./message/diagram/catalog.png)
 
 **Sent by**: Provider
 
@@ -52,7 +52,7 @@ be defined in the relevant catalog binding specification.
 
 **Response**: OK or ERROR
 
-**Schema**: [CatalogShape](../schemas/catalog-shape.ttl) and the [Catalog JSON Schema](../schemas/catalog-schema.json)
+**Schema**: [CatalogShape](./message/shape/catalog-shape.ttl) and the [Catalog JSON Schema](./message/schema/catalog-schema.json)
 
 #### Description
 
@@ -61,15 +61,15 @@ The catalog contains all [Asset Entries](#31-asset-entry) which the requester sh
 
 ### 2.3 Catalog Error Message
 
-![](./images/catalog-error-message.png)
+![](./message/diagram/catalog-error-message.png)
 
 **Sent by**: Consumer or Provider
 
 **Example**: [CatalogErrorMessage](./message/catalog-error-message.json)
 
 **Response**: OK or ERROR
 
-**Schema**: [CatalogErrorMessageShape](../schemas/catalog-error-message-shape.ttl) and the [CatalogErrorMessage JSON Schema](../schemas/catalog-error-message-schema.json)
+**Schema**: [CatalogErrorMessageShape](./message/shape/catalog-error-message-shape.ttl) and the [CatalogErrorMessage JSON Schema](./message/schema/catalog-error-message-schema.json)
 
 #### Description
 

diff --git a/catalog/images/catalog-error-message.png → ...message/diagram/catalog-error-message.png b/catalog/images/catalog-error-message.png → ...message/diagram/catalog-error-message.png
diff --git a/catalog/images/catalog-error-message.puml → ...essage/diagram/catalog-error-message.puml b/catalog/images/catalog-error-message.puml → ...essage/diagram/catalog-error-message.puml
diff --git a/catalog/images/catalog-request-message.png → ...ssage/diagram/catalog-request-message.png b/catalog/images/catalog-request-message.png → ...ssage/diagram/catalog-request-message.png
diff --git a/catalog/images/catalog-request-message.puml → ...sage/diagram/catalog-request-message.puml b/catalog/images/catalog-request-message.puml → ...sage/diagram/catalog-request-message.puml
diff --git a/catalog/images/catalog.png → catalog/message/diagram/catalog.png b/catalog/images/catalog.png → catalog/message/diagram/catalog.png
diff --git a/catalog/images/catalog.puml → catalog/message/diagram/catalog.puml b/catalog/images/catalog.puml → catalog/message/diagram/catalog.puml
diff --git a/...og/example/dcat.distribution.example.json → ...ge/example/dcat.distribution.example.json b/...og/example/dcat.distribution.example.json → ...ge/example/dcat.distribution.example.json
diff --git a/...le/dcat.distribution.example.option1.json → ...le/dcat.distribution.example.option1.json b/...le/dcat.distribution.example.option1.json → ...le/dcat.distribution.example.option1.json
diff --git a/...le/dcat.distribution.example.option2.json → ...le/dcat.distribution.example.option2.json b/...le/dcat.distribution.example.option2.json → ...le/dcat.distribution.example.option2.json
diff --git a/schemas/catalog-error-message-schema.json → .../schema/catalog-error-message-schema.json b/schemas/catalog-error-message-schema.json → .../schema/catalog-error-message-schema.json
diff --git a/schemas/catalog-message-schema.json → ...essage/schema/catalog-message-schema.json b/schemas/catalog-message-schema.json → ...essage/schema/catalog-message-schema.json
diff --git a/schemas/catalog-request-message-schema.json → ...chema/catalog-request-message-schema.json b/schemas/catalog-request-message-schema.json → ...chema/catalog-request-message-schema.json
diff --git a/schemas/catalog-schema.json → catalog/message/schema/catalog-schema.json b/schemas/catalog-schema.json → catalog/message/schema/catalog-schema.json
diff --git a/schemas/catalog-error-message-shape.ttl → ...age/shape/catalog-error-message-shape.ttl b/schemas/catalog-error-message-shape.ttl → ...age/shape/catalog-error-message-shape.ttl
diff --git a/schemas/catalog-message-shape.ttl → ...g/message/shape/catalog-message-shape.ttl b/schemas/catalog-message-shape.ttl → ...g/message/shape/catalog-message-shape.ttl
diff --git a/schemas/catalog-request-message-shape.ttl → ...e/shape/catalog-request-message-shape.ttl b/schemas/catalog-request-message-shape.ttl → ...e/shape/catalog-request-message-shape.ttl
diff --git a/schemas/catalog-shape.ttl → catalog/message/shape/catalog-shape.ttl b/schemas/catalog-shape.ttl → catalog/message/shape/catalog-shape.ttl
diff --git a/schemas/context.json → common/schema/context.json b/schemas/context.json → common/schema/context.json
diff --git a/common/definitions.schema.json → common/schema/definitions.schema.json b/common/definitions.schema.json → common/schema/definitions.schema.json
diff --git a/schemas/message-shape.ttl → common/shape/message-shape.ttl b/schemas/message-shape.ttl → common/shape/message-shape.ttl
diff --git a/schemas/odrl-shapes.ttl → common/shape/odrl-shapes.ttl b/schemas/odrl-shapes.ttl → common/shape/odrl-shapes.ttl
diff --git a/diagrams/diagram.styles.puml → common/style/diagram.styles.puml b/diagrams/diagram.styles.puml → common/style/diagram.styles.puml
diff --git a/negotiation/contract.negotiation.protocol.md b/negotiation/contract.negotiation.protocol.md
@@ -54,7 +54,7 @@ The CN state machine is transitioned upon receipt and acknowledgement of a messa
 
 ### 1. ContractRequestMessage
 
-![](./message/contract-request-message.png)
+![](./message/diagram/contract-request-message.png)
 
 **Sent by**: Consumer
 
@@ -63,9 +63,9 @@ The CN state machine is transitioned upon receipt and acknowledgement of a messa
 **Example**: [ContractRequestMessage](./message/contract-request-message.json)
 
 **Response**: [ContractNegotiation](./message/contract-negotiation.json) containing the negotiation id or ERROR:
-![](./message/contract-negotiation.png)
+![](./message/diagram/contract-negotiation.png)
 
-**Schema**: [ContractRequestMessageShape](../schemas/contract-request-message-shape.ttl), [ContractRequestMessage JSON Schema](../schemas/contract-request-message-schema.json), [ContractNegotiationShape](../schemas/contract-negotiation-shape.ttl) and [ContractNegotiation JSON Schema](../schemas/contract-negotiation-schema.json)
+**Schema**: [ContractRequestMessageShape](./message/shape/contract-request-message-shape.ttl), [ContractRequestMessage JSON Schema](./message/schema/contract-request-message-schema.json), [ContractNegotiationShape](./message/shape/contract-negotiation-shape.ttl) and [ContractNegotiation JSON Schema](./message/schema/contract-negotiation-schema.json)
 
 #### Description
 
@@ -90,7 +90,7 @@ The _ContractRequestMessage_ is sent by a consumer to initiate a contract negoti
 
 ### 2. ContractAgreementMessage
 
-![](./message/contract-agreement-message.png)
+![](./message/diagram/contract-agreement-message.png)
 
 **Sent by**: Provider
 
@@ -100,7 +100,7 @@ The _ContractRequestMessage_ is sent by a consumer to initiate a contract negoti
 
 **Response**: OK or ERROR
 
-**Schema**: [ContractAgreementMessageShape](../schemas/contract-agreement-message-shape.ttl) and [ContractAgreementMessage JSON Schema](../schemas/contract-agreement-message-schema.json)
+**Schema**: [ContractAgreementMessageShape](./message/shape/contract-agreement-message-shape.ttl) and [ContractAgreementMessage JSON Schema](./message/schema/contract-agreement-message-schema.json)
 
 #### Description
 
@@ -113,7 +113,7 @@ A _ContractAgreementMessage_ must contain an ODRL Agreement.
 ### 3. ContractAgreementVerificationMessage
 
 
-![](./message/contract-agreement-verification-message.png)
+![](./message/diagram/contract-agreement-verification-message.png)
 
 **Sent by**: Consumer
 
@@ -123,7 +123,7 @@ A _ContractAgreementMessage_ must contain an ODRL Agreement.
 
 **Response**: OK or ERROR
 
-**Schema**: [ContractAgreementVerificationMessageShape](../schemas/contract-agreement-verification-message-shape.ttl) and the [ContractAgreementVerificationMessage JSON Schema](../schemas/contract-agreement-verification-message-schema.json)
+**Schema**: [ContractAgreementVerificationMessageShape](./message/shape/contract-agreement-verification-message-shape.ttl) and the [ContractAgreementVerificationMessage JSON Schema](./message/schema/contract-agreement-verification-message-schema.json)
 
 #### Description
 
@@ -135,7 +135,7 @@ A _ContractAgreementVerificationMessage_ must contain a `processId`.
 ### 4. ContractNegotiationEventMessage
 
 
-![](./message/contract-negotiation-event-message.png)
+![](./message/diagram/contract-negotiation-event-message.png)
 
 **Sent by**: Provider or Consumer
 
@@ -145,7 +145,7 @@ A _ContractAgreementVerificationMessage_ must contain a `processId`.
 
 **Response**: OK or ERROR
 
-**Schema**: [ContractNegotiationEventMessageShape](../schemas/contract-negotiation-event-message-shape.ttl) and the [ContractNegotiationEventMessage JSON Schema](../schemas/contract-negotiation-event-message-schema.json)
+**Schema**: [ContractNegotiationEventMessageShape](./message/shape/contract-negotiation-event-message-shape.ttl) and the [ContractNegotiationEventMessage JSON Schema](./message/schema/contract-negotiation-event-message-schema.json)
 
 #### Description
 
@@ -168,7 +168,7 @@ provider to send a contract negotiation event after the negotiation state machin
 
 ### 5. ContractNegotiationTerminationMessage
 
-![](./message/contract-negotiation-termination-message.png)
+![](./message/diagram/contract-negotiation-termination-message.png)
 
 
 **Sent by**: Consumer or Provider
@@ -177,7 +177,7 @@ provider to send a contract negotiation event after the negotiation state machin
 
 **Example**: [ContractNegotiationTerminationMessage](./message/contract-negotiation-termination-message.json)
 
-**Schema**: [ContractNegotiationTerminationMessageShape](../schemas/contract-negotiation-termination-message-shape.ttl) and the [ContractNegotiationTerminationMessage JSON Schema](../schemas/contract-negotiation-termination-message-schema.json)
+**Schema**: [ContractNegotiationTerminationMessageShape](./message/shape/contract-negotiation-termination-message-shape.ttl) and the [ContractNegotiationTerminationMessage JSON Schema](./message/schema/contract-negotiation-termination-message-schema.json)
 
 #### Description
 
@@ -199,7 +199,7 @@ without providing an explanation. Nevertheless, the sender may provide a descrip
 
 **Example**: [NegotiationError](./message/contract-negotiation-error.json)
 
-**Schema**: [ContractNegotiationErrorShape](../schemas/contract-negotiation-error-shape.ttl) and the [ContractNegotiationErrorMessage JSON Schema](../schemas/contract-negotiation-error-schema.json)
+**Schema**: [ContractNegotiationErrorShape](./message/shape/contract-negotiation-error-shape.ttl) and the [ContractNegotiationErrorMessage JSON Schema](./message/schema/contract-negotiation-error-schema.json)
 
 #### Description
 

diff --git a/...on/message/contract-agreement-message.png → ...ge/diagram/contract-agreement-message.png b/...on/message/contract-agreement-message.png → ...ge/diagram/contract-agreement-message.png
diff --git a/...n/message/contract-agreement-message.puml → ...e/diagram/contract-agreement-message.puml b/...n/message/contract-agreement-message.puml → ...e/diagram/contract-agreement-message.puml
diff --git a/...ntract-agreement-verification-message.png → ...ntract-agreement-verification-message.png b/...ntract-agreement-verification-message.png → ...ntract-agreement-verification-message.png
diff --git a/...tract-agreement-verification-message.puml → ...tract-agreement-verification-message.puml b/...tract-agreement-verification-message.puml → ...tract-agreement-verification-message.puml
diff --git a/...on/message/contract-negotiation-error.png → ...ge/diagram/contract-negotiation-error.png b/...on/message/contract-negotiation-error.png → ...ge/diagram/contract-negotiation-error.png
diff --git a/...n/message/contract-negotiation-error.puml → ...e/diagram/contract-negotiation-error.puml b/...n/message/contract-negotiation-error.puml → ...e/diagram/contract-negotiation-error.puml
diff --git a/...ge/contract-negotiation-event-message.png → ...am/contract-negotiation-event-message.png b/...ge/contract-negotiation-event-message.png → ...am/contract-negotiation-event-message.png
diff --git a/...e/contract-negotiation-event-message.puml → ...m/contract-negotiation-event-message.puml b/...e/contract-negotiation-event-message.puml → ...m/contract-negotiation-event-message.puml
diff --git a/...tract-negotiation-termination-message.png → ...tract-negotiation-termination-message.png b/...tract-negotiation-termination-message.png → ...tract-negotiation-termination-message.png
diff --git a/...ract-negotiation-termination-message.puml → ...ract-negotiation-termination-message.puml b/...ract-negotiation-termination-message.puml → ...ract-negotiation-termination-message.puml
diff --git a/negotiation/message/contract-negotiation.png → .../message/diagram/contract-negotiation.png b/negotiation/message/contract-negotiation.png → .../message/diagram/contract-negotiation.png
diff --git a/...tiation/message/contract-negotiation.puml → ...message/diagram/contract-negotiation.puml b/...tiation/message/contract-negotiation.puml → ...message/diagram/contract-negotiation.puml
diff --git a/...tion/message/contract-request-message.png → ...sage/diagram/contract-request-message.png b/...tion/message/contract-request-message.png → ...sage/diagram/contract-request-message.png
diff --git a/...ion/message/contract-request-message.puml → ...age/diagram/contract-request-message.puml b/...ion/message/contract-request-message.puml → ...age/diagram/contract-request-message.puml
diff --git a/...as/contract-agreement-message-schema.json → ...ma/contract-agreement-message-schema.json b/...as/contract-agreement-message-schema.json → ...ma/contract-agreement-message-schema.json
diff --git a/...greement-verification-message-schema.json → ...greement-verification-message-schema.json b/...greement-verification-message-schema.json → ...greement-verification-message-schema.json
diff --git a/...as/contract-negotiation-error-schema.json → ...ma/contract-negotiation-error-schema.json b/...as/contract-negotiation-error-schema.json → ...ma/contract-negotiation-error-schema.json
diff --git a/...act-negotiation-event-message-schema.json → ...act-negotiation-event-message-schema.json b/...act-negotiation-event-message-schema.json → ...act-negotiation-event-message-schema.json
diff --git a/schemas/contract-negotiation-schema.json → ...e/schema/contract-negotiation-schema.json b/schemas/contract-negotiation-schema.json → ...e/schema/contract-negotiation-schema.json
diff --git a/...gotiation-termination-message-schema.json → ...gotiation-termination-message-schema.json b/...gotiation-termination-message-schema.json → ...gotiation-termination-message-schema.json
diff --git a/schemas/contract-request-message-schema.json → ...hema/contract-request-message-schema.json b/schemas/contract-request-message-schema.json → ...hema/contract-request-message-schema.json
diff --git a/schemas/contract-agreement-message-shape.ttl → ...hape/contract-agreement-message-shape.ttl b/schemas/contract-agreement-message-shape.ttl → ...hape/contract-agreement-message-shape.ttl
diff --git a/...-agreement-verification-message-shape.ttl → ...-agreement-verification-message-shape.ttl b/...-agreement-verification-message-shape.ttl → ...-agreement-verification-message-shape.ttl
diff --git a/schemas/contract-negotiation-error-shape.ttl → ...hape/contract-negotiation-error-shape.ttl b/schemas/contract-negotiation-error-shape.ttl → ...hape/contract-negotiation-error-shape.ttl
diff --git a/...tract-negotiation-event-message-shape.ttl → ...tract-negotiation-event-message-shape.ttl b/...tract-negotiation-event-message-shape.ttl → ...tract-negotiation-event-message-shape.ttl
diff --git a/...as/contract-negotiation-message-shape.ttl → ...pe/contract-negotiation-message-shape.ttl b/...as/contract-negotiation-message-shape.ttl → ...pe/contract-negotiation-message-shape.ttl
diff --git a/schemas/contract-negotiation-shape.ttl → ...sage/shape/contract-negotiation-shape.ttl b/schemas/contract-negotiation-shape.ttl → ...sage/shape/contract-negotiation-shape.ttl
diff --git a/...negotiation-termination-message-shape.ttl → ...negotiation-termination-message-shape.ttl b/...negotiation-termination-message-shape.ttl → ...negotiation-termination-message-shape.ttl
diff --git a/schemas/contract-request-message-shape.ttl → .../shape/contract-request-message-shape.ttl b/schemas/contract-request-message-shape.ttl → .../shape/contract-request-message-shape.ttl
diff --git a/...er/images/transfer-completion-message.png → ...e/diagram/transfer-completion-message.png b/...er/images/transfer-completion-message.png → ...e/diagram/transfer-completion-message.png
diff --git a/...r/images/transfer-completion-message.puml → .../diagram/transfer-completion-message.puml b/...r/images/transfer-completion-message.puml → .../diagram/transfer-completion-message.puml
diff --git a/transfer/images/transfer-error.png → transfer/message/diagram/transfer-error.png b/transfer/images/transfer-error.png → transfer/message/diagram/transfer-error.png
diff --git a/transfer/images/transfer-error.puml → transfer/message/diagram/transfer-error.puml b/transfer/images/transfer-error.puml → transfer/message/diagram/transfer-error.puml
diff --git a/transfer/images/transfer-process.png → ...sfer/message/diagram/transfer-process.png b/transfer/images/transfer-process.png → ...sfer/message/diagram/transfer-process.png
diff --git a/transfer/images/transfer-process.puml → ...fer/message/diagram/transfer-process.puml b/transfer/images/transfer-process.puml → ...fer/message/diagram/transfer-process.puml
diff --git a/transfer/images/transfer-request-message.png → ...sage/diagram/transfer-request-message.png b/transfer/images/transfer-request-message.png → ...sage/diagram/transfer-request-message.png
diff --git a/...sfer/images/transfer-request-message.puml → ...age/diagram/transfer-request-message.puml b/...sfer/images/transfer-request-message.puml → ...age/diagram/transfer-request-message.puml
diff --git a/transfer/images/transfer-start-message.png → ...essage/diagram/transfer-start-message.png b/transfer/images/transfer-start-message.png → ...essage/diagram/transfer-start-message.png
diff --git a/transfer/images/transfer-start-message.puml → ...ssage/diagram/transfer-start-message.puml b/transfer/images/transfer-start-message.puml → ...ssage/diagram/transfer-start-message.puml
diff --git a/...er/images/transfer-suspension-message.png → ...e/diagram/transfer-suspension-message.png b/...er/images/transfer-suspension-message.png → ...e/diagram/transfer-suspension-message.png
diff --git a/...r/images/transfer-suspension-message.puml → .../diagram/transfer-suspension-message.puml b/...r/images/transfer-suspension-message.puml → .../diagram/transfer-suspension-message.puml
diff --git a/...r/images/transfer-termination-message.png → .../diagram/transfer-termination-message.png b/...r/images/transfer-termination-message.png → .../diagram/transfer-termination-message.png
diff --git a/.../images/transfer-termination-message.puml → ...diagram/transfer-termination-message.puml b/.../images/transfer-termination-message.puml → ...diagram/transfer-termination-message.puml
diff --git a/...s/transfer-completion-message-schema.json → ...a/transfer-completion-message-schema.json b/...s/transfer-completion-message-schema.json → ...a/transfer-completion-message-schema.json
diff --git a/schemas/transfer-error-schema.json → ...message/schema/transfer-error-schema.json b/schemas/transfer-error-schema.json → ...message/schema/transfer-error-schema.json
diff --git a/schemas/transfer-process-schema.json → ...ssage/schema/transfer-process-schema.json b/schemas/transfer-process-schema.json → ...ssage/schema/transfer-process-schema.json
diff --git a/schemas/transfer-request-message-schema.json → ...hema/transfer-request-message-schema.json b/schemas/transfer-request-message-schema.json → ...hema/transfer-request-message-schema.json
diff --git a/schemas/transfer-start-message-schema.json → ...schema/transfer-start-message-schema.json b/schemas/transfer-start-message-schema.json → ...schema/transfer-start-message-schema.json
diff --git a/...s/transfer-suspension-message-schema.json → ...a/transfer-suspension-message-schema.json b/...s/transfer-suspension-message-schema.json → ...a/transfer-suspension-message-schema.json
diff --git a/.../transfer-termination-message-schema.json → .../transfer-termination-message-schema.json b/.../transfer-termination-message-schema.json → .../transfer-termination-message-schema.json
diff --git a/...mas/transfer-completion-message-shape.ttl → ...ape/transfer-completion-message-shape.ttl b/...mas/transfer-completion-message-shape.ttl → ...ape/transfer-completion-message-shape.ttl
diff --git a/schemas/transfer-error-shape.ttl → ...er/message/shape/transfer-error-shape.ttl b/schemas/transfer-error-shape.ttl → ...er/message/shape/transfer-error-shape.ttl
diff --git a/schemas/transfer-process-shape.ttl → .../message/shape/transfer-process-shape.ttl b/schemas/transfer-process-shape.ttl → .../message/shape/transfer-process-shape.ttl
diff --git a/schemas/transfer-request-message-shape.ttl → .../shape/transfer-request-message-shape.ttl b/schemas/transfer-request-message-shape.ttl → .../shape/transfer-request-message-shape.ttl
diff --git a/schemas/transfer-start-message-shape.ttl → ...ge/shape/transfer-start-message-shape.ttl b/schemas/transfer-start-message-shape.ttl → ...ge/shape/transfer-start-message-shape.ttl
diff --git a/...mas/transfer-suspension-message-shape.ttl → ...ape/transfer-suspension-message-shape.ttl b/...mas/transfer-suspension-message-shape.ttl → ...ape/transfer-suspension-message-shape.ttl
diff --git a/...as/transfer-termination-message-shape.ttl → ...pe/transfer-termination-message-shape.ttl b/...as/transfer-termination-message-shape.ttl → ...pe/transfer-termination-message-shape.ttl
diff --git a/transfer/transfer.process.protocol.md b/transfer/transfer.process.protocol.md
@@ -71,7 +71,7 @@ The TP states are:
 
 ### 1. Transfer Request Message
 
-![](./images/transfer-request-message.png)
+![](./message/diagram/transfer-request-message.png)
 
 **Sent by**: Consumer
 
@@ -81,9 +81,9 @@ The TP states are:
 
 **Response**: [TransferProcess](./message/transfer-process.json) containing the transfer process id or ERROR.
 
-![](./images/transfer-process.png)
+![](./message/diagram/transfer-process.png)
 
-**Schema**: [TransferRequestMessage](../schemas/transfer-request-message-shape.ttl), [TransferRequestMessage JSON Schema](../schemas/transfer-request-message-schema.json), [TransferProcess Shape](../schemas/transfer-process-shape.ttl) and the [TransferProcess JSON Schema](../schemas/transfer-process-schema.json)
+**Schema**: [TransferRequestMessage](./message/shape/transfer-request-message-shape.ttl), [TransferRequestMessage JSON Schema](./message/schema/transfer-request-message-schema.json), [TransferProcess Shape](./message/shape/transfer-process-shape.ttl) and the [TransferProcess JSON Schema](./message/schema/transfer-process-schema.json)
 
 #### Description
 
@@ -112,7 +112,7 @@ Providers must include a `correlationId` property in the `TransferProcessMessage
 
 ### 2. Transfer Start Message
 
-![](./images/transfer-start-message.png)
+![](./message/diagram/transfer-start-message.png)
 
 **Sent by**: Provider
 
@@ -122,7 +122,7 @@ Providers must include a `correlationId` property in the `TransferProcessMessage
 
 **Response**: ACK or ERROR.
 
-**Schema**: [TransferStartMessageShape](../schemas/transfer-start-message-shape.ttl) and the [TransferStartMessage JSON Schema](../schemas/transfer-start-message-schema.json)
+**Schema**: [TransferStartMessageShape](./message/shape/transfer-start-message-shape.ttl) and the [TransferStartMessage JSON Schema](./message/schema/transfer-start-message-schema.json)
 
 
 #### Description
@@ -136,7 +136,7 @@ The _TransferStartMessage_ is sent by the provider to indicate the asset transfe
 
 ### 3. Transfer Suspension Message
 
-![](./images/transfer-suspension-message.png)
+![](./message/diagram/transfer-suspension-message.png)
 
 **Sent by**: Provider or Consumer
 
@@ -146,15 +146,15 @@ The _TransferStartMessage_ is sent by the provider to indicate the asset transfe
 
 **Response**: ACK or ERROR.
 
-**Schema**: [TransferSuspensionMessageShape](../schemas/transfer-suspension-message-shape.ttl) and the [TransferSuspensionMessage JSON Schema](../schemas/transfer-suspension-message-schema.json)
+**Schema**: [TransferSuspensionMessageShape](./message/shape/transfer-suspension-message-shape.ttl) and the [TransferSuspensionMessage JSON Schema](./message/schema/transfer-suspension-message-schema.json)
 
 #### Description
 
 The _TransferSuspensionMessage_ is sent by the provider or consumer when either of them needs to temporarily suspend the data transfer.
 
 ### 4. Transfer Completion Message
 
-![](./images/transfer-completion-message.png)
+![](./message/diagram/transfer-completion-message.png)
 
 **Sent by**: 
 
@@ -164,7 +164,7 @@ The _TransferSuspensionMessage_ is sent by the provider or consumer when either
 
 **Response**: ACK or ERROR.
 
-**Schema**: [TransferCompletionMessageShape](../schemas/transfer-completion-message-shape.ttl) and the [TransferCompletionMessage JSON Schema](../schemas/transfer-completion-message-schema.json)
+**Schema**: [TransferCompletionMessageShape](./message/shape/transfer-completion-message-shape.ttl) and the [TransferCompletionMessage JSON Schema](./message/schema/transfer-completion-message-schema.json)
 
 #### Description
 
@@ -173,7 +173,7 @@ notification by performing it as part of its wire protocol. In those cases, a _T
 
 ### 5. Transfer Termination Message
 
-![](./images/transfer-termination-message.png)
+![](./message/diagram/transfer-termination-message.png)
 
 **Sent by**: Provider or Consumer
 
@@ -183,7 +183,7 @@ notification by performing it as part of its wire protocol. In those cases, a _T
 
 **Response**: ACK or ERROR.
 
-**Schema**: [TransferTerminationMessageShape](../schemas/transfer-termination-message-shape.ttl) and the [TransferTerminationMessage JSON Schema](../schemas/transfer-termination-message-schema.json)
+**Schema**: [TransferTerminationMessageShape](./message/shape/transfer-termination-message-shape.ttl) and the [TransferTerminationMessage JSON Schema](./message/schema/transfer-termination-message-schema.json)
 
 #### Description
 
@@ -192,13 +192,13 @@ a terminal state. If the termination was due to an error, the sender may include
 
 ## TransferError
 
-![](./images/transfer-error.png)
+![](./message/diagram/transfer-error.png)
 
 **Sent by**: Consumer or Provider
 
 **Example**: [TransferError](./message/transfer-error.json)
 
-**Schema**: [TransferErrorShape](../schemas/transfer-error-shape.ttl) and the [TransferError JSON Schema](../schemas/transfer-error-schema.json)
+**Schema**: [TransferErrorShape](./message/shape/transfer-error-shape.ttl) and the [TransferError JSON Schema](./message/schema/transfer-error-schema.json)
 
 #### Description