diff --git a/rdmorganiser/questions/training.xml b/rdmorganiser/questions/training.xml
index 38275b8a..042a6b4b 100644
--- a/rdmorganiser/questions/training.xml
+++ b/rdmorganiser/questions/training.xml
@@ -21,10 +21,10 @@
 		<title lang="fr">Général</title>
 		<title lang="it">Generale</title>
 	</section>
-	<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/rdm/topic-research_question">
+	<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/general/topic-research_question">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
 		<key>topic-research_question</key>
-		<path>training/rdm/topic-research_question</path>
+		<path>training/general/topic-research_question</path>
 		<dc:comment/>
 		<attribute/>
 		<section dc:uri="https://rdmorganiser.github.io/terms/questions/training/general"/>
@@ -52,13 +52,13 @@
 		<verbose_name_plural lang="it"/>
 		<conditions/>
 	</questionset>
-	<question dc:uri="https://rdmorganiser.github.io/terms/questions/training/rdm/topic-research_question/title">
+	<question dc:uri="https://rdmorganiser.github.io/terms/questions/training/general/topic-research_question/title">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
 		<key>title</key>
-		<path>training/rdm/topic-research_question/title</path>
+		<path>training/general/topic-research_question/title</path>
 		<dc:comment/>
 		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/research_question/title"/>
-		<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/rdm/topic-research_question"/>
+		<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/general/topic-research_question"/>
 		<is_collection>False</is_collection>
 		<order>1</order>
 		<help lang="en">Please describe briefly the project and its aims.</help>
@@ -90,10 +90,10 @@
 		<optionsets/>
 		<conditions/>
 	</question>
-	<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/rdm/funding-funder">
+	<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/general/funding-funder">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
 		<key>funding-funder</key>
-		<path>training/rdm/funding-funder</path>
+		<path>training/general/funding-funder</path>
 		<dc:comment/>
 		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/funder/id"/>
 		<section dc:uri="https://rdmorganiser.github.io/terms/questions/training/general"/>
@@ -121,13 +121,13 @@
 		<verbose_name_plural lang="it">Enti finanziatori</verbose_name_plural>
 		<conditions/>
 	</questionset>
-	<question dc:uri="https://rdmorganiser.github.io/terms/questions/training/rdm/funding-funder/title">
+	<question dc:uri="https://rdmorganiser.github.io/terms/questions/training/general/funding-funder/title">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
 		<key>title</key>
-		<path>training/rdm/funding-funder/title</path>
+		<path>training/general/funding-funder/title</path>
 		<dc:comment/>
 		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/funder/programme/title"/>
-		<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/rdm/funding-funder"/>
+		<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/general/funding-funder"/>
 		<is_collection>False</is_collection>
 		<order>1</order>
 		<help lang="en"/>
@@ -159,13 +159,13 @@
 		<optionsets/>
 		<conditions/>
 	</question>
-	<question dc:uri="https://rdmorganiser.github.io/terms/questions/training/rdm/funding-funder/name">
+	<question dc:uri="https://rdmorganiser.github.io/terms/questions/training/general/funding-funder/name">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
 		<key>name</key>
-		<path>training/rdm/funding-funder/name</path>
+		<path>training/general/funding-funder/name</path>
 		<dc:comment/>
 		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/funder/name"/>
-		<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/rdm/funding-funder"/>
+		<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/general/funding-funder"/>
 		<is_collection>False</is_collection>
 		<order>0</order>
 		<help lang="en"/>
@@ -197,44 +197,44 @@
 		<optionsets/>
 		<conditions/>
 	</question>
-	<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/rdm/other-requirements-yesno">
+	<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/general/other-requirements-yesno">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
-		<key>other-requirements</key>
-		<path>training/rdm/other-requirements-yesno</path>
+		<key>other-requirements-yesno</key>
+		<path>training/general/other-requirements-yesno</path>
 		<dc:comment/>
 		<attribute/>
 		<section dc:uri="https://rdmorganiser.github.io/terms/questions/training/general"/>
 		<is_collection>False</is_collection>
 		<order>50</order>
-		<title lang="en">Other requirements</title>
+		<title lang="en">Other requirements I</title>
 		<help lang="en"/>
 		<verbose_name lang="en"/>
 		<verbose_name_plural lang="en"/>
