diff --git a/partitioned-heat-conduction-complex/README.md b/partitioned-heat-conduction-complex/README.md
index a7a181dcd..ceea8ab78 100644
--- a/partitioned-heat-conduction-complex/README.md
+++ b/partitioned-heat-conduction-complex/README.md
@@ -26,4 +26,4 @@ See `partitioned-heat-conduction`, only `fenics` is provided as a solver.
 
 ## Running the simulation
 
-See `partitioned-heat-conduction`. The additional featured mentioned above can be activated via command line arguments. Please run `python3 fenics/heat.py --help` for a full list of provided arguments.
+See `partitioned-heat-conduction`. The additional featured mentioned above can be activated via command line arguments. Please run `python3 solver-fenics/heat.py --help` for a full list of provided arguments.
diff --git a/partitioned-heat-conduction-complex/fenics/clean.sh b/partitioned-heat-conduction-complex/dirichlet-fenics/clean.sh
similarity index 100%
rename from partitioned-heat-conduction-complex/fenics/clean.sh
rename to partitioned-heat-conduction-complex/dirichlet-fenics/clean.sh
diff --git a/partitioned-heat-conduction-complex/fenics/precice-adapter-config-D.json b/partitioned-heat-conduction-complex/dirichlet-fenics/precice-adapter-config.json
similarity index 100%
rename from partitioned-heat-conduction-complex/fenics/precice-adapter-config-D.json
rename to partitioned-heat-conduction-complex/dirichlet-fenics/precice-adapter-config.json
diff --git a/partitioned-heat-conduction-complex/dirichlet-fenics/run.sh b/partitioned-heat-conduction-complex/dirichlet-fenics/run.sh
new file mode 100755
index 000000000..24dba5e2b
--- /dev/null
+++ b/partitioned-heat-conduction-complex/dirichlet-fenics/run.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e -u
+
+python3 ../solver-fenics/heat.py -d -i complex
\ No newline at end of file
diff --git a/partitioned-heat-conduction-complex/fenics/run.sh b/partitioned-heat-conduction-complex/fenics/run.sh
deleted file mode 100755
index e5792229f..000000000
--- a/partitioned-heat-conduction-complex/fenics/run.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-set -e -u
-
-while getopts ":dn" opt; do
-  case ${opt} in
-  d)
-    python3 heat.py -d -i complex
-    ;;
-  n)
-    python3 heat.py -n -i complex
-    ;;
-  \?)
-    echo "Usage: cmd [-d] [-n]"
-    ;;
-  esac
-done
diff --git a/partitioned-heat-conduction-complex/neumann-fenics/clean.sh b/partitioned-heat-conduction-complex/neumann-fenics/clean.sh
new file mode 100755
index 000000000..3a8b4619d
--- /dev/null
+++ b/partitioned-heat-conduction-complex/neumann-fenics/clean.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e -u
+
+. ../../tools/cleaning-tools.sh
+
+clean_fenics .
diff --git a/partitioned-heat-conduction-complex/fenics/precice-adapter-config-N.json b/partitioned-heat-conduction-complex/neumann-fenics/precice-adapter-config.json
similarity index 100%
rename from partitioned-heat-conduction-complex/fenics/precice-adapter-config-N.json
rename to partitioned-heat-conduction-complex/neumann-fenics/precice-adapter-config.json
diff --git a/partitioned-heat-conduction-complex/neumann-fenics/run.sh b/partitioned-heat-conduction-complex/neumann-fenics/run.sh
new file mode 100755
index 000000000..bc4e1d14e
--- /dev/null
+++ b/partitioned-heat-conduction-complex/neumann-fenics/run.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e -u
+
+python3 ../solver-fenics/heat.py -n -i complex
\ No newline at end of file
diff --git a/partitioned-heat-conduction-complex/fenics/.gitignore b/partitioned-heat-conduction-complex/solver-fenics/.gitignore
similarity index 100%
rename from partitioned-heat-conduction-complex/fenics/.gitignore
rename to partitioned-heat-conduction-complex/solver-fenics/.gitignore
diff --git a/partitioned-heat-conduction-complex/fenics/errorcomputation.py b/partitioned-heat-conduction-complex/solver-fenics/errorcomputation.py
similarity index 100%
rename from partitioned-heat-conduction-complex/fenics/errorcomputation.py
rename to partitioned-heat-conduction-complex/solver-fenics/errorcomputation.py
diff --git a/partitioned-heat-conduction-complex/fenics/heat.py b/partitioned-heat-conduction-complex/solver-fenics/heat.py
similarity index 98%
rename from partitioned-heat-conduction-complex/fenics/heat.py
rename to partitioned-heat-conduction-complex/solver-fenics/heat.py
index 293db7338..b18846d0a 100644
--- a/partitioned-heat-conduction-complex/fenics/heat.py
+++ b/partitioned-heat-conduction-complex/solver-fenics/heat.py
@@ -99,11 +99,11 @@ def determine_gradient(V_g, u, flux):
 precice, precice_dt, initial_data = None, 0.0, None
 
 # Initialize the adapter according to the specific participant
+precice = Adapter(adapter_config_filename="precice-adapter-config.json")
+
 if problem is ProblemType.DIRICHLET:
-    precice = Adapter(adapter_config_filename="precice-adapter-config-D.json")
     precice.initialize(coupling_boundary, read_function_space=V, write_object=f_N_function)
 elif problem is ProblemType.NEUMANN:
-    precice = Adapter(adapter_config_filename="precice-adapter-config-N.json")
     precice.initialize(coupling_boundary, read_function_space=V_g, write_object=u_D_function)
 
 boundary_marker = False
diff --git a/partitioned-heat-conduction-complex/fenics/my_enums.py b/partitioned-heat-conduction-complex/solver-fenics/my_enums.py
similarity index 100%
rename from partitioned-heat-conduction-complex/fenics/my_enums.py
rename to partitioned-heat-conduction-complex/solver-fenics/my_enums.py
diff --git a/partitioned-heat-conduction-complex/fenics/problem_setup.py b/partitioned-heat-conduction-complex/solver-fenics/problem_setup.py
similarity index 100%
rename from partitioned-heat-conduction-complex/fenics/problem_setup.py
rename to partitioned-heat-conduction-complex/solver-fenics/problem_setup.py