diff --git a/src/gui/dialogs/dialog.hpp b/src/gui/dialog/dialog.hpp
similarity index 100%
rename from src/gui/dialogs/dialog.hpp
rename to src/gui/dialog/dialog.hpp
diff --git a/src/gui/dialogs/name-chooser.cpp b/src/gui/dialog/name-chooser.cpp
similarity index 100%
rename from src/gui/dialogs/name-chooser.cpp
rename to src/gui/dialog/name-chooser.cpp
diff --git a/src/gui/dialogs/name-chooser.hpp b/src/gui/dialog/name-chooser.hpp
similarity index 100%
rename from src/gui/dialogs/name-chooser.hpp
rename to src/gui/dialog/name-chooser.hpp
diff --git a/src/gui/dialogs/preferences-dialog.hpp b/src/gui/dialog/preferences-dialog.hpp
similarity index 100%
rename from src/gui/dialogs/preferences-dialog.hpp
rename to src/gui/dialog/preferences-dialog.hpp
diff --git a/src/gui/dialogs/render.cpp b/src/gui/dialog/render.cpp
similarity index 100%
rename from src/gui/dialogs/render.cpp
rename to src/gui/dialog/render.cpp
diff --git a/src/gui/dialogs/render.hpp b/src/gui/dialog/render.hpp
similarity index 100%
rename from src/gui/dialogs/render.hpp
rename to src/gui/dialog/render.hpp
diff --git a/src/gui/panels/assets-panel.cpp b/src/gui/panel/assets-panel.cpp
similarity index 100%
rename from src/gui/panels/assets-panel.cpp
rename to src/gui/panel/assets-panel.cpp
diff --git a/src/gui/panels/assets-panel.hpp b/src/gui/panel/assets-panel.hpp
similarity index 100%
rename from src/gui/panels/assets-panel.hpp
rename to src/gui/panel/assets-panel.hpp
diff --git a/src/gui/panels/panel.cpp b/src/gui/panel/panel.cpp
similarity index 100%
rename from src/gui/panels/panel.cpp
rename to src/gui/panel/panel.cpp
diff --git a/src/gui/panels/panel.hpp b/src/gui/panel/panel.hpp
similarity index 100%
rename from src/gui/panels/panel.hpp
rename to src/gui/panel/panel.hpp
diff --git a/src/gui/panels/timeline-panel.cpp b/src/gui/panel/timeline-panel.cpp
similarity index 100%
rename from src/gui/panels/timeline-panel.cpp
rename to src/gui/panel/timeline-panel.cpp
diff --git a/src/gui/panels/timeline-panel.hpp b/src/gui/panel/timeline-panel.hpp
similarity index 100%
rename from src/gui/panels/timeline-panel.hpp
rename to src/gui/panel/timeline-panel.hpp
diff --git a/src/gui/panels/viewer-panel.cpp b/src/gui/panel/viewer-panel.cpp
similarity index 100%
rename from src/gui/panels/viewer-panel.cpp
rename to src/gui/panel/viewer-panel.cpp
diff --git a/src/gui/panels/viewer-panel.hpp b/src/gui/panel/viewer-panel.hpp
similarity index 100%
rename from src/gui/panels/viewer-panel.hpp
rename to src/gui/panel/viewer-panel.hpp
diff --git a/src/gui/widgets/button-bar.cpp b/src/gui/widget/button-bar.cpp
similarity index 100%
rename from src/gui/widgets/button-bar.cpp
rename to src/gui/widget/button-bar.cpp
diff --git a/src/gui/widgets/button-bar.hpp b/src/gui/widget/button-bar.hpp
similarity index 100%
rename from src/gui/widgets/button-bar.hpp
rename to src/gui/widget/button-bar.hpp
diff --git a/src/gui/widgets/menu-button.cpp b/src/gui/widget/menu-button.cpp
similarity index 100%
rename from src/gui/widgets/menu-button.cpp
rename to src/gui/widget/menu-button.cpp
diff --git a/src/gui/widgets/menu-button.hpp b/src/gui/widget/menu-button.hpp
similarity index 100%
rename from src/gui/widgets/menu-button.hpp
rename to src/gui/widget/menu-button.hpp
diff --git a/src/gui/widgets/mini-button.hpp b/src/gui/widget/mini-button.hpp
similarity index 100%
rename from src/gui/widgets/mini-button.hpp
rename to src/gui/widget/mini-button.hpp
diff --git a/src/gui/widgets/panel-bar.cpp b/src/gui/widget/panel-bar.cpp
similarity index 100%
rename from src/gui/widgets/panel-bar.cpp
rename to src/gui/widget/panel-bar.cpp
diff --git a/src/gui/widgets/panel-bar.hpp b/src/gui/widget/panel-bar.hpp
similarity index 100%
rename from src/gui/widgets/panel-bar.hpp
rename to src/gui/widget/panel-bar.hpp
diff --git a/src/gui/widgets/timecode-widget.cpp b/src/gui/widget/timecode-widget.cpp
similarity index 100%
rename from src/gui/widgets/timecode-widget.cpp
rename to src/gui/widget/timecode-widget.cpp
diff --git a/src/gui/widgets/timecode-widget.hpp b/src/gui/widget/timecode-widget.hpp
similarity index 100%
rename from src/gui/widgets/timecode-widget.hpp
rename to src/gui/widget/timecode-widget.hpp
diff --git a/src/gui/widgets/timeline-widget.cpp b/src/gui/widget/timeline-widget.cpp
similarity index 100%
rename from src/gui/widgets/timeline-widget.cpp
rename to src/gui/widget/timeline-widget.cpp
diff --git a/src/gui/widgets/timeline-widget.hpp b/src/gui/widget/timeline-widget.hpp
similarity index 100%
rename from src/gui/widgets/timeline-widget.hpp
rename to src/gui/widget/timeline-widget.hpp
diff --git a/src/gui/widgets/timeline/basic-draw-strategy.hpp b/src/gui/widget/timeline/basic-draw-strategy.hpp
similarity index 100%
rename from src/gui/widgets/timeline/basic-draw-strategy.hpp
rename to src/gui/widget/timeline/basic-draw-strategy.hpp
diff --git a/src/gui/widgets/timeline/draw-strategy.cpp b/src/gui/widget/timeline/draw-strategy.cpp
similarity index 100%
rename from src/gui/widgets/timeline/draw-strategy.cpp
rename to src/gui/widget/timeline/draw-strategy.cpp
diff --git a/src/gui/widgets/timeline/draw-strategy.hpp b/src/gui/widget/timeline/draw-strategy.hpp
similarity index 100%
rename from src/gui/widgets/timeline/draw-strategy.hpp
rename to src/gui/widget/timeline/draw-strategy.hpp
diff --git a/src/gui/widgets/timeline/timeline-arrow-tool.cpp b/src/gui/widget/timeline/timeline-arrow-tool.cpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-arrow-tool.cpp
rename to src/gui/widget/timeline/timeline-arrow-tool.cpp
diff --git a/src/gui/widgets/timeline/timeline-arrow-tool.hpp b/src/gui/widget/timeline/timeline-arrow-tool.hpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-arrow-tool.hpp
rename to src/gui/widget/timeline/timeline-arrow-tool.hpp
diff --git a/src/gui/widgets/timeline/timeline-body.cpp b/src/gui/widget/timeline/timeline-body.cpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-body.cpp
rename to src/gui/widget/timeline/timeline-body.cpp
diff --git a/src/gui/widgets/timeline/timeline-body.hpp b/src/gui/widget/timeline/timeline-body.hpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-body.hpp
rename to src/gui/widget/timeline/timeline-body.hpp
diff --git a/src/gui/widgets/timeline/timeline-clip-track.cpp b/src/gui/widget/timeline/timeline-clip-track.cpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-clip-track.cpp
rename to src/gui/widget/timeline/timeline-clip-track.cpp
diff --git a/src/gui/widgets/timeline/timeline-clip-track.hpp b/src/gui/widget/timeline/timeline-clip-track.hpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-clip-track.hpp
rename to src/gui/widget/timeline/timeline-clip-track.hpp
diff --git a/src/gui/widgets/timeline/timeline-clip.cpp b/src/gui/widget/timeline/timeline-clip.cpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-clip.cpp
rename to src/gui/widget/timeline/timeline-clip.cpp
diff --git a/src/gui/widgets/timeline/timeline-clip.hpp b/src/gui/widget/timeline/timeline-clip.hpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-clip.hpp
rename to src/gui/widget/timeline/timeline-clip.hpp
diff --git a/src/gui/widgets/timeline/timeline-entity.cpp b/src/gui/widget/timeline/timeline-entity.cpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-entity.cpp
rename to src/gui/widget/timeline/timeline-entity.cpp
diff --git a/src/gui/widgets/timeline/timeline-entity.hpp b/src/gui/widget/timeline/timeline-entity.hpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-entity.hpp
rename to src/gui/widget/timeline/timeline-entity.hpp
diff --git a/src/gui/widgets/timeline/timeline-group-track.cpp b/src/gui/widget/timeline/timeline-group-track.cpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-group-track.cpp
rename to src/gui/widget/timeline/timeline-group-track.cpp
diff --git a/src/gui/widgets/timeline/timeline-group-track.hpp b/src/gui/widget/timeline/timeline-group-track.hpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-group-track.hpp
rename to src/gui/widget/timeline/timeline-group-track.hpp
diff --git a/src/gui/widgets/timeline/timeline-header-container.cpp b/src/gui/widget/timeline/timeline-header-container.cpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-header-container.cpp
rename to src/gui/widget/timeline/timeline-header-container.cpp
diff --git a/src/gui/widgets/timeline/timeline-header-container.hpp b/src/gui/widget/timeline/timeline-header-container.hpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-header-container.hpp
rename to src/gui/widget/timeline/timeline-header-container.hpp
diff --git a/src/gui/widgets/timeline/timeline-header-widget.cpp b/src/gui/widget/timeline/timeline-header-widget.cpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-header-widget.cpp
rename to src/gui/widget/timeline/timeline-header-widget.cpp
diff --git a/src/gui/widgets/timeline/timeline-header-widget.hpp b/src/gui/widget/timeline/timeline-header-widget.hpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-header-widget.hpp
rename to src/gui/widget/timeline/timeline-header-widget.hpp
diff --git a/src/gui/widgets/timeline/timeline-ibeam-tool.cpp b/src/gui/widget/timeline/timeline-ibeam-tool.cpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-ibeam-tool.cpp
rename to src/gui/widget/timeline/timeline-ibeam-tool.cpp
diff --git a/src/gui/widgets/timeline/timeline-ibeam-tool.hpp b/src/gui/widget/timeline/timeline-ibeam-tool.hpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-ibeam-tool.hpp
rename to src/gui/widget/timeline/timeline-ibeam-tool.hpp
diff --git a/src/gui/widgets/timeline/timeline-layout-helper.cpp b/src/gui/widget/timeline/timeline-layout-helper.cpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-layout-helper.cpp
rename to src/gui/widget/timeline/timeline-layout-helper.cpp
diff --git a/src/gui/widgets/timeline/timeline-layout-helper.hpp b/src/gui/widget/timeline/timeline-layout-helper.hpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-layout-helper.hpp
rename to src/gui/widget/timeline/timeline-layout-helper.hpp
diff --git a/src/gui/widgets/timeline/timeline-ruler.cpp b/src/gui/widget/timeline/timeline-ruler.cpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-ruler.cpp
rename to src/gui/widget/timeline/timeline-ruler.cpp
diff --git a/src/gui/widgets/timeline/timeline-ruler.hpp b/src/gui/widget/timeline/timeline-ruler.hpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-ruler.hpp
rename to src/gui/widget/timeline/timeline-ruler.hpp
diff --git a/src/gui/widgets/timeline/timeline-state.cpp b/src/gui/widget/timeline/timeline-state.cpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-state.cpp
rename to src/gui/widget/timeline/timeline-state.cpp
diff --git a/src/gui/widgets/timeline/timeline-state.hpp b/src/gui/widget/timeline/timeline-state.hpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-state.hpp
rename to src/gui/widget/timeline/timeline-state.hpp
diff --git a/src/gui/widgets/timeline/timeline-tool.cpp b/src/gui/widget/timeline/timeline-tool.cpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-tool.cpp
rename to src/gui/widget/timeline/timeline-tool.cpp
diff --git a/src/gui/widgets/timeline/timeline-tool.hpp b/src/gui/widget/timeline/timeline-tool.hpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-tool.hpp
rename to src/gui/widget/timeline/timeline-tool.hpp
diff --git a/src/gui/widgets/timeline/timeline-track.cpp b/src/gui/widget/timeline/timeline-track.cpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-track.cpp
rename to src/gui/widget/timeline/timeline-track.cpp
diff --git a/src/gui/widgets/timeline/timeline-track.hpp b/src/gui/widget/timeline/timeline-track.hpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-track.hpp
rename to src/gui/widget/timeline/timeline-track.hpp
diff --git a/src/gui/widgets/timeline/timeline-view-window.cpp b/src/gui/widget/timeline/timeline-view-window.cpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-view-window.cpp
rename to src/gui/widget/timeline/timeline-view-window.cpp
diff --git a/src/gui/widgets/timeline/timeline-view-window.hpp b/src/gui/widget/timeline/timeline-view-window.hpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-view-window.hpp
rename to src/gui/widget/timeline/timeline-view-window.hpp
diff --git a/src/gui/widgets/timeline/timeline-zoom-scale.cpp b/src/gui/widget/timeline/timeline-zoom-scale.cpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-zoom-scale.cpp
rename to src/gui/widget/timeline/timeline-zoom-scale.cpp
diff --git a/src/gui/widgets/timeline/timeline-zoom-scale.hpp b/src/gui/widget/timeline/timeline-zoom-scale.hpp
similarity index 100%
rename from src/gui/widgets/timeline/timeline-zoom-scale.hpp
rename to src/gui/widget/timeline/timeline-zoom-scale.hpp
diff --git a/src/gui/widgets/video-display-widget.cpp b/src/gui/widget/video-display-widget.cpp
similarity index 100%
rename from src/gui/widgets/video-display-widget.cpp
rename to src/gui/widget/video-display-widget.cpp
diff --git a/src/gui/widgets/video-display-widget.hpp b/src/gui/widget/video-display-widget.hpp
similarity index 100%
rename from src/gui/widgets/video-display-widget.hpp
rename to src/gui/widget/video-display-widget.hpp