diff --git a/src/public/javascripts/dialogs/add_link.js b/src/public/javascripts/dialogs/add_link.js
index e357471c2..bf44a1ce4 100644
--- a/src/public/javascripts/dialogs/add_link.js
+++ b/src/public/javascripts/dialogs/add_link.js
@@ -1,10 +1,10 @@
 "use strict";
 
-import treeService from '../note_tree.js';
-import cloning from '../cloning.js';
-import link from '../link.js';
-import noteEditor from '../note_editor.js';
-import treeUtils from '../tree_utils.js';
+import treeService from '../services/tree_service.js';
+import cloning from '../services/cloning.js';
+import link from '../services/link.js';
+import noteDetail from '../services/note_detail.js';
+import treeUtils from '../services/tree_utils.js';
 
 const $dialog = $("#add-link-dialog");
 const $form = $("#add-link-form");
@@ -27,7 +27,7 @@ function setLinkType(linkType) {
 async function showDialog() {
     glob.activeDialog = $dialog;
 
-    if (noteEditor.getCurrentNoteType() === 'text') {
+    if (noteDetail.getCurrentNoteType() === 'text') {
         $linkTypeHtml.prop('disabled', false);
 
         setLinkType('html');
@@ -99,14 +99,14 @@ $form.submit(() => {
         else if (linkType === 'selected-to-current') {
             const prefix = $clonePrefix.val();
 
-            cloning.cloneNoteTo(noteId, noteEditor.getCurrentNoteId(), prefix);
+            cloning.cloneNoteTo(noteId, noteDetail.getCurrentNoteId(), prefix);
 
             $dialog.dialog("close");
         }
         else if (linkType === 'current-to-selected') {
             const prefix = $clonePrefix.val();
 
-            cloning.cloneNoteTo(noteEditor.getCurrentNoteId(), noteId, prefix);
+            cloning.cloneNoteTo(noteDetail.getCurrentNoteId(), noteId, prefix);
 
             $dialog.dialog("close");
         }
diff --git a/src/public/javascripts/dialogs/edit_tree_prefix.js b/src/public/javascripts/dialogs/edit_tree_prefix.js
index 45dbdcbee..30ddb6680 100644
--- a/src/public/javascripts/dialogs/edit_tree_prefix.js
+++ b/src/public/javascripts/dialogs/edit_tree_prefix.js
@@ -1,6 +1,6 @@
 "use strict";
 
-import treeService from '../note_tree.js';
+import treeService from '../services/tree_service.js';
 
 const $dialog = $("#edit-tree-prefix-dialog");
 const $form = $("#edit-tree-prefix-form");
diff --git a/src/public/javascripts/dialogs/event_log.js b/src/public/javascripts/dialogs/event_log.js
index b89cafe52..675cf80fe 100644
--- a/src/public/javascripts/dialogs/event_log.js
+++ b/src/public/javascripts/dialogs/event_log.js
@@ -1,7 +1,7 @@
 "use strict";
 
-import link from '../link.js';
-import utils from '../utils.js';
+import link from '../services/link.js';
+import utils from '../services/utils.js';
 
 const $dialog = $("#event-log-dialog");
 const $list = $("#event-log-list");
diff --git a/src/public/javascripts/dialogs/jump_to_note.js b/src/public/javascripts/dialogs/jump_to_note.js
index f1dae16cf..6d7056dfb 100644
--- a/src/public/javascripts/dialogs/jump_to_note.js
+++ b/src/public/javascripts/dialogs/jump_to_note.js
@@ -1,8 +1,8 @@
 "use strict";
 
-import treeService from '../note_tree.js';
-import link from '../link.js';
-import utils from '../utils.js';
+import treeService from '../services/tree_service.js';
+import link from '../services/link.js';
+import utils from '../services/utils.js';
 
 const $showDialogButton = $("#jump-to-note-button");
 const $dialog = $("#jump-to-note-dialog");
diff --git a/src/public/javascripts/dialogs/labels.js b/src/public/javascripts/dialogs/labels.js
index b63dd90fd..ca6ffd5f6 100644
--- a/src/public/javascripts/dialogs/labels.js
+++ b/src/public/javascripts/dialogs/labels.js
@@ -1,7 +1,7 @@
 "use strict";
 
-import noteEditor from '../note_editor.js';
-import utils from '../utils.js';
+import noteDetail from '../services/note_detail.js';
+import utils from '../services/utils.js';
 
 const $showDialogButton = $(".show-labels-button");
 const $dialog = $("#labels-dialog");
@@ -17,7 +17,7 @@ function LabelsModel() {
     this.labels = ko.observableArray();
 
     this.loadLabels = async function() {
-        const noteId = noteEditor.getCurrentNoteId();
+        const noteId = noteDetail.getCurrentNoteId();
 
         const labels = await server.get('notes/' + noteId + '/labels');
 
@@ -81,7 +81,7 @@ function LabelsModel() {
             return;
         }
 
-        const noteId = noteEditor.getCurrentNoteId();
+        const noteId = noteDetail.getCurrentNoteId();
 
         const labelsToSave = self.labels()
             .map(attr => attr())
@@ -95,7 +95,7 @@ function LabelsModel() {
 
         utils.showMessage("Labels have been saved.");
 
-        noteEditor.loadLabelList();
+        noteDetail.loadLabelList();
     };
 
     function addLastEmptyRow() {
diff --git a/src/public/javascripts/dialogs/note_history.js b/src/public/javascripts/dialogs/note_history.js
index 7819fd643..9283fb4e4 100644
--- a/src/public/javascripts/dialogs/note_history.js
+++ b/src/public/javascripts/dialogs/note_history.js
@@ -1,7 +1,7 @@
 "use strict";
 
-import noteEditor from '../note_editor.js';
-import utils from '../utils.js';
+import noteDetail from '../services/note_detail.js';
+import utils from '../services/utils.js';
 
 const $showDialogButton = $("#show-history-button");
 const $dialog = $("#note-history-dialog");
@@ -12,7 +12,7 @@ const $title = $("#note-history-title");
 let historyItems = [];
 
 async function showCurrentNoteHistory() {
-    await showNoteHistoryDialog(noteEditor.getCurrentNoteId());
+    await showNoteHistoryDialog(noteDetail.getCurrentNoteId());
 }
 
 async function showNoteHistoryDialog(noteId, noteRevisionId) {
diff --git a/src/public/javascripts/dialogs/note_source.js b/src/public/javascripts/dialogs/note_source.js
index 327f7c54d..f34deb522 100644
--- a/src/public/javascripts/dialogs/note_source.js
+++ b/src/public/javascripts/dialogs/note_source.js
@@ -1,6 +1,6 @@
 "use strict";
 
-import noteEditor from '../note_editor.js';
+import noteDetail from '../services/note_detail.js';
 
 const $showDialogButton = $("#show-source-button");
 const $dialog = $("#note-source-dialog");
@@ -15,7 +15,7 @@ function showDialog() {
         height: 500
     });
 
-    const noteText = noteEditor.getCurrentNote().detail.content;
+    const noteText = noteDetail.getCurrentNote().detail.content;
 
     $noteSource.text(formatHtml(noteText));
 }
diff --git a/src/public/javascripts/dialogs/recent_changes.js b/src/public/javascripts/dialogs/recent_changes.js
index 5e4d59023..d832940dd 100644
--- a/src/public/javascripts/dialogs/recent_changes.js
+++ b/src/public/javascripts/dialogs/recent_changes.js
@@ -1,7 +1,7 @@
 "use strict";
 
-import link from '../link.js';
-import utils from '../utils.js';
+import link from '../services/link.js';
+import utils from '../services/utils.js';
 
 const $showDialogButton = $("#recent-changes-button");
 const $dialog = $("#recent-changes-dialog");
diff --git a/src/public/javascripts/dialogs/recent_notes.js b/src/public/javascripts/dialogs/recent_notes.js
index eff86cec2..90b446550 100644
--- a/src/public/javascripts/dialogs/recent_notes.js
+++ b/src/public/javascripts/dialogs/recent_notes.js
@@ -1,8 +1,8 @@
 "use strict";
 
-import treeService from '../note_tree.js';
-import server from '../server.js';
-import messaging from '../messaging.js';
+import treeService from '../services/tree_service.js';
+import server from '../services/server.js';
+import messaging from '../services/messaging.js';
 
 const $showDialogButton = $("#recent-notes-button");
 const $dialog = $("#recent-notes-dialog");
diff --git a/src/public/javascripts/dialogs/settings.js b/src/public/javascripts/dialogs/settings.js
index 9f3253b1a..bc26ad6c3 100644
--- a/src/public/javascripts/dialogs/settings.js
+++ b/src/public/javascripts/dialogs/settings.js
@@ -1,8 +1,8 @@
 "use strict";
 
-import protected_session from '../protected_session.js';
-import utils from '../utils.js';
-import server from '../server.js';
+import protected_session from '../services/protected_session.js';
+import utils from '../services/utils.js';
+import server from '../services/server.js';
 
 const $showDialogButton = $("#settings-button");
 const $dialog = $("#settings-dialog");
diff --git a/src/public/javascripts/dialogs/sql_console.js b/src/public/javascripts/dialogs/sql_console.js
index 77cdd2d35..75bce6db7 100644
--- a/src/public/javascripts/dialogs/sql_console.js
+++ b/src/public/javascripts/dialogs/sql_console.js
@@ -1,6 +1,6 @@
 "use strict";
 
-import utils from '../utils.js';
+import utils from '../services/utils.js';
 
 const $dialog = $("#sql-console-dialog");
 const $query = $('#sql-console-query');
diff --git a/src/public/javascripts/bootstrap.js b/src/public/javascripts/services/bootstrap.js
similarity index 59%
rename from src/public/javascripts/bootstrap.js
rename to src/public/javascripts/services/bootstrap.js
index 9ddabb999..658f7560e 100644
--- a/src/public/javascripts/bootstrap.js
+++ b/src/public/javascripts/services/bootstrap.js
@@ -1,14 +1,14 @@
-import addLink from './dialogs/add_link.js';
-import editTreePrefix from './dialogs/edit_tree_prefix.js';
-import eventLog from './dialogs/event_log.js';
-import jumpToNote from './dialogs/jump_to_note.js';
-import labelsDialog from './dialogs/labels.js';
-import noteHistory from './dialogs/note_history.js';
-import noteSource from './dialogs/note_source.js';
-import recentChanges from './dialogs/recent_changes.js';
-import recentNotes from './dialogs/recent_notes.js';
-import settings from './dialogs/settings.js';
-import sqlConsole from './dialogs/sql_console.js';
+import addLink from '../dialogs/add_link.js';
+import editTreePrefix from '../dialogs/edit_tree_prefix.js';
+import eventLog from '../dialogs/event_log.js';
+import jumpToNote from '../dialogs/jump_to_note.js';
+import labelsDialog from '../dialogs/labels.js';
+import noteHistory from '../dialogs/note_history.js';
+import noteSource from '../dialogs/note_source.js';
+import recentChanges from '../dialogs/recent_changes.js';
+import recentNotes from '../dialogs/recent_notes.js';
+import settings from '../dialogs/settings.js';
+import sqlConsole from '../dialogs/sql_console.js';
 
 import cloning from './cloning.js';
 import contextMenu from './context_menu.js';
@@ -16,7 +16,7 @@ import dragAndDropSetup from './drag_and_drop.js';
 import exportService from './export.js';
 import link from './link.js';
 import messaging from './messaging.js';
-import noteEditor from './note_editor.js';
+import noteDetail from './note_detail.js';
 import noteType from './note_type.js';
 import protected_session from './protected_session.js';
 import ScriptApi from './script_api.js';
@@ -28,7 +28,7 @@ import utils from './utils.js';
 
 import searchTreeService from './search_tree.js';
 import './init.js';
-import treeService from './note_tree.js';
+import treeService from './tree_service.js';
 const $toggleSearchButton = $("#toggle-search-button");
 
 $toggleSearchButton.click(searchTreeService.toggleSearch);
diff --git a/src/public/javascripts/cloning.js b/src/public/javascripts/services/cloning.js
similarity index 93%
rename from src/public/javascripts/cloning.js
rename to src/public/javascripts/services/cloning.js
index bb578a888..a335e8499 100644
--- a/src/public/javascripts/cloning.js
+++ b/src/public/javascripts/services/cloning.js
@@ -1,6 +1,6 @@
 "use strict";
 
-import treeService from './note_tree.js';
+import treeService from './tree_service.js';
 
 async function cloneNoteTo(childNoteId, parentNoteId, prefix) {
     const resp = await server.put('notes/' + childNoteId + '/clone-to/' + parentNoteId, {
diff --git a/src/public/javascripts/context_menu.js b/src/public/javascripts/services/context_menu.js
similarity index 99%
rename from src/public/javascripts/context_menu.js
rename to src/public/javascripts/services/context_menu.js
index 0631a104f..9f627fae9 100644
--- a/src/public/javascripts/context_menu.js
+++ b/src/public/javascripts/services/context_menu.js
@@ -1,6 +1,6 @@
 "use strict";
 
-import treeService from './note_tree.js';
+import treeService from './tree_service.js';
 import cloning from './cloning.js';
 import exportService from './export.js';
 import messaging from './messaging.js';
diff --git a/src/public/javascripts/drag_and_drop.js b/src/public/javascripts/services/drag_and_drop.js
similarity index 98%
rename from src/public/javascripts/drag_and_drop.js
rename to src/public/javascripts/services/drag_and_drop.js
index 252bc0160..e01b1e51c 100644
--- a/src/public/javascripts/drag_and_drop.js
+++ b/src/public/javascripts/services/drag_and_drop.js
@@ -1,6 +1,6 @@
 "use strict";
 
-import treeService from './note_tree.js';
+import treeService from './tree_service.js';
 import treeChanges from './tree_changes.js';
 
 const dragAndDropSetup = {
diff --git a/src/public/javascripts/export.js b/src/public/javascripts/services/export.js
similarity index 95%
rename from src/public/javascripts/export.js
rename to src/public/javascripts/services/export.js
index 9c105b58a..601c70075 100644
--- a/src/public/javascripts/export.js
+++ b/src/public/javascripts/services/export.js
@@ -1,6 +1,6 @@
 "use strict";
 
-import treeService from './note_tree.js';
+import treeService from './tree_service.js';
 import protected_session from './protected_session.js';
 import utils from './utils.js';
 
diff --git a/src/public/javascripts/init.js b/src/public/javascripts/services/init.js
similarity index 96%
rename from src/public/javascripts/init.js
rename to src/public/javascripts/services/init.js
index 4c1054e96..0ba895917 100644
--- a/src/public/javascripts/init.js
+++ b/src/public/javascripts/services/init.js
@@ -1,9 +1,9 @@
 "use strict";
 
-import treeService from './note_tree.js';
+import treeService from './tree_service.js';
 import link from './link.js';
 import messaging from './messaging.js';
-import noteEditor from './note_editor.js';
+import noteDetail from './note_detail.js';
 import treeUtils from './tree_utils.js';
 import utils from './utils.js';
 import server from './server.js';
@@ -107,7 +107,7 @@ $("#note-title").bind('keydown', 'return', () => $("#note-detail").focus());
 $(window).on('beforeunload', () => {
     // this makes sure that when user e.g. reloads the page or navigates away from the page, the note's content is saved
     // this sends the request asynchronously and doesn't wait for result
-    noteEditor.saveNoteIfChanged();
+    noteDetail.saveNoteIfChanged();
 });
 
 // Overrides the default autocomplete filter function to search for matched on atleast 1 word in each of the input term's words
@@ -164,7 +164,7 @@ $(document).tooltip({
         if (notePath !== null) {
             const noteId = treeUtils.getNoteIdFromNotePath(notePath);
 
-            noteEditor.loadNote(noteId).then(note => callback(note.detail.content));
+            noteDetail.loadNote(noteId).then(note => callback(note.detail.content));
         }
     },
     close: function(event, ui)
@@ -244,7 +244,7 @@ $("#attachment-upload").change(async function() {
     formData.append('upload', this.files[0]);
 
     const resp = await $.ajax({
-        url: baseApiUrl + 'attachments/upload/' + noteEditor.getCurrentNoteId(),
+        url: baseApiUrl + 'attachments/upload/' + noteDetail.getCurrentNoteId(),
         headers: server.getHeaders(),
         data: formData,
         type: 'POST',
diff --git a/src/public/javascripts/link.js b/src/public/javascripts/services/link.js
similarity index 93%
rename from src/public/javascripts/link.js
rename to src/public/javascripts/services/link.js
index c06c85549..6b40becdb 100644
--- a/src/public/javascripts/link.js
+++ b/src/public/javascripts/services/link.js
@@ -1,7 +1,7 @@
 "use strict";
 
-import treeService from './note_tree.js';
-import noteEditor from './note_editor.js';
+import treeService from './tree_service.js';
+import noteDetail from './note_detail.js';
 import treeUtils from './tree_utils.js';
 
 function getNotePathFromLink(url) {
@@ -77,14 +77,14 @@ function goToLink(e) {
 }
 
 function addLinkToEditor(linkTitle, linkHref) {
-    const editor = noteEditor.getEditor();
+    const editor = noteDetail.getEditor();
     const doc = editor.document;
 
     doc.enqueueChanges(() => editor.data.insertLink(linkTitle, linkHref), doc.selection);
 }
 
 function addTextToEditor(text) {
-    const editor = noteEditor.getEditor();
+    const editor = noteDetail.getEditor();
     const doc = editor.document;
 
     doc.enqueueChanges(() => editor.data.insertText(text), doc.selection);
diff --git a/src/public/javascripts/messaging.js b/src/public/javascripts/services/messaging.js
similarity index 94%
rename from src/public/javascripts/messaging.js
rename to src/public/javascripts/services/messaging.js
index 3bc626c10..d64921cfb 100644
--- a/src/public/javascripts/messaging.js
+++ b/src/public/javascripts/services/messaging.js
@@ -1,8 +1,7 @@
 "use strict";
 
-import treeService from './note_tree.js';
-import noteEditor from './note_editor.js';
-import sync from './sync.js';
+import treeService from './tree_service.js';
+import noteDetailService from './note_detail.js';
 import utils from './utils.js';
 
 const $changesToPushCount = $("#changes-to-push-count");
@@ -41,10 +40,10 @@ function messageHandler(event) {
             treeService.reload();
         }
 
-        if (syncData.some(sync => sync.entityName === 'notes' && sync.entityId === noteEditor.getCurrentNoteId())) {
+        if (syncData.some(sync => sync.entityName === 'notes' && sync.entityId === noteDetailService.getCurrentNoteId())) {
             utils.showMessage('Reloading note because of background changes');
 
-            noteEditor.reload();
+            noteDetailService.reload();
         }
 
         if (syncData.some(sync => sync.entityName === 'recent_notes')) {
diff --git a/src/public/javascripts/note_editor.js b/src/public/javascripts/services/note_detail.js
similarity index 99%
rename from src/public/javascripts/note_editor.js
rename to src/public/javascripts/services/note_detail.js
index e2f1e0668..48be3ed68 100644
--- a/src/public/javascripts/note_editor.js
+++ b/src/public/javascripts/services/note_detail.js
@@ -1,6 +1,6 @@
 "use strict";
 
-import treeService from './note_tree.js';
+import treeService from './tree_service.js';
 import noteType from './note_type.js';
 import protected_session from './protected_session.js';
 import utils from './utils.js';
diff --git a/src/public/javascripts/note_type.js b/src/public/javascripts/services/note_type.js
similarity index 96%
rename from src/public/javascripts/note_type.js
rename to src/public/javascripts/services/note_type.js
index 980d7f7bb..344887a2d 100644
--- a/src/public/javascripts/note_type.js
+++ b/src/public/javascripts/services/note_type.js
@@ -1,7 +1,7 @@
 "use strict";
 
-import treeService from './note_tree.js';
-import noteEditor from './note_editor.js';
+import treeService from './tree_service.js';
+import noteDetail from './note_detail.js';
 import utils from './utils.js';
 
 const $executeScriptButton = $("#execute-script-button");
@@ -85,13 +85,13 @@ function NoteTypeModel() {
     };
 
     async function save() {
-        const note = noteEditor.getCurrentNote();
+        const note = noteDetail.getCurrentNote();
 
         await server.put('notes/' + note.detail.noteId
             + '/type/' + encodeURIComponent(self.type())
             + '/mime/' + encodeURIComponent(self.mime()));
 
-        await noteEditor.reload();
+        await noteDetail.reload();
 
         // for the note icon to be updated in the tree
         await treeService.reload();
diff --git a/src/public/javascripts/protected_session.js b/src/public/javascripts/services/protected_session.js
similarity index 89%
rename from src/public/javascripts/protected_session.js
rename to src/public/javascripts/services/protected_session.js
index 9f66e53f4..1eb041977 100644
--- a/src/public/javascripts/protected_session.js
+++ b/src/public/javascripts/services/protected_session.js
@@ -1,7 +1,7 @@
 "use strict";
 
-import treeService from './note_tree.js';
-import noteEditor from './note_editor.js';
+import treeService from './tree_service.js';
+import noteDetail from './note_detail.js';
 import utils from './utils.js';
 import server from './server.js';
 
@@ -68,7 +68,7 @@ async function setupProtectedSession() {
 
     $dialog.dialog("close");
 
-    noteEditor.reload();
+    noteDetail.reload();
     treeService.reload();
 
     if (protectedSessionDeferred !== null) {
@@ -117,33 +117,33 @@ function isProtectedSessionAvailable() {
 async function protectNoteAndSendToServer() {
     await ensureProtectedSession(true, true);
 
-    const note = noteEditor.getCurrentNote();
+    const note = noteDetail.getCurrentNote();
 
-    noteEditor.updateNoteFromInputs(note);
+    noteDetail.updateNoteFromInputs(note);
 
     note.detail.isProtected = true;
 
-    await noteEditor.saveNoteToServer(note);
+    await noteDetail.saveNoteToServer(note);
 
     treeService.setProtected(note.detail.noteId, note.detail.isProtected);
 
-    noteEditor.setNoteBackgroundIfProtected(note);
+    noteDetail.setNoteBackgroundIfProtected(note);
 }
 
 async function unprotectNoteAndSendToServer() {
     await ensureProtectedSession(true, true);
 
-    const note = noteEditor.getCurrentNote();
+    const note = noteDetail.getCurrentNote();
 
-    noteEditor.updateNoteFromInputs(note);
+    noteDetail.updateNoteFromInputs(note);
 
     note.detail.isProtected = false;
 
-    await noteEditor.saveNoteToServer(note);
+    await noteDetail.saveNoteToServer(note);
 
     treeService.setProtected(note.detail.noteId, note.detail.isProtected);
 
-    noteEditor.setNoteBackgroundIfProtected(note);
+    noteDetail.setNoteBackgroundIfProtected(note);
 }
 
 function touchProtectedSession() {
@@ -160,7 +160,7 @@ async function protectSubTree(noteId, protect) {
     utils.showMessage("Request to un/protect sub tree has finished successfully");
 
     treeService.reload();
-    noteEditor.reload();
+    noteDetail.reload();
 }
 
 $passwordForm.submit(() => {
diff --git a/src/public/javascripts/script_api.js b/src/public/javascripts/services/script_api.js
similarity index 96%
rename from src/public/javascripts/script_api.js
rename to src/public/javascripts/services/script_api.js
index 7cb1f3132..0f4b10c4d 100644
--- a/src/public/javascripts/script_api.js
+++ b/src/public/javascripts/services/script_api.js
@@ -1,4 +1,4 @@
-import treeService from './note_tree.js';
+import treeService from './tree_service.js';
 
 function ScriptApi(startNote, currentNote) {
     const $pluginButtons = $("#plugin-buttons");
diff --git a/src/public/javascripts/script_context.js b/src/public/javascripts/services/script_context.js
similarity index 100%
rename from src/public/javascripts/script_context.js
rename to src/public/javascripts/services/script_context.js
diff --git a/src/public/javascripts/search_tree.js b/src/public/javascripts/services/search_tree.js
similarity index 97%
rename from src/public/javascripts/search_tree.js
rename to src/public/javascripts/services/search_tree.js
index 906250b73..bf9e759ff 100644
--- a/src/public/javascripts/search_tree.js
+++ b/src/public/javascripts/services/search_tree.js
@@ -1,6 +1,6 @@
 "use strict";
 
-import treeService from './note_tree.js';
+import treeService from './tree_service.js';
 
 const $tree = $("#tree");
 const $searchInput = $("input[name='search-text']");
diff --git a/src/public/javascripts/server.js b/src/public/javascripts/services/server.js
similarity index 100%
rename from src/public/javascripts/server.js
rename to src/public/javascripts/services/server.js
diff --git a/src/public/javascripts/sync.js b/src/public/javascripts/services/sync.js
similarity index 100%
rename from src/public/javascripts/sync.js
rename to src/public/javascripts/services/sync.js
diff --git a/src/public/javascripts/tree_cache.js b/src/public/javascripts/services/tree_cache.js
similarity index 94%
rename from src/public/javascripts/tree_cache.js
rename to src/public/javascripts/services/tree_cache.js
index 387956cd2..4f57d2f2b 100644
--- a/src/public/javascripts/tree_cache.js
+++ b/src/public/javascripts/services/tree_cache.js
@@ -1,6 +1,6 @@
 import utils from "./utils.js";
-import Branch from "./entities/branch.js";
-import NoteShort from "./entities/note_short.js";
+import Branch from "../entities/branch.js";
+import NoteShort from "../entities/note_short.js";
 
 class TreeCache {
     load(noteRows, branchRows) {
diff --git a/src/public/javascripts/tree_changes.js b/src/public/javascripts/services/tree_changes.js
similarity index 98%
rename from src/public/javascripts/tree_changes.js
rename to src/public/javascripts/services/tree_changes.js
index 6238ca3ed..7aae9e70b 100644
--- a/src/public/javascripts/tree_changes.js
+++ b/src/public/javascripts/services/tree_changes.js
@@ -1,6 +1,6 @@
 "use strict";
 
-import treeService from './note_tree.js';
+import treeService from './tree_service.js';
 import utils from './utils.js';
 
 async function moveBeforeNode(nodesToMove, beforeNode) {
diff --git a/src/public/javascripts/note_tree.js b/src/public/javascripts/services/tree_service.js
similarity index 99%
rename from src/public/javascripts/note_tree.js
rename to src/public/javascripts/services/tree_service.js
index e2173c504..c77cafb97 100644
--- a/src/public/javascripts/note_tree.js
+++ b/src/public/javascripts/services/tree_service.js
@@ -4,13 +4,13 @@ import contextMenu from './context_menu.js';
 import dragAndDropSetup from './drag_and_drop.js';
 import link from './link.js';
 import messaging from './messaging.js';
-import noteEditor from './note_editor.js';
+import noteDetail from './note_detail.js';
 import protected_session from './protected_session.js';
 import treeChanges from './tree_changes.js';
 import treeUtils from './tree_utils.js';
 import utils from './utils.js';
 import server from './server.js';
-import recentNotes from './dialogs/recent_notes.js';
+import recentNotes from '../dialogs/recent_notes.js';
 import treeCache from './tree_cache.js';
 
 const $tree = $("#tree");
@@ -494,7 +494,7 @@ function initFancyTree(branch) {
             return false;
         },
         "return": node => {
-            noteEditor.focus();
+            noteDetail.focus();
 
             return false;
         },
@@ -557,7 +557,7 @@ function initFancyTree(branch) {
 
             setCurrentNotePathToHash(data.node);
 
-            noteEditor.switchToNote(node.noteId);
+            noteDetail.switchToNote(node.noteId);
 
             showParentList(node.noteId, data.node);
         },
@@ -793,7 +793,7 @@ async function createNote(node, parentNoteId, target, isProtected) {
 
     treeCache.add(note, branch);
 
-    noteEditor.newNoteCreated();
+    noteDetail.newNoteCreated();
 
     const newNode = {
         title: newNoteName,
diff --git a/src/public/javascripts/tree_utils.js b/src/public/javascripts/services/tree_utils.js
similarity index 100%
rename from src/public/javascripts/tree_utils.js
rename to src/public/javascripts/services/tree_utils.js
diff --git a/src/public/javascripts/utils.js b/src/public/javascripts/services/utils.js
similarity index 100%
rename from src/public/javascripts/utils.js
rename to src/public/javascripts/services/utils.js
diff --git a/src/views/index.ejs b/src/views/index.ejs
index 50fa5ffcd..5fb09c8c3 100644
--- a/src/views/index.ejs
+++ b/src/views/index.ejs
@@ -519,7 +519,7 @@
 
     <link href="/stylesheets/style.css" rel="stylesheet">
 
-    <script src="/javascripts/bootstrap.js" type="module"></script>
+    <script src="/javascripts/services/bootstrap.js" type="module"></script>
 
     <script type="text/javascript">
       // we hide container initally because otherwise it is rendered first without CSS and then flickers into