diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index e69de29b..00000000
diff --git a/docs/implementation-guides/v2/Demand_Flexibility/README.md b/docs/implementation-guides/v2/Demand_Flexibility/README.md
deleted file mode 100644
index e69de29b..00000000
diff --git a/docs/implementation-guides/v2/EV_Charging/EV_Charging.md b/docs/implementation-guides/v2/EV_Charging/EV_Charging.md
index 50f92172..10d790c8 100644
--- a/docs/implementation-guides/v2/EV_Charging/EV_Charging.md
+++ b/docs/implementation-guides/v2/EV_Charging/EV_Charging.md
@@ -17,16 +17,6 @@ Implementation Guide \- EV Charging \- Version 0.8 (DRAFT) <!-- omit from toc --
   - [10.2. Actors](#102-actors)
 - [11. Creating an Open Network for EV Charging](#11-creating-an-open-network-for-ev-charging)
   - [11.1. Setting up a Registry](#111-setting-up-a-registry)
-    - [11.1.1. For a Network Participant](#1111-for-a-network-participant)
-      - [11.1.1.1. Step 1 :  Claiming a Namespace](#11111-step-1---claiming-a-namespace)
-      - [11.1.1.2. Step 2 :  Setting up a Registry](#11112-step-2---setting-up-a-registry)
-      - [11.1.1.3. Step 3 :  Publishing subscriber details](#11113-step-3---publishing-subscriber-details)
-    - [11.1.2. Step 4 :  Share details of the registry created with the Beckn One team](#1112-step-4---share-details-of-the-registry-created-with-the-beckn-one-team)
-    - [11.1.3. For a Network facilitator organization](#1113-for-a-network-facilitator-organization)
-      - [11.1.3.1. Step 1 :  Claiming a Namespace](#11131-step-1---claiming-a-namespace)
-      - [11.1.3.2. Step 2 :  Setting up a Registry](#11132-step-2---setting-up-a-registry)
-      - [11.1.3.3. Step 3 :  Publishing subscriber details](#11133-step-3---publishing-subscriber-details)
-      - [11.1.3.4. Step 4 :  Share details of the registry created with the Beckn One team](#11134-step-4---share-details-of-the-registry-created-with-the-beckn-one-team)
   - [11.2. Setting up the Protocol Endpoints](#112-setting-up-the-protocol-endpoints)
     - [11.2.1. Installing Beckn ONIX](#1121-installing-beckn-onix)
     - [11.2.2. Configuring Beckn ONIX for EV Charging Transactions](#1122-configuring-beckn-onix-for-ev-charging-transactions)
@@ -212,77 +202,8 @@ To create an open network for EV charging requires all the EV charging BAPs, BPP
 
 ## 11.1. Setting up a Registry
 
-The NP Registry serves as the root of addressability and trust for all network participants. It maintains comprehensive details such as the participant’s globally unique identifier (ID), network address (Beckn API URL), public key, operational domains, and assigned role (e.g., BAP, BPP, CDS). In addition to managing participant registration, authentication, authorization, and permission control, the Registry oversees participant verification, activation, and overall lifecycle management, ensuring that only validated and authorized entities can operate within the network.
+Please refer to [Setting up a Registry](../common/setting_up_a_registry.md) for detailed steps.
 
-![](../assets/registry-arch.png)
-
-You can publish your registries at [DeDi.global](https://publish.dedi.global/).
-
-### 11.1.1. For a Network Participant
-
-#### 11.1.1.1. Step 1 :  Claiming a Namespace
-
-To get started, any platform that has implemented Beckn Protocol MUST create a globally unique namespace for themselves.   
-All NPs (BAPs, BPPs, CDS’es) **MUST** register as a user on dedi.global and claim a unique namespace against their FQDN to become globally addressable. As part of the claiming process, the user must prove ownership of the namespace by verifying the ownership of their domain. Namespace would be at an organisation level. You can put your organisation name as the name of the namespace.
-
-#### 11.1.1.2. Step 2 :  Setting up a Registry
-
-Once the namespace is claimed, each NP **MUST** create a Beckn NP registry in the namespace to list their subscriber details. While creating the registry, the user **MUST** configure it with the [subscriber schema](https://gist.githubusercontent.com/nirmalnr/a6e5b17522169ecea4f3ccdd831af7e4/raw/7744f2542034db9675901b61b41c8228ea239074/beckn-subscriber-no-refs.schema.json). Example of a registry name can be `subscription-details`.
-
-#### 11.1.1.3. Step 3 :  Publishing subscriber details
-
-In the registry that is created, NPs **MUST** publish their subscription details including their ID, network endpoints, public keys, operational domains and assigned roles (BAP, BPP) as records.
-
-*Detailed steps to create namespaces and registries in dedi.global can be found [here](https://github.com/dedi-global/docs/blob/0976607aabc6641d330a3d41a3bd89ab8790ea09/user-guides/namespace%20and%20registry%20creation.md).*
-
-### 11.1.2. Step 4 :  Share details of the registry created with the Beckn One team
-
-Once the registry is created and details are published, the namespace and the registry name of the newly created registry should be shared with the beckn one team.
-
-### 11.1.3. For a Network facilitator organization
-
-#### 11.1.3.1. Step 1 :  Claiming a Namespace
-
-An NFO **MAY** register as a user on dedi.global and claim a unique namespace against their FQDN. As part of the claiming process, the user must prove ownership of that namespace by verifying the ownership of that domain. The NFO name can be set as the name of the namespace. 
-*Note: A calibrated roll out of this infrastructure is planned and hence before it is open to the general public NFOs are advised to share their own domain and the domains of their NPs to the Beckn One team so that they can be whitelisted which will allow the NPs to verify the same using TXT records in their DNS.*
-
-#### 11.1.3.2. Step 2 :  Setting up a Registry
-
-Network facilitators **MAY** create registries under their own namespace using the [subscriber reference schema](https://gist.githubusercontent.com/nirmalnr/a6e5b17522169ecea4f3ccdd831af7e4/raw/b7cf8a47e6531ef22744b43e6305b8d8cc106e7b/beckn-subscriber-reference.schema.json) to point to either whole registries or records created by the NPs in their own namespaces.  Example of a registry name can be `subscription-details`.
-
-#### 11.1.3.3. Step 3 :  Publishing subscriber details
-
-In the registry that is created, NFOs **MAY** publish records which act as pointers to either whole registries or records created by the NPs records. The URL field in the record would be the lookup URL for a registry or a record as per DeDi protocol.
-
-Example: For referencing another registry created by an NP, the record details created would be:
-
-```json
-{
-  "url": "https://.dedi.global/dedi/lookup/example-company/subscription-details",
-  "type": "Registry",
-  "subscriber_id": "example-company.com"
-}
-```
-
-Here `example-company` is the namespace of the NP, and all records added in the registry is referenced here. 
-
-If only one record in the registry needs to be referenced, then the record details created would be:
-
-```json
-{
-  "url": "https://.dedi.global/dedi/lookup/example-company/subscription-details/energy-bap",
-  "type": "Record",
-  "subscriber_id": "example-company.com"
-}
-```
-
-Here `energy-bap` is the name of the record created by the NP in this registry. Only that record is referenced here.
-
-*Detailed steps to create namespaces and registries in dedi.global can be found [here](https://github.com/dedi-global/docs/blob/0976607aabc6641d330a3d41a3bd89ab8790ea09/user-guides/namespace%20and%20registry%20creation.md).*
-
-#### 11.1.3.4. Step 4 :  Share details of the registry created with the Beckn One team
-
-Once the registry is created and details are published, the namespace and the registry name of the newly created registry should be shared with the beckn one team.
 
 ## 11.2. Setting up the Protocol Endpoints
 
diff --git a/docs/implementation-guides/v2/P2P_Trading/P2P_Trading_implementation_guide_DRAFT.md b/docs/implementation-guides/v2/P2P_Trading/P2P_Trading_implementation_guide_DRAFT.md
index 76e4d936..59118cb6 100644
--- a/docs/implementation-guides/v2/P2P_Trading/P2P_Trading_implementation_guide_DRAFT.md
+++ b/docs/implementation-guides/v2/P2P_Trading/P2P_Trading_implementation_guide_DRAFT.md
@@ -16,16 +16,6 @@ Version 0.1 (Non-Normative)
   - [7.2. Actors](#72-actors)
 - [8. Creating an Open Network for Peer to Peer Energy Trading](#8-creating-an-open-network-for-peer-to-peer-energy-trading)
   - [8.1. Setting up a Registry](#81-setting-up-a-registry)
-    - [8.1.1. For a Network Participant](#811-for-a-network-participant)
-      - [8.1.1.1. Step 1 :  Claiming a Namespace](#8111-step-1---claiming-a-namespace)
-      - [8.1.1.2. Step 2 :  Setting up a Registry](#8112-step-2---setting-up-a-registry)
-      - [8.1.1.3. Step 3 :  Publishing subscriber details](#8113-step-3---publishing-subscriber-details)
-    - [8.1.2. Step 4 :  Share details of the registry created with the Beckn One team](#812-step-4---share-details-of-the-registry-created-with-the-beckn-one-team)
-    - [8.1.3. For a Network facilitator organization](#813-for-a-network-facilitator-organization)
-      - [8.1.3.1. Step 1 :  Claiming a Namespace](#8131-step-1---claiming-a-namespace)
-      - [8.1.3.2. Step 2 :  Setting up a Registry](#8132-step-2---setting-up-a-registry)
-      - [8.1.3.3. Step 3 :  Publishing subscriber details](#8133-step-3---publishing-subscriber-details)
-      - [8.1.3.4. Step 4 :  Share details of the registry created with the Beckn One team](#8134-step-4---share-details-of-the-registry-created-with-the-beckn-one-team)
   - [8.2. Setting up the Protocol Endpoints](#82-setting-up-the-protocol-endpoints)
     - [8.2.1. Installing Beckn ONIX](#821-installing-beckn-onix)
     - [8.2.2. Configuring Beckn ONIX for Peer to Peer Energy Trading](#822-configuring-beckn-onix-for-peer-to-peer-energy-trading)
@@ -247,77 +237,8 @@ To create an open network for energy trading requires all the producers, prosume
 
 ## 8.1. Setting up a Registry
 
-The NP Registry serves as the root of addressability and trust for all network participants. It maintains comprehensive details such as the participant’s globally unique identifier (ID), network address (Beckn API URL), public key, operational domains, and assigned role (e.g., BAP, BPP, CDS). In addition to managing participant registration, authentication, authorization, and permission control, the Registry oversees participant verification, activation, and overall lifecycle management, ensuring that only validated and authorized entities can operate within the network.
+Please refer to [Setting up a Registry](../common/setting_up_a_registry.md) for detailed steps.
 
-![](../assets/registry-arch.png)
-
-You can publish your registries at [DeDi.global](https://publish.dedi.global/).
-
-### 8.1.1. For a Network Participant
-
-#### 8.1.1.1. Step 1 :  Claiming a Namespace
-
-To get started, any platform that has implemented Beckn Protocol MUST create a globally unique namespace for themselves.   
-All NPs (BAPs, BPPs, CDS’es) **MUST** register as a user on dedi.global and claim a unique namespace against their FQDN to become globally addressable. As part of the claiming process, the user must prove ownership of the namespace by verifying the ownership of their domain. Namespace would be at an organisation level. You can put your organisation name as the name of the namespace.
-
-#### 8.1.1.2. Step 2 :  Setting up a Registry
-
-Once the namespace is claimed, each NP **MUST** create a Beckn NP registry in the namespace to list their subscriber details. While creating the registry, the user **MUST** configure it with the [subscriber schema](https://gist.githubusercontent.com/nirmalnr/a6e5b17522169ecea4f3ccdd831af7e4/raw/7744f2542034db9675901b61b41c8228ea239074/beckn-subscriber-no-refs.schema.json). Example of a registry name can be `subscription-details`.
-
-#### 8.1.1.3. Step 3 :  Publishing subscriber details
-
-In the registry that is created, NPs **MUST** publish their subscription details including their ID, network endpoints, public keys, operational domains and assigned roles (BAP, BPP) as records.
-
-*Detailed steps to create namespaces and registries in dedi.global can be found [here](https://github.com/dedi-global/docs/blob/0976607aabc6641d330a3d41a3bd89ab8790ea09/user-guides/namespace%20and%20registry%20creation.md).*
-
-### 8.1.2. Step 4 :  Share details of the registry created with the Beckn One team
-
-Once the registry is created and details are published, the namespace and the registry name of the newly created registry should be shared with the beckn one team.
-
-### 8.1.3. For a Network facilitator organization
-
-#### 8.1.3.1. Step 1 :  Claiming a Namespace
-
-An NFO **MAY** register as a user on dedi.global and claim a unique namespace against their FQDN. As part of the claiming process, the user must prove ownership of that namespace by verifying the ownership of that domain. The NFO name can be set as the name of the namespace. 
-*Note: A calibrated roll out of this infrastructure is planned and hence before it is open to the general public NFOs are advised to share their own domain and the domains of their NPs to the Beckn One team so that they can be whitelisted which will allow the NPs to verify the same using TXT records in their DNS.*
-
-#### 8.1.3.2. Step 2 :  Setting up a Registry
-
-Network facilitators **MAY** create registries under their own namespace using the [subscriber reference schema](https://gist.githubusercontent.com/nirmalnr/a6e5b17522169ecea4f3ccdd831af7e4/raw/b7cf8a47e6531ef22744b43e6305b8d8cc106e7b/beckn-subscriber-reference.schema.json) to point to either whole registries or records created by the NPs in their own namespaces.  Example of a registry name can be `subscription-details`.
-
-#### 8.1.3.3. Step 3 :  Publishing subscriber details
-
-In the registry that is created, NFOs **MAY** publish records which act as pointers to either whole registries or records created by the NPs records. The URL field in the record would be the lookup URL for a registry or a record as per DeDi protocol.
-
-Example: For referencing another registry created by an NP, the record details created would be:
-
-```json
-{
-  "url": "https://.dedi.global/dedi/lookup/example-company/subscription-details",
-  "type": "Registry",
-  "subscriber_id": "example-company.com"
-}
-```
-
-Here `example-company` is the namespace of the NP, and all records added in the registry is referenced here. 
-
-If only one record in the registry needs to be referenced, then the record details created would be:
-
-```json
-{
-  "url": "https://.dedi.global/dedi/lookup/example-company/subscription-details/energy-bap",
-  "type": "Record",
-  "subscriber_id": "example-company.com"
-}
-```
-
-Here `energy-bap` is the name of the record created by the NP in this registry. Only that record is referenced here.
-
-*Detailed steps to create namespaces and registries in dedi.global can be found [here](https://github.com/dedi-global/docs/blob/0976607aabc6641d330a3d41a3bd89ab8790ea09/user-guides/namespace%20and%20registry%20creation.md).*
-
-#### 8.1.3.4. Step 4 :  Share details of the registry created with the Beckn One team
-
-Once the registry is created and details are published, the namespace and the registry name of the newly created registry should be shared with the beckn one team.
 
 ## 8.2. Setting up the Protocol Endpoints
 
diff --git a/docs/implementation-guides/v2/P2P_Trading/README.md b/docs/implementation-guides/v2/P2P_Trading/README.md
deleted file mode 100644
index e69de29b..00000000
diff --git a/docs/implementation-guides/v2/common/setting_up_a_registry.md b/docs/implementation-guides/v2/common/setting_up_a_registry.md
new file mode 100644
index 00000000..68fbb8b5
--- /dev/null
+++ b/docs/implementation-guides/v2/common/setting_up_a_registry.md
@@ -0,0 +1,71 @@
+The NP Registry serves as the root of addressability and trust for all network participants. It maintains comprehensive details such as the participant’s globally unique identifier (ID), network address (Beckn API URL), public key, operational domains, and assigned role (e.g., BAP, BPP, CDS). In addition to managing participant registration, authentication, authorization, and permission control, the Registry oversees participant verification, activation, and overall lifecycle management, ensuring that only validated and authorized entities can operate within the network.
+
+![](../assets/registry-arch.png)
+
+You can publish your registries at [DeDi.global](https://publish.dedi.global/).
+
+### For a Network Participant
+
+#### Step 1 :  Claiming a Namespace
+
+To get started, any platform that has implemented Beckn Protocol MUST create a globally unique namespace for themselves.   
+All NPs (BAPs, BPPs, CDS’es) **MUST** register as a user on dedi.global and claim a unique namespace against their FQDN to become globally addressable. As part of the claiming process, the user must prove ownership of the namespace by verifying the ownership of their domain. Namespace would be at an organisation level. You can put your organisation name as the name of the namespace.
+
+#### Step 2 :  Setting up a Registry
+
+Once the namespace is claimed, each NP **MUST** create a Beckn NP registry in the namespace to list their subscriber details. While creating the registry, the user **MUST** configure it with the [subscriber schema](https://gist.githubusercontent.com/nirmalnr/a6e5b17522169ecea4f3ccdd831af7e4/raw/7744f2542034db9675901b61b41c8228ea239074/beckn-subscriber-no-refs.schema.json). Example of a registry name can be `subscription-details`.
+
+#### Step 3 :  Publishing subscriber details
+
+In the registry that is created, NPs **MUST** publish their subscription details including their ID, network endpoints, public keys, operational domains and assigned roles (BAP, BPP) as records.
+
+*Detailed steps to create namespaces and registries in dedi.global can be found [here](https://github.com/dedi-global/docs/blob/0976607aabc6641d330a3d41a3bd89ab8790ea09/user-guides/namespace%20and%20registry%20creation.md).*
+
+### Step 4 :  Share details of the registry created with the Beckn One team
+
+Once the registry is created and details are published, the namespace and the registry name of the newly created registry should be shared with the beckn one team.
+
+### For a Network facilitator organization
+
+#### Step 1 :  Claiming a Namespace
+
+An NFO **MAY** register as a user on dedi.global and claim a unique namespace against their FQDN. As part of the claiming process, the user must prove ownership of that namespace by verifying the ownership of that domain. The NFO name can be set as the name of the namespace. 
+*Note: A calibrated roll out of this infrastructure is planned and hence before it is open to the general public NFOs are advised to share their own domain and the domains of their NPs to the Beckn One team so that they can be whitelisted which will allow the NPs to verify the same using TXT records in their DNS.*
+
+#### Step 2 :  Setting up a Registry
+
+Network facilitators **MAY** create registries under their own namespace using the [subscriber reference schema](https://gist.githubusercontent.com/nirmalnr/a6e5b17522169ecea4f3ccdd831af7e4/raw/b7cf8a47e6531ef22744b43e6305b8d8cc106e7b/beckn-subscriber-reference.schema.json) to point to either whole registries or records created by the NPs in their own namespaces.  Example of a registry name can be `subscription-details`.
+
+#### Step 3 :  Publishing subscriber details
+
+In the registry that is created, NFOs **MAY** publish records which act as pointers to either whole registries or records created by the NPs records. The URL field in the record would be the lookup URL for a registry or a record as per DeDi protocol.
+
+Example: For referencing another registry created by an NP, the record details created would be:
+
+```json
+{
+  "url": "https://.dedi.global/dedi/lookup/example-company/subscription-details",
+  "type": "Registry",
+  "subscriber_id": "example-company.com"
+}
+```
+
+Here `example-company` is the namespace of the NP, and all records added in the registry is referenced here. 
+
+If only one record in the registry needs to be referenced, then the record details created would be:
+
+```json
+{
+  "url": "https://.dedi.global/dedi/lookup/example-company/subscription-details/energy-bap",
+  "type": "Record",
+  "subscriber_id": "example-company.com"
+}
+```
+
+Here `energy-bap` is the name of the record created by the NP in this registry. Only that record is referenced here.
+
+*Detailed steps to create namespaces and registries in dedi.global can be found [here](https://github.com/dedi-global/docs/blob/0976607aabc6641d330a3d41a3bd89ab8790ea09/user-guides/namespace%20and%20registry%20creation.md).*
+
+#### Step 4 :  Share details of the registry created with the Beckn One team
+
+Once the registry is created and details are published, the namespace and the registry name of the newly created registry should be shared with the beckn one team.
diff --git a/specification/README.md b/specification/README.md
deleted file mode 100644
index e69de29b..00000000