diff --git a/catalog-v001.xml b/catalog-v001.xml
index 47c43100..42a9f524 100644
--- a/catalog-v001.xml
+++ b/catalog-v001.xml
@@ -33,14 +33,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/disciplines/catalog-v001.xml b/disciplines/catalog-v001.xml
index 565b2f45..5e4168c1 100644
--- a/disciplines/catalog-v001.xml
+++ b/disciplines/catalog-v001.xml
@@ -34,14 +34,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/disciplines/disciplines.ttl b/disciplines/disciplines.ttl
index 48f2cada..3d00bb9d 100644
--- a/disciplines/disciplines.ttl
+++ b/disciplines/disciplines.ttl
@@ -23,15 +23,15 @@
.
# Imported vis sisystem
-# ,
-# ,
-# ,
-# ,
+# ,
+# ,
+# ,
+# ,
# Currently not imported by default
-# ,
-# ,
-# ,
+# ,
+# ,
+# ,
# To be removed
diff --git a/disciplines/isq.ttl b/disciplines/isq.ttl
index 3b346189..c143502b 100644
--- a/disciplines/isq.ttl
+++ b/disciplines/isq.ttl
@@ -11,7 +11,7 @@
rdf:type owl:Ontology ;
owl:versionIRI ;
owl:imports ,
- ,
+ ,
;
dcterms:abstract """Defines physical quantities in the International System of Quantities (ISQ). ISQ was made an official ISO standard in 2009 and is defined in the ISO/IEC 80000 standard.
diff --git a/disciplines/units/sisystem.ttl b/disciplines/sisystem.ttl
similarity index 75%
rename from disciplines/units/sisystem.ttl
rename to disciplines/sisystem.ttl
index 4488557a..967b0b32 100644
--- a/disciplines/units/sisystem.ttl
+++ b/disciplines/sisystem.ttl
@@ -10,10 +10,10 @@
rdf:type owl:Ontology ;
owl:versionIRI ;
- owl:imports ,
- ,
- ,
- ,
- .
+ owl:imports ,
+ ,
+ ,
+ ,
+ .
### Generated by the OWL API (version 4.5.25.2023-02-15T19:15:49Z) https://github.com/owlcs/owlapi
diff --git a/disciplines/units/catalog-v001.xml b/disciplines/units/catalog-v001.xml
index 61ae9aa4..b4bbb23b 100644
--- a/disciplines/units/catalog-v001.xml
+++ b/disciplines/units/catalog-v001.xml
@@ -34,14 +34,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/disciplines/units/coherentsiunits.ttl b/disciplines/units/coherentsiunits.ttl
index 58e3be93..a98387e4 100644
--- a/disciplines/units/coherentsiunits.ttl
+++ b/disciplines/units/coherentsiunits.ttl
@@ -1,4 +1,4 @@
-@prefix : .
+@prefix : .
@prefix owl: .
@prefix rdf: .
@prefix xml: .
@@ -7,11 +7,11 @@
@prefix rdfs: .
@prefix skos: .
@prefix dcterms: .
-@base .
+@base .
- rdf:type owl:Ontology ;
- owl:versionIRI ;
- owl:imports ;
+ rdf:type owl:Ontology ;
+ owl:versionIRI ;
+ owl:imports ;
dcterms:abstract "The module 'coherentsiunits' contain coherent derived SI units. For each physical dimensionality there exists one and only one coherent derived SI unit. Examples of such units are m/s, Pa·m, etc..."@en ;
dcterms:contributor "Adham Hashibon, Fraunhofer IWM (DE)" ,
"Francesca L. Bleken, SINTEF (NO)" ,
diff --git a/disciplines/units/deprecated.ttl b/disciplines/units/deprecated.ttl
index 7f12d0ec..aaf3876f 100644
--- a/disciplines/units/deprecated.ttl
+++ b/disciplines/units/deprecated.ttl
@@ -10,7 +10,7 @@
rdf:type owl:Ontology ;
owl:versionIRI ;
- owl:imports ,
+ owl:imports ,
;
dcterms:abstract "This module contains deprecated IRIs with references."@en ;
dcterms:contributor "Gerhard Goldbeck, Boldbeck Consulting Ltd (UK)" ;
diff --git a/disciplines/units/noncoherentsiunits.ttl b/disciplines/units/noncoherentsiunits.ttl
index 38625e54..8b961e1f 100644
--- a/disciplines/units/noncoherentsiunits.ttl
+++ b/disciplines/units/noncoherentsiunits.ttl
@@ -9,9 +9,9 @@
@prefix dcterms: .
@base .
- rdf:type owl:Ontology ;
- owl:versionIRI ;
- owl:imports ;
+ rdf:type owl:Ontology ;
+ owl:versionIRI ;
+ owl:imports ;
dcterms:abstract "The 'noncoherentsiunits' module contains non-coherent SI derived units. This include ."@en ;
dcterms:contributor "Adham Hashibon, Fraunhofer IWM (DE)" ,
"Francesca L. Bleken, SINTEF (NO)" ,
diff --git a/disciplines/units/prefixedsiunits.ttl b/disciplines/units/prefixedsiunits.ttl
index ec279643..2b8d32f8 100644
--- a/disciplines/units/prefixedsiunits.ttl
+++ b/disciplines/units/prefixedsiunits.ttl
@@ -7,11 +7,11 @@
@prefix rdfs: .
@prefix skos: .
@prefix dcterms: .
-@base .
+@base .
- rdf:type owl:Ontology ;
- owl:versionIRI ;
- owl:imports ;
+ rdf:type owl:Ontology ;
+ owl:versionIRI ;
+ owl:imports ;
dcterms:abstract "The module 'prefixedsiunits' contains prefixed SI units, like km, ms, MPa, etc..."@en ;
dcterms:contributor "Adham Hashibon, Fraunhofer IWM (DE)" ,
"Francesca L. Bleken, SINTEF (NO)" ,
diff --git a/disciplines/units/prefixedunits.ttl b/disciplines/units/prefixedunits.ttl
index 9854372f..b47471cb 100644
--- a/disciplines/units/prefixedunits.ttl
+++ b/disciplines/units/prefixedunits.ttl
@@ -12,10 +12,10 @@
rdf:type owl:Ontology ;
owl:versionIRI ;
owl:imports ,
- ,
- ,
- ,
- ;
+ ,
+ ,
+ ,
+ ;
dcterms:abstract "This module contains prefixed units."@en ;
dcterms:contributor "Gerhard Goldbeck, Boldbeck Consulting Ltd (UK)" ;
dcterms:creator "Emanuele Ghedini, University of Bologna (IT)" ,
diff --git a/disciplines/units/siacceptedunits.ttl b/disciplines/units/siacceptedunits.ttl
index 1daa60a3..4b7d8088 100644
--- a/disciplines/units/siacceptedunits.ttl
+++ b/disciplines/units/siacceptedunits.ttl
@@ -8,9 +8,9 @@
@prefix dcterms: .
@base .
- rdf:type owl:Ontology ;
- owl:versionIRI ;
- owl:imports ;
+ rdf:type owl:Ontology ;
+ owl:versionIRI ;
+ owl:imports ;
dcterms:abstract "The module 'siacceptedunits' include non-SI units that are accepted for use with the SI units as well as derived units constructed from SI and SI-accepted units."@en ;
dcterms:contributor "Adham Hashibon, Fraunhofer IWM (DE)" ,
"Francesca L. Bleken, SINTEF (NO)" ,
diff --git a/disciplines/units/sidimensionalunits.ttl b/disciplines/units/sidimensionalunits.ttl
index 5ebb08ce..dbf6f31a 100644
--- a/disciplines/units/sidimensionalunits.ttl
+++ b/disciplines/units/sidimensionalunits.ttl
@@ -9,8 +9,8 @@
@prefix dcterms: .
@base .
- rdf:type owl:Ontology ;
- owl:versionIRI ;
+ rdf:type owl:Ontology ;
+ owl:versionIRI ;
owl:imports ;
emmo:EMMO_1246b120_abbe_4840_b0f8_3e4348b24a17 "emmo@emmc.eu" ;
dcterms:abstract """The module 'sidimensionalunits' defines SI dimensional unit classes. These classes provide a categorisation of all units according to their SI physical dimensions.
diff --git a/disciplines/units/siunits.ttl b/disciplines/units/siunits.ttl
index 4c66637f..99eb7e4f 100644
--- a/disciplines/units/siunits.ttl
+++ b/disciplines/units/siunits.ttl
@@ -8,10 +8,10 @@
@prefix dcterms: .
@base .
- rdf:type owl:Ontology ;
- owl:versionIRI ;
+ rdf:type owl:Ontology ;
+ owl:versionIRI ;
owl:imports ,
- ;
+ ;
dcterms:abstract """The module 'siunits' defines the 7 base units and 22 derived units as well as the metric prefixes specified in the SI system.
All additional derived units, SI-based or not, goes into the 'units-extension' module."""@en ;
diff --git a/disciplines/units/unclassifiedunits.ttl b/disciplines/units/unclassifiedunits.ttl
index e2817aa7..574efe77 100644
--- a/disciplines/units/unclassifiedunits.ttl
+++ b/disciplines/units/unclassifiedunits.ttl
@@ -9,8 +9,8 @@
@prefix dcterms: .
@base .
- rdf:type owl:Ontology ;
- owl:versionIRI ;
+ rdf:type owl:Ontology ;
+ owl:versionIRI ;
owl:imports ;
dcterms:abstract "This module holds so far unclassified units imported from QUDT. By time these units will be moved into other modules while being classified. Their IRI will not be changed."@en ;
dcterms:contributor "Adham Hashibon, Fraunhofer IWM (DE)" ,
diff --git a/disciplines/units/unitsextension.ttl b/disciplines/units/unitsextension.ttl
index ec2806d4..5483eca6 100644
--- a/disciplines/units/unitsextension.ttl
+++ b/disciplines/units/unitsextension.ttl
@@ -11,7 +11,7 @@
rdf:type owl:Ontology ;
owl:versionIRI ;
- owl:imports ;
+ owl:imports ;
dcterms:abstract "The module 'unitsextension' defines non-prefixed units that are not included in the 'siumits' module."@en ;
dcterms:contributor "Adham Hashibon, Fraunhofer IWM (DE)" ,
"Francesca L. Bleken, SINTEF (NO)" ,
diff --git a/domain/catalog-v001.xml b/domain/catalog-v001.xml
index ed9406c6..aab92cd9 100644
--- a/domain/catalog-v001.xml
+++ b/domain/catalog-v001.xml
@@ -32,14 +32,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/scripts/metrology2.py b/scripts/metrology2.py
index 8d36e5ca..20724391 100644
--- a/scripts/metrology2.py
+++ b/scripts/metrology2.py
@@ -301,7 +301,7 @@ def powermult(i, tokens, order, power, mult, known):
onto_pu.save(disciplinesdir / "prefixedunits.ttl", format="turtle", overwrite=True)
set_turtle_prefix(disciplinesdir / "sidimensionalunits.ttl", EMMO,
- EMMO / "disciplines/sidimensionalunits")
+ EMMO / "disciplines/units/sidimensionalunits")
set_turtle_prefix(disciplinesdir / "unitsextension.ttl", EMMO,
EMMO / "disciplines/unitsextension")
set_turtle_prefix(disciplinesdir / "prefixedunits.ttl", EMMO,