-		<title lang="de">Weitere Anforderungen</title>
+		<title lang="de">Weitere Anforderungen I</title>
 		<help lang="de"/>
 		<verbose_name lang="de"/>
 		<verbose_name_plural lang="de"/>
-		<title lang="es">Otros requisitos</title>
+		<title lang="es">Otros requisitos I</title>
 		<help lang="es"/>
 		<verbose_name lang="es"/>
 		<verbose_name_plural lang="es"/>
-		<title lang="fr">Autres exigences</title>
+		<title lang="fr">Autres exigences I</title>
 		<help lang="fr"/>
 		<verbose_name lang="fr"/>
 		<verbose_name_plural lang="fr"/>
-		<title lang="it">Ulteriori condizioni</title>
+		<title lang="it">Ulteriori condizioni I</title>
 		<help lang="it"/>
 		<verbose_name lang="it"/>
 		<verbose_name_plural lang="it"/>
 		<conditions/>
 	</questionset>
-	<question dc:uri="https://rdmorganiser.github.io/terms/questions/training/rdm/other-requirements-yesno/abstract">
+	<question dc:uri="https://rdmorganiser.github.io/terms/questions/training/general/other-requirements-yesno/abstract">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
 		<key>abstract</key>
-		<path>training/rdm/other-requirements-yesno/abstract</path>
+		<path>training/general/other-requirements-yesno/abstract</path>
 		<dc:comment/>
 		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/additional_rdm_policy/conditions"/>
-		<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/rdm/other-requirements-yesno"/>
+		<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/general/other-requirements-yesno"/>
 		<is_collection>False</is_collection>
 		<is_optional>False</is_optional>
 		<order>0</order>
@@ -260,13 +260,13 @@
 		<optionsets/>
 		<conditions/>
 	</question>
-	<question dc:uri="https://rdmorganiser.github.io/terms/questions/training/rdm/other-requirements-yesno/requirements">
+	<question dc:uri="https://rdmorganiser.github.io/terms/questions/training/general/other-requirements-yesno/requirements">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
 		<key>requirements</key>
-		<path>training/rdm/other-requirements-yesno/requirements</path>
+		<path>training/general/other-requirements-yesno/requirements</path>
 		<dc:comment/>
 		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/additional_rdm_policy/requirements"/>
-		<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/rdm/other-requirements-yesno"/>
+		<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/general/other-requirements-yesno"/>
 		<is_collection>False</is_collection>
 		<order>1</order>
 		<help lang="en">Please briefly outline them and refer to more detailed sources of information if necessary. Please indicate also if the rules / guidelines are mandatory or optional.</help>
@@ -300,13 +300,13 @@
 			<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/additional_rdm_policy"/>
 		</conditions>
 	</question>
-	<question dc:uri="https://rdmorganiser.github.io/terms/questions/training/rdm/other-requirements-yesno/yesno">
+	<question dc:uri="https://rdmorganiser.github.io/terms/questions/training/general/other-requirements-yesno/yesno">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
 		<key>yesno</key>
-		<path>training/rdm/other-requirements-yesno/yesno</path>
+		<path>training/general/other-requirements-yesno/yesno</path>
 		<dc:comment/>
 		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/additional_rdm_policy/yesno"/>
-		<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/rdm/other-requirements-yesno"/>
+		<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/general/other-requirements-yesno"/>
 		<is_collection>False</is_collection>
 		<order>0</order>
 		<help lang="en">Examples of discipline-specific requirements:
@@ -826,10 +826,10 @@ Altri tipi di dati sono di per sé unici e non possono essere rigenerati. Questo
 		<title lang="fr">Utilisation de données</title>
 		<title lang="it">Utilizzo dei dati</title>
 	</section>
-	<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/data-usage/data-storage-and-security-data_security">
+	<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/organization/data-storage-and-security-data_security">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
 		<key>data-storage-and-security-data_security</key>
-		<path>training/data-usage/data-storage-and-security-data_security</path>
+		<path>training/organization/data-storage-and-security-data_security</path>
 		<dc:comment/>
 		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmorganiser.github.io/terms/questions/training/data-usage"/>
@@ -857,13 +857,13 @@ Altri tipi di dati sono di per sé unici e non possono essere rigenerati. Questo
 		<verbose_name_plural lang="it">raccolte di dati</verbose_name_plural>
 		<conditions/>
 	</questionset>
