diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index 24afdc7..83a42ca 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -13,7 +13,7 @@ jobs:
     - uses: psf/black@stable
       with:
         options: "--check --diff"
-        src: ./python_workflow_definition/src/python_workflow_definition
+        src: ./src/python_workflow_definition
     - uses: psf/black@stable
       with:
         options: "--check --diff"
@@ -35,7 +35,7 @@ jobs:
     - name: Pip check
       shell: bash -l {0}
       run: |
-        pip install --no-deps --no-build-isolation -e python_workflow_definition
+        pip install --no-deps --no-build-isolation -e .
         pip check
 
   nfdi4ing:
@@ -53,7 +53,7 @@ jobs:
     - name: Installation and setup
       shell: bash -l {0}
       run: |
-        pip install --no-deps --no-build-isolation -e python_workflow_definition
+        pip install --no-deps --no-build-isolation -e .
         conda install -c conda-forge jupyter papermill
         verdi presto --profile-name pwd
         sudo apt-get install -y $(cat binder/apt.txt)
@@ -92,7 +92,7 @@ jobs:
       shell: bash -l {0}
       run: |
         pip install --no-deps --no-build-isolation -e example_workflows/quantum_espresso/qe_xml_parser
-        pip install --no-deps --no-build-isolation -e python_workflow_definition
+        pip install --no-deps --no-build-isolation -e .
         conda install -c conda-forge jupyter papermill
         verdi presto --profile-name pwd
     - name: Tests
@@ -122,7 +122,7 @@ jobs:
     - name: Installation and setup
       shell: bash -l {0}
       run: |
-        pip install --no-deps --no-build-isolation -e python_workflow_definition
+        pip install --no-deps --no-build-isolation -e .
         conda install -c conda-forge jupyter papermill
         verdi presto --profile-name pwd
     - name: Tests
diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
index 4e26be5..1a02cab 100644
--- a/.github/workflows/pypi.yml
+++ b/.github/workflows/pypi.yml
@@ -26,9 +26,7 @@ jobs:
         environment-file: binder/environment.yml
     - name: Build
       shell: bash -l {0}
-      run: |
-        cd python_workflow_definition
-        hatch build -t sdist -t wheel
+      run: hatch build -t sdist -t wheel
     - name: Publish distribution 📦 to PyPI
       uses: pypa/gh-action-pypi-publish@release/v1
       with:
diff --git a/.gitignore b/.gitignore
index cdcde78..33d3384 100644
--- a/.gitignore
+++ b/.gitignore
@@ -178,7 +178,7 @@ cython_debug/
 input_tmp.in
 pyiron.log
 pyiron_draw.png
-python_workflow_definition/src/python_workflow_definition/__pycache__/
+src/python_workflow_definition/__pycache__/
 test/
 mini/
 evcurve.png
diff --git a/binder/environment.yml b/binder/environment.yml
index a5957e1..de25b7a 100644
--- a/binder/environment.yml
+++ b/binder/environment.yml
@@ -2,6 +2,7 @@ channels:
 - conda-forge
 dependencies:
 - python =3.12
+- click =8.1.8
 - pydantic =2.11.4
 - hatch =1.14.1
 - hatchling =1.27.0
diff --git a/example_workflows/quantum_espresso/environment.yml b/example_workflows/quantum_espresso/environment.yml
index c3fcb89..962ad20 100644
--- a/example_workflows/quantum_espresso/environment.yml
+++ b/example_workflows/quantum_espresso/environment.yml
@@ -5,5 +5,5 @@ dependencies:
 - matplotlib=3.10.1
 - xmlschema=3.4.3
 - optimade=1.2.3
