diff --git a/src/film-on-substrate.parset b/problems/film-on-substrate.parset
similarity index 93%
rename from src/film-on-substrate.parset
rename to problems/film-on-substrate.parset
index d594ef8332c1ae5cc702956c01a95ac384bf8f80..9bc4ce139b2090e48002f5bdbb4f4e8ddcb85e0c 100644
--- a/src/film-on-substrate.parset
+++ b/problems/film-on-substrate.parset
@@ -9,10 +9,10 @@ structuredGrid = true
 lower = 0 0 0
 upper = 200 100 200
 
-elements = 10 5 5
+elements = 4 2 2
 
 # Number of grid levels, all elements containing surfaceshell grid vertices will get adaptively refined
-numLevels = 2
+numLevels = 1
 
 # When starting from a file, the stress-free configuration of the surfaceShell is read from a file, this file needs to match the *finest* grid level!
 startFromFile = false
@@ -26,7 +26,7 @@ gridDeformation="[1.3*x[0], x[1], x[2]]"
 #  Boundary values
 #############################################
 
-problem = cantilever
+dirichletValues = identity-dirichlet-values
 
 ###  Python predicate specifying all Dirichlet grid vertices
 # x is the vertex coordinate
@@ -34,7 +34,7 @@ dirichletVerticesPredicate = "x[0] < 0.01"
 
 ###  Python predicate specifying all surfaceshell grid vertices, elements conataining these vertices will get adaptively refined
 # x is the vertex coordinate
-surfaceShellVerticesPredicate = "x[2] > 199.99"
+surfaceShellVerticesPredicate = "x[2] > 199.99 and x[0] > 49.99 and x[0] < 150.01"
 
 ###  Python predicate specifying all Neumann grid vertices
 # x is the vertex coordinate
@@ -60,7 +60,7 @@ numHomotopySteps = 1
 tolerance = 1e-3
 
 # Max number of solver steps
-maxSolverSteps = 300
+maxSolverSteps = 1
 
 # Measure convergence
 instrumented = 0
@@ -70,7 +70,7 @@ instrumented = 0
 #############################################
 
 # initial regularization parameter
-initialRegularization = 10000000000
+initialRegularization = 1000000
 
 #############################################
 #  Solver parameters specific for trust-region solver using multigrid solver 
@@ -106,7 +106,7 @@ baseTolerance = 1e-8
 #   Material parameters
 ############################
 
-energy = stvenantkirchhoff
+energy = mooneyrivlin
 
 ## For the Wriggers L-shape example
 [materialParameters]
@@ -122,13 +122,7 @@ surfaceShellParameters = surface-shell-parameters-1-3
 mu_c = 0
 
 # Length scale parameter
-L_c = 0.2 
-
-# Curvature exponent
-q = 2
-
-# Shear correction factor
-kappa = 1
+L_c = 0.2
 
 b1 = 1
 b2 = 1
diff --git a/src/cantilever-dirichlet-values.py b/problems/identity-dirichlet-values.py
similarity index 56%
rename from src/cantilever-dirichlet-values.py
rename to problems/identity-dirichlet-values.py
index 4de4795d9032688711235ebb76aee90054e74226..0de07b1203a3a68863f204b5a35e42205ef69c5d 100644
--- a/src/cantilever-dirichlet-values.py
+++ b/problems/identity-dirichlet-values.py
@@ -5,13 +5,8 @@ class DirichletValues:
         self.homotopyParameter = homotopyParameter
 
     def deformation(self, x):
-        # Dirichlet b.c. simply clamp the shell in the reference configuration
-        out = x
-
-        return out
-
+        return x
 
     def orientation(self, x):
-        rotation = [[1,0,0], [0, 1, 0], [0, 0, 1]]
+        rotation = [[1,0,0], [0,1,0], [0,0,1]]
         return rotation
-
diff --git a/src/surface-shell-parameters-1-3.py b/problems/surface-shell-parameters-1-3.py
similarity index 100%
rename from src/surface-shell-parameters-1-3.py
rename to problems/surface-shell-parameters-1-3.py
diff --git a/src/film-on-substrate.cc b/src/film-on-substrate.cc
index 6348e753bf53c8ba3469fcbfd18ef9461019d43f..0f263551e83035ae31499a861edae80575a059d7 100644
--- a/src/film-on-substrate.cc
+++ b/src/film-on-substrate.cc
@@ -133,7 +133,7 @@ int main (int argc, char *argv[]) try
   Python::runStream()
         << std::endl << "import sys"
         << std::endl << "import os"
-        << std::endl << "sys.path.append(os.getcwd() + '/../../src/')"
+        << std::endl << "sys.path.append(os.getcwd() + '/../../problems/')"
         << std::endl;
 
   typedef BlockVector<FieldVector<double,dim> > SolutionType;
@@ -584,7 +584,7 @@ int main (int argc, char *argv[]) try
     //   Set Dirichlet values
     ////////////////////////////////////////////////////////
 
-    Python::Reference dirichletValuesClass = Python::import(parameterSet.get<std::string>("problem") + "-dirichlet-values");
+    Python::Reference dirichletValuesClass = Python::import(parameterSet.get<std::string>("dirichletValues"));
 
     Python::Callable C = dirichletValuesClass.get("DirichletValues");