diff --git a/nw/convert/__init__.py b/nw/convert/__init__.py
deleted file mode 100644
index ea50119a..00000000
--- a/nw/convert/__init__.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from nw.convert.tokenizer import Tokenizer
-
-from nw.convert.file.concat import ConcatFile
-from nw.convert.file.html import HtmlFile
-from nw.convert.file.latex import LaTeXFile
-from nw.convert.file.markdown import MarkdownFile
-from nw.convert.file.text import TextFile
-
-from nw.convert.text.tohtml import ToHtml
-from nw.convert.text.tolatex import ToLaTeX
-from nw.convert.text.tomarkdown import ToMarkdown
-from nw.convert.text.totext import ToText
-
-__all__ = [
-    "Tokenizer",
-    "ConcatFile",
-    "HtmlFile",
-    "LaTeXFile",
-    "MarkdownFile",
-    "TextFile",
-    "ToHtml",
-    "ToLaTeX",
-    "ToMarkdown",
-    "ToText",
-]
diff --git a/nw/core/__init__.py b/nw/core/__init__.py
index a608acd7..6dd65fd2 100644
--- a/nw/core/__init__.py
+++ b/nw/core/__init__.py
@@ -6,6 +6,8 @@ from nw.core.project import NWProject
 from nw.core.spellcheck import NWSpellCheck
 from nw.core.spellcheck import NWSpellEnchant
 from nw.core.spellcheck import NWSpellSimple
+from nw.core.tokenizer import Tokenizer
+from nw.core.tohtml import ToHtml
 from nw.core.tools import countWords
 from nw.core.tools import projectMaintenance
 from nw.core.tools import numberToWord
@@ -17,6 +19,8 @@ __all__ = [
     "NWSpellCheck",
     "NWSpellEnchant",
     "NWSpellSimple",
+    "Tokenizer",
+    "ToHtml",
     "countWords",
     "projectMaintenance",
     "numberToWord",
diff --git a/nw/convert/text/tohtml.py b/nw/core/tohtml.py
similarity index 99%
rename from nw/convert/text/tohtml.py
rename to nw/core/tohtml.py
index 330e7bc8..aa63eaff 100644
--- a/nw/convert/text/tohtml.py
+++ b/nw/core/tohtml.py
@@ -29,7 +29,7 @@ import logging
 import re
 import nw
 
-from nw.convert.tokenizer import Tokenizer
+from nw.core.tokenizer import Tokenizer
 from nw.constants import nwUnicode, nwLabels
 
 logger = logging.getLogger(__name__)
diff --git a/nw/convert/tokenizer.py b/nw/core/tokenizer.py
similarity index 100%
rename from nw/convert/tokenizer.py
rename to nw/core/tokenizer.py
diff --git a/nw/gui/__init__.py b/nw/gui/__init__.py
index 7d4633b5..c209b8d8 100644
--- a/nw/gui/__init__.py
+++ b/nw/gui/__init__.py
@@ -15,7 +15,6 @@ from nw.gui.additions.qswitch import QSwitch
 from nw.gui.dialogs.configeditor import GuiConfigEditor
 from nw.gui.dialogs.docmerge import GuiDocMerge
 from nw.gui.dialogs.docsplit import GuiDocSplit
-from nw.gui.dialogs.export import GuiExport
 from nw.gui.dialogs.itemeditor import GuiItemEditor
 from nw.gui.dialogs.projecteditor import GuiProjectEditor
 from nw.gui.dialogs.projectload import GuiProjectLoad
@@ -48,7 +47,6 @@ __all__ = [
     "GuiConfigEditor",
     "GuiDocMerge",
     "GuiDocSplit",
-    "GuiExport",
     "GuiItemEditor",
     "GuiProjectEditor",
     "GuiProjectLoad",
diff --git a/nw/gui/dialogs/__init__.py b/nw/gui/dialogs/__init__.py
index 2dbc503e..110b5b5e 100644
--- a/nw/gui/dialogs/__init__.py
+++ b/nw/gui/dialogs/__init__.py
@@ -3,7 +3,6 @@
 from nw.gui.dialogs.configeditor import GuiConfigEditor
 from nw.gui.dialogs.docmerge import GuiDocMerge
 from nw.gui.dialogs.docsplit import GuiDocSplit
-from nw.gui.dialogs.export import GuiExport
 from nw.gui.dialogs.itemeditor import GuiItemEditor
 from nw.gui.dialogs.projecteditor import GuiProjectEditor
 from nw.gui.dialogs.projectload import GuiProjectLoad
@@ -13,7 +12,6 @@ __all__ = [
     "GuiConfigEditor",
     "GuiDocMerge",
     "GuiDocSplit",
-    "GuiExport",
     "GuiItemEditor",
     "GuiProjectEditor",
     "GuiProjectLoad",
diff --git a/nw/gui/elements/docviewer.py b/nw/gui/elements/docviewer.py
index 9f3d65ff..c99b1de1 100644
--- a/nw/gui/elements/docviewer.py
+++ b/nw/gui/elements/docviewer.py
@@ -32,7 +32,7 @@ from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import QTextBrowser
 from PyQt5.QtGui import QTextOption, QFont, QPalette, QColor, QTextCursor
 
-from nw.convert import ToHtml
+from nw.core import ToHtml
 from nw.constants import nwAlert, nwItemType, nwDocAction
 from nw.gui.elements.doctitlebar import GuiDocTitleBar