-- qe=7.2
-- qe-tools=2.0.0
\ No newline at end of file
+- qe=7.4
+- qe-tools=2.0.0
diff --git a/example_workflows/quantum_espresso/qe_xml_parser/src/qe_xml_parser/schemas/qes_230310.xsd b/example_workflows/quantum_espresso/qe_xml_parser/src/qe_xml_parser/schemas/qes_230310.xsd
index 43d036a..2394151 100644
--- a/example_workflows/quantum_espresso/qe_xml_parser/src/qe_xml_parser/schemas/qes_230310.xsd
+++ b/example_workflows/quantum_espresso/qe_xml_parser/src/qe_xml_parser/schemas/qes_230310.xsd
@@ -73,6 +73,7 @@ datecode 220603
       <element type="qes:ekin_functionalType" name="ekin_functional" minOccurs="0" />
       <element type="qes:matrixType" name="external_atomic_forces" minOccurs="0" />
       <element type="qes:integerMatrixType" name="free_positions" minOccurs="0" />
+      <element type="qes:twochemType" name="twoch_" minOccurs="0" />
       <element type="qes:matrixType" name="starting_atomic_velocities" minOccurs="0" />
       <element type="qes:electric_fieldType" name="electric_field" minOccurs="0" />
       <element type="qes:atomic_constraintsType" name="atomic_constraints" minOccurs="0" />
@@ -235,6 +236,7 @@ datecode 220603
       <element type="qes:cellType" name="cell"/>
     </sequence>
     <attribute type="positiveInteger" name="nat" />
+    <attribute type="positiveInteger" name="num_of_atomic_wfc" />
     <attribute type="double" name="alat" use="optional"/>
     <attribute type="positiveInteger" name="bravais_index" use="optional"/>
       <attribute type="string" name="alternative_axes" use="optional" />
@@ -908,6 +910,15 @@ datecode 220603
      </simpleContent>
   </complexType>
 
+  <complexType name="twochemType">
+    <sequence>
+      <element type="boolean" name="twochem" minOccurs="0"/>
+      <element type="integer" name="nbnd_cond" minOccurs="0"/>
+      <element type="double" name="degauss_cond" minOccurs="0"/>
+      <element type="double" name="nelec_cond" minOccurs="0"/>
+    </sequence>  
+  </complexType>
+
   <!-- OUTPUT TYPE -->
 
   <complexType name="outputElectricFieldType">
@@ -997,6 +1008,7 @@ datecode 220603
     <sequence>
       <element type="qes:scf_convType" name="scf_conv"/>
       <element type="qes:opt_convType" name="opt_conv" minOccurs="0"/>
+      <element type="boolean" name="wf_collected" minOccurs="0"/>
     </sequence>
   </complexType>
   <complexType name="scf_convType">
@@ -1024,6 +1036,7 @@ datecode 220603
   <complexType name="symmetriesType">
     <sequence>
       <element type="unsignedByte" name="nsym"/>
+      <element type="unsignedByte" name="colin_mag"/>
       <element type="unsignedByte" name="nrot"/>
       <element type="unsignedByte" name="space_group"/>
       <element type="qes:symmetryType" name="symmetry" maxOccurs="48" minOccurs="1"/>
@@ -1101,8 +1114,9 @@ datecode 220603
       <element type="nonNegativeInteger" name="nbnd_up" minOccurs="0" />
       <element type="nonNegativeInteger" name="nbnd_dw" minOccurs="0" />
       <element type="double" name="nelec"/>
+      <element type="double" name="fermi_energy"/>
       <element type="integer" name = "num_of_atomic_wfc" minOccurs = "0"/>
-      <element type="boolean" name = "wf_collected" />
+      <element type="boolean" name = "wf_collected" minOccurs = "0"/>
       <element type="double" name="fermi_energy" minOccurs="0" />
       <element type="double" name="highestOccupiedLevel" minOccurs ="0"/>
       <element type="double" name="lowestUnoccupiedLevel" minOccurs="0"/>
@@ -1367,4 +1381,4 @@ datecode 220603
       <element type="double"  name="left_buffer_v"  minOccurs="0"/>
     </sequence>
   </complexType>
