diff --git a/src/Makefile.am b/src/Makefile.am
index 1ea490f5c9a8c62c5edae19fc7467473a36e9575..a6aea3690e3f2045a512d7b9b4ffac538c8a5479 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,9 +6,9 @@ bin_PROGRAMS = \
 
 SOURCES = \
 	assemblers.cc \
-	compute_state_dieterich_euler.cc \
-	compute_state_dieterich_common.cc \
-	compute_state_ruina.cc \
+	state/compute_state_dieterich_euler.cc \
+	state/compute_state_dieterich_common.cc \
+	state/compute_state_ruina.cc \
 	mysolver.cc \
 	one-body-sample.cc \
 	timestepping.cc \
diff --git a/src/one-body-sample.org b/src/one-body-sample.org
index 33b62f9d16b73ef484e0ce78f0a0c48aa2a1abb4..806170d5d9b47a2344d9ce9f02d6aa336767bba5 100644
--- a/src/one-body-sample.org
+++ b/src/one-body-sample.org
@@ -276,8 +276,9 @@
   
   #include "timestepping.hh"
   
-  #include "ruinastateupdater.hh"
-  #include "dieterichstateupdater.hh"
+  #include "state/stateupdater.hh"
+  #include "state/ruinastateupdater.hh"
+  #include "state/dieterichstateupdater.hh"
   
   int const dim = DIM;
   
diff --git a/src/compute_state_dieterich_common.cc b/src/state/compute_state_dieterich_common.cc
similarity index 100%
rename from src/compute_state_dieterich_common.cc
rename to src/state/compute_state_dieterich_common.cc
diff --git a/src/compute_state_dieterich_common.hh b/src/state/compute_state_dieterich_common.hh
similarity index 100%
rename from src/compute_state_dieterich_common.hh
rename to src/state/compute_state_dieterich_common.hh
diff --git a/src/compute_state_dieterich_euler.cc b/src/state/compute_state_dieterich_euler.cc
similarity index 100%
rename from src/compute_state_dieterich_euler.cc
rename to src/state/compute_state_dieterich_euler.cc
diff --git a/src/compute_state_dieterich_euler.hh b/src/state/compute_state_dieterich_euler.hh
similarity index 100%
rename from src/compute_state_dieterich_euler.hh
rename to src/state/compute_state_dieterich_euler.hh
diff --git a/src/compute_state_ruina.cc b/src/state/compute_state_ruina.cc
similarity index 100%
rename from src/compute_state_ruina.cc
rename to src/state/compute_state_ruina.cc
diff --git a/src/compute_state_ruina.hh b/src/state/compute_state_ruina.hh
similarity index 100%
rename from src/compute_state_ruina.hh
rename to src/state/compute_state_ruina.hh
diff --git a/src/dieterichstateupdater.hh b/src/state/dieterichstateupdater.hh
similarity index 100%
rename from src/dieterichstateupdater.hh
rename to src/state/dieterichstateupdater.hh
diff --git a/src/ruinastateupdater.hh b/src/state/ruinastateupdater.hh
similarity index 100%
rename from src/ruinastateupdater.hh
rename to src/state/ruinastateupdater.hh
diff --git a/src/stateupdater.hh b/src/state/stateupdater.hh
similarity index 100%
rename from src/stateupdater.hh
rename to src/state/stateupdater.hh