diff --git a/alpaca.c b/drivers/alpaca.c
similarity index 100%
rename from alpaca.c
rename to drivers/alpaca.c
diff --git a/cdb_assist.c b/drivers/cdb_assist.c
similarity index 100%
rename from cdb_assist.c
rename to drivers/cdb_assist.c
diff --git a/conmux.c b/drivers/conmux.c
similarity index 100%
rename from conmux.c
rename to drivers/conmux.c
diff --git a/external.c b/drivers/external.c
similarity index 100%
rename from external.c
rename to drivers/external.c
diff --git a/ftdi-gpio.c b/drivers/ftdi-gpio.c
similarity index 100%
rename from ftdi-gpio.c
rename to drivers/ftdi-gpio.c
diff --git a/local-gpio-v1.c b/drivers/local-gpio-v1.c
similarity index 100%
rename from local-gpio-v1.c
rename to drivers/local-gpio-v1.c
diff --git a/local-gpio-v2.c b/drivers/local-gpio-v2.c
similarity index 100%
rename from local-gpio-v2.c
rename to drivers/local-gpio-v2.c
diff --git a/local-gpio.c b/drivers/local-gpio.c
similarity index 100%
rename from local-gpio.c
rename to drivers/local-gpio.c
diff --git a/local-gpio.h b/drivers/local-gpio.h
similarity index 100%
rename from local-gpio.h
rename to drivers/local-gpio.h
diff --git a/qcomlt_dbg.c b/drivers/qcomlt_dbg.c
similarity index 100%
rename from qcomlt_dbg.c
rename to drivers/qcomlt_dbg.c
diff --git a/meson.build b/meson.build
index f1d12bd..927a2b8 100644
--- a/meson.build
+++ b/meson.build
@@ -65,29 +65,31 @@ if not compiler.has_function('forkpty')
   server_deps += util_dep
 endif
 
+drivers_srcs = ['drivers/alpaca.c',
+	        'drivers/cdb_assist.c',
+		'drivers/conmux.c',
+		'drivers/external.c',
+		'drivers/ftdi-gpio.c',
+		'drivers/local-gpio.c',
+		'drivers/qcomlt_dbg.c',
+		]
+
+if gpiod_dep.version().version_compare('>=2.0')
+	drivers_srcs += ['drivers/local-gpio-v2.c']
+else
+	drivers_srcs += ['drivers/local-gpio-v1.c']
+endif
+
 server_srcs = ['cdba-server.c',
-	       'cdb_assist.c',
 	       'circ_buf.c',
-	       'conmux.c',
 	       'device.c',
 	       'device_parser.c',
-               'external.c',
 	       'fastboot.c',
-	       'alpaca.c',
-	       'ftdi-gpio.c',
-	       'local-gpio.c',
 	       'console.c',
-	       'qcomlt_dbg.c',
 	       'ppps.c',
                'status.c',
                'status-cmd.c']
 
-if gpiod_dep.version().version_compare('>=2.0')
-	server_srcs += ['local-gpio-v2.c']
-else
-	server_srcs += ['local-gpio-v1.c']
-endif
-
 build_server = true
 foreach d: server_deps
   if not d.found()
@@ -97,7 +99,7 @@ endforeach
 
 if build_server
 	executable('cdba-server',
-		  server_srcs,
+		  server_srcs + drivers_srcs,
 		  dependencies : server_deps,
 		  install : true)
 elif not server_opt.disabled()