diff --git a/src/jsoncpp.cpp b/src/agent/jsoncpp.cpp
similarity index 100%
rename from src/jsoncpp.cpp
rename to src/agent/jsoncpp.cpp
diff --git a/src/linux/datasid-agent.cpp b/src/agent/linux/datasid-agent.cpp
similarity index 98%
rename from src/linux/datasid-agent.cpp
rename to src/agent/linux/datasid-agent.cpp
index 3d71b94e46648b64ba3377598ed24b433b5ff951..44460da85314631c1b7710c514f2ab7eb94a3c52 100644
--- a/src/linux/datasid-agent.cpp
+++ b/src/agent/linux/datasid-agent.cpp
@@ -19,7 +19,7 @@
  * USA.
  */
 #include <string>
-#include "../../include/agent/main.h"
+#include "agent/main.h"
 
 /*
  * set Functions
diff --git a/src/linux/datasid-common.cpp b/src/agent/linux/datasid-common.cpp
similarity index 97%
rename from src/linux/datasid-common.cpp
rename to src/agent/linux/datasid-common.cpp
index 0fcf5857e763e340306da22cd9a593e9b7ca3ef2..99d513cee83336b6c720c72da1104268f133e6c6 100644
--- a/src/linux/datasid-common.cpp
+++ b/src/agent/linux/datasid-common.cpp
@@ -19,7 +19,7 @@
  * USA.
  */
 #include <string>
-#include "../../include/agent/linux/datasid-common.h"
+#include "agent/linux/datasid-common.h"
 
 /*
  * fileExist Function
diff --git a/src/linux/datasid-conf.cpp b/src/agent/linux/datasid-conf.cpp
similarity index 98%
rename from src/linux/datasid-conf.cpp
rename to src/agent/linux/datasid-conf.cpp
index ab33ecfaf52c1d47be4353b899a060aed1cac690..4bd02ed918e6072b185b43eb68d7e19209a27104 100644
--- a/src/linux/datasid-conf.cpp
+++ b/src/agent/linux/datasid-conf.cpp
@@ -25,7 +25,7 @@
 #include <map>
 #include <sstream>
 #include <string>
-#include "../../include/agent/linux/datasid-conf.h"
+#include "agent/linux/datasid-conf.h"
 /*
  * set Functions
  */
diff --git a/src/linux/datasid-parse.cpp b/src/agent/linux/datasid-parse.cpp
similarity index 98%
rename from src/linux/datasid-parse.cpp
rename to src/agent/linux/datasid-parse.cpp
index 2bec17c626ab53c45f2320cc3b681592af098b99..a9dcf339507495b8b9987efee643c69571758dbc 100644
--- a/src/linux/datasid-parse.cpp
+++ b/src/agent/linux/datasid-parse.cpp
@@ -21,7 +21,7 @@
 #include <re2/re2.h>
 #include <map>
 #include <string>
