diff --git a/include/villas/api/node_request.hpp b/include/villas/api/requests/node.hpp
similarity index 100%
rename from include/villas/api/node_request.hpp
rename to include/villas/api/requests/node.hpp
diff --git a/include/villas/api/path_request.hpp b/include/villas/api/requests/path.hpp
similarity index 100%
rename from include/villas/api/path_request.hpp
rename to include/villas/api/requests/path.hpp
diff --git a/lib/api/CMakeLists.txt b/lib/api/CMakeLists.txt
index 5bfb21fd0..7de37ef0e 100644
--- a/lib/api/CMakeLists.txt
+++ b/lib/api/CMakeLists.txt
@@ -24,10 +24,11 @@
 set(API_SRC
     session.cpp
     request.cpp
-    node_request.cpp
-    path_request.cpp
     response.cpp
 
+    requests/node.cpp
+    requests/path.cpp
+
     requests/status.cpp
     requests/capabiltities.cpp
     requests/config.cpp
diff --git a/lib/api/node_request.cpp b/lib/api/requests/node.cpp
similarity index 97%
rename from lib/api/node_request.cpp
rename to lib/api/requests/node.cpp
index 132d3002c..f632a359f 100644
--- a/lib/api/node_request.cpp
+++ b/lib/api/requests/node.cpp
@@ -21,7 +21,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *********************************************************************************/
 
-#include <villas/api/node_request.hpp>
+#include <villas/api/requests/node.hpp>
 
 using namespace villas::node::api;
 
diff --git a/lib/api/requests/node_action.cpp b/lib/api/requests/node_action.cpp
index 2861fba68..6d6d41811 100644
--- a/lib/api/requests/node_action.cpp
+++ b/lib/api/requests/node_action.cpp
@@ -27,7 +27,7 @@
 #include <villas/utils.hpp>
 #include <villas/api.hpp>
 #include <villas/api/session.hpp>
-#include <villas/api/node_request.hpp>
+#include <villas/api/requests/node.hpp>
 #include <villas/api/response.hpp>
 
 namespace villas {
diff --git a/lib/api/requests/node_file.cpp b/lib/api/requests/node_file.cpp
index d5d26ad1b..de1c37bab 100644
--- a/lib/api/requests/node_file.cpp
+++ b/lib/api/requests/node_file.cpp
@@ -22,7 +22,7 @@
 
 #include <villas/super_node.hpp>
 #include <villas/api/session.hpp>
-#include <villas/api/node_request.hpp>
+#include <villas/api/requests/node.hpp>
 #include <villas/api/response.hpp>
 
 #include <villas/node_compat.hpp>
diff --git a/lib/api/requests/node_info.cpp b/lib/api/requests/node_info.cpp
index 10fb6f166..82c7f0026 100644
--- a/lib/api/requests/node_info.cpp
+++ b/lib/api/requests/node_info.cpp
@@ -28,7 +28,7 @@
 #include <villas/utils.hpp>
 #include <villas/stats.hpp>
 #include <villas/api/session.hpp>
-#include <villas/api/node_request.hpp>
+#include <villas/api/requests/node.hpp>
 #include <villas/api/response.hpp>
 
 namespace villas {
diff --git a/lib/api/requests/node_stats.cpp b/lib/api/requests/node_stats.cpp
index 86b04e0c4..4aceeff2b 100644
--- a/lib/api/requests/node_stats.cpp
+++ b/lib/api/requests/node_stats.cpp
@@ -28,7 +28,7 @@
 #include <villas/utils.hpp>
 #include <villas/api.hpp>
 #include <villas/api/session.hpp>
-#include <villas/api/node_request.hpp>
+#include <villas/api/requests/node.hpp>
 #include <villas/api/response.hpp>
 
 namespace villas {
diff --git a/lib/api/requests/node_stats_reset.cpp b/lib/api/requests/node_stats_reset.cpp
index 380f11243..78dd9ad4e 100644
--- a/lib/api/requests/node_stats_reset.cpp
+++ b/lib/api/requests/node_stats_reset.cpp
@@ -28,7 +28,7 @@
 #include <villas/utils.hpp>
 #include <villas/api.hpp>
 #include <villas/api/session.hpp>
-#include <villas/api/node_request.hpp>
+#include <villas/api/requests/node.hpp>
 #include <villas/api/response.hpp>
 
 namespace villas {
diff --git a/lib/api/path_request.cpp b/lib/api/requests/path.cpp
similarity index 97%
rename from lib/api/path_request.cpp
rename to lib/api/requests/path.cpp
index 2e3e8a96c..d6c56d8a1 100644
--- a/lib/api/path_request.cpp
+++ b/lib/api/requests/path.cpp
@@ -21,7 +21,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *********************************************************************************/
 
-#include <villas/api/path_request.hpp>
+#include <villas/api/requests/path.hpp>
 #include <villas/path.hpp>
 
 using namespace villas::node::api;
diff --git a/lib/api/requests/path_action.cpp b/lib/api/requests/path_action.cpp
index 2458858f4..709b44984 100644
--- a/lib/api/requests/path_action.cpp
+++ b/lib/api/requests/path_action.cpp
@@ -27,7 +27,7 @@
 #include <villas/utils.hpp>
 #include <villas/api.hpp>
 #include <villas/api/session.hpp>
-#include <villas/api/path_request.hpp>
+#include <villas/api/requests/path.hpp>
 #include <villas/api/response.hpp>
 
 namespace villas {
diff --git a/lib/api/requests/path_info.cpp b/lib/api/requests/path_info.cpp
index 151f0242c..4c427c898 100644
--- a/lib/api/requests/path_info.cpp
+++ b/lib/api/requests/path_info.cpp
@@ -28,7 +28,7 @@
 #include <villas/utils.hpp>
 #include <villas/stats.hpp>
 #include <villas/api/session.hpp>
-#include <villas/api/path_request.hpp>
+#include <villas/api/requests/path.hpp>
 #include <villas/api/response.hpp>
 
 namespace villas {