More import and file cleanup

nw/constants/__init__.py

@@ -9,20 +9,20 @@ from nw.constants.enum import (
 )
 
 __all__ = [
-    "isoLanguage",
     "isoCountry",
-    "nwConst",
+    "isoLanguage",
-    "nwRegEx",
-    "nwFiles",
-    "nwKeyWords",
-    "nwLabels",
-    "nwQuotes",
-    "nwUnicode",
     "nwAlert",
+    "nwConst",
     "nwDocAction",
+    "nwDocInsert",
+    "nwFiles",
     "nwItemClass",
     "nwItemLayout",
     "nwItemType",
+    "nwKeyWords",
+    "nwLabels",
     "nwOutline",
-    "nwDocInsert",
+    "nwQuotes",
+    "nwRegEx",
+    "nwUnicode",
 ]

nw/core/__init__.py

@@ -8,6 +8,9 @@ from nw.core.tohtml import ToHtml
 from nw.core.tools import countWords, numberToRoman, numberToWord
 
 __all__ = [
+    "countWords",
+    "numberToRoman",
+    "numberToWord",
     "NWDoc",
     "NWIndex",
     "NWProject",
@@ -15,7 +18,4 @@ __all__ = [
     "NWSpellEnchant",
     "NWSpellSimple",
     "ToHtml",
-    "countWords",
-    "numberToRoman",
-    "numberToWord",
 ]

nw/gui/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from nw.gui.about import GuiAbout
-from nw.gui.buildnovel import GuiBuildNovel
+from nw.gui.build import GuiBuildNovel
 from nw.gui.doceditor import GuiDocEditor
 from nw.gui.docmerge import GuiDocMerge
 from nw.gui.docsplit import GuiDocSplit
@@ -16,9 +16,9 @@ from nw.gui.projload import GuiProjectLoad
 from nw.gui.projsettings import GuiProjectSettings
 from nw.gui.projtree import GuiProjectTree
 from nw.gui.projwizard import GuiProjectWizard
-from nw.gui.writingstats import GuiWritingStats
 from nw.gui.statusbar import GuiMainStatus
-from nw.gui.theme import GuiIcons, GuiTheme
+from nw.gui.theme import GuiTheme
+from nw.gui.writingstats import GuiWritingStats
 
 __all__ = [
     "GuiAbout",
@@ -26,11 +26,12 @@ __all__ = [
     "GuiDocEditor",
     "GuiDocMerge",
     "GuiDocSplit",
-    "GuiDocViewer",
     "GuiDocViewDetails",
+    "GuiDocViewer",
     "GuiItemDetails",
     "GuiItemEditor",
     "GuiMainMenu",
+    "GuiMainStatus",
     "GuiOutline",
     "GuiOutlineDetails",
     "GuiPreferences",
@@ -38,8 +39,6 @@ __all__ = [
     "GuiProjectSettings",
     "GuiProjectTree",
     "GuiProjectWizard",
-    "GuiWritingStats",
-    "GuiMainStatus",
-    "GuiIcons",
     "GuiTheme",
+    "GuiWritingStats",
 ]