diff --git a/src/services/becca/becca.js b/src/becca/becca.js
similarity index 98%
rename from src/services/becca/becca.js
rename to src/becca/becca.js
index 2c03aebb5..eed48199c 100644
--- a/src/services/becca/becca.js
+++ b/src/becca/becca.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const sql = require("../sql.js");
+const sql = require("../services/sql.js");
 const NoteRevision = require("./entities/note_revision.js");
 const RecentNote = require("./entities/recent_note.js");
 
diff --git a/src/services/becca/becca_service.js b/src/becca/becca_service.js
similarity index 97%
rename from src/services/becca/becca_service.js
rename to src/becca/becca_service.js
index 65d29af09..6c51e9271 100644
--- a/src/services/becca/becca_service.js
+++ b/src/becca/becca_service.js
@@ -1,9 +1,9 @@
 "use strict";
 
 const becca = require('./becca.js');
-const cls = require('../cls');
-const protectedSessionService = require('../protected_session');
-const log = require('../log');
+const cls = require('../services/cls');
+const protectedSessionService = require('../services/protected_session');
+const log = require('../services/log');
 
 function isNotePathArchived(notePath) {
     const noteId = notePath[notePath.length - 1];
diff --git a/src/services/becca/entities/api_token.js b/src/becca/entities/api_token.js
similarity index 93%
rename from src/services/becca/entities/api_token.js
rename to src/becca/entities/api_token.js
index 57ba2ce10..a445fef6e 100644
--- a/src/services/becca/entities/api_token.js
+++ b/src/becca/entities/api_token.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const dateUtils = require('../../date_utils.js');
+const dateUtils = require('../../services/date_utils.js');
 const AbstractEntity = require("./abstract_entity.js");
 
 /**
diff --git a/src/services/becca/entities/attribute.js b/src/becca/entities/attribute.js
similarity index 95%
rename from src/services/becca/entities/attribute.js
rename to src/becca/entities/attribute.js
index b2115a240..fbd950310 100644
--- a/src/services/becca/entities/attribute.js
+++ b/src/becca/entities/attribute.js
@@ -2,9 +2,9 @@
 
 const Note = require('./note.js');
 const AbstractEntity = require("./abstract_entity.js");
-const sql = require("../../sql.js");
-const dateUtils = require("../../date_utils.js");
-const promotedAttributeDefinitionParser = require("../../promoted_attribute_definition_parser");
+const sql = require("../../services/sql.js");
+const dateUtils = require("../../services/date_utils.js");
+const promotedAttributeDefinitionParser = require("../../services/promoted_attribute_definition_parser");
 
 class Attribute extends AbstractEntity {
     static get entityName() { return "attributes"; }
diff --git a/src/services/becca/entities/branch.js b/src/becca/entities/branch.js
similarity index 97%
rename from src/services/becca/entities/branch.js
rename to src/becca/entities/branch.js
index 679797f2c..2848667e4 100644
--- a/src/services/becca/entities/branch.js
+++ b/src/becca/entities/branch.js
@@ -2,8 +2,8 @@
 
 const Note = require('./note.js');
 const AbstractEntity = require("./abstract_entity.js");
-const sql = require("../../sql.js");
-const dateUtils = require("../../date_utils.js");
+const sql = require("../../services/sql.js");
+const dateUtils = require("../../services/date_utils.js");
 
 class Branch extends AbstractEntity {
     static get entityName() { return "branches"; }
diff --git a/src/services/becca/entities/option.js b/src/becca/entities/option.js
similarity index 94%
rename from src/services/becca/entities/option.js
rename to src/becca/entities/option.js
index d535d02ac..599840975 100644
--- a/src/services/becca/entities/option.js
+++ b/src/becca/entities/option.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const dateUtils = require('../../date_utils.js');
+const dateUtils = require('../../services/date_utils.js');
 const AbstractEntity = require("./abstract_entity.js");
 
 /**
diff --git a/src/services/becca/entities/recent_note.js b/src/becca/entities/recent_note.js
similarity index 91%
rename from src/services/becca/entities/recent_note.js
rename to src/becca/entities/recent_note.js
index f3765970c..06776d965 100644
--- a/src/services/becca/entities/recent_note.js
+++ b/src/becca/entities/recent_note.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const dateUtils = require('../../date_utils.js');
+const dateUtils = require('../../services/date_utils.js');
 const AbstractEntity = require("./abstract_entity.js");
 
 /**
diff --git a/src/services/becca/similarity.js b/src/becca/similarity.js
similarity index 99%
rename from src/services/becca/similarity.js
rename to src/becca/similarity.js
index 8b9ecca9a..b4b1cb7de 100644
--- a/src/services/becca/similarity.js
+++ b/src/becca/similarity.js
@@ -1,7 +1,7 @@
 const becca = require('./becca.js');
-const log = require('../log');
+const log = require('../services/log');
 const beccaService = require('./becca_service.js');
-const dateUtils = require('../date_utils');
+const dateUtils = require('../services/date_utils');
 const { JSDOM } = require("jsdom");
 
 const DEBUG = false;