diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
index 6de53ff2e1fcbf19e8786244efaf76ad28646917..159d54cf10f6bdbdb8c76109e5f69090acd46c43 100644
--- a/build/CMakeLists.txt
+++ b/build/CMakeLists.txt
@@ -77,8 +77,8 @@ set(NETCDF_DIR ${F_MASTER}/build/source/netcdf)
 set(NOAHMP_DIR ${F_MASTER}/build/source/noah-mp)
 
 # Define Actors specific directories
-set(ACTORS_DIR ${PARENT_DIR}/build/source)
-set(SUMMA_ACTOR_DIR ${ACTORS_DIR}/summa_actor)
+set(ACTORS_DIR      ${PARENT_DIR}/build/source)
+set(SYS_INIT_DIR    ${ACTORS_DIR}/system_initialization)
 set(FILE_ACCESS_DIR ${ACTORS_DIR}/file_access_actor)
 set(JOB_ACTOR_DIR   ${ACTORS_DIR}/job_actor)
 set(HRU_ACTOR_DIR   ${ACTORS_DIR}/hru_actor)
@@ -200,8 +200,8 @@ set(INTERFACE
     ${ACTORS_DIR}/global/cppwrap_metadata.f90
     ${ACTORS_DIR}/global/c_interface_module.f90
     ${ACTORS_DIR}/global/gru_struc.f90)
-set(SUMMA_ACTOR_INTERFACE
-    ${SUMMA_ACTOR_DIR}/batch_distributer_actor.f90)
+set(SYS_INIT_INTERFACE
+    ${SYS_INIT_DIR}/batch_distributer_actor.f90)
 set(FILE_ACCESS_INTERFACE
     ${FILE_ACCESS_DIR}/file_access_actor.f90
     ${FILE_ACCESS_DIR}/output_structure.f90
@@ -224,16 +224,16 @@ set(ACTORS_GLOBAL
     ${ACTORS_DIR}/global/message_atoms.cpp
     ${ACTORS_DIR}/global/settings_functions.cpp
     ${ACTORS_DIR}/global/timing_info.cpp)
-set(SUMMA_ACTOR
-    ${ACTORS_DIR}/summa_actor/batch.cpp
-    ${ACTORS_DIR}/summa_actor/batch_container.cpp
-    ${ACTORS_DIR}/summa_actor/client.cpp
-    ${ACTORS_DIR}/summa_actor/client_container.cpp
-    ${ACTORS_DIR}/summa_actor/fortran_global_state_actor.cpp
-    ${ACTORS_DIR}/summa_actor/summa_actor.cpp
-    ${ACTORS_DIR}/summa_actor/summa_backup_server.cpp
-    ${ACTORS_DIR}/summa_actor/summa_client.cpp
-    ${ACTORS_DIR}/summa_actor/summa_server.cpp)
+set(SYS_INIT
+    ${SYS_INIT_DIR}/batch.cpp
+    ${SYS_INIT_DIR}/batch_container.cpp
+    ${SYS_INIT_DIR}/client.cpp
+    ${SYS_INIT_DIR}/client_container.cpp
+    ${SYS_INIT_DIR}/fortran_global_state_actor.cpp
+    ${SYS_INIT_DIR}/summa_actor.cpp
+    ${SYS_INIT_DIR}/summa_backup_server.cpp
+    ${SYS_INIT_DIR}/summa_client.cpp
+    ${SYS_INIT_DIR}/summa_server.cpp)
 set(FILE_ACCESS_ACTOR
     # ${ACTORS_DIR}/file_access_actor/file_access_utils.cpp
     ${ACTORS_DIR}/file_access_actor/file_access_actor.cpp
@@ -272,7 +272,7 @@ set(SUMMA_ALL
 
 set(SUMMA_ALL 
     ${SUMMA_ALL}
-    ${SUMMA_ACTOR_INTERFACE}
+    ${SYS_INIT_INTERFACE}
     ${FILE_ACCESS_INTERFACE}
     ${JOB_INTERFACE}
     ${HRU_INTERFACE})
@@ -316,7 +316,7 @@ add_executable(${EXEC_NAME}
                ${FILE_ACCESS_ACTOR}
                ${JOB_ACTOR}
                ${HRU_ACTOR}
-               ${SUMMA_ACTOR}
+               ${SYS_INIT}
                ${SUMMA_CLIENT}
                ${SUMMA_SERVER})
 set_property(TARGET ${EXEC_NAME} PROPERTY LINKER_LANGUAGE Fortran)
diff --git a/build/source/hru_actor/hru_actor.cpp b/build/source/hru_actor/hru_actor.cpp
index e45dba9650c74454636726a7363396cabf6f318b..0e467951e508a9dd108670429ab7ec30e6c16ed8 100644
--- a/build/source/hru_actor/hru_actor.cpp
+++ b/build/source/hru_actor/hru_actor.cpp
@@ -1,6 +1,6 @@
 #include "hru_actor.hpp"
 
-bool hru_extra_logging = true;
+bool hru_extra_logging = false;
 
 namespace caf {
 
diff --git a/build/source/summa_actor/batch.cpp b/build/source/system_initialization/batch.cpp
similarity index 100%
rename from build/source/summa_actor/batch.cpp
rename to build/source/system_initialization/batch.cpp
diff --git a/build/source/summa_actor/batch_container.cpp b/build/source/system_initialization/batch_container.cpp
similarity index 100%
rename from build/source/summa_actor/batch_container.cpp
rename to build/source/system_initialization/batch_container.cpp
diff --git a/build/source/summa_actor/batch_distributer_actor.f90 b/build/source/system_initialization/batch_distributer_actor.f90
similarity index 100%
rename from build/source/summa_actor/batch_distributer_actor.f90
rename to build/source/system_initialization/batch_distributer_actor.f90
diff --git a/build/source/summa_actor/client.cpp b/build/source/system_initialization/client.cpp
similarity index 100%
rename from build/source/summa_actor/client.cpp
rename to build/source/system_initialization/client.cpp
diff --git a/build/source/summa_actor/client_container.cpp b/build/source/system_initialization/client_container.cpp
similarity index 100%
rename from build/source/summa_actor/client_container.cpp
rename to build/source/system_initialization/client_container.cpp
diff --git a/build/source/summa_actor/fortran_global_state_actor.cpp b/build/source/system_initialization/fortran_global_state_actor.cpp
similarity index 100%
rename from build/source/summa_actor/fortran_global_state_actor.cpp
rename to build/source/system_initialization/fortran_global_state_actor.cpp
diff --git a/build/source/summa_actor/summa_actor.cpp b/build/source/system_initialization/summa_actor.cpp
similarity index 100%
rename from build/source/summa_actor/summa_actor.cpp
rename to build/source/system_initialization/summa_actor.cpp
diff --git a/build/source/summa_actor/summa_backup_server.cpp b/build/source/system_initialization/summa_backup_server.cpp
similarity index 100%
rename from build/source/summa_actor/summa_backup_server.cpp
rename to build/source/system_initialization/summa_backup_server.cpp
diff --git a/build/source/summa_actor/summa_client.cpp b/build/source/system_initialization/summa_client.cpp
similarity index 100%
rename from build/source/summa_actor/summa_client.cpp
rename to build/source/system_initialization/summa_client.cpp
diff --git a/build/source/summa_actor/summa_server.cpp b/build/source/system_initialization/summa_server.cpp
similarity index 100%
rename from build/source/summa_actor/summa_server.cpp
rename to build/source/system_initialization/summa_server.cpp