diff --git a/CGMES/PROF/CGMES-DL-PROF.rdf b/CGMES/PROF/CGMES-DL-PROF.rdf
new file mode 100644
index 0000000..7a456b2
--- /dev/null
+++ b/CGMES/PROF/CGMES-DL-PROF.rdf
@@ -0,0 +1,37 @@
+
+
+
+
+ Diagram Layout
+ CGMES 2.4 Diagram Layout profile.
+ DL
+ DL
+ ENTSO-E
+ ENTSO-E
+ ENTSO-E
+ https://www.apache.org/licenses/LICENSE-2.0
+ en-GB
+ f87f3518-5fc7-458f-9f26-4389075727c9
+
+ 2.4.15
+
+
+
+
+
+
+
+
+
+
+ Diagram Layout
+
+
+
+
+
+
+ http://www.w3.org/ns/shacl
+ DiagramLayoutProfile
+
+
diff --git a/CGMES/PROF/CGMES-DY-PROF.rdf b/CGMES/PROF/CGMES-DY-PROF.rdf
new file mode 100644
index 0000000..bf239e6
--- /dev/null
+++ b/CGMES/PROF/CGMES-DY-PROF.rdf
@@ -0,0 +1,39 @@
+
+
+
+
+ Dynamics
+ CGMES 2.4 Dynamics profile.
+ DY
+ DY
+ ENTSO-E
+ ENTSO-E
+ ENTSO-E
+ https://www.apache.org/licenses/LICENSE-2.0
+ en-GB
+ c02b7d06-1ae3-4df8-aeaa-0d4e0855b20c
+
+ 2.4.15
+
+
+
+
+
+
+
+
+
+
+
+
+ Dynamics
+
+
+
+
+
+
+ http://www.w3.org/ns/shacl
+ DynamicsProfile
+
+
diff --git a/CGMES/PROF/CGMES-EQ-PROF.rdf b/CGMES/PROF/CGMES-EQ-PROF.rdf
new file mode 100644
index 0000000..e85e6da
--- /dev/null
+++ b/CGMES/PROF/CGMES-EQ-PROF.rdf
@@ -0,0 +1,59 @@
+
+
+
+
+ Equipment
+ CGMES 2.4 Equipment profile.
+ EQ
+ EQ
+ ENTSO-E
+ ENTSO-E
+ ENTSO-E
+ https://www.apache.org/licenses/LICENSE-2.0
+ en-GB
+ 35869caf-4e6f-4432-b8cd-f67a981ac310
+
+ 2.4.15
+
+
+
+
+
+
+
+
+
+
+
+ Equipment
+
+
+
+
+
+
+ Equipment
+
+
+
+
+
+
+ Equipment
+
+
+
+
+
+
+ Equipment
+
+
+
+
+
+
+ http://www.w3.org/ns/shacl
+ EquipmentProfile
+
+
diff --git a/CGMES/PROF/CGMES-EQBD-PROF.rdf b/CGMES/PROF/CGMES-EQBD-PROF.rdf
new file mode 100644
index 0000000..16e0997
--- /dev/null
+++ b/CGMES/PROF/CGMES-EQBD-PROF.rdf
@@ -0,0 +1,36 @@
+
+
+
+
+ Equipment Boundary
+ CGMES 2.4 Equipment Boundary profile.
+ EQBD
+ EQBD
+ ENTSO-E
+ ENTSO-E
+ ENTSO-E
+ https://www.apache.org/licenses/LICENSE-2.0
+ en-GB
+ 0403f398-bea4-430a-87fa-744310a4dda7
+
+ 2.4.15
+
+
+
+
+
+
+
+
+
+ Equipment Boundary
+
+
+
+
+
+
+ http://www.w3.org/ns/shacl
+ EquipmentBoundaryProfile
+
+
diff --git a/CGMES/PROF/CGMES-FH-PROF.rdf b/CGMES/PROF/CGMES-FH-PROF.rdf
new file mode 100644
index 0000000..f76ce1c
--- /dev/null
+++ b/CGMES/PROF/CGMES-FH-PROF.rdf
@@ -0,0 +1,35 @@
+
+
+
+
+ File Header
+ CGMES 2.4 File Header profile.
+ FH
+ FH
+ ENTSO-E
+ ENTSO-E
+ ENTSO-E
+ https://www.apache.org/licenses/LICENSE-2.0
+ en-GB
+ 6ca8e494-9ebb-4b75-ad09-d8a4e7985ab5
+
+ 2.4.15
+
+
+
+
+
+
+
+
+ File Header
+
+
+
+
+
+
+ http://www.w3.org/ns/shacl
+ FileHeaderProfile
+
+
diff --git a/CGMES/PROF/CGMES-GL-PROF.rdf b/CGMES/PROF/CGMES-GL-PROF.rdf
new file mode 100644
index 0000000..fe18d29
--- /dev/null
+++ b/CGMES/PROF/CGMES-GL-PROF.rdf
@@ -0,0 +1,36 @@
+
+
+
+
+ Geographical Location
+ CGMES 2.4 Geographical Location profile.
+ GL
+ GL
+ ENTSO-E
+ ENTSO-E
+ ENTSO-E
+ https://www.apache.org/licenses/LICENSE-2.0
+ en-GB
+ 52bde251-7262-4035-b021-697e6170e7d0
+
+ 2.4.15
+
+
+
+
+
+
+
+
+
+ Geographical Location
+
+
+
+
+
+
+ http://www.w3.org/ns/shacl
+ GeographicalLocationProfile
+
+
diff --git a/CGMES/PROF/CGMES-SSH-PROF.rdf b/CGMES/PROF/CGMES-SSH-PROF.rdf
new file mode 100644
index 0000000..6c6fd6c
--- /dev/null
+++ b/CGMES/PROF/CGMES-SSH-PROF.rdf
@@ -0,0 +1,36 @@
+
+
+
+
+ Steady State Hypothesis
+ CGMES 2.4 Steady State Hypothesis profile.
+ SSH
+ SSH
+ ENTSO-E
+ ENTSO-E
+ ENTSO-E
+ https://www.apache.org/licenses/LICENSE-2.0
+ en-GB
+ 76900740-4f67-471f-924c-6cb6ebc2936b
+
+ 2.4.15
+
+
+
+
+
+
+
+
+
+ Steady State Hypothesis
+
+
+
+
+
+
+ http://www.w3.org/ns/shacl
+ SteadyStateHypothesisProfile
+
+
diff --git a/CGMES/PROF/CGMES-SV-PROF.rdf b/CGMES/PROF/CGMES-SV-PROF.rdf
new file mode 100644
index 0000000..cddd3b9
--- /dev/null
+++ b/CGMES/PROF/CGMES-SV-PROF.rdf
@@ -0,0 +1,38 @@
+
+
+
+
+ State Variables
+ CGMES 2.4 State Variables profile.
+ SV
+ SV
+ ENTSO-E
+ ENTSO-E
+ ENTSO-E
+ https://www.apache.org/licenses/LICENSE-2.0
+ en-GB
+ 7561f436-da60-4ebb-981b-31e541d347a8
+
+ 2.4.15
+
+
+
+
+
+
+
+
+
+
+
+ State Variables
+
+
+
+
+
+
+ http://www.w3.org/ns/shacl
+ StateVariablesProfile
+
+
diff --git a/CGMES/PROF/CGMES-TP-PROF.rdf b/CGMES/PROF/CGMES-TP-PROF.rdf
new file mode 100644
index 0000000..0b10c06
--- /dev/null
+++ b/CGMES/PROF/CGMES-TP-PROF.rdf
@@ -0,0 +1,36 @@
+
+
+
+
+ Topology
+ CGMES 2.4 Topology profile.
+ TP
+ TP
+ ENTSO-E
+ ENTSO-E
+ ENTSO-E
+ https://www.apache.org/licenses/LICENSE-2.0
+ en-GB
+ e73d405a-bed6-486d-bbb1-cd8088504d45
+
+ 2.4.15
+
+
+
+
+
+
+
+
+
+ Topology
+
+
+
+
+
+
+ http://www.w3.org/ns/shacl
+ TopologyProfile
+
+
diff --git a/CGMES/PROF/CGMES-TPBD-PROF.rdf b/CGMES/PROF/CGMES-TPBD-PROF.rdf
new file mode 100644
index 0000000..9d6cd6a
--- /dev/null
+++ b/CGMES/PROF/CGMES-TPBD-PROF.rdf
@@ -0,0 +1,37 @@
+
+
+
+
+ Topology Boundary
+ CGMES 2.4 Topology Boundary profile.
+ TPBD
+ TPBD
+ ENTSO-E
+ ENTSO-E
+ ENTSO-E
+ https://www.apache.org/licenses/LICENSE-2.0
+ en-GB
+ a90131f0-3da5-4b97-8494-0f8e04043a4e
+
+ 2.4.15
+
+
+
+
+
+
+
+
+
+
+ Topology Boundary
+
+
+
+
+
+
+ http://www.w3.org/ns/shacl
+ TopologyBoundaryProfile
+
+
diff --git a/CGMES/Original/RDFS/DiagramLayoutProfileRDFSAugmented-v2_4_15-4Sep2020.rdf b/CGMES/RDFS/DiagramLayoutProfileRDFSAugmented-v2_4_15-4Sep2020.rdf
similarity index 100%
rename from CGMES/Original/RDFS/DiagramLayoutProfileRDFSAugmented-v2_4_15-4Sep2020.rdf
rename to CGMES/RDFS/DiagramLayoutProfileRDFSAugmented-v2_4_15-4Sep2020.rdf
diff --git a/CGMES/Original/RDFS/DynamicsProfileRDFSAugmented-v2_4_15-4Sep2020.rdf b/CGMES/RDFS/DynamicsProfileRDFSAugmented-v2_4_15-4Sep2020.rdf
similarity index 100%
rename from CGMES/Original/RDFS/DynamicsProfileRDFSAugmented-v2_4_15-4Sep2020.rdf
rename to CGMES/RDFS/DynamicsProfileRDFSAugmented-v2_4_15-4Sep2020.rdf
diff --git a/CGMES/Original/RDFS/EquipmentBoundaryProfileRDFSAugmented-v2_4_15-4Sep2020.rdf b/CGMES/RDFS/EquipmentBoundaryProfileRDFSAugmented-v2_4_15-4Sep2020.rdf
similarity index 100%
rename from CGMES/Original/RDFS/EquipmentBoundaryProfileRDFSAugmented-v2_4_15-4Sep2020.rdf
rename to CGMES/RDFS/EquipmentBoundaryProfileRDFSAugmented-v2_4_15-4Sep2020.rdf
diff --git a/CGMES/Original/RDFS/EquipmentProfileCoreOperationRDFSAugmented-v2_4_15-4Sep2020.rdf b/CGMES/RDFS/EquipmentProfileCoreOperationRDFSAugmented-v2_4_15-4Sep2020.rdf
similarity index 100%
rename from CGMES/Original/RDFS/EquipmentProfileCoreOperationRDFSAugmented-v2_4_15-4Sep2020.rdf
rename to CGMES/RDFS/EquipmentProfileCoreOperationRDFSAugmented-v2_4_15-4Sep2020.rdf
diff --git a/CGMES/Original/RDFS/EquipmentProfileCoreOperationShortCircuitRDFSAugmented-v2_4_15-4Sep2020.rdf b/CGMES/RDFS/EquipmentProfileCoreOperationShortCircuitRDFSAugmented-v2_4_15-4Sep2020.rdf
similarity index 100%
rename from CGMES/Original/RDFS/EquipmentProfileCoreOperationShortCircuitRDFSAugmented-v2_4_15-4Sep2020.rdf
rename to CGMES/RDFS/EquipmentProfileCoreOperationShortCircuitRDFSAugmented-v2_4_15-4Sep2020.rdf
diff --git a/CGMES/Original/RDFS/EquipmentProfileCoreRDFSAugmented-v2_4_15-4Sep2020.rdf b/CGMES/RDFS/EquipmentProfileCoreRDFSAugmented-v2_4_15-4Sep2020.rdf
similarity index 100%
rename from CGMES/Original/RDFS/EquipmentProfileCoreRDFSAugmented-v2_4_15-4Sep2020.rdf
rename to CGMES/RDFS/EquipmentProfileCoreRDFSAugmented-v2_4_15-4Sep2020.rdf
diff --git a/CGMES/Original/RDFS/EquipmentProfileCoreShortCircuitRDFSAugmented-v2_4_15-4Sep2020.rdf b/CGMES/RDFS/EquipmentProfileCoreShortCircuitRDFSAugmented-v2_4_15-4Sep2020.rdf
similarity index 100%
rename from CGMES/Original/RDFS/EquipmentProfileCoreShortCircuitRDFSAugmented-v2_4_15-4Sep2020.rdf
rename to CGMES/RDFS/EquipmentProfileCoreShortCircuitRDFSAugmented-v2_4_15-4Sep2020.rdf
diff --git a/CGMES/Original/RDFS/FileHeader.rdf b/CGMES/RDFS/FileHeader.rdf
similarity index 100%
rename from CGMES/Original/RDFS/FileHeader.rdf
rename to CGMES/RDFS/FileHeader.rdf
diff --git a/CGMES/Original/RDFS/GeographicalLocationProfileRDFSAugmented-v2_4_15-4Sep2020.rdf b/CGMES/RDFS/GeographicalLocationProfileRDFSAugmented-v2_4_15-4Sep2020.rdf
similarity index 100%
rename from CGMES/Original/RDFS/GeographicalLocationProfileRDFSAugmented-v2_4_15-4Sep2020.rdf
rename to CGMES/RDFS/GeographicalLocationProfileRDFSAugmented-v2_4_15-4Sep2020.rdf
diff --git a/CGMES/Original/RDFS/StateVariableProfileRDFSAugmented-v2_4_15-4Sep2020.rdf b/CGMES/RDFS/StateVariableProfileRDFSAugmented-v2_4_15-4Sep2020.rdf
similarity index 100%
rename from CGMES/Original/RDFS/StateVariableProfileRDFSAugmented-v2_4_15-4Sep2020.rdf
rename to CGMES/RDFS/StateVariableProfileRDFSAugmented-v2_4_15-4Sep2020.rdf
diff --git a/CGMES/Original/RDFS/SteadyStateHypothesisProfileRDFSAugmented-v2_4_15-4Sep2020.rdf b/CGMES/RDFS/SteadyStateHypothesisProfileRDFSAugmented-v2_4_15-4Sep2020.rdf
similarity index 100%
rename from CGMES/Original/RDFS/SteadyStateHypothesisProfileRDFSAugmented-v2_4_15-4Sep2020.rdf
rename to CGMES/RDFS/SteadyStateHypothesisProfileRDFSAugmented-v2_4_15-4Sep2020.rdf
diff --git a/CGMES/Original/RDFS/TopologyBoundaryProfileRDFSAugmented-v2_4_15-4Sep2020.rdf b/CGMES/RDFS/TopologyBoundaryProfileRDFSAugmented-v2_4_15-4Sep2020.rdf
similarity index 100%
rename from CGMES/Original/RDFS/TopologyBoundaryProfileRDFSAugmented-v2_4_15-4Sep2020.rdf
rename to CGMES/RDFS/TopologyBoundaryProfileRDFSAugmented-v2_4_15-4Sep2020.rdf
diff --git a/CGMES/Original/RDFS/TopologyProfileRDFSAugmented-v2_4_15-4Sep2020.rdf b/CGMES/RDFS/TopologyProfileRDFSAugmented-v2_4_15-4Sep2020.rdf
similarity index 100%
rename from CGMES/Original/RDFS/TopologyProfileRDFSAugmented-v2_4_15-4Sep2020.rdf
rename to CGMES/RDFS/TopologyProfileRDFSAugmented-v2_4_15-4Sep2020.rdf
diff --git a/CGMES/Enhanced/SHACL/DiagramLayoutProfile.ttl b/CGMES/SHACL/DiagramLayoutProfile.ttl
similarity index 100%
rename from CGMES/Enhanced/SHACL/DiagramLayoutProfile.ttl
rename to CGMES/SHACL/DiagramLayoutProfile.ttl
diff --git a/CGMES/Enhanced/SHACL/DynamicsProfile.ttl b/CGMES/SHACL/DynamicsProfile.ttl
similarity index 100%
rename from CGMES/Enhanced/SHACL/DynamicsProfile.ttl
rename to CGMES/SHACL/DynamicsProfile.ttl
diff --git a/CGMES/Enhanced/SHACL/EquipmentBoundaryProfile.ttl b/CGMES/SHACL/EquipmentBoundaryProfile.ttl
similarity index 100%
rename from CGMES/Enhanced/SHACL/EquipmentBoundaryProfile.ttl
rename to CGMES/SHACL/EquipmentBoundaryProfile.ttl
diff --git a/CGMES/Enhanced/SHACL/EquipmentProfile.ttl b/CGMES/SHACL/EquipmentProfile.ttl
similarity index 100%
rename from CGMES/Enhanced/SHACL/EquipmentProfile.ttl
rename to CGMES/SHACL/EquipmentProfile.ttl
diff --git a/CGMES/Enhanced/SHACL/FileHeaderProfile.ttl b/CGMES/SHACL/FileHeaderProfile.ttl
similarity index 100%
rename from CGMES/Enhanced/SHACL/FileHeaderProfile.ttl
rename to CGMES/SHACL/FileHeaderProfile.ttl
diff --git a/CGMES/Enhanced/SHACL/GeographicalLocationProfile.ttl b/CGMES/SHACL/GeographicalLocationProfile.ttl
similarity index 100%
rename from CGMES/Enhanced/SHACL/GeographicalLocationProfile.ttl
rename to CGMES/SHACL/GeographicalLocationProfile.ttl
diff --git a/CGMES/Enhanced/SHACL/StateVariablesProfile.ttl b/CGMES/SHACL/StateVariablesProfile.ttl
similarity index 100%
rename from CGMES/Enhanced/SHACL/StateVariablesProfile.ttl
rename to CGMES/SHACL/StateVariablesProfile.ttl
diff --git a/CGMES/Enhanced/SHACL/SteadyStateHypothesisProfile.ttl b/CGMES/SHACL/SteadyStateHypothesisProfile.ttl
similarity index 100%
rename from CGMES/Enhanced/SHACL/SteadyStateHypothesisProfile.ttl
rename to CGMES/SHACL/SteadyStateHypothesisProfile.ttl
diff --git a/CGMES/Enhanced/SHACL/TopologyBoundaryProfile.ttl b/CGMES/SHACL/TopologyBoundaryProfile.ttl
similarity index 100%
rename from CGMES/Enhanced/SHACL/TopologyBoundaryProfile.ttl
rename to CGMES/SHACL/TopologyBoundaryProfile.ttl
diff --git a/CGMES/Enhanced/SHACL/TopologyProfile.ttl b/CGMES/SHACL/TopologyProfile.ttl
similarity index 100%
rename from CGMES/Enhanced/SHACL/TopologyProfile.ttl
rename to CGMES/SHACL/TopologyProfile.ttl