-	<question dc:uri="https://rdmorganiser.github.io/terms/questions/training/data-usage/data-storage-and-security-data_security/backups">
+	<question dc:uri="https://rdmorganiser.github.io/terms/questions/training/organization/data-storage-and-security-data_security/backups">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
 		<key>backups</key>
-		<path>training/data-usage/data-storage-and-security-data_security/backups</path>
+		<path>training/organization/data-storage-and-security-data_security/backups</path>
 		<dc:comment/>
 		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/data_security/backups"/>
-		<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/data-usage/data-storage-and-security-data_security"/>
+		<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/organization/data-storage-and-security-data_security"/>
 		<is_collection>False</is_collection>
 		<order>2</order>
 		<help lang="en">This question refers to backups while the data are being worked with. Questions of long-term preservation will be adressed in the respective section.</help>
@@ -895,10 +895,10 @@ Altri tipi di dati sono di per sé unici e non possono essere rigenerati. Questo
 		<optionsets/>
 		<conditions/>
 	</question>
-	<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/data-usage/data-sharing-and-re-use-publication">
+	<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/organization/data-sharing-and-re-use-publication">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
 		<key>data-sharing-and-re-use-publication</key>
-		<path>training/data-usage/data-sharing-and-re-use-publication</path>
+		<path>training/organization/data-sharing-and-re-use-publication</path>
 		<dc:comment/>
 		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmorganiser.github.io/terms/questions/training/data-usage"/>
@@ -926,13 +926,13 @@ Altri tipi di dati sono di per sé unici e non possono essere rigenerati. Questo
 		<verbose_name_plural lang="it">raccolte di dati</verbose_name_plural>
 		<conditions/>
 	</questionset>
-	<question dc:uri="https://rdmorganiser.github.io/terms/questions/training/data-usage/data-sharing-and-re-use-publication/yesno">
+	<question dc:uri="https://rdmorganiser.github.io/terms/questions/training/organization/data-sharing-and-re-use-publication/yesno">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
 		<key>yesno</key>
-		<path>training/data-usage/data-sharing-and-re-use-publication/yesno</path>
+		<path>training/organization/data-sharing-and-re-use-publication/yesno</path>
 		<dc:comment/>
 		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/sharing/yesno"/>
-		<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/data-usage/data-sharing-and-re-use-publication"/>
+		<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/organization/data-sharing-and-re-use-publication"/>
 		<is_collection>False</is_collection>
 		<order>1</order>
 		<help lang="en"/>
@@ -1254,10 +1254,10 @@ Altri tipi di dati sono di per sé unici e non possono essere rigenerati. Questo
 		</optionsets>
 		<conditions/>
 	</question>
-	<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/data-usage/data-sharing-and-re-use-interoperability">
+	<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/organization/data-sharing-and-re-use-interoperability">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
 		<key>data-sharing-and-re-use-interoperability</key>
-		<path>training/data-usage/data-sharing-and-re-use-interoperability</path>
+		<path>training/organization/data-sharing-and-re-use-interoperability</path>
 		<dc:comment/>
 		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/id"/>
 		<section dc:uri="https://rdmorganiser.github.io/terms/questions/training/data-usage"/>
@@ -1285,13 +1285,13 @@ Altri tipi di dati sono di per sé unici e non possono essere rigenerati. Questo
 		<verbose_name_plural lang="it">raccolte di dati</verbose_name_plural>
 		<conditions/>
 	</questionset>
-	<question dc:uri="https://rdmorganiser.github.io/terms/questions/training/data-usage/data-sharing-and-re-use-interoperability/abstract">
+	<question dc:uri="https://rdmorganiser.github.io/terms/questions/training/organization/data-sharing-and-re-use-interoperability/abstract">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
 		<key>abstract</key>
-		<path>training/data-usage/data-sharing-and-re-use-interoperability/abstract</path>
+		<path>training/organization/data-sharing-and-re-use-interoperability/abstract</path>
 		<dc:comment/>
 		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/dataset/restriction"/>
-		<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/data-usage/data-sharing-and-re-use-interoperability"/>
+		<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/training/organization/data-sharing-and-re-use-interoperability"/>
 		<is_collection>False</is_collection>
 		<is_optional>False</is_optional>
 		<order>0</order>