diff --git a/tools/cabana/.gitignore b/tools/cabana/.gitignore
index 73879ab05..c74ab7483 100644
--- a/tools/cabana/.gitignore
+++ b/tools/cabana/.gitignore
@@ -3,5 +3,5 @@ moc_*
 
 _cabana
 settings
-car_fingerprint_to_dbc.json
+dbc/car_fingerprint_to_dbc.json
 tests/_test_cabana
diff --git a/tools/cabana/SConscript b/tools/cabana/SConscript
index 5f4f7fc52..d9156f229 100644
--- a/tools/cabana/SConscript
+++ b/tools/cabana/SConscript
@@ -28,7 +28,8 @@ cabana_env.Depends(assets, Glob('/assets/*', exclude=[assets, assets_src, "asset
 
 prev_moc_path = cabana_env['QT_MOCHPREFIX']
 cabana_env['QT_MOCHPREFIX'] = os.path.dirname(prev_moc_path) + '/cabana/moc_'
-cabana_lib = cabana_env.Library("cabana_lib", ['mainwin.cc', 'streams/livestream.cc', 'streams/abstractstream.cc', 'streams/replaystream.cc', 'binaryview.cc', 'chartswidget.cc', 'historylog.cc', 'videowidget.cc', 'signaledit.cc', 'dbc.cc', 'dbcfile.cc', 'dbcmanager.cc',
+cabana_lib = cabana_env.Library("cabana_lib", ['mainwin.cc', 'streams/livestream.cc', 'streams/abstractstream.cc', 'streams/replaystream.cc', 'binaryview.cc', 'chartswidget.cc', 'historylog.cc', 'videowidget.cc', 'signaledit.cc', 
+                                               'dbc/dbc.cc', 'dbc/dbcfile.cc', 'dbc/dbcmanager.cc',
                                                'commands.cc', 'messageswidget.cc', 'route.cc', 'settings.cc', 'util.cc', 'detailwidget.cc', 'tools/findsimilarbits.cc'], LIBS=cabana_libs, FRAMEWORKS=base_frameworks)
 cabana_env.Program('_cabana', ['cabana.cc', cabana_lib, assets], LIBS=cabana_libs, FRAMEWORKS=base_frameworks)
 
@@ -39,5 +40,5 @@ if GetOption('test'):
   cabana_env.Program('tests/_test_cabana', ['tests/test_runner.cc', 'tests/test_cabana.cc', cabana_lib], LIBS=[cabana_libs])
 
 def generate_dbc_json(target, source, env):
-  env.Execute('tools/cabana/generate_dbc_json.py --out tools/cabana/car_fingerprint_to_dbc.json')
+  env.Execute('tools/cabana/dbc/generate_dbc_json.py --out tools/cabana/dbc/car_fingerprint_to_dbc.json')
 cabana_env.Command('generate_dbc_json', [], generate_dbc_json)
diff --git a/tools/cabana/binaryview.h b/tools/cabana/binaryview.h
index f677d1194..8598fe490 100644
--- a/tools/cabana/binaryview.h
+++ b/tools/cabana/binaryview.h
@@ -6,7 +6,7 @@
 #include <QStyledItemDelegate>
 #include <QTableView>
 
-#include "tools/cabana/dbcmanager.h"
+#include "tools/cabana/dbc/dbcmanager.h"
 #include "tools/cabana/streams/abstractstream.h"
 
 class BinaryItemDelegate : public QStyledItemDelegate {
diff --git a/tools/cabana/chartswidget.h b/tools/cabana/chartswidget.h
index de6cfc56b..7f757f021 100644
--- a/tools/cabana/chartswidget.h
+++ b/tools/cabana/chartswidget.h
@@ -13,7 +13,7 @@
 #include <QtCharts/QScatterSeries>
 #include <QtCharts/QValueAxis>
 
-#include "tools/cabana/dbcmanager.h"
+#include "tools/cabana/dbc/dbcmanager.h"
 #include "tools/cabana/streams/abstractstream.h"
 using namespace QtCharts;
 
diff --git a/tools/cabana/commands.h b/tools/cabana/commands.h
index 2a5f40d58..84d1a6e2a 100644
--- a/tools/cabana/commands.h
+++ b/tools/cabana/commands.h
@@ -3,7 +3,7 @@
 #include <QUndoCommand>
 #include <QUndoStack>
 
-#include "tools/cabana/dbcmanager.h"
+#include "tools/cabana/dbc/dbcmanager.h"
 #include "tools/cabana/streams/abstractstream.h"
 
 class EditMsgCommand : public QUndoCommand {
diff --git a/tools/cabana/dbc.cc b/tools/cabana/dbc/dbc.cc
similarity index 98%
rename from tools/cabana/dbc.cc
rename to tools/cabana/dbc/dbc.cc
index 38002af06..46302ad78 100644
--- a/tools/cabana/dbc.cc
+++ b/tools/cabana/dbc/dbc.cc
@@ -1,4 +1,4 @@
-#include "tools/cabana/dbc.h"
+#include "tools/cabana/dbc/dbc.h"
 #include "tools/cabana/util.h"
 
 uint qHash(const MessageId &item) {
diff --git a/tools/cabana/dbc.h b/tools/cabana/dbc/dbc.h
similarity index 100%
rename from tools/cabana/dbc.h
rename to tools/cabana/dbc/dbc.h
diff --git a/tools/cabana/dbcfile.cc b/tools/cabana/dbc/dbcfile.cc
similarity index 99%
rename from tools/cabana/dbcfile.cc
rename to tools/cabana/dbc/dbcfile.cc
index 14a98347e..8b4f98508 100644
--- a/tools/cabana/dbcfile.cc
+++ b/tools/cabana/dbc/dbcfile.cc
@@ -1,4 +1,4 @@
-#include "tools/cabana/dbcfile.h"
+#include "tools/cabana/dbc/dbcfile.h"
 
 #include <QDebug>
 
diff --git a/tools/cabana/dbcfile.h b/tools/cabana/dbc/dbcfile.h
similarity index 97%
rename from tools/cabana/dbcfile.h
rename to tools/cabana/dbc/dbcfile.h
index b8fa3ea41..082ee773b 100644
--- a/tools/cabana/dbcfile.h
+++ b/tools/cabana/dbc/dbcfile.h
@@ -8,7 +8,7 @@
 #include <QSet>
 #include <QDebug>
 
-#include "tools/cabana/dbc.h"
+#include "tools/cabana/dbc/dbc.h"
 
 const QString AUTO_SAVE_EXTENSION = ".tmp";
 
diff --git a/tools/cabana/dbcmanager.cc b/tools/cabana/dbc/dbcmanager.cc
similarity index 99%
rename from tools/cabana/dbcmanager.cc
rename to tools/cabana/dbc/dbcmanager.cc
index 26c9105b4..0cc51989c 100644
--- a/tools/cabana/dbcmanager.cc
+++ b/tools/cabana/dbc/dbcmanager.cc
@@ -1,4 +1,4 @@
-#include "tools/cabana/dbcmanager.h"
+#include "tools/cabana/dbc/dbcmanager.h"
 
 #include <QFile>
 #include <QRegularExpression>
diff --git a/tools/cabana/dbcmanager.h b/tools/cabana/dbc/dbcmanager.h
similarity index 96%
rename from tools/cabana/dbcmanager.h
rename to tools/cabana/dbc/dbcmanager.h
index 2a5aa6da2..31183e819 100644
--- a/tools/cabana/dbcmanager.h
+++ b/tools/cabana/dbc/dbcmanager.h
@@ -8,8 +8,8 @@
 #include <QSet>
 #include <QDebug>
 
-#include "tools/cabana/dbc.h"
-#include "tools/cabana/dbcfile.h"
+#include "tools/cabana/dbc/dbc.h"
+#include "tools/cabana/dbc/dbcfile.h"
 
 typedef QSet<uint8_t> SourceSet;
 const SourceSet SOURCE_ALL = {};
diff --git a/tools/cabana/generate_dbc_json.py b/tools/cabana/dbc/generate_dbc_json.py
similarity index 100%
rename from tools/cabana/generate_dbc_json.py
rename to tools/cabana/dbc/generate_dbc_json.py
diff --git a/tools/cabana/historylog.h b/tools/cabana/historylog.h
index 119b61a0e..8b8d1b06d 100644
--- a/tools/cabana/historylog.h
+++ b/tools/cabana/historylog.h
@@ -7,7 +7,7 @@
 #include <QLineEdit>
 #include <QTableView>
 
-#include "tools/cabana/dbcmanager.h"
+#include "tools/cabana/dbc/dbcmanager.h"
 #include "tools/cabana/streams/abstractstream.h"
 #include "tools/cabana/util.h"
 
diff --git a/tools/cabana/mainwin.cc b/tools/cabana/mainwin.cc
index 3b1edce23..c979a20f1 100644
--- a/tools/cabana/mainwin.cc
+++ b/tools/cabana/mainwin.cc
@@ -55,7 +55,7 @@ MainWindow::MainWindow() : QMainWindow() {
   main_win = this;
   qInstallMessageHandler(qLogMessageHandler);
 
-  for (const QString &fn : {"./car_fingerprint_to_dbc.json", "./tools/cabana/car_fingerprint_to_dbc.json"}) {
+  for (const QString &fn : {"./dbc/car_fingerprint_to_dbc.json", "./tools/cabana/dbc/car_fingerprint_to_dbc.json"}) {
     QFile json_file(fn);
     if (json_file.open(QIODevice::ReadOnly)) {
       fingerprint_to_dbc = QJsonDocument::fromJson(json_file.readAll());
diff --git a/tools/cabana/mainwin.h b/tools/cabana/mainwin.h
index 349fa3b28..991a34931 100644
--- a/tools/cabana/mainwin.h
+++ b/tools/cabana/mainwin.h
@@ -8,7 +8,7 @@
 #include <QStatusBar>
 
 #include "tools/cabana/chartswidget.h"
-#include "tools/cabana/dbcmanager.h"
+#include "tools/cabana/dbc/dbcmanager.h"
 #include "tools/cabana/detailwidget.h"
 #include "tools/cabana/messageswidget.h"
 #include "tools/cabana/videowidget.h"
diff --git a/tools/cabana/messageswidget.h b/tools/cabana/messageswidget.h
index 08dac0d69..d4ef89651 100644
--- a/tools/cabana/messageswidget.h
+++ b/tools/cabana/messageswidget.h
@@ -6,7 +6,7 @@
 #include <QSet>
 #include <QTableView>
 
-#include "tools/cabana/dbcmanager.h"
+#include "tools/cabana/dbc/dbcmanager.h"
 #include "tools/cabana/streams/abstractstream.h"
 
 class MessageListModel : public QAbstractTableModel {
diff --git a/tools/cabana/streams/abstractstream.h b/tools/cabana/streams/abstractstream.h
index 37490d0ec..0515f7c7e 100644
--- a/tools/cabana/streams/abstractstream.h
+++ b/tools/cabana/streams/abstractstream.h
@@ -6,7 +6,7 @@
 #include <QColor>
 #include <QHash>
 
-#include "tools/cabana/dbcmanager.h"
+#include "tools/cabana/dbc/dbcmanager.h"
 #include "tools/cabana/settings.h"
 #include "tools/cabana/util.h"
 #include "tools/replay/replay.h"
diff --git a/tools/cabana/tests/test_cabana.cc b/tools/cabana/tests/test_cabana.cc
index 3a5d64f0a..4bc01a6a8 100644
--- a/tools/cabana/tests/test_cabana.cc
+++ b/tools/cabana/tests/test_cabana.cc
@@ -3,7 +3,7 @@
 #undef INFO
 #include "catch2/catch.hpp"
 #include "tools/replay/logreader.h"
-#include "tools/cabana/dbcmanager.h"
+#include "tools/cabana/dbc/dbcmanager.h"
 #include "tools/cabana/streams/abstractstream.h"
 
 // demo route, first segment
diff --git a/tools/cabana/tools/findsimilarbits.cc b/tools/cabana/tools/findsimilarbits.cc
index e40498f04..7fe5b2667 100644
--- a/tools/cabana/tools/findsimilarbits.cc
+++ b/tools/cabana/tools/findsimilarbits.cc
@@ -8,7 +8,7 @@
 #include <QPushButton>
 #include <QRadioButton>
 
-#include "tools/cabana/dbcmanager.h"
+#include "tools/cabana/dbc/dbcmanager.h"
 #include "tools/cabana/streams/abstractstream.h"
 
 FindSimilarBitsDlg::FindSimilarBitsDlg(QWidget *parent) : QDialog(parent, Qt::WindowFlags() | Qt::Window) {
diff --git a/tools/cabana/tools/findsimilarbits.h b/tools/cabana/tools/findsimilarbits.h
index a40e2cd8d..77bfac19c 100644
--- a/tools/cabana/tools/findsimilarbits.h
+++ b/tools/cabana/tools/findsimilarbits.h
@@ -6,7 +6,7 @@
 #include <QSpinBox>
 #include <QTableWidget>
 
-#include "tools/cabana/dbcmanager.h"
+#include "tools/cabana/dbc/dbcmanager.h"
 
 class FindSimilarBitsDlg : public QDialog {
   Q_OBJECT
diff --git a/tools/cabana/util.h b/tools/cabana/util.h
index 330da7717..7f40c4235 100644
--- a/tools/cabana/util.h
+++ b/tools/cabana/util.h
@@ -12,7 +12,7 @@
 #include <QToolButton>
 #include <QVector>
 
-#include "tools/cabana/dbc.h"
+#include "tools/cabana/dbc/dbc.h"
 
 class ChangeTracker {
 public:
diff --git a/tools/cabana/videowidget.h b/tools/cabana/videowidget.h
index a5ce8c345..40a85662b 100644
--- a/tools/cabana/videowidget.h
+++ b/tools/cabana/videowidget.h
@@ -12,7 +12,7 @@
 
 #include "selfdrive/ui/qt/widgets/cameraview.h"
 #include "selfdrive/ui/qt/widgets/controls.h"
-#include "tools/cabana/dbcmanager.h"
+#include "tools/cabana/dbc/dbcmanager.h"
 #include "tools/cabana/streams/abstractstream.h"
 
 class Slider : public QSlider {