diff --git a/SavvyCAN.pro b/SavvyCAN.pro
index 6c122c2..d97b115 100644
--- a/SavvyCAN.pro
+++ b/SavvyCAN.pro
@@ -22,35 +22,22 @@ SOURCES += main.cpp\
     utility.cpp \
     qcustomplot.cpp \
     graphingwindow.cpp \
-    frameinfowindow.cpp \
     newgraphdialog.cpp \
     frameplaybackwindow.cpp \
     serialworker.cpp \
     candatagrid.cpp \
-    flowviewwindow.cpp \
     framesenderwindow.cpp \
-    dbchandler.cpp \
-    dbcmaineditor.cpp \
-    dbcsignaleditor.cpp \
     framefileio.cpp \
-    filecomparatorwindow.cpp \
     mainsettingsdialog.cpp \
     firmwareuploaderwindow.cpp \
-    discretestatewindow.cpp \
     connectionwindow.cpp \
     scriptingwindow.cpp \
     scriptcontainer.cpp \
     canfilter.cpp \
-    rangestatewindow.cpp \
-    dbc_classes.cpp \
-    dbcloadsavewindow.cpp \
-    fuzzingwindow.cpp \
-    udsscanwindow.cpp \
     can_structs.cpp \
-    isotp_interpreterwindow.cpp \
-    isotp_handler.cpp \
     canconnectionmodel.cpp \
     canbus.cpp \
+    motorcontrollerconfigwindow.cpp \
     connections/canconnection.cpp \
     connections/socketcan.cpp \
     connections/canconfactory.cpp \
@@ -59,8 +46,20 @@ SOURCES += main.cpp\
     re/sniffer/snifferitem.cpp \
     re/sniffer/sniffermodel.cpp \
     re/sniffer/snifferwindow.cpp \
-    motorcontrollerconfigwindow.cpp
-    motorcontrollerconfigwindow.cpp
+    dbc/dbc_classes.cpp \
+    dbc/dbchandler.cpp \
+    dbc/dbcloadsavewindow.cpp \
+    dbc/dbcmaineditor.cpp \
+    dbc/dbcsignaleditor.cpp \
+    re/discretestatewindow.cpp \
+    re/filecomparatorwindow.cpp \
+    re/flowviewwindow.cpp \
+    re/frameinfowindow.cpp \
+    re/fuzzingwindow.cpp \
+    re/isotp_handler.cpp \
+    re/isotp_interpreterwindow.cpp \
+    re/rangestatewindow.cpp \
+    re/udsscanwindow.cpp
 
 HEADERS  += mainwindow.h \
     can_structs.h \
@@ -68,37 +67,24 @@ HEADERS  += mainwindow.h \
     utility.h \
     qcustomplot.h \
     graphingwindow.h \
-    frameinfowindow.h \
     newgraphdialog.h \
     frameplaybackwindow.h \
     serialworker.h \
     candatagrid.h \
-    flowviewwindow.h \
     framesenderwindow.h \
     can_trigger_structs.h \
-    dbc_classes.h \
-    dbchandler.h \
-    dbcmaineditor.h \
-    dbcsignaleditor.h \
     framefileio.h \
     config.h \
-    filecomparatorwindow.h \
     mainsettingsdialog.h \
     firmwareuploaderwindow.h \
-    discretestatewindow.h \
     connectionwindow.h \
     scriptingwindow.h \
     scriptcontainer.h \
     canfilter.h \
-    rangestatewindow.h \
-    dbcloadsavewindow.h \
-    fuzzingwindow.h \
-    udsscanwindow.h \
-    isotp_interpreterwindow.h \
-    isotp_handler.h \
     canconnectionmodel.h \
     canbus.h \
     utils/lfqueue.h \
+    motorcontrollerconfigwindow.h \
     connections/canconnection.h \
     connections/socketcan.h \
     connections/canconconst.h \
@@ -108,32 +94,44 @@ HEADERS  += mainwindow.h \
     re/sniffer/snifferitem.h \
     re/sniffer/sniffermodel.h \
     re/sniffer/snifferwindow.h \
-    motorcontrollerconfigwindow.h
-    motorcontrollerconfigwindow.h
+    dbc/dbc_classes.h \
+    dbc/dbchandler.h \
+    dbc/dbcloadsavewindow.h \
+    dbc/dbcmaineditor.h \
+    dbc/dbcsignaleditor.h \
+    re/discretestatewindow.h \
+    re/filecomparatorwindow.h \
+    re/flowviewwindow.h \
+    re/frameinfowindow.h \
+    re/fuzzingwindow.h \
+    re/isotp_handler.h \
+    re/isotp_interpreterwindow.h \
+    re/rangestatewindow.h \
+    re/udsscanwindow.h
 
