diff --git a/app/routes/application.js b/app/routes/application.js
index a23748b3fa7c0d5651cc8b763edd139a82f71d22..6734f7bb070a33a506465ae53e366492eb111924 100644
--- a/app/routes/application.js
+++ b/app/routes/application.js
@@ -1,4 +1,4 @@
-import BaseRoute from 'papermerge/base/routing';
+import BaseRoute from 'papermerge/routes/base';
 
 
 export default class ApplicationRoute extends BaseRoute {
diff --git a/app/routes/authenticated/automates/index.js b/app/routes/authenticated/automates/index.js
index 2168ce0ab60b12aa50912c8f25ddc31e1c8d93a7..c80958b92d8979c63ef804f985d41130c0caf347 100644
--- a/app/routes/authenticated/automates/index.js
+++ b/app/routes/authenticated/automates/index.js
@@ -1,5 +1,5 @@
 import { inject as service } from '@ember/service';
-import BaseRoute from 'papermerge/base/routing';
+import BaseRoute from 'papermerge/routes/base';
 
 export default class AutomatesRoute extends BaseRoute {
   @service store;
diff --git a/app/routes/authenticated/groups.js b/app/routes/authenticated/groups.js
index 87e75e1e1ffbe753dd76717b7fe4c081819dc8b1..3657a81eb7442903c55b053018c7de4f0e68b250 100644
--- a/app/routes/authenticated/groups.js
+++ b/app/routes/authenticated/groups.js
@@ -1,5 +1,5 @@
 import { inject as service } from '@ember/service';
-import BaseRoute from 'papermerge/base/routing';
+import BaseRoute from 'papermerge/routes/base';
 
 
 export default class GroupsRoute extends BaseRoute {
diff --git a/app/routes/authenticated/roles/index.js b/app/routes/authenticated/roles/index.js
index 7886741e0af277894b3e197b6d87704c23a52224..e1b3064167546da41df232dc52f8171c5de24b91 100644
--- a/app/routes/authenticated/roles/index.js
+++ b/app/routes/authenticated/roles/index.js
@@ -1,4 +1,4 @@
-import BaseRoute from 'papermerge/base/routing';
+import BaseRoute from 'papermerge/routes/base';
 import { inject as service } from '@ember/service';
 
 
diff --git a/app/routes/authenticated/tags.js b/app/routes/authenticated/tags.js
index 0a6b8d5c41955c04b33e8ff8943c00107a5c5b60..34362cae05a0aaaee044a144a27bad9c61259b96 100644
--- a/app/routes/authenticated/tags.js
+++ b/app/routes/authenticated/tags.js
@@ -1,5 +1,5 @@
 import { service } from '@ember/service';
-import BaseRoute from 'papermerge/base/routing';
+import BaseRoute from 'papermerge/routes/base';
 
 
 export default class TagsRoute extends BaseRoute {
diff --git a/app/routes/authenticated/tokens.js b/app/routes/authenticated/tokens.js
index 924d608ebfa0c244f06a5710a5ba189ff2a65bad..ab97f8b1eb82180ac76db6bbb0ace3ef4d655174 100644
--- a/app/routes/authenticated/tokens.js
+++ b/app/routes/authenticated/tokens.js
@@ -1,5 +1,5 @@
 import { service } from '@ember/service';
-import BaseRoute from 'papermerge/base/routing';
+import BaseRoute from 'papermerge/routes/base';
 
 
 export default class TokensRoute extends BaseRoute {
diff --git a/app/routes/authenticated/users/index.js b/app/routes/authenticated/users/index.js
index 44691a495694ffcc4f117cd46067479c0e08f62f..5178a34bbbbd23c5080fcc700cea5fee8f9dbb7f 100644
--- a/app/routes/authenticated/users/index.js
+++ b/app/routes/authenticated/users/index.js
@@ -1,5 +1,6 @@
 import { inject as service } from '@ember/service';
-import BaseRoute from 'papermerge/base/routing';
+import BaseRoute from 'papermerge/routes/base';
+
 
 export default class UsersRoute extends BaseRoute {
   @service store;
diff --git a/app/base/routing.js b/app/routes/base.js
similarity index 100%
rename from app/base/routing.js
rename to app/routes/base.js