diff --git a/templates/defaultForm b/templates/defaultForm
index 3b8de88..87ee65a 100644
--- a/templates/defaultForm
+++ b/templates/defaultForm
@@ -4,13 +4,9 @@ user: "%u"
 created: "%D"
 sample ID: "%3"
 
-aim:
-  type: multiline
-  doc: "What is the aim of this experiment?"
+# use groups for better structuring
+sample information: group_id
 
-observation:
-  type: multiline
-  doc: "free text observations beyond the measurement"
 
 sample preparation log:
     type: file
@@ -21,11 +17,23 @@ sample description:
   doc: "a short description of the sample"
   required: true
 
+# this is general, it can be extended by the general part
+# of any specific templates
+general: group_id
+
 experiment start:
     type: date
     doc: "Experiment starting date and time in ISO 8601 format"
     required: true
 
+aim:
+  type: multiline
+  doc: "What is the aim of this experiment?"
+
+observation:
+  type: multiline
+  doc: "free text observations beyond the measurement"
+
 attachments / links:
     type: file
     doc: "Any attachments, like figures or other experiments you find important to be coupled to this experiment. Data if there is no specific place for it in the form below."
diff --git a/templates/dls.yaml b/templates/dls.yaml
index b434a4a..d8eb5ba 100644
--- a/templates/dls.yaml
+++ b/templates/dls.yaml
@@ -8,7 +8,9 @@ doc: |
 
 # specify a template version so one can compare if needed
 template: dls.yaml
-template version: 2024-10-24
+template version: 2024-10-25
+
+dynamic light scattering: group_id
 
 DLS device:
   type: select
@@ -67,7 +69,7 @@ first correlation delay:
 
 # we can use group or group_id as value of a simple label
 # to define grouping of the fields
-software parameters: group
+software information: group
 
 software:
   type: text
@@ -80,9 +82,9 @@ software version:
   required: true
 
 
-parameters: group
+runs: group
 
-parameters of runs:
+individual runs:
   type: "subset"
   required: true
   form: