diff --git a/server/modules/protocol/CDC/CMakeLists.txt b/server/modules/protocol/CDC/CMakeLists.txt
new file mode 100644
index 000000000..4d6d2deb8
--- /dev/null
+++ b/server/modules/protocol/CDC/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_library(CDC SHARED cdc.c)
+target_link_libraries(CDC maxscale-common)
+set_target_properties(CDC PROPERTIES VERSION "1.0.1")
+install_module(CDC core)
diff --git a/server/modules/protocol/cdc.c b/server/modules/protocol/CDC/cdc.c
similarity index 100%
rename from server/modules/protocol/cdc.c
rename to server/modules/protocol/CDC/cdc.c
diff --git a/server/modules/protocol/CMakeLists.txt b/server/modules/protocol/CMakeLists.txt
index abdc3f233..eb2dc0482 100644
--- a/server/modules/protocol/CMakeLists.txt
+++ b/server/modules/protocol/CMakeLists.txt
@@ -1,37 +1,14 @@
-add_library(MySQLClient SHARED mysql_client.c mysql_common.c)
-target_link_libraries(MySQLClient maxscale-common  MySQLAuth)
-set_target_properties(MySQLClient PROPERTIES VERSION "1.0.0")
-install_module(MySQLClient core)
+if(BUILD_CDC)
+  add_subdirectory(CDC)
+endif()
 
-add_library(MySQLBackend SHARED mysql_backend.c mysql_common.c)
-target_link_libraries(MySQLBackend maxscale-common MySQLAuth)
-set_target_properties(MySQLBackend PROPERTIES VERSION "2.0.0")
-install_module(MySQLBackend core)
+add_subdirectory(HTTPD)
+add_subdirectory(maxscaled)
+add_subdirectory(MySQLBackend)
+add_subdirectory(MySQLClient)
+add_subdirectory(telnetd)
 
-add_library(telnetd SHARED telnetd.c)
-target_link_libraries(telnetd maxscale-common)
-set_target_properties(telnetd PROPERTIES VERSION "1.0.1")
-install_module(telnetd core)
-
-add_library(HTTPD SHARED httpd.c)
-target_link_libraries(HTTPD maxscale-common)
-set_target_properties(HTTPD PROPERTIES VERSION "1.0.1")
-install_module(HTTPD core)
 
 if(BUILD_TESTS)
-  add_library(testprotocol SHARED testprotocol.c)
-  set_target_properties(testprotocol PROPERTIES VERSION "1.0.0")
-  install_module(testprotocol core)
-endif()
-
-add_library(maxscaled SHARED maxscaled.c)
-target_link_libraries(maxscaled maxscale-common)
-set_target_properties(maxscaled PROPERTIES VERSION "1.0.0")
-install_module(maxscaled core)
-
-if(BUILD_CDC)
-  add_library(CDC SHARED cdc.c)
-  target_link_libraries(CDC maxscale-common)
-  set_target_properties(CDC PROPERTIES VERSION "1.0.1")
-  install_module(CDC core)
+  add_subdirectory(testprotocol)
 endif()
diff --git a/server/modules/protocol/HTTPD/CMakeLists.txt b/server/modules/protocol/HTTPD/CMakeLists.txt
new file mode 100644
index 000000000..bcecd1b3e
--- /dev/null
+++ b/server/modules/protocol/HTTPD/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_library(HTTPD SHARED httpd.c)
+target_link_libraries(HTTPD maxscale-common)
+set_target_properties(HTTPD PROPERTIES VERSION "1.0.1")
+install_module(HTTPD core)
diff --git a/server/modules/protocol/httpd.c b/server/modules/protocol/HTTPD/httpd.c
similarity index 100%
rename from server/modules/protocol/httpd.c
rename to server/modules/protocol/HTTPD/httpd.c
diff --git a/server/modules/protocol/MySQLBackend/CMakeLists.txt b/server/modules/protocol/MySQLBackend/CMakeLists.txt
new file mode 100644
index 000000000..f23cb071b
--- /dev/null
+++ b/server/modules/protocol/MySQLBackend/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_library(MySQLBackend SHARED mysql_backend.c ../mysql_common.c)
+target_link_libraries(MySQLBackend maxscale-common MySQLAuth)
+set_target_properties(MySQLBackend PROPERTIES VERSION "2.0.0")
+install_module(MySQLBackend core)
diff --git a/server/modules/protocol/mysql_backend.c b/server/modules/protocol/MySQLBackend/mysql_backend.c
similarity index 100%
rename from server/modules/protocol/mysql_backend.c
rename to server/modules/protocol/MySQLBackend/mysql_backend.c
diff --git a/server/modules/protocol/MySQLClient/CMakeLists.txt b/server/modules/protocol/MySQLClient/CMakeLists.txt
new file mode 100644
index 000000000..6a250cea0
--- /dev/null
+++ b/server/modules/protocol/MySQLClient/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_library(MySQLClient SHARED mysql_client.c ../mysql_common.c)
+target_link_libraries(MySQLClient maxscale-common  MySQLAuth)
+set_target_properties(MySQLClient PROPERTIES VERSION "1.0.0")
+install_module(MySQLClient core)
diff --git a/server/modules/protocol/mysql_client.c b/server/modules/protocol/MySQLClient/mysql_client.c
similarity index 100%
rename from server/modules/protocol/mysql_client.c
rename to server/modules/protocol/MySQLClient/mysql_client.c
diff --git a/server/modules/protocol/maxscaled/CMakeLists.txt b/server/modules/protocol/maxscaled/CMakeLists.txt
new file mode 100644
index 000000000..6ae8580a2
--- /dev/null
+++ b/server/modules/protocol/maxscaled/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_library(maxscaled SHARED maxscaled.c)
+target_link_libraries(maxscaled maxscale-common)
+set_target_properties(maxscaled PROPERTIES VERSION "1.0.0")
+install_module(maxscaled core)
diff --git a/server/modules/protocol/maxscaled.c b/server/modules/protocol/maxscaled/maxscaled.c
similarity index 100%
rename from server/modules/protocol/maxscaled.c
rename to server/modules/protocol/maxscaled/maxscaled.c
diff --git a/server/modules/protocol/telnetd/CMakeLists.txt b/server/modules/protocol/telnetd/CMakeLists.txt
new file mode 100644
index 000000000..a2ddfdaf7
--- /dev/null
+++ b/server/modules/protocol/telnetd/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_library(telnetd SHARED telnetd.c)
+target_link_libraries(telnetd maxscale-common)
+set_target_properties(telnetd PROPERTIES VERSION "1.0.1")
+install_module(telnetd core)
diff --git a/server/modules/protocol/telnetd.c b/server/modules/protocol/telnetd/telnetd.c
similarity index 100%
rename from server/modules/protocol/telnetd.c
rename to server/modules/protocol/telnetd/telnetd.c
diff --git a/server/modules/protocol/testprotocol/CMakeLists.txt b/server/modules/protocol/testprotocol/CMakeLists.txt
new file mode 100644
index 000000000..2e6b401e0
--- /dev/null
+++ b/server/modules/protocol/testprotocol/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_library(testprotocol SHARED testprotocol.c)
+set_target_properties(testprotocol PROPERTIES VERSION "1.0.0")
+install_module(testprotocol core)
diff --git a/server/modules/protocol/testprotocol.c b/server/modules/protocol/testprotocol/testprotocol.c
similarity index 100%
rename from server/modules/protocol/testprotocol.c
rename to server/modules/protocol/testprotocol/testprotocol.c