-FORMS    += mainwindow.ui \
-    graphingwindow.ui \
-    frameinfowindow.ui \
-    newgraphdialog.ui \
-    frameplaybackwindow.ui \
-    candatagrid.ui \
-    flowviewwindow.ui \
-    framesenderwindow.ui \
-    dbcmaineditor.ui \
-    dbcsignaleditor.ui \
-    filecomparatorwindow.ui \
-    mainsettingsdialog.ui \
-    firmwareuploaderwindow.ui \
-    discretestatewindow.ui \
-    connectionwindow.ui \
-    scriptingwindow.ui \
-    rangestatewindow.ui \
-    dbcloadsavewindow.ui \
-    fuzzingwindow.ui \
-    udsscanwindow.ui \
-    isotp_interpreterwindow.ui \
-    snifferwindow.ui \
-    motorcontrollerconfigwindow.ui
+FORMS    += ui/candatagrid.ui \
+    ui/connectionwindow.ui \
+    ui/dbcloadsavewindow.ui \
+    ui/dbcmaineditor.ui \
+    ui/dbcsignaleditor.ui \
+    ui/discretestatewindow.ui \
+    ui/filecomparatorwindow.ui \
+    ui/firmwareuploaderwindow.ui \
+    ui/flowviewwindow.ui \
+    ui/frameinfowindow.ui \
+    ui/frameplaybackwindow.ui \
+    ui/framesenderwindow.ui \
+    ui/fuzzingwindow.ui \
+    ui/graphingwindow.ui \
+    ui/isotp_interpreterwindow.ui \
+    ui/mainsettingsdialog.ui \
+    ui/mainwindow.ui \
+    ui/motorcontrollerconfigwindow.ui \
+    ui/newgraphdialog.ui \
+    ui/rangestatewindow.ui \
+    ui/scriptingwindow.ui \
+    ui/snifferwindow.ui \
+    ui/udsscanwindow.ui
 
 DISTFILES +=
 
diff --git a/canframemodel.h b/canframemodel.h
index c1d17c6..a26e7f3 100644
--- a/canframemodel.h
+++ b/canframemodel.h
@@ -7,7 +7,7 @@
 #include <QDebug>
 #include <QMutex>
 #include "can_structs.h"
-#include "dbchandler.h"
+#include "dbc/dbchandler.h"
 #include "connections/canconnection.h"
 
 class CANFrameModel: public QAbstractTableModel
diff --git a/dbc_classes.cpp b/dbc/dbc_classes.cpp
similarity index 100%
rename from dbc_classes.cpp
rename to dbc/dbc_classes.cpp
diff --git a/dbc_classes.h b/dbc/dbc_classes.h
similarity index 100%
rename from dbc_classes.h
rename to dbc/dbc_classes.h
diff --git a/dbchandler.cpp b/dbc/dbchandler.cpp
similarity index 100%
rename from dbchandler.cpp
rename to dbc/dbchandler.cpp
diff --git a/dbchandler.h b/dbc/dbchandler.h
similarity index 100%
rename from dbchandler.h
rename to dbc/dbchandler.h
diff --git a/dbcloadsavewindow.cpp b/dbc/dbcloadsavewindow.cpp
similarity index 100%
rename from dbcloadsavewindow.cpp
rename to dbc/dbcloadsavewindow.cpp
diff --git a/dbcloadsavewindow.h b/dbc/dbcloadsavewindow.h
similarity index 100%
rename from dbcloadsavewindow.h
rename to dbc/dbcloadsavewindow.h
diff --git a/dbcmaineditor.cpp b/dbc/dbcmaineditor.cpp
similarity index 100%
rename from dbcmaineditor.cpp
rename to dbc/dbcmaineditor.cpp
diff --git a/dbcmaineditor.h b/dbc/dbcmaineditor.h
similarity index 100%
rename from dbcmaineditor.h
rename to dbc/dbcmaineditor.h
diff --git a/dbcsignaleditor.cpp b/dbc/dbcsignaleditor.cpp
similarity index 100%
rename from dbcsignaleditor.cpp
rename to dbc/dbcsignaleditor.cpp
diff --git a/dbcsignaleditor.h b/dbc/dbcsignaleditor.h
similarity index 100%
rename from dbcsignaleditor.h
rename to dbc/dbcsignaleditor.h
diff --git a/graphingwindow.h b/graphingwindow.h
index 4887243..e3fad88 100644
--- a/graphingwindow.h
+++ b/graphingwindow.h
@@ -3,7 +3,7 @@
 
 #include "qcustomplot.h"
 #include "can_structs.h"
-#include "dbchandler.h"
+#include "dbc/dbchandler.h"
 
 #include <QDialog>
 
