diff --git a/build/makefile b/build/makefile
index 780784218f4d9d529ba0e2fa8c9e6b3340f45612..9368cc4df61b49792bade25d648f9a09a39feb13 100644
--- a/build/makefile
+++ b/build/makefile
@@ -53,10 +53,10 @@ DSHARE_DIR = $(F_KORE_DIR)/dshare
 NUMREC_DIR = $(F_KORE_DIR)/numrec
 NOAHMP_DIR = $(F_KORE_DIR)/noah-mp
 ENGINE_DIR = $(F_KORE_DIR)/engine
-INTERFACE_DIR = $(F_KORE_DIR)/interface
-JOB_ACTOR_DIR = $(INTERFACE_DIR)/job_actor
-FILE_ACCESS_DIR = $(INTERFACE_DIR)/file_access_actor
-HRU_ACTOR_DIR = $(INTERFACE_DIR)/hru_actor
+ACTORS_DIR = $(F_KORE_DIR)/actors
+JOB_ACTOR_DIR = $(ACTORS_DIR)/job_actor
+FILE_ACCESS_DIR = $(ACTORS_DIR)/file_access_actor
+HRU_ACTOR_DIR = $(ACTORS_DIR)/hru_actor
 
 #  utilities
 SUMMA_NRUTIL= \
@@ -135,7 +135,7 @@ SUMMA_INTERFACE= \
 		cppwrap_auxiliary.f90 \
 		cppwrap_metadata.f90 \
 
-INTERFACE = $(patsubst %, $(INTERFACE_DIR)/%, $(SUMMA_INTERFACE))
+INTERFACE = $(patsubst %, $(ACTORS_DIR)/global/%, $(SUMMA_INTERFACE))
 
 SUMMA_FILEACCESS_INTERFACE = \
 		initOutputStruc.f90 \
diff --git a/build/source/actors/FileAccess.h b/build/source/actors/file_access_actor/FileAccess.h
similarity index 90%
rename from build/source/actors/FileAccess.h
rename to build/source/actors/file_access_actor/FileAccess.h
index c1167db81074f98d811f159bb320d7a75bc27043..9dee306931bb8df4584c737d03ff09b256b4d4d4 100644
--- a/build/source/actors/FileAccess.h
+++ b/build/source/actors/file_access_actor/FileAccess.h
@@ -1,15 +1,16 @@
 #ifndef FILEACCESS_H_
 #define FILEACCESS_H_
-
-#include "../interface/fortran_dataTypes.h"
-#include "../interface/file_access_actor/fileAccess_subroutine_wrappers.h"
 #include "caf/all.hpp"
-#include "messageAtoms.h"
+
+#include "../global/fortran_dataTypes.h"
+#include "../global/messageAtoms.h"
+#include "../global/global.h"
+#include "../global/json.hpp"
+#include "fileAccess_subroutine_wrappers.h"
 #include "OutputManager.h"
 #include <vector>
 #include <chrono>
