diff --git a/ElectronClient/app/gui/NoteText.jsx b/ElectronClient/app/gui/NoteText.jsx
index 796435615..c623431dc 100644
--- a/ElectronClient/app/gui/NoteText.jsx
+++ b/ElectronClient/app/gui/NoteText.jsx
@@ -425,7 +425,7 @@ class NoteTextComponent extends React.Component {
 		const viewer = <webview
 			style={viewerStyle}
 			nodeintegration="1"
-			src="note-content.html"
+			src="gui/note-viewer/index.html"
 			ref={(elem) => { this.webview_ref(elem); } }
 		/>
 
diff --git a/ElectronClient/app/highlight/VERSION.txt b/ElectronClient/app/gui/note-viewer/highlight/VERSION.txt
similarity index 100%
rename from ElectronClient/app/highlight/VERSION.txt
rename to ElectronClient/app/gui/note-viewer/highlight/VERSION.txt
diff --git a/ElectronClient/app/highlight/highlight.pack.js b/ElectronClient/app/gui/note-viewer/highlight/highlight.pack.js
similarity index 100%
rename from ElectronClient/app/highlight/highlight.pack.js
rename to ElectronClient/app/gui/note-viewer/highlight/highlight.pack.js
diff --git a/ElectronClient/app/highlight/styles/atom-one-light.css b/ElectronClient/app/gui/note-viewer/highlight/styles/atom-one-light.css
similarity index 100%
rename from ElectronClient/app/highlight/styles/atom-one-light.css
rename to ElectronClient/app/gui/note-viewer/highlight/styles/atom-one-light.css
diff --git a/ElectronClient/app/note-content.html b/ElectronClient/app/gui/note-viewer/index.html
similarity index 100%
rename from ElectronClient/app/note-content.html
rename to ElectronClient/app/gui/note-viewer/index.html
diff --git a/joplin.sublime-project b/joplin.sublime-project
index c83a425f5..a56cd50bf 100755
--- a/joplin.sublime-project
+++ b/joplin.sublime-project
@@ -17,7 +17,8 @@
 				"src/log.txt",
 				"*.min.js",
 				"ElectronClient/app/highlight/*.pack.js",
-				"app/css/font-awesome.min.css",
+				"ElectronClient/app/gui/note-viewer/css/font-awesome.min.css",
+				"_mydocs/mdtest/vendor/bin/html-to-markdown",
 			],
 			"folder_exclude_patterns":
 			[