diff --git a/fairmq/CMakeLists.txt b/fairmq/CMakeLists.txt
index cec9f314..5c5a1903 100644
--- a/fairmq/CMakeLists.txt
+++ b/fairmq/CMakeLists.txt
@@ -176,7 +176,7 @@ if(BUILD_FAIRMQ)
   set(FAIRMQ_PRIVATE_HEADER_FILES
     plugins/Builtin.h
     plugins/config/Config.h
-    plugins/Control.h
+    plugins/control/Control.h
     shmem/Message.h
     shmem/Poller.h
     shmem/UnmanagedRegion.h
@@ -223,7 +223,7 @@ if(BUILD_FAIRMQ)
     Properties.cxx
     SuboptParser.cxx
     plugins/config/Config.cxx
-    plugins/Control.cxx
+    plugins/control/Control.cxx
     MemoryResources.cxx
     shmem/Monitor.cxx
   )
diff --git a/fairmq/plugins/Builtin.h b/fairmq/plugins/Builtin.h
index b95c573a..258ab0c0 100644
--- a/fairmq/plugins/Builtin.h
+++ b/fairmq/plugins/Builtin.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -9,4 +9,4 @@
 // List of all builtin plugin headers (the ones which call REGISTER_FAIRMQ_PLUGIN macro)
 
 #include <fairmq/plugins/config/Config.h>
-#include <fairmq/plugins/Control.h>
+#include <fairmq/plugins/control/Control.h>
diff --git a/fairmq/plugins/Control.cxx b/fairmq/plugins/control/Control.cxx
similarity index 100%
rename from fairmq/plugins/Control.cxx
rename to fairmq/plugins/control/Control.cxx
diff --git a/fairmq/plugins/Control.h b/fairmq/plugins/control/Control.h
similarity index 100%
rename from fairmq/plugins/Control.h
rename to fairmq/plugins/control/Control.h