-#include "global.h"
-#include "json.hpp"
+
 
 
 class forcingFile {
diff --git a/build/source/actors/FileAccessActor.h b/build/source/actors/file_access_actor/FileAccessActor.h
similarity index 100%
rename from build/source/actors/FileAccessActor.h
rename to build/source/actors/file_access_actor/FileAccessActor.h
diff --git a/build/source/actors/OutputManager.h b/build/source/actors/file_access_actor/OutputManager.h
similarity index 100%
rename from build/source/actors/OutputManager.h
rename to build/source/actors/file_access_actor/OutputManager.h
diff --git a/build/source/interface/file_access_actor/cppwrap_fileAccess.f90 b/build/source/actors/file_access_actor/cppwrap_fileAccess.f90
similarity index 100%
rename from build/source/interface/file_access_actor/cppwrap_fileAccess.f90
rename to build/source/actors/file_access_actor/cppwrap_fileAccess.f90
diff --git a/build/source/interface/file_access_actor/deallocateOutputStruc.f90 b/build/source/actors/file_access_actor/deallocateOutputStruc.f90
similarity index 100%
rename from build/source/interface/file_access_actor/deallocateOutputStruc.f90
rename to build/source/actors/file_access_actor/deallocateOutputStruc.f90
diff --git a/build/source/interface/file_access_actor/fileAccess_subroutine_wrappers.h b/build/source/actors/file_access_actor/fileAccess_subroutine_wrappers.h
similarity index 100%
rename from build/source/interface/file_access_actor/fileAccess_subroutine_wrappers.h
rename to build/source/actors/file_access_actor/fileAccess_subroutine_wrappers.h
diff --git a/build/source/interface/file_access_actor/initOutputStruc.f90 b/build/source/actors/file_access_actor/initOutputStruc.f90
similarity index 100%
rename from build/source/interface/file_access_actor/initOutputStruc.f90
rename to build/source/actors/file_access_actor/initOutputStruc.f90
diff --git a/build/source/actors/global.h b/build/source/actors/global/global.h
similarity index 100%
rename from build/source/actors/global.h
rename to build/source/actors/global/global.h
diff --git a/build/source/actors/json.hpp b/build/source/actors/global/json.hpp
similarity index 100%
rename from build/source/actors/json.hpp
rename to build/source/actors/global/json.hpp
diff --git a/build/source/actors/messageAtoms.h b/build/source/actors/global/messageAtoms.h
similarity index 100%
rename from build/source/actors/messageAtoms.h
rename to build/source/actors/global/messageAtoms.h
diff --git a/build/source/actors/HRU.h b/build/source/actors/hru_actor/HRU.h
similarity index 96%
rename from build/source/actors/HRU.h
rename to build/source/actors/hru_actor/HRU.h
index 73c1a9690445cc1e5dd3d5555f8c21ea8ce48116..8dd21f21da1af814887b80aac0a57e3da4fa0529 100644
--- a/build/source/actors/HRU.h
+++ b/build/source/actors/hru_actor/HRU.h
@@ -1,9 +1,12 @@
 #ifndef HRU_H_
 #define HRU_H_
 #include "caf/all.hpp"
-#include "../interface/fortran_dataTypes.h"
-#include "../interface/hru_actor/hru_subroutine_wrappers.h"
-#include "messageAtoms.h"
+#include "hru_subroutine_wrappers.h"
+#include "../global/fortran_dataTypes.h"
+#include "../global/messageAtoms.h"
+#include "../global/json.hpp"
+#include "../global/global.h"
+
 #include <fstream>
 #include <string>
 #include <typeinfo>
@@ -12,8 +15,7 @@
 #include <sys/resource.h>
 #include <chrono>
 #include <iostream>
-#include "json.hpp"
-#include "global.h"
+
 
 using namespace caf;
 
diff --git a/build/source/actors/HRUActor.h b/build/source/actors/hru_actor/HRUActor.h
similarity index 100%
rename from build/source/actors/HRUActor.h
rename to build/source/actors/hru_actor/HRUActor.h
diff --git a/build/source/interface/hru_actor/cppwrap_hru.f90 b/build/source/actors/hru_actor/cppwrap_hru.f90
similarity index 100%
rename from build/source/interface/hru_actor/cppwrap_hru.f90
rename to build/source/actors/hru_actor/cppwrap_hru.f90
diff --git a/build/source/interface/hru_actor/hru_subroutine_wrappers.h b/build/source/actors/hru_actor/hru_subroutine_wrappers.h
similarity index 100%
rename from build/source/interface/hru_actor/hru_subroutine_wrappers.h
rename to build/source/actors/hru_actor/hru_subroutine_wrappers.h
diff --git a/build/source/actors/GRUinfo.h b/build/source/actors/job_actor/GRUinfo.h
similarity index 100%
rename from build/source/actors/GRUinfo.h
rename to build/source/actors/job_actor/GRUinfo.h
diff --git a/build/source/actors/Job.h b/build/source/actors/job_actor/Job.h
similarity index 90%
rename from build/source/actors/Job.h
rename to build/source/actors/job_actor/Job.h
index 4eb897dddf6df1a6a50f4f59dc8490d5dff6cfa7..dd44e5d8d93da7ae479f3e32249bc28c80d14da5 100644
--- a/build/source/actors/Job.h
+++ b/build/source/actors/job_actor/Job.h
@@ -3,20 +3,21 @@
 
 #include "caf/all.hpp"
 #include "caf/io/all.hpp"
+#include "../file_access_actor/FileAccessActor.h"
+#include "../hru_actor/HRUActor.h"
+#include "../global/messageAtoms.h"
+#include "../global/json.hpp"
+#include "../global/global.h"
+#include "GRUinfo.h"
+#include "job_subroutine_wrappers.h"
+
 #include "string.h"
 #include <unistd.h>
 #include <vector>
-#include "FileAccessActor.h"
-#include "../interface/job_actor/job_subroutine_wrappers.h"
-#include "HRUActor.h"
 #include <chrono>
-#include "messageAtoms.h"
-#include "GRUinfo.h"
 #include <iostream>
 #include <fstream>
 #include <sys/stat.h>
-#include "json.hpp"
-#include "global.h"
 
 struct job_state {
     // Actor References
diff --git a/build/source/actors/JobActor.h b/build/source/actors/job_actor/JobActor.h
similarity index 100%
rename from build/source/actors/JobActor.h
rename to build/source/actors/job_actor/JobActor.h
diff --git a/build/source/interface/job_actor/cppwrap_job.f90 b/build/source/actors/job_actor/cppwrap_job.f90
similarity index 100%
rename from build/source/interface/job_actor/cppwrap_job.f90
rename to build/source/actors/job_actor/cppwrap_job.f90
diff --git a/build/source/interface/job_actor/job_subroutine_wrappers.h b/build/source/actors/job_actor/job_subroutine_wrappers.h
similarity index 100%
rename from build/source/interface/job_actor/job_subroutine_wrappers.h
rename to build/source/actors/job_actor/job_subroutine_wrappers.h
diff --git a/build/source/actors/main.cc b/build/source/actors/main.cc
index 64c2788857a7247258c0024fb6d184c10ff147a5..bb1f58afdf93be4aa85fc3f34ac2f43236fbdca6 100644
--- a/build/source/actors/main.cc
+++ b/build/source/actors/main.cc
@@ -1,12 +1,13 @@
 #include "caf/all.hpp"
 #include "caf/io/all.hpp"
-#include "SummaActor.h"
+#include "summa_actor/SummaActor.h"
+#include "global/messageAtoms.h"
+#include "global/global.h"
+
 #include <string>
-#include "messageAtoms.h"
 #include <bits/stdc++.h>
 #include <unistd.h>
 #include <iostream>
-#include "global.h"
 
 using namespace caf;
 
diff --git a/build/source/actors/SummaActor.h b/build/source/actors/summa_actor/SummaActor.h
similarity index 100%
rename from build/source/actors/SummaActor.h
rename to build/source/actors/summa_actor/SummaActor.h
diff --git a/build/source/actors/SummaManager.h b/build/source/actors/summa_actor/SummaManager.h
similarity index 91%
rename from build/source/actors/SummaManager.h
rename to build/source/actors/summa_actor/SummaManager.h
index bc4e20f6050180b3db6897c21560800f301fa57c..da875782b25c35ea1b589823d68a467a32321581 100644
--- a/build/source/actors/SummaManager.h
+++ b/build/source/actors/summa_actor/SummaManager.h
@@ -3,13 +3,15 @@
 
 #include "caf/all.hpp"
 #include "caf/io/all.hpp"
-#include "JobActor.h"
+#include "../job_actor/JobActor.h"
+#include "../global/json.hpp"
+#include "../global/global.h"
+
+
 #include <iostream>
 #include <chrono>
 #include <string>
-#include "json.hpp"
 #include <fstream>
-#include "global.h"