diff --git a/release/files_common b/release/files_common
index 696f827fba..4013310559 100644
--- a/release/files_common
+++ b/release/files_common
@@ -109,85 +109,20 @@ selfdrive/car/fw_versions.py
 selfdrive/car/isotp_parallel_query.py
 selfdrive/car/tests/__init__.py
 selfdrive/car/tests/test_car_interfaces.py
-selfdrive/car/chrysler/__init__.py
-selfdrive/car/chrysler/carstate.py
-selfdrive/car/chrysler/interface.py
-selfdrive/car/chrysler/radar_interface.py
-selfdrive/car/chrysler/values.py
-selfdrive/car/chrysler/carcontroller.py
-selfdrive/car/chrysler/chryslercan.py
-selfdrive/car/honda/__init__.py
-selfdrive/car/honda/carstate.py
-selfdrive/car/honda/interface.py
-selfdrive/car/honda/radar_interface.py
-selfdrive/car/honda/values.py
-selfdrive/car/honda/carcontroller.py
-selfdrive/car/honda/hondacan.py
-selfdrive/car/hyundai/__init__.py
-selfdrive/car/hyundai/carstate.py
-selfdrive/car/hyundai/interface.py
-selfdrive/car/hyundai/radar_interface.py
-selfdrive/car/hyundai/values.py
-selfdrive/car/hyundai/carcontroller.py
-selfdrive/car/hyundai/hyundaican.py
-selfdrive/car/toyota/__init__.py
-selfdrive/car/toyota/carstate.py
-selfdrive/car/toyota/tunes.py
-selfdrive/car/toyota/interface.py
-selfdrive/car/toyota/radar_interface.py
-selfdrive/car/toyota/values.py
-selfdrive/car/toyota/carcontroller.py
-selfdrive/car/toyota/toyotacan.py
-selfdrive/car/nissan/__init__.py
-selfdrive/car/nissan/carcontroller.py
-selfdrive/car/nissan/carstate.py
-selfdrive/car/nissan/interface.py
-selfdrive/car/nissan/nissancan.py
-selfdrive/car/nissan/radar_interface.py
-selfdrive/car/nissan/values.py
-selfdrive/car/volkswagen/__init__.py
-selfdrive/car/volkswagen/carstate.py
-selfdrive/car/volkswagen/interface.py
-selfdrive/car/volkswagen/radar_interface.py
-selfdrive/car/volkswagen/values.py
-selfdrive/car/volkswagen/carcontroller.py
-selfdrive/car/volkswagen/volkswagencan.py
-selfdrive/car/gm/__init__.py
-selfdrive/car/gm/carstate.py
-selfdrive/car/gm/interface.py
-selfdrive/car/gm/radar_interface.py
-selfdrive/car/gm/values.py
-selfdrive/car/gm/carcontroller.py
-selfdrive/car/gm/gmcan.py
-selfdrive/car/ford/__init__.py
-selfdrive/car/ford/carstate.py
-selfdrive/car/ford/interface.py
-selfdrive/car/ford/radar_interface.py
-selfdrive/car/ford/values.py
-selfdrive/car/ford/carcontroller.py
-selfdrive/car/ford/fordcan.py
-selfdrive/car/subaru/__init__.py
-selfdrive/car/subaru/carstate.py
-selfdrive/car/subaru/interface.py
-selfdrive/car/subaru/radar_interface.py
-selfdrive/car/subaru/values.py
-selfdrive/car/subaru/carcontroller.py
-selfdrive/car/subaru/subarucan.py
-selfdrive/car/mazda/__init__.py
-selfdrive/car/mazda/carstate.py
-selfdrive/car/mazda/interface.py
-selfdrive/car/mazda/radar_interface.py
-selfdrive/car/mazda/values.py
-selfdrive/car/mazda/carcontroller.py
-selfdrive/car/mazda/mazdacan.py
-selfdrive/car/tesla/__init__.py
-selfdrive/car/tesla/teslacan.py
-selfdrive/car/tesla/carcontroller.py
-selfdrive/car/tesla/radar_interface.py
-selfdrive/car/tesla/values.py
-selfdrive/car/tesla/carstate.py
-selfdrive/car/tesla/interface.py
+
+selfdrive/car/body/*.py
+selfdrive/car/chrysler/*.py
+selfdrive/car/ford/*.py
+selfdrive/car/gm/*.py
+selfdrive/car/honda/*.py
+selfdrive/car/hyundai/*.py
+selfdrive/car/mazda/*.py
 selfdrive/car/mock/*.py
+selfdrive/car/nissan/*.py
+selfdrive/car/subaru/*.py
+selfdrive/car/tesla/*.py
+selfdrive/car/toyota/*.py
+selfdrive/car/volkswagen/*.py
 
 selfdrive/clocksd/.gitignore
 selfdrive/clocksd/SConscript
@@ -532,6 +467,8 @@ opendbc/can/parser.cc
 opendbc/can/parser.py
 opendbc/can/parser_pyx.pyx
 
+opendbc/comma_body.dbc
+
 opendbc/chrysler_pacifica_2017_hybrid.dbc
 opendbc/chrysler_pacifica_2017_hybrid_private_fusion.dbc