diff --git a/nw/gui/__init__.py b/nw/gui/__init__.py
index 35cbac0a..28a7a654 100644
--- a/nw/gui/__init__.py
+++ b/nw/gui/__init__.py
@@ -1,56 +1,49 @@
 # -*- coding: utf-8 -*-
 
-# Main Window Elements
+from nw.gui.about import GuiAbout
 from nw.gui.build import GuiBuildNovel
-from nw.gui.theme import GuiIcons
+from nw.gui.docbars import GuiDocTitleBar
+from nw.gui.docbars import GuiNoticeBar
+from nw.gui.docbars import GuiSearchBar
+from nw.gui.docdetails import GuiDocDetails
+from nw.gui.doceditor import GuiDocEditor
+from nw.gui.docmerge import GuiDocMerge
+from nw.gui.docsplit import GuiDocSplit
+from nw.gui.doctree import GuiDocTree
+from nw.gui.docviewer import GuiDocViewer
+from nw.gui.itemeditor import GuiItemEditor
 from nw.gui.mainmenu import GuiMainMenu
+from nw.gui.outline import GuiProjectOutline
+from nw.gui.preferences import GuiPreferences
+from nw.gui.projectload import GuiProjectLoad
+from nw.gui.projectsettings import GuiProjectSettings
+from nw.gui.sessionlog import GuiSessionLogView
 from nw.gui.statusbar import GuiMainStatus
+from nw.gui.theme import GuiIcons
 from nw.gui.theme import GuiTheme
-
-# Dialogs
-from nw.gui.dialogs.about import GuiAbout
-from nw.gui.dialogs.preferences import GuiPreferences
-from nw.gui.dialogs.docmerge import GuiDocMerge
-from nw.gui.dialogs.docsplit import GuiDocSplit
-from nw.gui.dialogs.itemeditor import GuiItemEditor
-from nw.gui.dialogs.projectsettings import GuiProjectSettings
-from nw.gui.dialogs.projectload import GuiProjectLoad
-from nw.gui.dialogs.sessionlog import GuiSessionLogView
-
-# GUI Elements
-from nw.gui.elements.docdetails import GuiDocDetails
-from nw.gui.elements.doceditor import GuiDocEditor
-from nw.gui.elements.docbars import GuiDocTitleBar
-from nw.gui.elements.doctree import GuiDocTree
-from nw.gui.elements.docviewer import GuiDocViewer
-from nw.gui.elements.docbars import GuiNoticeBar
-from nw.gui.elements.outline import GuiProjectOutline
-from nw.gui.elements.docbars import GuiSearchBar
-from nw.gui.elements.viewdetails import GuiDocViewDetails
-
-# Tools
+from nw.gui.viewdetails import GuiDocViewDetails
 
 __all__ = [
-    "GuiBuildNovel",
-    "GuiIcons",
-    "GuiMainMenu",
-    "GuiMainStatus",
-    "GuiTheme",
     "GuiAbout",
-    "GuiPreferences",
-    "GuiDocMerge",
-    "GuiDocSplit",
-    "GuiItemEditor",
-    "GuiProjectSettings",
-    "GuiProjectLoad",
-    "GuiSessionLogView",
+    "GuiBuildNovel",
+    "GuiDocTitleBar",
+    "GuiNoticeBar",
+    "GuiSearchBar",
     "GuiDocDetails",
     "GuiDocEditor",
-    "GuiDocTitleBar",
+    "GuiDocMerge",
+    "GuiDocSplit",
     "GuiDocTree",
     "GuiDocViewer",
-    "GuiNoticeBar",
+    "GuiItemEditor",
+    "GuiMainMenu",
     "GuiProjectOutline",
-    "GuiSearchBar",
+    "GuiPreferences",
+    "GuiProjectLoad",
+    "GuiProjectSettings",
+    "GuiSessionLogView",
+    "GuiMainStatus",
+    "GuiIcons",
+    "GuiTheme",
     "GuiDocViewDetails",
 ]
