diff --git a/DSLogic-gui/CMake/Findlibusb-1.0.cmake b/DSView/CMake/Findlibusb-1.0.cmake
similarity index 100%
rename from DSLogic-gui/CMake/Findlibusb-1.0.cmake
rename to DSView/CMake/Findlibusb-1.0.cmake
diff --git a/DSLogic-gui/CMakeLists.txt b/DSView/CMakeLists.txt
similarity index 100%
rename from DSLogic-gui/CMakeLists.txt
rename to DSView/CMakeLists.txt
diff --git a/DSLogic-gui/COPYING b/DSView/COPYING
similarity index 100%
rename from DSLogic-gui/COPYING
rename to DSView/COPYING
diff --git a/DSLogic-gui/DSLogic.qrc b/DSView/DSLogic.qrc
similarity index 100%
rename from DSLogic-gui/DSLogic.qrc
rename to DSView/DSLogic.qrc
diff --git a/DSLogic-gui/INSTALL b/DSView/INSTALL
similarity index 100%
rename from DSLogic-gui/INSTALL
rename to DSView/INSTALL
diff --git a/DSLogic-gui/NEWS b/DSView/NEWS
similarity index 100%
rename from DSLogic-gui/NEWS
rename to DSView/NEWS
diff --git a/DSLogic-gui/README b/DSView/README
similarity index 100%
rename from DSLogic-gui/README
rename to DSView/README
diff --git a/DSLogic-gui/config.h.in b/DSView/config.h.in
similarity index 100%
rename from DSLogic-gui/config.h.in
rename to DSView/config.h.in
diff --git a/DSLogic-gui/extdef.h b/DSView/extdef.h
similarity index 100%
rename from DSLogic-gui/extdef.h
rename to DSView/extdef.h
diff --git a/DSLogic-gui/icons/Thumbs.db b/DSView/icons/Thumbs.db
similarity index 100%
rename from DSLogic-gui/icons/Thumbs.db
rename to DSView/icons/Thumbs.db
diff --git a/DSLogic-gui/icons/about.png b/DSView/icons/about.png
similarity index 100%
rename from DSLogic-gui/icons/about.png
rename to DSView/icons/about.png
diff --git a/DSLogic-gui/icons/add.png b/DSView/icons/add.png
similarity index 100%
rename from DSLogic-gui/icons/add.png
rename to DSView/icons/add.png
diff --git a/DSLogic-gui/icons/capture.png b/DSView/icons/capture.png
similarity index 100%
rename from DSLogic-gui/icons/capture.png
rename to DSView/icons/capture.png
diff --git a/DSLogic-gui/icons/decoder-hidden.png b/DSView/icons/decoder-hidden.png
similarity index 100%
rename from DSLogic-gui/icons/decoder-hidden.png
rename to DSView/icons/decoder-hidden.png
diff --git a/DSLogic-gui/icons/decoder-shown.png b/DSView/icons/decoder-shown.png
similarity index 100%
rename from DSLogic-gui/icons/decoder-shown.png
rename to DSView/icons/decoder-shown.png
diff --git a/DSLogic-gui/icons/del.png b/DSView/icons/del.png
similarity index 100%
rename from DSLogic-gui/icons/del.png
rename to DSView/icons/del.png
diff --git a/DSLogic-gui/icons/down-arrow.png b/DSView/icons/down-arrow.png
similarity index 100%
rename from DSLogic-gui/icons/down-arrow.png
rename to DSView/icons/down-arrow.png
diff --git a/DSLogic-gui/icons/dsl_logo.png b/DSView/icons/dsl_logo.png
similarity index 100%
rename from DSLogic-gui/icons/dsl_logo.png
rename to DSView/icons/dsl_logo.png
diff --git a/DSLogic-gui/icons/file.png b/DSView/icons/file.png
similarity index 100%
rename from DSLogic-gui/icons/file.png
rename to DSView/icons/file.png
diff --git a/DSLogic-gui/icons/file_dis.png b/DSView/icons/file_dis.png
similarity index 100%
rename from DSLogic-gui/icons/file_dis.png
rename to DSView/icons/file_dis.png
diff --git a/DSLogic-gui/icons/gear.png b/DSView/icons/gear.png
similarity index 100%
rename from DSLogic-gui/icons/gear.png
rename to DSView/icons/gear.png
diff --git a/DSLogic-gui/icons/instant.png b/DSView/icons/instant.png
similarity index 100%
rename from DSLogic-gui/icons/instant.png
rename to DSView/icons/instant.png
diff --git a/DSLogic-gui/icons/logo.png b/DSView/icons/logo.png
similarity index 100%
rename from DSLogic-gui/icons/logo.png
rename to DSView/icons/logo.png
diff --git a/DSLogic-gui/icons/logo_color.png b/DSView/icons/logo_color.png
similarity index 100%
rename from DSLogic-gui/icons/logo_color.png
rename to DSView/icons/logo_color.png
diff --git a/DSLogic-gui/icons/logo_noColor.png b/DSView/icons/logo_noColor.png
similarity index 100%
rename from DSLogic-gui/icons/logo_noColor.png
rename to DSView/icons/logo_noColor.png
diff --git a/DSLogic-gui/icons/measure.png b/DSView/icons/measure.png
similarity index 100%
rename from DSLogic-gui/icons/measure.png
rename to DSView/icons/measure.png
diff --git a/DSLogic-gui/icons/measure_dis.png b/DSView/icons/measure_dis.png
similarity index 100%
rename from DSLogic-gui/icons/measure_dis.png
rename to DSView/icons/measure_dis.png
diff --git a/DSLogic-gui/icons/next.png b/DSView/icons/next.png
similarity index 100%
rename from DSLogic-gui/icons/next.png
rename to DSView/icons/next.png
diff --git a/DSLogic-gui/icons/open.png b/DSView/icons/open.png
similarity index 100%
rename from DSLogic-gui/icons/open.png
rename to DSView/icons/open.png
diff --git a/DSLogic-gui/icons/params.png b/DSView/icons/params.png
similarity index 100%
rename from DSLogic-gui/icons/params.png
rename to DSView/icons/params.png
diff --git a/DSLogic-gui/icons/params_dis.png b/DSView/icons/params_dis.png
similarity index 100%
rename from DSLogic-gui/icons/params_dis.png
rename to DSView/icons/params_dis.png
diff --git a/DSLogic-gui/icons/pre.png b/DSView/icons/pre.png
similarity index 100%
rename from DSLogic-gui/icons/pre.png
rename to DSView/icons/pre.png
diff --git a/DSLogic-gui/icons/protocol.png b/DSView/icons/protocol.png
similarity index 100%
rename from DSLogic-gui/icons/protocol.png
rename to DSView/icons/protocol.png
diff --git a/DSLogic-gui/icons/protocol_dis.png b/DSView/icons/protocol_dis.png
similarity index 100%
rename from DSLogic-gui/icons/protocol_dis.png
rename to DSView/icons/protocol_dis.png
diff --git a/DSLogic-gui/icons/save.png b/DSView/icons/save.png
similarity index 100%
rename from DSLogic-gui/icons/save.png
rename to DSView/icons/save.png
diff --git a/DSLogic-gui/icons/search-bar.png b/DSView/icons/search-bar.png
similarity index 100%
rename from DSLogic-gui/icons/search-bar.png
rename to DSView/icons/search-bar.png
diff --git a/DSLogic-gui/icons/search-bar_dis.png b/DSView/icons/search-bar_dis.png
similarity index 100%
rename from DSLogic-gui/icons/search-bar_dis.png
rename to DSView/icons/search-bar_dis.png
diff --git a/DSLogic-gui/icons/search.png b/DSView/icons/search.png
similarity index 100%
rename from DSLogic-gui/icons/search.png
rename to DSView/icons/search.png
diff --git a/DSLogic-gui/icons/slider-handle.png b/DSView/icons/slider-handle.png
similarity index 100%
rename from DSLogic-gui/icons/slider-handle.png
rename to DSView/icons/slider-handle.png
diff --git a/DSLogic-gui/icons/start.png b/DSView/icons/start.png
similarity index 100%
rename from DSLogic-gui/icons/start.png
rename to DSView/icons/start.png
diff --git a/DSLogic-gui/icons/stop.png b/DSView/icons/stop.png
similarity index 100%
rename from DSLogic-gui/icons/stop.png
rename to DSView/icons/stop.png
diff --git a/DSLogic-gui/icons/trigger.png b/DSView/icons/trigger.png
similarity index 100%
rename from DSLogic-gui/icons/trigger.png
rename to DSView/icons/trigger.png
diff --git a/DSLogic-gui/icons/trigger_dis.png b/DSView/icons/trigger_dis.png
similarity index 100%
rename from DSLogic-gui/icons/trigger_dis.png
rename to DSView/icons/trigger_dis.png
diff --git a/DSLogic-gui/icons/wiki.png b/DSView/icons/wiki.png
similarity index 100%
rename from DSLogic-gui/icons/wiki.png
rename to DSView/icons/wiki.png
diff --git a/DSLogic-gui/main.cpp b/DSView/main.cpp
similarity index 100%
rename from DSLogic-gui/main.cpp
rename to DSView/main.cpp
diff --git a/DSLogic-gui/pv/data/analog.cpp b/DSView/pv/data/analog.cpp
similarity index 100%
rename from DSLogic-gui/pv/data/analog.cpp
rename to DSView/pv/data/analog.cpp
diff --git a/DSLogic-gui/pv/data/analog.h b/DSView/pv/data/analog.h
similarity index 100%
rename from DSLogic-gui/pv/data/analog.h
rename to DSView/pv/data/analog.h
diff --git a/DSLogic-gui/pv/data/analogsnapshot.cpp b/DSView/pv/data/analogsnapshot.cpp
similarity index 100%
rename from DSLogic-gui/pv/data/analogsnapshot.cpp
rename to DSView/pv/data/analogsnapshot.cpp
diff --git a/DSLogic-gui/pv/data/analogsnapshot.h b/DSView/pv/data/analogsnapshot.h
similarity index 100%
rename from DSLogic-gui/pv/data/analogsnapshot.h
rename to DSView/pv/data/analogsnapshot.h
diff --git a/DSLogic-gui/pv/data/decode/annotation.cpp b/DSView/pv/data/decode/annotation.cpp
similarity index 100%
rename from DSLogic-gui/pv/data/decode/annotation.cpp
rename to DSView/pv/data/decode/annotation.cpp
diff --git a/DSLogic-gui/pv/data/decode/annotation.h b/DSView/pv/data/decode/annotation.h
similarity index 100%
rename from DSLogic-gui/pv/data/decode/annotation.h
rename to DSView/pv/data/decode/annotation.h
diff --git a/DSLogic-gui/pv/data/decode/decoder.cpp b/DSView/pv/data/decode/decoder.cpp
similarity index 100%
rename from DSLogic-gui/pv/data/decode/decoder.cpp
rename to DSView/pv/data/decode/decoder.cpp
diff --git a/DSLogic-gui/pv/data/decode/decoder.h b/DSView/pv/data/decode/decoder.h
similarity index 100%
rename from DSLogic-gui/pv/data/decode/decoder.h
rename to DSView/pv/data/decode/decoder.h
diff --git a/DSLogic-gui/pv/data/decode/row.cpp b/DSView/pv/data/decode/row.cpp
similarity index 100%
rename from DSLogic-gui/pv/data/decode/row.cpp
rename to DSView/pv/data/decode/row.cpp
diff --git a/DSLogic-gui/pv/data/decode/row.h b/DSView/pv/data/decode/row.h
similarity index 100%
rename from DSLogic-gui/pv/data/decode/row.h
rename to DSView/pv/data/decode/row.h
diff --git a/DSLogic-gui/pv/data/decode/rowdata.cpp b/DSView/pv/data/decode/rowdata.cpp
similarity index 100%
rename from DSLogic-gui/pv/data/decode/rowdata.cpp
rename to DSView/pv/data/decode/rowdata.cpp
diff --git a/DSLogic-gui/pv/data/decode/rowdata.h b/DSView/pv/data/decode/rowdata.h
similarity index 100%
rename from DSLogic-gui/pv/data/decode/rowdata.h
rename to DSView/pv/data/decode/rowdata.h
diff --git a/DSLogic-gui/pv/data/decoderstack.cpp b/DSView/pv/data/decoderstack.cpp
similarity index 100%
rename from DSLogic-gui/pv/data/decoderstack.cpp
rename to DSView/pv/data/decoderstack.cpp
diff --git a/DSLogic-gui/pv/data/decoderstack.h b/DSView/pv/data/decoderstack.h
similarity index 100%
rename from DSLogic-gui/pv/data/decoderstack.h
rename to DSView/pv/data/decoderstack.h
diff --git a/DSLogic-gui/pv/data/dso.cpp b/DSView/pv/data/dso.cpp
similarity index 100%
rename from DSLogic-gui/pv/data/dso.cpp
rename to DSView/pv/data/dso.cpp
diff --git a/DSLogic-gui/pv/data/dso.h b/DSView/pv/data/dso.h
similarity index 100%
rename from DSLogic-gui/pv/data/dso.h
rename to DSView/pv/data/dso.h
diff --git a/DSLogic-gui/pv/data/dsosnapshot.cpp b/DSView/pv/data/dsosnapshot.cpp
similarity index 100%
rename from DSLogic-gui/pv/data/dsosnapshot.cpp
rename to DSView/pv/data/dsosnapshot.cpp
diff --git a/DSLogic-gui/pv/data/dsosnapshot.h b/DSView/pv/data/dsosnapshot.h
similarity index 100%
rename from DSLogic-gui/pv/data/dsosnapshot.h
rename to DSView/pv/data/dsosnapshot.h
diff --git a/DSLogic-gui/pv/data/group.cpp b/DSView/pv/data/group.cpp
similarity index 100%
rename from DSLogic-gui/pv/data/group.cpp
rename to DSView/pv/data/group.cpp
diff --git a/DSLogic-gui/pv/data/group.h b/DSView/pv/data/group.h
similarity index 100%
rename from DSLogic-gui/pv/data/group.h
rename to DSView/pv/data/group.h
diff --git a/DSLogic-gui/pv/data/groupsnapshot.cpp b/DSView/pv/data/groupsnapshot.cpp
similarity index 100%
rename from DSLogic-gui/pv/data/groupsnapshot.cpp
rename to DSView/pv/data/groupsnapshot.cpp
diff --git a/DSLogic-gui/pv/data/groupsnapshot.h b/DSView/pv/data/groupsnapshot.h
similarity index 100%
rename from DSLogic-gui/pv/data/groupsnapshot.h
rename to DSView/pv/data/groupsnapshot.h
diff --git a/DSLogic-gui/pv/data/logic.cpp b/DSView/pv/data/logic.cpp
similarity index 100%
rename from DSLogic-gui/pv/data/logic.cpp
rename to DSView/pv/data/logic.cpp
diff --git a/DSLogic-gui/pv/data/logic.h b/DSView/pv/data/logic.h
similarity index 100%
rename from DSLogic-gui/pv/data/logic.h
rename to DSView/pv/data/logic.h
diff --git a/DSLogic-gui/pv/data/logicsnapshot.cpp b/DSView/pv/data/logicsnapshot.cpp
similarity index 100%
rename from DSLogic-gui/pv/data/logicsnapshot.cpp
rename to DSView/pv/data/logicsnapshot.cpp
diff --git a/DSLogic-gui/pv/data/logicsnapshot.h b/DSView/pv/data/logicsnapshot.h
similarity index 100%
rename from DSLogic-gui/pv/data/logicsnapshot.h
rename to DSView/pv/data/logicsnapshot.h
diff --git a/DSLogic-gui/pv/data/signaldata.cpp b/DSView/pv/data/signaldata.cpp
similarity index 100%
rename from DSLogic-gui/pv/data/signaldata.cpp
rename to DSView/pv/data/signaldata.cpp
diff --git a/DSLogic-gui/pv/data/signaldata.h b/DSView/pv/data/signaldata.h
similarity index 100%
rename from DSLogic-gui/pv/data/signaldata.h
rename to DSView/pv/data/signaldata.h
diff --git a/DSLogic-gui/pv/data/snapshot.cpp b/DSView/pv/data/snapshot.cpp
similarity index 100%
rename from DSLogic-gui/pv/data/snapshot.cpp
rename to DSView/pv/data/snapshot.cpp
diff --git a/DSLogic-gui/pv/data/snapshot.h b/DSView/pv/data/snapshot.h
similarity index 100%
rename from DSLogic-gui/pv/data/snapshot.h
rename to DSView/pv/data/snapshot.h
diff --git a/DSLogic-gui/pv/device/device.cpp b/DSView/pv/device/device.cpp
similarity index 100%
rename from DSLogic-gui/pv/device/device.cpp
rename to DSView/pv/device/device.cpp
diff --git a/DSLogic-gui/pv/device/device.h b/DSView/pv/device/device.h
similarity index 100%
rename from DSLogic-gui/pv/device/device.h
rename to DSView/pv/device/device.h
diff --git a/DSLogic-gui/pv/device/devinst.cpp b/DSView/pv/device/devinst.cpp
similarity index 100%
rename from DSLogic-gui/pv/device/devinst.cpp
rename to DSView/pv/device/devinst.cpp
diff --git a/DSLogic-gui/pv/device/devinst.h b/DSView/pv/device/devinst.h
similarity index 100%
rename from DSLogic-gui/pv/device/devinst.h
rename to DSView/pv/device/devinst.h
diff --git a/DSLogic-gui/pv/device/file.cpp b/DSView/pv/device/file.cpp
similarity index 100%
rename from DSLogic-gui/pv/device/file.cpp
rename to DSView/pv/device/file.cpp
diff --git a/DSLogic-gui/pv/device/file.h b/DSView/pv/device/file.h
similarity index 100%
rename from DSLogic-gui/pv/device/file.h
rename to DSView/pv/device/file.h
diff --git a/DSLogic-gui/pv/device/inputfile.cpp b/DSView/pv/device/inputfile.cpp
similarity index 100%
rename from DSLogic-gui/pv/device/inputfile.cpp
rename to DSView/pv/device/inputfile.cpp
diff --git a/DSLogic-gui/pv/device/inputfile.h b/DSView/pv/device/inputfile.h
similarity index 100%
rename from DSLogic-gui/pv/device/inputfile.h
rename to DSView/pv/device/inputfile.h
diff --git a/DSLogic-gui/pv/device/sessionfile.cpp b/DSView/pv/device/sessionfile.cpp
similarity index 100%
rename from DSLogic-gui/pv/device/sessionfile.cpp
rename to DSView/pv/device/sessionfile.cpp
diff --git a/DSLogic-gui/pv/device/sessionfile.h b/DSView/pv/device/sessionfile.h
similarity index 100%
rename from DSLogic-gui/pv/device/sessionfile.h
rename to DSView/pv/device/sessionfile.h
diff --git a/DSLogic-gui/pv/devicemanager.cpp b/DSView/pv/devicemanager.cpp
similarity index 100%
rename from DSLogic-gui/pv/devicemanager.cpp
rename to DSView/pv/devicemanager.cpp
diff --git a/DSLogic-gui/pv/devicemanager.h b/DSView/pv/devicemanager.h
similarity index 100%
rename from DSLogic-gui/pv/devicemanager.h
rename to DSView/pv/devicemanager.h
diff --git a/DSLogic-gui/pv/dialogs/about.cpp b/DSView/pv/dialogs/about.cpp
similarity index 100%
rename from DSLogic-gui/pv/dialogs/about.cpp
rename to DSView/pv/dialogs/about.cpp
diff --git a/DSLogic-gui/pv/dialogs/about.h b/DSView/pv/dialogs/about.h
similarity index 100%
rename from DSLogic-gui/pv/dialogs/about.h
rename to DSView/pv/dialogs/about.h
diff --git a/DSLogic-gui/pv/dialogs/about.ui b/DSView/pv/dialogs/about.ui
similarity index 100%
rename from DSLogic-gui/pv/dialogs/about.ui
rename to DSView/pv/dialogs/about.ui
diff --git a/DSLogic-gui/pv/dialogs/deviceoptions.cpp b/DSView/pv/dialogs/deviceoptions.cpp
similarity index 100%
rename from DSLogic-gui/pv/dialogs/deviceoptions.cpp
rename to DSView/pv/dialogs/deviceoptions.cpp
diff --git a/DSLogic-gui/pv/dialogs/deviceoptions.h b/DSView/pv/dialogs/deviceoptions.h
similarity index 100%
rename from DSLogic-gui/pv/dialogs/deviceoptions.h
rename to DSView/pv/dialogs/deviceoptions.h
diff --git a/DSLogic-gui/pv/dialogs/search.cpp b/DSView/pv/dialogs/search.cpp
similarity index 100%
rename from DSLogic-gui/pv/dialogs/search.cpp
rename to DSView/pv/dialogs/search.cpp
diff --git a/DSLogic-gui/pv/dialogs/search.h b/DSView/pv/dialogs/search.h
similarity index 100%
rename from DSLogic-gui/pv/dialogs/search.h
rename to DSView/pv/dialogs/search.h
diff --git a/DSLogic-gui/pv/dialogs/storeprogress.cpp b/DSView/pv/dialogs/storeprogress.cpp
similarity index 100%
rename from DSLogic-gui/pv/dialogs/storeprogress.cpp
rename to DSView/pv/dialogs/storeprogress.cpp
diff --git a/DSLogic-gui/pv/dialogs/storeprogress.h b/DSView/pv/dialogs/storeprogress.h
similarity index 100%
rename from DSLogic-gui/pv/dialogs/storeprogress.h
rename to DSView/pv/dialogs/storeprogress.h
diff --git a/DSLogic-gui/pv/dock/dsotriggerdock.cpp b/DSView/pv/dock/dsotriggerdock.cpp
similarity index 100%
rename from DSLogic-gui/pv/dock/dsotriggerdock.cpp
rename to DSView/pv/dock/dsotriggerdock.cpp
diff --git a/DSLogic-gui/pv/dock/dsotriggerdock.h b/DSView/pv/dock/dsotriggerdock.h
similarity index 100%
rename from DSLogic-gui/pv/dock/dsotriggerdock.h
rename to DSView/pv/dock/dsotriggerdock.h
diff --git a/DSLogic-gui/pv/dock/measuredock.cpp b/DSView/pv/dock/measuredock.cpp
similarity index 100%
rename from DSLogic-gui/pv/dock/measuredock.cpp
rename to DSView/pv/dock/measuredock.cpp
diff --git a/DSLogic-gui/pv/dock/measuredock.h b/DSView/pv/dock/measuredock.h
similarity index 100%
rename from DSLogic-gui/pv/dock/measuredock.h
rename to DSView/pv/dock/measuredock.h
diff --git a/DSLogic-gui/pv/dock/protocoldock.cpp b/DSView/pv/dock/protocoldock.cpp
similarity index 100%
rename from DSLogic-gui/pv/dock/protocoldock.cpp
rename to DSView/pv/dock/protocoldock.cpp
diff --git a/DSLogic-gui/pv/dock/protocoldock.h b/DSView/pv/dock/protocoldock.h
similarity index 100%
rename from DSLogic-gui/pv/dock/protocoldock.h
rename to DSView/pv/dock/protocoldock.h
diff --git a/DSLogic-gui/pv/dock/searchdock.cpp b/DSView/pv/dock/searchdock.cpp
similarity index 100%
rename from DSLogic-gui/pv/dock/searchdock.cpp
rename to DSView/pv/dock/searchdock.cpp
diff --git a/DSLogic-gui/pv/dock/searchdock.h b/DSView/pv/dock/searchdock.h
similarity index 100%
rename from DSLogic-gui/pv/dock/searchdock.h
rename to DSView/pv/dock/searchdock.h
diff --git a/DSLogic-gui/pv/dock/triggerdock.cpp b/DSView/pv/dock/triggerdock.cpp
similarity index 100%
rename from DSLogic-gui/pv/dock/triggerdock.cpp
rename to DSView/pv/dock/triggerdock.cpp
diff --git a/DSLogic-gui/pv/dock/triggerdock.h b/DSView/pv/dock/triggerdock.h
similarity index 100%
rename from DSLogic-gui/pv/dock/triggerdock.h
rename to DSView/pv/dock/triggerdock.h
diff --git a/DSLogic-gui/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
similarity index 100%
rename from DSLogic-gui/pv/mainwindow.cpp
rename to DSView/pv/mainwindow.cpp
diff --git a/DSLogic-gui/pv/mainwindow.h b/DSView/pv/mainwindow.h
similarity index 100%
rename from DSLogic-gui/pv/mainwindow.h
rename to DSView/pv/mainwindow.h
diff --git a/DSLogic-gui/pv/prop/binding/binding.cpp b/DSView/pv/prop/binding/binding.cpp
similarity index 100%
rename from DSLogic-gui/pv/prop/binding/binding.cpp
rename to DSView/pv/prop/binding/binding.cpp
diff --git a/DSLogic-gui/pv/prop/binding/binding.h b/DSView/pv/prop/binding/binding.h
similarity index 100%
rename from DSLogic-gui/pv/prop/binding/binding.h
rename to DSView/pv/prop/binding/binding.h
diff --git a/DSLogic-gui/pv/prop/binding/decoderoptions.cpp b/DSView/pv/prop/binding/decoderoptions.cpp
similarity index 100%
rename from DSLogic-gui/pv/prop/binding/decoderoptions.cpp
rename to DSView/pv/prop/binding/decoderoptions.cpp
diff --git a/DSLogic-gui/pv/prop/binding/decoderoptions.h b/DSView/pv/prop/binding/decoderoptions.h
similarity index 100%
rename from DSLogic-gui/pv/prop/binding/decoderoptions.h
rename to DSView/pv/prop/binding/decoderoptions.h
diff --git a/DSLogic-gui/pv/prop/binding/deviceoptions.cpp b/DSView/pv/prop/binding/deviceoptions.cpp
similarity index 100%
rename from DSLogic-gui/pv/prop/binding/deviceoptions.cpp
rename to DSView/pv/prop/binding/deviceoptions.cpp
diff --git a/DSLogic-gui/pv/prop/binding/deviceoptions.h b/DSView/pv/prop/binding/deviceoptions.h
similarity index 100%
rename from DSLogic-gui/pv/prop/binding/deviceoptions.h
rename to DSView/pv/prop/binding/deviceoptions.h
diff --git a/DSLogic-gui/pv/prop/bool.cpp b/DSView/pv/prop/bool.cpp
similarity index 100%
rename from DSLogic-gui/pv/prop/bool.cpp
rename to DSView/pv/prop/bool.cpp
diff --git a/DSLogic-gui/pv/prop/bool.h b/DSView/pv/prop/bool.h
similarity index 100%
rename from DSLogic-gui/pv/prop/bool.h
rename to DSView/pv/prop/bool.h
diff --git a/DSLogic-gui/pv/prop/double.cpp b/DSView/pv/prop/double.cpp
similarity index 100%
rename from DSLogic-gui/pv/prop/double.cpp
rename to DSView/pv/prop/double.cpp
diff --git a/DSLogic-gui/pv/prop/double.h b/DSView/pv/prop/double.h
similarity index 100%
rename from DSLogic-gui/pv/prop/double.h
rename to DSView/pv/prop/double.h
diff --git a/DSLogic-gui/pv/prop/enum.cpp b/DSView/pv/prop/enum.cpp
similarity index 100%
rename from DSLogic-gui/pv/prop/enum.cpp
rename to DSView/pv/prop/enum.cpp
diff --git a/DSLogic-gui/pv/prop/enum.h b/DSView/pv/prop/enum.h
similarity index 100%
rename from DSLogic-gui/pv/prop/enum.h
rename to DSView/pv/prop/enum.h
diff --git a/DSLogic-gui/pv/prop/int.cpp b/DSView/pv/prop/int.cpp
similarity index 100%
rename from DSLogic-gui/pv/prop/int.cpp
rename to DSView/pv/prop/int.cpp
diff --git a/DSLogic-gui/pv/prop/int.h b/DSView/pv/prop/int.h
similarity index 100%
rename from DSLogic-gui/pv/prop/int.h
rename to DSView/pv/prop/int.h
diff --git a/DSLogic-gui/pv/prop/property.cpp b/DSView/pv/prop/property.cpp
similarity index 100%
rename from DSLogic-gui/pv/prop/property.cpp
rename to DSView/pv/prop/property.cpp
diff --git a/DSLogic-gui/pv/prop/property.h b/DSView/pv/prop/property.h
similarity index 100%
rename from DSLogic-gui/pv/prop/property.h
rename to DSView/pv/prop/property.h
diff --git a/DSLogic-gui/pv/prop/string.cpp b/DSView/pv/prop/string.cpp
similarity index 100%
rename from DSLogic-gui/pv/prop/string.cpp
rename to DSView/pv/prop/string.cpp
diff --git a/DSLogic-gui/pv/prop/string.h b/DSView/pv/prop/string.h
similarity index 100%
rename from DSLogic-gui/pv/prop/string.h
rename to DSView/pv/prop/string.h
diff --git a/DSLogic-gui/pv/sigsession.cpp b/DSView/pv/sigsession.cpp
similarity index 100%
rename from DSLogic-gui/pv/sigsession.cpp
rename to DSView/pv/sigsession.cpp
diff --git a/DSLogic-gui/pv/sigsession.h b/DSView/pv/sigsession.h
similarity index 100%
rename from DSLogic-gui/pv/sigsession.h
rename to DSView/pv/sigsession.h
diff --git a/DSLogic-gui/pv/storesession.cpp b/DSView/pv/storesession.cpp
similarity index 100%
rename from DSLogic-gui/pv/storesession.cpp
rename to DSView/pv/storesession.cpp
diff --git a/DSLogic-gui/pv/storesession.h b/DSView/pv/storesession.h
similarity index 100%
rename from DSLogic-gui/pv/storesession.h
rename to DSView/pv/storesession.h
diff --git a/DSLogic-gui/pv/toolbars/filebar.cpp b/DSView/pv/toolbars/filebar.cpp
similarity index 100%
rename from DSLogic-gui/pv/toolbars/filebar.cpp
rename to DSView/pv/toolbars/filebar.cpp
diff --git a/DSLogic-gui/pv/toolbars/filebar.h b/DSView/pv/toolbars/filebar.h
similarity index 100%
rename from DSLogic-gui/pv/toolbars/filebar.h
rename to DSView/pv/toolbars/filebar.h
diff --git a/DSLogic-gui/pv/toolbars/logobar.cpp b/DSView/pv/toolbars/logobar.cpp
similarity index 100%
rename from DSLogic-gui/pv/toolbars/logobar.cpp
rename to DSView/pv/toolbars/logobar.cpp
diff --git a/DSLogic-gui/pv/toolbars/logobar.h b/DSView/pv/toolbars/logobar.h
similarity index 100%
rename from DSLogic-gui/pv/toolbars/logobar.h
rename to DSView/pv/toolbars/logobar.h
diff --git a/DSLogic-gui/pv/toolbars/samplingbar.cpp b/DSView/pv/toolbars/samplingbar.cpp
similarity index 100%
rename from DSLogic-gui/pv/toolbars/samplingbar.cpp
rename to DSView/pv/toolbars/samplingbar.cpp
diff --git a/DSLogic-gui/pv/toolbars/samplingbar.h b/DSView/pv/toolbars/samplingbar.h
similarity index 100%
rename from DSLogic-gui/pv/toolbars/samplingbar.h
rename to DSView/pv/toolbars/samplingbar.h
diff --git a/DSLogic-gui/pv/toolbars/trigbar.cpp b/DSView/pv/toolbars/trigbar.cpp
similarity index 100%
rename from DSLogic-gui/pv/toolbars/trigbar.cpp
rename to DSView/pv/toolbars/trigbar.cpp
diff --git a/DSLogic-gui/pv/toolbars/trigbar.h b/DSView/pv/toolbars/trigbar.h
similarity index 100%
rename from DSLogic-gui/pv/toolbars/trigbar.h
rename to DSView/pv/toolbars/trigbar.h
diff --git a/DSLogic-gui/pv/view/analogsignal.cpp b/DSView/pv/view/analogsignal.cpp
similarity index 100%
rename from DSLogic-gui/pv/view/analogsignal.cpp
rename to DSView/pv/view/analogsignal.cpp
diff --git a/DSLogic-gui/pv/view/analogsignal.h b/DSView/pv/view/analogsignal.h
similarity index 100%
rename from DSLogic-gui/pv/view/analogsignal.h
rename to DSView/pv/view/analogsignal.h
diff --git a/DSLogic-gui/pv/view/cursor.cpp b/DSView/pv/view/cursor.cpp
similarity index 100%
rename from DSLogic-gui/pv/view/cursor.cpp
rename to DSView/pv/view/cursor.cpp
diff --git a/DSLogic-gui/pv/view/cursor.h b/DSView/pv/view/cursor.h
similarity index 100%
rename from DSLogic-gui/pv/view/cursor.h
rename to DSView/pv/view/cursor.h
diff --git a/DSLogic-gui/pv/view/decodetrace.cpp b/DSView/pv/view/decodetrace.cpp
similarity index 100%
rename from DSLogic-gui/pv/view/decodetrace.cpp
rename to DSView/pv/view/decodetrace.cpp
diff --git a/DSLogic-gui/pv/view/decodetrace.h b/DSView/pv/view/decodetrace.h
similarity index 100%
rename from DSLogic-gui/pv/view/decodetrace.h
rename to DSView/pv/view/decodetrace.h
diff --git a/DSLogic-gui/pv/view/devmode.cpp b/DSView/pv/view/devmode.cpp
similarity index 100%
rename from DSLogic-gui/pv/view/devmode.cpp
rename to DSView/pv/view/devmode.cpp
diff --git a/DSLogic-gui/pv/view/devmode.h b/DSView/pv/view/devmode.h
similarity index 100%
rename from DSLogic-gui/pv/view/devmode.h
rename to DSView/pv/view/devmode.h
diff --git a/DSLogic-gui/pv/view/dsldial.cpp b/DSView/pv/view/dsldial.cpp
similarity index 100%
rename from DSLogic-gui/pv/view/dsldial.cpp
rename to DSView/pv/view/dsldial.cpp
diff --git a/DSLogic-gui/pv/view/dsldial.h b/DSView/pv/view/dsldial.h
similarity index 100%
rename from DSLogic-gui/pv/view/dsldial.h
rename to DSView/pv/view/dsldial.h
diff --git a/DSLogic-gui/pv/view/dsosignal.cpp b/DSView/pv/view/dsosignal.cpp
similarity index 100%
rename from DSLogic-gui/pv/view/dsosignal.cpp
rename to DSView/pv/view/dsosignal.cpp
diff --git a/DSLogic-gui/pv/view/dsosignal.h b/DSView/pv/view/dsosignal.h
similarity index 100%
rename from DSLogic-gui/pv/view/dsosignal.h
rename to DSView/pv/view/dsosignal.h
diff --git a/DSLogic-gui/pv/view/groupsignal.cpp b/DSView/pv/view/groupsignal.cpp
similarity index 100%
rename from DSLogic-gui/pv/view/groupsignal.cpp
rename to DSView/pv/view/groupsignal.cpp
diff --git a/DSLogic-gui/pv/view/groupsignal.h b/DSView/pv/view/groupsignal.h
similarity index 100%
rename from DSLogic-gui/pv/view/groupsignal.h
rename to DSView/pv/view/groupsignal.h
diff --git a/DSLogic-gui/pv/view/header.cpp b/DSView/pv/view/header.cpp
similarity index 100%
rename from DSLogic-gui/pv/view/header.cpp
rename to DSView/pv/view/header.cpp
diff --git a/DSLogic-gui/pv/view/header.h b/DSView/pv/view/header.h
similarity index 100%
rename from DSLogic-gui/pv/view/header.h
rename to DSView/pv/view/header.h
diff --git a/DSLogic-gui/pv/view/logicsignal.cpp b/DSView/pv/view/logicsignal.cpp
similarity index 100%
rename from DSLogic-gui/pv/view/logicsignal.cpp
rename to DSView/pv/view/logicsignal.cpp
diff --git a/DSLogic-gui/pv/view/logicsignal.h b/DSView/pv/view/logicsignal.h
similarity index 100%
rename from DSLogic-gui/pv/view/logicsignal.h
rename to DSView/pv/view/logicsignal.h
diff --git a/DSLogic-gui/pv/view/ruler.cpp b/DSView/pv/view/ruler.cpp
similarity index 100%
rename from DSLogic-gui/pv/view/ruler.cpp
rename to DSView/pv/view/ruler.cpp
diff --git a/DSLogic-gui/pv/view/ruler.h b/DSView/pv/view/ruler.h
similarity index 100%
rename from DSLogic-gui/pv/view/ruler.h
rename to DSView/pv/view/ruler.h
diff --git a/DSLogic-gui/pv/view/selectableitem.cpp b/DSView/pv/view/selectableitem.cpp
similarity index 100%
rename from DSLogic-gui/pv/view/selectableitem.cpp
rename to DSView/pv/view/selectableitem.cpp
diff --git a/DSLogic-gui/pv/view/selectableitem.h b/DSView/pv/view/selectableitem.h
similarity index 100%
rename from DSLogic-gui/pv/view/selectableitem.h
rename to DSView/pv/view/selectableitem.h
diff --git a/DSLogic-gui/pv/view/signal.cpp b/DSView/pv/view/signal.cpp
similarity index 100%
rename from DSLogic-gui/pv/view/signal.cpp
rename to DSView/pv/view/signal.cpp
diff --git a/DSLogic-gui/pv/view/signal.h b/DSView/pv/view/signal.h
similarity index 100%
rename from DSLogic-gui/pv/view/signal.h
rename to DSView/pv/view/signal.h
diff --git a/DSLogic-gui/pv/view/timemarker.cpp b/DSView/pv/view/timemarker.cpp
similarity index 100%
rename from DSLogic-gui/pv/view/timemarker.cpp
rename to DSView/pv/view/timemarker.cpp
diff --git a/DSLogic-gui/pv/view/timemarker.h b/DSView/pv/view/timemarker.h
similarity index 100%
rename from DSLogic-gui/pv/view/timemarker.h
rename to DSView/pv/view/timemarker.h
diff --git a/DSLogic-gui/pv/view/trace.cpp b/DSView/pv/view/trace.cpp
similarity index 100%
rename from DSLogic-gui/pv/view/trace.cpp
rename to DSView/pv/view/trace.cpp
diff --git a/DSLogic-gui/pv/view/trace.h b/DSView/pv/view/trace.h
similarity index 100%
rename from DSLogic-gui/pv/view/trace.h
rename to DSView/pv/view/trace.h
diff --git a/DSLogic-gui/pv/view/view.cpp b/DSView/pv/view/view.cpp
similarity index 100%
rename from DSLogic-gui/pv/view/view.cpp
rename to DSView/pv/view/view.cpp
diff --git a/DSLogic-gui/pv/view/view.h b/DSView/pv/view/view.h
similarity index 100%
rename from DSLogic-gui/pv/view/view.h
rename to DSView/pv/view/view.h
diff --git a/DSLogic-gui/pv/view/viewport.cpp b/DSView/pv/view/viewport.cpp
similarity index 100%
rename from DSLogic-gui/pv/view/viewport.cpp
rename to DSView/pv/view/viewport.cpp
diff --git a/DSLogic-gui/pv/view/viewport.h b/DSView/pv/view/viewport.h
similarity index 100%
rename from DSLogic-gui/pv/view/viewport.h
rename to DSView/pv/view/viewport.h
diff --git a/DSLogic-gui/pv/widgets/decodergroupbox.cpp b/DSView/pv/widgets/decodergroupbox.cpp
similarity index 100%
rename from DSLogic-gui/pv/widgets/decodergroupbox.cpp
rename to DSView/pv/widgets/decodergroupbox.cpp
diff --git a/DSLogic-gui/pv/widgets/decodergroupbox.h b/DSView/pv/widgets/decodergroupbox.h
similarity index 100%
rename from DSLogic-gui/pv/widgets/decodergroupbox.h
rename to DSView/pv/widgets/decodergroupbox.h
diff --git a/DSLogic-gui/pv/widgets/decodermenu.cpp b/DSView/pv/widgets/decodermenu.cpp
similarity index 100%
rename from DSLogic-gui/pv/widgets/decodermenu.cpp
rename to DSView/pv/widgets/decodermenu.cpp
diff --git a/DSLogic-gui/pv/widgets/decodermenu.h b/DSView/pv/widgets/decodermenu.h
similarity index 100%
rename from DSLogic-gui/pv/widgets/decodermenu.h
rename to DSView/pv/widgets/decodermenu.h
diff --git a/DSLogic-gui/pv/widgets/fakelineedit.cpp b/DSView/pv/widgets/fakelineedit.cpp
similarity index 100%
rename from DSLogic-gui/pv/widgets/fakelineedit.cpp
rename to DSView/pv/widgets/fakelineedit.cpp
diff --git a/DSLogic-gui/pv/widgets/fakelineedit.h b/DSView/pv/widgets/fakelineedit.h
similarity index 100%
rename from DSLogic-gui/pv/widgets/fakelineedit.h
rename to DSView/pv/widgets/fakelineedit.h
diff --git a/DSLogic-gui/res/DSLogic.fw b/DSView/res/DSLogic.fw
similarity index 100%
rename from DSLogic-gui/res/DSLogic.fw
rename to DSView/res/DSLogic.fw
diff --git a/DSLogic-gui/res/DSLogic33.bin b/DSView/res/DSLogic33.bin
similarity index 100%
rename from DSLogic-gui/res/DSLogic33.bin
rename to DSView/res/DSLogic33.bin
diff --git a/DSLogic-gui/res/DSLogic50.bin b/DSView/res/DSLogic50.bin
similarity index 100%
rename from DSLogic-gui/res/DSLogic50.bin
rename to DSView/res/DSLogic50.bin
diff --git a/DSLogic-gui/stylesheet.qss b/DSView/stylesheet.qss
similarity index 100%
rename from DSLogic-gui/stylesheet.qss
rename to DSView/stylesheet.qss
diff --git a/DSLogic-gui/test/CMakeLists.txt b/DSView/test/CMakeLists.txt
similarity index 100%
rename from DSLogic-gui/test/CMakeLists.txt
rename to DSView/test/CMakeLists.txt
diff --git a/DSLogic-gui/test/data/analogsnapshot.cpp b/DSView/test/data/analogsnapshot.cpp
similarity index 100%
rename from DSLogic-gui/test/data/analogsnapshot.cpp
rename to DSView/test/data/analogsnapshot.cpp
diff --git a/DSLogic-gui/test/data/logicsnapshot.cpp b/DSView/test/data/logicsnapshot.cpp
similarity index 100%
rename from DSLogic-gui/test/data/logicsnapshot.cpp
rename to DSView/test/data/logicsnapshot.cpp
diff --git a/DSLogic-gui/test/test.cpp b/DSView/test/test.cpp
similarity index 100%
rename from DSLogic-gui/test/test.cpp
rename to DSView/test/test.cpp
diff --git a/libsigrok4DSLogic/AUTHORS b/libsigrok4DSL/AUTHORS
similarity index 100%
rename from libsigrok4DSLogic/AUTHORS
rename to libsigrok4DSL/AUTHORS
diff --git a/libsigrok4DSLogic/COPYING b/libsigrok4DSL/COPYING
similarity index 100%
rename from libsigrok4DSLogic/COPYING
rename to libsigrok4DSL/COPYING
diff --git a/libsigrok4DSLogic/ChangeLog b/libsigrok4DSL/ChangeLog
similarity index 100%
rename from libsigrok4DSLogic/ChangeLog
rename to libsigrok4DSL/ChangeLog
diff --git a/libsigrok4DSLogic/INSTALL b/libsigrok4DSL/INSTALL
similarity index 100%
rename from libsigrok4DSLogic/INSTALL
rename to libsigrok4DSL/INSTALL
diff --git a/libsigrok4DSLogic/Makefile.am b/libsigrok4DSL/Makefile.am
similarity index 100%
rename from libsigrok4DSLogic/Makefile.am
rename to libsigrok4DSL/Makefile.am
diff --git a/libsigrok4DSLogic/NEWS b/libsigrok4DSL/NEWS
similarity index 100%
rename from libsigrok4DSLogic/NEWS
rename to libsigrok4DSL/NEWS
diff --git a/libsigrok4DSLogic/README b/libsigrok4DSL/README
similarity index 100%
rename from libsigrok4DSLogic/README
rename to libsigrok4DSL/README
diff --git a/libsigrok4DSLogic/autogen.sh b/libsigrok4DSL/autogen.sh
similarity index 100%
rename from libsigrok4DSLogic/autogen.sh
rename to libsigrok4DSL/autogen.sh
diff --git a/libsigrok4DSLogic/backend.c b/libsigrok4DSL/backend.c
similarity index 100%
rename from libsigrok4DSLogic/backend.c
rename to libsigrok4DSL/backend.c
diff --git a/libsigrok4DSLogic/configure.ac b/libsigrok4DSL/configure.ac
similarity index 100%
rename from libsigrok4DSLogic/configure.ac
rename to libsigrok4DSL/configure.ac
diff --git a/libsigrok4DSLogic/device.c b/libsigrok4DSL/device.c
similarity index 100%
rename from libsigrok4DSLogic/device.c
rename to libsigrok4DSL/device.c
diff --git a/libsigrok4DSLogic/error.c b/libsigrok4DSL/error.c
similarity index 100%
rename from libsigrok4DSLogic/error.c
rename to libsigrok4DSL/error.c
diff --git a/libsigrok4DSLogic/filter.c b/libsigrok4DSL/filter.c
similarity index 100%
rename from libsigrok4DSLogic/filter.c
rename to libsigrok4DSL/filter.c
diff --git a/libsigrok4DSLogic/hardware/DSLogic/Makefile.am b/libsigrok4DSL/hardware/DSLogic/Makefile.am
similarity index 100%
rename from libsigrok4DSLogic/hardware/DSLogic/Makefile.am
rename to libsigrok4DSL/hardware/DSLogic/Makefile.am
diff --git a/libsigrok4DSLogic/hardware/DSLogic/command.c b/libsigrok4DSL/hardware/DSLogic/command.c
similarity index 100%
rename from libsigrok4DSLogic/hardware/DSLogic/command.c
rename to libsigrok4DSL/hardware/DSLogic/command.c
diff --git a/libsigrok4DSLogic/hardware/DSLogic/command.h b/libsigrok4DSL/hardware/DSLogic/command.h
similarity index 100%
rename from libsigrok4DSLogic/hardware/DSLogic/command.h
rename to libsigrok4DSL/hardware/DSLogic/command.h
diff --git a/libsigrok4DSLogic/hardware/DSLogic/dslogic.c b/libsigrok4DSL/hardware/DSLogic/dslogic.c
similarity index 100%
rename from libsigrok4DSLogic/hardware/DSLogic/dslogic.c
rename to libsigrok4DSL/hardware/DSLogic/dslogic.c
diff --git a/libsigrok4DSLogic/hardware/DSLogic/dslogic.h b/libsigrok4DSL/hardware/DSLogic/dslogic.h
similarity index 100%
rename from libsigrok4DSLogic/hardware/DSLogic/dslogic.h
rename to libsigrok4DSL/hardware/DSLogic/dslogic.h
diff --git a/libsigrok4DSLogic/hardware/Makefile.am b/libsigrok4DSL/hardware/Makefile.am
similarity index 100%
rename from libsigrok4DSLogic/hardware/Makefile.am
rename to libsigrok4DSL/hardware/Makefile.am
diff --git a/libsigrok4DSLogic/hardware/common/Makefile.am b/libsigrok4DSL/hardware/common/Makefile.am
similarity index 100%
rename from libsigrok4DSLogic/hardware/common/Makefile.am
rename to libsigrok4DSL/hardware/common/Makefile.am
diff --git a/libsigrok4DSLogic/hardware/common/ezusb.c b/libsigrok4DSL/hardware/common/ezusb.c
similarity index 100%
rename from libsigrok4DSLogic/hardware/common/ezusb.c
rename to libsigrok4DSL/hardware/common/ezusb.c
diff --git a/libsigrok4DSLogic/hardware/common/usb.c b/libsigrok4DSL/hardware/common/usb.c
similarity index 100%
rename from libsigrok4DSLogic/hardware/common/usb.c
rename to libsigrok4DSL/hardware/common/usb.c
diff --git a/libsigrok4DSLogic/hardware/demo/Makefile.am b/libsigrok4DSL/hardware/demo/Makefile.am
similarity index 100%
rename from libsigrok4DSLogic/hardware/demo/Makefile.am
rename to libsigrok4DSL/hardware/demo/Makefile.am
diff --git a/libsigrok4DSLogic/hardware/demo/demo.c b/libsigrok4DSL/hardware/demo/demo.c
similarity index 100%
rename from libsigrok4DSLogic/hardware/demo/demo.c
rename to libsigrok4DSL/hardware/demo/demo.c
diff --git a/libsigrok4DSLogic/hwdriver.c b/libsigrok4DSL/hwdriver.c
similarity index 100%
rename from libsigrok4DSLogic/hwdriver.c
rename to libsigrok4DSL/hwdriver.c
diff --git a/libsigrok4DSLogic/input/Makefile.am b/libsigrok4DSL/input/Makefile.am
similarity index 100%
rename from libsigrok4DSLogic/input/Makefile.am
rename to libsigrok4DSL/input/Makefile.am
diff --git a/libsigrok4DSLogic/input/in_binary.c b/libsigrok4DSL/input/in_binary.c
similarity index 100%
rename from libsigrok4DSLogic/input/in_binary.c
rename to libsigrok4DSL/input/in_binary.c
diff --git a/libsigrok4DSLogic/input/in_vcd.c b/libsigrok4DSL/input/in_vcd.c
similarity index 100%
rename from libsigrok4DSLogic/input/in_vcd.c
rename to libsigrok4DSL/input/in_vcd.c
diff --git a/libsigrok4DSLogic/input/in_wav.c b/libsigrok4DSL/input/in_wav.c
similarity index 100%
rename from libsigrok4DSLogic/input/in_wav.c
rename to libsigrok4DSL/input/in_wav.c
diff --git a/libsigrok4DSLogic/input/input.c b/libsigrok4DSL/input/input.c
similarity index 100%
rename from libsigrok4DSLogic/input/input.c
rename to libsigrok4DSL/input/input.c
diff --git a/libsigrok4DSLogic/libsigrok-internal.h b/libsigrok4DSL/libsigrok-internal.h
similarity index 100%
rename from libsigrok4DSLogic/libsigrok-internal.h
rename to libsigrok4DSL/libsigrok-internal.h
diff --git a/libsigrok4DSLogic/libsigrok.h b/libsigrok4DSL/libsigrok.h
similarity index 100%
rename from libsigrok4DSLogic/libsigrok.h
rename to libsigrok4DSL/libsigrok.h
diff --git a/libsigrok4DSLogic/libsigrok4DSLogic.pc.in b/libsigrok4DSL/libsigrok4DSLogic.pc.in
similarity index 100%
rename from libsigrok4DSLogic/libsigrok4DSLogic.pc.in
rename to libsigrok4DSL/libsigrok4DSLogic.pc.in
diff --git a/libsigrok4DSLogic/log.c b/libsigrok4DSL/log.c
similarity index 100%
rename from libsigrok4DSLogic/log.c
rename to libsigrok4DSL/log.c
diff --git a/libsigrok4DSLogic/output/Makefile.am b/libsigrok4DSL/output/Makefile.am
similarity index 100%
rename from libsigrok4DSLogic/output/Makefile.am
rename to libsigrok4DSL/output/Makefile.am
diff --git a/libsigrok4DSLogic/output/out_analog.c b/libsigrok4DSL/output/out_analog.c
similarity index 100%
rename from libsigrok4DSLogic/output/out_analog.c
rename to libsigrok4DSL/output/out_analog.c
diff --git a/libsigrok4DSLogic/output/out_binary.c b/libsigrok4DSL/output/out_binary.c
similarity index 100%
rename from libsigrok4DSLogic/output/out_binary.c
rename to libsigrok4DSL/output/out_binary.c
diff --git a/libsigrok4DSLogic/output/out_csv.c b/libsigrok4DSL/output/out_csv.c
similarity index 100%
rename from libsigrok4DSLogic/output/out_csv.c
rename to libsigrok4DSL/output/out_csv.c
diff --git a/libsigrok4DSLogic/output/out_vcd.c b/libsigrok4DSL/output/out_vcd.c
similarity index 100%
rename from libsigrok4DSLogic/output/out_vcd.c
rename to libsigrok4DSL/output/out_vcd.c
diff --git a/libsigrok4DSLogic/output/output.c b/libsigrok4DSL/output/output.c
similarity index 100%
rename from libsigrok4DSLogic/output/output.c
rename to libsigrok4DSL/output/output.c
diff --git a/libsigrok4DSLogic/output/text/Makefile.am b/libsigrok4DSL/output/text/Makefile.am
similarity index 100%
rename from libsigrok4DSLogic/output/text/Makefile.am
rename to libsigrok4DSL/output/text/Makefile.am
diff --git a/libsigrok4DSLogic/output/text/ascii.c b/libsigrok4DSL/output/text/ascii.c
similarity index 100%
rename from libsigrok4DSLogic/output/text/ascii.c
rename to libsigrok4DSL/output/text/ascii.c
diff --git a/libsigrok4DSLogic/output/text/bits.c b/libsigrok4DSL/output/text/bits.c
similarity index 100%
rename from libsigrok4DSLogic/output/text/bits.c
rename to libsigrok4DSL/output/text/bits.c
diff --git a/libsigrok4DSLogic/output/text/hex.c b/libsigrok4DSL/output/text/hex.c
similarity index 100%
rename from libsigrok4DSLogic/output/text/hex.c
rename to libsigrok4DSL/output/text/hex.c
diff --git a/libsigrok4DSLogic/output/text/text.c b/libsigrok4DSL/output/text/text.c
similarity index 100%
rename from libsigrok4DSLogic/output/text/text.c
rename to libsigrok4DSL/output/text/text.c
diff --git a/libsigrok4DSLogic/output/text/text.h b/libsigrok4DSL/output/text/text.h
similarity index 100%
rename from libsigrok4DSLogic/output/text/text.h
rename to libsigrok4DSL/output/text/text.h
diff --git a/libsigrok4DSLogic/proto.h b/libsigrok4DSL/proto.h
similarity index 100%
rename from libsigrok4DSLogic/proto.h
rename to libsigrok4DSL/proto.h
diff --git a/libsigrok4DSLogic/session.c b/libsigrok4DSL/session.c
similarity index 100%
rename from libsigrok4DSLogic/session.c
rename to libsigrok4DSL/session.c
diff --git a/libsigrok4DSLogic/session_driver.c b/libsigrok4DSL/session_driver.c
similarity index 100%
rename from libsigrok4DSLogic/session_driver.c
rename to libsigrok4DSL/session_driver.c
diff --git a/libsigrok4DSLogic/session_file.c b/libsigrok4DSL/session_file.c
similarity index 100%
rename from libsigrok4DSLogic/session_file.c
rename to libsigrok4DSL/session_file.c
diff --git a/libsigrok4DSLogic/std.c b/libsigrok4DSL/std.c
similarity index 100%
rename from libsigrok4DSLogic/std.c
rename to libsigrok4DSL/std.c
diff --git a/libsigrok4DSLogic/strutil.c b/libsigrok4DSL/strutil.c
similarity index 100%
rename from libsigrok4DSLogic/strutil.c
rename to libsigrok4DSL/strutil.c
diff --git a/libsigrok4DSLogic/tests/Makefile.am b/libsigrok4DSL/tests/Makefile.am
similarity index 100%
rename from libsigrok4DSLogic/tests/Makefile.am
rename to libsigrok4DSL/tests/Makefile.am
diff --git a/libsigrok4DSLogic/tests/check_core.c b/libsigrok4DSL/tests/check_core.c
similarity index 100%
rename from libsigrok4DSLogic/tests/check_core.c
rename to libsigrok4DSL/tests/check_core.c
diff --git a/libsigrok4DSLogic/tests/check_driver_all.c b/libsigrok4DSL/tests/check_driver_all.c
similarity index 100%
rename from libsigrok4DSLogic/tests/check_driver_all.c
rename to libsigrok4DSL/tests/check_driver_all.c
diff --git a/libsigrok4DSLogic/tests/check_main.c b/libsigrok4DSL/tests/check_main.c
similarity index 100%
rename from libsigrok4DSLogic/tests/check_main.c
rename to libsigrok4DSL/tests/check_main.c
diff --git a/libsigrok4DSLogic/tests/check_strutil.c b/libsigrok4DSL/tests/check_strutil.c
similarity index 100%
rename from libsigrok4DSLogic/tests/check_strutil.c
rename to libsigrok4DSL/tests/check_strutil.c
diff --git a/libsigrok4DSLogic/tests/lib.c b/libsigrok4DSL/tests/lib.c
similarity index 100%
rename from libsigrok4DSLogic/tests/lib.c
rename to libsigrok4DSL/tests/lib.c
diff --git a/libsigrok4DSLogic/tests/lib.h b/libsigrok4DSL/tests/lib.h
similarity index 100%
rename from libsigrok4DSLogic/tests/lib.h
rename to libsigrok4DSL/tests/lib.h
diff --git a/libsigrok4DSLogic/trigger.c b/libsigrok4DSL/trigger.c
similarity index 100%
rename from libsigrok4DSLogic/trigger.c
rename to libsigrok4DSL/trigger.c
diff --git a/libsigrok4DSLogic/version.c b/libsigrok4DSL/version.c
similarity index 100%
rename from libsigrok4DSLogic/version.c
rename to libsigrok4DSL/version.c
diff --git a/libsigrok4DSLogic/version.h.in b/libsigrok4DSL/version.h.in
similarity index 100%
rename from libsigrok4DSLogic/version.h.in
rename to libsigrok4DSL/version.h.in