diff --git a/doxy_zeus.py b/doxy_zeus.py
index e8b7ec4..36b6611 100644
--- a/doxy_zeus.py
+++ b/doxy_zeus.py
@@ -24,10 +24,10 @@ def create(target, module_name):
 	    '*operator<<*',
 	    ])
 	my_module.add_exclude_file([
-	    'debug.h',
+	    'debug.hpp',
 	    ])
 	my_module.add_file_patterns([
-	    '*.h',
+	    '*.hpp',
 	    '*.md',
 	    ])
 	
diff --git a/lutin_zeus.py b/lutin_zeus.py
index 9da68da..40d2863 100644
--- a/lutin_zeus.py
+++ b/lutin_zeus.py
@@ -54,28 +54,28 @@ def create(target, module_name):
 	    'zeus/mineType.cpp',
 	    ])
 	my_module.add_header_file([
-	    'zeus/AbstractFunction.h',
-	    'zeus/AbstractFunctionTypeDirect.h',
-	    'zeus/AbstractFunctionTypeClass.h',
-	    'zeus/FutureData.h',
-	    'zeus/FutureBase.h',
-	    'zeus/Future.h',
-	    'zeus/File.h',
-	    'zeus/Buffer.h',
-	    'zeus/BufferParameter.h',
-	    'zeus/BufferCall.h',
-	    'zeus/BufferAnswer.h',
-	    'zeus/BufferData.h',
-	    'zeus/BufferEvent.h',
-	    'zeus/BufferFlow.h',
-	    'zeus/ParamType.h',
-	    'zeus/debug.h',
-	    'zeus/Client.h',
-	    'zeus/RemoteProcessCall.h',
-	    'zeus/Service.h',
-	    'zeus/ServiceRemote.h',
-	    'zeus/WebServer.h',
-	    'zeus/mineType.h',
+	    'zeus/AbstractFunction.hpp',
+	    'zeus/AbstractFunctionTypeDirect.hpp',
+	    'zeus/AbstractFunctionTypeClass.hpp',
+	    'zeus/FutureData.hpp',
+	    'zeus/FutureBase.hpp',
+	    'zeus/Future.hpp',
+	    'zeus/File.hpp',
+	    'zeus/Buffer.hpp',
+	    'zeus/BufferParameter.hpp',
+	    'zeus/BufferCall.hpp',
+	    'zeus/BufferAnswer.hpp',
+	    'zeus/BufferData.hpp',
+	    'zeus/BufferEvent.hpp',
+	    'zeus/BufferFlow.hpp',
+	    'zeus/ParamType.hpp',
+	    'zeus/debug.hpp',
+	    'zeus/Client.hpp',
+	    'zeus/RemoteProcessCall.hpp',
+	    'zeus/Service.hpp',
+	    'zeus/ServiceRemote.hpp',
+	    'zeus/WebServer.hpp',
+	    'zeus/mineType.hpp',
 	    ])
 	if target.config["compilator"] == "clang":
 		my_module.add_flag('c++', "-Wno-unsequenced", export=True)
