diff --git a/spec/search/note_cache_mocking.js b/spec/search/note_cache_mocking.js
index b3fc35c8a..69b17cc3c 100644
--- a/spec/search/note_cache_mocking.js
+++ b/spec/search/note_cache_mocking.js
@@ -1,7 +1,7 @@
-const Note = require('../../src/services/becca/entities/note.js');
-const Branch = require('../../src/services/becca/entities/branch.js');
-const Attribute = require('../../src/services/becca/entities/attribute.js');
-const becca = require('../../src/services/becca/becca.js');
+const Note = require('../../src/becca/entities/note.js');
+const Branch = require('../../src/becca/entities/branch.js');
+const Attribute = require('../../src/becca/entities/attribute.js');
+const becca = require('../../src/becca/becca.js');
 const randtoken = require('rand-token').generator({source: 'crypto'});
 
 /** @return {Note} */
diff --git a/spec/search/search.spec.js b/spec/search/search.spec.js
index 3d46b6170..611072c5d 100644
--- a/spec/search/search.spec.js
+++ b/spec/search/search.spec.js
@@ -1,9 +1,9 @@
 const searchService = require('../../src/services/search/services/search.js');
-const Note = require('../../src/services/becca/entities/note.js');
-const Branch = require('../../src/services/becca/entities/branch.js');
+const Note = require('../../src/becca/entities/note.js');
+const Branch = require('../../src/becca/entities/branch.js');
 const SearchContext = require('../../src/services/search/search_context.js');
 const dateUtils = require('../../src/services/date_utils.js');
