diff --git a/app/routes/authenticated/roles/add.js b/app/routes/authenticated/roles/add.js
index 2024071d607354d0f093459dc5575578467aca0a..585bf1158d3c87f25abe50ed61c836c868b1c62c 100644
--- a/app/routes/authenticated/roles/add.js
+++ b/app/routes/authenticated/roles/add.js
@@ -1,5 +1,6 @@
-import { inject as service } from '@ember/service';
-import BaseRoute from 'papermerge/base/routing';
+import { service } from '@ember/service';
+import BaseRoute from 'papermerge/routes/base';
+
 
 export default class AddRoleRoute extends BaseRoute {
   @service store;
diff --git a/app/routes/authenticated/roles/edit.js b/app/routes/authenticated/roles/edit.js
index c8b0f7fe34cb00ee08a7f77b69c5ed84e4a5de46..4aca3638f54a15b28a8b1f4cf68426f3ae775f28 100644
--- a/app/routes/authenticated/roles/edit.js
+++ b/app/routes/authenticated/roles/edit.js
@@ -1,6 +1,7 @@
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import RSVP from 'rsvp';
-import BaseRoute from 'papermerge/base/routing';
+import BaseRoute from 'papermerge/routes/base';
+
 
 export default class EditRoleRoute extends BaseRoute {
   @service store;
diff --git a/app/routes/authenticated/roles/index.js b/app/routes/authenticated/roles/index.js
index e1b3064167546da41df232dc52f8171c5de24b91..8339180995ca348baacd44c8ddb9f479084dc3b0 100644
--- a/app/routes/authenticated/roles/index.js
+++ b/app/routes/authenticated/roles/index.js
@@ -1,5 +1,5 @@
 import BaseRoute from 'papermerge/routes/base';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 
 export default class RolesRoute extends BaseRoute {
diff --git a/app/routes/authenticated/users/add.js b/app/routes/authenticated/users/add.js
index 08bf1cb7cb8c6ea35149de78e1c98939996d3bb3..6b1eb3c75d2425659b3f7bcbfbff6feff5b2e49e 100644
--- a/app/routes/authenticated/users/add.js
+++ b/app/routes/authenticated/users/add.js
@@ -1,6 +1,7 @@
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import RSVP from 'rsvp';
-import BaseRoute from 'papermerge/base/routing';
+import BaseRoute from 'papermerge/routes/base';
+
 
 class AddUserRoute extends BaseRoute {
   @service store;
diff --git a/app/routes/authenticated/users/change_password.js b/app/routes/authenticated/users/change_password.js
index 30477db2919a8069cf7330ba827cd7b805c08edd..1c76ffcaaf641065802dbd192fb74a7dcce11fb5 100644
--- a/app/routes/authenticated/users/change_password.js
+++ b/app/routes/authenticated/users/change_password.js
@@ -1,5 +1,6 @@
-import { inject as service } from '@ember/service';
-import BaseRoute from 'papermerge/base/routing';
+import { service } from '@ember/service';
+import BaseRoute from 'papermerge/routes/base';
+
 
 export default class ChangeUserPasswordRoute extends BaseRoute {
   @service store;
diff --git a/app/routes/authenticated/users/edit.js b/app/routes/authenticated/users/edit.js
index b08d399ea7709d7e42a067643342702fe23e94a6..2ad9e0e2c20cb0129841f73e879943f4f067b456 100644
--- a/app/routes/authenticated/users/edit.js
+++ b/app/routes/authenticated/users/edit.js
@@ -1,6 +1,7 @@
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import RSVP from 'rsvp';
-import BaseRoute from 'papermerge/base/routing';
+import BaseRoute from 'papermerge/routes/base';
+
 
 export default class EditUserRoute extends BaseRoute {
   @service store;
diff --git a/app/routes/authenticated/users/index.js b/app/routes/authenticated/users/index.js
index 5178a34bbbbd23c5080fcc700cea5fee8f9dbb7f..1db4ffa3674157672841774566a97cfeaf0cf7aa 100644
--- a/app/routes/authenticated/users/index.js
+++ b/app/routes/authenticated/users/index.js
@@ -1,4 +1,4 @@
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import BaseRoute from 'papermerge/routes/base';