diff --git a/mainwindow.h b/mainwindow.h
index cfefe35..d5ac430 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -9,24 +9,24 @@
 #include "can_structs.h"
 #include "framefileio.h"
 #include "graphingwindow.h"
-#include "frameinfowindow.h"
+#include "re/frameinfowindow.h"
 #include "frameplaybackwindow.h"
-#include "flowviewwindow.h"
+#include "re/flowviewwindow.h"
 #include "framesenderwindow.h"
-#include "filecomparatorwindow.h"
-#include "dbchandler.h"
-#include "dbcmaineditor.h"
+#include "re/filecomparatorwindow.h"
+#include "dbc/dbchandler.h"
+#include "dbc/dbcmaineditor.h"
 #include "mainsettingsdialog.h"
 #include "firmwareuploaderwindow.h"
-#include "discretestatewindow.h"
+#include "re/discretestatewindow.h"
 #include "connectionwindow.h"
 #include "scriptingwindow.h"
-#include "rangestatewindow.h"
-#include "dbcloadsavewindow.h"
-#include "fuzzingwindow.h"
-#include "udsscanwindow.h"
+#include "re/rangestatewindow.h"
+#include "dbc/dbcloadsavewindow.h"
+#include "re/fuzzingwindow.h"
+#include "re/udsscanwindow.h"
 #include "re/sniffer/snifferwindow.h"
-#include "isotp_interpreterwindow.h"
+#include "re/isotp_interpreterwindow.h"
 #include "motorcontrollerconfigwindow.h"
 
 class ConnectionWindow;
diff --git a/newgraphdialog.h b/newgraphdialog.h
index 907a03c..85ce74c 100644
--- a/newgraphdialog.h
+++ b/newgraphdialog.h
@@ -3,7 +3,7 @@
 
 #include <QDialog>
 #include "graphingwindow.h"