diff --git a/nw/gui/dialogs/about.py b/nw/gui/about.py
similarity index 100%
rename from nw/gui/dialogs/about.py
rename to nw/gui/about.py
diff --git a/nw/gui/dialogs/__init__.py b/nw/gui/dialogs/__init__.py
deleted file mode 100644
index 5f4e4a03..00000000
--- a/nw/gui/dialogs/__init__.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from nw.gui.dialogs.about import GuiAbout
-from nw.gui.dialogs.preferences import GuiPreferences
-from nw.gui.dialogs.docmerge import GuiDocMerge
-from nw.gui.dialogs.docsplit import GuiDocSplit
-from nw.gui.dialogs.itemeditor import GuiItemEditor
-from nw.gui.dialogs.projectsettings import GuiProjectSettings
-from nw.gui.dialogs.projectload import GuiProjectLoad
-from nw.gui.dialogs.sessionlog import GuiSessionLogView
-
-__all__ = [
-    "GuiAbout",
-    "GuiPreferences",
-    "GuiDocMerge",
-    "GuiDocSplit",
-    "GuiItemEditor",
-    "GuiProjectSettings",
-    "GuiProjectLoad",
-    "GuiSessionLogView",
-]
diff --git a/nw/gui/elements/docbars.py b/nw/gui/docbars.py
similarity index 100%
rename from nw/gui/elements/docbars.py
rename to nw/gui/docbars.py
diff --git a/nw/gui/elements/docdetails.py b/nw/gui/docdetails.py
similarity index 100%
rename from nw/gui/elements/docdetails.py
rename to nw/gui/docdetails.py
diff --git a/nw/gui/elements/doceditor.py b/nw/gui/doceditor.py
similarity index 99%
rename from nw/gui/elements/doceditor.py
rename to nw/gui/doceditor.py
index 0493f167..bf511e07 100644
--- a/nw/gui/elements/doceditor.py
+++ b/nw/gui/doceditor.py
@@ -42,7 +42,7 @@ from PyQt5.QtGui import (
 
 from nw.core import NWDoc
 from nw.gui.dochighlight import GuiDocHighlighter
-from nw.gui.elements.docbars import GuiDocTitleBar
+from nw.gui.docbars import GuiDocTitleBar
 from nw.core import NWSpellSimple, countWords
 from nw.constants import nwUnicode, nwDocAction
 
diff --git a/nw/gui/dialogs/docmerge.py b/nw/gui/docmerge.py
similarity index 100%
rename from nw/gui/dialogs/docmerge.py
rename to nw/gui/docmerge.py
diff --git a/nw/gui/dialogs/docsplit.py b/nw/gui/docsplit.py
similarity index 100%
rename from nw/gui/dialogs/docsplit.py
rename to nw/gui/docsplit.py
diff --git a/nw/gui/elements/doctree.py b/nw/gui/doctree.py
similarity index 100%
rename from nw/gui/elements/doctree.py
rename to nw/gui/doctree.py
diff --git a/nw/gui/elements/docviewer.py b/nw/gui/docviewer.py
similarity index 99%
rename from nw/gui/elements/docviewer.py
rename to nw/gui/docviewer.py
index 820c6e85..1be66bba 100644
--- a/nw/gui/elements/docviewer.py
+++ b/nw/gui/docviewer.py
@@ -34,7 +34,7 @@ from PyQt5.QtGui import QTextOption, QFont, QPalette, QColor, QTextCursor
 
 from nw.core import ToHtml
 from nw.constants import nwAlert, nwItemType, nwDocAction
-from nw.gui.elements.docbars import GuiDocTitleBar
+from nw.gui.docbars import GuiDocTitleBar
 
 logger = logging.getLogger(__name__)
 
diff --git a/nw/gui/elements/__init__.py b/nw/gui/elements/__init__.py
deleted file mode 100644
index 29a334a4..00000000
--- a/nw/gui/elements/__init__.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from nw.gui.elements.docdetails import GuiDocDetails
-from nw.gui.elements.doceditor import GuiDocEditor
-from nw.gui.elements.docbars import GuiDocTitleBar
-from nw.gui.elements.doctree import GuiDocTree
-from nw.gui.elements.docviewer import GuiDocViewer
-from nw.gui.elements.docbars import GuiNoticeBar
-from nw.gui.elements.outline import GuiProjectOutline
-from nw.gui.elements.docbars import GuiSearchBar
-from nw.gui.elements.viewdetails import GuiDocViewDetails
-
-__all__ = [
-    "GuiDocDetails",
-    "GuiDocEditor",
-    "GuiDocTitleBar",
-    "GuiDocTree",
-    "GuiDocViewer",
-    "GuiNoticeBar",
-    "GuiProjectOutline",
-    "GuiSearchBar",
-    "GuiDocViewDetails",
-]
diff --git a/nw/gui/dialogs/itemeditor.py b/nw/gui/itemeditor.py
similarity index 100%
rename from nw/gui/dialogs/itemeditor.py
rename to nw/gui/itemeditor.py
diff --git a/nw/gui/mainmenu.py b/nw/gui/mainmenu.py
index 31206d82..5ff4d918 100644
--- a/nw/gui/mainmenu.py
+++ b/nw/gui/mainmenu.py
@@ -32,7 +32,7 @@ from PyQt5.QtCore import QUrl
 from PyQt5.QtGui import QDesktopServices
 from PyQt5.QtWidgets import QMenuBar, QAction, QMessageBox
 
-from nw.gui.dialogs import GuiAbout
+from nw.gui.about import GuiAbout
 from nw.constants import nwItemType, nwItemClass, nwDocAction
 
 logger = logging.getLogger(__name__)
diff --git a/nw/gui/elements/outline.py b/nw/gui/outline.py
similarity index 100%
rename from nw/gui/elements/outline.py
rename to nw/gui/outline.py
diff --git a/nw/gui/dialogs/preferences.py b/nw/gui/preferences.py
similarity index 100%
rename from nw/gui/dialogs/preferences.py
rename to nw/gui/preferences.py
diff --git a/nw/gui/dialogs/projectload.py b/nw/gui/projectload.py
similarity index 100%
rename from nw/gui/dialogs/projectload.py
rename to nw/gui/projectload.py
diff --git a/nw/gui/dialogs/projectsettings.py b/nw/gui/projectsettings.py
similarity index 100%
rename from nw/gui/dialogs/projectsettings.py
rename to nw/gui/projectsettings.py
diff --git a/nw/gui/dialogs/sessionlog.py b/nw/gui/sessionlog.py
similarity index 100%
rename from nw/gui/dialogs/sessionlog.py
rename to nw/gui/sessionlog.py
diff --git a/nw/gui/elements/viewdetails.py b/nw/gui/viewdetails.py
similarity index 100%
rename from nw/gui/elements/viewdetails.py
rename to nw/gui/viewdetails.py