-</schema>
\ No newline at end of file
+</schema>
diff --git a/python_workflow_definition/pyproject.toml b/pyproject.toml
similarity index 96%
rename from python_workflow_definition/pyproject.toml
rename to pyproject.toml
index b760b0b..6ce5e08 100644
--- a/python_workflow_definition/pyproject.toml
+++ b/pyproject.toml
@@ -14,7 +14,7 @@ authors = [
   { name = "Marnik Bercx", email = "marnik.bercx@psi.ch" },
   { name = "Christina Ertural", email = "christina.ertural@bam.de" },
 ]
-license = { file = "../LICENSE" }
+license = { file = "LICENSE" }
 dependencies = [
     "numpy>=1.21,<2",
     "pydantic>=2.7.0,<=2.11.4",
diff --git a/python_workflow_definition/src/python_workflow_definition/__init__.py b/src/python_workflow_definition/__init__.py
similarity index 100%
rename from python_workflow_definition/src/python_workflow_definition/__init__.py
rename to src/python_workflow_definition/__init__.py
diff --git a/python_workflow_definition/src/python_workflow_definition/aiida.py b/src/python_workflow_definition/aiida.py
similarity index 100%
rename from python_workflow_definition/src/python_workflow_definition/aiida.py
rename to src/python_workflow_definition/aiida.py
diff --git a/python_workflow_definition/src/python_workflow_definition/cwl/__init__.py b/src/python_workflow_definition/cwl/__init__.py
similarity index 100%
rename from python_workflow_definition/src/python_workflow_definition/cwl/__init__.py
rename to src/python_workflow_definition/cwl/__init__.py
diff --git a/python_workflow_definition/src/python_workflow_definition/cwl/__main__.py b/src/python_workflow_definition/cwl/__main__.py
similarity index 100%
rename from python_workflow_definition/src/python_workflow_definition/cwl/__main__.py
rename to src/python_workflow_definition/cwl/__main__.py
diff --git a/python_workflow_definition/src/python_workflow_definition/executorlib.py b/src/python_workflow_definition/executorlib.py
similarity index 100%
rename from python_workflow_definition/src/python_workflow_definition/executorlib.py
rename to src/python_workflow_definition/executorlib.py
diff --git a/python_workflow_definition/src/python_workflow_definition/jobflow.py b/src/python_workflow_definition/jobflow.py
similarity index 100%
rename from python_workflow_definition/src/python_workflow_definition/jobflow.py
rename to src/python_workflow_definition/jobflow.py
diff --git a/python_workflow_definition/src/python_workflow_definition/models.py b/src/python_workflow_definition/models.py
similarity index 100%
rename from python_workflow_definition/src/python_workflow_definition/models.py
rename to src/python_workflow_definition/models.py
diff --git a/python_workflow_definition/src/python_workflow_definition/plot.py b/src/python_workflow_definition/plot.py
similarity index 100%
rename from python_workflow_definition/src/python_workflow_definition/plot.py
rename to src/python_workflow_definition/plot.py
diff --git a/python_workflow_definition/src/python_workflow_definition/purepython.py b/src/python_workflow_definition/purepython.py
similarity index 100%
rename from python_workflow_definition/src/python_workflow_definition/purepython.py
rename to src/python_workflow_definition/purepython.py
diff --git a/python_workflow_definition/src/python_workflow_definition/pyiron_base.py b/src/python_workflow_definition/pyiron_base.py
similarity index 100%
rename from python_workflow_definition/src/python_workflow_definition/pyiron_base.py
rename to src/python_workflow_definition/pyiron_base.py
diff --git a/python_workflow_definition/src/python_workflow_definition/shared.py b/src/python_workflow_definition/shared.py
similarity index 100%
rename from python_workflow_definition/src/python_workflow_definition/shared.py
rename to src/python_workflow_definition/shared.py