diff --git a/src/widgets/automatable_button.cpp b/src/gui/widgets/automatable_button.cpp
similarity index 100%
rename from src/widgets/automatable_button.cpp
rename to src/gui/widgets/automatable_button.cpp
diff --git a/src/widgets/automatable_slider.cpp b/src/gui/widgets/automatable_slider.cpp
similarity index 100%
rename from src/widgets/automatable_slider.cpp
rename to src/gui/widgets/automatable_slider.cpp
diff --git a/src/widgets/caption_menu.cpp b/src/gui/widgets/caption_menu.cpp
similarity index 100%
rename from src/widgets/caption_menu.cpp
rename to src/gui/widgets/caption_menu.cpp
diff --git a/src/widgets/combobox.cpp b/src/gui/widgets/combobox.cpp
similarity index 100%
rename from src/widgets/combobox.cpp
rename to src/gui/widgets/combobox.cpp
diff --git a/src/widgets/cpuload_widget.cpp b/src/gui/widgets/cpuload_widget.cpp
similarity index 100%
rename from src/widgets/cpuload_widget.cpp
rename to src/gui/widgets/cpuload_widget.cpp
diff --git a/src/widgets/effect_label.cpp b/src/gui/widgets/effect_label.cpp
similarity index 100%
rename from src/widgets/effect_label.cpp
rename to src/gui/widgets/effect_label.cpp
diff --git a/src/widgets/effect_rack_view.cpp b/src/gui/widgets/effect_rack_view.cpp
similarity index 100%
rename from src/widgets/effect_rack_view.cpp
rename to src/gui/widgets/effect_rack_view.cpp
diff --git a/src/widgets/effect_view.cpp b/src/gui/widgets/effect_view.cpp
similarity index 100%
rename from src/widgets/effect_view.cpp
rename to src/gui/widgets/effect_view.cpp
diff --git a/src/widgets/envelope_and_lfo_view.cpp b/src/gui/widgets/envelope_and_lfo_view.cpp
similarity index 100%
rename from src/widgets/envelope_and_lfo_view.cpp
rename to src/gui/widgets/envelope_and_lfo_view.cpp
diff --git a/src/widgets/fade_button.cpp b/src/gui/widgets/fade_button.cpp
similarity index 100%
rename from src/widgets/fade_button.cpp
rename to src/gui/widgets/fade_button.cpp
diff --git a/src/widgets/fader.cpp b/src/gui/widgets/fader.cpp
similarity index 100%
rename from src/widgets/fader.cpp
rename to src/gui/widgets/fader.cpp
diff --git a/src/widgets/graph.cpp b/src/gui/widgets/graph.cpp
similarity index 100%
rename from src/widgets/graph.cpp
rename to src/gui/widgets/graph.cpp
diff --git a/src/widgets/group_box.cpp b/src/gui/widgets/group_box.cpp
similarity index 100%
rename from src/widgets/group_box.cpp
rename to src/gui/widgets/group_box.cpp
diff --git a/src/widgets/instrument_function_views.cpp b/src/gui/widgets/instrument_function_views.cpp
similarity index 100%
rename from src/widgets/instrument_function_views.cpp
rename to src/gui/widgets/instrument_function_views.cpp
diff --git a/src/widgets/instrument_midi_io_view.cpp b/src/gui/widgets/instrument_midi_io_view.cpp
similarity index 100%
rename from src/widgets/instrument_midi_io_view.cpp
rename to src/gui/widgets/instrument_midi_io_view.cpp
diff --git a/src/widgets/instrument_sound_shaping_view.cpp b/src/gui/widgets/instrument_sound_shaping_view.cpp
similarity index 100%
rename from src/widgets/instrument_sound_shaping_view.cpp
rename to src/gui/widgets/instrument_sound_shaping_view.cpp
diff --git a/src/widgets/kmultitabbar.cpp b/src/gui/widgets/kmultitabbar.cpp
similarity index 100%
rename from src/widgets/kmultitabbar.cpp
rename to src/gui/widgets/kmultitabbar.cpp
diff --git a/src/widgets/knob.cpp b/src/gui/widgets/knob.cpp
similarity index 100%
rename from src/widgets/knob.cpp
rename to src/gui/widgets/knob.cpp
diff --git a/src/widgets/ladspa_control_view.cpp b/src/gui/widgets/ladspa_control_view.cpp
similarity index 100%
rename from src/widgets/ladspa_control_view.cpp
rename to src/gui/widgets/ladspa_control_view.cpp
diff --git a/src/widgets/lcd_spinbox.cpp b/src/gui/widgets/lcd_spinbox.cpp
similarity index 100%
rename from src/widgets/lcd_spinbox.cpp
rename to src/gui/widgets/lcd_spinbox.cpp
diff --git a/src/widgets/led_checkbox.cpp b/src/gui/widgets/led_checkbox.cpp
similarity index 100%
rename from src/widgets/led_checkbox.cpp
rename to src/gui/widgets/led_checkbox.cpp
diff --git a/src/widgets/meter_dialog.cpp b/src/gui/widgets/meter_dialog.cpp
similarity index 100%
rename from src/widgets/meter_dialog.cpp
rename to src/gui/widgets/meter_dialog.cpp
diff --git a/src/widgets/name_label.cpp b/src/gui/widgets/name_label.cpp
similarity index 100%
rename from src/widgets/name_label.cpp
rename to src/gui/widgets/name_label.cpp
diff --git a/src/widgets/nstate_button.cpp b/src/gui/widgets/nstate_button.cpp
similarity index 100%
rename from src/widgets/nstate_button.cpp
rename to src/gui/widgets/nstate_button.cpp
diff --git a/src/widgets/pixmap_button.cpp b/src/gui/widgets/pixmap_button.cpp
similarity index 100%
rename from src/widgets/pixmap_button.cpp
rename to src/gui/widgets/pixmap_button.cpp
diff --git a/src/widgets/project_notes.cpp b/src/gui/widgets/project_notes.cpp
similarity index 100%
rename from src/widgets/project_notes.cpp
rename to src/gui/widgets/project_notes.cpp
diff --git a/src/widgets/rename_dialog.cpp b/src/gui/widgets/rename_dialog.cpp
similarity index 100%
rename from src/widgets/rename_dialog.cpp
rename to src/gui/widgets/rename_dialog.cpp
diff --git a/src/widgets/rubberband.cpp b/src/gui/widgets/rubberband.cpp
similarity index 100%
rename from src/widgets/rubberband.cpp
rename to src/gui/widgets/rubberband.cpp
diff --git a/src/widgets/side_bar_widget.cpp b/src/gui/widgets/side_bar_widget.cpp
similarity index 100%
rename from src/widgets/side_bar_widget.cpp
rename to src/gui/widgets/side_bar_widget.cpp
diff --git a/src/widgets/string_pair_drag.cpp b/src/gui/widgets/string_pair_drag.cpp
similarity index 100%
rename from src/widgets/string_pair_drag.cpp
rename to src/gui/widgets/string_pair_drag.cpp
diff --git a/src/widgets/tab_bar.cpp b/src/gui/widgets/tab_bar.cpp
similarity index 100%
rename from src/widgets/tab_bar.cpp
rename to src/gui/widgets/tab_bar.cpp
diff --git a/src/widgets/tab_widget.cpp b/src/gui/widgets/tab_widget.cpp
similarity index 100%
rename from src/widgets/tab_widget.cpp
rename to src/gui/widgets/tab_widget.cpp
diff --git a/src/widgets/tempo_sync_knob.cpp b/src/gui/widgets/tempo_sync_knob.cpp
similarity index 100%
rename from src/widgets/tempo_sync_knob.cpp
rename to src/gui/widgets/tempo_sync_knob.cpp
diff --git a/src/widgets/text_float.cpp b/src/gui/widgets/text_float.cpp
similarity index 100%
rename from src/widgets/text_float.cpp
rename to src/gui/widgets/text_float.cpp
diff --git a/src/widgets/tool_button.cpp b/src/gui/widgets/tool_button.cpp
similarity index 100%
rename from src/widgets/tool_button.cpp
rename to src/gui/widgets/tool_button.cpp
diff --git a/src/widgets/tooltip.cpp b/src/gui/widgets/tooltip.cpp
similarity index 100%
rename from src/widgets/tooltip.cpp
rename to src/gui/widgets/tooltip.cpp
diff --git a/src/widgets/visualization_widget.cpp b/src/gui/widgets/visualization_widget.cpp
similarity index 100%
rename from src/widgets/visualization_widget.cpp
rename to src/gui/widgets/visualization_widget.cpp
diff --git a/src/widgets/volume_knob.cpp b/src/gui/widgets/volume_knob.cpp
similarity index 100%
rename from src/widgets/volume_knob.cpp
rename to src/gui/widgets/volume_knob.cpp