diff --git a/ckb-dev-detect b/ckb-next-dev-detect
similarity index 100%
rename from ckb-dev-detect
rename to ckb-next-dev-detect
diff --git a/src/ckb-gradient/main.c b/src/animations/gradient/main.c
similarity index 100%
rename from src/ckb-gradient/main.c
rename to src/animations/gradient/main.c
diff --git a/src/ckb-heat/main.c b/src/animations/heat/main.c
similarity index 100%
rename from src/ckb-heat/main.c
rename to src/animations/heat/main.c
diff --git a/src/ckb-mviz/main.c b/src/animations/mviz/main.c
similarity index 100%
rename from src/ckb-mviz/main.c
rename to src/animations/mviz/main.c
diff --git a/src/ckb-pinwheel/main.c b/src/animations/pinwheel/main.c
similarity index 100%
rename from src/ckb-pinwheel/main.c
rename to src/animations/pinwheel/main.c
diff --git a/src/ckb-rain/main.c b/src/animations/rain/main.c
similarity index 100%
rename from src/ckb-rain/main.c
rename to src/animations/rain/main.c
diff --git a/src/ckb-random/main.c b/src/animations/random/main.c
similarity index 100%
rename from src/ckb-random/main.c
rename to src/animations/random/main.c
diff --git a/src/ckb-ripple/main.c b/src/animations/ripple/main.c
similarity index 100%
rename from src/ckb-ripple/main.c
rename to src/animations/ripple/main.c
diff --git a/src/ckb-wave/main.c b/src/animations/wave/main.c
similarity index 100%
rename from src/ckb-wave/main.c
rename to src/animations/wave/main.c
diff --git a/src/ckb/binary.qrc b/src/ckb/binary.qrc
deleted file mode 100644
index 46cbf6a7..00000000
--- a/src/ckb/binary.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/bin">
-        <file>ckb-next-key.gpg</file>
-    </qresource>
-</RCC>
diff --git a/src/ckb/image.qrc b/src/ckb/image.qrc
deleted file mode 100644
index 001e16e5..00000000
--- a/src/ckb/image.qrc
+++ /dev/null
@@ -1,22 +0,0 @@
-<RCC>
-    <qresource prefix="/img">
-        <file>ckb-logo.png</file>
-        <file>icon_blank.png</file>
-        <file>icon_mode.png</file>
-        <file>icon_mode1.png</file>
-        <file>icon_mode1_hardware.png</file>
-        <file>icon_mode2.png</file>
-        <file>icon_mode2_hardware.png</file>
-        <file>icon_mode3.png</file>
-        <file>icon_mode3_hardware.png</file>
-        <file>icon_plus.png</file>
-        <file>icon_profile.png</file>
-        <file>icon_profile_hardware.png</file>
-        <file>overlay_m65.png</file>
-        <file>overlay_scimitar.png</file>
-        <file>overlay_sabre.png</file>
-        <file>overlay_harpoon.png</file>
-        <file>overlay_glaive.png</file>
-        <file>overlay_polaris.png</file>
-    </qresource>
-</RCC>
diff --git a/src/ckb/text.qrc b/src/ckb/text.qrc
deleted file mode 100644
index a3bb0783..00000000
--- a/src/ckb/text.qrc
+++ /dev/null
@@ -1,7 +0,0 @@
-<RCC>
-    <qresource prefix="/txt">
-        <file>demoprofile.conf</file>
-        <file>ckb.desktop</file>
-        <file>com.ckb.ckb.plist</file>
-    </qresource>
-</RCC>
diff --git a/src/ckb-daemon/command.c b/src/daemon/command.c
similarity index 100%
rename from src/ckb-daemon/command.c
rename to src/daemon/command.c
diff --git a/src/ckb-daemon/command.h b/src/daemon/command.h
similarity index 100%
rename from src/ckb-daemon/command.h
rename to src/daemon/command.h
diff --git a/src/ckb-daemon/device.c b/src/daemon/device.c
similarity index 100%
rename from src/ckb-daemon/device.c
rename to src/daemon/device.c
diff --git a/src/ckb-daemon/device.h b/src/daemon/device.h
similarity index 100%
rename from src/ckb-daemon/device.h
rename to src/daemon/device.h
diff --git a/src/ckb-daemon/device_keyboard.c b/src/daemon/device_keyboard.c
similarity index 100%
rename from src/ckb-daemon/device_keyboard.c
rename to src/daemon/device_keyboard.c
diff --git a/src/ckb-daemon/device_mouse.c b/src/daemon/device_mouse.c
similarity index 100%
rename from src/ckb-daemon/device_mouse.c
rename to src/daemon/device_mouse.c
diff --git a/src/ckb-daemon/device_vtable.c b/src/daemon/device_vtable.c
similarity index 100%
rename from src/ckb-daemon/device_vtable.c
rename to src/daemon/device_vtable.c
diff --git a/src/ckb-daemon/devnode.c b/src/daemon/devnode.c
similarity index 100%
rename from src/ckb-daemon/devnode.c
rename to src/daemon/devnode.c
diff --git a/src/ckb-daemon/devnode.h b/src/daemon/devnode.h
similarity index 100%
rename from src/ckb-daemon/devnode.h
rename to src/daemon/devnode.h
diff --git a/src/ckb-daemon/dpi.c b/src/daemon/dpi.c
similarity index 100%
rename from src/ckb-daemon/dpi.c
rename to src/daemon/dpi.c
diff --git a/src/ckb-daemon/dpi.h b/src/daemon/dpi.h
similarity index 100%
rename from src/ckb-daemon/dpi.h
rename to src/daemon/dpi.h
diff --git a/src/ckb-daemon/extra_mac.c b/src/daemon/extra_mac.c
similarity index 100%
rename from src/ckb-daemon/extra_mac.c
rename to src/daemon/extra_mac.c
diff --git a/src/ckb-daemon/firmware.c b/src/daemon/firmware.c
similarity index 100%
rename from src/ckb-daemon/firmware.c
rename to src/daemon/firmware.c
diff --git a/src/ckb-daemon/firmware.h b/src/daemon/firmware.h
similarity index 100%
rename from src/ckb-daemon/firmware.h
rename to src/daemon/firmware.h
diff --git a/src/ckb-daemon/includes.h b/src/daemon/includes.h
similarity index 100%
rename from src/ckb-daemon/includes.h
rename to src/daemon/includes.h
diff --git a/src/ckb-daemon/input.c b/src/daemon/input.c
similarity index 100%
rename from src/ckb-daemon/input.c
rename to src/daemon/input.c
diff --git a/src/ckb-daemon/input.h b/src/daemon/input.h
similarity index 100%
rename from src/ckb-daemon/input.h
rename to src/daemon/input.h
diff --git a/src/ckb-daemon/input_linux.c b/src/daemon/input_linux.c
similarity index 100%
rename from src/ckb-daemon/input_linux.c
rename to src/daemon/input_linux.c
diff --git a/src/ckb-daemon/input_mac.c b/src/daemon/input_mac.c
similarity index 100%
rename from src/ckb-daemon/input_mac.c
rename to src/daemon/input_mac.c
diff --git a/src/ckb-daemon/input_mac_mouse.c b/src/daemon/input_mac_mouse.c
similarity index 100%
rename from src/ckb-daemon/input_mac_mouse.c
rename to src/daemon/input_mac_mouse.c
diff --git a/src/ckb-daemon/keymap.c b/src/daemon/keymap.c
similarity index 100%
rename from src/ckb-daemon/keymap.c
rename to src/daemon/keymap.c
diff --git a/src/ckb-daemon/keymap.h b/src/daemon/keymap.h
similarity index 100%
rename from src/ckb-daemon/keymap.h
rename to src/daemon/keymap.h
diff --git a/src/ckb-daemon/keymap_mac.h b/src/daemon/keymap_mac.h
similarity index 100%
rename from src/ckb-daemon/keymap_mac.h
rename to src/daemon/keymap_mac.h
diff --git a/src/ckb-daemon/keymap_patch.c b/src/daemon/keymap_patch.c
similarity index 100%
rename from src/ckb-daemon/keymap_patch.c
rename to src/daemon/keymap_patch.c
diff --git a/src/ckb-daemon/keymap_patch.h b/src/daemon/keymap_patch.h
similarity index 100%
rename from src/ckb-daemon/keymap_patch.h
rename to src/daemon/keymap_patch.h
diff --git a/src/ckb-daemon/led.c b/src/daemon/led.c
similarity index 100%
rename from src/ckb-daemon/led.c
rename to src/daemon/led.c
diff --git a/src/ckb-daemon/led.h b/src/daemon/led.h
similarity index 100%
rename from src/ckb-daemon/led.h
rename to src/daemon/led.h
diff --git a/src/ckb-daemon/led_keyboard.c b/src/daemon/led_keyboard.c
similarity index 100%
rename from src/ckb-daemon/led_keyboard.c
rename to src/daemon/led_keyboard.c
diff --git a/src/ckb-daemon/led_mouse.c b/src/daemon/led_mouse.c
similarity index 100%
rename from src/ckb-daemon/led_mouse.c
rename to src/daemon/led_mouse.c
diff --git a/src/ckb-daemon/led_mousepad.c b/src/daemon/led_mousepad.c
similarity index 100%
rename from src/ckb-daemon/led_mousepad.c
rename to src/daemon/led_mousepad.c
diff --git a/src/ckb-daemon/main.c b/src/daemon/main.c
similarity index 100%
rename from src/ckb-daemon/main.c
rename to src/daemon/main.c
diff --git a/src/ckb-daemon/notify.c b/src/daemon/notify.c
similarity index 100%
rename from src/ckb-daemon/notify.c
rename to src/daemon/notify.c
diff --git a/src/ckb-daemon/notify.h b/src/daemon/notify.h
similarity index 100%
rename from src/ckb-daemon/notify.h
rename to src/daemon/notify.h
diff --git a/src/ckb-daemon/os.h b/src/daemon/os.h
similarity index 100%
rename from src/ckb-daemon/os.h
rename to src/daemon/os.h
diff --git a/src/ckb-daemon/profile.c b/src/daemon/profile.c
similarity index 100%
rename from src/ckb-daemon/profile.c
rename to src/daemon/profile.c
diff --git a/src/ckb-daemon/profile.h b/src/daemon/profile.h
similarity index 100%
rename from src/ckb-daemon/profile.h
rename to src/daemon/profile.h
diff --git a/src/ckb-daemon/profile_keyboard.c b/src/daemon/profile_keyboard.c
similarity index 100%
rename from src/ckb-daemon/profile_keyboard.c
rename to src/daemon/profile_keyboard.c
diff --git a/src/ckb-daemon/profile_mouse.c b/src/daemon/profile_mouse.c
similarity index 100%
rename from src/ckb-daemon/profile_mouse.c
rename to src/daemon/profile_mouse.c
diff --git a/src/ckb-daemon/structures.h b/src/daemon/structures.h
similarity index 100%
rename from src/ckb-daemon/structures.h
rename to src/daemon/structures.h
diff --git a/src/ckb-daemon/usb.c b/src/daemon/usb.c
similarity index 100%
rename from src/ckb-daemon/usb.c
rename to src/daemon/usb.c
diff --git a/src/ckb-daemon/usb.h b/src/daemon/usb.h
similarity index 100%
rename from src/ckb-daemon/usb.h
rename to src/daemon/usb.h
diff --git a/src/ckb-daemon/usb_linux.c b/src/daemon/usb_linux.c
similarity index 100%
rename from src/ckb-daemon/usb_linux.c
rename to src/daemon/usb_linux.c
diff --git a/src/ckb-daemon/usb_mac.c b/src/daemon/usb_mac.c
similarity index 100%
rename from src/ckb-daemon/usb_mac.c
rename to src/daemon/usb_mac.c
diff --git a/src/ckb/animadddialog.cpp b/src/gui/animadddialog.cpp
similarity index 100%
rename from src/ckb/animadddialog.cpp
rename to src/gui/animadddialog.cpp
diff --git a/src/ckb/animadddialog.h b/src/gui/animadddialog.h
similarity index 100%
rename from src/ckb/animadddialog.h
rename to src/gui/animadddialog.h
diff --git a/src/ckb/animadddialog.ui b/src/gui/animadddialog.ui
similarity index 100%
rename from src/ckb/animadddialog.ui
rename to src/gui/animadddialog.ui
diff --git a/src/ckb/animscript.cpp b/src/gui/animscript.cpp
similarity index 100%
rename from src/ckb/animscript.cpp
rename to src/gui/animscript.cpp
diff --git a/src/ckb/animscript.h b/src/gui/animscript.h
similarity index 100%
rename from src/ckb/animscript.h
rename to src/gui/animscript.h
diff --git a/src/ckb/animsettingdialog.cpp b/src/gui/animsettingdialog.cpp
similarity index 100%
rename from src/ckb/animsettingdialog.cpp
rename to src/gui/animsettingdialog.cpp
diff --git a/src/ckb/animsettingdialog.h b/src/gui/animsettingdialog.h
similarity index 100%
rename from src/ckb/animsettingdialog.h
rename to src/gui/animsettingdialog.h
diff --git a/src/ckb/animsettingdialog.ui b/src/gui/animsettingdialog.ui
similarity index 100%
rename from src/ckb/animsettingdialog.ui
rename to src/gui/animsettingdialog.ui
diff --git a/src/ckb/autorun.cpp b/src/gui/autorun.cpp
similarity index 100%
rename from src/ckb/autorun.cpp
rename to src/gui/autorun.cpp
diff --git a/src/ckb/autorun.h b/src/gui/autorun.h
similarity index 100%
rename from src/ckb/autorun.h
rename to src/gui/autorun.h
diff --git a/src/ckb/ckb-info.plist b/src/gui/ckb-info.plist
similarity index 100%
rename from src/ckb/ckb-info.plist
rename to src/gui/ckb-info.plist
diff --git a/src/ckb/ckb-logo.icns b/src/gui/ckb-logo.icns
similarity index 100%
rename from src/ckb/ckb-logo.icns
rename to src/gui/ckb-logo.icns
diff --git a/src/ckb/ckb.desktop b/src/gui/ckb.desktop
similarity index 100%
rename from src/ckb/ckb.desktop
rename to src/gui/ckb.desktop
diff --git a/src/ckb/ckbsettings.cpp b/src/gui/ckbsettings.cpp
similarity index 100%
rename from src/ckb/ckbsettings.cpp
rename to src/gui/ckbsettings.cpp
diff --git a/src/ckb/ckbsettings.h b/src/gui/ckbsettings.h
similarity index 100%
rename from src/ckb/ckbsettings.h
rename to src/gui/ckbsettings.h
diff --git a/src/ckb/ckbsettingswriter.cpp b/src/gui/ckbsettingswriter.cpp
similarity index 100%
rename from src/ckb/ckbsettingswriter.cpp
rename to src/gui/ckbsettingswriter.cpp
diff --git a/src/ckb/ckbsettingswriter.h b/src/gui/ckbsettingswriter.h
similarity index 100%
rename from src/ckb/ckbsettingswriter.h
rename to src/gui/ckbsettingswriter.h
diff --git a/src/ckb/colorbutton.cpp b/src/gui/colorbutton.cpp
similarity index 100%
rename from src/ckb/colorbutton.cpp
rename to src/gui/colorbutton.cpp
diff --git a/src/ckb/colorbutton.h b/src/gui/colorbutton.h
similarity index 100%
rename from src/ckb/colorbutton.h
rename to src/gui/colorbutton.h
diff --git a/src/ckb/colormap.cpp b/src/gui/colormap.cpp
similarity index 100%
rename from src/ckb/colormap.cpp
rename to src/gui/colormap.cpp
diff --git a/src/ckb/colormap.h b/src/gui/colormap.h
similarity index 100%
rename from src/ckb/colormap.h
rename to src/gui/colormap.h
diff --git a/src/ckb/com.ckb.ckb.plist b/src/gui/com.ckb.ckb.plist
similarity index 100%
rename from src/ckb/com.ckb.ckb.plist
rename to src/gui/com.ckb.ckb.plist
diff --git a/src/ckb/extrasettingswidget.cpp b/src/gui/extrasettingswidget.cpp
similarity index 100%
rename from src/ckb/extrasettingswidget.cpp
rename to src/gui/extrasettingswidget.cpp
diff --git a/src/ckb/extrasettingswidget.h b/src/gui/extrasettingswidget.h
similarity index 100%
rename from src/ckb/extrasettingswidget.h
rename to src/gui/extrasettingswidget.h
diff --git a/src/ckb/extrasettingswidget.ui b/src/gui/extrasettingswidget.ui
similarity index 100%
rename from src/ckb/extrasettingswidget.ui
rename to src/gui/extrasettingswidget.ui
diff --git a/src/ckb/fwupgradedialog.cpp b/src/gui/fwupgradedialog.cpp
similarity index 100%
rename from src/ckb/fwupgradedialog.cpp
rename to src/gui/fwupgradedialog.cpp
diff --git a/src/ckb/fwupgradedialog.h b/src/gui/fwupgradedialog.h
similarity index 100%
rename from src/ckb/fwupgradedialog.h
rename to src/gui/fwupgradedialog.h
diff --git a/src/ckb/fwupgradedialog.ui b/src/gui/fwupgradedialog.ui
similarity index 100%
rename from src/ckb/fwupgradedialog.ui
rename to src/gui/fwupgradedialog.ui
diff --git a/src/ckb/gradientbutton.cpp b/src/gui/gradientbutton.cpp
similarity index 100%
rename from src/ckb/gradientbutton.cpp
rename to src/gui/gradientbutton.cpp
diff --git a/src/ckb/gradientbutton.h b/src/gui/gradientbutton.h
similarity index 100%
rename from src/ckb/gradientbutton.h
rename to src/gui/gradientbutton.h
diff --git a/src/ckb/gradientdialog.cpp b/src/gui/gradientdialog.cpp
similarity index 100%
rename from src/ckb/gradientdialog.cpp
rename to src/gui/gradientdialog.cpp
diff --git a/src/ckb/gradientdialog.h b/src/gui/gradientdialog.h
similarity index 100%
rename from src/ckb/gradientdialog.h
rename to src/gui/gradientdialog.h
diff --git a/src/ckb/gradientdialog.ui b/src/gui/gradientdialog.ui
similarity index 100%
rename from src/ckb/gradientdialog.ui
rename to src/gui/gradientdialog.ui
diff --git a/src/ckb/gradientdialogwidget.cpp b/src/gui/gradientdialogwidget.cpp
similarity index 100%
rename from src/ckb/gradientdialogwidget.cpp
rename to src/gui/gradientdialogwidget.cpp
diff --git a/src/ckb/gradientdialogwidget.h b/src/gui/gradientdialogwidget.h
similarity index 100%
rename from src/ckb/gradientdialogwidget.h
rename to src/gui/gradientdialogwidget.h
diff --git a/src/ckb/kb.cpp b/src/gui/kb.cpp
similarity index 100%
rename from src/ckb/kb.cpp
rename to src/gui/kb.cpp
diff --git a/src/ckb/kb.h b/src/gui/kb.h
similarity index 100%
rename from src/ckb/kb.h
rename to src/gui/kb.h
diff --git a/src/ckb/kbanim.cpp b/src/gui/kbanim.cpp
similarity index 100%
rename from src/ckb/kbanim.cpp
rename to src/gui/kbanim.cpp
diff --git a/src/ckb/kbanim.h b/src/gui/kbanim.h
similarity index 100%
rename from src/ckb/kbanim.h
rename to src/gui/kbanim.h
diff --git a/src/ckb/kbanimwidget.cpp b/src/gui/kbanimwidget.cpp
similarity index 100%
rename from src/ckb/kbanimwidget.cpp
rename to src/gui/kbanimwidget.cpp
diff --git a/src/ckb/kbanimwidget.h b/src/gui/kbanimwidget.h
similarity index 100%
rename from src/ckb/kbanimwidget.h
rename to src/gui/kbanimwidget.h
diff --git a/src/ckb/kbanimwidget.ui b/src/gui/kbanimwidget.ui
similarity index 100%
rename from src/ckb/kbanimwidget.ui
rename to src/gui/kbanimwidget.ui
diff --git a/src/ckb/kbbind.cpp b/src/gui/kbbind.cpp
similarity index 100%
rename from src/ckb/kbbind.cpp
rename to src/gui/kbbind.cpp
diff --git a/src/ckb/kbbind.h b/src/gui/kbbind.h
similarity index 100%
rename from src/ckb/kbbind.h
rename to src/gui/kbbind.h
diff --git a/src/ckb/kbbindwidget.cpp b/src/gui/kbbindwidget.cpp
similarity index 100%
rename from src/ckb/kbbindwidget.cpp
rename to src/gui/kbbindwidget.cpp
diff --git a/src/ckb/kbbindwidget.h b/src/gui/kbbindwidget.h
similarity index 100%
rename from src/ckb/kbbindwidget.h
rename to src/gui/kbbindwidget.h
diff --git a/src/ckb/kbbindwidget.ui b/src/gui/kbbindwidget.ui
similarity index 100%
rename from src/ckb/kbbindwidget.ui
rename to src/gui/kbbindwidget.ui
diff --git a/src/ckb/kbfirmware.cpp b/src/gui/kbfirmware.cpp
similarity index 100%
rename from src/ckb/kbfirmware.cpp
rename to src/gui/kbfirmware.cpp
diff --git a/src/ckb/kbfirmware.h b/src/gui/kbfirmware.h
similarity index 100%
rename from src/ckb/kbfirmware.h
rename to src/gui/kbfirmware.h
diff --git a/src/ckb/kblight.cpp b/src/gui/kblight.cpp
similarity index 100%
rename from src/ckb/kblight.cpp
rename to src/gui/kblight.cpp
diff --git a/src/ckb/kblight.h b/src/gui/kblight.h
similarity index 100%
rename from src/ckb/kblight.h
rename to src/gui/kblight.h
diff --git a/src/ckb/kblightwidget.cpp b/src/gui/kblightwidget.cpp
similarity index 100%
rename from src/ckb/kblightwidget.cpp
rename to src/gui/kblightwidget.cpp
diff --git a/src/ckb/kblightwidget.h b/src/gui/kblightwidget.h
similarity index 100%
rename from src/ckb/kblightwidget.h
rename to src/gui/kblightwidget.h
diff --git a/src/ckb/kblightwidget.ui b/src/gui/kblightwidget.ui
similarity index 100%
rename from src/ckb/kblightwidget.ui
rename to src/gui/kblightwidget.ui
diff --git a/src/ckb/kbmanager.cpp b/src/gui/kbmanager.cpp
similarity index 100%
rename from src/ckb/kbmanager.cpp
rename to src/gui/kbmanager.cpp
diff --git a/src/ckb/kbmanager.h b/src/gui/kbmanager.h
similarity index 100%
rename from src/ckb/kbmanager.h
rename to src/gui/kbmanager.h
diff --git a/src/ckb/kbmode.cpp b/src/gui/kbmode.cpp
similarity index 100%
rename from src/ckb/kbmode.cpp
rename to src/gui/kbmode.cpp
diff --git a/src/ckb/kbmode.h b/src/gui/kbmode.h
similarity index 100%
rename from src/ckb/kbmode.h
rename to src/gui/kbmode.h
diff --git a/src/ckb/kbperf.cpp b/src/gui/kbperf.cpp
similarity index 100%
rename from src/ckb/kbperf.cpp
rename to src/gui/kbperf.cpp
diff --git a/src/ckb/kbperf.h b/src/gui/kbperf.h
similarity index 100%
rename from src/ckb/kbperf.h
rename to src/gui/kbperf.h
diff --git a/src/ckb/kbprofile.cpp b/src/gui/kbprofile.cpp
similarity index 100%
rename from src/ckb/kbprofile.cpp
rename to src/gui/kbprofile.cpp
diff --git a/src/ckb/kbprofile.h b/src/gui/kbprofile.h
similarity index 100%
rename from src/ckb/kbprofile.h
rename to src/gui/kbprofile.h
diff --git a/src/ckb/kbprofiledialog.cpp b/src/gui/kbprofiledialog.cpp
similarity index 100%
rename from src/ckb/kbprofiledialog.cpp
rename to src/gui/kbprofiledialog.cpp
diff --git a/src/ckb/kbprofiledialog.h b/src/gui/kbprofiledialog.h
similarity index 100%
rename from src/ckb/kbprofiledialog.h
rename to src/gui/kbprofiledialog.h
diff --git a/src/ckb/kbprofiledialog.ui b/src/gui/kbprofiledialog.ui
similarity index 100%
rename from src/ckb/kbprofiledialog.ui
rename to src/gui/kbprofiledialog.ui
diff --git a/src/ckb/kbwidget.cpp b/src/gui/kbwidget.cpp
similarity index 100%
rename from src/ckb/kbwidget.cpp
rename to src/gui/kbwidget.cpp
diff --git a/src/ckb/kbwidget.h b/src/gui/kbwidget.h
similarity index 100%
rename from src/ckb/kbwidget.h
rename to src/gui/kbwidget.h
diff --git a/src/ckb/kbwidget.ui b/src/gui/kbwidget.ui
similarity index 100%
rename from src/ckb/kbwidget.ui
rename to src/gui/kbwidget.ui
diff --git a/src/ckb/keyaction.cpp b/src/gui/keyaction.cpp
similarity index 100%
rename from src/ckb/keyaction.cpp
rename to src/gui/keyaction.cpp
diff --git a/src/ckb/keyaction.h b/src/gui/keyaction.h
similarity index 100%
rename from src/ckb/keyaction.h
rename to src/gui/keyaction.h
diff --git a/src/ckb/keymap.cpp b/src/gui/keymap.cpp
similarity index 100%
rename from src/ckb/keymap.cpp
rename to src/gui/keymap.cpp
diff --git a/src/ckb/keymap.h b/src/gui/keymap.h
similarity index 100%
rename from src/ckb/keymap.h
rename to src/gui/keymap.h
diff --git a/src/ckb/keywidget.cpp b/src/gui/keywidget.cpp
similarity index 100%
rename from src/ckb/keywidget.cpp
rename to src/gui/keywidget.cpp
diff --git a/src/ckb/keywidget.h b/src/gui/keywidget.h
similarity index 100%
rename from src/ckb/keywidget.h
rename to src/gui/keywidget.h
diff --git a/src/ckb/kperfwidget.cpp b/src/gui/kperfwidget.cpp
similarity index 100%
rename from src/ckb/kperfwidget.cpp
rename to src/gui/kperfwidget.cpp
diff --git a/src/ckb/kperfwidget.h b/src/gui/kperfwidget.h
similarity index 100%
rename from src/ckb/kperfwidget.h
rename to src/gui/kperfwidget.h
diff --git a/src/ckb/kperfwidget.ui b/src/gui/kperfwidget.ui
similarity index 100%
rename from src/ckb/kperfwidget.ui
rename to src/gui/kperfwidget.ui
diff --git a/src/ckb/layoutdialog.cpp b/src/gui/layoutdialog.cpp
similarity index 100%
rename from src/ckb/layoutdialog.cpp
rename to src/gui/layoutdialog.cpp
diff --git a/src/ckb/layoutdialog.h b/src/gui/layoutdialog.h
similarity index 100%
rename from src/ckb/layoutdialog.h
rename to src/gui/layoutdialog.h
diff --git a/src/ckb/layoutdialog.ui b/src/gui/layoutdialog.ui
similarity index 100%
rename from src/ckb/layoutdialog.ui
rename to src/gui/layoutdialog.ui
diff --git a/src/ckb/macroreader.cpp b/src/gui/macroreader.cpp
similarity index 100%
rename from src/ckb/macroreader.cpp
rename to src/gui/macroreader.cpp
diff --git a/src/ckb/macroreader.h b/src/gui/macroreader.h
similarity index 100%
rename from src/ckb/macroreader.h
rename to src/gui/macroreader.h
diff --git a/src/ckb/main.cpp b/src/gui/main.cpp
similarity index 100%
rename from src/ckb/main.cpp
rename to src/gui/main.cpp
diff --git a/src/ckb/mainwindow.cpp b/src/gui/mainwindow.cpp
similarity index 100%
rename from src/ckb/mainwindow.cpp
rename to src/gui/mainwindow.cpp
diff --git a/src/ckb/mainwindow.h b/src/gui/mainwindow.h
similarity index 100%
rename from src/ckb/mainwindow.h
rename to src/gui/mainwindow.h
diff --git a/src/ckb/mainwindow.ui b/src/gui/mainwindow.ui
similarity index 100%
rename from src/ckb/mainwindow.ui
rename to src/gui/mainwindow.ui
diff --git a/src/ckb/media.h b/src/gui/media.h
similarity index 100%
rename from src/ckb/media.h
rename to src/gui/media.h
diff --git a/src/ckb/media_linux.cpp b/src/gui/media_linux.cpp
similarity index 100%
rename from src/ckb/media_linux.cpp
rename to src/gui/media_linux.cpp
diff --git a/src/ckb/media_mac.m b/src/gui/media_mac.m
similarity index 100%
rename from src/ckb/media_mac.m
rename to src/gui/media_mac.m
diff --git a/src/ckb/modeselectdialog.cpp b/src/gui/modeselectdialog.cpp
similarity index 100%
rename from src/ckb/modeselectdialog.cpp
rename to src/gui/modeselectdialog.cpp
diff --git a/src/ckb/modeselectdialog.h b/src/gui/modeselectdialog.h
similarity index 100%
rename from src/ckb/modeselectdialog.h
rename to src/gui/modeselectdialog.h
diff --git a/src/ckb/modeselectdialog.ui b/src/gui/modeselectdialog.ui
similarity index 100%
rename from src/ckb/modeselectdialog.ui
rename to src/gui/modeselectdialog.ui
diff --git a/src/ckb/mperfwidget.cpp b/src/gui/mperfwidget.cpp
similarity index 100%
rename from src/ckb/mperfwidget.cpp
rename to src/gui/mperfwidget.cpp
diff --git a/src/ckb/mperfwidget.h b/src/gui/mperfwidget.h
similarity index 100%
rename from src/ckb/mperfwidget.h
rename to src/gui/mperfwidget.h
diff --git a/src/ckb/mperfwidget.ui b/src/gui/mperfwidget.ui
similarity index 100%
rename from src/ckb/mperfwidget.ui
rename to src/gui/mperfwidget.ui
diff --git a/src/ckb/rebindwidget.cpp b/src/gui/rebindwidget.cpp
similarity index 100%
rename from src/ckb/rebindwidget.cpp
rename to src/gui/rebindwidget.cpp
diff --git a/src/ckb/rebindwidget.h b/src/gui/rebindwidget.h
similarity index 100%
rename from src/ckb/rebindwidget.h
rename to src/gui/rebindwidget.h
diff --git a/src/ckb/rebindwidget.ui b/src/gui/rebindwidget.ui
similarity index 100%
rename from src/ckb/rebindwidget.ui
rename to src/gui/rebindwidget.ui
diff --git a/src/ckb/ckb-next-key.gpg b/src/gui/resources/ckb-next-key.gpg
similarity index 100%
rename from src/ckb/ckb-next-key.gpg
rename to src/gui/resources/ckb-next-key.gpg
diff --git a/src/ckb/ckb-logo.png b/src/gui/resources/ckb-next-logo.png
similarity index 100%
rename from src/ckb/ckb-logo.png
rename to src/gui/resources/ckb-next-logo.png
diff --git a/src/ckb/demoprofile.conf b/src/gui/resources/demoprofile.conf
similarity index 100%
rename from src/ckb/demoprofile.conf
rename to src/gui/resources/demoprofile.conf
diff --git a/src/ckb/icon_blank.png b/src/gui/resources/icon_blank.png
similarity index 100%
rename from src/ckb/icon_blank.png
rename to src/gui/resources/icon_blank.png
diff --git a/src/ckb/icon_mode.png b/src/gui/resources/icon_mode.png
similarity index 100%
rename from src/ckb/icon_mode.png
rename to src/gui/resources/icon_mode.png
diff --git a/src/ckb/icon_mode1.png b/src/gui/resources/icon_mode1.png
similarity index 100%
rename from src/ckb/icon_mode1.png
rename to src/gui/resources/icon_mode1.png
diff --git a/src/ckb/icon_mode1_hardware.png b/src/gui/resources/icon_mode1_hardware.png
similarity index 100%
rename from src/ckb/icon_mode1_hardware.png
rename to src/gui/resources/icon_mode1_hardware.png
diff --git a/src/ckb/icon_mode2.png b/src/gui/resources/icon_mode2.png
similarity index 100%
rename from src/ckb/icon_mode2.png
rename to src/gui/resources/icon_mode2.png
diff --git a/src/ckb/icon_mode2_hardware.png b/src/gui/resources/icon_mode2_hardware.png
similarity index 100%
rename from src/ckb/icon_mode2_hardware.png
rename to src/gui/resources/icon_mode2_hardware.png
diff --git a/src/ckb/icon_mode3.png b/src/gui/resources/icon_mode3.png
similarity index 100%
rename from src/ckb/icon_mode3.png
rename to src/gui/resources/icon_mode3.png
diff --git a/src/ckb/icon_mode3_hardware.png b/src/gui/resources/icon_mode3_hardware.png
similarity index 100%
rename from src/ckb/icon_mode3_hardware.png
rename to src/gui/resources/icon_mode3_hardware.png
diff --git a/src/ckb/icon_plus.png b/src/gui/resources/icon_plus.png
similarity index 100%
rename from src/ckb/icon_plus.png
rename to src/gui/resources/icon_plus.png
diff --git a/src/ckb/icon_profile.png b/src/gui/resources/icon_profile.png
similarity index 100%
rename from src/ckb/icon_profile.png
rename to src/gui/resources/icon_profile.png
diff --git a/src/ckb/icon_profile_hardware.png b/src/gui/resources/icon_profile_hardware.png
similarity index 100%
rename from src/ckb/icon_profile_hardware.png
rename to src/gui/resources/icon_profile_hardware.png
diff --git a/src/ckb/overlay_glaive.png b/src/gui/resources/overlay_glaive.png
similarity index 100%
rename from src/ckb/overlay_glaive.png
rename to src/gui/resources/overlay_glaive.png
diff --git a/src/ckb/overlay_glaive.svg b/src/gui/resources/overlay_glaive.svg
similarity index 100%
rename from src/ckb/overlay_glaive.svg
rename to src/gui/resources/overlay_glaive.svg
diff --git a/src/ckb/overlay_harpoon.png b/src/gui/resources/overlay_harpoon.png
similarity index 100%
rename from src/ckb/overlay_harpoon.png
rename to src/gui/resources/overlay_harpoon.png
diff --git a/src/ckb/overlay_harpoon.svg b/src/gui/resources/overlay_harpoon.svg
similarity index 100%
rename from src/ckb/overlay_harpoon.svg
rename to src/gui/resources/overlay_harpoon.svg
diff --git a/src/ckb/overlay_m65.png b/src/gui/resources/overlay_m65.png
similarity index 100%
rename from src/ckb/overlay_m65.png
rename to src/gui/resources/overlay_m65.png
diff --git a/src/ckb/overlay_polaris.png b/src/gui/resources/overlay_polaris.png
similarity index 100%
rename from src/ckb/overlay_polaris.png
rename to src/gui/resources/overlay_polaris.png
diff --git a/src/ckb/overlay_polaris.svg b/src/gui/resources/overlay_polaris.svg
similarity index 100%
rename from src/ckb/overlay_polaris.svg
rename to src/gui/resources/overlay_polaris.svg
diff --git a/src/ckb/overlay_sabre.png b/src/gui/resources/overlay_sabre.png
similarity index 100%
rename from src/ckb/overlay_sabre.png
rename to src/gui/resources/overlay_sabre.png
diff --git a/src/ckb/overlay_scimitar.png b/src/gui/resources/overlay_scimitar.png
similarity index 100%
rename from src/ckb/overlay_scimitar.png
rename to src/gui/resources/overlay_scimitar.png
diff --git a/src/ckb/rlistwidget.cpp b/src/gui/rlistwidget.cpp
similarity index 100%
rename from src/ckb/rlistwidget.cpp
rename to src/gui/rlistwidget.cpp
diff --git a/src/ckb/rlistwidget.h b/src/gui/rlistwidget.h
similarity index 100%
rename from src/ckb/rlistwidget.h
rename to src/gui/rlistwidget.h
diff --git a/src/ckb/settingswidget.cpp b/src/gui/settingswidget.cpp
similarity index 100%
rename from src/ckb/settingswidget.cpp
rename to src/gui/settingswidget.cpp
diff --git a/src/ckb/settingswidget.h b/src/gui/settingswidget.h
similarity index 100%
rename from src/ckb/settingswidget.h
rename to src/gui/settingswidget.h
diff --git a/src/ckb/settingswidget.ui b/src/gui/settingswidget.ui
similarity index 100%
rename from src/ckb/settingswidget.ui
rename to src/gui/settingswidget.ui
diff --git a/src/ckb/ckb-anim.h b/src/libs/ckb-next/include/ckb-next/animation.h
similarity index 100%
rename from src/ckb/ckb-anim.h
rename to src/libs/ckb-next/include/ckb-next/animation.h
diff --git a/src/ckb-mviz/COPYING b/src/libs/kissfft/COPYING
similarity index 100%
rename from src/ckb-mviz/COPYING
rename to src/libs/kissfft/COPYING
diff --git a/src/ckb-mviz/_kiss_fft_guts.h b/src/libs/kissfft/include/kissfft/_kiss_fft_guts.h
similarity index 100%
rename from src/ckb-mviz/_kiss_fft_guts.h
rename to src/libs/kissfft/include/kissfft/_kiss_fft_guts.h
diff --git a/src/ckb-mviz/kiss_fft.h b/src/libs/kissfft/include/kissfft/kiss_fft.h
similarity index 100%
rename from src/ckb-mviz/kiss_fft.h
rename to src/libs/kissfft/include/kissfft/kiss_fft.h
diff --git a/src/ckb-mviz/kiss_fftr.h b/src/libs/kissfft/include/kissfft/kiss_fftr.h
similarity index 100%
rename from src/ckb-mviz/kiss_fftr.h
rename to src/libs/kissfft/include/kissfft/kiss_fftr.h
diff --git a/src/ckb-mviz/kiss_fft.c b/src/libs/kissfft/kiss_fft.c
similarity index 100%
rename from src/ckb-mviz/kiss_fft.c
rename to src/libs/kissfft/kiss_fft.c
diff --git a/src/ckb-mviz/kiss_fftr.c b/src/libs/kissfft/kiss_fftr.c
similarity index 100%
rename from src/ckb-mviz/kiss_fftr.c
rename to src/libs/kissfft/kiss_fftr.c
diff --git a/src/ckb/quazip/COPYING b/src/libs/quazip/COPYING
similarity index 100%
rename from src/ckb/quazip/COPYING
rename to src/libs/quazip/COPYING
diff --git a/src/ckb/quazip/JlCompress.cpp b/src/libs/quazip/JlCompress.cpp
similarity index 100%
rename from src/ckb/quazip/JlCompress.cpp
rename to src/libs/quazip/JlCompress.cpp
diff --git a/src/ckb/quazip/JlCompress.h b/src/libs/quazip/JlCompress.h
similarity index 100%
rename from src/ckb/quazip/JlCompress.h
rename to src/libs/quazip/JlCompress.h
diff --git a/src/ckb/quazip/crypt.h b/src/libs/quazip/crypt.h
similarity index 100%
rename from src/ckb/quazip/crypt.h
rename to src/libs/quazip/crypt.h
diff --git a/src/ckb/quazip/ioapi.h b/src/libs/quazip/ioapi.h
similarity index 100%
rename from src/ckb/quazip/ioapi.h
rename to src/libs/quazip/ioapi.h
diff --git a/src/ckb/quazip/qioapi.cpp b/src/libs/quazip/qioapi.cpp
similarity index 100%
rename from src/ckb/quazip/qioapi.cpp
rename to src/libs/quazip/qioapi.cpp
diff --git a/src/ckb/quazip/quaadler32.cpp b/src/libs/quazip/quaadler32.cpp
similarity index 100%
rename from src/ckb/quazip/quaadler32.cpp
rename to src/libs/quazip/quaadler32.cpp
diff --git a/src/ckb/quazip/quaadler32.h b/src/libs/quazip/quaadler32.h
similarity index 100%
rename from src/ckb/quazip/quaadler32.h
rename to src/libs/quazip/quaadler32.h
diff --git a/src/ckb/quazip/quachecksum32.h b/src/libs/quazip/quachecksum32.h
similarity index 100%
rename from src/ckb/quazip/quachecksum32.h
rename to src/libs/quazip/quachecksum32.h
diff --git a/src/ckb/quazip/quacrc32.cpp b/src/libs/quazip/quacrc32.cpp
similarity index 100%
rename from src/ckb/quazip/quacrc32.cpp
rename to src/libs/quazip/quacrc32.cpp
diff --git a/src/ckb/quazip/quacrc32.h b/src/libs/quazip/quacrc32.h
similarity index 100%
rename from src/ckb/quazip/quacrc32.h
rename to src/libs/quazip/quacrc32.h
diff --git a/src/ckb/quazip/quagzipfile.cpp b/src/libs/quazip/quagzipfile.cpp
similarity index 100%
rename from src/ckb/quazip/quagzipfile.cpp
rename to src/libs/quazip/quagzipfile.cpp
diff --git a/src/ckb/quazip/quagzipfile.h b/src/libs/quazip/quagzipfile.h
similarity index 100%
rename from src/ckb/quazip/quagzipfile.h
rename to src/libs/quazip/quagzipfile.h
diff --git a/src/ckb/quazip/quaziodevice.cpp b/src/libs/quazip/quaziodevice.cpp
similarity index 100%
rename from src/ckb/quazip/quaziodevice.cpp
rename to src/libs/quazip/quaziodevice.cpp
diff --git a/src/ckb/quazip/quaziodevice.h b/src/libs/quazip/quaziodevice.h
similarity index 100%
rename from src/ckb/quazip/quaziodevice.h
rename to src/libs/quazip/quaziodevice.h
diff --git a/src/ckb/quazip/quazip.cpp b/src/libs/quazip/quazip.cpp
similarity index 100%
rename from src/ckb/quazip/quazip.cpp
rename to src/libs/quazip/quazip.cpp
diff --git a/src/ckb/quazip/quazip.h b/src/libs/quazip/quazip.h
similarity index 100%
rename from src/ckb/quazip/quazip.h
rename to src/libs/quazip/quazip.h
diff --git a/src/ckb/quazip/quazip_global.h b/src/libs/quazip/quazip_global.h
similarity index 100%
rename from src/ckb/quazip/quazip_global.h
rename to src/libs/quazip/quazip_global.h
diff --git a/src/ckb/quazip/quazipdir.cpp b/src/libs/quazip/quazipdir.cpp
similarity index 100%
rename from src/ckb/quazip/quazipdir.cpp
rename to src/libs/quazip/quazipdir.cpp
diff --git a/src/ckb/quazip/quazipdir.h b/src/libs/quazip/quazipdir.h
similarity index 100%
rename from src/ckb/quazip/quazipdir.h
rename to src/libs/quazip/quazipdir.h
diff --git a/src/ckb/quazip/quazipfile.cpp b/src/libs/quazip/quazipfile.cpp
similarity index 100%
rename from src/ckb/quazip/quazipfile.cpp
rename to src/libs/quazip/quazipfile.cpp
diff --git a/src/ckb/quazip/quazipfile.h b/src/libs/quazip/quazipfile.h
similarity index 100%
rename from src/ckb/quazip/quazipfile.h
rename to src/libs/quazip/quazipfile.h
diff --git a/src/ckb/quazip/quazipfileinfo.cpp b/src/libs/quazip/quazipfileinfo.cpp
similarity index 100%
rename from src/ckb/quazip/quazipfileinfo.cpp
rename to src/libs/quazip/quazipfileinfo.cpp
diff --git a/src/ckb/quazip/quazipfileinfo.h b/src/libs/quazip/quazipfileinfo.h
similarity index 100%
rename from src/ckb/quazip/quazipfileinfo.h
rename to src/libs/quazip/quazipfileinfo.h
diff --git a/src/ckb/quazip/quazipnewinfo.cpp b/src/libs/quazip/quazipnewinfo.cpp
similarity index 100%
rename from src/ckb/quazip/quazipnewinfo.cpp
rename to src/libs/quazip/quazipnewinfo.cpp
diff --git a/src/ckb/quazip/quazipnewinfo.h b/src/libs/quazip/quazipnewinfo.h
similarity index 100%
rename from src/ckb/quazip/quazipnewinfo.h
rename to src/libs/quazip/quazipnewinfo.h
diff --git a/src/ckb/quazip/unzip.c b/src/libs/quazip/unzip.c
similarity index 100%
rename from src/ckb/quazip/unzip.c
rename to src/libs/quazip/unzip.c
diff --git a/src/ckb/quazip/unzip.h b/src/libs/quazip/unzip.h
similarity index 100%
rename from src/ckb/quazip/unzip.h
rename to src/libs/quazip/unzip.h
diff --git a/src/ckb/quazip/zip.c b/src/libs/quazip/zip.c
similarity index 100%
rename from src/ckb/quazip/zip.c
rename to src/libs/quazip/zip.c
diff --git a/src/ckb/quazip/zip.h b/src/libs/quazip/zip.h
similarity index 100%
rename from src/ckb/quazip/zip.h
rename to src/libs/quazip/zip.h