diff --git a/release/files_common b/release/files_common
index 7073625cfb..e69d58520d 100644
--- a/release/files_common
+++ b/release/files_common
@@ -74,7 +74,6 @@ selfdrive/sentry.py
 selfdrive/swaglog.py
 selfdrive/logmessaged.py
 selfdrive/tombstoned.py
-selfdrive/pandad.py
 selfdrive/updated.py
 selfdrive/rtshield.py
 selfdrive/statsd.py
@@ -98,6 +97,7 @@ selfdrive/boardd/panda.h
 selfdrive/boardd/pigeon.cc
 selfdrive/boardd/pigeon.h
 selfdrive/boardd/set_time.py
+selfdrive/boardd/pandad.py
 
 selfdrive/car/__init__.py
 selfdrive/car/car_helpers.py
diff --git a/selfdrive/pandad.py b/selfdrive/boardd/pandad.py
similarity index 100%
rename from selfdrive/pandad.py
rename to selfdrive/boardd/pandad.py
diff --git a/selfdrive/manager/process_config.py b/selfdrive/manager/process_config.py
index c017e48fab..bc88154c2c 100644
--- a/selfdrive/manager/process_config.py
+++ b/selfdrive/manager/process_config.py
@@ -27,7 +27,7 @@ procs = [
   PythonProcess("deleter", "selfdrive.loggerd.deleter", persistent=True),
   PythonProcess("dmonitoringd", "selfdrive.monitoring.dmonitoringd", enabled=(not PC or WEBCAM), driverview=True),
   PythonProcess("logmessaged", "selfdrive.logmessaged", persistent=True),
-  PythonProcess("pandad", "selfdrive.pandad", persistent=True),
+  PythonProcess("pandad", "selfdrive.boardd.pandad", persistent=True),
   PythonProcess("paramsd", "selfdrive.locationd.paramsd"),
   PythonProcess("plannerd", "selfdrive.controls.plannerd"),
   PythonProcess("radard", "selfdrive.controls.radard"),