-#include "dbchandler.h"
+#include "dbc/dbchandler.h"
 
 namespace Ui {
 class NewGraphDialog;
diff --git a/discretestatewindow.cpp b/re/discretestatewindow.cpp
similarity index 100%
rename from discretestatewindow.cpp
rename to re/discretestatewindow.cpp
diff --git a/discretestatewindow.h b/re/discretestatewindow.h
similarity index 100%
rename from discretestatewindow.h
rename to re/discretestatewindow.h
diff --git a/filecomparatorwindow.cpp b/re/filecomparatorwindow.cpp
similarity index 100%
rename from filecomparatorwindow.cpp
rename to re/filecomparatorwindow.cpp
diff --git a/filecomparatorwindow.h b/re/filecomparatorwindow.h
similarity index 100%
rename from filecomparatorwindow.h
rename to re/filecomparatorwindow.h
diff --git a/flowviewwindow.cpp b/re/flowviewwindow.cpp
similarity index 100%
rename from flowviewwindow.cpp
rename to re/flowviewwindow.cpp
diff --git a/flowviewwindow.h b/re/flowviewwindow.h
similarity index 100%
rename from flowviewwindow.h
rename to re/flowviewwindow.h
diff --git a/frameinfowindow.cpp b/re/frameinfowindow.cpp
similarity index 100%
rename from frameinfowindow.cpp
rename to re/frameinfowindow.cpp
diff --git a/frameinfowindow.h b/re/frameinfowindow.h
similarity index 100%
rename from frameinfowindow.h
rename to re/frameinfowindow.h
diff --git a/fuzzingwindow.cpp b/re/fuzzingwindow.cpp
similarity index 100%
rename from fuzzingwindow.cpp
rename to re/fuzzingwindow.cpp
diff --git a/fuzzingwindow.h b/re/fuzzingwindow.h
similarity index 100%
rename from fuzzingwindow.h
rename to re/fuzzingwindow.h
diff --git a/isotp_handler.cpp b/re/isotp_handler.cpp
similarity index 100%
rename from isotp_handler.cpp
rename to re/isotp_handler.cpp
diff --git a/isotp_handler.h b/re/isotp_handler.h
similarity index 100%
rename from isotp_handler.h
rename to re/isotp_handler.h
diff --git a/isotp_interpreterwindow.cpp b/re/isotp_interpreterwindow.cpp
similarity index 100%
rename from isotp_interpreterwindow.cpp
rename to re/isotp_interpreterwindow.cpp
diff --git a/isotp_interpreterwindow.h b/re/isotp_interpreterwindow.h
similarity index 100%
rename from isotp_interpreterwindow.h
rename to re/isotp_interpreterwindow.h
diff --git a/rangestatewindow.cpp b/re/rangestatewindow.cpp
similarity index 100%
rename from rangestatewindow.cpp
rename to re/rangestatewindow.cpp
diff --git a/rangestatewindow.h b/re/rangestatewindow.h
similarity index 100%
rename from rangestatewindow.h
rename to re/rangestatewindow.h
diff --git a/udsscanwindow.cpp b/re/udsscanwindow.cpp
similarity index 100%
rename from udsscanwindow.cpp
rename to re/udsscanwindow.cpp
diff --git a/udsscanwindow.h b/re/udsscanwindow.h
similarity index 100%
rename from udsscanwindow.h
rename to re/udsscanwindow.h
diff --git a/candatagrid.ui b/ui/candatagrid.ui
similarity index 100%
rename from candatagrid.ui
rename to ui/candatagrid.ui
diff --git a/connectionwindow.ui b/ui/connectionwindow.ui
similarity index 100%
rename from connectionwindow.ui
rename to ui/connectionwindow.ui
diff --git a/dbcloadsavewindow.ui b/ui/dbcloadsavewindow.ui
similarity index 100%
rename from dbcloadsavewindow.ui
rename to ui/dbcloadsavewindow.ui
diff --git a/dbcmaineditor.ui b/ui/dbcmaineditor.ui
similarity index 100%
rename from dbcmaineditor.ui
rename to ui/dbcmaineditor.ui
diff --git a/dbcsignaleditor.ui b/ui/dbcsignaleditor.ui
similarity index 100%
rename from dbcsignaleditor.ui
rename to ui/dbcsignaleditor.ui
diff --git a/discretestatewindow.ui b/ui/discretestatewindow.ui
similarity index 100%
rename from discretestatewindow.ui
rename to ui/discretestatewindow.ui
diff --git a/filecomparatorwindow.ui b/ui/filecomparatorwindow.ui
similarity index 100%
rename from filecomparatorwindow.ui
rename to ui/filecomparatorwindow.ui
diff --git a/firmwareuploaderwindow.ui b/ui/firmwareuploaderwindow.ui
similarity index 100%
rename from firmwareuploaderwindow.ui
rename to ui/firmwareuploaderwindow.ui
diff --git a/flowviewwindow.ui b/ui/flowviewwindow.ui
similarity index 100%
rename from flowviewwindow.ui
rename to ui/flowviewwindow.ui
diff --git a/frameinfowindow.ui b/ui/frameinfowindow.ui
similarity index 100%
rename from frameinfowindow.ui
rename to ui/frameinfowindow.ui
diff --git a/frameplaybackwindow.ui b/ui/frameplaybackwindow.ui
similarity index 100%
rename from frameplaybackwindow.ui
rename to ui/frameplaybackwindow.ui
diff --git a/framesenderwindow.ui b/ui/framesenderwindow.ui
similarity index 100%
rename from framesenderwindow.ui
rename to ui/framesenderwindow.ui
diff --git a/fuzzingwindow.ui b/ui/fuzzingwindow.ui
similarity index 100%
rename from fuzzingwindow.ui
rename to ui/fuzzingwindow.ui
diff --git a/graphingwindow.ui b/ui/graphingwindow.ui
similarity index 100%
rename from graphingwindow.ui
rename to ui/graphingwindow.ui
diff --git a/isotp_interpreterwindow.ui b/ui/isotp_interpreterwindow.ui
similarity index 100%
rename from isotp_interpreterwindow.ui
rename to ui/isotp_interpreterwindow.ui
diff --git a/mainsettingsdialog.ui b/ui/mainsettingsdialog.ui
similarity index 100%
rename from mainsettingsdialog.ui
rename to ui/mainsettingsdialog.ui
diff --git a/mainwindow.ui b/ui/mainwindow.ui
similarity index 100%
rename from mainwindow.ui
rename to ui/mainwindow.ui
diff --git a/motorcontrollerconfigwindow.ui b/ui/motorcontrollerconfigwindow.ui
similarity index 100%
rename from motorcontrollerconfigwindow.ui
rename to ui/motorcontrollerconfigwindow.ui
diff --git a/newgraphdialog.ui b/ui/newgraphdialog.ui
similarity index 100%
rename from newgraphdialog.ui
rename to ui/newgraphdialog.ui
diff --git a/rangestatewindow.ui b/ui/rangestatewindow.ui
similarity index 100%
rename from rangestatewindow.ui
rename to ui/rangestatewindow.ui
diff --git a/scriptingwindow.ui b/ui/scriptingwindow.ui
similarity index 100%
rename from scriptingwindow.ui
rename to ui/scriptingwindow.ui
diff --git a/snifferwindow.ui b/ui/snifferwindow.ui
similarity index 100%
rename from snifferwindow.ui
rename to ui/snifferwindow.ui
diff --git a/udsscanwindow.ui b/ui/udsscanwindow.ui
similarity index 100%
rename from udsscanwindow.ui
rename to ui/udsscanwindow.ui