diff --git a/tools/system-gateway/appl/ClientInterface.cpp b/tools/gateway/appl/ClientInterface.cpp
similarity index 100%
rename from tools/system-gateway/appl/ClientInterface.cpp
rename to tools/gateway/appl/ClientInterface.cpp
diff --git a/tools/system-gateway/appl/ClientInterface.hpp b/tools/gateway/appl/ClientInterface.hpp
similarity index 100%
rename from tools/system-gateway/appl/ClientInterface.hpp
rename to tools/gateway/appl/ClientInterface.hpp
diff --git a/tools/system-gateway/appl/GateWay.cpp b/tools/gateway/appl/GateWay.cpp
similarity index 100%
rename from tools/system-gateway/appl/GateWay.cpp
rename to tools/gateway/appl/GateWay.cpp
diff --git a/tools/system-gateway/appl/GateWay.hpp b/tools/gateway/appl/GateWay.hpp
similarity index 100%
rename from tools/system-gateway/appl/GateWay.hpp
rename to tools/gateway/appl/GateWay.hpp
diff --git a/tools/system-gateway/appl/ServiceInterface.cpp b/tools/gateway/appl/ServiceInterface.cpp
similarity index 100%
rename from tools/system-gateway/appl/ServiceInterface.cpp
rename to tools/gateway/appl/ServiceInterface.cpp
diff --git a/tools/system-gateway/appl/ServiceInterface.hpp b/tools/gateway/appl/ServiceInterface.hpp
similarity index 100%
rename from tools/system-gateway/appl/ServiceInterface.hpp
rename to tools/gateway/appl/ServiceInterface.hpp
diff --git a/tools/system-gateway/appl/debug.cpp b/tools/gateway/appl/debug.cpp
similarity index 100%
rename from tools/system-gateway/appl/debug.cpp
rename to tools/gateway/appl/debug.cpp
diff --git a/tools/picture/appl/debug.hpp b/tools/gateway/appl/debug.hpp
similarity index 100%
rename from tools/picture/appl/debug.hpp
rename to tools/gateway/appl/debug.hpp
diff --git a/tools/system-gateway/appl/main.cpp b/tools/gateway/appl/main.cpp
similarity index 100%
rename from tools/system-gateway/appl/main.cpp
rename to tools/gateway/appl/main.cpp
diff --git a/tools/system-gateway/lutin_zeus-gateway.py b/tools/gateway/lutin_zeus-gateway.py
similarity index 100%
rename from tools/system-gateway/lutin_zeus-gateway.py
rename to tools/gateway/lutin_zeus-gateway.py
diff --git a/tools/picture/appl/debug.cpp b/tools/service-picture/appl/debug.cpp
similarity index 100%
rename from tools/picture/appl/debug.cpp
rename to tools/service-picture/appl/debug.cpp
diff --git a/tools/system-gateway/appl/debug.hpp b/tools/service-picture/appl/debug.hpp
similarity index 100%
rename from tools/system-gateway/appl/debug.hpp
rename to tools/service-picture/appl/debug.hpp
diff --git a/tools/picture/appl/main.cpp b/tools/service-picture/appl/main.cpp
similarity index 100%
rename from tools/picture/appl/main.cpp
rename to tools/service-picture/appl/main.cpp
diff --git a/tools/picture/lutin_zeus-picture.py b/tools/service-picture/lutin_zeus-service-picture.py
similarity index 100%
rename from tools/picture/lutin_zeus-picture.py
rename to tools/service-picture/lutin_zeus-service-picture.py
diff --git a/tools/system-user/appl/debug.cpp b/tools/service-user/appl/debug.cpp
similarity index 100%
rename from tools/system-user/appl/debug.cpp
rename to tools/service-user/appl/debug.cpp
diff --git a/tools/system-user/appl/debug.hpp b/tools/service-user/appl/debug.hpp
similarity index 100%
rename from tools/system-user/appl/debug.hpp
rename to tools/service-user/appl/debug.hpp
diff --git a/tools/system-user/appl/main.cpp b/tools/service-user/appl/main.cpp
similarity index 100%
rename from tools/system-user/appl/main.cpp
rename to tools/service-user/appl/main.cpp
diff --git a/tools/system-user/lutin_zeus-system-user.py b/tools/service-user/lutin_zeus-service-user.py
similarity index 100%
rename from tools/system-user/lutin_zeus-system-user.py
rename to tools/service-user/lutin_zeus-service-user.py