diff --git a/SavvyCAN.pro b/SavvyCAN.pro
index 507299d..481cf8d 100644
--- a/SavvyCAN.pro
+++ b/SavvyCAN.pro
@@ -60,7 +60,10 @@ SOURCES += main.cpp\
     re/graphingwindow.cpp \
     re/newgraphdialog.cpp \
     bisectwindow.cpp \
-    signalviewerwindow.cpp
+    signalviewerwindow.cpp \
+    bus_protocols/isotp_handler.cpp \
+    bus_protocols/j1939_handler.cpp \
+    bus_protocols/uds_handler.cpp
 
 HEADERS  += mainwindow.h \
     can_structs.h \
@@ -99,7 +102,6 @@ HEADERS  += mainwindow.h \
     re/flowviewwindow.h \
     re/frameinfowindow.h \
     re/fuzzingwindow.h \
-    re/isotp_handler.h \
     re/isotp_interpreterwindow.h \
     re/rangestatewindow.h \
     re/udsscanwindow.h \
@@ -109,7 +111,10 @@ HEADERS  += mainwindow.h \
     re/graphingwindow.h \
     re/newgraphdialog.h \
     bisectwindow.h \
-    signalviewerwindow.h
+    signalviewerwindow.h \
+    bus_protocols/isotp_handler.h \
+    bus_protocols/j1939_handler.h \
+    bus_protocols/uds_handler.h
 
 FORMS    += ui/candatagrid.ui \
     ui/connectionwindow.ui \
diff --git a/re/isotp_handler.cpp b/bus_protocols/isotp_handler.cpp
similarity index 100%
rename from re/isotp_handler.cpp
rename to bus_protocols/isotp_handler.cpp
diff --git a/re/isotp_handler.h b/bus_protocols/isotp_handler.h
similarity index 100%
rename from re/isotp_handler.h
rename to bus_protocols/isotp_handler.h
diff --git a/bus_protocols/j1939_handler.cpp b/bus_protocols/j1939_handler.cpp
new file mode 100644
index 0000000..8b80ca6
--- /dev/null
+++ b/bus_protocols/j1939_handler.cpp
@@ -0,0 +1,2 @@
+#include "j1939_handler.h"
+
diff --git a/bus_protocols/j1939_handler.h b/bus_protocols/j1939_handler.h
new file mode 100644
index 0000000..504ca14
--- /dev/null
+++ b/bus_protocols/j1939_handler.h
@@ -0,0 +1,10 @@
+#ifndef J1939_HANDLER_H
+#define J1939_HANDLER_H
+
+#include <Qt>
+#include <QObject>
+#include <QDebug>
+#include "can_structs.h"
+
+
+#endif // J1939_HANDLER_H
diff --git a/bus_protocols/uds_handler.cpp b/bus_protocols/uds_handler.cpp
new file mode 100644
index 0000000..c967857
--- /dev/null
+++ b/bus_protocols/uds_handler.cpp
@@ -0,0 +1,3 @@
+#include "uds_handler.h"
+
+
diff --git a/bus_protocols/uds_handler.h b/bus_protocols/uds_handler.h
new file mode 100644
index 0000000..e58eb7d
--- /dev/null
+++ b/bus_protocols/uds_handler.h
@@ -0,0 +1,9 @@
+#ifndef UDS_HANDLER_H
+#define UDS_HANDLER_H
+
+#include <Qt>
+#include <QObject>
+#include <QDebug>
+#include "can_structs.h"
+
+#endif // UDS_HANDLER_H