diff --git a/test/client/appl/debug.cpp b/test/client/appl/debug.cpp
index f9fb587..f4f863b 100644
--- a/test/client/appl/debug.cpp
+++ b/test/client/appl/debug.cpp
@@ -4,7 +4,7 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <appl/debug.h>
+#include <appl/debug.hpp>
 
 int32_t appl::getLogId() {
 	static int32_t g_val = elog::registerInstance("zeus-test-client");
diff --git a/test/client/appl/debug.h b/test/client/appl/debug.hpp
similarity index 97%
rename from test/client/appl/debug.h
rename to test/client/appl/debug.hpp
index d422118..cdc460d 100644
--- a/test/client/appl/debug.h
+++ b/test/client/appl/debug.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <elog/log.h>
+#include <elog/log.hpp>
 
 namespace appl {
 	int32_t getLogId();
diff --git a/test/client/appl/main.cpp b/test/client/appl/main.cpp
index 8086006..50760d7 100644
--- a/test/client/appl/main.cpp
+++ b/test/client/appl/main.cpp
@@ -4,15 +4,15 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <appl/debug.h>
-#include <zeus/Client.h>
-#include <zeus/ServiceRemote.h>
-#include <zeus/mineType.h>
-#include <etk/etk.h>
-#include <etk/os/FSNode.h>
+#include <appl/debug.hpp>
+#include <zeus/Client.hpp>
+#include <zeus/ServiceRemote.hpp>
+#include <zeus/mineType.hpp>
+#include <etk/etk.hpp>
+#include <etk/os/FSNode.hpp>
 #include <unistd.h>
 
-#include <etk/stdTools.h>
+#include <etk/stdTools.hpp>
 
 int main(int _argc, const char *_argv[]) {
 	etk::init(_argc, _argv);
diff --git a/test/service1/appl/debug.cpp b/test/service1/appl/debug.cpp
index 1789ef0..1501cfc 100644
--- a/test/service1/appl/debug.cpp
+++ b/test/service1/appl/debug.cpp
@@ -4,7 +4,7 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <appl/debug.h>
+#include <appl/debug.hpp>
 
 int32_t appl::getLogId() {
 	static int32_t g_val = elog::registerInstance("zeus-test-service1");
diff --git a/test/service1/appl/debug.h b/test/service1/appl/debug.hpp
similarity index 97%
rename from test/service1/appl/debug.h
rename to test/service1/appl/debug.hpp
index d422118..cdc460d 100644
--- a/test/service1/appl/debug.h
+++ b/test/service1/appl/debug.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <elog/log.h>
+#include <elog/log.hpp>
 
 namespace appl {
 	int32_t getLogId();
diff --git a/test/service1/appl/main.cpp b/test/service1/appl/main.cpp
index d5853de..4e86dd5 100644
--- a/test/service1/appl/main.cpp
+++ b/test/service1/appl/main.cpp
@@ -4,12 +4,12 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <appl/debug.h>
-#include <zeus/Service.h>
-#include <etk/etk.h>
+#include <appl/debug.hpp>
+#include <zeus/Service.hpp>
+#include <etk/etk.hpp>
 #include <unistd.h>
 
-#include <etk/stdTools.h>
+#include <etk/stdTools.hpp>
 namespace appl {
 	class User {
 		public:
diff --git a/tools/picture/appl/debug.cpp b/tools/picture/appl/debug.cpp
index 7003cc3..8095c7d 100644
--- a/tools/picture/appl/debug.cpp
+++ b/tools/picture/appl/debug.cpp
@@ -4,7 +4,7 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <appl/debug.h>
+#include <appl/debug.hpp>
 
 int32_t appl::getLogId() {
 	static int32_t g_val = elog::registerInstance("zeus-picture");
diff --git a/tools/picture/appl/debug.h b/tools/picture/appl/debug.hpp
similarity index 97%
rename from tools/picture/appl/debug.h
rename to tools/picture/appl/debug.hpp
index d422118..cdc460d 100644
--- a/tools/picture/appl/debug.h
+++ b/tools/picture/appl/debug.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <elog/log.h>
+#include <elog/log.hpp>
 
 namespace appl {
 	int32_t getLogId();
diff --git a/tools/picture/appl/main.cpp b/tools/picture/appl/main.cpp
index 28331df..c0f4bf0 100644
--- a/tools/picture/appl/main.cpp
+++ b/tools/picture/appl/main.cpp
@@ -4,14 +4,14 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <appl/debug.h>
-#include <zeus/Service.h>
-#include <zeus/File.h>
-#include <etk/etk.h>
-#include <unistd.h>
+#include <appl/debug.hpp>
+#include <zeus/Service.hpp>
+#include <zeus/File.hpp>
+#include <etk/etk.hpp>
+#include <unistd.hpp>
 #include <mutex>
-#include <ejson/ejson.h>
-#include <etk/os/FSNode.h>
+#include <ejson/ejson.hpp>
+#include <etk/os/FSNode.hpp>
 #include <sstream>
 
 #include <etk/stdTools.h>
diff --git a/tools/system-gateway/appl/ClientInterface.cpp b/tools/system-gateway/appl/ClientInterface.cpp
index bfb9336..f4da77d 100644
--- a/tools/system-gateway/appl/ClientInterface.cpp
+++ b/tools/system-gateway/appl/ClientInterface.cpp
@@ -4,13 +4,13 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <appl/debug.h>
-#include <appl/ClientInterface.h>
-#include <zeus/Future.h>
-#include <appl/GateWay.h>
+#include <appl/debug.hpp>
+#include <appl/ClientInterface.hpp>
+#include <zeus/Future.hpp>
+#include <appl/GateWay.hpp>
 #include <unistd.h>
 
-#include <zeus/AbstractFunction.h>
+#include <zeus/AbstractFunction.hpp>
 
 
 static const std::string protocolError = "PROTOCOL-ERROR";
diff --git a/tools/system-gateway/appl/ClientInterface.h b/tools/system-gateway/appl/ClientInterface.hpp
similarity index 94%
rename from tools/system-gateway/appl/ClientInterface.h
rename to tools/system-gateway/appl/ClientInterface.hpp
index 26cd4b3..2f31416 100644
--- a/tools/system-gateway/appl/ClientInterface.h
+++ b/tools/system-gateway/appl/ClientInterface.hpp
@@ -5,9 +5,9 @@
  */
 #pragma once
 
-#include <zeus/WebServer.h>
-#include <appl/GateWay.h>
-#include <appl/ServiceInterface.h>
+#include <zeus/WebServer.hpp>
+#include <appl/GateWay.hpp>
+#include <appl/ServiceInterface.hpp>
 
 namespace appl {
 	class GateWay;
diff --git a/tools/system-gateway/appl/GateWay.cpp b/tools/system-gateway/appl/GateWay.cpp
index 5969554..541b19e 100644
--- a/tools/system-gateway/appl/GateWay.cpp
+++ b/tools/system-gateway/appl/GateWay.cpp
@@ -4,9 +4,9 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <appl/GateWay.h>
-#include <appl/debug.h>
-#include <enet/TcpServer.h>
+#include <appl/GateWay.hpp>
+#include <appl/debug.hpp>
+#include <enet/TcpServer.hpp>
 
 
 namespace appl {
diff --git a/tools/system-gateway/appl/GateWay.h b/tools/system-gateway/appl/GateWay.hpp
similarity index 94%
rename from tools/system-gateway/appl/GateWay.h
rename to tools/system-gateway/appl/GateWay.hpp
index a00d41d..cbf576d 100644
--- a/tools/system-gateway/appl/GateWay.h
+++ b/tools/system-gateway/appl/GateWay.hpp
@@ -4,9 +4,9 @@
  * @license APACHE v2.0 (see license file)
  */
 #pragma once
-#include <appl/ServiceInterface.h>
-#include <appl/ClientInterface.h>
-#include <eproperty/Value.h>
+#include <appl/ServiceInterface.hpp>
+#include <appl/ClientInterface.hpp>
+#include <eproperty/Value.hpp>
 
 namespace appl {
 	class TcpServerInput;
diff --git a/tools/system-gateway/appl/ServiceInterface.cpp b/tools/system-gateway/appl/ServiceInterface.cpp
index 93a9841..312e6b1 100644
--- a/tools/system-gateway/appl/ServiceInterface.cpp
+++ b/tools/system-gateway/appl/ServiceInterface.cpp
@@ -4,10 +4,10 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <appl/debug.h>
-#include <appl/ServiceInterface.h>
-#include <appl/ClientInterface.h>
-#include <appl/GateWay.h>
+#include <appl/debug.hpp>
+#include <appl/ServiceInterface.hpp>
+#include <appl/ClientInterface.hpp>
+#include <appl/GateWay.hpp>
 
 // todo : cHANGE THIS ...
 static const std::string protocolError = "PROTOCOL-ERROR";
diff --git a/tools/system-gateway/appl/ServiceInterface.h b/tools/system-gateway/appl/ServiceInterface.hpp
similarity index 93%
rename from tools/system-gateway/appl/ServiceInterface.h
rename to tools/system-gateway/appl/ServiceInterface.hpp
index aa68402..fdc5b0c 100644
--- a/tools/system-gateway/appl/ServiceInterface.h
+++ b/tools/system-gateway/appl/ServiceInterface.hpp
@@ -5,8 +5,8 @@
  */
 #pragma once
 
-#include <zeus/WebServer.h>
-#include <ememory/memory.h>
+#include <zeus/WebServer.hpp>
+#include <ememory/memory.hpp>
 
 namespace appl {
 	class GateWay;
diff --git a/tools/system-gateway/appl/debug.cpp b/tools/system-gateway/appl/debug.cpp
index 6b67622..f1450e8 100644
--- a/tools/system-gateway/appl/debug.cpp
+++ b/tools/system-gateway/appl/debug.cpp
@@ -4,7 +4,7 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <appl/debug.h>
+#include <appl/debug.hpp>
 
 int32_t appl::getLogId() {
 	static int32_t g_val = elog::registerInstance("zeus-gateway");
diff --git a/tools/system-gateway/appl/debug.h b/tools/system-gateway/appl/debug.hpp
similarity index 97%
rename from tools/system-gateway/appl/debug.h
rename to tools/system-gateway/appl/debug.hpp
index d422118..cdc460d 100644
--- a/tools/system-gateway/appl/debug.h
+++ b/tools/system-gateway/appl/debug.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <elog/log.h>
+#include <elog/log.hpp>
 
 namespace appl {
 	int32_t getLogId();
diff --git a/tools/system-gateway/appl/main.cpp b/tools/system-gateway/appl/main.cpp
index 0a0404a..ad891c2 100644
--- a/tools/system-gateway/appl/main.cpp
+++ b/tools/system-gateway/appl/main.cpp
@@ -4,12 +4,12 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <appl/debug.h>
-#include <appl/GateWay.h>
-#include <etk/etk.h>
+#include <appl/debug.hpp>
+#include <appl/GateWay.hpp>
+#include <etk/etk.hpp>
 #include <unistd.h>
 
-#include <etk/stdTools.h>
+#include <etk/stdTools.hpp>
 
 int main(int _argc, const char *_argv[]) {
 	etk::init(_argc, _argv);
diff --git a/tools/system-user/appl/debug.cpp b/tools/system-user/appl/debug.cpp
index 25a3d81..88312f6 100644
--- a/tools/system-user/appl/debug.cpp
+++ b/tools/system-user/appl/debug.cpp
@@ -4,7 +4,7 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <appl/debug.h>
+#include <appl/debug.hpp>
 
 int32_t appl::getLogId() {
 	static int32_t g_val = elog::registerInstance("zeus-system-service");
diff --git a/tools/system-user/appl/debug.h b/tools/system-user/appl/debug.h
deleted file mode 100644
index d422118..0000000
--- a/tools/system-user/appl/debug.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/** @file
- * @author Edouard DUPIN
- * @copyright 2016, Edouard DUPIN, all right reserved
- * @license APACHE v2.0 (see license file)
- */
-#pragma once
-
-#include <elog/log.h>
-
-namespace appl {
-	int32_t getLogId();
-};
-
-#define APPL_BASE(info,data) ELOG_BASE(appl::getLogId(),info,data)
-
-#define APPL_PRINT(data)      APPL_BASE(-1, data)
-#define APPL_CRITICAL(data)      APPL_BASE(1, data)
-#define APPL_ERROR(data)         APPL_BASE(2, data)
-#define APPL_WARNING(data)       APPL_BASE(3, data)
-#ifdef DEBUG
-	#define APPL_INFO(data)          APPL_BASE(4, data)
-	#define APPL_DEBUG(data)         APPL_BASE(5, data)
-	#define APPL_VERBOSE(data)       APPL_BASE(6, data)
-	#define APPL_TODO(data)          APPL_BASE(4, "TODO : " << data)
-#else
-	#define APPL_INFO(data)          do { } while(false)
-	#define APPL_DEBUG(data)         do { } while(false)
-	#define APPL_VERBOSE(data)       do { } while(false)
-	#define APPL_TODO(data)          do { } while(false)
-#endif
-
-#define APPL_ASSERT(cond,data) \
-	do { \
-		if (!(cond)) { \
-			APPL_CRITICAL(data); \
-			assert(!#cond); \
-		} \
-	} while (0)
-
-
diff --git a/tools/system-user/appl/debug.hpp b/tools/system-user/appl/debug.hpp
new file mode 100644
index 0000000..cdc460d
--- /dev/null
+++ b/tools/system-user/appl/debug.hpp
@@ -0,0 +1,40 @@
+/** @file
+ * @author Edouard DUPIN
+ * @copyright 2016, Edouard DUPIN, all right reserved
+ * @license APACHE v2.0 (see license file)
+ */
+#pragma once
+
+#include <elog/log.hpp>
+
+namespace appl {
+	int32_t getLogId();
+};
+
+#define APPL_BASE(info,data) ELOG_BASE(appl::getLogId(),info,data)
+
+#define APPL_PRINT(data)      APPL_BASE(-1, data)
+#define APPL_CRITICAL(data)      APPL_BASE(1, data)
+#define APPL_ERROR(data)         APPL_BASE(2, data)
+#define APPL_WARNING(data)       APPL_BASE(3, data)
+#ifdef DEBUG
+	#define APPL_INFO(data)          APPL_BASE(4, data)
+	#define APPL_DEBUG(data)         APPL_BASE(5, data)
+	#define APPL_VERBOSE(data)       APPL_BASE(6, data)
+	#define APPL_TODO(data)          APPL_BASE(4, "TODO : " << data)
+#else
+	#define APPL_INFO(data)          do { } while(false)
+	#define APPL_DEBUG(data)         do { } while(false)
+	#define APPL_VERBOSE(data)       do { } while(false)
+	#define APPL_TODO(data)          do { } while(false)
+#endif
+
+#define APPL_ASSERT(cond,data) \
+	do { \
+		if (!(cond)) { \
+			APPL_CRITICAL(data); \
+			assert(!#cond); \
+		} \
+	} while (0)
+
+
diff --git a/tools/system-user/appl/main.cpp b/tools/system-user/appl/main.cpp
index 8f6d6f4..b94409c 100644
--- a/tools/system-user/appl/main.cpp
+++ b/tools/system-user/appl/main.cpp
@@ -4,14 +4,14 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <appl/debug.h>
-#include <zeus/Service.h>
-#include <etk/etk.h>
+#include <appl/debug.hpp>
+#include <zeus/Service.hpp>
+#include <etk/etk.hpp>
 #include <unistd.h>
 #include <mutex>
-#include <ejson/ejson.h>
+#include <ejson/ejson.hpp>
 
-#include <etk/stdTools.h>
+#include <etk/stdTools.hpp>
 namespace appl {
 	class User {
 		private:
diff --git a/zeus/AbstractFunction.cpp b/zeus/AbstractFunction.cpp
index d17df40..78dffcd 100644
--- a/zeus/AbstractFunction.cpp
+++ b/zeus/AbstractFunction.cpp
@@ -3,9 +3,9 @@
  * @copyright 2016, Edouard DUPIN, all right reserved
  * @license APACHE v2.0 (see license file)
  */
-#include <zeus/AbstractFunction.h>
-#include <zeus/debug.h>
-#include <etk/os/FSNode.h>
+#include <zeus/AbstractFunction.hpp>
+#include <zeus/debug.hpp>
+#include <etk/os/FSNode.hpp>
 
 static int32_t firstCall(bool& _value) {
 	_value = false;
diff --git a/zeus/AbstractFunction.h b/zeus/AbstractFunction.hpp
similarity index 95%
rename from zeus/AbstractFunction.h
rename to zeus/AbstractFunction.hpp
index 887fc1d..96ba0ff 100644
--- a/zeus/AbstractFunction.h
+++ b/zeus/AbstractFunction.hpp
@@ -4,12 +4,12 @@
  * @license APACHE v2.0 (see license file)
  */
 #pragma once
-#include <zeus/debug.h>
-#include <zeus/ParamType.h>
-#include <zeus/File.h>
-#include <zeus/Buffer.h>
-#include <zeus/BufferCall.h>
-#include <ememory/memory.h>
+#include <zeus/debug.hpp>
+#include <zeus/ParamType.hpp>
+#include <zeus/File.hpp>
+#include <zeus/Buffer.hpp>
+#include <zeus/BufferCall.hpp>
+#include <ememory/memory.hpp>
 
 
 namespace zeus {
@@ -134,5 +134,5 @@ namespace zeus {
 	};
 }
 
-#include <zeus/WebServer.h>
+#include <zeus/WebServer.hpp>
 
diff --git a/zeus/AbstractFunctionTypeClass.h b/zeus/AbstractFunctionTypeClass.hpp
similarity index 98%
rename from zeus/AbstractFunctionTypeClass.h
rename to zeus/AbstractFunctionTypeClass.hpp
index 6895b21..b57593b 100644
--- a/zeus/AbstractFunctionTypeClass.h
+++ b/zeus/AbstractFunctionTypeClass.hpp
@@ -5,10 +5,10 @@
  */
 #pragma once
 
-#include <zeus/WebServer.h>
-#include <zeus/debug.h>
-#include <zeus/AbstractFunction.h>
-#include <zeus/mineType.h>
+#include <zeus/WebServer.hpp>
+#include <zeus/debug.hpp>
+#include <zeus/AbstractFunction.hpp>
+#include <zeus/mineType.hpp>
 
 
 namespace zeus {
diff --git a/zeus/AbstractFunctionTypeDirect.h b/zeus/AbstractFunctionTypeDirect.hpp
similarity index 98%
rename from zeus/AbstractFunctionTypeDirect.h
rename to zeus/AbstractFunctionTypeDirect.hpp
index b8b9a74..3c9a07d 100644
--- a/zeus/AbstractFunctionTypeDirect.h
+++ b/zeus/AbstractFunctionTypeDirect.hpp
@@ -5,9 +5,9 @@
  */
 #pragma once
 
-#include <zeus/WebServer.h>
-#include <zeus/debug.h>
-#include <zeus/AbstractFunction.h>
+#include <zeus/WebServer.hpp>
+#include <zeus/debug.hpp>
+#include <zeus/AbstractFunction.hpp>
 namespace zeus {
 	/**
 	 * @brief Execute a call on the global function with a return value
diff --git a/zeus/Buffer.cpp b/zeus/Buffer.cpp
index 9b98333..e3907f8 100644
--- a/zeus/Buffer.cpp
+++ b/zeus/Buffer.cpp
@@ -3,18 +3,18 @@
  * @copyright 2016, Edouard DUPIN, all right reserved
  * @license APACHE v2.0 (see license file)
  */
-#include <etk/types.h>
-#include <zeus/Buffer.h>
-#include <zeus/debug.h>
-#include <zeus/ParamType.h>
-#include <etk/stdTools.h>
-#include <zeus/AbstractFunction.h>
+#include <etk/types.hpp>
+#include <zeus/Buffer.hpp>
+#include <zeus/debug.hpp>
+#include <zeus/ParamType.hpp>
+#include <etk/stdTools.hpp>
+#include <zeus/AbstractFunction.hpp>
 #include <climits>
-#include <zeus/BufferAnswer.h>
-#include <zeus/BufferCall.h>
-#include <zeus/BufferData.h>
-#include <zeus/BufferFlow.h>
-#include <zeus/BufferEvent.h>
+#include <zeus/BufferAnswer.hpp>
+#include <zeus/BufferCall.hpp>
+#include <zeus/BufferData.hpp>
+#include <zeus/BufferFlow.hpp>
+#include <zeus/BufferEvent.hpp>
 
 namespace etk {
 	template<> std::string to_string<enum zeus::Buffer::typeMessage>(const enum zeus::Buffer::typeMessage& _value) {
diff --git a/zeus/Buffer.h b/zeus/Buffer.hpp
similarity index 98%
rename from zeus/Buffer.h
rename to zeus/Buffer.hpp
index 575ae16..094824d 100644
--- a/zeus/Buffer.h
+++ b/zeus/Buffer.hpp
@@ -4,9 +4,9 @@
  * @license APACHE v2.0 (see license file)
  */
 #pragma once
-#include <etk/types.h>
-#include <enet/WebSocket.h>
-#include <zeus/ParamType.h>
+#include <etk/types.hpp>
+#include <enet/WebSocket.hpp>
+#include <zeus/ParamType.hpp>
 
 namespace zeus {
 	class WebServer;
diff --git a/zeus/BufferAnswer.cpp b/zeus/BufferAnswer.cpp
index 5edb798..f34a034 100644
--- a/zeus/BufferAnswer.cpp
+++ b/zeus/BufferAnswer.cpp
@@ -3,12 +3,12 @@
  * @copyright 2016, Edouard DUPIN, all right reserved
  * @license APACHE v2.0 (see license file)
  */
-#include <etk/types.h>
-#include <zeus/Buffer.h>
-#include <zeus/debug.h>
-#include <zeus/ParamType.h>
-#include <etk/stdTools.h>
-#include <zeus/BufferAnswer.h>
+#include <etk/types.hpp>
+#include <zeus/Buffer.hpp>
+#include <zeus/debug.hpp>
+#include <zeus/ParamType.hpp>
+#include <etk/stdTools.hpp>
+#include <zeus/BufferAnswer.hpp>
 
 void zeus::BufferAnswer::generateDisplay(std::ostream& _os) const {
 	zeus::Buffer::generateDisplay(_os);
diff --git a/zeus/BufferAnswer.h b/zeus/BufferAnswer.hpp
similarity index 95%
rename from zeus/BufferAnswer.h
rename to zeus/BufferAnswer.hpp
index 3e10fca..9e96e83 100644
--- a/zeus/BufferAnswer.h
+++ b/zeus/BufferAnswer.hpp
@@ -4,10 +4,10 @@
  * @license APACHE v2.0 (see license file)
  */
 #pragma once
-#include <etk/types.h>
-#include <enet/WebSocket.h>
-#include <zeus/ParamType.h>
-#include <zeus/BufferParameter.h>
+#include <etk/types.hpp>
+#include <enet/WebSocket.hpp>
+#include <zeus/ParamType.hpp>
+#include <zeus/BufferParameter.hpp>
 
 namespace zeus {
 
diff --git a/zeus/BufferCall.cpp b/zeus/BufferCall.cpp
index ee6903a..4aa76f5 100644
--- a/zeus/BufferCall.cpp
+++ b/zeus/BufferCall.cpp
@@ -3,12 +3,12 @@
  * @copyright 2016, Edouard DUPIN, all right reserved
  * @license APACHE v2.0 (see license file)
  */
-#include <etk/types.h>
-#include <zeus/Buffer.h>
-#include <zeus/debug.h>
-#include <zeus/ParamType.h>
-#include <etk/stdTools.h>
-#include <zeus/BufferCall.h>
+#include <etk/types.hpp>
+#include <zeus/Buffer.hpp>
+#include <zeus/debug.hpp>
+#include <zeus/ParamType.hpp>
+#include <etk/stdTools.hpp>
+#include <zeus/BufferCall.hpp>
 
 void zeus::BufferCall::generateDisplay(std::ostream& _os) const {
 	zeus::Buffer::generateDisplay(_os);
diff --git a/zeus/BufferCall.h b/zeus/BufferCall.hpp
similarity index 91%
rename from zeus/BufferCall.h
rename to zeus/BufferCall.hpp
index 0367fae..01525fe 100644
--- a/zeus/BufferCall.h
+++ b/zeus/BufferCall.hpp
@@ -4,10 +4,10 @@
  * @license APACHE v2.0 (see license file)
  */
 #pragma once
-#include <etk/types.h>
-#include <enet/WebSocket.h>
-#include <zeus/ParamType.h>
-#include <zeus/BufferParameter.h>
+#include <etk/types.hpp>
+#include <enet/WebSocket.hpp>
+#include <zeus/ParamType.hpp>
+#include <zeus/BufferParameter.hpp>
 
 namespace zeus {
 
diff --git a/zeus/BufferData.cpp b/zeus/BufferData.cpp
index c0afa44..7b2e489 100644
--- a/zeus/BufferData.cpp
+++ b/zeus/BufferData.cpp
@@ -3,12 +3,12 @@
  * @copyright 2016, Edouard DUPIN, all right reserved
  * @license APACHE v2.0 (see license file)
  */
-#include <etk/types.h>
-#include <zeus/Buffer.h>
-#include <zeus/debug.h>
-#include <zeus/ParamType.h>
-#include <etk/stdTools.h>
-#include <zeus/BufferData.h>
+#include <etk/types.hpp>
+#include <zeus/Buffer.hpp>
+#include <zeus/debug.hpp>
+#include <zeus/ParamType.hpp>
+#include <etk/stdTools.hpp>
+#include <zeus/BufferData.hpp>
 
 void zeus::BufferData::generateDisplay(std::ostream& _os) const {
 	zeus::Buffer::generateDisplay(_os);
diff --git a/zeus/BufferData.h b/zeus/BufferData.hpp
similarity index 94%
rename from zeus/BufferData.h
rename to zeus/BufferData.hpp
index 9370f51..acc161a 100644
--- a/zeus/BufferData.h
+++ b/zeus/BufferData.hpp
@@ -4,10 +4,10 @@
  * @license APACHE v2.0 (see license file)
  */
 #pragma once
-#include <etk/types.h>
-#include <enet/WebSocket.h>
-#include <zeus/ParamType.h>
-#include <zeus/Buffer.h>
+#include <etk/types.hpp>
+#include <enet/WebSocket.hpp>
+#include <zeus/ParamType.hpp>
+#include <zeus/Buffer.hpp>
 
 namespace zeus {
 
diff --git a/zeus/BufferEvent.cpp b/zeus/BufferEvent.cpp
index bbfcaf2..7b6697e 100644
--- a/zeus/BufferEvent.cpp
+++ b/zeus/BufferEvent.cpp
@@ -3,12 +3,12 @@
  * @copyright 2016, Edouard DUPIN, all right reserved
  * @license APACHE v2.0 (see license file)
  */
-#include <etk/types.h>
-#include <zeus/Buffer.h>
-#include <zeus/debug.h>
-#include <zeus/ParamType.h>
-#include <etk/stdTools.h>
-#include <zeus/BufferEvent.h>
+#include <etk/types.hpp>
+#include <zeus/Buffer.hpp>
+#include <zeus/debug.hpp>
+#include <zeus/ParamType.hpp>
+#include <etk/stdTools.hpp>
+#include <zeus/BufferEvent.hpp>
 
 /*
 // ------------------------------------------------------------------------------------
diff --git a/zeus/BufferEvent.h b/zeus/BufferEvent.hpp
similarity index 91%
rename from zeus/BufferEvent.h
rename to zeus/BufferEvent.hpp
index c0d022c..220acdf 100644
--- a/zeus/BufferEvent.h
+++ b/zeus/BufferEvent.hpp
@@ -4,9 +4,9 @@
  * @license APACHE v2.0 (see license file)
  */
 #pragma once
-#include <etk/types.h>
-#include <enet/WebSocket.h>
-#include <zeus/ParamType.h>
+#include <etk/types.hpp>
+#include <enet/WebSocket.hpp>
+#include <zeus/ParamType.hpp>
 
 namespace zeus {
 
diff --git a/zeus/BufferFlow.cpp b/zeus/BufferFlow.cpp
index 4257037..e8458f1 100644
--- a/zeus/BufferFlow.cpp
+++ b/zeus/BufferFlow.cpp
@@ -3,12 +3,12 @@
  * @copyright 2016, Edouard DUPIN, all right reserved
  * @license APACHE v2.0 (see license file)
  */
-#include <etk/types.h>
-#include <zeus/Buffer.h>
-#include <zeus/debug.h>
-#include <zeus/ParamType.h>
-#include <etk/stdTools.h>
-#include <zeus/BufferFlow.h>
+#include <etk/types.hpp>
+#include <zeus/Buffer.hpp>
+#include <zeus/debug.hpp>
+#include <zeus/ParamType.hpp>
+#include <etk/stdTools.hpp>
+#include <zeus/BufferFlow.hpp>
 
 /*
 // ------------------------------------------------------------------------------------
diff --git a/zeus/BufferFlow.h b/zeus/BufferFlow.hpp
similarity index 91%
rename from zeus/BufferFlow.h
rename to zeus/BufferFlow.hpp
index 3a156fc..7383560 100644
--- a/zeus/BufferFlow.h
+++ b/zeus/BufferFlow.hpp
@@ -4,9 +4,9 @@
  * @license APACHE v2.0 (see license file)
  */
 #pragma once
-#include <etk/types.h>
-#include <enet/WebSocket.h>
-#include <zeus/ParamType.h>
+#include <etk/types.hpp>
+#include <enet/WebSocket.hpp>
+#include <zeus/ParamType.hpp>
 
 namespace zeus {
 
diff --git a/zeus/BufferParameter.cpp b/zeus/BufferParameter.cpp
index 076f3de..475229a 100644
--- a/zeus/BufferParameter.cpp
+++ b/zeus/BufferParameter.cpp
@@ -3,14 +3,14 @@
  * @copyright 2016, Edouard DUPIN, all right reserved
  * @license APACHE v2.0 (see license file)
  */
-#include <etk/types.h>
-#include <zeus/Buffer.h>
-#include <zeus/BufferData.h>
-#include <zeus/debug.h>
-#include <zeus/ParamType.h>
-#include <etk/stdTools.h>
-#include <zeus/BufferParameter.h>
-#include <zeus/File.h>
+#include <etk/types.hpp>
+#include <zeus/Buffer.hpp>
+#include <zeus/BufferData.hpp>
+#include <zeus/debug.hpp>
+#include <zeus/ParamType.hpp>
+#include <etk/stdTools.hpp>
+#include <zeus/BufferParameter.hpp>
+#include <zeus/File.hpp>
 
 bool zeus::BufferParameter::writeOn(enet::WebSocket& _interface) {
 	uint8_t* data = nullptr;
diff --git a/zeus/BufferParameter.h b/zeus/BufferParameter.hpp
similarity index 96%
rename from zeus/BufferParameter.h
rename to zeus/BufferParameter.hpp
index e264509..2d94b7e 100644
--- a/zeus/BufferParameter.h
+++ b/zeus/BufferParameter.hpp
@@ -4,9 +4,9 @@
  * @license APACHE v2.0 (see license file)
  */
 #pragma once
-#include <etk/types.h>
-#include <enet/WebSocket.h>
-#include <zeus/ParamType.h>
+#include <etk/types.hpp>
+#include <enet/WebSocket.hpp>
+#include <zeus/ParamType.hpp>
 
 namespace zeus {
 
diff --git a/zeus/BufferParameter_addParameter.cpp b/zeus/BufferParameter_addParameter.cpp
index c73b91c..dbcd62b 100644
--- a/zeus/BufferParameter_addParameter.cpp
+++ b/zeus/BufferParameter_addParameter.cpp
@@ -3,17 +3,17 @@
  * @copyright 2016, Edouard DUPIN, all right reserved
  * @license APACHE v2.0 (see license file)
  */
-#include <etk/types.h>
-#include <zeus/Buffer.h>
-#include <zeus/BufferData.h>
-#include <zeus/debug.h>
-#include <zeus/ParamType.h>
-#include <etk/stdTools.h>
-#include <zeus/AbstractFunction.h>
+#include <etk/types.hpp>
+#include <zeus/Buffer.hpp>
+#include <zeus/BufferData.hpp>
+#include <zeus/debug.hpp>
+#include <zeus/ParamType.hpp>
+#include <etk/stdTools.hpp>
+#include <zeus/AbstractFunction.hpp>
 #include <climits>
-#include <etk/os/FSNode.h>
-#include <zeus/mineType.h>
-#include <zeus/WebServer.h>
+#include <etk/os/FSNode.hpp>
+#include <zeus/mineType.hpp>
+#include <zeus/WebServer.hpp>
 
 
 void zeus::addType(std::vector<uint8_t>& _data, zeus::ParamType _type) {
diff --git a/zeus/BufferParameter_getParameter.cpp b/zeus/BufferParameter_getParameter.cpp
index 9e4afb1..033317f 100644
--- a/zeus/BufferParameter_getParameter.cpp
+++ b/zeus/BufferParameter_getParameter.cpp
@@ -3,12 +3,12 @@
  * @copyright 2016, Edouard DUPIN, all right reserved
  * @license APACHE v2.0 (see license file)
  */
-#include <etk/types.h>
-#include <zeus/Buffer.h>
-#include <zeus/debug.h>
-#include <zeus/ParamType.h>
-#include <etk/stdTools.h>
-#include <zeus/AbstractFunction.h>
+#include <etk/types.hpp>
+#include <zeus/Buffer.hpp>
+#include <zeus/debug.hpp>
+#include <zeus/ParamType.hpp>
+#include <etk/stdTools.hpp>
+#include <zeus/AbstractFunction.hpp>
 #include <climits>
 namespace zeus {
 	template<>
diff --git a/zeus/Client.cpp b/zeus/Client.cpp
index 8593725..9ebd7a1 100644
--- a/zeus/Client.cpp
+++ b/zeus/Client.cpp
@@ -4,9 +4,9 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <enet/TcpClient.h>
-#include <zeus/Client.h>
-#include <zeus/debug.h>
+#include <enet/TcpClient.hpp>
+#include <zeus/Client.hpp>
+#include <zeus/debug.hpp>
 
 #include <unistd.h>
 
diff --git a/zeus/Client.h b/zeus/Client.hpp
similarity index 96%
rename from zeus/Client.h
rename to zeus/Client.hpp
index d1fab1d..20f63a8 100644
--- a/zeus/Client.h
+++ b/zeus/Client.hpp
@@ -5,13 +5,13 @@
  */
 #pragma once
 
-#include <zeus/WebServer.h>
-#include <eproperty/Value.h>
-#include <zeus/debug.h>
+#include <zeus/WebServer.hpp>
+#include <eproperty/Value.hpp>
+#include <zeus/debug.hpp>
 #include <chrono>
-#include <unistd.h>
-#include <zeus/Future.h>
-#include <zeus/ServiceRemote.h>
+#include <unistd.hpp>
+#include <zeus/Future.hpp>
+#include <zeus/ServiceRemote.hpp>
 
 namespace zeus {
 	/**
diff --git a/zeus/File.cpp b/zeus/File.cpp
index 7748ce8..40f908d 100644
--- a/zeus/File.cpp
+++ b/zeus/File.cpp
@@ -3,12 +3,12 @@
  * @copyright 2016, Edouard DUPIN, all right reserved
  * @license APACHE v2.0 (see license file)
  */
-#include <zeus/File.h>
-#include <zeus/debug.h>
-#include <etk/types.h>
-#include <etk/stdTools.h>
-#include <zeus/mineType.h>
-#include <etk/os/FSNode.h>
+#include <zeus/File.hpp>
+#include <zeus/debug.hpp>
+#include <etk/types.hpp>
+#include <etk/stdTools.hpp>
+#include <zeus/mineType.hpp>
+#include <etk/os/FSNode.hpp>
 #include <string.h>
 
 
diff --git a/zeus/File.h b/zeus/File.hpp
similarity index 99%
rename from zeus/File.h
rename to zeus/File.hpp
index 7990bfc..c6c4629 100644
--- a/zeus/File.h
+++ b/zeus/File.hpp
@@ -4,7 +4,7 @@
  * @license APACHE v2.0 (see license file)
  */
 #pragma once
-#include <etk/types.h>
+#include <etk/types.hpp>
 
 namespace zeus {
 	/**
diff --git a/zeus/Future.cpp b/zeus/Future.cpp
index adf30e8..a5b5aa7 100644
--- a/zeus/Future.cpp
+++ b/zeus/Future.cpp
@@ -3,11 +3,11 @@
  * @copyright 2014, Edouard DUPIN, all right reserved
  * @license APACHE v2.0 (see license file)
  */
-#include <zeus/Future.h>
-#include <zeus/BufferAnswer.h>
-#include <zeus/debug.h>
+#include <zeus/Future.hpp>
+#include <zeus/BufferAnswer.hpp>
+#include <zeus/debug.hpp>
 #include <unistd.h>
-#include <zeus/File.h>
+#include <zeus/File.hpp>
 
 namespace zeus {
 	template<>
diff --git a/zeus/Future.h b/zeus/Future.hpp
similarity index 98%
rename from zeus/Future.h
rename to zeus/Future.hpp
index 3264d83..842e739 100644
--- a/zeus/Future.h
+++ b/zeus/Future.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <zeus/FutureBase.h>
+#include <zeus/FutureBase.hpp>
 
 namespace zeus {
 	/**
diff --git a/zeus/FutureBase.cpp b/zeus/FutureBase.cpp
index 9fd7cb5..20ce268 100644
--- a/zeus/FutureBase.cpp
+++ b/zeus/FutureBase.cpp
@@ -3,9 +3,9 @@
  * @copyright 2014, Edouard DUPIN, all right reserved
  * @license APACHE v2.0 (see license file)
  */
-#include <zeus/FutureBase.h>
-#include <zeus/BufferAnswer.h>
-#include <zeus/debug.h>
+#include <zeus/FutureBase.hpp>
+#include <zeus/BufferAnswer.hpp>
+#include <zeus/debug.hpp>
 #include <unistd.h>
 
 zeus::FutureBase::FutureBase(const zeus::FutureBase& _base):
diff --git a/zeus/FutureBase.h b/zeus/FutureBase.hpp
similarity index 99%
rename from zeus/FutureBase.h
rename to zeus/FutureBase.hpp
index db045d3..956aed2 100644
--- a/zeus/FutureBase.h
+++ b/zeus/FutureBase.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <zeus/FutureData.h>
+#include <zeus/FutureData.hpp>
 
 namespace zeus {
 	/**
diff --git a/zeus/FutureData.h b/zeus/FutureData.hpp
similarity index 92%
rename from zeus/FutureData.h
rename to zeus/FutureData.hpp
index 3df12e2..93050ad 100644
--- a/zeus/FutureData.h
+++ b/zeus/FutureData.hpp
@@ -5,10 +5,10 @@
  */
 #pragma once
 
-#include <etk/types.h>
-#include <zeus/Buffer.h>
+#include <etk/types.hpp>
+#include <zeus/Buffer.hpp>
 #include <functional>
-#include <ememory/memory.h>
+#include <ememory/memory.hpp>
 
 
 namespace zeus {
diff --git a/zeus/ParamType.cpp b/zeus/ParamType.cpp
index 8e9fff5..5d08173 100644
--- a/zeus/ParamType.cpp
+++ b/zeus/ParamType.cpp
@@ -4,9 +4,9 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <zeus/ParamType.h>
-#include <zeus/debug.h>
-#include <zeus/File.h>
+#include <zeus/ParamType.hpp>
+#include <zeus/debug.hpp>
+#include <zeus/File.hpp>
 
 
 bool zeus::checkCompatibility(const ParamType& _type, const ParamType& _params) {
diff --git a/zeus/ParamType.h b/zeus/ParamType.hpp
similarity index 100%
rename from zeus/ParamType.h
rename to zeus/ParamType.hpp
diff --git a/zeus/RemoteProcessCall.cpp b/zeus/RemoteProcessCall.cpp
index a24612d..f43467a 100644
--- a/zeus/RemoteProcessCall.cpp
+++ b/zeus/RemoteProcessCall.cpp
@@ -3,7 +3,7 @@
  * @copyright 2016, Edouard DUPIN, all right reserved
  * @license APACHE v2.0 (see license file)
  */
-#include <zeus/RemoteProcessCall.h>
+#include <zeus/RemoteProcessCall.hpp>
 
 zeus::RemoteProcessCall::RemoteProcessCall() :
   m_type("UNKNOW"){
diff --git a/zeus/RemoteProcessCall.h b/zeus/RemoteProcessCall.hpp
similarity index 97%
rename from zeus/RemoteProcessCall.h
rename to zeus/RemoteProcessCall.hpp
index a6e80d3..ee0ce0a 100644
--- a/zeus/RemoteProcessCall.h
+++ b/zeus/RemoteProcessCall.hpp
@@ -5,10 +5,10 @@
  */
 #pragma once
 
-#include <zeus/WebServer.h>
-#include <zeus/AbstractFunctionTypeDirect.h>
-#include <zeus/AbstractFunctionTypeClass.h>
-#include <zeus/debug.h>
+#include <zeus/WebServer.hpp>
+#include <zeus/AbstractFunctionTypeDirect.hpp>
+#include <zeus/AbstractFunctionTypeClass.hpp>
+#include <zeus/debug.hpp>
 
 namespace zeus {
 	/**
diff --git a/zeus/Service.cpp b/zeus/Service.cpp
index 36c2440..a85d78d 100644
--- a/zeus/Service.cpp
+++ b/zeus/Service.cpp
@@ -4,10 +4,10 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <zeus/Service.h>
-#include <zeus/debug.h>
-#include <etk/stdTools.h>
-#include <enet/TcpClient.h>
+#include <zeus/Service.hpp>
+#include <zeus/debug.hpp>
+#include <etk/stdTools.hpp>
+#include <enet/TcpClient.hpp>
 
 #include <unistd.h>
 
diff --git a/zeus/Service.h b/zeus/Service.hpp
similarity index 97%
rename from zeus/Service.h
rename to zeus/Service.hpp
index 9084783..85d7540 100644
--- a/zeus/Service.h
+++ b/zeus/Service.hpp
@@ -5,13 +5,13 @@
  */
 #pragma once
 
-#include <zeus/WebServer.h>
-#include <eproperty/Value.h>
-#include <zeus/AbstractFunctionTypeDirect.h>
-#include <zeus/AbstractFunctionTypeClass.h>
-#include <zeus/debug.h>
-#include <zeus/RemoteProcessCall.h>
-#include <zeus/Future.h>
+#include <zeus/WebServer.hpp>
+#include <eproperty/Value.hpp>
+#include <zeus/AbstractFunctionTypeDirect.hpp>
+#include <zeus/AbstractFunctionTypeClass.hpp>
+#include <zeus/debug.hpp>
+#include <zeus/RemoteProcessCall.hpp>
+#include <zeus/Future.hpp>
 
 /**
  * @brief Main zeus library namespace
diff --git a/zeus/ServiceRemote.cpp b/zeus/ServiceRemote.cpp
index 269f05b..452b91f 100644
--- a/zeus/ServiceRemote.cpp
+++ b/zeus/ServiceRemote.cpp
@@ -4,8 +4,8 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <zeus/ServiceRemote.h>
-#include <zeus/Client.h>
+#include <zeus/ServiceRemote.hpp>
+#include <zeus/Client.hpp>
 
 zeus::ServiceRemote::ServiceRemote(ememory::SharedPtr<zeus::WebServer> _clientLink, const std::string& _name):
   m_interfaceClient(_clientLink),
diff --git a/zeus/ServiceRemote.h b/zeus/ServiceRemote.hpp
similarity index 91%
rename from zeus/ServiceRemote.h
rename to zeus/ServiceRemote.hpp
index 717beed..109106a 100644
--- a/zeus/ServiceRemote.h
+++ b/zeus/ServiceRemote.hpp
@@ -5,12 +5,12 @@
  */
 #pragma once
 
-#include <zeus/WebServer.h>
-#include <zeus/debug.h>
-#include <zeus/AbstractFunction.h>
-#include <zeus/ServiceRemote.h>
-#include <zeus/Future.h>
-#include <zeus/WebServer.h>
+#include <zeus/WebServer.hpp>
+#include <zeus/debug.hpp>
+#include <zeus/AbstractFunction.hpp>
+#include <zeus/ServiceRemote.hpp>
+#include <zeus/Future.hpp>
+#include <zeus/WebServer.hpp>
 
 namespace zeus {
 	class Client;
diff --git a/zeus/WebServer.cpp b/zeus/WebServer.cpp
index 480b56b..419a118 100644
--- a/zeus/WebServer.cpp
+++ b/zeus/WebServer.cpp
@@ -3,11 +3,11 @@
  * @copyright 2016, Edouard DUPIN, all right reserved
  * @license APACHE v2.0 (see license file)
  */
-#include <zeus/WebServer.h>
-#include <zeus/debug.h>
-#include <ethread/tools.h>
-#include <unistd.h>
-#include <zeus/BufferData.h>
+#include <zeus/WebServer.hpp>
+#include <zeus/debug.hpp>
+#include <ethread/tools.hpp>
+#include <unistd.hpp>
+#include <zeus/BufferData.hpp>
 
 
 ememory::SharedPtr<zeus::BufferCall> zeus::createBaseCall(uint64_t _transactionId, const std::string& _functionName, const uint32_t& _serviceId) {
diff --git a/zeus/WebServer.h b/zeus/WebServer.hpp
similarity index 98%
rename from zeus/WebServer.h
rename to zeus/WebServer.hpp
index fb62ee7..b776f53 100644
--- a/zeus/WebServer.h
+++ b/zeus/WebServer.hpp
@@ -4,13 +4,13 @@
  * @license APACHE v2.0 (see license file)
  */
 #pragma once
-#include <zeus/Buffer.h>
-#include <zeus/BufferAnswer.h>
-#include <enet/WebSocket.h>
+#include <zeus/Buffer.hpp>
+#include <zeus/BufferAnswer.hpp>
+#include <enet/WebSocket.hpp>
 #include <thread>
-#include <ememory/memory.h>
-#include <zeus/AbstractFunction.h>
-#include <zeus/FutureBase.h>
+#include <ememory/memory.hpp>
+#include <zeus/AbstractFunction.hpp>
+#include <zeus/FutureBase.hpp>
 
 namespace zeus {
 	/**
diff --git a/zeus/debug.cpp b/zeus/debug.cpp
index b992e59..652f75a 100644
--- a/zeus/debug.cpp
+++ b/zeus/debug.cpp
@@ -4,7 +4,7 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <zeus/debug.h>
+#include <zeus/debug.hpp>
 
 int32_t zeus::getLogId() {
 	static int32_t g_val = elog::registerInstance("zeus");
diff --git a/zeus/debug.h b/zeus/debug.hpp
similarity index 97%
rename from zeus/debug.h
rename to zeus/debug.hpp
index 68585fb..539b61b 100644
--- a/zeus/debug.h
+++ b/zeus/debug.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <elog/log.h>
+#include <elog/log.hpp>
 
 namespace zeus {
 	int32_t getLogId();
diff --git a/zeus/mineType.cpp b/zeus/mineType.cpp
index 3880a54..93abe7a 100644
--- a/zeus/mineType.cpp
+++ b/zeus/mineType.cpp
@@ -4,8 +4,8 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <zeus/mineType.h>
-#include <zeus/debug.h>
+#include <zeus/mineType.hpp>
+#include <zeus/debug.hpp>
 
 
 static std::vector<std::pair<std::string, std::string>> mineList = {
diff --git a/zeus/mineType.h b/zeus/mineType.hpp
similarity index 96%
rename from zeus/mineType.h
rename to zeus/mineType.hpp
index d00c6e4..9ffc33d 100644
--- a/zeus/mineType.h
+++ b/zeus/mineType.hpp
@@ -4,7 +4,7 @@
  * @license APACHE v2.0 (see license file)
  */
 #pragma once
-#include <etk/types.h>
+#include <etk/types.hpp>
 
 namespace zeus {
 	/**