diff --git a/server/modules/routing/CMakeLists.txt b/server/modules/routing/CMakeLists.txt
index 113deadbe..6fee3cb20 100644
--- a/server/modules/routing/CMakeLists.txt
+++ b/server/modules/routing/CMakeLists.txt
@@ -1,32 +1,17 @@
-if(BUILD_TESTS)
-  add_library(testroute SHARED testroute.c)
-  target_link_libraries(testroute maxscale-common)
-  set_target_properties(testroute PROPERTIES VERSION "1.0.0")
-  install_module(testroute core)
-endif()
-
-add_library(readconnroute SHARED readconnroute.c)
-target_link_libraries(readconnroute maxscale-common)
-set_target_properties(readconnroute PROPERTIES VERSION "1.1.0")
-install_module(readconnroute core)
-
-add_library(debugcli SHARED debugcli.c debugcmd.c)
-target_link_libraries(debugcli maxscale-common)
-set_target_properties(debugcli PROPERTIES VERSION "1.1.1")
-install_module(debugcli core)
-
-add_library(cli SHARED cli.c debugcmd.c)
-target_link_libraries(cli maxscale-common)
-set_target_properties(cli PROPERTIES VERSION "1.0.0")
-install_module(cli core)
-
-add_subdirectory(readwritesplit)
-add_subdirectory(schemarouter)
 if(BUILD_AVRO)
   add_subdirectory(avro)
 endif()
 if(BUILD_BINLOG)
   add_subdirectory(binlog)
 endif()
-add_subdirectory(maxinfo)
 
+add_subdirectory(cli)
+add_subdirectory(debugcli)
+add_subdirectory(maxinfo)
+add_subdirectory(readconnroute)
+add_subdirectory(readwritesplit)
+add_subdirectory(schemarouter)
+
+if(BUILD_TESTS)
+  add_subdirectory(testroute)
+endif()
diff --git a/server/modules/routing/cli/CMakeLists.txt b/server/modules/routing/cli/CMakeLists.txt
new file mode 100644
index 000000000..aff15d29a
--- /dev/null
+++ b/server/modules/routing/cli/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_library(cli SHARED cli.c ../debugcli/debugcmd.c)
+target_link_libraries(cli maxscale-common)
+set_target_properties(cli PROPERTIES VERSION "1.0.0")
+install_module(cli core)
diff --git a/server/modules/routing/cli.c b/server/modules/routing/cli/cli.c
similarity index 100%
rename from server/modules/routing/cli.c
rename to server/modules/routing/cli/cli.c
diff --git a/server/modules/routing/debugcli/CMakeLists.txt b/server/modules/routing/debugcli/CMakeLists.txt
new file mode 100644
index 000000000..f32ea459a
--- /dev/null
+++ b/server/modules/routing/debugcli/CMakeLists.txt
@@ -0,0 +1,5 @@
+add_library(debugcli SHARED debugcli.c debugcmd.c)
+target_link_libraries(debugcli maxscale-common)
+set_target_properties(debugcli PROPERTIES VERSION "1.1.1")
+install_module(debugcli core)
+
diff --git a/server/modules/routing/debugcli.c b/server/modules/routing/debugcli/debugcli.c
similarity index 100%
rename from server/modules/routing/debugcli.c
rename to server/modules/routing/debugcli/debugcli.c
diff --git a/server/modules/routing/debugcmd.c b/server/modules/routing/debugcli/debugcmd.c
similarity index 100%
rename from server/modules/routing/debugcmd.c
rename to server/modules/routing/debugcli/debugcmd.c
diff --git a/server/modules/routing/readconnroute/CMakeLists.txt b/server/modules/routing/readconnroute/CMakeLists.txt
new file mode 100644
index 000000000..c8463d622
--- /dev/null
+++ b/server/modules/routing/readconnroute/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_library(readconnroute SHARED readconnroute.c)
+target_link_libraries(readconnroute maxscale-common)
+set_target_properties(readconnroute PROPERTIES VERSION "1.1.0")
+install_module(readconnroute core)
diff --git a/server/modules/routing/readconnroute.c b/server/modules/routing/readconnroute/readconnroute.c
similarity index 100%
rename from server/modules/routing/readconnroute.c
rename to server/modules/routing/readconnroute/readconnroute.c
diff --git a/server/modules/routing/testroute/CMakeLists.txt b/server/modules/routing/testroute/CMakeLists.txt
new file mode 100644
index 000000000..58c91cfd2
--- /dev/null
+++ b/server/modules/routing/testroute/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_library(testroute SHARED testroute.c)
+target_link_libraries(testroute maxscale-common)
+set_target_properties(testroute PROPERTIES VERSION "1.0.0")
+install_module(testroute core)
diff --git a/server/modules/routing/testroute.c b/server/modules/routing/testroute/testroute.c
similarity index 100%
rename from server/modules/routing/testroute.c
rename to server/modules/routing/testroute/testroute.c
diff --git a/server/modules/routing/webserver.c b/server/modules/routing/webserver/webserver.c
similarity index 100%
rename from server/modules/routing/webserver.c
rename to server/modules/routing/webserver/webserver.c