Code cleanup

Otarcik_CAN/Otarcik_CAN.pro

@@ -29,6 +29,7 @@ INCLUDEPATH += $$PWD/ \
                $$PWD/Sources/PCAN \
                $$PWD/Sources/KVASER\
                $$PWD/Sources/CANDatabase\
+               $$PWD/Sources/CANBus\
 
 SOURCES += Sources/main.cpp \
            Sources/MainWindow.cpp \
@@ -36,16 +37,17 @@ SOURCES += Sources/main.cpp \
     Sources/OtarcikCan.cpp \
     Sources/Gui/GeneralStatusPage.cpp \
     Sources/GeneralMessagesLogDispatcher.cpp \
-    Sources/CANAnalyzer.cpp \
-    Sources/CANMessage.cpp \
     Sources/Gui/CANViewerPage.cpp \
     Sources/CANDatabase/CANDatabase.cpp \
-    Sources/CANDevice.cpp \
-    Sources/CANSignal.cpp \
     Sources/SystemConfig.cpp \
-    Sources/CANDeviceConfig.cpp \
     Sources/Gui/CANbusSettingsPage.cpp \
-    Sources/Gui/LoggingSettingsPage.cpp
+    Sources/Gui/LoggingSettingsPage.cpp \
+    Sources/CANBus/CANAnalyzer.cpp \
+    Sources/CANBus/CANDevice.cpp \
+    Sources/CANBus/CANDeviceConfig.cpp \
+    Sources/CANBus/CANMessage.cpp \
+    Sources/CANBus/CANSignal.cpp \
+    Sources/CANBus/CANDataLogger.cpp
 
 HEADERS  += Sources/MainWindow.h \
     Sources/PCANInterface.h \
@@ -55,16 +57,17 @@ HEADERS  += Sources/MainWindow.h \
     Sources/defines.h \
     Sources/KVASER/kvaDbLib.h \
     Sources/PCAN/PCANBasic.h \
-    Sources/CANAnalyzer.h \
-    Sources/CANMessage.h \
     Sources/Gui/CANViewerPage.h \
     Sources/CANDatabase/CANDatabase.h \
-    Sources/CANDevice.h \
-    Sources/CANSignal.h \
     Sources/SystemConfig.h \
-    Sources/CANDeviceConfig.h \
     Sources/Gui/CANbusSettingsPage.h \
-    Sources/Gui/LoggingSettingsPage.h
+    Sources/Gui/LoggingSettingsPage.h \
+    Sources/CANBus/CANAnalyzer.h \
+    Sources/CANBus/CANDevice.h \
+    Sources/CANBus/CANDeviceConfig.h \
+    Sources/CANBus/CANMessage.h \
+    Sources/CANBus/CANSignal.h \
+    Sources/CANBus/CANDataLogger.h
 
 FORMS    += Sources/Gui/MainWindow.ui \
     Sources/Gui/GeneralStatusPage.ui \