-#include "../../include/agent/linux/datasid-parse.h"
+#include "agent/linux/datasid-parse.h"
 
 /* 
  * trim Function
diff --git a/src/linux/datasid-proxy.cpp b/src/agent/linux/datasid-proxy.cpp
similarity index 97%
rename from src/linux/datasid-proxy.cpp
rename to src/agent/linux/datasid-proxy.cpp
index 32ac8a7016a713128fdc3b68768539574aba9cae..bca8347efcf9178ed1f1a51bc66a005d589dac6a 100644
--- a/src/linux/datasid-proxy.cpp
+++ b/src/agent/linux/datasid-proxy.cpp
@@ -21,7 +21,7 @@
 #include <iostream>
 #include <map>
 #include <string>
-#include "../../include/agent/linux/datasid-proxy.h"
+#include "agent/linux/datasid-proxy.h"
 
 /*
  * set Functions
diff --git a/src/linux/get_date.cpp b/src/agent/linux/get_date.cpp
similarity index 100%
rename from src/linux/get_date.cpp
rename to src/agent/linux/get_date.cpp
diff --git a/src/linux/get_disks_info.cpp b/src/agent/linux/get_disks_info.cpp
similarity index 100%
rename from src/linux/get_disks_info.cpp
rename to src/agent/linux/get_disks_info.cpp
diff --git a/src/linux/get_distro.cpp b/src/agent/linux/get_distro.cpp
similarity index 100%
rename from src/linux/get_distro.cpp
rename to src/agent/linux/get_distro.cpp
diff --git a/src/linux/get_macaddr.cpp b/src/agent/linux/get_macaddr.cpp
similarity index 100%
rename from src/linux/get_macaddr.cpp
rename to src/agent/linux/get_macaddr.cpp
diff --git a/src/linux/get_machine_type.cpp b/src/agent/linux/get_machine_type.cpp
similarity index 100%
rename from src/linux/get_machine_type.cpp
rename to src/agent/linux/get_machine_type.cpp
diff --git a/src/linux/get_memory_size.cpp b/src/agent/linux/get_memory_size.cpp
similarity index 100%
rename from src/linux/get_memory_size.cpp
rename to src/agent/linux/get_memory_size.cpp
diff --git a/src/linux/get_processor_model.cpp b/src/agent/linux/get_processor_model.cpp
similarity index 100%
rename from src/linux/get_processor_model.cpp
rename to src/agent/linux/get_processor_model.cpp
diff --git a/src/linux/get_time.cpp b/src/agent/linux/get_time.cpp
similarity index 100%
rename from src/linux/get_time.cpp
rename to src/agent/linux/get_time.cpp
diff --git a/src/linux/get_user_count.cpp b/src/agent/linux/get_user_count.cpp
similarity index 100%
rename from src/linux/get_user_count.cpp
rename to src/agent/linux/get_user_count.cpp
diff --git a/src/linux/inventory.cpp b/src/agent/linux/inventory.cpp
similarity index 100%
rename from src/linux/inventory.cpp
rename to src/agent/linux/inventory.cpp
diff --git a/src/linux/open_file.cpp b/src/agent/linux/open_file.cpp
similarity index 100%
rename from src/linux/open_file.cpp
rename to src/agent/linux/open_file.cpp
diff --git a/src/main.cpp b/src/agent/main.cpp
similarity index 100%
rename from src/main.cpp
rename to src/agent/main.cpp
diff --git a/src/network_bandwidth.cpp b/src/agent/network_bandwidth.cpp
similarity index 100%
rename from src/network_bandwidth.cpp
rename to src/agent/network_bandwidth.cpp
diff --git a/src/post.cpp b/src/agent/post.cpp
similarity index 100%
rename from src/post.cpp
rename to src/agent/post.cpp
diff --git a/src/user_history.cpp b/src/agent/user_history.cpp
similarity index 100%
rename from src/user_history.cpp
rename to src/agent/user_history.cpp
diff --git a/src/windows/get_date.cpp b/src/agent/windows/get_date.cpp
similarity index 100%
rename from src/windows/get_date.cpp
rename to src/agent/windows/get_date.cpp
diff --git a/src/windows/get_macaddr.cpp b/src/agent/windows/get_macaddr.cpp
similarity index 100%
rename from src/windows/get_macaddr.cpp
rename to src/agent/windows/get_macaddr.cpp
diff --git a/src/windows/get_machine_type.cpp b/src/agent/windows/get_machine_type.cpp
similarity index 100%
rename from src/windows/get_machine_type.cpp
rename to src/agent/windows/get_machine_type.cpp
diff --git a/src/windows/get_time.cpp b/src/agent/windows/get_time.cpp
similarity index 100%
rename from src/windows/get_time.cpp
rename to src/agent/windows/get_time.cpp
diff --git a/src/windows/inventory.cpp b/src/agent/windows/inventory.cpp
similarity index 100%
rename from src/windows/inventory.cpp
rename to src/agent/windows/inventory.cpp