-const becca = require('../../src/services/becca/becca.js');
+const becca = require('../../src/becca/becca.js');
 const {NoteBuilder, findNoteByTitle, note} = require('./note_cache_mocking.js');
 
 describe("Search", () => {
diff --git a/spec/search/value_extractor.spec.js b/spec/search/value_extractor.spec.js
index aa3096756..a8bd3a505 100644
--- a/spec/search/value_extractor.spec.js
+++ b/spec/search/value_extractor.spec.js
@@ -1,6 +1,6 @@
 const {note} = require('./note_cache_mocking.js');
 const ValueExtractor = require('../../src/services/search/value_extractor.js');
-const becca = require('../../src/services/becca/becca.js');
+const becca = require('../../src/becca/becca.js');
 const SearchContext = require("../../src/services/search/search_context.js");
 
 const dsc = new SearchContext();
diff --git a/src/app.js b/src/app.js
index 195625df2..462d07342 100644
--- a/src/app.js
+++ b/src/app.js
@@ -10,7 +10,7 @@ const FileStore = require('session-file-store')(session);
 const sessionSecret = require('./services/session_secret');
 const dataDir = require('./services/data_dir');
 require('./services/handlers');
-require('./services/becca/becca_loader.js');
+require('./becca/becca_loader.js');
 
 const app = express();
 
diff --git a/src/services/becca/becca_loader.js b/src/becca/becca_loader.js
similarity index 90%
rename from src/services/becca/becca_loader.js
rename to src/becca/becca_loader.js
index 0eb3df1b4..675206f2b 100644
--- a/src/services/becca/becca_loader.js
+++ b/src/becca/becca_loader.js
@@ -1,21 +1,21 @@
 "use strict";
 
-const sql = require('../sql.js');
-const eventService = require('../events.js');
+const sql = require('../services/sql.js');
+const eventService = require('../services/events.js');
 const becca = require('./becca.js');
-const sqlInit = require('../sql_init');
-const log = require('../log');
-const Note = require('./entities/note');
-const Branch = require('./entities/branch');
-const Attribute = require('./entities/attribute');
-const Option = require('./entities/option');
-const cls = require("../cls.js");
+const sqlInit = require('../services/sql_init');
+const log = require('../services/log');
+const Note = require('./entities/note.js');
+const Branch = require('./entities/branch.js');
+const Attribute = require('./entities/attribute.js');
+const Option = require('./entities/option.js');
+const cls = require("../services/cls.js");
 
 const beccaLoaded = new Promise((res, rej) => {
     sqlInit.dbReady.then(() => {
         load();
 
-        cls.init(() => require('../options_init').initStartupOptions());
+        cls.init(() => require('../services/options_init').initStartupOptions());
 
         res();
     });
diff --git a/src/services/becca/entities/abstract_entity.js b/src/becca/entities/abstract_entity.js
similarity index 89%
rename from src/services/becca/entities/abstract_entity.js
rename to src/becca/entities/abstract_entity.js
index 465f1a69f..7b7c176f6 100644
--- a/src/services/becca/entities/abstract_entity.js
+++ b/src/becca/entities/abstract_entity.js
@@ -1,11 +1,11 @@
 "use strict";
 
-const utils = require('../../utils');
-const sql = require('../../sql');
-const entityChangesService = require('../../entity_changes');
-const eventService = require("../../events");
-const dateUtils = require("../../date_utils");
-const cls = require("../../cls");
+const utils = require('../../services/utils');
+const sql = require('../../services/sql');
+const entityChangesService = require('../../services/entity_changes');
+const eventService = require("../../services/events");
+const dateUtils = require("../../services/date_utils");
+const cls = require("../../services/cls");
 
 let becca = null;
 
@@ -41,7 +41,7 @@ class AbstractEntity {
 
     get becca() {
         if (!becca) {
-            becca = require('../becca');
+            becca = require('../becca.js');
         }
 
         return becca;
diff --git a/src/services/becca/entities/note.js b/src/becca/entities/note.js
similarity index 98%
rename from src/services/becca/entities/note.js
rename to src/becca/entities/note.js
index 249be39e5..776bf8675 100644
--- a/src/services/becca/entities/note.js
+++ b/src/becca/entities/note.js
@@ -1,13 +1,13 @@
 "use strict";
 
-const protectedSessionService = require('../../protected_session');
-const log = require('../../log');
-const sql = require('../../sql');
-const utils = require('../../utils');
-const dateUtils = require('../../date_utils');
-const entityChangesService = require('../../entity_changes');
-const AbstractEntity = require("./abstract_entity");
-const NoteRevision = require("./note_revision");
+const protectedSessionService = require('../../services/protected_session');
+const log = require('../../services/log');
+const sql = require('../../services/sql');
+const utils = require('../../services/utils');
+const dateUtils = require('../../services/date_utils');
+const entityChangesService = require('../../services/entity_changes');
+const AbstractEntity = require("./abstract_entity.js");
+const NoteRevision = require("./note_revision.js");
 
 const LABEL = 'label';
 const RELATION = 'relation';
@@ -879,7 +879,7 @@ class Note extends AbstractEntity {
             }
         }
         else {
-            const Attribute = require("./attribute");
+            const Attribute = require("./attribute.js");
 
             new Attribute({
                 noteId: this.noteId,
@@ -911,7 +911,7 @@ class Note extends AbstractEntity {
      * @return {Attribute}
      */
     addAttribute(type, name, value = "", isInheritable = false, position = 1000) {
-        const Attribute = require("./attribute");
+        const Attribute = require("./attribute.js");
 
         return new Attribute({
             noteId: this.noteId,
diff --git a/src/services/becca/entities/note_revision.js b/src/becca/entities/note_revision.js
similarity index 93%
rename from src/services/becca/entities/note_revision.js
rename to src/becca/entities/note_revision.js
index 4c62b4d17..b78c11aa2 100644
--- a/src/services/becca/entities/note_revision.js
+++ b/src/becca/entities/note_revision.js
@@ -1,12 +1,12 @@
 "use strict";
 
-const protectedSessionService = require('../../protected_session');
-const utils = require('../../utils');
-const sql = require('../../sql');
-const dateUtils = require('../../date_utils');
-const becca = require('../../becca/becca');
-const entityChangesService = require('../../entity_changes');
-const AbstractEntity = require("./abstract_entity");
+const protectedSessionService = require('../../services/protected_session');
+const utils = require('../../services/utils');
+const sql = require('../../services/sql');
+const dateUtils = require('../../services/date_utils');
+const becca = require('../becca.js');
+const entityChangesService = require('../../services/entity_changes');
+const AbstractEntity = require("./abstract_entity.js");
 
 /**
  * NoteRevision represents snapshot of note's title and content at some point in the past. It's used for seamless note versioning.
diff --git a/src/services/becca/entity_constructor.js b/src/becca/entity_constructor.js
similarity index 90%
rename from src/services/becca/entity_constructor.js
rename to src/becca/entity_constructor.js
index 4a8731493..3f5b84915 100644
--- a/src/services/becca/entity_constructor.js
+++ b/src/becca/entity_constructor.js
@@ -1,7 +1,7 @@
-const Note = require('./entities/note');
+const Note = require('./entities/note.js');
 const NoteRevision = require('./entities/note_revision.js');
-const Branch = require('./entities/branch');
-const Attribute = require('./entities/attribute');
+const Branch = require('./entities/branch.js');
+const Attribute = require('./entities/attribute.js');
 const RecentNote = require('./entities/recent_note.js');
 const ApiToken = require('./entities/api_token.js');
 
diff --git a/src/routes/api/attributes.js b/src/routes/api/attributes.js
index 0c3f42b0e..132c41c5e 100644
--- a/src/routes/api/attributes.js
+++ b/src/routes/api/attributes.js
@@ -3,8 +3,8 @@
 const sql = require('../../services/sql');
 const log = require('../../services/log');
 const attributeService = require('../../services/attributes');
-const Attribute = require('../../services/becca/entities/attribute');
-const becca = require("../../services/becca/becca");
+const Attribute = require('../../becca/entities/attribute.js');
+const becca = require("../../becca/becca.js");
 
 function getEffectiveNoteAttributes(req) {
     const note = becca.getNote(req.params.noteId);
diff --git a/src/routes/api/autocomplete.js b/src/routes/api/autocomplete.js
index 9082b3d25..6fb2f5e3d 100644
--- a/src/routes/api/autocomplete.js
+++ b/src/routes/api/autocomplete.js
@@ -1,11 +1,11 @@
 "use strict";
 
-const beccaService = require('../../services/becca/becca_service.js');
+const beccaService = require('../../becca/becca_service.js');
 const searchService = require('../../services/search/services/search.js');
 const log = require('../../services/log');
 const utils = require('../../services/utils');
 const cls = require('../../services/cls');
-const becca = require("../../services/becca/becca");
+const becca = require("../../becca/becca.js");
 
 function getAutocomplete(req) {
     const query = req.query.query.trim();
diff --git a/src/routes/api/branches.js b/src/routes/api/branches.js
index 53eb027af..bc22d35a9 100644
--- a/src/routes/api/branches.js
+++ b/src/routes/api/branches.js
@@ -5,7 +5,7 @@ const utils = require('../../services/utils');
 const entityChangesService = require('../../services/entity_changes.js');
 const treeService = require('../../services/tree');
 const noteService = require('../../services/notes');
-const becca = require('../../services/becca/becca.js');
+const becca = require('../../becca/becca.js');
 const TaskContext = require('../../services/task_context');
 
 /**
diff --git a/src/routes/api/clipper.js b/src/routes/api/clipper.js
index 1aea27a72..15753ae0c 100644
--- a/src/routes/api/clipper.js
+++ b/src/routes/api/clipper.js
@@ -10,7 +10,7 @@ const ws = require('../../services/ws.js');
 const log = require('../../services/log');
 const utils = require('../../services/utils');
 const path = require('path');
-const Attribute = require('../../services/becca/entities/attribute');
+const Attribute = require('../../becca/entities/attribute.js');
 const htmlSanitizer = require('../../services/html_sanitizer');
 
 function findClippingNote(todayNote, pageUrl) {
diff --git a/src/routes/api/files.js b/src/routes/api/files.js
index 4cb671ae1..fd0cf11cc 100644
--- a/src/routes/api/files.js
+++ b/src/routes/api/files.js
@@ -9,7 +9,7 @@ const fs = require('fs');
 const { Readable } = require('stream');
 const chokidar = require('chokidar');
 const ws = require('../../services/ws');
-const becca = require("../../services/becca/becca");
+const becca = require("../../becca/becca.js");
 
 function updateFile(req) {
     const {noteId} = req.params;
diff --git a/src/routes/api/image.js b/src/routes/api/image.js
index 4c21386c5..6b9a3b195 100644
--- a/src/routes/api/image.js
+++ b/src/routes/api/image.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const imageService = require('../../services/image');
-const becca = require('../../services/becca/becca');
+const becca = require('../../becca/becca.js');
 const RESOURCE_DIR = require('../../services/resource_dir').RESOURCE_DIR;
 const fs = require('fs');
 
diff --git a/src/routes/api/import.js b/src/routes/api/import.js
index 8c8794b67..0ac52b1e9 100644
--- a/src/routes/api/import.js
+++ b/src/routes/api/import.js
@@ -6,7 +6,7 @@ const zipImportService = require('../../services/import/zip');
 const singleImportService = require('../../services/import/single');
 const cls = require('../../services/cls');
 const path = require('path');
-const beccaLoader = require('../../services/becca/becca_loader.js');
+const beccaLoader = require('../../becca/becca_loader.js');
 const log = require('../../services/log');
 const TaskContext = require('../../services/task_context.js');
 
diff --git a/src/routes/api/login.js b/src/routes/api/login.js
index 9cb21931b..34a01db60 100644
--- a/src/routes/api/login.js
+++ b/src/routes/api/login.js
@@ -11,7 +11,7 @@ const eventService = require('../../services/events');
 const sqlInit = require('../../services/sql_init');
 const sql = require('../../services/sql');
 const optionService = require('../../services/options');
-const ApiToken = require('../../services/becca/entities/api_token.js');
+const ApiToken = require('../../becca/entities/api_token.js');
 const ws = require("../../services/ws.js");
 
 function loginSync(req) {
diff --git a/src/routes/api/note_revisions.js b/src/routes/api/note_revisions.js
index 0a1f736e8..cdedee5bf 100644
--- a/src/routes/api/note_revisions.js
+++ b/src/routes/api/note_revisions.js
@@ -1,12 +1,12 @@
 "use strict";
 
-const beccaService = require('../../services/becca/becca_service.js');
+const beccaService = require('../../becca/becca_service.js');
 const protectedSessionService = require('../../services/protected_session');
 const noteRevisionService = require('../../services/note_revisions');
 const utils = require('../../services/utils');
 const sql = require('../../services/sql');
 const path = require('path');
-const becca = require("../../services/becca/becca");
+const becca = require("../../becca/becca.js");
 
 function getNoteRevisions(req) {
     return becca.getNoteRevisionsFromQuery(`
diff --git a/src/routes/api/notes.js b/src/routes/api/notes.js
index 1ee5d695a..cb20e38c9 100644
--- a/src/routes/api/notes.js
+++ b/src/routes/api/notes.js
@@ -8,7 +8,7 @@ const log = require('../../services/log');
 const TaskContext = require('../../services/task_context');
 const fs = require('fs');
 const noteRevisionService = require("../../services/note_revisions.js");
-const becca = require("../../services/becca/becca");
+const becca = require("../../becca/becca.js");
 
 function getNote(req) {
     const noteId = req.params.noteId;
diff --git a/src/routes/api/recent_changes.js b/src/routes/api/recent_changes.js
index 750a4e23a..f1e58a3d9 100644
--- a/src/routes/api/recent_changes.js
+++ b/src/routes/api/recent_changes.js
@@ -3,7 +3,7 @@
 const sql = require('../../services/sql');
 const protectedSessionService = require('../../services/protected_session');
 const noteService = require('../../services/notes');
-const beccaService = require('../../services/becca/becca_service.js');
+const beccaService = require('../../becca/becca_service.js');
 
 function getRecentChanges(req) {
     const {ancestorNoteId} = req.params;
diff --git a/src/routes/api/recent_notes.js b/src/routes/api/recent_notes.js
index 3c8108a30..50e07b72d 100644
--- a/src/routes/api/recent_notes.js
+++ b/src/routes/api/recent_notes.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const RecentNote = require('../../services/becca/entities/recent_note.js');
+const RecentNote = require('../../becca/entities/recent_note.js');
 const sql = require('../../services/sql');
 const dateUtils = require('../../services/date_utils');
 
diff --git a/src/routes/api/script.js b/src/routes/api/script.js
index 6cf8e9e5d..799af134f 100644
--- a/src/routes/api/script.js
+++ b/src/routes/api/script.js
@@ -2,7 +2,7 @@
 
 const scriptService = require('../../services/script');
 const attributeService = require('../../services/attributes');
-const becca = require('../../services/becca/becca');
+const becca = require('../../becca/becca.js');
 const syncService = require('../../services/sync');
 
 function exec(req) {
diff --git a/src/routes/api/search.js b/src/routes/api/search.js
index 593ada04f..ed618ff22 100644
--- a/src/routes/api/search.js
+++ b/src/routes/api/search.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const becca = require('../../services/becca/becca');
+const becca = require('../../becca/becca.js');
 const SearchContext = require('../../services/search/search_context');
 const log = require('../../services/log');
 const scriptService = require('../../services/script');
diff --git a/src/routes/api/similar_notes.js b/src/routes/api/similar_notes.js
index 1d20a2664..741ef20f6 100644
--- a/src/routes/api/similar_notes.js
+++ b/src/routes/api/similar_notes.js
@@ -1,7 +1,7 @@
 "use strict";
 
-const similarityService = require('../../services/becca/similarity.js');
-const becca = require("../../services/becca/becca");
+const similarityService = require('../../becca/similarity.js');
+const becca = require("../../becca/becca.js");
 
 async function getSimilarNotes(req) {
     const noteId = req.params.noteId;
diff --git a/src/routes/api/stats.js b/src/routes/api/stats.js
index c96e6da43..bbb16fd04 100644
--- a/src/routes/api/stats.js
+++ b/src/routes/api/stats.js
@@ -1,5 +1,5 @@
 const sql = require('../../services/sql');
-const becca = require('../../services/becca/becca.js');
+const becca = require('../../becca/becca.js');
 
 function getNoteSize(req) {
     const {noteId} = req.params;
diff --git a/src/routes/api/tree.js b/src/routes/api/tree.js
index 49bb8bf37..72b0a79b2 100644
--- a/src/routes/api/tree.js
+++ b/src/routes/api/tree.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const becca = require('../../services/becca/becca.js');
+const becca = require('../../becca/becca.js');
 const log = require('../../services/log');
 
 function getNotesAndBranchesAndAttributes(noteIds) {
diff --git a/src/routes/custom.js b/src/routes/custom.js
index 2cc9b8d35..c56b54aa7 100644
--- a/src/routes/custom.js
+++ b/src/routes/custom.js
@@ -3,7 +3,7 @@ const fileUploadService = require('./api/files.js');
 const scriptService = require('../services/script');
 const cls = require('../services/cls');
 const sql = require("../services/sql");
-const becca = require("../services/becca/becca");
+const becca = require("../becca/becca.js");
 
 function handleRequest(req, res) {
     // express puts content after first slash into 0 index element
diff --git a/src/services/attributes.js b/src/services/attributes.js
index 87d72c968..e91c8bf69 100644
--- a/src/services/attributes.js
+++ b/src/services/attributes.js
@@ -2,8 +2,8 @@
 
 const searchService = require('./search/services/search');
 const sql = require('./sql');
-const becca = require('./becca/becca.js');
-const Attribute = require('./becca/entities/attribute');
+const becca = require('../becca/becca.js');
+const Attribute = require('../becca/entities/attribute.js');
 const {formatAttrForSearch} = require("./attribute_formatter.js");
 
 const ATTRIBUTE_TYPES = [ 'label', 'relation' ];
diff --git a/src/services/backend_script_api.js b/src/services/backend_script_api.js
index aaef0741b..47149b50e 100644
--- a/src/services/backend_script_api.js
+++ b/src/services/backend_script_api.js
@@ -13,7 +13,7 @@ const cloningService = require('./cloning');
 const appInfo = require('./app_info');
 const searchService = require('./search/services/search');
 const SearchContext = require("./search/search_context.js");
-const becca = require("./becca/becca");
+const becca = require("../becca/becca.js");
 
 /**
  * This is the main backend API interface for scripts. It's published in the local "api" object.
diff --git a/src/services/cloning.js b/src/services/cloning.js
index 42d58c931..ca113e13f 100644
--- a/src/services/cloning.js
+++ b/src/services/cloning.js
@@ -4,10 +4,10 @@ const sql = require('./sql');
 const eventChangesService = require('./entity_changes.js');
 const treeService = require('./tree');
 const noteService = require('./notes');
-const Branch = require('../services/becca/entities/branch');
+const Branch = require('../becca/entities/branch.js');
 const TaskContext = require("./task_context.js");
 const utils = require('./utils');
-const becca = require("./becca/becca");
+const becca = require("../becca/becca.js");
 
 function cloneNoteToParent(noteId, parentBranchId, prefix) {
     const parentBranch = becca.getBranch(parentBranchId);
diff --git a/src/services/consistency_checks.js b/src/services/consistency_checks.js
index cc3a046be..e95049c94 100644
--- a/src/services/consistency_checks.js
+++ b/src/services/consistency_checks.js
@@ -8,11 +8,11 @@ const syncMutexService = require('./sync_mutex');
 const cls = require('./cls');
 const entityChangesService = require('./entity_changes.js');
 const optionsService = require('./options');
-const Branch = require('../services/becca/entities/branch');
+const Branch = require('../becca/entities/branch.js');
 const dateUtils = require('./date_utils');
 const attributeService = require('./attributes');
 const noteRevisionService = require('./note_revisions');
-const becca = require("./becca/becca");
+const becca = require("../becca/becca.js");
 
 class ConsistencyChecks {
     constructor(autoFix) {
@@ -579,7 +579,7 @@ class ConsistencyChecks {
         }
 
         if (this.fixedIssues) {
-            require("../services/becca/becca_loader").load();
+            require("../becca/becca_loader.js").load();
         }
 
         return !this.unrecoveredConsistencyErrors;
diff --git a/src/services/date_notes.js b/src/services/date_notes.js
index 2c2d129d3..18997109d 100644
--- a/src/services/date_notes.js
+++ b/src/services/date_notes.js
@@ -3,7 +3,7 @@
 const noteService = require('./notes');
 const attributeService = require('./attributes');
 const dateUtils = require('./date_utils');
-const becca = require('./becca/becca');
+const becca = require('../becca/becca.js');
 const sql = require('./sql');
 const protectedSessionService = require('./protected_session');
 
diff --git a/src/services/entity_changes.js b/src/services/entity_changes.js
index 04ef50fbc..3a9c79c2a 100644
--- a/src/services/entity_changes.js
+++ b/src/services/entity_changes.js
@@ -3,7 +3,7 @@ const sourceIdService = require('./source_id');
 const dateUtils = require('./date_utils');
 const log = require('./log');
 const cls = require('./cls');
-const becca = require("./becca/becca.js");
+const becca = require("../becca/becca.js");
 
 let maxEntityChangeId = 0;
 
diff --git a/src/services/export/opml.js b/src/services/export/opml.js
index a3a1842a4..12ae6721a 100644
--- a/src/services/export/opml.js
+++ b/src/services/export/opml.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const utils = require('../utils');
-const becca = require("../becca/becca");
+const becca = require("../../becca/becca.js");
 
 function exportToOpml(taskContext, branch, version, res) {
     if (!['1.0', '2.0'].includes(version)) {
diff --git a/src/services/handlers.js b/src/services/handlers.js
index 525ba87cf..a427625b8 100644
--- a/src/services/handlers.js
+++ b/src/services/handlers.js
@@ -2,8 +2,8 @@ const eventService = require('./events');
 const scriptService = require('./script');
 const treeService = require('./tree');
 const noteService = require('./notes');
-const becca = require('./becca/becca.js');
-const Attribute = require('./becca/entities/attribute');
+const becca = require('../becca/becca.js');
+const Attribute = require('../becca/entities/attribute.js');
 
 function runAttachedRelations(note, relationName, originEntity) {
     // same script note can get here with multiple ways, but execute only once
diff --git a/src/services/image.js b/src/services/image.js
index 66edae160..aa4118f68 100644
--- a/src/services/image.js
+++ b/src/services/image.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const becca = require('./becca/becca');
+const becca = require('../becca/becca.js');
 const log = require('./log');
 const protectedSessionService = require('./protected_session');
 const noteService = require('./notes');
diff --git a/src/services/import/zip.js b/src/services/import/zip.js
index 7c2726d9e..36ad4c301 100644
--- a/src/services/import/zip.js
+++ b/src/services/import/zip.js
@@ -1,11 +1,11 @@
 "use strict";
 
-const Attribute = require('../../services/becca/entities/attribute');
+const Attribute = require('../../becca/entities/attribute.js');
 const utils = require('../../services/utils');
 const log = require('../../services/log');
 const noteService = require('../../services/notes');
 const attributeService = require('../../services/attributes');
-const Branch = require('../../services/becca/entities/branch');
+const Branch = require('../../becca/entities/branch.js');
 const path = require('path');
 const commonmark = require('commonmark');
 const protectedSessionService = require('../protected_session');
@@ -13,7 +13,7 @@ const mimeService = require("./mime");
 const treeService = require("../tree");
 const yauzl = require("yauzl");
 const htmlSanitizer = require('../html_sanitizer');
-const becca = require("../becca/becca.js");
+const becca = require("../../becca/becca.js");
 
 /**
  * @param {TaskContext} taskContext
diff --git a/src/services/note_revisions.js b/src/services/note_revisions.js
index 8d0c77996..966e69c8a 100644
--- a/src/services/note_revisions.js
+++ b/src/services/note_revisions.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const NoteRevision = require('./becca/entities/note_revision.js');
+const NoteRevision = require('../becca/entities/note_revision.js');
 const dateUtils = require('./date_utils');
 const log = require('./log');
 const sql = require('./sql');
diff --git a/src/services/notes.js b/src/services/notes.js
index 223afafef..d823b318f 100644
--- a/src/services/notes.js
+++ b/src/services/notes.js
@@ -13,10 +13,10 @@ const attributeService = require('../services/attributes');
 const request = require('./request');
 const path = require('path');
 const url = require('url');
-const becca = require('../services/becca/becca');
-const Branch = require('../services/becca/entities/branch');
-const Note = require('../services/becca/entities/note');
-const Attribute = require('../services/becca/entities/attribute');
+const becca = require('../becca/becca.js');
+const Branch = require('../becca/entities/branch.js');
+const Note = require('../becca/entities/note.js');
+const Attribute = require('../becca/entities/attribute.js');
 
 function getNewNotePosition(parentNoteId) {
     const note = becca.notes[parentNoteId];
diff --git a/src/services/options.js b/src/services/options.js
index c27e050ed..7cb49930d 100644
--- a/src/services/options.js
+++ b/src/services/options.js
@@ -1,7 +1,7 @@
-const becca = require('./becca/becca');
+const becca = require('../becca/becca.js');
 
 function getOption(name) {
-    const option = require('./becca/becca').getOption(name);
+    const option = require('../becca/becca.js').getOption(name);
 
     if (!option) {
         throw new Error(`Option "${name}" doesn't exist`);
@@ -57,7 +57,7 @@ function setOption(name, value) {
 
 function createOption(name, value, isSynced) {
     // to avoid circular dependency, need to find better solution
-    const Option = require('../services/becca/entities/option');
+    const Option = require('../becca/entities/option.js');
 
     new Option({
         name: name,
diff --git a/src/services/scheduler.js b/src/services/scheduler.js
index 49280e5a0..9965a6c95 100644
--- a/src/services/scheduler.js
+++ b/src/services/scheduler.js
@@ -4,7 +4,7 @@ const sqlInit = require('./sql_init');
 const config = require('./config');
 const log = require('./log');
 const sql = require("./sql");
-const becca = require("./becca/becca");
+const becca = require("../becca/becca.js");
 
 function getRunAtHours(note) {
     try {
diff --git a/src/services/script.js b/src/services/script.js
index 30180a8f4..8bc1fc0f1 100644
--- a/src/services/script.js
+++ b/src/services/script.js
@@ -1,7 +1,7 @@
 const ScriptContext = require('./script_context');
 const cls = require('./cls');
 const log = require('./log');
-const becca = require("./becca/becca");
+const becca = require("../becca/becca.js");
 
 function executeNote(note, apiParams) {
     if (!note.isJavaScript() || note.getScriptEnv() !== 'backend' || !note.isContentAvailable) {
diff --git a/src/services/search/expressions/ancestor.js b/src/services/search/expressions/ancestor.js
index 7ce085427..63384789c 100644
--- a/src/services/search/expressions/ancestor.js
+++ b/src/services/search/expressions/ancestor.js
@@ -3,7 +3,7 @@
 const Expression = require('./expression');
 const NoteSet = require('../note_set');
 const log = require('../../log');
-const becca = require('../../becca/becca.js');
+const becca = require('../../../becca/becca.js');
 
 class AncestorExp extends Expression {
     constructor(ancestorNoteId, ancestorDepth) {
diff --git a/src/services/search/expressions/attribute_exists.js b/src/services/search/expressions/attribute_exists.js
index 4067f4655..8aba8fb32 100644
--- a/src/services/search/expressions/attribute_exists.js
+++ b/src/services/search/expressions/attribute_exists.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const NoteSet = require('../note_set');
-const becca = require('../../becca/becca.js');
+const becca = require('../../../becca/becca.js');
 const Expression = require('./expression');
 
 class AttributeExistsExp extends Expression {
diff --git a/src/services/search/expressions/descendant_of.js b/src/services/search/expressions/descendant_of.js
index b50302a73..8e12f40e2 100644
--- a/src/services/search/expressions/descendant_of.js
+++ b/src/services/search/expressions/descendant_of.js
@@ -2,7 +2,7 @@
 
 const Expression = require('./expression');
 const NoteSet = require('../note_set');
-const becca = require('../../becca/becca.js');
+const becca = require('../../../becca/becca.js');
 
 class DescendantOfExp extends Expression {
     constructor(subExpression) {
diff --git a/src/services/search/expressions/label_comparison.js b/src/services/search/expressions/label_comparison.js
index 59506da2b..cb0b178ed 100644
--- a/src/services/search/expressions/label_comparison.js
+++ b/src/services/search/expressions/label_comparison.js
@@ -2,7 +2,7 @@
 
 const Expression = require('./expression');
 const NoteSet = require('../note_set');
-const becca = require('../../becca/becca.js');
+const becca = require('../../../becca/becca.js');
 
 class LabelComparisonExp extends Expression {
     constructor(attributeType, attributeName, comparator) {
diff --git a/src/services/search/expressions/note_cache_flat_text.js b/src/services/search/expressions/note_cache_flat_text.js
index 54d3892c9..6324b6dd7 100644
--- a/src/services/search/expressions/note_cache_flat_text.js
+++ b/src/services/search/expressions/note_cache_flat_text.js
@@ -2,7 +2,7 @@
 
 const Expression = require('./expression');
 const NoteSet = require('../note_set');
-const becca = require('../../becca/becca.js');
+const becca = require('../../../becca/becca.js');
 
 class BeccaFlatTextExp extends Expression {
     constructor(tokens) {
@@ -13,7 +13,7 @@ class BeccaFlatTextExp extends Expression {
 
     execute(inputNoteSet, executionContext) {
         // has deps on SQL which breaks unit test so needs to be dynamically required
-        const beccaService = require('../../becca/becca_service.js');
+        const beccaService = require('../../../becca/becca_service.js');
         const resultNoteSet = new NoteSet();
 
         function searchDownThePath(note, tokens, path) {
diff --git a/src/services/search/expressions/note_content_protected_fulltext.js b/src/services/search/expressions/note_content_protected_fulltext.js
index b1224f634..23c99e674 100644
--- a/src/services/search/expressions/note_content_protected_fulltext.js
+++ b/src/services/search/expressions/note_content_protected_fulltext.js
@@ -3,7 +3,7 @@
 const Expression = require('./expression');
 const NoteSet = require('../note_set');
 const log = require('../../log');
-const becca = require('../../becca/becca.js');
+const becca = require('../../../becca/becca.js');
 const protectedSessionService = require('../../protected_session');
 const striptags = require('striptags');
 
diff --git a/src/services/search/expressions/note_content_unprotected_fulltext.js b/src/services/search/expressions/note_content_unprotected_fulltext.js
index 230df2f1d..5ad190081 100644
--- a/src/services/search/expressions/note_content_unprotected_fulltext.js
+++ b/src/services/search/expressions/note_content_unprotected_fulltext.js
@@ -2,7 +2,7 @@
 
 const Expression = require('./expression');
 const NoteSet = require('../note_set');
-const becca = require('../../becca/becca.js');
+const becca = require('../../../becca/becca.js');
 const striptags = require('striptags');
 
 class NoteContentUnprotectedFulltextExp extends Expression {
diff --git a/src/services/search/expressions/relation_where.js b/src/services/search/expressions/relation_where.js
index 2086e0601..8ea60c5fb 100644
--- a/src/services/search/expressions/relation_where.js
+++ b/src/services/search/expressions/relation_where.js
@@ -2,7 +2,7 @@
 
 const Expression = require('./expression');
 const NoteSet = require('../note_set');
-const becca = require('../../becca/becca.js');
+const becca = require('../../../becca/becca.js');
 
 class RelationWhereExp extends Expression {
     constructor(relationName, subExpression) {
diff --git a/src/services/search/search_result.js b/src/services/search/search_result.js
index c7045a789..b91e0f016 100644
--- a/src/services/search/search_result.js
+++ b/src/services/search/search_result.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const beccaService = require('../becca/becca_service.js');
+const beccaService = require('../../becca/becca_service.js');
 
 class SearchResult {
     constructor(notePathArray) {
diff --git a/src/services/search/services/search.js b/src/services/search/services/search.js
index 99039b5c5..bbf7a924c 100644
--- a/src/services/search/services/search.js
+++ b/src/services/search/services/search.js
@@ -6,8 +6,8 @@ const parse = require('./parse.js');
 const NoteSet = require("../note_set.js");
 const SearchResult = require("../search_result.js");
 const SearchContext = require("../search_context.js");
-const becca = require('../../becca/becca.js');
-const beccaService = require('../../becca/becca_service.js');
+const becca = require('../../../becca/becca.js');
+const beccaService = require('../../../becca/becca_service.js');
 const utils = require('../../utils.js');
 const log = require('../../log.js');
 
diff --git a/src/services/setup.js b/src/services/setup.js
index 2cefe3e23..0d4d67ada 100644
--- a/src/services/setup.js
+++ b/src/services/setup.js
@@ -6,7 +6,7 @@ const syncOptions = require('./sync_options');
 const request = require('./request');
 const appInfo = require('./app_info');
 const utils = require('./utils');
-const becca = require("./becca/becca");
+const becca = require("../becca/becca.js");
 
 async function hasSyncServerSchemaAndSeed() {
     const response = await requestToSyncServer('GET', '/api/setup/status');
diff --git a/src/services/sql.js b/src/services/sql.js
index d29192afe..ba01ff773 100644
--- a/src/services/sql.js
+++ b/src/services/sql.js
@@ -249,7 +249,7 @@ function transactional(func) {
         if (entityChanges.length > 0) {
             log.info("Transaction rollback dirtied the becca, forcing reload.");
 
-            require('./becca/becca_loader.js').load();
+            require('../becca/becca_loader.js').load();
         }
 
         throw e;
diff --git a/src/services/sql_init.js b/src/services/sql_init.js
index 26ac6c416..bff5001d8 100644
--- a/src/services/sql_init.js
+++ b/src/services/sql_init.js
@@ -5,7 +5,7 @@ const sql = require('./sql');
 const utils = require('./utils');
 const optionService = require('./options');
 const port = require('./port');
-const Option = require('./becca/entities/option');
+const Option = require('../becca/entities/option.js');
 const TaskContext = require('./task_context.js');
 const migrationService = require('./migration');
 const cls = require('./cls');
@@ -60,10 +60,10 @@ async function createInitialDatabase(username, password, theme) {
     sql.transactional(() => {
         sql.executeScript(schema);
 
-        require("./becca/becca_loader").load();
+        require("../becca/becca_loader.js").load();
 
-        const Note = require("./becca/entities/note");
-        const Branch = require("./becca/entities/branch");
+        const Note = require("../becca/entities/note.js");
+        const Branch = require("../becca/entities/branch.js");
 
         rootNote = new Note({
             noteId: 'root',
diff --git a/src/services/sync.js b/src/services/sync.js
index 7355d66dd..e7fc470c8 100644
--- a/src/services/sync.js
+++ b/src/services/sync.js
@@ -15,7 +15,7 @@ const cls = require('./cls');
 const request = require('./request');
 const ws = require('./ws');
 const entityChangesService = require('./entity_changes.js');
-const entityConstructor = require('../services/becca/entity_constructor');
+const entityConstructor = require('../becca/entity_constructor.js');
 
 let proxyToggle = true;
 
@@ -385,7 +385,7 @@ function getOutstandingPullCount() {
     return outstandingPullCount;
 }
 
-require("./becca/becca_loader").beccaLoaded.then(() => {
+require("../becca/becca_loader.js").beccaLoaded.then(() => {
     setInterval(cls.wrap(sync), 60000);
 
     // kickoff initial sync immediately
diff --git a/src/services/sync_update.js b/src/services/sync_update.js
index d785377a8..a13748c10 100644
--- a/src/services/sync_update.js
+++ b/src/services/sync_update.js
@@ -2,7 +2,7 @@ const sql = require('./sql');
 const log = require('./log');
 const entityChangesService = require('./entity_changes.js');
 const eventService = require('./events');
-const entityConstructor = require("./becca/entity_constructor.js");
+const entityConstructor = require("../becca/entity_constructor.js");
 
 function updateEntity(entityChange, entity, sourceId) {
     // can be undefined for options with isSynced=false
diff --git a/src/services/tree.js b/src/services/tree.js
index 6cab39a9b..aa90d301e 100644
--- a/src/services/tree.js
+++ b/src/services/tree.js
@@ -2,10 +2,10 @@
 
 const sql = require('./sql');
 const log = require('./log');
-const Branch = require('../services/becca/entities/branch');
+const Branch = require('../becca/entities/branch.js');
 const entityChangesService = require('./entity_changes.js');
 const protectedSessionService = require('./protected_session');
-const becca = require('./becca/becca.js');
+const becca = require('../becca/becca.js');
 
 function getNotes(noteIds) {
     // we return also deleted notes which have been specifically asked for