src/coupledtimestepper.hh → src/time-stepping/coupledtimestepper.hh

-#ifndef SRC_COUPLEDTIMESTEPPER_HH
-#define SRC_COUPLEDTIMESTEPPER_HH
+#ifndef SRC_TIME_STEPPING_COUPLEDTIMESTEPPER_HH
+#define SRC_TIME_STEPPING_COUPLEDTIMESTEPPER_HH
 
 #include <functional>
 #include <memory>
 
 #include <dune/common/parametertree.hh>
-#include "fixedpointiterator.hh"
+
+#include "../spatial-solving/fixedpointiterator.hh"
 
 template <class Factory, class Updaters, class ErrorNorm>
 class CoupledTimeStepper {

src/coupledtimestepper_tmpl.cc → src/time-stepping/coupledtimestepper_tmpl.cc

@@ -2,6 +2,9 @@
 #error MY_DIM unset
 #endif
 
+#include "../explicitgrid.hh"
+#include "../explicitvectors.hh"
+
 #include <dune/common/function.hh>
 
 #include <dune/solvers/norms/energynorm.hh>
@@ -10,11 +13,8 @@
 #include <dune/tectonic/globalfriction.hh>
 #include <dune/tectonic/myblockproblem.hh>
 
-#include "explicitgrid.hh"
-#include "explicitvectors.hh"
-
+#include "../spatial-solving/solverfactory.hh"
 #include "rate/rateupdater.hh"
-#include "solverfactory.hh"
 #include "state/stateupdater.hh"
 #include "updaters.hh"
 

src/rate.cc → src/time-stepping/rate.cc

@@ -3,8 +3,8 @@
 #endif
 
 #include "rate.hh"
-#include "rate/newmark.cc"
-#include "rate/backward_euler.cc"
+#include "rate/backward_euler.hh"
+#include "rate/newmark.hh"
 
 template <class Vector, class Matrix, class Function, int dimension>
 std::shared_ptr<RateUpdater<Vector, Matrix, Function, dimension>>

src/rate.hh → src/time-stepping/rate.hh

-#ifndef SRC_RATE_HH
-#define SRC_RATE_HH
+#ifndef SRC_TIME_STEPPING_RATE_HH
+#define SRC_TIME_STEPPING_RATE_HH
 
 #include <memory>
 
-#include "enums.hh"
+#include "../enums.hh"
 #include "rate/rateupdater.hh"
 
 template <class Vector, class Matrix, class Function, int dimension>

src/rate/backward_euler.hh → src/time-stepping/rate/backward_euler.hh

-#ifndef SRC_RATE_BACKWARD_EULER_HH
-#define SRC_RATE_BACKWARD_EULER_HH
+#ifndef SRC_TIME_STEPPING_RATE_BACKWARD_EULER_HH
+#define SRC_TIME_STEPPING_RATE_BACKWARD_EULER_HH
 
 template <class Vector, class Matrix, class Function, size_t dim>
 class BackwardEuler : public RateUpdater<Vector, Matrix, Function, dim> {
@@ -13,7 +13,8 @@ class BackwardEuler : public RateUpdater<Vector, Matrix, Function, dim> {
              Matrix &) override;
   void postProcess(Vector const &) override;
 
-  std::shared_ptr<RateUpdater<Vector, Matrix, Function, dim>> clone() const;
+  std::shared_ptr<RateUpdater<Vector, Matrix, Function, dim>> clone()
+      const override;
 
 private:
 };

src/rate/newmark.hh → src/time-stepping/rate/newmark.hh

-#ifndef SRC_RATE_NEWMARK_HH
-#define SRC_RATE_NEWMARK_HH
+#ifndef SRC_TIME_STEPPING_RATE_NEWMARK_HH
+#define SRC_TIME_STEPPING_RATE_NEWMARK_HH
 
 template <class Vector, class Matrix, class Function, size_t dim>
 class Newmark : public RateUpdater<Vector, Matrix, Function, dim> {
@@ -13,6 +13,7 @@ class Newmark : public RateUpdater<Vector, Matrix, Function, dim> {
              Matrix &) override;
   void postProcess(Vector const &) override;
 
-  std::shared_ptr<RateUpdater<Vector, Matrix, Function, dim>> clone() const;
+  std::shared_ptr<RateUpdater<Vector, Matrix, Function, dim>> clone()
+      const override;
 };
 #endif

src/rate/rateupdater.hh → src/time-stepping/rate/rateupdater.hh

-#ifndef SRC_RATE_RATEUPDATER_HH
-#define SRC_RATE_RATEUPDATER_HH
+#ifndef SRC_TIME_STEPPING_RATE_RATEUPDATER_HH
+#define SRC_TIME_STEPPING_RATE_RATEUPDATER_HH
 
 #include <memory>
 
 #include <dune/common/bitsetvector.hh>
 
-#include "../matrices.hh"
+#include "../../matrices.hh"
 
 template <class Vector, class Matrix, class Function, size_t dim>
 class RateUpdater {

src/rate/rateupdater_tmpl.cc → src/time-stepping/rate/rateupdater_tmpl.cc

@@ -4,7 +4,7 @@
 
 #include <dune/common/function.hh>
 
-#include "../explicitvectors.hh"
+#include "../../explicitvectors.hh"
 
 using Function = Dune::VirtualFunction<double, double>;
 

src/rate_tmpl.cc → src/time-stepping/rate_tmpl.cc

-#include <dune/common/function.hh>
+#include "../explicitvectors.hh"
 
-#include "explicitvectors.hh"
+#include <dune/common/function.hh>
 
 using Function = Dune::VirtualFunction<double, double>;
 

src/state.hh → src/time-stepping/state.hh

-#ifndef SRC_STATE_HH
-#define SRC_STATE_HH
+#ifndef SRC_TIME_STEPPING_STATE_HH
+#define SRC_TIME_STEPPING_STATE_HH
 
 #include <memory>
 
 #include <dune/common/bitsetvector.hh>
 
-#include "enums.hh"
-
-#include "state/stateupdater.hh"
+#include "../enums.hh"
 #include "state/ageinglawstateupdater.hh"
 #include "state/sliplawstateupdater.hh"
+#include "state/stateupdater.hh"
 
 template <class ScalarVector, class Vector>
 std::shared_ptr<StateUpdater<ScalarVector, Vector>> initStateUpdater(

src/state/ageinglawstateupdater.cc → src/time-stepping/state/ageinglawstateupdater.cc

+#include <cmath>
+
 #include "ageinglawstateupdater.hh"
-#include "../tobool.hh"
+#include "../../tobool.hh"
 
 template <class ScalarVector, class Vector>
 AgeingLawStateUpdater<ScalarVector, Vector>::AgeingLawStateUpdater(

src/state/ageinglawstateupdater.hh → src/time-stepping/state/ageinglawstateupdater.hh

-#ifndef SRC_STATE_AGEINGLAWSTATEUPDATER_HH
-#define SRC_STATE_AGEINGLAWSTATEUPDATER_HH
+#ifndef SRC_TIME_STEPPING_STATE_AGEINGLAWSTATEUPDATER_HH
+#define SRC_TIME_STEPPING_STATE_AGEINGLAWSTATEUPDATER_HH
 
 #include "stateupdater.hh"
 
@@ -15,7 +15,7 @@ class AgeingLawStateUpdater : public StateUpdater<ScalarVector, Vector> {
   void solve(Vector const &velocity_field) override;
   void extractAlpha(ScalarVector &) override;
 
-  std::shared_ptr<StateUpdater<ScalarVector, Vector>> clone() const;
+  std::shared_ptr<StateUpdater<ScalarVector, Vector>> clone() const override;
 
 private:
   ScalarVector alpha_o;

src/state/sliplawstateupdater.cc → src/time-stepping/state/sliplawstateupdater.cc

+#include <cmath>
+
 #include "sliplawstateupdater.hh"
-#include "../tobool.hh"
+#include "../../tobool.hh"
 
 template <class ScalarVector, class Vector>
 SlipLawStateUpdater<ScalarVector, Vector>::SlipLawStateUpdater(