diff --git a/app/abilities/article-comment.js b/app/abilities/article-comment.js
index 3fbd1882f..38a7c4ade 100644
--- a/app/abilities/article-comment.js
+++ b/app/abilities/article-comment.js
@@ -1,6 +1,10 @@
 import { Ability } from 'ember-can';
 
 export default class ArticleComment extends Ability {
+  get canShow() {
+    return this.session.hasPermission('article-comment.read');
+  }
+
   get canCreate() {
     return this.session.hasPermission('article-comment.create');
   }
diff --git a/app/abilities/debit/transaction.js b/app/abilities/debit/transaction.js
index 1798fa3e2..35fbfd359 100644
--- a/app/abilities/debit/transaction.js
+++ b/app/abilities/debit/transaction.js
@@ -1,6 +1,10 @@
 import { Ability } from 'ember-can';
 
 export default class Transaction extends Ability {
+  get canShow() {
+    return this.session.hasPermission('debit/transaction.read');
+  }
+
   get canEdit() {
     return this.session.hasPermission('debit/transaction.update');
   }
diff --git a/app/abilities/photo.js b/app/abilities/photo.js
index 047f0b269..141478220 100644
--- a/app/abilities/photo.js
+++ b/app/abilities/photo.js
@@ -8,7 +8,7 @@ export default class Photo extends Ability {
   get canShowPhotoComments() {
     return (
       this.session.hasPermission('photo-comment.read') ||
-      this.model.photoAlbum.publiclyVisible
+      this.model.photoAlbum.get('publiclyVisible')
     );
   }
 }
diff --git a/app/adapters/application.js b/app/adapters/application.js
index ae37a35a0..d605adac7 100644
--- a/app/adapters/application.js
+++ b/app/adapters/application.js
@@ -1,7 +1,7 @@
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
 import { underscore } from '@ember/string';
 import { inject as service } from '@ember/service';
-import ENV from '../config/environment';
+import ENV from 'amber-ui/config/environment';
 
 import { pluralize } from 'ember-inflector';
 
diff --git a/app/authenticators/oauth2.js b/app/authenticators/oauth2.js
index b4c4cdca6..949a736fc 100644
--- a/app/authenticators/oauth2.js
+++ b/app/authenticators/oauth2.js
@@ -1,5 +1,5 @@
 import OAuth2PasswordGrant from 'ember-simple-auth/authenticators/oauth2-password-grant';
-import ENV from '../config/environment';
+import ENV from 'amber-ui/config/environment';
 
 export default class OAuth2Authenticator extends OAuth2PasswordGrant {
   serverTokenEndpoint = `${ENV.api.hostname}/oauth/token`;
diff --git a/app/components/bread-crumbs.hbs b/app/components/bread-crumbs.hbs
deleted file mode 100644
index 3a22524c6..000000000
--- a/app/components/bread-crumbs.hbs
+++ /dev/null
@@ -1,11 +0,0 @@
-<ol class='breadcrumb'>
-  <li class='breadcrumb-item'><LinkTo @route='index'>C.S.V. Alpha</LinkTo></li>
-
-  {{#each routeHierarchy as |route|}}
-    {{#if (has-block)}}
-      {{yield this route}}
-    {{else}}
-      <BreadCrumb @route={{route}} @breadCrumbs={{this}} />
-    {{/if}}
-  {{/each}}
-</ol>
\ No newline at end of file
diff --git a/app/components/bread-crumbs.js b/app/components/bread-crumbs.js
deleted file mode 100644
index 057907951..000000000
--- a/app/components/bread-crumbs.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import BreadCrumbs from 'ember-crumbly/components/bread-crumbs';
-
-export default class CustomBreadCrumbs extends BreadCrumbs {}
diff --git a/app/components/breadcrumbs.hbs b/app/components/breadcrumbs.hbs
new file mode 100644
index 000000000..83175c79a
--- /dev/null
+++ b/app/components/breadcrumbs.hbs
@@ -0,0 +1,15 @@
+<ol class='breadcrumb'>
+  <li class='breadcrumb-item'><LinkTo @route='index'>C.S.V. Alpha</LinkTo></li>
+
+  {{#each @routeInfos as |routeInfo|}}
+    <li class='breadcrumb-item'>
+      {{#if (has-next routeInfo @routeInfos)}}
+        <LinkTo @route={{routeInfo.name}}>
+          {{routeInfo.metadata.breadcrumb.title}}
+        </LinkTo>
+      {{else}}
+        {{routeInfo.metadata.breadcrumb.title}}
+      {{/if}}
+    </li>
+  {{/each}}
+</ol>
\ No newline at end of file
diff --git a/app/components/cards/activity-card.hbs b/app/components/cards/activity-card.hbs
index 4c6887d60..2af52e4ed 100644
--- a/app/components/cards/activity-card.hbs
+++ b/app/components/cards/activity-card.hbs
@@ -41,7 +41,7 @@
             <span class='subtitle-author' data-test-activity-author>
               {{#if activity.group}}
                 <LinkTo
-                  @route='groups.show'
+                  @route='groups.group'
                   @model={{activity.group.id}}
                   class='link-to card-subtitle-link'
                 >
@@ -49,7 +49,7 @@
                 </LinkTo>
               {{else}}
                 <LinkTo
-                  @route='users.show'
+                  @route='users.user'
                   @model={{activity.author.id}}
                   class='link-to card-subtitle-link'
                 >
diff --git a/app/components/cards/article-card.hbs b/app/components/cards/article-card.hbs
index ce2d70cd6..a126dae8c 100644
--- a/app/components/cards/article-card.hbs
+++ b/app/components/cards/article-card.hbs
@@ -23,7 +23,7 @@
         </div>
 
         <div class='card-titles'>
-          <LinkTo @route='articles.show' @model={{article.id}}>
+          <LinkTo @route='articles.article' @model={{article.id}}>
             <h2 class='card-title' itemprop='name headline'>
               {{#if article.pinned}}<FaIcon @icon='thumbtack' />{{/if}}
               {{article.title}}
@@ -32,7 +32,7 @@
           <h3 class='card-subtitle'>
             {{#if article.group}}
               <LinkTo
-                @route='groups.show'
+                @route='groups.group'
                 @model={{article.group.id}}
                 class='link-to card-subtitle-link'
               >
@@ -46,7 +46,7 @@
               </LinkTo>
             {{else}}
               <LinkTo
-                @route='users.show'
+                @route='users.user'
                 @model={{article.author.id}}
                 class='link-to card-subtitle-link'
               >
@@ -101,7 +101,7 @@
         }}
       </span>
       {{#if useMaxHeight}}
-        <LinkTo @route='articles.show' @model={{article.id}} itemprop='url'>
+        <LinkTo @route='articles.article' @model={{article.id}} itemprop='url'>
           <span class='float-md-end'> {{t 'tag.button.readMore'}} </span>
         </LinkTo>
       {{/if}}
diff --git a/app/components/cards/frontpage-article-card.hbs b/app/components/cards/frontpage-article-card.hbs
index 0e369c701..126e9d7c1 100644
--- a/app/components/cards/frontpage-article-card.hbs
+++ b/app/components/cards/frontpage-article-card.hbs
@@ -1,4 +1,4 @@
-<LinkTo @route='articles.show' @model={{article.id}}>
+<LinkTo @route='articles.article' @model={{article.id}}>
   <article
     class={{if useMaxHeight 'd-flex'}}
     itemscope
@@ -24,7 +24,7 @@
             </h5>
             {{#if article.group}}
               <LinkTo
-                @route='groups.show'
+                @route='groups.group'
                 @model={{article.group.id}}
                 class='link-to card-subtitle-link'
               >
@@ -39,7 +39,7 @@
               </LinkTo>
             {{else}}
               <LinkTo
-                @route='users.show'
+                @route='users.user'
                 @model={{article.author.id}}
                 class='link-to card-subtitle-link'
               >
diff --git a/app/components/cards/privacy-preference.hbs b/app/components/cards/privacy-preference.hbs
index c5b6f2aa6..9f9c7abfd 100644
--- a/app/components/cards/privacy-preference.hbs
+++ b/app/components/cards/privacy-preference.hbs
@@ -3,7 +3,7 @@
 
   {{#if (can 'edit user' model)}}
     <LinkTo
-      @route='users.edit-privacy'
+      @route='users.user.edit.privacy'
       @model={{model.id}}
       class='btn btn-outline-info'
     >
diff --git a/app/components/form/response/response-card.hbs b/app/components/form/response/response-card.hbs
index c032a2a0b..84f053c9f 100644
--- a/app/components/form/response/response-card.hbs
+++ b/app/components/form/response/response-card.hbs
@@ -15,7 +15,7 @@
       @inputLayout='vertical'
     >
       {{#if form.questions}}
-        <LinkTo @route='activities.index' class='btn btn-default'>
+        <LinkTo @route='activities' class='btn btn-default'>
           Annuleren
         </LinkTo>
         Vragen met een * zijn verplicht
diff --git a/app/components/form/response/response-completed-alert.hbs b/app/components/form/response/response-completed-alert.hbs
index b0ba59e01..132fad17d 100644
--- a/app/components/form/response/response-completed-alert.hbs
+++ b/app/components/form/response/response-completed-alert.hbs
@@ -11,7 +11,7 @@
     </span>
     {{#if form.canRespond}}
       <LinkTo
-        @route='form.responses.destroy'
+        @route='form.responses.response.destroy'
         @model={{form.currentUserResponseId}}
         class='btn btn-secondary'
       >
diff --git a/app/components/form/responses-table-row.hbs b/app/components/form/responses-table-row.hbs
index f45a7fdbe..2e232b097 100644
--- a/app/components/form/responses-table-row.hbs
+++ b/app/components/form/responses-table-row.hbs
@@ -8,7 +8,7 @@
   {{#if (can 'destroy form/response')}}
     {{#if response.form.canRespond}}
       <LinkTo
-        @route='form.responses.destroy'
+        @route='form.responses.response.destroy'
         @model={{response.id}}
         class='no-print'
       >
@@ -17,7 +17,7 @@
     {{/if}}
   {{/if}}
 
-  <LinkTo @route='users.show' @model={{response.user.id}}>
+  <LinkTo @route='users.user' @model={{response.user.id}}>
     {{response.user.fullNameWithNickname}}
   </LinkTo>
 </td>
diff --git a/app/components/forms/photo-album-form.hbs b/app/components/forms/photo-album-form.hbs
index 1e03e66b7..49c884a2b 100644
--- a/app/components/forms/photo-album-form.hbs
+++ b/app/components/forms/photo-album-form.hbs
@@ -1,6 +1,6 @@
 <div class='card'>
   <div class='card-header'>
-    <h5>{{if @model.isNew 'Foto-album aanmaken' 'Foto-album wijzigen'}}</h5>
+    <h5>{{if @model.isNew 'Fotoalbum aanmaken' 'Fotoalbum wijzigen'}}</h5>
   </div>
   <div class='card-body'>
     <form {{action @onSubmit on='submit'}}>
@@ -25,7 +25,7 @@
         <div class="row">
           <div class="col-sm-10 offset-sm-2">
             <div class='alert alert-warning' role='alert'>
-              Een publiek foto-album verschijnt op de voorpagina, en is ook voor
+              Een publiek fotoalbum verschijnt op de voorpagina, en is ook voor
               externen zichtbaar. Wees dus voorzichtig met wat je plaatst en zorg
               dat je toestemming hebt. Zie het mediabeleid voor meer informatie.
             </div>
@@ -86,7 +86,7 @@
         @errors={{@model.errors}}
         @errorMessage={{@errorMessage}}
       >
-        <button {{action @onCancel}} type="button" class='btn btn-default'>
+        <button {{action @onCancel}} type='button' class='btn btn-default'>
           Annuleren
         </button>
       </ModelForm::FormActions>
diff --git a/app/components/forms/post-form.hbs b/app/components/forms/post-form.hbs
index 9c583ada3..399e6eb71 100644
--- a/app/components/forms/post-form.hbs
+++ b/app/components/forms/post-form.hbs
@@ -1,6 +1,6 @@
 <div class='card'>
   <div class='card-header'>
-    <h5>Forumpost bewerken</h5>
+    <h5>{{if @model.isNew 'Forumbericht aanmaken' 'Forumbericht wijzigen'}}</h5>
   </div>
   <div class='card-body'>
     <form {{action @onSubmit on='submit'}}>
diff --git a/app/components/forms/transaction-form.hbs b/app/components/forms/transaction-form.hbs
index 753c5e198..fe3c44309 100644
--- a/app/components/forms/transaction-form.hbs
+++ b/app/components/forms/transaction-form.hbs
@@ -1,6 +1,6 @@
 <div class='card'>
   <div class='card-header'>
-    <h5>Transactie aanmaken</h5>
+    <h5>{{if @model.isNew 'Transactie aanmaken' 'Transactie wijzigen'}}</h5>
   </div>
   <div class='card-body'>
     <form {{action @onSubmit on='submit'}}>
diff --git a/app/components/forum/forum-post.hbs b/app/components/forum/forum-post.hbs
index 7b23dbe26..9c5e3d309 100644
--- a/app/components/forum/forum-post.hbs
+++ b/app/components/forum/forum-post.hbs
@@ -2,14 +2,14 @@
   <div class='card-body'>
     <div class='row'>
       <div class='col-md-3 forum-post-author-info'>
-        <LinkTo @route='users.show' @model={{post.author.id}}>
+        <LinkTo @route='users.user' @model={{post.author.id}}>
           <img
             src='{{post.author.avatarThumbUrlOrDefault}}'
             alt='avatar'
             class='profile-picture profile-picture-large'
           />
         </LinkTo>
-        <LinkTo @route='users.show' @model={{post.author.id}}>
+        <LinkTo @route='users.user' @model={{post.author.id}}>
           <p class="mt-1"> <strong> {{post.author.fullNameWithNickname}} </strong> </p>
         </LinkTo>
       </div>
@@ -52,7 +52,7 @@
       <span class='text-muted pe-1 w-auto'>
         {{#if (can 'destroy forum/posts')}}
           <LinkTo
-            @route='forum.categories.category.threads.thread.posts.destroy'
+            @route='forum.categories.category.threads.thread.posts.post.destroy'
             @model={{post.id}}
             class='link-highlight px-2'
           >
@@ -62,7 +62,7 @@
 
         {{#if (can 'edit forum/post' post)}}
           <LinkTo
-            @route='forum.categories.category.threads.thread.posts.edit'
+            @route='forum.categories.category.threads.thread.posts.post.edit'
             @model={{post.id}}
             class='link-highlight px-2'
           >
diff --git a/app/components/header-nav.hbs b/app/components/header-nav.hbs
index a4d06fd3a..fcdc5c2b2 100644
--- a/app/components/header-nav.hbs
+++ b/app/components/header-nav.hbs
@@ -1,6 +1,9 @@
 <nav class='navbar pb-0 pt-0' aria-label='breadcrumb'>
   <div class="container-fluid d-flex justify-content-between">
-    <span class='left-sidebar-toggle d-block d-md-none link' {{action 'toggleLeftSidebar'}}>
+    <span
+      class='left-sidebar-toggle d-block d-md-none link'
+      {{action 'toggleLeftSidebar'}}
+    >
       ☰
     </span>
 
@@ -12,14 +15,16 @@
       <div class='navbar-overflow-wrapper'>
         <div class='navbar-nav col d-flex flex-row'>
           {{#if (or session.isAuthenticated media.isMobile)}}
-            <BreadCrumbs @crumbClass='breadcrumb-item' />
+            <Breadcrumbs @routeInfos={{@routeInfos}} />
           {{else}}
-            <BsDropdown as |dd| {{did-insert (action 'setAvailableStaticPages')}}>
-              <dd.button @type="primary">{{t "component.headerNav.aboutUs"}}</dd.button>
+            <BsDropdown {{did-insert (action 'setAvailableStaticPages')}} as |dd|>
+              <dd.button @type="primary">
+                {{t "component.headerNav.aboutUs"}}
+              </dd.button>
               <dd.menu @renderInPlace={{false}} as |ddm|>
                 {{#each-in staticPagesForDropdown as |id title|}}
                   <ddm.item>
-                    <ddm.linkTo @route='static-pages.show' @model={{id}}>
+                    <ddm.linkTo @route='static-pages.static-page' @model={{id}}>
                       {{title}}
                     </ddm.linkTo>
                   </ddm.item>
@@ -42,8 +47,11 @@
     </div>
 
     {{#unless session.isAuthenticated}}
-      <button class='btn btn-locale btn-inverse-locale-{{intl.locale}}' title='{{t "component.headerNav.changeLocale"}}'
-        {{action 'toggleLocale'}} type='button'>
+      <button
+        class='btn btn-locale btn-inverse-locale-{{intl.locale}}'
+        title='{{t "component.headerNav.changeLocale"}}'
+        {{action 'toggleLocale'}}
+        type='button'>
       </button>
     {{/unless}}
   </div>
diff --git a/app/components/header-nav.js b/app/components/header-nav.js
index db3376e10..002f0bfd7 100644
--- a/app/components/header-nav.js
+++ b/app/components/header-nav.js
@@ -95,7 +95,7 @@ export default Component.extend({
   addStaticPageOption: function (list, id, localeName) {
     if (this.availableStaticPages && this.availableStaticPages[id]) {
       list.push({
-        link: 'static-pages.show',
+        link: 'static-pages.static-page',
         linkArgument: id,
         title: this.intl.t('component.headerNav.' + localeName),
         icon: '',
diff --git a/app/components/index/public/about-alpha.hbs b/app/components/index/public/about-alpha.hbs
index e72191d19..548e19f7e 100644
--- a/app/components/index/public/about-alpha.hbs
+++ b/app/components/index/public/about-alpha.hbs
@@ -6,7 +6,7 @@
     </p>
 
     <LinkTo
-      @route='static-pages.show'
+      @route='static-pages.static-page'
       @model='c-s-v-alpha'
       class='btn btn-lg btn-light me-3 mb-3'
     >
diff --git a/app/components/index/public/action-buttons.hbs b/app/components/index/public/action-buttons.hbs
index 00dd9c741..b0cd79274 100644
--- a/app/components/index/public/action-buttons.hbs
+++ b/app/components/index/public/action-buttons.hbs
@@ -11,7 +11,7 @@
       {{t 'component.index.public.actionButtons.memberButton'}}
     </a>
     <LinkTo
-      @route='static-pages.show'
+      @route='static-pages.static-page'
       @model='word-lid'
       class='btn btn-lg btn-primary frontpage-button mt-3'
     >
diff --git a/app/components/index/special-promo.hbs b/app/components/index/special-promo.hbs
index 235dc81a9..e963a3f42 100644
--- a/app/components/index/special-promo.hbs
+++ b/app/components/index/special-promo.hbs
@@ -6,7 +6,7 @@
         <em>{{date}}</em>
         <p>{{text}}</p>
         <LinkTo
-          @route='articles.show'
+          @route='articles.article'
           @model={{123}}
           class='btn frontpage-button btn-lg float-xs-end'
         >
diff --git a/app/components/index/sponsorkliks-alert.hbs b/app/components/index/sponsorkliks-alert.hbs
index 2a195dc8c..e2a3b1c02 100644
--- a/app/components/index/sponsorkliks-alert.hbs
+++ b/app/components/index/sponsorkliks-alert.hbs
@@ -15,7 +15,9 @@
     bij verschillende webshops verdient Alpha er ook nog wat aan. De uitgebreide
     uitleg vind je
     <b>
-      <LinkTo @route='static-pages.show' @model='alpha-deals'>hier</LinkTo>
+      <LinkTo @route='static-pages.static-page' @model='alpha-deals'>
+        hier
+      </LinkTo>
     </b>.
 
     <br />
diff --git a/app/components/menu-sidebar.hbs b/app/components/menu-sidebar.hbs
index e57e442bc..e88f348ce 100644
--- a/app/components/menu-sidebar.hbs
+++ b/app/components/menu-sidebar.hbs
@@ -44,7 +44,7 @@
 
     <div class='profile-menu {{if layoutManager.profileMenuOpen "open"}}'>
       <MenuSidebarItem
-        @link='users.show'
+        @link='users.user'
         @hasPermission={{can 'show activities'}}
         @icon='user'
         @title={{t 'mixin.menuItems.profile'}}
@@ -55,7 +55,7 @@
         @link='mail-aliases'
         @hasPermission={{can 'show mail-aliases'}}
         @icon='envelope'
-        @title={{t 'mixin.menuItems.mailaliases'}}
+        @title={{t 'mixin.menuItems.mailAliases'}}
         @minor={{true}}
       />
       <MenuSidebarItem
diff --git a/app/components/model-form/file-input.js b/app/components/model-form/file-input.js
index ad9a5767b..1a6d85aac 100644
--- a/app/components/model-form/file-input.js
+++ b/app/components/model-form/file-input.js
@@ -1,6 +1,6 @@
 import { computed } from '@ember/object';
 import EmberArray from '@ember/array';
-import ENV from '../../config/environment';
+import ENV from 'amber-ui/config/environment';
 import ModelFormTextInputComponent from './text-input';
 
 export default ModelFormTextInputComponent.extend({
diff --git a/app/components/page-actions.hbs b/app/components/page-actions.hbs
index c85252123..1ca7c970c 100644
--- a/app/components/page-actions.hbs
+++ b/app/components/page-actions.hbs
@@ -1,9 +1,4 @@
 <div class='row justify-content-md-between flex-wrap page-actions'>
-  <div class='col-12 col-md ps-0'>
-    {{#unless hideBreadCrumbs}}
-      <BreadCrumbs @crumbClass='breadcrumb-item' @outputStyle='bootstrap' />
-    {{/unless}}
-  </div>
   {{#if (or pageActions (has-block))}}
     {{#page-actions-buttons pageActions}}
       {{yield}}
diff --git a/app/components/photo-albums/photo.hbs b/app/components/photo-albums/photo.hbs
index 34aaf999a..e79d37cac 100644
--- a/app/components/photo-albums/photo.hbs
+++ b/app/components/photo-albums/photo.hbs
@@ -6,7 +6,7 @@
   {{#if this.showInfo}}
     <p class='text-end text-muted mt-2'>
       Foto geüpload door
-      <LinkTo @route='users.show' @model={{@model.uploader.id}}>
+      <LinkTo @route='users.user' @model={{@model.uploader.id}}>
         {{@model.uploader.fullNameWithNickname}}
       </LinkTo>
 
diff --git a/app/components/quick-post.hbs b/app/components/quick-post.hbs
index 6d2a5eae3..40ffd9576 100644
--- a/app/components/quick-post.hbs
+++ b/app/components/quick-post.hbs
@@ -13,7 +13,11 @@
   <div class='card-block'>
     <div class='p-3 pb-5'>
       <div class='row pb-2'>
-        <LinkTo class="p-0 w-auto" @route='users.show' @model={{this.session.currentUser.id}}>
+        <LinkTo
+          @route='users.user'
+          @model={{this.session.currentUser.id}}
+          class="p-0 w-auto"
+        >
           <img
             class='profile-picture profile-picture-md ms-3 p-0'
             alt='{{this.session.currentUser.fullName}}'
@@ -74,7 +78,11 @@
     {{#each this.sortedMessages as |message index|}}
       <hr />
       <div class='row qp-message p-3'>
-        <LinkTo class="p-0 w-auto" @route='users.show' @model={{message.author.id}}>
+        <LinkTo
+          @route='users.user'
+          @model={{message.author.id}}
+          class="p-0 w-auto"
+        >
           <img
             class='profile-picture profile-picture-md ms-3 p-0'
             alt='{{message.author.fullName}}'
@@ -85,7 +93,7 @@
         <div class='ps-3 col'>
           <div class='row'>
             <LinkTo
-              @route='users.show'
+              @route='users.user'
               @model={{message.author.id}}
               class='col w-auto'
             >
diff --git a/app/components/tools/board-room-presence.hbs b/app/components/tools/board-room-presence.hbs
index 12c50181b..b70989892 100644
--- a/app/components/tools/board-room-presence.hbs
+++ b/app/components/tools/board-room-presence.hbs
@@ -13,7 +13,7 @@
       {{#each sortedPresences as |presence|}}
         <div class='py-1'>
           <div class='d-block'>
-            <LinkTo @route='users.show' @model={{presence.user.id}}>
+            <LinkTo @route='users.user' @model={{presence.user.id}}>
               <small><b>{{presence.user.fullNameWithNickname}}</b></small>
             </LinkTo>
           </div>
diff --git a/app/components/tools/closing-activities.hbs b/app/components/tools/closing-activities.hbs
index 0ed8fe99c..d06c31fbd 100644
--- a/app/components/tools/closing-activities.hbs
+++ b/app/components/tools/closing-activities.hbs
@@ -2,7 +2,7 @@
   <div class='card tool'>
     <div class='card-header'>
       <div class='d-flex justify-content-between'>
-        <LinkTo @route='activities.index'>
+        <LinkTo @route='activities'>
           <h5 class='card-text'>Sluitende inschrijflijsten</h5>
         </LinkTo>
         <div class='col-xs-1 tool-actions'>
@@ -34,7 +34,7 @@
 
     <ul class='list-group list-group-flush'>
       {{#each activities as |activity|}}
-        <LinkTo @route='activities.show' @model={{activity.id}}>
+        <LinkTo @route='activities.activity' @model={{activity.id}}>
           <li class='list-group-item'>
             <span class='activity-tool-title'>{{activity.title}}</span>
             <br />
diff --git a/app/components/tools/forum-posts.hbs b/app/components/tools/forum-posts.hbs
index d17095986..b49d2a6af 100644
--- a/app/components/tools/forum-posts.hbs
+++ b/app/components/tools/forum-posts.hbs
@@ -1,6 +1,6 @@
 <div class='card tool'>
   <div class='card-header'>
-    <LinkTo @route='forum.index'>
+    <LinkTo @route='forum'>
       <h5 class='card-text'>Forum</h5>
     </LinkTo>
   </div>
@@ -8,7 +8,7 @@
   <ul class='list-group list-group-flush'>
     {{#each threads as |thread|}}
       <LinkTo
-        @route='forum.categories.category.threads.thread.show'
+        @route='forum.categories.category.threads.thread'
         @models={{array thread.category.id thread.id}}
       >
         <li class='list-group-item'>
diff --git a/app/components/tools/recent-photos.hbs b/app/components/tools/recent-photos.hbs
index 61f1c2c18..d1bc05905 100644
--- a/app/components/tools/recent-photos.hbs
+++ b/app/components/tools/recent-photos.hbs
@@ -9,7 +9,7 @@
       <div class='d-flex'>
         {{#each photosWithComments as |photo|}}
           <LinkTo
-            @route='photo-albums.photo-album.photos.show'
+            @route='photo-albums.photo-album.photos.photo'
             @models={{array photo.photoAlbum.id photo.id}}
             class='picture-link col-xs'
           >
@@ -37,7 +37,7 @@
       </LinkTo>
     {{else}}
       <li class='list-group-item'>
-        Er zijn helaas geen recente foto-albums!
+        Er zijn helaas geen recente fotoalbums!
       </li>
     {{/each}}
   </ul>
diff --git a/app/components/tools/recent-polls.hbs b/app/components/tools/recent-polls.hbs
index 5d83fea91..34716dd07 100644
--- a/app/components/tools/recent-polls.hbs
+++ b/app/components/tools/recent-polls.hbs
@@ -1,13 +1,13 @@
 <div class='card tool'>
   <div class='card-header'>
-    <LinkTo @route='polls.index'>
+    <LinkTo @route='polls'>
       <h5 class='card-text'>Polls</h5>
     </LinkTo>
   </div>
 
   <ul class='list-group list-group-flush'>
     {{#each polls as |poll|}}
-      <LinkTo @route='polls.show' @model={{poll.id}}>
+      <LinkTo @route='polls.poll' @model={{poll.id}}>
         <li class='list-group-item'>
           <div class='d-flex justify-content-between'>
             <span>
diff --git a/app/components/tools/upcoming-activities.hbs b/app/components/tools/upcoming-activities.hbs
index 7a6316ae1..e00635831 100644
--- a/app/components/tools/upcoming-activities.hbs
+++ b/app/components/tools/upcoming-activities.hbs
@@ -1,7 +1,7 @@
 <div class='card tool'>
   <div class='card-header'>
     <div class='d-flex justify-content-between'>
-      <LinkTo @route='activities.index'>
+      <LinkTo @route='activities'>
         <h5 class='card-text'>Komende activiteiten</h5>
       </LinkTo>
       <div class='col-xs-1 tool-actions'>
@@ -33,7 +33,7 @@
 
   <ul class='list-group list-group-flush'>
     {{#each activities as |activity|}}
-      <LinkTo @route='activities.show' @model={{activity.id}}>
+      <LinkTo @route='activities.activity' @model={{activity.id}}>
         <li class='list-group-item'>
           <span class='activity-tool-title'>{{activity.title}}</span>
           <br />
diff --git a/app/components/tools/upcoming-birthdays.hbs b/app/components/tools/upcoming-birthdays.hbs
index d83ef39ad..ef6894541 100644
--- a/app/components/tools/upcoming-birthdays.hbs
+++ b/app/components/tools/upcoming-birthdays.hbs
@@ -14,7 +14,7 @@
               />
               <h6 class='current-birthday-name'>
                 <strong>
-                  <LinkTo @route='users.show' @model={{user.id}}>
+                  <LinkTo @route='users.user' @model={{user.id}}>
                     {{user.fullNameWithNickname}}
                     is vandaag
                     {{user.age}}
@@ -26,9 +26,11 @@
           </li>
         {{else}}
           <li class='list-group-item'>
-            <LinkTo @route='users.show' @model={{user.id}}>
+            <LinkTo @route='users.user' @model={{user.id}}>
               <div class='upcoming-birthday-holder'>
-                <span class='upcoming-birthday-name'> {{user.fullNameWithNickname}} </span>
+                <span class='upcoming-birthday-name'>
+                  {{user.fullNameWithNickname}}
+                </span>
                 <span class='upcoming-birthday-date'>
                   {{moment-format user.birthday 'DD-MMM'}}
                 </span>
diff --git a/app/components/user-comment.hbs b/app/components/user-comment.hbs
index 4d36656d2..a9e166b45 100644
--- a/app/components/user-comment.hbs
+++ b/app/components/user-comment.hbs
@@ -1,5 +1,5 @@
 <div class='d-flex comment'>
-  <LinkTo @route='users.show' @model={{comment.author.id}}>
+  <LinkTo @route='users.user' @model={{comment.author.id}}>
     <img
       class='profile-picture profile-picture-small me-2'
       src='{{comment.author.avatarThumbUrlOrDefault}}'
@@ -8,7 +8,7 @@
   <div class='comment-content'>
     <div class='d-flex'>
       {{#if (can 'show users')}}
-        <LinkTo @route='users.show' @model={{comment.author.id}}>
+        <LinkTo @route='users.user' @model={{comment.author.id}}>
           <strong>{{comment.author.fullNameWithNickname}}</strong>
         </LinkTo>
       {{else}}
@@ -17,13 +17,19 @@
 
       {{#if comment.article}}
         {{#if (can 'destroy article-comments')}}
-          <LinkTo @route='article-comments.destroy' @model={{comment.id}}>
+          <LinkTo
+            @route='article-comments.article-comment.destroy'
+            @model={{comment.id}}
+          >
             <FaIcon @icon='trash' class='text-muted destroy-icon ms-2' />
           </LinkTo>
         {{/if}}
       {{else if comment.photo}}
         {{#if (can 'destroy photo-comments')}}
-          <LinkTo @route='photo-comments.destroy' @model={{comment.id}}>
+          <LinkTo
+            @route='photo-comments.photo-comment.destroy'
+            @model={{comment.id}}
+          >
             <FaIcon @icon='trash' class='text-muted destroy-icon ms-2' />
           </LinkTo>
         {{/if}}
diff --git a/app/components/users/password-settings.js b/app/components/users/password-settings.js
index 2e67dc67e..03053b9f6 100644
--- a/app/components/users/password-settings.js
+++ b/app/components/users/password-settings.js
@@ -46,7 +46,7 @@ export default Component.extend({
         this.set('password', '');
         this.set('passwordConfirmation', '');
         this.flashNotice.sendSuccess('Wachtwoord succesvol aangepast!');
-        this.transitionToRoute('users.show-security', userId);
+        this.transitionToRoute('users.user.security', userId);
       } else if (isInvalidResponse(response)) {
         let json = await response.json();
         this.set(
diff --git a/app/controllers/activities/destroy.js b/app/controllers/activities/activity/destroy.js
similarity index 61%
rename from app/controllers/activities/destroy.js
rename to app/controllers/activities/activity/destroy.js
index 8673e0f8a..8972ad596 100644
--- a/app/controllers/activities/destroy.js
+++ b/app/controllers/activities/activity/destroy.js
@@ -1,6 +1,6 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
 
 export default class ActivityDestroyController extends DestroyController {
-  successTransitionTarget = 'activities.index';
-  cancelTransitionTarget = 'activities.show';
+  successTransitionTarget = 'activities';
+  cancelTransitionTarget = 'activities.activity';
 }
diff --git a/app/controllers/activities/edit.js b/app/controllers/activities/activity/edit.js
similarity index 81%
rename from app/controllers/activities/edit.js
rename to app/controllers/activities/activity/edit.js
index 550ff4657..cb61dead3 100644
--- a/app/controllers/activities/edit.js
+++ b/app/controllers/activities/activity/edit.js
@@ -1,15 +1,13 @@
-// eslint-disable-next-line ember/no-computed-properties-in-native-classes
-import { action } from '@ember/object';
 import { ActivityCategories } from 'amber-ui/constants';
+import EditController from 'amber-ui/controllers/application/edit';
+import { action } from '@ember/object';
 import { isNone } from '@ember/utils';
 import { inject as service } from '@ember/service';
-// eslint-disable-next-line ember/no-computed-properties-in-native-classes
-import EditController from '../application/edit';
-import { union } from '../../utils/array-operations';
+import { union } from 'amber-ui/utils/array-operations';
 
-export default class EditActivityController extends EditController {
+export default class ActivityEditController extends EditController {
   successMessage = 'Activiteit opgeslagen!';
-  successTransitionTarget = 'activities.show';
+  successTransitionTarget = 'activities.activity';
 
   @service session;
   @service abilities;
diff --git a/app/controllers/activities/generate-alias.js b/app/controllers/activities/activity/generate-alias.js
similarity index 84%
rename from app/controllers/activities/generate-alias.js
rename to app/controllers/activities/activity/generate-alias.js
index e4ce8dd5c..89ad0085f 100644
--- a/app/controllers/activities/generate-alias.js
+++ b/app/controllers/activities/activity/generate-alias.js
@@ -1,14 +1,16 @@
-import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
+import { action } from '@ember/object';
 import { isInvalidResponse } from 'ember-fetch/errors';
+import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
 
-export default class GenerateAliasController extends Controller {
+export default class ActivityGenerateAliasController extends Controller {
   @service fetch;
+
   @tracked errorMessage = null;
   @tracked alias;
   @tracked expiresAt;
+
   @action
   async generateAlias() {
     this.errorMessage = null;
@@ -21,7 +23,7 @@ export default class GenerateAliasController extends Controller {
       this.expiresAt = json.data.expires_at;
     } else if (isInvalidResponse(response)) {
       const json = await response.json();
-      this.errorMessage = json.errors ? json.errors[0].detail : response;
+      this.errorMessage = json.errors?.[0].detail ?? response;
     }
   }
 }
diff --git a/app/controllers/activities/show.js b/app/controllers/activities/activity/index.js
similarity index 81%
rename from app/controllers/activities/show.js
rename to app/controllers/activities/activity/index.js
index 50eb03058..1ae111793 100644
--- a/app/controllers/activities/show.js
+++ b/app/controllers/activities/activity/index.js
@@ -1,9 +1,10 @@
-import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
 import { isNone } from '@ember/utils';
+import { inject as service } from '@ember/service';
 
-export default class ShowActivityController extends Controller {
+export default class ActivityIndexController extends Controller {
   @service flashNotice;
+
   get canSubmitResponse() {
     const { form } = this.model;
     return !isNone(form) && form.get('currentUserCanRespond');
diff --git a/app/controllers/activities/print-enrolled.js b/app/controllers/activities/activity/print-enrolled.js
similarity index 95%
rename from app/controllers/activities/print-enrolled.js
rename to app/controllers/activities/activity/print-enrolled.js
index 8c6de9e5a..59c9709b1 100644
--- a/app/controllers/activities/print-enrolled.js
+++ b/app/controllers/activities/activity/print-enrolled.js
@@ -1,18 +1,19 @@
 import Controller from '@ember/controller';
-import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
+import { tracked } from '@glimmer/tracking';
 
 const tabs = ['form', 'consumptionList'];
 const formTab = tabs[0];
 const consumptionListTab = tabs[1];
 
-export default class PrintEnrolledController extends Controller {
+export default class ActivityPrintEnrolledController extends Controller {
   @tracked showAllergyInfo = true;
   @tracked showCheckbox = true;
   @tracked currentTab = formTab;
   @tracked options = ['Bier', 'Fris'];
   @tracked newOption = '';
   @tracked showRobertHofstra = true;
+
   additionalEmptyRows = 5;
 
   get sortedResponses() {
diff --git a/app/controllers/activities/ical.js b/app/controllers/activities/ical.js
index 8b1c3ad01..ae3fad973 100644
--- a/app/controllers/activities/ical.js
+++ b/app/controllers/activities/ical.js
@@ -5,7 +5,7 @@ import { inject as service } from '@ember/service';
 import { ActivityCategories } from 'amber-ui/constants';
 import { tracked } from '@glimmer/tracking';
 
-export default class IcalController extends Controller {
+export default class ActivitiesIcalController extends Controller {
   @service session;
 
   @tracked activityCategoryOptions;
diff --git a/app/controllers/activities/index.js b/app/controllers/activities/index.js
index d6c7f7e4f..0ad739b5c 100644
--- a/app/controllers/activities/index.js
+++ b/app/controllers/activities/index.js
@@ -5,7 +5,8 @@ export default class ActivitiesIndexController extends FilterableAndSortableCont
   @tracked sortedAttribute = 'start_time';
 
   queryParams = ['search', 'sort', 'page'];
-  routeOnEnter = 'activities.show';
+
+  routeOnEnter = 'activities.activity';
   sortableAttributes = [
     {
       value: 'title',
diff --git a/app/controllers/activities/new.js b/app/controllers/activities/new.js
index 480e91672..f4bfa7aac 100644
--- a/app/controllers/activities/new.js
+++ b/app/controllers/activities/new.js
@@ -1,10 +1,8 @@
-import EditActivityController from './edit';
+import ActivityEditController from './activity/edit';
 
-export default class NewActivityController extends EditActivityController {
+export default class ActivitiesNewController extends ActivityEditController {
   successMessage = 'Aanmaken gelukt!';
   cancelMessage = 'Aanmaken geannuleerd.';
-  cancelTransitionTarget = 'activities.index';
-  get cancelTransitionModel() {
-    return null;
-  }
+  cancelTransitionTarget = 'activities';
+  cancelTransitionModel = null;
 }
diff --git a/app/controllers/application.js b/app/controllers/application.js
index 46162b04c..45cb09e45 100644
--- a/app/controllers/application.js
+++ b/app/controllers/application.js
@@ -1,8 +1,18 @@
-import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
 
 export default class ApplicationController extends Controller {
+  @service layoutManager;
+  @service router;
   @service session;
 
-  @service layoutManager;
+  get routeInfos() {
+    const linkListToArray = (route) => {
+      return route ? [...linkListToArray(route.parent), route] : [];
+    };
+
+    return linkListToArray(this.router.currentRoute).filter(
+      (routeInfo) => routeInfo.metadata?.breadcrumb?.title
+    );
+  }
 }
diff --git a/app/controllers/application/destroy.js b/app/controllers/application/destroy.js
index 523a7bf8f..f7455aad6 100644
--- a/app/controllers/application/destroy.js
+++ b/app/controllers/application/destroy.js
@@ -4,12 +4,11 @@ import { tracked } from '@glimmer/tracking';
 
 export default class DestroyController extends EditController {
   @tracked destroyed = false;
+
   successMessage = 'Verwijderen gelukt!';
   cancelMessage = 'Verwijderen geannuleerd.';
-  @tracked cancelTransitionTarget = null;
-  get successTransitionModel() {
-    return null;
-  }
+  cancelTransitionTarget = null;
+  successTransitionModel = null;
 
   get cancelTransitionModel() {
     return this.model;
@@ -21,18 +20,18 @@ export default class DestroyController extends EditController {
   }
 
   onError(error) {
-    // todo: somehow incorporate the error into the message in a more robust manner?
+    // TODO: somehow incorporate the error into the message in a more robust
+    //  manner?
     this.errorMessage = `Er ging iets fout bij het verwijderen: ${error}`;
   }
 
   transition() {
-    // todo: this does not quite work everywhere, because navigating back after the transition
+    // TODO: this does not quite work everywhere, because navigating back after
+    //  the transition.
     if (this.destroyed) {
       this.replaceRoute(...arguments);
     } else {
       this.transitionToRoute(...arguments);
     }
   }
-
-  submit = undefined;
 }
diff --git a/app/controllers/application/edit.js b/app/controllers/application/edit.js
index 68cb35fe9..ee6657585 100644
--- a/app/controllers/application/edit.js
+++ b/app/controllers/application/edit.js
@@ -8,10 +8,17 @@ export default class EditController extends Controller {
   @service flashNotice;
 
   @tracked errorMessage = null;
-  successMessage = 'Wijzigen gelukt!';
-  cancelMessage = 'Wijzigen geannuleerd.';
   @tracked successTransitionTarget = null;
   @tracked cancelTransitionTarget = this.successTransitionTarget; // sensible default
+
+  successMessage = 'Wijzigen gelukt!';
+  cancelMessage = 'Wijzigen geannuleerd.';
+
+  constructor() {
+    super(...arguments);
+    this.modelSaveUtil = new ModelSaveUtil(this);
+  }
+
   get successTransitionModel() {
     return this.model;
   }
@@ -20,24 +27,20 @@ export default class EditController extends Controller {
     return this.successTransitionModel;
   }
 
-  constructor() {
-    super(...arguments);
-    this.modelSaveUtil = new ModelSaveUtil(this);
-  }
-
   @action
   submit() {
     this.modelSaveUtil.saveModel(this.model);
   }
 
-  onError(error) {
-    // todo: somehow incorporate the error into the message maybe? could be useful if users can show us the error message
-    this.errorMessage =
-      'Er ging iets fout bij het opslaan van je wijzigingen. ' + error;
-  }
-
   @action
   cancel() {
     this.modelSaveUtil.cancelEdit();
   }
+
+  onError(error) {
+    // TODO: somehow incorporate the error into the message maybe? could be
+    //  useful if users can show us the error message
+    this.errorMessage =
+      'Er ging iets fout bij het opslaan van je wijzigingen. ' + error;
+  }
 }
diff --git a/app/controllers/application/filterable-and-sortable.js b/app/controllers/application/filterable-and-sortable.js
index 052a67f65..c4cc28e37 100644
--- a/app/controllers/application/filterable-and-sortable.js
+++ b/app/controllers/application/filterable-and-sortable.js
@@ -7,6 +7,7 @@ export default class FilterableAndSortableController extends Controller {
   @tracked sortedAscending = true;
 
   @tracked search = '';
+
   sortableAttributes = [];
 
   get sort() {
diff --git a/app/controllers/application/group-memberships.js b/app/controllers/application/group-memberships.js
index f8355da8b..473d8832c 100644
--- a/app/controllers/application/group-memberships.js
+++ b/app/controllers/application/group-memberships.js
@@ -5,11 +5,12 @@ import moment from 'moment';
 import { tracked } from '@glimmer/tracking';
 
 export default class GroupMembershipsController extends Controller {
-  @tracked filter = '';
-  @tracked oldMembershipsAreVisible = false;
   @tracked sortedAttribute = null;
   @tracked sortedAscending = true;
 
+  @tracked filter = '';
+  @tracked oldMembershipsAreVisible = false;
+
   get models() {
     return this.model.memberships;
   }
@@ -21,28 +22,6 @@ export default class GroupMembershipsController extends Controller {
     return this.sortModels(this.filterModels(records));
   }
 
-  filterModels(models) {
-    // Do not filter when no value is inserted
-    if (isBlank(this.filter)) {
-      return models;
-    }
-
-    return models.filter((model) => {
-      return this.filterableAttributes
-        .reduce((show, attribute) => {
-          const value = model.get(attribute);
-          return show + value;
-        }, '')
-        .toLowerCase()
-        .includes(this.filter.toLowerCase());
-    });
-  }
-
-  sortModels(models) {
-    const sortedModels = models.sortBy(this.sortedAttribute);
-    return this.sortedAscending ? sortedModels : sortedModels.reverse();
-  }
-
   get oldMemberships() {
     return this.models.filter(
       (membership) => membership.endDate && membership.endDate < moment.now()
@@ -91,4 +70,26 @@ export default class GroupMembershipsController extends Controller {
   setSortedAscending(value) {
     this.sortedAscending = value;
   }
+
+  filterModels(models) {
+    // Do not filter when no value is inserted
+    if (isBlank(this.filter)) {
+      return models;
+    }
+
+    return models.filter((model) => {
+      return this.filterableAttributes
+        .reduce((show, attribute) => {
+          const value = model.get(attribute);
+          return show + value;
+        }, '')
+        .toLowerCase()
+        .includes(this.filter.toLowerCase());
+    });
+  }
+
+  sortModels(models) {
+    const sortedModels = models.sortBy(this.sortedAttribute);
+    return this.sortedAscending ? sortedModels : sortedModels.reverse();
+  }
 }
diff --git a/app/controllers/application/new.js b/app/controllers/application/new.js
index eabb43b94..02cd746c0 100644
--- a/app/controllers/application/new.js
+++ b/app/controllers/application/new.js
@@ -4,7 +4,5 @@ export default class NewController extends EditController {
   successMessage = 'Aanmaken gelukt!';
   cancelMessage = 'Aanmaken geannuleerd.';
   cancelTransitionTarget = null; // default should not be successTransitionTarget, in contrast to the edit controller
-  get cancelTransitionModel() {
-    return null;
-  }
+  cancelTransitionModel = null;
 }
diff --git a/app/controllers/article-comments/destroy.js b/app/controllers/article-comments/article-comment/destroy.js
similarity index 78%
rename from app/controllers/article-comments/destroy.js
rename to app/controllers/article-comments/article-comment/destroy.js
index b8eeb6244..4826fe162 100644
--- a/app/controllers/article-comments/destroy.js
+++ b/app/controllers/article-comments/article-comment/destroy.js
@@ -2,9 +2,9 @@ import DestroyController from 'amber-ui/controllers/application/destroy';
 import { action } from '@ember/object';
 
 export default class ArticleCommentDestroyController extends DestroyController {
-  successMessage = 'Artikelreactie verwijderd!';
-  successTransitionTarget = 'articles.show';
-  cancelTransitionTarget = 'articles.show';
+  successMessage = 'Artikel reactie verwijderd!';
+  successTransitionTarget = 'articles.article';
+  cancelTransitionTarget = 'articles.article';
 
   get successTransitionModel() {
     return this.article;
diff --git a/app/controllers/articles/destroy.js b/app/controllers/articles/article/destroy.js
similarity index 62%
rename from app/controllers/articles/destroy.js
rename to app/controllers/articles/article/destroy.js
index 8180029e9..fc6b2598d 100644
--- a/app/controllers/articles/destroy.js
+++ b/app/controllers/articles/article/destroy.js
@@ -1,6 +1,6 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
 
 export default class ArticleDestroyController extends DestroyController {
-  successTransitionTarget = 'articles.index';
-  cancelTransitionTarget = 'articles.show';
+  successTransitionTarget = 'articles';
+  cancelTransitionTarget = 'articles.article';
 }
diff --git a/app/controllers/articles/edit.js b/app/controllers/articles/article/edit.js
similarity index 89%
rename from app/controllers/articles/edit.js
rename to app/controllers/articles/article/edit.js
index c98cad2b3..6e8eed97b 100644
--- a/app/controllers/articles/edit.js
+++ b/app/controllers/articles/article/edit.js
@@ -2,11 +2,11 @@ import EditController from 'amber-ui/controllers/application/edit';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 
-export default class EditArticleController extends EditController {
-  successTransitionTarget = 'articles.show';
-
-  @service session;
+export default class ArticleEditController extends EditController {
   @service abilities;
+  @service session;
+
+  successTransitionTarget = 'articles.article';
 
   get canPin() {
     return this.session.hasPermission('article.update');
diff --git a/app/controllers/articles/show.js b/app/controllers/articles/article/index.js
similarity index 92%
rename from app/controllers/articles/show.js
rename to app/controllers/articles/article/index.js
index f585df384..42f43849a 100644
--- a/app/controllers/articles/show.js
+++ b/app/controllers/articles/article/index.js
@@ -1,12 +1,14 @@
-import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
-import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
+import { tracked } from '@glimmer/tracking';
 
-export default class ShowArticleController extends Controller {
-  @service session;
+export default class ArticleIndexController extends Controller {
   @service flashNotice;
+  @service session;
+
   @tracked newArticleComment = '';
+
   get sortedArticleComments() {
     return this.model.comments.sortBy('createdAt');
   }
diff --git a/app/controllers/articles/index.js b/app/controllers/articles/index.js
index 5b35dd727..124d8dc33 100644
--- a/app/controllers/articles/index.js
+++ b/app/controllers/articles/index.js
@@ -5,8 +5,9 @@ export default class ArticlesIndexController extends FilterableAndSortableContro
   @tracked sortedAttribute = 'created_at';
   @tracked sortedAscending = false;
 
-  routeOnEnter = 'articles.show';
   queryParams = ['search', 'sort', 'page'];
+
+  routeOnEnter = 'articles.article';
   sortableAttributes = [
     {
       value: 'title',
diff --git a/app/controllers/articles/new.js b/app/controllers/articles/new.js
index 8e9f92616..c16b3c209 100644
--- a/app/controllers/articles/new.js
+++ b/app/controllers/articles/new.js
@@ -1,10 +1,8 @@
-import EditArticleController from './edit';
+import ArticleEditController from './article/edit';
 
-export default class NewArticleController extends EditArticleController {
+export default class ArticlesNewController extends ArticleEditController {
   successMessage = 'Artikel aangemaakt!';
   cancelMessage = 'Artikel aanmaken geannuleerd.';
-  cancelTransitionTarget = 'articles.index';
-  get cancelTransitionModel() {
-    return null;
-  }
+  cancelTransitionTarget = 'articles';
+  cancelTransitionModel = null;
 }
diff --git a/app/controllers/books/destroy.js b/app/controllers/books/book/destroy.js
similarity index 63%
rename from app/controllers/books/destroy.js
rename to app/controllers/books/book/destroy.js
index 36256fc49..c3c936f29 100644
--- a/app/controllers/books/destroy.js
+++ b/app/controllers/books/book/destroy.js
@@ -1,6 +1,6 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
 
 export default class BookDestroyController extends DestroyController {
-  successTransitionTarget = 'books.index';
-  cancelTransitionTarget = 'books.show';
+  successTransitionTarget = 'books';
+  cancelTransitionTarget = 'books.book';
 }
diff --git a/app/controllers/books/edit.js b/app/controllers/books/book/edit.js
similarity index 93%
rename from app/controllers/books/edit.js
rename to app/controllers/books/book/edit.js
index ec754854c..781967f29 100644
--- a/app/controllers/books/edit.js
+++ b/app/controllers/books/book/edit.js
@@ -3,10 +3,11 @@ import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 
-export default class EditBookController extends EditController {
+export default class BookEditController extends EditController {
   @service fetch;
 
-  successTransitionTarget = 'books.show';
+  successTransitionTarget = 'books.book';
+
   @tracked showScanner = false;
   @tracked devices = [];
   @tracked device = null;
diff --git a/app/controllers/books/index.js b/app/controllers/books/index.js
index 8dffa081f..ed92c98d0 100644
--- a/app/controllers/books/index.js
+++ b/app/controllers/books/index.js
@@ -1,11 +1,12 @@
 import FilterableAndSortableController from 'amber-ui/controllers/application/filterable-and-sortable';
 import { tracked } from '@glimmer/tracking';
 
-export default class BookIndexController extends FilterableAndSortableController {
+export default class BooksIndexController extends FilterableAndSortableController {
   @tracked sortedAttribute = 'author';
 
-  routeOnEnter = 'books.show';
   queryParams = ['search', 'sort', 'page'];
+
+  routeOnEnter = 'books.book';
   sortableAttributes = [
     {
       value: 'title',
diff --git a/app/controllers/books/new.js b/app/controllers/books/new.js
index 15ac9a0fc..3f346c1ce 100644
--- a/app/controllers/books/new.js
+++ b/app/controllers/books/new.js
@@ -1,10 +1,8 @@
-import EditBookController from './edit';
+import BookEditController from './book/edit';
 
-export default class NewBookController extends EditBookController {
+export default class BooksNewController extends BookEditController {
   successMessage = 'Aanmaken gelukt!';
   cancelMessage = 'Aanmaken geannuleerd.';
-  cancelTransitionTarget = 'books.index';
-  get cancelTransitionModel() {
-    return null;
-  }
+  cancelTransitionTarget = 'books';
+  cancelTransitionModel = null;
 }
diff --git a/app/controllers/books/show.js b/app/controllers/books/show.js
deleted file mode 100644
index 7f865f3fd..000000000
--- a/app/controllers/books/show.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Controller from '@ember/controller';
-
-export default class ShowBookController extends Controller {}
diff --git a/app/controllers/debit/collections/collection/destroy.js b/app/controllers/debit/collections/collection/destroy.js
new file mode 100644
index 000000000..d45e5769c
--- /dev/null
+++ b/app/controllers/debit/collections/collection/destroy.js
@@ -0,0 +1,6 @@
+import DestroyController from 'amber-ui/controllers/application/destroy';
+
+export default class CollectionDestroyController extends DestroyController {
+  successTransitionTarget = 'debit.collections';
+  cancelTransitionTarget = 'debit.collections.collection';
+}
diff --git a/app/controllers/debit/collections/edit.js b/app/controllers/debit/collections/collection/edit.js
similarity index 87%
rename from app/controllers/debit/collections/edit.js
rename to app/controllers/debit/collections/collection/edit.js
index c244cb389..5205576f7 100644
--- a/app/controllers/debit/collections/edit.js
+++ b/app/controllers/debit/collections/collection/edit.js
@@ -1,10 +1,10 @@
-import { action } from '@ember/object';
 import EditController from 'amber-ui/controllers/application/edit';
+import { action } from '@ember/object';
 
-export default class DebitCollectionEditController extends EditController {
+export default class CollectionEditController extends EditController {
   successMessage = 'Incasso aangepast!';
   cancelMessage = 'Incasso aanpassen geannuleerd.';
-  successTransitionTarget = 'debit.collections.show';
+  successTransitionTarget = 'debit.collections.collection';
 
   get users() {
     return this.store.findAll('user');
diff --git a/app/controllers/debit/collections/show.js b/app/controllers/debit/collections/collection/index.js
similarity index 92%
rename from app/controllers/debit/collections/show.js
rename to app/controllers/debit/collections/collection/index.js
index 181c1ef12..8eacf24cb 100644
--- a/app/controllers/debit/collections/show.js
+++ b/app/controllers/debit/collections/collection/index.js
@@ -1,6 +1,6 @@
 import Controller from '@ember/controller';
 
-export default class DebitCollectionShowController extends Controller {
+export default class CollectionIndexController extends Controller {
   get groupedTransactions() {
     const transactions = [];
     this.model.transactions.forEach((transaction) => {
diff --git a/app/controllers/debit/collections/destroy.js b/app/controllers/debit/collections/destroy.js
deleted file mode 100644
index 68a5d67a2..000000000
--- a/app/controllers/debit/collections/destroy.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import DestroyController from 'amber-ui/controllers/application/destroy';
-
-export default class DebitCollectionDestroyController extends DestroyController {
-  successTransitionTarget = 'debit.collections.index';
-  cancelTransitionTarget = 'debit.collections.show';
-}
diff --git a/app/controllers/debit/collections/index.js b/app/controllers/debit/collections/index.js
index 0f676dab9..42b09b863 100644
--- a/app/controllers/debit/collections/index.js
+++ b/app/controllers/debit/collections/index.js
@@ -5,8 +5,9 @@ export default class CollectionsIndexController extends FilterableAndSortableCon
   @tracked sortedAttribute = 'date';
   @tracked sortedAscending = false;
 
-  routeOnEnter = 'debit.collections.show';
   queryParams = ['search', 'sort', 'page'];
+
+  routeOnEnter = 'debit.collections.collection';
   sortableAttributes = [
     {
       value: 'name',
diff --git a/app/controllers/debit/collections/new.js b/app/controllers/debit/collections/new.js
index 1d2132fed..d901118e3 100644
--- a/app/controllers/debit/collections/new.js
+++ b/app/controllers/debit/collections/new.js
@@ -1,15 +1,13 @@
+import EditController from 'amber-ui/controllers/application/edit';
 import EmberArray from '@ember/array';
 import { action } from '@ember/object';
-import EditController from 'amber-ui/controllers/application/edit';
 
-export default class DebitCollectionNewController extends EditController {
+export default class CollectionsNewController extends EditController {
   successMessage = 'Incasso aangemaakt!';
   cancelMessage = 'Incasso aanmaken geannuleerd.';
-  successTransitionTarget = 'debit.collections.show';
-  cancelTransitionTarget = 'debit.collections.index';
-  get cancelTransitionModel() {
-    return null;
-  }
+  successTransitionTarget = 'debit.collections.collection';
+  cancelTransitionTarget = 'debit.collections';
+  cancelTransitionModel = null;
 
   validMimetypes = EmberArray.apply([
     'text/csv',
@@ -19,6 +17,7 @@ export default class DebitCollectionNewController extends EditController {
   ]);
 
   validExtensions = EmberArray.apply(['csv', 'ods', 'xlsx', 'xlsm']);
+
   @action
   fileLoaded(file) {
     const collection = this.model;
diff --git a/app/controllers/debit/mandates/index.js b/app/controllers/debit/mandates/index.js
index 92b7a83ef..c8b35c8c4 100644
--- a/app/controllers/debit/mandates/index.js
+++ b/app/controllers/debit/mandates/index.js
@@ -5,8 +5,9 @@ export default class MandatesIndexController extends FilterableAndSortableContro
   @tracked sortedAttribute = 'start_date';
   @tracked sortedAscending = false;
 
-  routeOnEnter = 'debit.mandates.show';
   queryParams = ['search', 'sort', 'page'];
+
+  routeOnEnter = 'debit.mandates.mandate';
   sortableAttributes = [
     {
       value: 'start_date',
diff --git a/app/controllers/debit/mandates/edit.js b/app/controllers/debit/mandates/mandate/edit.js
similarity index 52%
rename from app/controllers/debit/mandates/edit.js
rename to app/controllers/debit/mandates/mandate/edit.js
index 7779047ff..9cbf0d128 100644
--- a/app/controllers/debit/mandates/edit.js
+++ b/app/controllers/debit/mandates/mandate/edit.js
@@ -1,12 +1,11 @@
 import EditController from 'amber-ui/controllers/application/edit';
-// eslint-disable-next-line ember/no-computed-properties-in-native-classes
 import { inject as service } from '@ember/service';
 
-export default class EditMandateController extends EditController {
-  successTransitionTarget = 'debit.mandates.show';
-
+export default class MandateEditController extends EditController {
   @service store;
 
+  successTransitionTarget = 'debit.mandates.mandate';
+
   get users() {
     return this.store.findAll('user');
   }
diff --git a/app/controllers/debit/mandates/new.js b/app/controllers/debit/mandates/new.js
index 6ee9e76e0..3aec32271 100644
--- a/app/controllers/debit/mandates/new.js
+++ b/app/controllers/debit/mandates/new.js
@@ -1,10 +1,8 @@
-import EditMandateController from './edit';
+import MandateEditController from './mandate/edit';
 
-export default class NewMandateController extends EditMandateController {
+export default class MandatesNewController extends MandateEditController {
   successMessage = 'Aanmaken gelukt!';
   cancelMessage = 'Aanmaken geannuleerd.';
-  cancelTransitionTarget = 'debit.mandates.index';
-  get cancelTransitionModel() {
-    return null;
-  }
+  cancelTransitionTarget = 'debit.mandates';
+  cancelTransitionModel = null;
 }
diff --git a/app/controllers/debit/transactions/destroy.js b/app/controllers/debit/transactions/transaction/destroy.js
similarity index 70%
rename from app/controllers/debit/transactions/destroy.js
rename to app/controllers/debit/transactions/transaction/destroy.js
index 27d375e20..3a7dff6d3 100644
--- a/app/controllers/debit/transactions/destroy.js
+++ b/app/controllers/debit/transactions/transaction/destroy.js
@@ -1,9 +1,9 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
 import { action } from '@ember/object';
 
-export default class DebitTransactionDestroyController extends DestroyController {
-  successTransitionTarget = 'debit.collections.show';
-  cancelTransitionTarget = 'debit.collections.show';
+export default class TransactionDestroyController extends DestroyController {
+  successTransitionTarget = 'debit.collections.collection';
+  cancelTransitionTarget = 'debit.collections.collection';
 
   get successTransitionModel() {
     return this.collection;
diff --git a/app/controllers/debit/transactions/edit.js b/app/controllers/debit/transactions/transaction/edit.js
similarity index 84%
rename from app/controllers/debit/transactions/edit.js
rename to app/controllers/debit/transactions/transaction/edit.js
index 056a6ee12..648df912c 100644
--- a/app/controllers/debit/transactions/edit.js
+++ b/app/controllers/debit/transactions/transaction/edit.js
@@ -1,17 +1,22 @@
-import { action } from '@ember/object';
 import EditController from 'amber-ui/controllers/application/edit';
+import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 
-export default class EditTransactionController extends EditController {
+export default class TransactionEditController extends EditController {
+  @service store;
+
   successMessage = 'Transactie aangepast!';
   cancelMessage = 'Transactie wijzigen geannuleerd.';
-  successTransitionTarget = 'debit.collections.show';
-  @service store;
+  successTransitionTarget = 'debit.collections.collection';
 
   get successTransitionModel() {
     return this.collection;
   }
 
+  get users() {
+    return this.store.findAll('user');
+  }
+
   @action
   async submit() {
     this.collection = await this.model.collection;
@@ -24,10 +29,6 @@ export default class EditTransactionController extends EditController {
     super.cancel();
   }
 
-  get users() {
-    return this.store.findAll('user');
-  }
-
   @action
   setUser(user) {
     this.model.user = user;
diff --git a/app/controllers/error.js b/app/controllers/error.js
index c56bbfbbd..795734a0d 100644
--- a/app/controllers/error.js
+++ b/app/controllers/error.js
@@ -1,6 +1,6 @@
-import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
 import { run } from '@ember/runloop';
+import { inject as service } from '@ember/service';
 
 export default class ErrorController extends Controller {
   @service flashNotice;
diff --git a/app/controllers/form/responses/destroy.js b/app/controllers/form/responses/destroy.js
deleted file mode 100644
index 4a90b0673..000000000
--- a/app/controllers/form/responses/destroy.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
-import DestroyController from 'amber-ui/controllers/application/destroy';
-
-export default class FormResponseDestroyController extends DestroyController {
-  @service store;
-  successMessage = 'Je inschrijving is verwijderd.';
-  successTransitionTarget = 'activities.index';
-  cancelTransitionTarget = 'activities.index';
-  // important note: there is no way (currently) to redirect from a form response to the activity, since the models
-  // are not designed with this in mind.
-  // I would not mind this being enabled by a slight redesign in the future, though.
-  get cancelTransitionModel() {
-    return null;
-  }
-
-  @action
-  async destroyModel() {
-    this.form = await this.model.form;
-    super.destroyModel();
-  }
-
-  onSuccess() {
-    this.form.reload();
-    this.modelSaveUtil.redirectSuccess();
-  }
-}
diff --git a/app/controllers/form/responses/response/destroy.js b/app/controllers/form/responses/response/destroy.js
new file mode 100644
index 000000000..d8f498e55
--- /dev/null
+++ b/app/controllers/form/responses/response/destroy.js
@@ -0,0 +1,27 @@
+import DestroyController from 'amber-ui/controllers/application/destroy';
+import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
+
+export default class ResponseDestroyController extends DestroyController {
+  @service store;
+
+  successMessage = 'Je inschrijving is verwijderd.';
+  successTransitionTarget = 'activities';
+  cancelTransitionTarget = 'activities';
+  // FIXME: there is no way (currently) to redirect from a form response to the
+  //  activity, since the models are not designed with this in mind.
+  //  I would not mind this being enabled by a slight redesign in the future,
+  //  though.
+  cancelTransitionModel = null;
+
+  @action
+  async destroyModel() {
+    this.form = await this.model.form;
+    super.destroyModel();
+  }
+
+  onSuccess() {
+    this.form.reload();
+    this.modelSaveUtil.redirectSuccess();
+  }
+}
diff --git a/app/controllers/forum/categories/category/destroy.js b/app/controllers/forum/categories/category/destroy.js
index c58211298..d5a9d5637 100644
--- a/app/controllers/forum/categories/category/destroy.js
+++ b/app/controllers/forum/categories/category/destroy.js
@@ -1,7 +1,7 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
 
-export default class ForumCategoryDestroyController extends DestroyController {
+export default class CategoryDestroyController extends DestroyController {
   successMessage = 'Categorie verwijderd!';
-  successTransitionTarget = 'forum.index';
+  successTransitionTarget = 'forum';
   cancelTransitionTarget = 'forum.categories.category';
 }
diff --git a/app/controllers/forum/categories/category/edit.js b/app/controllers/forum/categories/category/edit.js
index fa1866751..0aac10748 100644
--- a/app/controllers/forum/categories/category/edit.js
+++ b/app/controllers/forum/categories/category/edit.js
@@ -1,6 +1,6 @@
 import EditController from 'amber-ui/controllers/application/edit';
 
-export default class EditCategoryController extends EditController {
+export default class CategoryEditController extends EditController {
   successMessage = 'Categorie aangepast!';
   successTransitionTarget = 'forum.categories.category';
 }
diff --git a/app/controllers/forum/categories/category/threads/index.js b/app/controllers/forum/categories/category/threads/index.js
index b5e0b535e..9be3a5ef9 100644
--- a/app/controllers/forum/categories/category/threads/index.js
+++ b/app/controllers/forum/categories/category/threads/index.js
@@ -5,8 +5,9 @@ export default class ThreadsIndexController extends FilterableAndSortableControl
   @tracked sortedAttribute = 'updated_at';
   @tracked sortedAscending = false;
 
-  routeOnEnter = 'forum.categories.category.threads.thread.show';
   queryParams = ['search', 'sort'];
+
+  routeOnEnter = 'forum.categories.category.threads.thread';
   sortableAttributes = [
     {
       value: 'updated_at',
diff --git a/app/controllers/forum/categories/category/threads/new.js b/app/controllers/forum/categories/category/threads/new.js
index 3805b5bae..a44dc71db 100644
--- a/app/controllers/forum/categories/category/threads/new.js
+++ b/app/controllers/forum/categories/category/threads/new.js
@@ -1,9 +1,10 @@
 import NewController from 'amber-ui/controllers/application/new';
 import { action } from '@ember/object';
 
-export default class NewThreadController extends NewController {
-  successTransitionTarget = 'forum.categories.category.threads.thread.show';
-  cancelTransitionTarget = 'forum.categories.category.show';
+export default class ThreadsNewController extends NewController {
+  successTransitionTarget = 'forum.categories.category.threads.thread';
+  cancelTransitionTarget = 'forum.categories.category';
+
   get cancelTransitionModel() {
     return this.category;
   }
diff --git a/app/controllers/forum/categories/category/threads/thread/destroy.js b/app/controllers/forum/categories/category/threads/thread/destroy.js
index 6f9cbbf34..473fbe9df 100644
--- a/app/controllers/forum/categories/category/threads/thread/destroy.js
+++ b/app/controllers/forum/categories/category/threads/thread/destroy.js
@@ -1,10 +1,10 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
 import { action } from '@ember/object';
 
-export default class ForumThreadDestroyController extends DestroyController {
+export default class ThreadDestroyController extends DestroyController {
+  successMessage = 'Topic verwijderd!';
   successTransitionTarget = 'forum.categories.category';
   cancelTransitionTarget = 'forum.categories.category.threads.thread';
-  successMessage = 'Topic verwijderd!';
 
   get successTransitionModel() {
     return this.category;
diff --git a/app/controllers/forum/categories/category/threads/thread/edit.js b/app/controllers/forum/categories/category/threads/thread/edit.js
index 97704fe21..e87ed28ac 100644
--- a/app/controllers/forum/categories/category/threads/thread/edit.js
+++ b/app/controllers/forum/categories/category/threads/thread/edit.js
@@ -1,6 +1,6 @@
 import EditController from 'amber-ui/controllers/application/edit';
 
-export default class EditThreadController extends EditController {
+export default class ThreadEditController extends EditController {
   successMessage = 'Topic aangepast!';
-  successTransitionTarget = 'forum.categories.category.threads.thread.show';
+  successTransitionTarget = 'forum.categories.category.threads.thread';
 }
diff --git a/app/controllers/forum/categories/category/threads/thread/posts/destroy.js b/app/controllers/forum/categories/category/threads/thread/posts/post/destroy.js
similarity index 86%
rename from app/controllers/forum/categories/category/threads/thread/posts/destroy.js
rename to app/controllers/forum/categories/category/threads/thread/posts/post/destroy.js
index 096e466e7..17385378b 100644
--- a/app/controllers/forum/categories/category/threads/thread/posts/destroy.js
+++ b/app/controllers/forum/categories/category/threads/thread/posts/post/destroy.js
@@ -1,10 +1,10 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
 import { action } from '@ember/object';
 
-export default class ForumPostDestroyController extends DestroyController {
+export default class PostDestroyController extends DestroyController {
   successMessage = 'Forumbericht verwijderd!';
-  successTransitionTarget = 'forum.categories.category.threads.thread.show';
-  cancelTransitionTarget = 'forum.categories.category.threads.thread.show';
+  successTransitionTarget = 'forum.categories.category.threads.thread';
+  cancelTransitionTarget = 'forum.categories.category.threads.thread';
 
   get successTransitionModel() {
     return this.thread;
diff --git a/app/controllers/forum/categories/category/threads/thread/posts/edit.js b/app/controllers/forum/categories/category/threads/thread/posts/post/edit.js
similarity index 89%
rename from app/controllers/forum/categories/category/threads/thread/posts/edit.js
rename to app/controllers/forum/categories/category/threads/thread/posts/post/edit.js
index 3ce2bc802..2fe9fe0bf 100644
--- a/app/controllers/forum/categories/category/threads/thread/posts/edit.js
+++ b/app/controllers/forum/categories/category/threads/thread/posts/post/edit.js
@@ -1,9 +1,10 @@
-import { action } from '@ember/object';
 import EditController from 'amber-ui/controllers/application/edit';
+import { action } from '@ember/object';
 
-export default class EditPostController extends EditController {
+export default class PostEditController extends EditController {
   successMessage = 'Forumbericht aangepast!';
   successTransitionTarget = 'forum.categories.category.threads.thread';
+
   get successTransitionModel() {
     return this.thread;
   }
diff --git a/app/controllers/forum/categories/new.js b/app/controllers/forum/categories/new.js
index c145cd600..6bb7ad551 100644
--- a/app/controllers/forum/categories/new.js
+++ b/app/controllers/forum/categories/new.js
@@ -1,10 +1,8 @@
 import NewController from 'amber-ui/controllers/application/new';
 
-export default class NewCategoryController extends NewController {
+export default class CategoriesNewController extends NewController {
   successMessage = 'Categorie toegevoegd!';
   successTransitionTarget = 'forum.categories';
   cancelTransitionTarget = 'forum.categories';
-  get successTransitionModel() {
-    return null;
-  }
+  successTransitionModel = null;
 }
diff --git a/app/controllers/groups/edit.js b/app/controllers/groups/group/edit.js
similarity index 93%
rename from app/controllers/groups/edit.js
rename to app/controllers/groups/group/edit.js
index ab2967341..6afb5cbe9 100644
--- a/app/controllers/groups/edit.js
+++ b/app/controllers/groups/group/edit.js
@@ -1,15 +1,16 @@
-import { action } from '@ember/object';
 import { A } from '@ember/array';
+import EditController from 'amber-ui/controllers/application/edit';
 import { GroupKinds } from 'amber-ui/constants';
+import { action } from '@ember/object';
 import { all } from 'rsvp';
 import { capitalize } from '@ember/string';
 import { inject as service } from '@ember/service';
-import EditController from '../application/edit';
 
-export default class EditGroupController extends EditController {
+export default class GroupEditController extends EditController {
   @service session;
+
   successMessage = 'Groep aangepast!';
-  successTransitionTarget = 'groups.show';
+  successTransitionTarget = 'groups.group';
 
   _groupKindToOption(groupKind) {
     return {
diff --git a/app/controllers/groups/export.js b/app/controllers/groups/group/export.js
similarity index 96%
rename from app/controllers/groups/export.js
rename to app/controllers/groups/group/export.js
index 5750e18d8..585494dd4 100644
--- a/app/controllers/groups/export.js
+++ b/app/controllers/groups/group/export.js
@@ -4,9 +4,9 @@ import { A } from '@ember/array';
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 
-export default class GroupsExportController extends Controller {
+export default class GroupExportController extends Controller {
   @service fetch;
-  @service('file-saver') fileSaver;
+  @service fileSaver;
 
   questions = [
     {
@@ -176,6 +176,6 @@ export default class GroupsExportController extends Controller {
       blob,
       'application/csv'
     );
-    this.transitionToRoute('groups.show', this.model);
+    this.transitionToRoute('groups.group', this.model);
   }
 }
diff --git a/app/controllers/groups/show.js b/app/controllers/groups/group/index.js
similarity index 89%
rename from app/controllers/groups/show.js
rename to app/controllers/groups/group/index.js
index 3aafa68bb..1ede07e47 100644
--- a/app/controllers/groups/show.js
+++ b/app/controllers/groups/group/index.js
@@ -2,11 +2,10 @@ import GroupMembershipsController from 'amber-ui/controllers/application/group-m
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
 
-export default class GroupsShowController extends GroupMembershipsController {
+export default class GroupIndexController extends GroupMembershipsController {
   @tracked sortedAttribute = 'user.firstName';
 
   filterableAttributes = ['user.username', 'user.fullName', 'function'];
-
   sortableAttributes = [
     {
       value: 'user.firstName',
@@ -26,7 +25,7 @@ export default class GroupsShowController extends GroupMembershipsController {
   selectFirstItem() {
     if (this.filteredModels.length > 0) {
       this.transitionToRoute(
-        'users.show',
+        'users.user',
         this.filteredModels.firstObject.user.get('id')
       );
     }
diff --git a/app/controllers/groups/index.js b/app/controllers/groups/index.js
index 476062c40..0c17eb105 100644
--- a/app/controllers/groups/index.js
+++ b/app/controllers/groups/index.js
@@ -3,11 +3,11 @@ import { tracked } from '@glimmer/tracking';
 
 export default class GroupsIndexController extends FilterableAndSortableController {
   @tracked sortedAttribute = 'name';
+
   @tracked showAdministrative = false;
   @tracked showInactive = false;
 
-  routeOnEnter = 'groups.show';
-
+  routeOnEnter = 'groups.group';
   queryParams = {
     selectedGroupKind: 'kind',
     search: 'search',
diff --git a/app/controllers/groups/new.js b/app/controllers/groups/new.js
index f0ef74eb9..5cf57414b 100644
--- a/app/controllers/groups/new.js
+++ b/app/controllers/groups/new.js
@@ -1,10 +1,8 @@
-import EditGroupController from './edit';
+import GroupEditController from './group/edit';
 
-export default class NewGroupController extends EditGroupController {
+export default class GroupsNewController extends GroupEditController {
   successMessage = 'Groep aangemaakt!';
   cancelMessage = 'Groep aanmaken geannuleerd.';
-  cancelTransitionTarget = 'groups.index';
-  get cancelTransitionModel() {
-    return null;
-  }
+  cancelTransitionTarget = 'groups';
+  cancelTransitionModel = null;
 }
diff --git a/app/controllers/login.js b/app/controllers/login.js
index e00dde3fb..31558399e 100644
--- a/app/controllers/login.js
+++ b/app/controllers/login.js
@@ -1,13 +1,13 @@
 import Controller from '@ember/controller';
-import { typeOf } from '@ember/utils';
-import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
+import { typeOf } from '@ember/utils';
 
 export default class LoginController extends Controller {
-  @tracked errorMessage;
   @service session;
 
+  @tracked errorMessage = null;
   @tracked username;
   @tracked password;
   @tracked verificationCode;
diff --git a/app/controllers/mail-aliases/index.js b/app/controllers/mail-aliases/index.js
index f42348485..9c7dceb0e 100644
--- a/app/controllers/mail-aliases/index.js
+++ b/app/controllers/mail-aliases/index.js
@@ -5,7 +5,8 @@ export default class MailAliasesIndexController extends FilterableAndSortableCon
   @tracked sortedAttribute = 'email';
 
   queryParams = ['search', 'sort'];
-  routeOnEnter = 'users.show';
+
+  routeOnEnter = 'users.user';
   sortableAttributes = [
     {
       value: 'email',
diff --git a/app/controllers/mail-aliases/destroy.js b/app/controllers/mail-aliases/mail-alias/destroy.js
similarity index 60%
rename from app/controllers/mail-aliases/destroy.js
rename to app/controllers/mail-aliases/mail-alias/destroy.js
index 38369008b..6e5250563 100644
--- a/app/controllers/mail-aliases/destroy.js
+++ b/app/controllers/mail-aliases/mail-alias/destroy.js
@@ -1,6 +1,6 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
 
 export default class MailAliasDestroyController extends DestroyController {
-  successTransitionTarget = 'mail-aliases.index';
-  cancelTransitionTarget = 'mail-aliases.show';
+  successTransitionTarget = 'mail-aliases';
+  cancelTransitionTarget = 'mail-aliases.mail-alias';
 }
diff --git a/app/controllers/mail-aliases/edit.js b/app/controllers/mail-aliases/mail-alias/edit.js
similarity index 85%
rename from app/controllers/mail-aliases/edit.js
rename to app/controllers/mail-aliases/mail-alias/edit.js
index 242a8b7b0..1799b1dec 100644
--- a/app/controllers/mail-aliases/edit.js
+++ b/app/controllers/mail-aliases/mail-alias/edit.js
@@ -1,8 +1,8 @@
 import EditController from 'amber-ui/controllers/application/edit';
 import { MailAliasModerationTypes } from 'amber-ui/constants';
 
-export default class EditMailAliasController extends EditController {
-  successTransitionTarget = 'mail-aliases.show';
+export default class MailAliasEditController extends EditController {
+  successTransitionTarget = 'mail-aliases.mail-alias';
 
   _mailAliasModerationTypes(moderationType) {
     return {
diff --git a/app/controllers/mail-aliases/new.js b/app/controllers/mail-aliases/new.js
index 7077e86b3..c6189c486 100644
--- a/app/controllers/mail-aliases/new.js
+++ b/app/controllers/mail-aliases/new.js
@@ -1,10 +1,8 @@
-import EditMailAliasController from './edit';
+import MailAliasEditController from './mail-alias/edit';
 
-export default class NewMailAliasController extends EditMailAliasController {
-  successMessage = 'Mail-alias aangemaakt!';
-  cancelMessage = 'Mail-alias aanmaken geannuleerd.';
-  cancelTransitionTarget = 'mail-aliases.index';
-  get cancelTransitionModel() {
-    return null;
-  }
+export default class MailAliasesNewController extends MailAliasEditController {
+  successMessage = 'Mail alias aangemaakt!';
+  cancelMessage = 'Mail alias aanmaken geannuleerd.';
+  cancelTransitionTarget = 'mail-aliases';
+  cancelTransitionModel = null;
 }
diff --git a/app/controllers/mail-moderations/index.js b/app/controllers/mail-moderations/index.js
index 6da73a427..485cd1357 100644
--- a/app/controllers/mail-moderations/index.js
+++ b/app/controllers/mail-moderations/index.js
@@ -4,5 +4,5 @@ import { tracked } from '@glimmer/tracking';
 export default class MailModerationsIndexController extends FilterableAndSortableController {
   @tracked sortedAttribute = 'received_at';
 
-  routeOnEnter = 'mail-moderations.show';
+  routeOnEnter = 'mail-moderations.mail-moderation';
 }
diff --git a/app/controllers/mail-moderations/accept.js b/app/controllers/mail-moderations/mail-moderation/accept.js
similarity index 83%
rename from app/controllers/mail-moderations/accept.js
rename to app/controllers/mail-moderations/mail-moderation/accept.js
index 549797c1b..c1af5fada 100644
--- a/app/controllers/mail-moderations/accept.js
+++ b/app/controllers/mail-moderations/mail-moderation/accept.js
@@ -1,12 +1,14 @@
-import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
+import { action } from '@ember/object';
 import { isInvalidResponse } from 'ember-fetch/errors';
+import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
 
-export default class AcceptController extends Controller {
+export default class MailModerationAcceptController extends Controller {
   @service fetch;
+
   @tracked errorMessage = null;
+
   @action
   async submit() {
     this.errorMessage = null;
@@ -15,7 +17,7 @@ export default class AcceptController extends Controller {
     );
     if (response.ok) {
       this.model.unloadRecord();
-      this.transitionToRoute('mail-moderations.index');
+      this.transitionToRoute('mail-moderations');
     } else if (isInvalidResponse(response)) {
       const json = await response.json();
       this.errorMessage = json.errors[0].detail;
diff --git a/app/controllers/mail-moderations/destroy.js b/app/controllers/mail-moderations/mail-moderation/destroy.js
similarity index 68%
rename from app/controllers/mail-moderations/destroy.js
rename to app/controllers/mail-moderations/mail-moderation/destroy.js
index 1260169c8..4e2c147fb 100644
--- a/app/controllers/mail-moderations/destroy.js
+++ b/app/controllers/mail-moderations/mail-moderation/destroy.js
@@ -3,6 +3,6 @@ import DestroyController from 'amber-ui/controllers/application/destroy';
 export default class MailModerationDestroyController extends DestroyController {
   successMessage = 'Mail is genegeerd.';
   cancelMessage = 'Wijzigingen geannuleerd.';
-  successTransitionTarget = 'mail-moderations.index';
-  cancelTransitionTarget = 'mail-moderations.show';
+  successTransitionTarget = 'mail-moderations';
+  cancelTransitionTarget = 'mail-moderations.mail-moderation';
 }
diff --git a/app/controllers/mail-moderations/reject.js b/app/controllers/mail-moderations/mail-moderation/reject.js
similarity index 85%
rename from app/controllers/mail-moderations/reject.js
rename to app/controllers/mail-moderations/mail-moderation/reject.js
index 61474c6c3..54291d910 100644
--- a/app/controllers/mail-moderations/reject.js
+++ b/app/controllers/mail-moderations/mail-moderation/reject.js
@@ -1,13 +1,15 @@
-import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
+import { action } from '@ember/object';
 import { isInvalidResponse } from 'ember-fetch/errors';
+import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
 
-export default class RejectController extends Controller {
+export default class MailModerationRejectController extends Controller {
   @service fetch;
   @service flashNotice;
+
   @tracked errorMessage = null;
+
   @action
   async submit() {
     this.errorMessage = null;
@@ -18,7 +20,7 @@ export default class RejectController extends Controller {
     if (response.ok) {
       this.flashNotice.sendSuccess('Mail moderatie afgewezen!');
       this.model.unloadRecord();
-      this.transitionToRoute('mail-moderations.index');
+      this.transitionToRoute('mail-moderations');
     } else if (isInvalidResponse(response)) {
       const json = await response.json();
       this.errorMessage = json.error;
diff --git a/app/controllers/oauth/authorize.js b/app/controllers/oauth/authorize.js
index 5381742ce..b458a2f42 100644
--- a/app/controllers/oauth/authorize.js
+++ b/app/controllers/oauth/authorize.js
@@ -1,11 +1,13 @@
 import Controller from '@ember/controller';
+import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
 
-export default class AuthorizeController extends Controller {
+export default class OauthAuthorizeController extends Controller {
   @service fetch;
+
   @tracked clientName = null;
+
   queryParams = [
     'client_id',
     'redirect_uri',
diff --git a/app/controllers/photo-albums/index.js b/app/controllers/photo-albums/index.js
index c25bace5c..9c0c68d0f 100644
--- a/app/controllers/photo-albums/index.js
+++ b/app/controllers/photo-albums/index.js
@@ -6,6 +6,7 @@ export default class PhotoAlbumsIndexController extends FilterableAndSortableCon
   @tracked sortedAscending = false;
 
   queryParams = ['search', 'sort', 'page'];
+
   sortableAttributes = [
     {
       value: 'title',
diff --git a/app/controllers/photo-albums/new.js b/app/controllers/photo-albums/new.js
index 83e86b7c3..85c39ffd8 100644
--- a/app/controllers/photo-albums/new.js
+++ b/app/controllers/photo-albums/new.js
@@ -1,13 +1,13 @@
 import NewController from 'amber-ui/controllers/application/new';
 import { inject as service } from '@ember/service';
 
-export default class NewPhotoAlbumController extends NewController {
-  @service store;
-  @service session;
+export default class PhotoAlbumsNewController extends NewController {
   @service abilities;
+  @service session;
+  @service store;
 
   successTransitionTarget = 'photo-albums.photo-album.edit';
-  cancelTransitionTarget = 'photo-albums.index';
+  cancelTransitionTarget = 'photo-albums';
 
   get groups() {
     if (this.abilities.can('select all groups for photo-albums')) {
diff --git a/app/controllers/photo-albums/photo-album/destroy.js b/app/controllers/photo-albums/photo-album/destroy.js
index 859f22900..466e826cf 100644
--- a/app/controllers/photo-albums/photo-album/destroy.js
+++ b/app/controllers/photo-albums/photo-album/destroy.js
@@ -1,6 +1,6 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
 
 export default class PhotoAlbumDestroyController extends DestroyController {
-  successTransitionTarget = 'photo-albums.index';
-  cancelTransitionTarget = 'photo-albums.photo-album.show';
+  successTransitionTarget = 'photo-albums';
+  cancelTransitionTarget = 'photo-albums.photo-album';
 }
diff --git a/app/controllers/photo-albums/photo-album/edit.js b/app/controllers/photo-albums/photo-album/edit.js
index 7d256cf39..1c73ac7c0 100644
--- a/app/controllers/photo-albums/photo-album/edit.js
+++ b/app/controllers/photo-albums/photo-album/edit.js
@@ -1,21 +1,21 @@
-import { inject as service } from '@ember/service';
+import PhotoAlbumsNewController from '../new';
 import { action } from '@ember/object';
-import NewPhotoAlbumController from '../new';
+import { inject as service } from '@ember/service';
+
+// TODO: it would follow the pattern more if we let the PhotoAlbumsNewController
+//  extend the PhotoAlbumEditController, instead of vice versa.
+export default class PhotoAlbumEditController extends PhotoAlbumsNewController {
+  @service fetch;
 
-// todo: it would follow the pattern more if we let the NewPhotoAlbumController extend the EditPhotoAlbumController,
-//  instead of vice versa
-export default class EditPhotoAlbumController extends NewPhotoAlbumController {
   successMessage = "Wijzigen en/of foto's toevoegen gelukt!";
   cancelMessage = "Wijzigen en/of foto's toevoegen geannuleerd.";
-  successTransitionTarget = 'photo-albums.photo-album.show';
+  successTransitionTarget = 'photo-albums.photo-album';
   cancelTransitionTarget = this.successTransitionTarget;
 
   get cancelTransitionModel() {
     return this.successTransitionModel;
   }
 
-  @service fetch;
-
   get dropzoneHeaders() {
     return { Authorization: this.fetch.authorizationHeader() };
   }
diff --git a/app/controllers/photo-albums/photo-album/photos/destroy.js b/app/controllers/photo-albums/photo-album/photos/destroy.js
deleted file mode 100644
index 855425c3e..000000000
--- a/app/controllers/photo-albums/photo-album/photos/destroy.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import DestroyController from 'amber-ui/controllers/application/destroy';
-
-export default class PhotoAlbumPhotoDestroyController extends DestroyController {
-  successTransitionTarget = 'photo-albums.photo-album.photos.index';
-  cancelTransitionTarget = 'photo-albums.photo-album.photos.show';
-}
diff --git a/app/controllers/photo-albums/photo-album/photos/index.js b/app/controllers/photo-albums/photo-album/photos/index.js
index 9d4cb0bdc..6876589ca 100644
--- a/app/controllers/photo-albums/photo-album/photos/index.js
+++ b/app/controllers/photo-albums/photo-album/photos/index.js
@@ -4,9 +4,9 @@ import { dasherize } from '@ember/string';
 import moment from 'moment';
 import { inject as service } from '@ember/service';
 
-export default class PhotoAlbumPhotosIndexController extends Controller {
+export default class PhotosIndexController extends Controller {
   @service fetch;
-  @service('file-saver') fileSaver;
+  @service fileSaver;
 
   get sortedPhotos() {
     return this.model.get('sortedPhotos');
diff --git a/app/controllers/photo-albums/photo-album/photos/photo/destroy.js b/app/controllers/photo-albums/photo-album/photos/photo/destroy.js
new file mode 100644
index 000000000..87e2bb189
--- /dev/null
+++ b/app/controllers/photo-albums/photo-album/photos/photo/destroy.js
@@ -0,0 +1,6 @@
+import DestroyController from 'amber-ui/controllers/application/destroy';
+
+export default class PhotoDestroyController extends DestroyController {
+  successTransitionTarget = 'photo-albums.photo-album.photos';
+  cancelTransitionTarget = 'photo-albums.photo-album.photos.photo';
+}
diff --git a/app/controllers/photo-albums/photo-album/photos/show.js b/app/controllers/photo-albums/photo-album/photos/photo/index.js
similarity index 86%
rename from app/controllers/photo-albums/photo-album/photos/show.js
rename to app/controllers/photo-albums/photo-album/photos/photo/index.js
index e1a335732..0d2766123 100644
--- a/app/controllers/photo-albums/photo-album/photos/show.js
+++ b/app/controllers/photo-albums/photo-album/photos/photo/index.js
@@ -1,8 +1,8 @@
-import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
 import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
 
-export default class PhotoShowController extends Controller {
+export default class PhotoIndexController extends Controller {
   @service session;
 
   @action
@@ -26,7 +26,7 @@ export default class PhotoShowController extends Controller {
     const index = (photos.indexOf(this.model) + delta + length) % length;
     this.route;
     return this.replaceRoute(
-      'photo-albums.photo-album.photos.show',
+      'photo-albums.photo-album.photos.photo',
       photos.objectAt(index)
     );
   }
diff --git a/app/controllers/photo-comments/index.js b/app/controllers/photo-comments/index.js
index bedf0c36a..29cf9e401 100644
--- a/app/controllers/photo-comments/index.js
+++ b/app/controllers/photo-comments/index.js
@@ -6,11 +6,12 @@ import { tracked } from '@glimmer/tracking';
 export default class PhotoCommentsIndexController extends FilterableAndSortableController {
   @service flashNotice;
 
-  @tracked sortedAscending = false;
   @tracked sortedAttribute = 'updated_at';
+  @tracked sortedAscending = false;
 
-  routeOnEnter = 'photo-albums.photo-album.photos.show';
   queryParams = ['search', 'sort', 'page'];
+
+  routeOnEnter = 'photo-albums.photo-album.photos.photo';
   sortableAttributes = [
     {
       value: 'updated_at',
diff --git a/app/controllers/photo-comments/destroy.js b/app/controllers/photo-comments/photo-comment/destroy.js
similarity index 64%
rename from app/controllers/photo-comments/destroy.js
rename to app/controllers/photo-comments/photo-comment/destroy.js
index c88ba7919..4abe52a44 100644
--- a/app/controllers/photo-comments/destroy.js
+++ b/app/controllers/photo-comments/photo-comment/destroy.js
@@ -2,9 +2,9 @@ import DestroyController from 'amber-ui/controllers/application/destroy';
 import { action } from '@ember/object';
 
 export default class PhotoCommentDestroyController extends DestroyController {
-  successMessage = 'Fotoreactie verwijderd!';
-  successTransitionTarget = 'photo-albums.photo-album.photos.show';
-  cancelTransitionTarget = 'photo-albums.photo-album.photos.show';
+  successMessage = 'Foto reactie verwijderd!';
+  successTransitionTarget = 'photo-albums.photo-album.photos.photo';
+  cancelTransitionTarget = 'photo-albums.photo-album.photos.photo';
 
   get successTransitionModel() {
     return this.photo;
@@ -26,12 +26,14 @@ export default class PhotoCommentDestroyController extends DestroyController {
     super.cancel();
   }
 
-  async transition(transitionTarget, transitionModelID) {
+  // TODO: is this a supported method override? I can't find docs about this
+  //  anywhere.
+  async transition(transitionTarget, transitionModelId) {
     const photoAlbumModel = await this.photo.photoAlbum;
     this.transitionToRoute(
       transitionTarget,
       photoAlbumModel.id,
-      transitionModelID
+      transitionModelId
     );
   }
 }
diff --git a/app/controllers/polls/index.js b/app/controllers/polls/index.js
index 6f6665508..dc57f6582 100644
--- a/app/controllers/polls/index.js
+++ b/app/controllers/polls/index.js
@@ -5,8 +5,9 @@ export default class PollsIndexController extends FilterableAndSortableControlle
   @tracked sortedAttribute = 'created_at';
   @tracked sortedAscending = false;
 
-  routeOnEnter = 'polls.show';
   queryParams = ['search', 'sort', 'page'];
+
+  routeOnEnter = 'polls.poll';
   sortableAttributes = [
     {
       value: 'created_at',
diff --git a/app/controllers/polls/new.js b/app/controllers/polls/new.js
index c3ab7785f..e662d8177 100644
--- a/app/controllers/polls/new.js
+++ b/app/controllers/polls/new.js
@@ -1,10 +1,8 @@
-import EditPollController from './edit';
+import PollEditController from './poll/edit';
 
-export default class NewPollController extends EditPollController {
+export default class PollsNewController extends PollEditController {
   successMessage = 'Aanmaken gelukt!';
   cancelMessage = 'Aanmaken geannuleerd.';
-  cancelTransitionTarget = 'polls.index';
-  get cancelTransitionModel() {
-    return null;
-  }
+  cancelTransitionTarget = 'polls';
+  cancelTransitionModel = null;
 }
diff --git a/app/controllers/polls/destroy.js b/app/controllers/polls/poll/destroy.js
similarity index 73%
rename from app/controllers/polls/destroy.js
rename to app/controllers/polls/poll/destroy.js
index 185fc2534..bafb26a2a 100644
--- a/app/controllers/polls/destroy.js
+++ b/app/controllers/polls/poll/destroy.js
@@ -3,6 +3,6 @@ import DestroyController from 'amber-ui/controllers/application/destroy';
 export default class PollDestroyController extends DestroyController {
   successMessage = 'Poll verwijderd!';
   cancelMessage = 'Poll verwijderen geannuleerd.';
-  successTransitionTarget = 'polls.index';
-  cancelTransitionTarget = 'polls.show';
+  successTransitionTarget = 'polls';
+  cancelTransitionTarget = 'polls.poll';
 }
diff --git a/app/controllers/polls/edit.js b/app/controllers/polls/poll/edit.js
similarity index 61%
rename from app/controllers/polls/edit.js
rename to app/controllers/polls/poll/edit.js
index e3e8baf58..8c8caf60f 100644
--- a/app/controllers/polls/edit.js
+++ b/app/controllers/polls/poll/edit.js
@@ -1,10 +1,10 @@
-import EditController from '../application/edit';
+import EditController from 'amber-ui/controllers/application/edit';
 import { action } from '@ember/object';
-import { union } from '../../utils/array-operations';
+import { union } from 'amber-ui/utils/array-operations';
 
-export default class EditPollController extends EditController {
+export default class PollEditController extends EditController {
   successMessage = 'Poll opgeslagen!';
-  successTransitionTarget = 'polls.show';
+  successTransitionTarget = 'polls.poll';
 
   @action
   async submit() {
diff --git a/app/controllers/polls/show.js b/app/controllers/polls/poll/index.js
similarity index 97%
rename from app/controllers/polls/show.js
rename to app/controllers/polls/poll/index.js
index 02bca8dde..a7ed62241 100644
--- a/app/controllers/polls/show.js
+++ b/app/controllers/polls/poll/index.js
@@ -3,11 +3,11 @@ import EmberObject, { action, computed } from '@ember/object';
 import Controller from '@ember/controller';
 import FormLoadOrCreateUtil from 'amber-ui/utils/form-load-or-create';
 import { htmlSafe } from '@ember/template';
-import { inject as service } from '@ember/service';
 import { isNone } from '@ember/utils';
+import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 
-export default class PollsShowController extends Controller {
+export default class PollIndexController extends Controller {
   @service flashNotice;
   @service store;
 
diff --git a/app/controllers/sog/name-trainer.js b/app/controllers/sog/name-trainer.js
index fd0bd47d1..0bfa4471c 100644
--- a/app/controllers/sog/name-trainer.js
+++ b/app/controllers/sog/name-trainer.js
@@ -1,14 +1,25 @@
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
-import { run } from '@ember/runloop';
 import { action } from '@ember/object';
+import { run } from '@ember/runloop';
+import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 
-export default class NameTrainerController extends Controller {
+export default class SogNameTrainerController extends Controller {
   @service store;
-  queryParams = ['groupId', 'difficulty'];
+
+  @tracked errorMessage = null;
   @tracked groupId = null;
   @tracked difficulty = 1;
+  @tracked currentQuestionIndex = 1;
+  @tracked success = 0;
+  @tracked questions = [];
+  @tracked textInput = '';
+  @tracked started = false;
+  @tracked finished = false;
+  @tracked answered = false;
+
+  queryParams = ['groupId', 'difficulty'];
+
   difficultyOptions = [
     {
       value: 1,
@@ -24,28 +35,10 @@ export default class NameTrainerController extends Controller {
     },
   ];
 
-  @tracked currentQuestionIndex = 1;
-  @tracked success = 0;
-  @tracked questions = [];
-  @tracked textInput = '';
-  @tracked started = false;
-  @tracked finished = false;
-  @tracked answered = false;
-  @tracked errorMessage;
-
   get users() {
     return this.getUsers();
   }
 
-  async getUsers() {
-    const group = await this.group;
-    if (!group) {
-      return [];
-    }
-    const memberships = await group.get('memberships');
-    return await Promise.all(memberships.mapBy('user'));
-  }
-
   get group() {
     if (!this.groupId) {
       return null;
@@ -86,6 +79,15 @@ export default class NameTrainerController extends Controller {
     return 1 + Math.round((90 / this.questions.length) * this.success) / 10;
   }
 
+  async getUsers() {
+    const group = await this.group;
+    if (!group) {
+      return [];
+    }
+    const memberships = await group.get('memberships');
+    return await Promise.all(memberships.mapBy('user'));
+  }
+
   @action
   setGroupId(model) {
     this.groupId = model.id;
diff --git a/app/controllers/static-pages/index.js b/app/controllers/static-pages/index.js
index 93bb46328..1456f5133 100644
--- a/app/controllers/static-pages/index.js
+++ b/app/controllers/static-pages/index.js
@@ -1,8 +1,8 @@
 import FilterableAndSortableController from 'amber-ui/controllers/application/filterable-and-sortable';
-import { inject as service } from '@ember/service';
-import { tracked } from '@glimmer/tracking';
 import { A } from '@ember/array';
 import { isPresent } from '@ember/utils';
+import { inject as service } from '@ember/service';
+import { tracked } from '@glimmer/tracking';
 
 export default class StaticPagesIndexController extends FilterableAndSortableController {
   @service session;
@@ -11,7 +11,8 @@ export default class StaticPagesIndexController extends FilterableAndSortableCon
   @tracked sortedAttribute = 'title';
 
   queryParams = ['search', 'sort'];
-  routeOnEnter = 'static-pages.show';
+
+  routeOnEnter = 'static-pages.static-page';
   sortableAttributes = [
     {
       value: 'title',
diff --git a/app/controllers/static-pages/new.js b/app/controllers/static-pages/new.js
index 297dee018..82cc6ec98 100644
--- a/app/controllers/static-pages/new.js
+++ b/app/controllers/static-pages/new.js
@@ -1,10 +1,8 @@
-import EditStaticPageController from './edit';
+import StaticPageEditController from './static-page/edit';
 
-export default class NewStaticPageController extends EditStaticPageController {
+export default class StaticPagesNewController extends StaticPageEditController {
   successMessage = 'Infopagina aangemaakt!';
   cancelMessage = 'Aanmaken geannuleerd.';
-  cancelTransitionTarget = 'static-pages.index';
-  get cancelTransitionModel() {
-    return null;
-  }
+  cancelTransitionTarget = 'static-pages';
+  cancelTransitionModel = null;
 }
diff --git a/app/controllers/static-pages/destroy.js b/app/controllers/static-pages/static-page/destroy.js
similarity index 60%
rename from app/controllers/static-pages/destroy.js
rename to app/controllers/static-pages/static-page/destroy.js
index 00adb245e..3a1f09856 100644
--- a/app/controllers/static-pages/destroy.js
+++ b/app/controllers/static-pages/static-page/destroy.js
@@ -1,6 +1,6 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
 
 export default class StaticPageDestroyController extends DestroyController {
-  successTransitionTarget = 'static-pages.index';
-  cancelTransitionTarget = 'static-pages.show';
+  successTransitionTarget = 'static-pages';
+  cancelTransitionTarget = 'static-pages.static-page';
 }
diff --git a/app/controllers/static-pages/edit.js b/app/controllers/static-pages/static-page/edit.js
similarity index 81%
rename from app/controllers/static-pages/edit.js
rename to app/controllers/static-pages/static-page/edit.js
index d50787055..4427f7fe2 100644
--- a/app/controllers/static-pages/edit.js
+++ b/app/controllers/static-pages/static-page/edit.js
@@ -3,9 +3,9 @@ import { StaticPageCategories } from 'amber-ui/constants';
 import { capitalize } from '@ember/string';
 import { action } from '@ember/object';
 
-export default class EditStaticPageController extends EditController {
+export default class StaticPageEditController extends EditController {
   successMessage = 'Infopagina aangepast!';
-  successTransitionTarget = 'static-pages.show';
+  successTransitionTarget = 'static-pages.static-page';
 
   get staticPageCategoryOptions() {
     return StaticPageCategories.map((pageCategory) => {
diff --git a/app/controllers/users/batch/new.js b/app/controllers/users/batch/new.js
index 44924968b..f8ac9aebc 100644
--- a/app/controllers/users/batch/new.js
+++ b/app/controllers/users/batch/new.js
@@ -1,20 +1,13 @@
-import { inject as service } from '@ember/service';
 import EmberArray, { A } from '@ember/array';
+import NewController from 'amber-ui/controllers/application/new';
 import { action } from '@ember/object';
-import { tracked } from '@glimmer/tracking';
 import { isInvalidResponse } from 'ember-fetch/errors';
-import NewController from '../../application/new';
-
-export default class NewUserBatchController extends NewController {
-  successMessage = 'Gebruikers aanmaken gelukt!';
-  cancelMessage = 'Gebruikers aanmaken geannuleerd.';
-  cancelTransitionTarget = 'users.index';
-  successTransitionTarget = 'users.index';
-  get successTransitionModel() {
-    return null;
-  }
+import { inject as service } from '@ember/service';
+import { tracked } from '@glimmer/tracking';
 
+export default class BatchNewController extends NewController {
   @service fetch;
+
   @tracked importFile = null;
   @tracked addToGroup = null;
   @tracked reviewing = false;
@@ -22,6 +15,12 @@ export default class NewUserBatchController extends NewController {
   @tracked importErrors = A();
   @tracked properties = A();
 
+  successMessage = 'Gebruikers aanmaken gelukt!';
+  cancelMessage = 'Gebruikers aanmaken geannuleerd.';
+  cancelTransitionTarget = 'users';
+  successTransitionTarget = 'users';
+  successTransitionModel = null;
+
   validMimetypes = EmberArray.apply([
     'text/csv',
     'application/vnd.oasis.opendocument.spreadsheet',
@@ -92,7 +91,7 @@ export default class NewUserBatchController extends NewController {
 
     if (response.ok) {
       this.flashNotice.sendSuccess('Gebruikers opgeslagen');
-      this.transitionToRoute('users.index');
+      this.transitionToRoute('users');
     } else {
       this.flashNotice.sendError('Gebruikers niet opgeslagen');
       this.transitionToRoute('users.batch.new');
diff --git a/app/controllers/users/edit-permissions.js b/app/controllers/users/edit-permissions.js
deleted file mode 100644
index bb04d09f3..000000000
--- a/app/controllers/users/edit-permissions.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import UserEditController from 'amber-ui/controllers/users/edit';
-
-export default class EditUserPermissionsController extends UserEditController {
-  successMessage = 'Rechten gewijzigd!';
-  successTransitionTarget = 'users.show-permissions';
-}
diff --git a/app/controllers/users/edit-privacy.js b/app/controllers/users/edit-privacy.js
deleted file mode 100644
index abc416fbb..000000000
--- a/app/controllers/users/edit-privacy.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import EditUserController from './edit';
-
-export default class EditUserPrivacyController extends EditUserController {}
diff --git a/app/controllers/users/forgot-password.js b/app/controllers/users/forgot-password.js
index 266bd3449..b181f2782 100644
--- a/app/controllers/users/forgot-password.js
+++ b/app/controllers/users/forgot-password.js
@@ -1,14 +1,17 @@
-import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
-import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
+import { tracked } from '@glimmer/tracking';
 
-export default class ForgotPasswordController extends Controller {
+export default class UsersForgotPasswordController extends Controller {
   @service fetch;
-  queryParams = ['email'];
-  @tracked email = null;
+
+  @tracked errorMessage = null;
   @tracked successMessage;
-  @tracked errorMessage;
+  @tracked email = null;
+
+  queryParams = ['email'];
+
   @action
   async forgotPassword() {
     const response = await this.fetch.post('/users/reset_password', {
diff --git a/app/controllers/users/index.js b/app/controllers/users/index.js
index def31b4e8..a0c4579ee 100644
--- a/app/controllers/users/index.js
+++ b/app/controllers/users/index.js
@@ -5,7 +5,8 @@ export default class UsersIndexController extends FilterableAndSortableControlle
   @tracked sortedAttribute = 'first_name';
 
   queryParams = ['search', 'sort', 'page'];
-  routeOnEnter = 'users.show';
+
+  routeOnEnter = 'users.user';
   sortableAttributes = [
     {
       value: 'username',
diff --git a/app/controllers/users/members.js b/app/controllers/users/members.js
index a9208fa19..cd33fa87c 100644
--- a/app/controllers/users/members.js
+++ b/app/controllers/users/members.js
@@ -5,7 +5,8 @@ export default class UsersMembersController extends FilterableAndSortableControl
   @tracked sortedAttribute = 'first_name';
 
   queryParams = ['search', 'sort'];
-  routeOnEnter = 'users.show';
+
+  routeOnEnter = 'users.user';
   sortableAttributes = [
     {
       value: 'username',
diff --git a/app/controllers/users/new.js b/app/controllers/users/new.js
index 3cc800e61..d2c2141c1 100644
--- a/app/controllers/users/new.js
+++ b/app/controllers/users/new.js
@@ -1,10 +1,8 @@
-import EditUserController from './edit';
+import EditIndexController from './user/edit';
 
-export default class NewUserController extends EditUserController {
+export default class UsersNewController extends EditIndexController {
   successMessage = 'Gebruiker aangemaakt!';
   cancelMessage = 'Gebruiker aanmaken geannuleerd.';
-  cancelTransitionTarget = 'users.index';
-  get cancelTransitionModel() {
-    return null;
-  }
+  cancelTransitionTarget = 'users';
+  cancelTransitionModel = null;
 }
diff --git a/app/controllers/users/activate-account.js b/app/controllers/users/user/activate-account.js
similarity index 94%
rename from app/controllers/users/activate-account.js
rename to app/controllers/users/user/activate-account.js
index adf37b45e..3b4b42e1a 100644
--- a/app/controllers/users/activate-account.js
+++ b/app/controllers/users/user/activate-account.js
@@ -1,18 +1,20 @@
-import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
-import { run } from '@ember/runloop';
-import { isNone } from '@ember/utils';
+import { action } from '@ember/object';
 import { isNotFoundResponse } from 'ember-fetch/errors';
+import { isNone } from '@ember/utils';
+import { run } from '@ember/runloop';
+import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
 
-export default class ActivateAccountController extends Controller {
+export default class UserActivateAccountController extends Controller {
   @service fetch;
-  queryParams = ['activation_token'];
+
+  @tracked errorMessage = null;
+  @tracked successMessage;
   @tracked password;
   @tracked passwordConfirmation;
-  @tracked successMessage;
-  @tracked errorMessage;
+
+  queryParams = ['activation_token'];
 
   get isSaveButtonDisabled() {
     return (
diff --git a/app/controllers/users/edit.js b/app/controllers/users/user/edit/index.js
similarity index 90%
rename from app/controllers/users/edit.js
rename to app/controllers/users/user/edit/index.js
index 110c0f0e3..930bacfae 100644
--- a/app/controllers/users/edit.js
+++ b/app/controllers/users/user/edit/index.js
@@ -1,16 +1,16 @@
-import { action } from '@ember/object';
 import {
-  DigtusSubscriptionPreferenceTypes,
   AlmanakSubscriptionPreferenceTypes,
+  DigtusSubscriptionPreferenceTypes,
 } from 'amber-ui/constants';
 import EditController from 'amber-ui/controllers/application/edit';
+import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 
-export default class EditUserController extends EditController {
+export default class EditIndexController extends EditController {
   @service session;
 
   successMessage = 'Gegevens gewijzigd!';
-  successTransitionTarget = 'users.show';
+  successTransitionTarget = 'users.user';
 
   get canEditOnlyOwnProperties() {
     return (
diff --git a/app/controllers/users/user/edit/permissions.js b/app/controllers/users/user/edit/permissions.js
new file mode 100644
index 000000000..33fe23cb0
--- /dev/null
+++ b/app/controllers/users/user/edit/permissions.js
@@ -0,0 +1,6 @@
+import EditIndexController from '.';
+
+export default class EditPermissionsController extends EditIndexController {
+  successMessage = 'Rechten gewijzigd!';
+  successTransitionTarget = 'users.user.permissions';
+}
diff --git a/app/controllers/users/user/edit/privacy.js b/app/controllers/users/user/edit/privacy.js
new file mode 100644
index 000000000..9bdf30521
--- /dev/null
+++ b/app/controllers/users/user/edit/privacy.js
@@ -0,0 +1,3 @@
+import EditIndexController from '.';
+
+export default class EditPrivacyController extends EditIndexController {}
diff --git a/app/controllers/users/show-groups.js b/app/controllers/users/user/groups.js
similarity index 97%
rename from app/controllers/users/show-groups.js
rename to app/controllers/users/user/groups.js
index 8829b0bd7..ade2ab3ef 100644
--- a/app/controllers/users/show-groups.js
+++ b/app/controllers/users/user/groups.js
@@ -7,7 +7,6 @@ export default class UsersShowGroupsController extends GroupMembershipsControlle
   @tracked showAdministrativeGroups = false;
 
   filterableAttributes = ['group.name'];
-
   sortableAttributes = [
     {
       value: 'group.name',
@@ -29,7 +28,7 @@ export default class UsersShowGroupsController extends GroupMembershipsControlle
   selectFirstItem() {
     if (this.filteredModels.length > 0) {
       this.transitionToRoute(
-        'groups.show',
+        'groups.group',
         this.filteredModels.firstObject.group.get('id')
       );
     }
diff --git a/app/controllers/users/resend-activation.js b/app/controllers/users/user/resend-activation-code.js
similarity index 75%
rename from app/controllers/users/resend-activation.js
rename to app/controllers/users/user/resend-activation-code.js
index 66aa33360..2cfd269b2 100644
--- a/app/controllers/users/resend-activation.js
+++ b/app/controllers/users/user/resend-activation-code.js
@@ -1,20 +1,22 @@
-import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
+import { action } from '@ember/object';
 import { isNotFoundResponse } from 'ember-fetch/errors';
+import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
 
-export default class ResendActivationController extends Controller {
+export default class UserResendActivationCodeController extends Controller {
   @service fetch;
-  @tracked errorMessage;
+
+  @tracked errorMessage = null;
+
   @action
-  async resendActivation() {
+  async resendActivationCode() {
     this.errorMessage = null;
     const response = await this.fetch.post(
       `/users/${this.model.id}/resend_activation_mail`
     );
     if (response.ok) {
-      this.transitionToRoute('users.show', this.model);
+      this.transitionToRoute('users.user', this.model);
     } else if (isNotFoundResponse(response)) {
       this.errorMessage = 'Deze gebruiker is al geactiveerd!';
     } else {
diff --git a/app/controllers/users/webdav.js b/app/controllers/users/webdav.js
index 76c45232f..92eb84a00 100644
--- a/app/controllers/users/webdav.js
+++ b/app/controllers/users/webdav.js
@@ -1,10 +1,11 @@
-import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
 import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
 
-export default class WebdavController extends Controller {
-  @service session;
+export default class UsersWebdavController extends Controller {
   @service fetch;
+  @service session;
+
   get webDavEnabled() {
     return this.session.currentUser.webdavSecretKey !== null;
   }
@@ -15,7 +16,7 @@ export default class WebdavController extends Controller {
 
   @action
   async generateWebdavSecret() {
-    let user = this.session.currentUser;
+    const user = this.session.currentUser;
 
     await this.fetch.fetch(`/users/${user.id}/activate_webdav`, {
       method: 'POST',
diff --git a/app/controllers/vacancies/index.js b/app/controllers/vacancies/index.js
index e9d926e48..e6831bb01 100644
--- a/app/controllers/vacancies/index.js
+++ b/app/controllers/vacancies/index.js
@@ -1,10 +1,11 @@
 import FilterableAndSortableController from 'amber-ui/controllers/application/filterable-and-sortable';
 import { tracked } from '@glimmer/tracking';
 
-export default class VacancyIndexController extends FilterableAndSortableController {
+export default class VacanciesIndexController extends FilterableAndSortableController {
   @tracked sortedAttribute = 'created_at';
   @tracked sortedAscending = false;
 
-  routeOnEnter = 'vacancies.show';
-  queryParams = ['sort', 'page'];
+  queryParams = ['page', 'sort'];
+
+  routeOnEnter = 'vacancies.vacancy';
 }
diff --git a/app/controllers/vacancies/new.js b/app/controllers/vacancies/new.js
index 7e16d6126..c2f9b9bde 100644
--- a/app/controllers/vacancies/new.js
+++ b/app/controllers/vacancies/new.js
@@ -1,10 +1,8 @@
-import EditVacancyController from './edit';
+import VacancyEditController from './vacancy/edit';
 
-export default class NewVacancyController extends EditVacancyController {
+export default class VacanciesNewController extends VacancyEditController {
   successMessage = 'Vacature aangemaakt!';
   cancelMessage = 'Vacature aanmaken geannuleerd.';
-  cancelTransitionTarget = 'vacancies.index';
-  get cancelTransitionModel() {
-    return null;
-  }
+  cancelTransitionTarget = 'vacancies';
+  cancelTransitionModel = null;
 }
diff --git a/app/controllers/vacancies/show.js b/app/controllers/vacancies/show.js
deleted file mode 100644
index ecb551477..000000000
--- a/app/controllers/vacancies/show.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Controller from '@ember/controller';
-
-export default class ShowVacancyController extends Controller {}
diff --git a/app/controllers/vacancies/destroy.js b/app/controllers/vacancies/vacancy/destroy.js
similarity index 62%
rename from app/controllers/vacancies/destroy.js
rename to app/controllers/vacancies/vacancy/destroy.js
index fb83963b8..3671c103a 100644
--- a/app/controllers/vacancies/destroy.js
+++ b/app/controllers/vacancies/vacancy/destroy.js
@@ -1,6 +1,6 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
 
 export default class VacancyDestroyController extends DestroyController {
-  successTransitionTarget = 'vacancies.index';
-  cancelTransitionTarget = 'vacancies.show';
+  successTransitionTarget = 'vacancies';
+  cancelTransitionTarget = 'vacancies.vacancy';
 }
diff --git a/app/controllers/vacancies/edit.js b/app/controllers/vacancies/vacancy/edit.js
similarity index 83%
rename from app/controllers/vacancies/edit.js
rename to app/controllers/vacancies/vacancy/edit.js
index 9674842ef..f30651fb6 100644
--- a/app/controllers/vacancies/edit.js
+++ b/app/controllers/vacancies/vacancy/edit.js
@@ -2,12 +2,12 @@ import EditController from 'amber-ui/controllers/application/edit';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 
-export default class EditVacancyController extends EditController {
-  successMessage = 'Vacature opgeslagen!';
-  successTransitionTarget = 'vacancies.show';
-
-  @service session;
+export default class VacancyEditController extends EditController {
   @service abilities;
+  @service session;
+
+  successMessage = 'Vacature opgeslagen!';
+  successTransitionTarget = 'vacancies.vacancy';
 
   get groups() {
     if (this.abilities.can('select all groups for vacancies')) {
diff --git a/app/initializers/service-worker.js b/app/initializers/service-worker.js
index 1ba2ae398..a611a651c 100644
--- a/app/initializers/service-worker.js
+++ b/app/initializers/service-worker.js
@@ -1,4 +1,4 @@
-import ENV from '../config/environment';
+import ENV from 'amber-ui/config/environment';
 
 export default {
   name: 'service-worker',
diff --git a/app/router.js b/app/router.js
index 783cbe8c8..de9913bb0 100644
--- a/app/router.js
+++ b/app/router.js
@@ -32,29 +32,89 @@ export default class Router extends EmberRouter {
 }
 
 Router.map(function () {
-  this.route('oauth', function () {
-    this.route('authorize');
+  this.route('404-page-not-found', { path: '/*path' });
+
+  this.route('418-im-a-teapot', { path: '/coffee' });
+
+  this.route('activities', function () {
+    this.route('new');
+
+    this.route('ical');
+
+    this.route('activity', { path: ':id' }, function () {
+      this.route('edit');
+      this.route('destroy');
+
+      this.route('generate-alias');
+      this.route('print-enrolled');
+    });
   });
 
-  this.route('login');
+  this.route('article-comments', function () {
+    this.route('article-comment', { path: ':id' }, function () {
+      this.route('destroy');
+    });
+  });
 
-  this.route('profile');
+  this.route('articles', function () {
+    this.route('new');
 
-  this.route('static-pages', function () {
-    this.route('show', { path: '/:id' });
+    this.route('article', { path: ':id' }, function () {
+      this.route('edit');
+      this.route('destroy');
+    });
+  });
+
+  this.route('books', function () {
     this.route('new');
-    this.route('edit', { path: '/:id/edit' });
-    this.route('destroy', { path: '/:id/destroy' });
+
+    this.route('book', { path: ':id' }, function () {
+      this.route('edit');
+      this.route('destroy');
+    });
   });
 
-  this.route('quickpost');
+  this.route('debit', function () {
+    this.route('collections', function () {
+      this.route('new');
+
+      this.route('collection', { path: ':id' }, function () {
+        this.route('edit');
+        this.route('destroy');
+
+        this.route('sepa');
+      });
+    });
+
+    this.route('mandates', function () {
+      this.route('new');
+
+      this.route('mandate', { path: ':id' }, function () {
+        this.route('edit');
+      });
+    });
+
+    this.route('transactions', function () {
+      this.route('transaction', { path: ':id' }, function () {
+        this.route('edit');
+        this.route('destroy');
+      });
+    });
+  });
+
+  this.route('form', function () {
+    this.route('responses', function () {
+      this.route('response', { path: ':id' }, function () {
+        this.route('destroy');
+      });
+    });
+  });
 
   this.route('forum', function () {
     this.route('categories', function () {
       this.route('new');
 
       this.route('category', { path: ':category_id' }, function () {
-        this.route('show', { path: '/' });
         this.route('edit');
         this.route('destroy');
 
@@ -62,13 +122,14 @@ Router.map(function () {
           this.route('new');
 
           this.route('thread', { path: ':thread_id' }, function () {
-            this.route('show', { path: '/' });
             this.route('edit');
             this.route('destroy');
 
             this.route('posts', function () {
-              this.route('edit', { path: ':post_id/edit' });
-              this.route('destroy', { path: ':post_id/destroy' });
+              this.route('post', { path: ':post_id' }, function () {
+                this.route('edit');
+                this.route('destroy');
+              });
             });
           });
         });
@@ -76,151 +137,126 @@ Router.map(function () {
     });
   });
 
-  this.route('photo-albums', function () {
+  this.route('groups', function () {
     this.route('new');
 
-    this.route('photo-album', { path: ':photo_album_id' }, function () {
-      this.route('show', { path: '/' });
+    this.route('group', { path: ':id' }, function () {
       this.route('edit');
-      this.route('destroy');
 
-      this.route('photos', function () {
-        this.route('show', { path: '/:photo_id' });
-        this.route('destroy', { path: '/:photo_id/destroy' });
-      });
+      this.route('export');
     });
   });
 
-  this.route('photo-comments', function () {
-    this.route('destroy', { path: '/:id/destroy' });
-  });
-
-  this.route('users', function () {
-    this.route('members');
+  this.route('login');
 
+  this.route('mail-aliases', function () {
     this.route('new');
-    this.route('edit', { path: '/:id/edit' });
-    this.route('edit-permissions', { path: '/:id/edit/permissions' });
-    this.route('edit-privacy', { path: '/:id/edit/privacy' });
-    this.route('edit-security', { path: '/:id/edit/security' });
-    this.route('show', { path: '/:id' });
-    this.route('show-groups', { path: '/:id/groups' });
-    this.route('show-settings', { path: '/:id/settings' });
-    this.route('show-mail', { path: '/:id/mail' });
-    this.route('show-mandates', { path: '/:id/mandates' });
-    this.route('show-permissions', { path: '/:id/permissions' });
-    this.route('destroy', { path: '/:id/destroy' });
-
-    this.route('webdav');
 
-    this.route('forgot_password');
-    this.route('activate_account', { path: '/:id/activate_account' });
-    this.route('resend_activation', { path: '/:id/resend_activation' });
-
-    this.route('batch', function () {
-      this.route('new');
-      this.route('confirm');
+    this.route('mail-alias', { path: ':id' }, function () {
+      this.route('edit');
+      this.route('destroy');
     });
   });
 
-  this.route('articles', function () {
-    this.route('new');
-    this.route('edit', { path: '/:id/edit' });
-    this.route('show', { path: '/:id' });
-    this.route('destroy', { path: '/:id/destroy' });
-  });
+  this.route('mail-moderations', function () {
+    this.route('mail-moderation', { path: ':id' }, function () {
+      this.route('destroy');
 
-  this.route('article-comments', function () {
-    this.route('destroy', { path: '/:id/destroy' });
+      this.route('accept');
+      this.route('reject');
+    });
   });
 
-  this.route('polls', function () {
-    this.route('new');
-    this.route('edit', { path: '/:id/edit' });
-    this.route('show', { path: '/:id' });
-    this.route('destroy', { path: '/:id/destroy' });
+  this.route('oauth', function () {
+    this.route('authorize');
   });
 
-  this.route('mail-aliases', function () {
+  this.route('photo-albums', function () {
     this.route('new');
-    this.route('edit', { path: '/:id/edit' });
-    this.route('show', { path: '/:id' });
-    this.route('destroy', { path: '/:id/destroy' });
-  });
 
-  this.route('mail-moderations', function () {
-    this.route('show', { path: '/:id' });
-    this.route('destroy', { path: '/:id/destroy' });
-    this.route('accept', { path: '/:id/accept' });
-    this.route('reject', { path: '/:id/reject' });
-  });
+    this.route('photo-album', { path: ':photo_album_id' }, function () {
+      this.route('edit');
+      this.route('destroy');
 
-  this.route('activities', function () {
-    this.route('show', { path: '/:id' });
-    this.route('ical');
-    this.route('new');
-    this.route('edit', { path: '/:id/edit' });
-    this.route('destroy', { path: '/:id/destroy' });
-    this.route('generate-alias', { path: '/:id/generate-alias' });
-    this.route('print-enrolled', { path: '/:id/print-enrolled' });
+      this.route('photos', function () {
+        this.route('photo', { path: ':photo_id' }, function () {
+          this.route('destroy');
+        });
+      });
+    });
   });
 
-  this.route('debit', function () {
-    this.route('collections', function () {
-      this.route('show', { path: '/:id' });
-      this.route('sepa', { path: '/:id/sepa' });
-      this.route('new');
-      this.route('edit', { path: '/:id/edit' });
-      this.route('destroy', { path: '/:id/destroy' });
+  this.route('photo-comments', function () {
+    this.route('photo-comment', { path: ':id' }, function () {
+      this.route('destroy');
     });
+  });
 
-    this.route('transactions', function () {
-      this.route('edit', { path: '/:id/edit' });
-      this.route('destroy', { path: '/:id/destroy' });
-    });
+  this.route('polls', function () {
+    this.route('new');
 
-    this.route('mandates', function () {
-      this.route('show', { path: '/:id' });
-      this.route('new');
-      this.route('edit', { path: '/:id/edit' });
+    this.route('poll', { path: ':id' }, function () {
+      this.route('edit');
+      this.route('destroy');
     });
   });
 
-  this.route('form', function () {
-    this.route('responses', function () {
-      this.route('destroy', { path: '/:id/destroy' });
-    });
-  });
+  this.route('profile');
 
-  this.route('groups', function () {
-    this.route('show', { path: '/:id' });
-    this.route('export', { path: '/:id/export' });
-    this.route('new');
-    this.route('edit', { path: '/:id/edit' });
-  });
+  this.route('quickpost');
 
   this.route('sog', function () {
     this.route('name-trainer');
   });
 
-  this.route('404-page-not-found', { path: '/*path' });
+  this.route('sponsorkliks');
 
-  this.route('418-im-a-teapot', { path: '/coffee' });
+  this.route('static-pages', function () {
+    this.route('new');
 
-  this.route('sponsorkliks');
+    this.route('static-page', { path: ':id' }, function () {
+      this.route('edit');
+      this.route('destroy');
+    });
+  });
 
-  this.route('books', function () {
-    this.route('show', { path: '/:id' });
+  this.route('users', function () {
     this.route('new');
-    this.route('edit', { path: '/:id/edit' });
-    this.route('destroy', { path: '/:id/destroy' });
+
+    this.route('forgot-password');
+    this.route('members');
+    this.route('webdav');
+
+    this.route('user', { path: ':id' }, function () {
+      this.route('edit', function () {
+        this.route('permissions');
+        this.route('privacy');
+        this.route('security');
+      });
+      this.route('destroy');
+
+      this.route('groups');
+      this.route('mail');
+      this.route('mandates');
+      this.route('permissions');
+      this.route('settings');
+
+      this.route('activate-account');
+      this.route('resend-activation-code');
+    });
+
+    this.route('batch', function () {
+      this.route('new');
+    });
   });
 
   this.route('vacancies', function () {
-    this.route('show', { path: '/:id' });
     this.route('new');
-    this.route('edit', { path: '/:id/edit' });
-    this.route('destroy', { path: '/:id/destroy' });
+
+    this.route('vacancy', { path: ':id' }, function () {
+      this.route('edit');
+      this.route('destroy');
+    });
   });
 
   return true;
diff --git a/app/routes/activities.js b/app/routes/activities.js
new file mode 100644
index 000000000..7773b5065
--- /dev/null
+++ b/app/routes/activities.js
@@ -0,0 +1,7 @@
+import { ApplicationRoute } from 'amber-ui/routes/application/application';
+
+export default class ActivitiesRoute extends ApplicationRoute {
+  queryParams = {};
+
+  breadcrumb = { title: 'Activiteiten' };
+}
diff --git a/app/routes/activities/activity.js b/app/routes/activities/activity.js
new file mode 100644
index 000000000..f139973a7
--- /dev/null
+++ b/app/routes/activities/activity.js
@@ -0,0 +1,17 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class ActivityRoute extends AuthenticatedRoute {
+  queryParams = {};
+
+  get breadcrumb() {
+    return { title: this.controller?.model.title };
+  }
+
+  canAccess() {
+    return this.abilities.can('show activities');
+  }
+
+  model(params) {
+    return this.store.findRecord('activity', params.id, params);
+  }
+}
diff --git a/app/routes/activities/activity/destroy.js b/app/routes/activities/activity/destroy.js
new file mode 100644
index 000000000..58a80d61d
--- /dev/null
+++ b/app/routes/activities/activity/destroy.js
@@ -0,0 +1,9 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class ActivityDestroyRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Activiteit verwijderen' };
+
+  canAccess() {
+    return this.abilities.can('destroy activities');
+  }
+}
diff --git a/app/routes/activities/edit.js b/app/routes/activities/activity/edit.js
similarity index 58%
rename from app/routes/activities/edit.js
rename to app/routes/activities/activity/edit.js
index 1a8845f1e..70fecf079 100644
--- a/app/routes/activities/edit.js
+++ b/app/routes/activities/activity/edit.js
@@ -1,14 +1,14 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class EdityActivityRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Activiteit aanpassen' };
+export default class ActivityEditRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Activiteit aanpassen' };
 
   canAccess(model) {
     return this.abilities.can('edit activity', model);
   }
 
-  async model(params) {
-    const activity = await this.store.findRecord('activity', params.id, params);
+  async model() {
+    const activity = this.modelFor('activities.activity');
     await activity.form;
     return activity;
   }
diff --git a/app/routes/activities/activity/generate-alias.js b/app/routes/activities/activity/generate-alias.js
new file mode 100644
index 000000000..fb8068c4e
--- /dev/null
+++ b/app/routes/activities/activity/generate-alias.js
@@ -0,0 +1,15 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class ActivityGenerateAliasRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Creëer mail alias' };
+
+  canAccess(model) {
+    return this.abilities.can('generate alias for activity', model);
+  }
+
+  async model() {
+    const activity = this.modelFor('activities.activity');
+    await activity.form;
+    return activity;
+  }
+}
diff --git a/app/routes/activities/show.js b/app/routes/activities/activity/index.js
similarity index 79%
rename from app/routes/activities/show.js
rename to app/routes/activities/activity/index.js
index 611ecac2f..069cd4ec0 100644
--- a/app/routes/activities/show.js
+++ b/app/routes/activities/activity/index.js
@@ -1,9 +1,9 @@
-import { hash } from 'rsvp';
-import { inject as service } from '@ember/service';
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 import FormLoadOrCreateUtil from 'amber-ui/utils/form-load-or-create';
+import { hash } from 'rsvp';
+import { inject as service } from '@ember/service';
 
-export default class ShowActivityRoute extends AuthenticatedRoute {
+export default class ActivityIndexRoute extends AuthenticatedRoute {
   @service store;
 
   constructor() {
@@ -11,29 +11,25 @@ export default class ShowActivityRoute extends AuthenticatedRoute {
     this.formLoadOrCreateUtil = new FormLoadOrCreateUtil(this);
   }
 
-  get breadCrumb() {
-    return { title: this.controller.model.activity.title };
-  }
-
   get pageActions() {
     const { activity } = this.controller.model;
     return [
       {
-        link: 'activities.edit',
+        link: 'activities.activity.edit',
         title: 'Wijzigen',
         icon: 'pencil',
         linkArgument: activity,
         canAccess: this.abilities.can('edit activity', activity),
       },
       {
-        link: 'activities.destroy',
+        link: 'activities.activity.destroy',
         title: 'Verwijderen',
         icon: 'trash',
         linkArgument: activity,
         canAccess: this.abilities.can('destroy activities'),
       },
       {
-        link: 'activities.print-enrolled',
+        link: 'activities.activity.print-enrolled',
         title: 'Print ingeschrevenen',
         icon: 'print',
         linkArgument: activity,
@@ -43,7 +39,7 @@ export default class ShowActivityRoute extends AuthenticatedRoute {
         ),
       },
       {
-        link: 'activities.generate-alias',
+        link: 'activities.activity.generate-alias',
         title: 'Mail ingeschrevenen',
         icon: 'paper-plane',
         linkArgument: activity,
@@ -57,19 +53,15 @@ export default class ShowActivityRoute extends AuthenticatedRoute {
     return this.abilities.can('show activities');
   }
 
-  model(params) {
-    const activityPromise = this.store.findRecord(
-      'activity',
-      params.id,
-      params
-    );
+  model() {
+    const activity = this.modelFor('activities.activity');
     let formPromise, responsePromise;
 
     if (
       this.abilities.can('show form/forms') &&
       this.abilities.can('show form/responses')
     ) {
-      formPromise = activityPromise.then((activity) => activity.get('form'));
+      formPromise = activity.form;
       responsePromise = formPromise
         // Load or create the response
         .then((form) =>
@@ -86,7 +78,7 @@ export default class ShowActivityRoute extends AuthenticatedRoute {
     }
 
     return hash({
-      activity: activityPromise,
+      activity,
       form: formPromise,
       currentUserResponse: responsePromise,
     });
diff --git a/app/routes/activities/activity/print-enrolled.js b/app/routes/activities/activity/print-enrolled.js
new file mode 100644
index 000000000..15e554eb8
--- /dev/null
+++ b/app/routes/activities/activity/print-enrolled.js
@@ -0,0 +1,9 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class ActivityPrintEnrolledRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Print inschrijvingen/streeplijst' };
+
+  canAccess(model) {
+    return this.abilities.can('edit activity', model);
+  }
+}
diff --git a/app/routes/activities/destroy.js b/app/routes/activities/destroy.js
deleted file mode 100644
index 952f24c72..000000000
--- a/app/routes/activities/destroy.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
-
-export default class DestroyActivityRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Activiteit verwijderen' };
-
-  canAccess() {
-    return this.abilities.can('destroy activities');
-  }
-
-  model(params) {
-    return this.store.findRecord('activity', params.id, params);
-  }
-}
diff --git a/app/routes/activities/generate-alias.js b/app/routes/activities/generate-alias.js
deleted file mode 100644
index cb4ff2e1d..000000000
--- a/app/routes/activities/generate-alias.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
-
-export default class GenerateAliasRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Creëer mailalias' };
-
-  canAccess(model) {
-    return this.abilities.can('generate alias for activity', model);
-  }
-
-  model(params) {
-    return this.store
-      .findRecord('activity', params.id, params)
-      .then((activity) => activity.get('form').then(() => activity));
-  }
-}
diff --git a/app/routes/activities/ical.js b/app/routes/activities/ical.js
index 87aeea0ec..57130242f 100644
--- a/app/routes/activities/ical.js
+++ b/app/routes/activities/ical.js
@@ -1,7 +1,7 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class IcalRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Agenda Ical' };
+export default class ActivitiesIcalRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Agenda iCal' };
 
   canAccess() {
     return this.abilities.can('show ical activities');
diff --git a/app/routes/activities/index.js b/app/routes/activities/index.js
index 664764953..b53ca97d7 100644
--- a/app/routes/activities/index.js
+++ b/app/routes/activities/index.js
@@ -1,8 +1,6 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class ActivityIndexRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Activiteiten' };
-
+export default class ActivitiesIndexRoute extends AuthenticatedRoute {
   queryParams = {
     search: {
       refreshModel: true,
@@ -28,7 +26,7 @@ export default class ActivityIndexRoute extends AuthenticatedRoute {
       },
       {
         link: 'activities.ical',
-        title: 'Ical link',
+        title: 'iCal link',
         icon: 'calendar-days',
         canAccess: this.abilities.can('show ical activities'),
       },
diff --git a/app/routes/activities/new.js b/app/routes/activities/new.js
index 29220c9c8..516f5a6f2 100644
--- a/app/routes/activities/new.js
+++ b/app/routes/activities/new.js
@@ -1,7 +1,7 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
 export default class NewActivityRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Activiteit aanmaken' };
+  breadcrumb = { title: 'Activiteit aanmaken' };
 
   canAccess() {
     return this.abilities.can('create activities');
diff --git a/app/routes/activities/print-enrolled.js b/app/routes/activities/print-enrolled.js
deleted file mode 100644
index 9b971600e..000000000
--- a/app/routes/activities/print-enrolled.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
-
-export default class PrintEnrolledRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Print inschrijvingen/streeplijst' };
-
-  canAccess(model) {
-    return this.abilities.can('edit activity', model);
-  }
-
-  model(params) {
-    return this.store.findRecord('activity', params.id, params);
-  }
-}
diff --git a/app/routes/application.js b/app/routes/application.js
index adc835d18..08c5d99cf 100644
--- a/app/routes/application.js
+++ b/app/routes/application.js
@@ -2,9 +2,9 @@ import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 
 export default class AppRoute extends Route {
-  @service session;
   @service intl;
   @service moment;
+  @service session;
 
   async beforeModel() {
     await this.session.setup();
diff --git a/app/routes/application/application.js b/app/routes/application/application.js
index 7ab64e637..b998a6406 100644
--- a/app/routes/application/application.js
+++ b/app/routes/application/application.js
@@ -25,6 +25,12 @@ export class ApplicationRoute extends Route {
     controller.pageActions = this.pageActions;
     controller.tabItems = this.tabItems;
   }
+
+  buildRouteInfoMetadata() {
+    return {
+      breadcrumb: this.breadcrumb,
+    };
+  }
 }
 
 export class AuthenticatedRoute extends ApplicationRoute {
diff --git a/app/routes/article-comments.js b/app/routes/article-comments.js
new file mode 100644
index 000000000..7b478e573
--- /dev/null
+++ b/app/routes/article-comments.js
@@ -0,0 +1,7 @@
+import { ApplicationRoute } from 'amber-ui/routes/application/application';
+
+export default class ArticleCommentsRoute extends ApplicationRoute {
+  queryParams = {};
+
+  breadcrumb = { title: 'Artikel reacties' };
+}
diff --git a/app/routes/article-comments/article-comment.js b/app/routes/article-comments/article-comment.js
new file mode 100644
index 000000000..e31988f32
--- /dev/null
+++ b/app/routes/article-comments/article-comment.js
@@ -0,0 +1,13 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class ArticleCommentRoute extends AuthenticatedRoute {
+  queryParams = {};
+
+  canAccess() {
+    return this.abilities.can('show article-comments');
+  }
+
+  model(params) {
+    return this.store.findRecord('article-comment', params.id, params);
+  }
+}
diff --git a/app/routes/article-comments/article-comment/destroy.js b/app/routes/article-comments/article-comment/destroy.js
new file mode 100644
index 000000000..8a22b2a2b
--- /dev/null
+++ b/app/routes/article-comments/article-comment/destroy.js
@@ -0,0 +1,15 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class ArticleCommentDestroyRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Artikel reactie verwijderen' };
+
+  canAccess() {
+    return this.abilities.can('destroy article-comments');
+  }
+
+  async model() {
+    const articleComment = this.modelFor('article-comments.article-comment');
+    await articleComment.article;
+    return articleComment;
+  }
+}
diff --git a/app/routes/article-comments/destroy.js b/app/routes/article-comments/destroy.js
deleted file mode 100644
index 858e095ab..000000000
--- a/app/routes/article-comments/destroy.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
-
-export default class DestroyArticleCommentRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Artikel comment verwijderen' };
-
-  canAccess() {
-    return this.abilities.can('destroy article-comments');
-  }
-
-  async model(params) {
-    const articleComment = this.store.findRecord(
-      'article-comment',
-      params.id,
-      params
-    );
-    await articleComment.article;
-    return articleComment;
-  }
-}
diff --git a/app/routes/articles.js b/app/routes/articles.js
new file mode 100644
index 000000000..5c22bc0a1
--- /dev/null
+++ b/app/routes/articles.js
@@ -0,0 +1,15 @@
+import { ApplicationRoute } from 'amber-ui/routes/application/application';
+import { capitalize } from '@ember/string';
+import { inject as service } from '@ember/service';
+
+export default class ArticlesRoute extends ApplicationRoute {
+  @service intl;
+
+  queryParams = {};
+
+  get breadcrumb() {
+    return {
+      title: capitalize(this.intl.t('model.article.name.other').toString()),
+    };
+  }
+}
diff --git a/app/routes/articles/article.js b/app/routes/articles/article.js
new file mode 100644
index 000000000..b7e6a427b
--- /dev/null
+++ b/app/routes/articles/article.js
@@ -0,0 +1,13 @@
+import { ApplicationRoute } from 'amber-ui/routes/application/application';
+
+export default class ArticleRoute extends ApplicationRoute {
+  queryParams = {};
+
+  get breadcrumb() {
+    return { title: this.controller?.model.title };
+  }
+
+  model(params) {
+    return this.store.findRecord('article', params.id, params);
+  }
+}
diff --git a/app/routes/articles/article/destroy.js b/app/routes/articles/article/destroy.js
new file mode 100644
index 000000000..31d655e64
--- /dev/null
+++ b/app/routes/articles/article/destroy.js
@@ -0,0 +1,9 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class ArticleDestroyRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Artikel verwijderen' };
+
+  canAccess() {
+    return this.abilities.can('destroy articles');
+  }
+}
diff --git a/app/routes/articles/edit.js b/app/routes/articles/article/edit.js
similarity index 56%
rename from app/routes/articles/edit.js
rename to app/routes/articles/article/edit.js
index 08c9970a4..b1b05d823 100644
--- a/app/routes/articles/edit.js
+++ b/app/routes/articles/article/edit.js
@@ -1,16 +1,12 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class EditArticleRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Activiteit aanpassen' };
+export default class ArticleEditRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Artikel aanpassen' };
 
   canAccess(model) {
     return this.abilities.can('edit article', model);
   }
 
-  model(params) {
-    return this.store.findRecord('article', params.id, params);
-  }
-
   deactivate() {
     super.deactivate();
     this.controller.model?.rollbackAttributes();
diff --git a/app/routes/articles/show.js b/app/routes/articles/article/index.js
similarity index 58%
rename from app/routes/articles/show.js
rename to app/routes/articles/article/index.js
index 91b8ad564..17c1867b0 100644
--- a/app/routes/articles/show.js
+++ b/app/routes/articles/article/index.js
@@ -1,22 +1,18 @@
 import { ApplicationRoute } from 'amber-ui/routes/application/application';
 
-export default class ShowArticleRoute extends ApplicationRoute {
-  get breadCrumb() {
-    return { title: this.controller.model.title };
-  }
-
+export default class ArticleIndexRoute extends ApplicationRoute {
   get pageActions() {
     const article = this.controller.model;
     return [
       {
-        link: 'articles.edit',
+        link: 'articles.article.edit',
         title: 'Wijzigen',
         icon: 'pencil',
         linkArgument: article,
         canAccess: this.abilities.can('edit article', article),
       },
       {
-        link: 'articles.destroy',
+        link: 'articles.article.destroy',
         title: 'Verwijderen',
         icon: 'trash',
         linkArgument: this.controller.model,
@@ -24,12 +20,4 @@ export default class ShowArticleRoute extends ApplicationRoute {
       },
     ];
   }
-
-  canAccess() {
-    return this.abilities.can('show articles');
-  }
-
-  model(params) {
-    return this.store.findRecord('article', params.id, params);
-  }
 }
diff --git a/app/routes/articles/destroy.js b/app/routes/articles/destroy.js
deleted file mode 100644
index 95193a0e8..000000000
--- a/app/routes/articles/destroy.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
-
-export default class DestroyArticleRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Artikel verwijderen' };
-
-  canAccess() {
-    return this.abilities.can('destroy articles');
-  }
-
-  model(params) {
-    return this.store.findRecord('article', params.id, params);
-  }
-}
diff --git a/app/routes/articles/index.js b/app/routes/articles/index.js
index baa92ee31..85e06a420 100644
--- a/app/routes/articles/index.js
+++ b/app/routes/articles/index.js
@@ -1,16 +1,6 @@
 import { ApplicationRoute } from 'amber-ui/routes/application/application';
-import { capitalize } from '@ember/string';
-import { inject as service } from '@ember/service';
 
 export default class ArticlesIndexRoute extends ApplicationRoute {
-  @service intl;
-
-  get breadCrumb() {
-    return {
-      title: capitalize(this.intl.t('model.article.name.other').toString()),
-    };
-  }
-
   get pageActions() {
     return [
       {
@@ -22,10 +12,6 @@ export default class ArticlesIndexRoute extends ApplicationRoute {
     ];
   }
 
-  canAccess() {
-    return this.abilities.can('show articles');
-  }
-
   model(params) {
     params.sort = `-pinned,${params.sort}`;
     return this.store.queryPaged('article', params);
diff --git a/app/routes/articles/new.js b/app/routes/articles/new.js
index f676c1397..ea43d7cf2 100644
--- a/app/routes/articles/new.js
+++ b/app/routes/articles/new.js
@@ -1,7 +1,7 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class NewArticleRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Artikel aanmaken' };
+export default class ArticlesNewRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Artikel aanmaken' };
 
   canAccess() {
     return this.abilities.can('create articles');
diff --git a/app/routes/books.js b/app/routes/books.js
new file mode 100644
index 000000000..3c248ede0
--- /dev/null
+++ b/app/routes/books.js
@@ -0,0 +1,7 @@
+import { ApplicationRoute } from 'amber-ui/routes/application/application';
+
+export default class BooksRoute extends ApplicationRoute {
+  queryParams = {};
+
+  breadcrumb = { title: 'Boeken' };
+}
diff --git a/app/routes/books/book.js b/app/routes/books/book.js
new file mode 100644
index 000000000..4dade7952
--- /dev/null
+++ b/app/routes/books/book.js
@@ -0,0 +1,17 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class BookRoute extends AuthenticatedRoute {
+  queryParams = {};
+
+  get breadcrumb() {
+    return { title: this.controller?.model.title };
+  }
+
+  canAccess() {
+    return this.abilities.can('show books');
+  }
+
+  model(params) {
+    return this.store.findRecord('book', params.id, params);
+  }
+}
diff --git a/app/routes/books/book/destroy.js b/app/routes/books/book/destroy.js
new file mode 100644
index 000000000..2445cccfa
--- /dev/null
+++ b/app/routes/books/book/destroy.js
@@ -0,0 +1,9 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class BookDestroyRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Boek verwijderen' };
+
+  canAccess() {
+    return this.abilities.can('destroy books');
+  }
+}
diff --git a/app/routes/books/edit.js b/app/routes/books/book/edit.js
similarity index 56%
rename from app/routes/books/edit.js
rename to app/routes/books/book/edit.js
index 8d5826ddb..a21ea14dc 100644
--- a/app/routes/books/edit.js
+++ b/app/routes/books/book/edit.js
@@ -1,16 +1,12 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class EditBookRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Boek aanpassen' };
+export default class BookEditRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Boek aanpassen' };
 
   canAccess(model) {
     return this.abilities.can('edit book', model);
   }
 
-  model(params) {
-    return this.store.findRecord('book', params.id, params);
-  }
-
   deactivate() {
     super.deactivate();
     this.controller.model?.rollbackAttributes();
diff --git a/app/routes/books/show.js b/app/routes/books/book/index.js
similarity index 73%
rename from app/routes/books/show.js
rename to app/routes/books/book/index.js
index a65235ddb..d4a876024 100644
--- a/app/routes/books/show.js
+++ b/app/routes/books/book/index.js
@@ -2,7 +2,7 @@ import { inject as service } from '@ember/service';
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 import FormLoadOrCreateUtil from 'amber-ui/utils/form-load-or-create';
 
-export default class ShowBookRoute extends AuthenticatedRoute {
+export default class BookIndexRoute extends AuthenticatedRoute {
   @service store;
 
   constructor() {
@@ -10,22 +10,18 @@ export default class ShowBookRoute extends AuthenticatedRoute {
     this.formLoadOrCreateUtil = new FormLoadOrCreateUtil(this);
   }
 
-  get breadCrumb() {
-    return { title: this.controller.model.title };
-  }
-
   get pageActions() {
     const book = this.controller.model;
     return [
       {
-        link: 'books.edit',
+        link: 'books.book.edit',
         title: 'Wijzigen',
         icon: 'pencil',
         linkArgument: book,
         canAccess: this.abilities.can('edit book', book),
       },
       {
-        link: 'books.destroy',
+        link: 'books.book.destroy',
         title: 'Verwijderen',
         icon: 'trash',
         linkArgument: book,
@@ -37,8 +33,4 @@ export default class ShowBookRoute extends AuthenticatedRoute {
   canAccess() {
     return this.abilities.can('show books');
   }
-
-  model(params) {
-    return this.store.findRecord('book', params.id, params);
-  }
 }
diff --git a/app/routes/books/destroy.js b/app/routes/books/destroy.js
deleted file mode 100644
index 5afe9cf41..000000000
--- a/app/routes/books/destroy.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
-
-export default class DestroyBookRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Boek verwijderen' };
-
-  canAccess() {
-    return this.abilities.can('destroy books');
-  }
-
-  model(params) {
-    return this.store.findRecord('book', params.id, params);
-  }
-}
diff --git a/app/routes/books/index.js b/app/routes/books/index.js
index c8e0f6c87..3a494645b 100644
--- a/app/routes/books/index.js
+++ b/app/routes/books/index.js
@@ -1,8 +1,6 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class IndexBookRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Boeken' };
-
+export default class BooksIndexRoute extends AuthenticatedRoute {
   queryParams = {
     search: {
       refreshModel: true,
diff --git a/app/routes/books/new.js b/app/routes/books/new.js
index ef44c4bde..cc2b779ba 100644
--- a/app/routes/books/new.js
+++ b/app/routes/books/new.js
@@ -1,7 +1,7 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class NewBookRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Boek aanmaken' };
+export default class BooksNewRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Boek aanmaken' };
 
   canAccess() {
     return this.abilities.can('create books');
diff --git a/app/routes/debit.js b/app/routes/debit.js
deleted file mode 100644
index ba811f73d..000000000
--- a/app/routes/debit.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class DebitRoute extends Route {
-  breadCrumb = null;
-}
diff --git a/app/routes/debit/collections.js b/app/routes/debit/collections.js
new file mode 100644
index 000000000..b34645c7c
--- /dev/null
+++ b/app/routes/debit/collections.js
@@ -0,0 +1,7 @@
+import { ApplicationRoute } from 'amber-ui/routes/application/application';
+
+export default class CollectionsRoute extends ApplicationRoute {
+  queryParams = {};
+
+  breadcrumb = { title: "Incasso's" };
+}
diff --git a/app/routes/debit/collections/collection.js b/app/routes/debit/collections/collection.js
new file mode 100644
index 000000000..b373b1da8
--- /dev/null
+++ b/app/routes/debit/collections/collection.js
@@ -0,0 +1,17 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class CollectionRoute extends AuthenticatedRoute {
+  queryParams = {};
+
+  get breadcrumb() {
+    return { title: this.controller?.model.name };
+  }
+
+  canAccess() {
+    return this.abilities.can('show debit/collections');
+  }
+
+  model(params) {
+    return this.store.findRecord('debit/collection', params.id, params);
+  }
+}
diff --git a/app/routes/debit/collections/collection/destroy.js b/app/routes/debit/collections/collection/destroy.js
new file mode 100644
index 000000000..be42fe94a
--- /dev/null
+++ b/app/routes/debit/collections/collection/destroy.js
@@ -0,0 +1,9 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class CollectionDestroyRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Incasso verwijderen' };
+
+  canAccess() {
+    return this.abilities.can('destroy debit/collections');
+  }
+}
diff --git a/app/routes/debit/collections/edit.js b/app/routes/debit/collections/collection/edit.js
similarity index 55%
rename from app/routes/debit/collections/edit.js
rename to app/routes/debit/collections/collection/edit.js
index 533d4f079..f17e63e01 100644
--- a/app/routes/debit/collections/edit.js
+++ b/app/routes/debit/collections/collection/edit.js
@@ -1,16 +1,12 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class EditCollectionRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Incasso aanpassen' };
+export default class CollectionEditRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Incasso aanpassen' };
 
   canAccess() {
     return this.abilities.can('edit debit/collections');
   }
 
-  model(params) {
-    return this.store.findRecord('debit/collection', params.id, params);
-  }
-
   deactivate() {
     super.deactivate();
     this.controller.model?.rollbackAttributes();
diff --git a/app/routes/debit/collections/show.js b/app/routes/debit/collections/collection/index.js
similarity index 70%
rename from app/routes/debit/collections/show.js
rename to app/routes/debit/collections/collection/index.js
index 806efce3b..fcf368a8b 100644
--- a/app/routes/debit/collections/show.js
+++ b/app/routes/debit/collections/collection/index.js
@@ -1,29 +1,25 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class CollectionsIndexRoute extends AuthenticatedRoute {
-  get breadCrumb() {
-    return { title: this.controller.model.name };
-  }
-
+export default class CollectionIndexRoute extends AuthenticatedRoute {
   get pageActions() {
     const collection = this.controller.model;
     return [
       {
-        link: 'debit.collections.edit',
+        link: 'debit.collections.collection.edit',
         title: 'Wijzigen',
         icon: 'pencil',
         linkArgument: collection,
         canAccess: this.abilities.can('edit debit/collections'),
       },
       {
-        link: 'debit.collections.destroy',
+        link: 'debit.collections.collection.destroy',
         title: 'Verwijderen',
         icon: 'trash',
         linkArgument: collection,
         canAccess: this.abilities.can('destroy debit/collections'),
       },
       {
-        link: 'debit.collections.sepa',
+        link: 'debit.collections.collection.sepa',
         title: 'SEPA bestand downloaden',
         icon: 'download',
         linkArgument: collection.id,
@@ -36,11 +32,8 @@ export default class CollectionsIndexRoute extends AuthenticatedRoute {
     return this.abilities.can('show debit/collections');
   }
 
-  async model(params) {
-    const collection = await this.store.findRecord(
-      'debit/collection',
-      params.id
-    );
+  async model() {
+    const collection = this.modelFor('debit.collections.collection');
     await collection.transactions;
     // todo: simplify this to just returning collection, because transactions can be gotten from the collection, right?
     return collection;
diff --git a/app/routes/debit/collections/sepa.js b/app/routes/debit/collections/collection/sepa.js
similarity index 66%
rename from app/routes/debit/collections/sepa.js
rename to app/routes/debit/collections/collection/sepa.js
index bec3b7d58..f9a0f45a0 100644
--- a/app/routes/debit/collections/sepa.js
+++ b/app/routes/debit/collections/collection/sepa.js
@@ -1,32 +1,32 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
-import { inject as service } from '@ember/service';
 import { isInvalidResponse } from 'ember-fetch/errors';
+import { inject as service } from '@ember/service';
 
-export default class SepaRoute extends AuthenticatedRoute {
+export default class CollectionSepaRoute extends AuthenticatedRoute {
   @service fetch;
-  @service('file-saver') fileSaver;
+  @service fileSaver;
 
-  breadCrumb = { title: 'Sepa downloaden' };
+  breadcrumb = { title: 'SEPA downloaden' };
 
   canAccess() {
     return this.abilities.can('download sepa debit/collections');
   }
 
-  async model(params) {
-    const model = await this.store.findRecord('debit/collection', params.id);
+  async model() {
+    const model = this.modelFor('debit.collections.collection');
     const response = await this.fetch.fetch(
       `/debit/collections/${model.id}/sepa`,
       { dataType: 'text' }
     );
 
     if (response.ok) {
-      let blob = await response.blob();
+      const blob = await response.blob();
       this.fileSaver.saveFileAs(
         `${model.get('name')}.xml`,
         blob,
         'application/xml'
       );
-      return this.transitionTo('debit.collections.show', model.id);
+      return this.transitionTo('debit.collections.collection', model.id);
     } else if (isInvalidResponse(response)) {
       const json = await response.json();
       return json.errors;
diff --git a/app/routes/debit/collections/destroy.js b/app/routes/debit/collections/destroy.js
deleted file mode 100644
index b769e1d0f..000000000
--- a/app/routes/debit/collections/destroy.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
-
-export default class DestroyCollectionsRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Incasso aanpassen' };
-
-  canAccess() {
-    return this.abilities.can('destroy debit/collections');
-  }
-
-  model(params) {
-    return this.store.findRecord('debit/collection', params.id, params);
-  }
-}
diff --git a/app/routes/debit/collections/index.js b/app/routes/debit/collections/index.js
index dc619cb69..650ed28ad 100644
--- a/app/routes/debit/collections/index.js
+++ b/app/routes/debit/collections/index.js
@@ -1,8 +1,6 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
 export default class CollectionsIndexRoute extends AuthenticatedRoute {
-  breadCrumb = { title: "Incasso's" };
-
   get pageActions() {
     return [
       {
diff --git a/app/routes/debit/collections/new.js b/app/routes/debit/collections/new.js
index 03461dcdf..d1f4eac10 100644
--- a/app/routes/debit/collections/new.js
+++ b/app/routes/debit/collections/new.js
@@ -1,7 +1,7 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class NewCollectionRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Incasso aanmaken' };
+export default class CollectionsNewRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Incasso aanmaken' };
 
   canAccess() {
     return this.abilities.can('create debit/collections');
diff --git a/app/routes/debit/mandates.js b/app/routes/debit/mandates.js
new file mode 100644
index 000000000..11aab8217
--- /dev/null
+++ b/app/routes/debit/mandates.js
@@ -0,0 +1,7 @@
+import { ApplicationRoute } from 'amber-ui/routes/application/application';
+
+export default class MandatesRoute extends ApplicationRoute {
+  queryParams = {};
+
+  breadcrumb = { title: 'Incasso mandaten' };
+}
diff --git a/app/routes/debit/mandates/index.js b/app/routes/debit/mandates/index.js
index 43cbc2b86..5cff4ff11 100644
--- a/app/routes/debit/mandates/index.js
+++ b/app/routes/debit/mandates/index.js
@@ -1,8 +1,6 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class MandatesRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Incasso mandaten' };
-
+export default class MandatesIndexRoute extends AuthenticatedRoute {
   get pageActions() {
     return [
       {
diff --git a/app/routes/debit/mandates/mandate.js b/app/routes/debit/mandates/mandate.js
new file mode 100644
index 000000000..e1265e18a
--- /dev/null
+++ b/app/routes/debit/mandates/mandate.js
@@ -0,0 +1,17 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class MandateRoute extends AuthenticatedRoute {
+  queryParams = {};
+
+  get breadcrumb() {
+    return { title: this.controller?.model.id };
+  }
+
+  canAccess() {
+    return this.abilities.can('show debit/mandates');
+  }
+
+  model(params) {
+    return this.store.findRecord('debit/mandate', params.id, params);
+  }
+}
diff --git a/app/routes/debit/mandates/edit.js b/app/routes/debit/mandates/mandate/edit.js
similarity index 55%
rename from app/routes/debit/mandates/edit.js
rename to app/routes/debit/mandates/mandate/edit.js
index 6462f1067..e1e08bb76 100644
--- a/app/routes/debit/mandates/edit.js
+++ b/app/routes/debit/mandates/mandate/edit.js
@@ -1,16 +1,12 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class EditMandateRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Mandaat aanpassen' };
+export default class MandateEditRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Mandaat aanpassen' };
 
   canAccess() {
     return this.abilities.can('edit debit/mandates');
   }
 
-  model(params) {
-    return this.store.findRecord('debit/mandate', params.id, params);
-  }
-
   deactivate() {
     super.deactivate();
     this.controller.model?.rollbackAttributes();
diff --git a/app/routes/debit/mandates/show.js b/app/routes/debit/mandates/mandate/index.js
similarity index 57%
rename from app/routes/debit/mandates/show.js
rename to app/routes/debit/mandates/mandate/index.js
index 3c8119f4c..e537e1591 100644
--- a/app/routes/debit/mandates/show.js
+++ b/app/routes/debit/mandates/mandate/index.js
@@ -1,14 +1,10 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class CollectionsIndexRoute extends AuthenticatedRoute {
-  get breadCrumb() {
-    return { title: this.controller.model.id };
-  }
-
+export default class MandateIndexRoute extends AuthenticatedRoute {
   get pageActions() {
     return [
       {
-        link: 'debit.mandates.edit',
+        link: 'debit.mandates.mandate.edit',
         title: 'Wijzigen',
         icon: 'pencil',
         linkArgument: this.controller.model,
@@ -20,8 +16,4 @@ export default class CollectionsIndexRoute extends AuthenticatedRoute {
   canAccess() {
     return this.abilities.can('show debit/mandates');
   }
-
-  model(params) {
-    return this.store.findRecord('debit/mandate', params.id, params);
-  }
 }
diff --git a/app/routes/debit/mandates/new.js b/app/routes/debit/mandates/new.js
index 84332ec49..fc9d99c34 100644
--- a/app/routes/debit/mandates/new.js
+++ b/app/routes/debit/mandates/new.js
@@ -1,7 +1,7 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class NewMandateRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Mandaat aanmaken' };
+export default class MandatesNewRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Mandaat aanmaken' };
 
   canAccess() {
     return this.abilities.can('create debit/mandates');
diff --git a/app/routes/debit/transactions.js b/app/routes/debit/transactions.js
new file mode 100644
index 000000000..78ca2bfdb
--- /dev/null
+++ b/app/routes/debit/transactions.js
@@ -0,0 +1,7 @@
+import { ApplicationRoute } from 'amber-ui/routes/application/application';
+
+export default class TransactionsRoute extends ApplicationRoute {
+  queryParams = {};
+
+  breadcrumb = { title: 'Transacties' };
+}
diff --git a/app/routes/debit/transactions/destroy.js b/app/routes/debit/transactions/transaction.js
similarity index 51%
rename from app/routes/debit/transactions/destroy.js
rename to app/routes/debit/transactions/transaction.js
index 14e7a3a58..ed0577ac5 100644
--- a/app/routes/debit/transactions/destroy.js
+++ b/app/routes/debit/transactions/transaction.js
@@ -1,10 +1,10 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class DestroyTransactionRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Transactie verwijderen' };
+export default class TransactionRoute extends AuthenticatedRoute {
+  queryParams = {};
 
   canAccess() {
-    return this.abilities.can('destroy debit/transactions');
+    return this.abilities.can('show debit/transactions');
   }
 
   model(params) {
diff --git a/app/routes/debit/transactions/transaction/destroy.js b/app/routes/debit/transactions/transaction/destroy.js
new file mode 100644
index 000000000..62f0f6798
--- /dev/null
+++ b/app/routes/debit/transactions/transaction/destroy.js
@@ -0,0 +1,9 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class TransactionDestroyRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Transactie verwijderen' };
+
+  canAccess() {
+    return this.abilities.can('destroy debit/transactions');
+  }
+}
diff --git a/app/routes/debit/transactions/edit.js b/app/routes/debit/transactions/transaction/edit.js
similarity index 55%
rename from app/routes/debit/transactions/edit.js
rename to app/routes/debit/transactions/transaction/edit.js
index 311688dc6..86d0c6334 100644
--- a/app/routes/debit/transactions/edit.js
+++ b/app/routes/debit/transactions/transaction/edit.js
@@ -1,16 +1,12 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class EditTransactionRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Transactie aanpassen' };
+export default class TransactionEditRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Transactie aanpassen' };
 
   canAccess() {
     return this.abilities.can('edit debit/transactions');
   }
 
-  model(params) {
-    return this.store.findRecord('debit/transaction', params.id, params);
-  }
-
   deactivate() {
     super.deactivate();
     this.controller.model?.rollbackAttributes();
diff --git a/app/routes/form.js b/app/routes/form.js
deleted file mode 100644
index 57f1cd412..000000000
--- a/app/routes/form.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class FormRoute extends Route {
-  breadCrumb = null;
-}
diff --git a/app/routes/form/responses.js b/app/routes/form/responses.js
deleted file mode 100644
index fce25c16a..000000000
--- a/app/routes/form/responses.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class FormResponseRoute extends Route {
-  breadCrumb = null;
-}
diff --git a/app/routes/form/responses/destroy.js b/app/routes/form/responses/destroy.js
deleted file mode 100644
index b7580c6be..000000000
--- a/app/routes/form/responses/destroy.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
-
-export default class DestroyFormResponseRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Formulierantwoord verwijderen' };
-
-  canAccess(model) {
-    return this.abilities.can('destroy form/response', model);
-  }
-
-  model(params) {
-    return this.store.findRecord('form/response', params.id, params);
-  }
-}
diff --git a/app/routes/form/responses/response.js b/app/routes/form/responses/response.js
new file mode 100644
index 000000000..87208b4a7
--- /dev/null
+++ b/app/routes/form/responses/response.js
@@ -0,0 +1,13 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class ResponseRoute extends AuthenticatedRoute {
+  queryParams = {};
+
+  canAccess() {
+    return this.abilities.can('show form/responses');
+  }
+
+  model(params) {
+    return this.store.findRecord('form/response', params.id, params);
+  }
+}
diff --git a/app/routes/form/responses/response/destroy.js b/app/routes/form/responses/response/destroy.js
new file mode 100644
index 000000000..fd162754b
--- /dev/null
+++ b/app/routes/form/responses/response/destroy.js
@@ -0,0 +1,9 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class ResponseDestroyRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Formulierantwoord verwijderen' };
+
+  canAccess(model) {
+    return this.abilities.can('destroy form/responses', model);
+  }
+}
diff --git a/app/routes/forum.js b/app/routes/forum.js
new file mode 100644
index 000000000..5e68c11dd
--- /dev/null
+++ b/app/routes/forum.js
@@ -0,0 +1,7 @@
+import { ApplicationRoute } from 'amber-ui/routes/application/application';
+
+export default class ForumRoute extends ApplicationRoute {
+  queryParams = {};
+
+  breadcrumb = { title: 'Forum' };
+}
diff --git a/app/routes/forum/categories.js b/app/routes/forum/categories.js
deleted file mode 100644
index aadd45ccb..000000000
--- a/app/routes/forum/categories.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class CategoriesRoute extends Route {
-  breadCrumb = null;
-}
diff --git a/app/routes/forum/categories/category.js b/app/routes/forum/categories/category.js
index 2105bc875..6dc2c7d29 100644
--- a/app/routes/forum/categories/category.js
+++ b/app/routes/forum/categories/category.js
@@ -3,8 +3,8 @@ import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 export default class CategoryRoute extends AuthenticatedRoute {
   queryParams = {};
 
-  get breadCrumb() {
-    return { title: this.controller.model.name };
+  get breadcrumb() {
+    return { title: this.controller?.model.name };
   }
 
   canAccess() {
diff --git a/app/routes/forum/categories/category/destroy.js b/app/routes/forum/categories/category/destroy.js
index 0b54302ae..25733be26 100644
--- a/app/routes/forum/categories/category/destroy.js
+++ b/app/routes/forum/categories/category/destroy.js
@@ -1,16 +1,12 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class DestroyCategoryRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Categorie verwijderen' };
+export default class CategoryDestroyRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Categorie verwijderen' };
 
   canAccess() {
     return this.abilities.can('destroy forum/categories');
   }
 
-  model() {
-    return this.modelFor('forum.categories.category');
-  }
-
   deactivate() {
     super.deactivate();
     this.controller.model?.rollbackAttributes();
diff --git a/app/routes/forum/categories/category/edit.js b/app/routes/forum/categories/category/edit.js
index 83cac32bb..792a0a0c0 100644
--- a/app/routes/forum/categories/category/edit.js
+++ b/app/routes/forum/categories/category/edit.js
@@ -1,16 +1,12 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class EditCategoryRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Categorie aanpassen' };
+export default class CategoryEditRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Categorie aanpassen' };
 
   canAccess() {
     return this.abilities.can('edit forum/categories');
   }
 
-  model() {
-    return this.modelFor('forum.categories.category');
-  }
-
   deactivate() {
     super.deactivate();
     this.controller.model?.rollbackAttributes();
diff --git a/app/routes/forum/categories/category/index.js b/app/routes/forum/categories/category/index.js
new file mode 100644
index 000000000..d1bbbb0fb
--- /dev/null
+++ b/app/routes/forum/categories/category/index.js
@@ -0,0 +1,7 @@
+import { ApplicationRoute } from 'amber-ui/routes/application/application';
+
+export default class CategoryIndexRoute extends ApplicationRoute {
+  beforeModel() {
+    this.transitionTo('forum.categories.category.threads');
+  }
+}
diff --git a/app/routes/forum/categories/category/show.js b/app/routes/forum/categories/category/show.js
deleted file mode 100644
index 520916dce..000000000
--- a/app/routes/forum/categories/category/show.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
-
-export default class ShowCategoryRoute extends AuthenticatedRoute {
-  beforeModel() {
-    this.transitionTo('forum.categories.category.threads');
-  }
-}
diff --git a/app/routes/forum/categories/category/threads.js b/app/routes/forum/categories/category/threads.js
deleted file mode 100644
index 96ab0ce36..000000000
--- a/app/routes/forum/categories/category/threads.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class ThreadsRoute extends Route {
-  breadCrumb = null;
-}
diff --git a/app/routes/forum/categories/category/threads/index.js b/app/routes/forum/categories/category/threads/index.js
index ef53fc107..771b31454 100644
--- a/app/routes/forum/categories/category/threads/index.js
+++ b/app/routes/forum/categories/category/threads/index.js
@@ -1,8 +1,8 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 import { assign } from '@ember/polyfills';
 
-export default class ThreadIndexRoute extends AuthenticatedRoute {
-  get breadCrumb() {
+export default class ThreadsIndexRoute extends AuthenticatedRoute {
+  get breadcrumb() {
     return { title: this.controller.model.name };
   }
 
diff --git a/app/routes/forum/categories/category/threads/new.js b/app/routes/forum/categories/category/threads/new.js
index 4ddd41ac6..39f10eb7e 100644
--- a/app/routes/forum/categories/category/threads/new.js
+++ b/app/routes/forum/categories/category/threads/new.js
@@ -1,7 +1,7 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class NewTopicRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Topic aanmaken' };
+export default class ThreadsNewRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Topic aanmaken' };
 
   canAccess() {
     return this.abilities.can('create forum/thread');
diff --git a/app/routes/forum/categories/category/threads/thread.js b/app/routes/forum/categories/category/threads/thread.js
index a93f01537..09ac4c618 100644
--- a/app/routes/forum/categories/category/threads/thread.js
+++ b/app/routes/forum/categories/category/threads/thread.js
@@ -3,8 +3,8 @@ import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 export default class ThreadRoute extends AuthenticatedRoute {
   queryParams = {};
 
-  get breadCrumb() {
-    return { title: this.controller.model.title };
+  get breadcrumb() {
+    return { title: this.controller?.model.title };
   }
 
   canAccess() {
diff --git a/app/routes/forum/categories/category/threads/thread/destroy.js b/app/routes/forum/categories/category/threads/thread/destroy.js
index 724faea4a..334044d7f 100644
--- a/app/routes/forum/categories/category/threads/thread/destroy.js
+++ b/app/routes/forum/categories/category/threads/thread/destroy.js
@@ -1,13 +1,9 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class DestroyTopicRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Topic verwijderen' };
+export default class ThreadDestroyRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Topic verwijderen' };
 
   canAccess() {
     return this.abilities.can('destroy forum/threads');
   }
-
-  model() {
-    return this.modelFor('forum.categories.category.threads.thread');
-  }
 }
diff --git a/app/routes/forum/categories/category/threads/thread/edit.js b/app/routes/forum/categories/category/threads/thread/edit.js
index 2662be6f3..5a7475a59 100644
--- a/app/routes/forum/categories/category/threads/thread/edit.js
+++ b/app/routes/forum/categories/category/threads/thread/edit.js
@@ -1,19 +1,12 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class EditTopicRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Topic aanpassen' };
+export default class ThreadEditRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Topic aanpassen' };
 
   canAccess() {
     return this.abilities.can('edit forum/threads');
   }
 
-  async model() {
-    const thread = await this.modelFor(
-      'forum.categories.category.threads.thread'
-    );
-    return thread;
-  }
-
   deactivate() {
     super.deactivate();
     this.controller.model.rollbackAttributesAndPosts();
diff --git a/app/routes/forum/categories/category/threads/thread/index.js b/app/routes/forum/categories/category/threads/thread/index.js
new file mode 100644
index 000000000..8a9c7636b
--- /dev/null
+++ b/app/routes/forum/categories/category/threads/thread/index.js
@@ -0,0 +1,7 @@
+import { ApplicationRoute } from 'amber-ui/routes/application/application';
+
+export default class ThreadIndexRoute extends ApplicationRoute {
+  beforeModel() {
+    this.transitionTo('forum.categories.category.threads.thread.posts');
+  }
+}
diff --git a/app/routes/forum/categories/category/threads/thread/posts.js b/app/routes/forum/categories/category/threads/thread/posts.js
deleted file mode 100644
index de97256e9..000000000
--- a/app/routes/forum/categories/category/threads/thread/posts.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class PostsRoute extends Route {
-  breadCrumb = null;
-}
diff --git a/app/routes/forum/categories/category/threads/thread/posts/index.js b/app/routes/forum/categories/category/threads/thread/posts/index.js
index 0dc902715..7a33ba396 100644
--- a/app/routes/forum/categories/category/threads/thread/posts/index.js
+++ b/app/routes/forum/categories/category/threads/thread/posts/index.js
@@ -1,17 +1,34 @@
-import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
-import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
 import {
   bindKeyboardShortcuts,
   unbindKeyboardShortcuts,
 } from 'ember-keyboard-shortcuts';
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
 
-export default class PostIndexRoute extends AuthenticatedRoute {
-  @service router;
+export default class PostsIndexRoute extends AuthenticatedRoute {
   @service fetch;
+  @service router;
 
-  get breadCrumb() {
-    return { title: this.controller.model.title };
+  keyboardShortcuts = {
+    left: 'goToPreviousPage',
+    up: 'goToPreviousPage',
+    right: 'goToNextPage',
+    down: 'goToNextPage',
+  };
+
+  constructor() {
+    super(...arguments);
+
+    this.router.on('routeDidChange', () => {
+      const thread = this.modelFor('forum.categories.category.threads.thread');
+      if (thread) {
+        // only mark as read if we are in a thread
+        this.fetch.fetch(`/forum/threads/${thread.id}/mark_read`, {
+          method: 'POST',
+        });
+      }
+    });
   }
 
   get pageActions() {
@@ -43,6 +60,13 @@ export default class PostIndexRoute extends AuthenticatedRoute {
     return model;
   }
 
+  resetController(controller, isExiting, transition) {
+    super.resetController(controller, isExiting, transition);
+    if (isExiting) {
+      controller.send('resetNewContent');
+    }
+  }
+
   activate() {
     bindKeyboardShortcuts(this);
   }
@@ -51,13 +75,6 @@ export default class PostIndexRoute extends AuthenticatedRoute {
     unbindKeyboardShortcuts(this);
   }
 
-  keyboardShortcuts = {
-    left: 'goToPreviousPage',
-    up: 'goToPreviousPage',
-    right: 'goToNextPage',
-    down: 'goToNextPage',
-  };
-
   @action
   goToPreviousPage() {
     this.controller.send('goToPreviousPage');
@@ -67,25 +84,4 @@ export default class PostIndexRoute extends AuthenticatedRoute {
   goToNextPage() {
     this.controller.send('goToNextPage');
   }
-
-  resetController(controller, isExiting, transition) {
-    super.resetController(controller, isExiting, transition);
-    if (isExiting) {
-      controller.send('resetNewContent');
-    }
-  }
-
-  constructor() {
-    super(...arguments);
-
-    this.router.on('routeDidChange', () => {
-      const thread = this.modelFor('forum.categories.category.threads.thread');
-      if (thread) {
-        // only mark as read if we are in a thread
-        this.fetch.fetch(`/forum/threads/${thread.id}/mark_read`, {
-          method: 'POST',
-        });
-      }
-    });
-  }
 }
diff --git a/app/routes/forum/categories/category/threads/thread/posts/destroy.js b/app/routes/forum/categories/category/threads/thread/posts/post.js
similarity index 52%
rename from app/routes/forum/categories/category/threads/thread/posts/destroy.js
rename to app/routes/forum/categories/category/threads/thread/posts/post.js
index d88a0acc2..f62e63ec7 100644
--- a/app/routes/forum/categories/category/threads/thread/posts/destroy.js
+++ b/app/routes/forum/categories/category/threads/thread/posts/post.js
@@ -1,10 +1,10 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class DestroyPostRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Forumbericht verwijderen' };
+export default class PostRoute extends AuthenticatedRoute {
+  queryParams = {};
 
   canAccess() {
-    return this.abilities.can('destroy forum/posts');
+    return this.abilities.can('show forum/posts');
   }
 
   model(params) {
diff --git a/app/routes/forum/categories/category/threads/thread/posts/post/destroy.js b/app/routes/forum/categories/category/threads/thread/posts/post/destroy.js
new file mode 100644
index 000000000..93cc4c136
--- /dev/null
+++ b/app/routes/forum/categories/category/threads/thread/posts/post/destroy.js
@@ -0,0 +1,9 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class PostDestroyRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Forumbericht verwijderen' };
+
+  canAccess() {
+    return this.abilities.can('destroy forum/posts');
+  }
+}
diff --git a/app/routes/forum/categories/category/threads/thread/posts/edit.js b/app/routes/forum/categories/category/threads/thread/posts/post/edit.js
similarity index 55%
rename from app/routes/forum/categories/category/threads/thread/posts/edit.js
rename to app/routes/forum/categories/category/threads/thread/posts/post/edit.js
index ca1b86c2d..b1a2fff3e 100644
--- a/app/routes/forum/categories/category/threads/thread/posts/edit.js
+++ b/app/routes/forum/categories/category/threads/thread/posts/post/edit.js
@@ -1,16 +1,12 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class EditPostRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Forumbericht aanpassen' };
+export default class PostEditRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Forumbericht aanpassen' };
 
   canAccess(model) {
     return this.abilities.can('edit forum/post', model);
   }
 
-  model(params) {
-    return this.store.findRecord('forum/post', params.post_id, params);
-  }
-
   deactivate() {
     super.deactivate();
     this.controller.model.rollbackAttributes();
diff --git a/app/routes/forum/categories/category/threads/thread/show.js b/app/routes/forum/categories/category/threads/thread/show.js
deleted file mode 100644
index d13bb6a55..000000000
--- a/app/routes/forum/categories/category/threads/thread/show.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
-
-export default class ShowThreadRoute extends AuthenticatedRoute {
-  beforeModel() {
-    this.transitionTo('forum.categories.category.threads.thread.posts');
-  }
-}
diff --git a/app/routes/forum/categories/index.js b/app/routes/forum/categories/index.js
index aa440d304..f02d278c1 100644
--- a/app/routes/forum/categories/index.js
+++ b/app/routes/forum/categories/index.js
@@ -1,8 +1,6 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class ForumIndexRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Forum' };
-
+export default class CategoriesIndexRoute extends AuthenticatedRoute {
   get pageActions() {
     return [
       {
diff --git a/app/routes/forum/categories/new.js b/app/routes/forum/categories/new.js
index a23a33af1..c83b218b3 100644
--- a/app/routes/forum/categories/new.js
+++ b/app/routes/forum/categories/new.js
@@ -1,7 +1,7 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
 export default class NewCategoryRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Categorie aanmaken' };
+  breadcrumb = { title: 'Categorie aanmaken' };
 
   canAccess() {
     return this.abilities.can('create forum/categories');
diff --git a/app/routes/forum/index.js b/app/routes/forum/index.js
index 2cacd73ad..00051b048 100644
--- a/app/routes/forum/index.js
+++ b/app/routes/forum/index.js
@@ -1,10 +1,6 @@
-import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
-
-export default class ForumIndexRoute extends AuthenticatedRoute {
-  canAccess() {
-    return this.abilities.can('show forum/categories');
-  }
+import { ApplicationRoute } from 'amber-ui/routes/application/application';
 
+export default class ForumIndexRoute extends ApplicationRoute {
   beforeModel() {
     this.transitionTo('forum.categories');
   }
diff --git a/app/routes/groups.js b/app/routes/groups.js
new file mode 100644
index 000000000..c4e1147b4
--- /dev/null
+++ b/app/routes/groups.js
@@ -0,0 +1,7 @@
+import { ApplicationRoute } from 'amber-ui/routes/application/application';
+
+export default class GroupsRoute extends ApplicationRoute {
+  queryParams = {};
+
+  breadcrumb = { title: 'Groepen' };
+}
diff --git a/app/routes/groups/group.js b/app/routes/groups/group.js
new file mode 100644
index 000000000..c1146e42a
--- /dev/null
+++ b/app/routes/groups/group.js
@@ -0,0 +1,17 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class GroupRoute extends AuthenticatedRoute {
+  queryParams = {};
+
+  get breadcrumb() {
+    return { title: this.controller?.model.name };
+  }
+
+  canAccess() {
+    return this.abilities.can('show groups');
+  }
+
+  model(params) {
+    return this.store.findRecord('group', params.id, params);
+  }
+}
diff --git a/app/routes/groups/edit.js b/app/routes/groups/group/edit.js
similarity index 58%
rename from app/routes/groups/edit.js
rename to app/routes/groups/group/edit.js
index d0088d360..f942ce3af 100644
--- a/app/routes/groups/edit.js
+++ b/app/routes/groups/group/edit.js
@@ -1,16 +1,12 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class NewGroupRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Groep aanpassen' };
+export default class GroupEditRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Groep aanpassen' };
 
   canAccess(model) {
     return this.abilities.can('edit group', model);
   }
 
-  model(params) {
-    return this.store.findRecord('group', params.id, params);
-  }
-
   deactivate() {
     super.deactivate();
     this.controller.model?.rollbackAttributesAndMemberships();
diff --git a/app/routes/groups/export.js b/app/routes/groups/group/export.js
similarity index 57%
rename from app/routes/groups/export.js
rename to app/routes/groups/group/export.js
index f2e5d8354..9293d97a4 100644
--- a/app/routes/groups/export.js
+++ b/app/routes/groups/group/export.js
@@ -1,15 +1,11 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class ExportGroupRoute extends AuthenticatedRoute {
-  get breadCrumb() {
+export default class GroupExportRoute extends AuthenticatedRoute {
+  get breadcrumb() {
     return { title: `${this.controller.model.name} exporteren` };
   }
 
   canAccess(model) {
     return this.abilities.can('export group', model);
   }
-
-  model(params) {
-    return this.store.findRecord('group', params.id, params);
-  }
 }
diff --git a/app/routes/groups/show.js b/app/routes/groups/group/index.js
similarity index 74%
rename from app/routes/groups/show.js
rename to app/routes/groups/group/index.js
index 7b0611ecd..7b1631f96 100644
--- a/app/routes/groups/show.js
+++ b/app/routes/groups/group/index.js
@@ -1,23 +1,19 @@
-import { all } from 'rsvp';
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+import { all } from 'rsvp';
 
-export default class ShowGroupRoute extends AuthenticatedRoute {
-  get breadCrumb() {
-    return { title: this.controller.model.name };
-  }
-
+export default class GroupIndexRoute extends AuthenticatedRoute {
   get pageActions() {
     const group = this.controller.model;
     return [
       {
-        link: 'groups.edit',
+        link: 'groups.group.edit',
         title: 'Wijzigen',
         icon: 'pencil',
         linkArgument: group,
         canAccess: this.abilities.can('edit group', group),
       },
       {
-        link: 'groups.export',
+        link: 'groups.group.export',
         title: 'Gebruikers exporteren',
         icon: 'download',
         linkArgument: group,
@@ -30,10 +26,6 @@ export default class ShowGroupRoute extends AuthenticatedRoute {
     return this.abilities.can('show groups');
   }
 
-  model(params) {
-    return this.store.findRecord('group', params.id, params);
-  }
-
   afterModel(group) {
     // This ensures all memberships and users are loaded
     if (this.abilities.can('show memberships')) {
diff --git a/app/routes/groups/index.js b/app/routes/groups/index.js
index dfec544e8..7929a351e 100644
--- a/app/routes/groups/index.js
+++ b/app/routes/groups/index.js
@@ -1,8 +1,6 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class GroupIndexRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Groepen' };
-
+export default class GroupsIndexRoute extends AuthenticatedRoute {
   queryParams = {
     search: {
       refreshModel: true,
diff --git a/app/routes/groups/new.js b/app/routes/groups/new.js
index 005ff0627..509aaed8f 100644
--- a/app/routes/groups/new.js
+++ b/app/routes/groups/new.js
@@ -1,7 +1,7 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class NewGroupRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Groep aanmaken' };
+export default class GroupsNewRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Groep aanmaken' };
 
   canAccess() {
     return this.abilities.can('create groups');
diff --git a/app/routes/index.js b/app/routes/index.js
index 3485af863..89ad3f030 100644
--- a/app/routes/index.js
+++ b/app/routes/index.js
@@ -12,10 +12,6 @@ export default class IndexRoute extends ApplicationRoute {
     ];
   }
 
-  canAccess() {
-    return true;
-  }
-
   model(params) {
     params.sort = '-pinned,-created_at';
     return this.store.queryPaged('article', params);
diff --git a/app/routes/mail-aliases.js b/app/routes/mail-aliases.js
new file mode 100644
index 000000000..9158d5a2c
--- /dev/null
+++ b/app/routes/mail-aliases.js
@@ -0,0 +1,7 @@
+import { ApplicationRoute } from 'amber-ui/routes/application/application';
+
+export default class MailAliasesRoute extends ApplicationRoute {
+  queryParams = {};
+
+  breadcrumb = { title: 'Mail aliassen' };
+}
diff --git a/app/routes/mail-aliases/destroy.js b/app/routes/mail-aliases/destroy.js
deleted file mode 100644
index 7c9141e9f..000000000
--- a/app/routes/mail-aliases/destroy.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
-
-export default class DestroyMailAliasRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Mail-alias verwijderen' };
-
-  canAccess() {
-    return this.abilities.can('destroy mail-aliases');
-  }
-
-  model(params) {
-    return this.store.findRecord('mail-aliases', params.id, params);
-  }
-}
diff --git a/app/routes/mail-aliases/index.js b/app/routes/mail-aliases/index.js
index 4bfb8679d..c43e2e6ff 100644
--- a/app/routes/mail-aliases/index.js
+++ b/app/routes/mail-aliases/index.js
@@ -1,15 +1,11 @@
-import { ApplicationRoute } from 'amber-ui/routes/application/application';
-import { inject as service } from '@ember/service';
-
-export default class MailAliasIndexRoute extends ApplicationRoute {
-  @service intl;
-  breadCrumb = { title: 'Mail-aliassen' };
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
+export default class MailAliasesIndexRoute extends AuthenticatedRoute {
   get pageActions() {
     return [
       {
         link: 'mail-aliases.new',
-        title: 'Nieuw mailalias',
+        title: 'Nieuw mail alias',
         icon: 'plus',
         canAccess: this.abilities.can('create mail-aliases'),
       },
diff --git a/app/routes/mail-aliases/mail-alias.js b/app/routes/mail-aliases/mail-alias.js
new file mode 100644
index 000000000..d1508e893
--- /dev/null
+++ b/app/routes/mail-aliases/mail-alias.js
@@ -0,0 +1,17 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class MailAliasRoute extends AuthenticatedRoute {
+  queryParams = {};
+
+  get breadcrumb() {
+    return { title: this.controller?.model.email };
+  }
+
+  canAccess() {
+    return this.abilities.can('show mail-aliases');
+  }
+
+  model(params) {
+    return this.store.findRecord('mail-alias', params.id, params);
+  }
+}
diff --git a/app/routes/mail-aliases/mail-alias/destroy.js b/app/routes/mail-aliases/mail-alias/destroy.js
new file mode 100644
index 000000000..0a6f8c9c4
--- /dev/null
+++ b/app/routes/mail-aliases/mail-alias/destroy.js
@@ -0,0 +1,9 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class MailAliasDestroyRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Mail alias verwijderen' };
+
+  canAccess() {
+    return this.abilities.can('destroy mail-aliases');
+  }
+}
diff --git a/app/routes/mail-aliases/edit.js b/app/routes/mail-aliases/mail-alias/edit.js
similarity index 56%
rename from app/routes/mail-aliases/edit.js
rename to app/routes/mail-aliases/mail-alias/edit.js
index 6364ab773..2aeb6ac44 100644
--- a/app/routes/mail-aliases/edit.js
+++ b/app/routes/mail-aliases/mail-alias/edit.js
@@ -1,16 +1,12 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class EditMailAliasRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Mail-alias aanpassen' };
+export default class MailAliasEditRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Mail alias aanpassen' };
 
   canAccess(model) {
     return this.abilities.can('edit mail-alias', model);
   }
 
-  model(params) {
-    return this.store.findRecord('mail-alias', params.id, params);
-  }
-
   deactivate() {
     super.deactivate();
     this.controller.model?.rollbackAttributes();
diff --git a/app/routes/mail-aliases/show.js b/app/routes/mail-aliases/mail-alias/index.js
similarity index 64%
rename from app/routes/mail-aliases/show.js
rename to app/routes/mail-aliases/mail-alias/index.js
index c53051945..a7c5df11a 100644
--- a/app/routes/mail-aliases/show.js
+++ b/app/routes/mail-aliases/mail-alias/index.js
@@ -1,22 +1,18 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class ShowMailAliasRoute extends AuthenticatedRoute {
-  get breadCrumb() {
-    return { title: this.controller.model.email };
-  }
-
+export default class MailAliasIndexRoute extends AuthenticatedRoute {
   get pageActions() {
     const mailAlias = this.controller.model;
     return [
       {
-        link: 'mail-aliases.edit',
+        link: 'mail-aliases.mail-alias.edit',
         title: 'Wijzigen',
         icon: 'pencil',
         linkArgument: mailAlias,
         canAccess: this.abilities.can('edit mail-aliases'),
       },
       {
-        link: 'mail-aliases.destroy',
+        link: 'mail-aliases.mail-alias.destroy',
         title: 'Verwijderen',
         icon: 'trash',
         linkArgument: mailAlias,
@@ -28,8 +24,4 @@ export default class ShowMailAliasRoute extends AuthenticatedRoute {
   canAccess() {
     return this.abilities.can('show mail-aliases');
   }
-
-  model(params) {
-    return this.store.findRecord('mail-alias', params.id, params);
-  }
 }
diff --git a/app/routes/mail-aliases/new.js b/app/routes/mail-aliases/new.js
index 51e772c01..8c8986979 100644
--- a/app/routes/mail-aliases/new.js
+++ b/app/routes/mail-aliases/new.js
@@ -1,7 +1,7 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class NewMailAliasRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Mail-alias aanmaken' };
+export default class MailAliasesNewRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Mail alias aanmaken' };
 
   canAccess() {
     return this.abilities.can('create mail-aliases');
diff --git a/app/routes/mail-moderations.js b/app/routes/mail-moderations.js
new file mode 100644
index 000000000..820140741
--- /dev/null
+++ b/app/routes/mail-moderations.js
@@ -0,0 +1,7 @@
+import { ApplicationRoute } from 'amber-ui/routes/application/application';
+
+export default class MailModerationsRoute extends ApplicationRoute {
+  queryParams = {};
+
+  breadcrumb = { title: 'Mail moderatie' };
+}
diff --git a/app/routes/mail-moderations/accept.js b/app/routes/mail-moderations/accept.js
deleted file mode 100644
index e58f57008..000000000
--- a/app/routes/mail-moderations/accept.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
-
-export default class AcceptModerationRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Moderatieverzoek goedkeuren' };
-
-  canAccess() {
-    return this.abilities.can('accept mail-moderations');
-  }
-
-  model(params) {
-    return this.store.findRecord('stored-mail', params.id, params);
-  }
-}
diff --git a/app/routes/mail-moderations/destroy.js b/app/routes/mail-moderations/destroy.js
deleted file mode 100644
index 9b572fcd2..000000000
--- a/app/routes/mail-moderations/destroy.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
-
-export default class DestroyModerationRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Moderatieverzoek negeren' };
-
-  canAccess() {
-    return this.abilities.can('destroy mail-moderations');
-  }
-
-  model(params) {
-    return this.store.findRecord('stored-mail', params.id, params);
-  }
-}
diff --git a/app/routes/mail-moderations/index.js b/app/routes/mail-moderations/index.js
index 44fc81474..606d5a41c 100644
--- a/app/routes/mail-moderations/index.js
+++ b/app/routes/mail-moderations/index.js
@@ -1,8 +1,6 @@
-import { ApplicationRoute } from 'amber-ui/routes/application/application';
-
-export default class ModerationIndexRoute extends ApplicationRoute {
-  breadCrumb = { title: 'Mailmoderatie' };
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
+export default class MailModerationsIndexRoute extends AuthenticatedRoute {
   canAccess() {
     return this.abilities.can('show mail-moderations');
   }
diff --git a/app/routes/mail-moderations/mail-moderation.js b/app/routes/mail-moderations/mail-moderation.js
new file mode 100644
index 000000000..fc7284bc7
--- /dev/null
+++ b/app/routes/mail-moderations/mail-moderation.js
@@ -0,0 +1,17 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class MailModerationRoute extends AuthenticatedRoute {
+  queryParams = {};
+
+  get breadcrumb() {
+    return { title: this.controller?.model.subject };
+  }
+
+  canAccess() {
+    return this.abilities.can('show mail-moderations');
+  }
+
+  model(params) {
+    return this.store.findRecord('stored-mail', params.id, params);
+  }
+}
diff --git a/app/routes/mail-moderations/mail-moderation/accept.js b/app/routes/mail-moderations/mail-moderation/accept.js
new file mode 100644
index 000000000..cfc6c3b13
--- /dev/null
+++ b/app/routes/mail-moderations/mail-moderation/accept.js
@@ -0,0 +1,9 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class MailModerationAcceptRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Moderatieverzoek goedkeuren' };
+
+  canAccess() {
+    return this.abilities.can('accept mail-moderations');
+  }
+}
diff --git a/app/routes/mail-moderations/mail-moderation/destroy.js b/app/routes/mail-moderations/mail-moderation/destroy.js
new file mode 100644
index 000000000..71b75f66e
--- /dev/null
+++ b/app/routes/mail-moderations/mail-moderation/destroy.js
@@ -0,0 +1,9 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class MailModerationDestroyRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Moderatieverzoek negeren' };
+
+  canAccess() {
+    return this.abilities.can('destroy mail-moderations');
+  }
+}
diff --git a/app/routes/mail-moderations/show.js b/app/routes/mail-moderations/mail-moderation/index.js
similarity index 67%
rename from app/routes/mail-moderations/show.js
rename to app/routes/mail-moderations/mail-moderation/index.js
index 156d65be3..d95e9d1ff 100644
--- a/app/routes/mail-moderations/show.js
+++ b/app/routes/mail-moderations/mail-moderation/index.js
@@ -1,28 +1,24 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class ShowModerationRoute extends AuthenticatedRoute {
-  get breadCrumb() {
-    return { title: this.controller.model.subject };
-  }
-
+export default class MailModerationIndexRoute extends AuthenticatedRoute {
   get pageActions() {
     return [
       {
-        link: 'mail-moderations.accept',
+        link: 'mail-moderations.mail-moderation.accept',
         title: 'Goedkeuren',
         icon: 'check',
         linkArgument: this.controller.model,
         canAccess: this.abilities.can('accept mail-moderations'),
       },
       {
-        link: 'mail-moderations.reject',
+        link: 'mail-moderations.mail-moderation.reject',
         title: 'Afkeuren',
         icon: 'circle-minus',
         linkArgument: this.controller.model,
         canAccess: this.abilities.can('reject mail-moderations'),
       },
       {
-        link: 'mail-moderations.destroy',
+        link: 'mail-moderations.mail-moderation.destroy',
         title: 'Negeren',
         icon: 'trash',
         linkArgument: this.controller.model,
@@ -34,8 +30,4 @@ export default class ShowModerationRoute extends AuthenticatedRoute {
   canAccess() {
     return this.abilities.can('show mail-moderations');
   }
-
-  model(params) {
-    return this.store.findRecord('stored-mail', params.id, params);
-  }
 }
diff --git a/app/routes/mail-moderations/mail-moderation/reject.js b/app/routes/mail-moderations/mail-moderation/reject.js
new file mode 100644
index 000000000..64117011b
--- /dev/null
+++ b/app/routes/mail-moderations/mail-moderation/reject.js
@@ -0,0 +1,9 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class MailModerationRejectRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Moderatieverzoek afwijzen' };
+
+  canAccess() {
+    return this.abilities.can('reject mail-moderations');
+  }
+}
diff --git a/app/routes/mail-moderations/reject.js b/app/routes/mail-moderations/reject.js
deleted file mode 100644
index ccc7af73f..000000000
--- a/app/routes/mail-moderations/reject.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
-
-export default class RejectModerationRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Moderatieverzoek afwijzen' };
-
-  canAccess() {
-    return this.abilities.can('reject mail-moderations');
-  }
-
-  model(params) {
-    return this.store.findRecord('stored-mail', params.id, params);
-  }
-}
diff --git a/app/routes/oauth/authorize.js b/app/routes/oauth/authorize.js
index 4ed1435df..daf737e18 100644
--- a/app/routes/oauth/authorize.js
+++ b/app/routes/oauth/authorize.js
@@ -6,10 +6,6 @@ export default class OauthAuthorizeRoute extends AuthenticatedRoute {
   @service router;
   @service session;
 
-  canAccess() {
-    return this.session.isAuthenticated;
-  }
-
   constructor() {
     super(...arguments);
 
@@ -41,4 +37,8 @@ export default class OauthAuthorizeRoute extends AuthenticatedRoute {
         });
     });
   }
+
+  canAccess() {
+    return this.session.isAuthenticated;
+  }
 }
diff --git a/app/routes/photo-albums.js b/app/routes/photo-albums.js
index 11063579c..452b3fde7 100644
--- a/app/routes/photo-albums.js
+++ b/app/routes/photo-albums.js
@@ -1,5 +1,15 @@
-import Route from '@ember/routing/route';
+import { ApplicationRoute } from 'amber-ui/routes/application/application';
+import { capitalize } from '@ember/string';
+import { inject as service } from '@ember/service';
 
-export default class PhotoAlbumsRoute extends Route {
-  breadCrumb = null;
+export default class PhotoAlbumsRoute extends ApplicationRoute {
+  @service intl;
+
+  queryParams = {};
+
+  get breadcrumb() {
+    return {
+      title: capitalize(this.intl.t('model.photoAlbum.name.other').toString()),
+    };
+  }
 }
diff --git a/app/routes/photo-albums/index.js b/app/routes/photo-albums/index.js
index e882c9a8e..90c544940 100644
--- a/app/routes/photo-albums/index.js
+++ b/app/routes/photo-albums/index.js
@@ -1,37 +1,23 @@
 import { ApplicationRoute } from 'amber-ui/routes/application/application';
-import { capitalize } from '@ember/string';
-import { inject as service } from '@ember/service';
-
-export default class ArticlesIndexRoute extends ApplicationRoute {
-  @service intl;
-
-  get breadCrumb() {
-    return {
-      title: capitalize(this.intl.t('model.photoAlbum.name.other').toString()),
-    };
-  }
 
+export default class PhotoAlbumsIndexRoute extends ApplicationRoute {
   get pageActions() {
     return [
       {
-        link: 'photo-comments.index',
-        title: 'Bekijk fotoreacties',
+        link: 'photo-comments',
+        title: 'Bekijk foto reacties',
         icon: 'comments',
         canAccess: this.abilities.can('show photo-comments'),
       },
       {
         link: 'photo-albums.new',
-        title: 'Nieuw foto-album',
+        title: 'Nieuw fotoalbum',
         icon: 'plus',
         canAccess: this.abilities.can('create photo-albums'),
       },
     ];
   }
 
-  canAccess() {
-    return this.abilities.can('show photo-albums');
-  }
-
   model(params) {
     return this.store.queryPaged('photo-album', params);
   }
diff --git a/app/routes/photo-albums/new.js b/app/routes/photo-albums/new.js
index 22ae62e24..e4de6b049 100644
--- a/app/routes/photo-albums/new.js
+++ b/app/routes/photo-albums/new.js
@@ -1,7 +1,7 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class NewPhotoAlbumRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Foto album aanmaken' };
+export default class PhotoAlbumsNewRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Fotoalbum aanmaken' };
 
   canAccess() {
     return this.abilities.can('create photo-album');
diff --git a/app/routes/photo-albums/photo-album.js b/app/routes/photo-albums/photo-album.js
index 49eb2c85e..fb8dd28fa 100644
--- a/app/routes/photo-albums/photo-album.js
+++ b/app/routes/photo-albums/photo-album.js
@@ -1,32 +1,29 @@
 import { ApplicationRoute } from 'amber-ui/routes/application/application';
 
-export default class PhotoAlbumSubRoute extends ApplicationRoute {
+export default class PhotoAlbumRoute extends ApplicationRoute {
   queryParams = {};
-  get breadCrumb() {
-    return { title: this.controller.model.title };
+
+  get breadcrumb() {
+    return { title: this.controller?.model.title };
   }
 
   get pageActions() {
     return [
       {
-        link: 'photo-comments.index',
-        title: 'Bekijk fotoreacties',
+        link: 'photo-comments',
+        title: 'Bekijk foto reacties',
         icon: 'comments',
         canAccess: this.abilities.can('show photo-comments'),
       },
       {
         link: 'photo-albums.new',
-        title: 'Nieuw foto-album',
+        title: 'Nieuw fotoalbum',
         icon: 'plus',
         canAccess: this.abilities.can('create photo-albums'),
       },
     ];
   }
 
-  canAccess() {
-    return this.abilities.can('show photo-albums');
-  }
-
   model(params) {
     return this.store.findRecord('photo-album', params.photo_album_id, params);
   }
diff --git a/app/routes/photo-albums/photo-album/destroy.js b/app/routes/photo-albums/photo-album/destroy.js
index 20437d1a6..d9363158d 100644
--- a/app/routes/photo-albums/photo-album/destroy.js
+++ b/app/routes/photo-albums/photo-album/destroy.js
@@ -1,13 +1,9 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class DestroyArticleRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Foto album verwijderen' };
+export default class PhotoAlbumDestroyRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Fotoalbum verwijderen' };
 
   canAccess() {
     return this.abilities.can('destroy photo-albums');
   }
-
-  model() {
-    return this.modelFor('photo-albums.photo-album');
-  }
 }
diff --git a/app/routes/photo-albums/photo-album/edit.js b/app/routes/photo-albums/photo-album/edit.js
index 65170cb29..49f52e96b 100644
--- a/app/routes/photo-albums/photo-album/edit.js
+++ b/app/routes/photo-albums/photo-album/edit.js
@@ -1,16 +1,12 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class EditPhotoAlbumRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Foto album aanpassen' };
+export default class PhotoAlbumEditRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Fotoalbum aanpassen' };
 
   canAccess(model) {
     return this.abilities.can('edit photo-albums', model);
   }
 
-  model() {
-    return this.modelFor('photo-albums.photo-album');
-  }
-
   deactivate() {
     super.deactivate();
     this.controller.model?.rollbackAttributes();
diff --git a/app/routes/photo-albums/photo-album/show.js b/app/routes/photo-albums/photo-album/index.js
similarity index 53%
rename from app/routes/photo-albums/photo-album/show.js
rename to app/routes/photo-albums/photo-album/index.js
index 75353952f..b7d6c2751 100644
--- a/app/routes/photo-albums/photo-album/show.js
+++ b/app/routes/photo-albums/photo-album/index.js
@@ -1,10 +1,6 @@
 import { ApplicationRoute } from 'amber-ui/routes/application/application';
 
-export default class ShowPhotoAlbumRoute extends ApplicationRoute {
-  canAccess() {
-    return this.abilities.can('show photo-albums');
-  }
-
+export default class PhotoAlbumIndexRoute extends ApplicationRoute {
   beforeModel() {
     this.transitionTo('photo-albums.photo-album.photos');
   }
diff --git a/app/routes/photo-albums/photo-album/photos.js b/app/routes/photo-albums/photo-album/photos.js
deleted file mode 100644
index 48eaa53f0..000000000
--- a/app/routes/photo-albums/photo-album/photos.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class PhotosRoute extends Route {
-  breadCrumb = null;
-}
diff --git a/app/routes/photo-albums/photo-album/photos/destroy.js b/app/routes/photo-albums/photo-album/photos/destroy.js
deleted file mode 100644
index 7d54abcd5..000000000
--- a/app/routes/photo-albums/photo-album/photos/destroy.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
-
-export default class DestroyArticleRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Foto verwijderen' };
-
-  canAccess() {
-    return this.abilities.can('destroy photos');
-  }
-
-  model(params) {
-    return this.store.findRecord('photo', params.photo_id, params);
-  }
-}
diff --git a/app/routes/photo-albums/photo-album/photos/index.js b/app/routes/photo-albums/photo-album/photos/index.js
index 4358784f6..a21e43f49 100644
--- a/app/routes/photo-albums/photo-album/photos/index.js
+++ b/app/routes/photo-albums/photo-album/photos/index.js
@@ -1,10 +1,6 @@
 import { ApplicationRoute } from 'amber-ui/routes/application/application';
 
 export default class PhotosIndexRoute extends ApplicationRoute {
-  get breadCrumb() {
-    return { title: this.controller.model.title };
-  }
-
   get pageActions() {
     const photoAlbum = this.controller.model;
     return [
@@ -24,12 +20,4 @@ export default class PhotosIndexRoute extends ApplicationRoute {
       },
     ];
   }
-
-  canAccess() {
-    return this.abilities.can('show photo-albums');
-  }
-
-  model() {
-    return this.modelFor('photo-albums.photo-album');
-  }
 }
diff --git a/app/routes/photo-albums/photo-album/photos/photo.js b/app/routes/photo-albums/photo-album/photos/photo.js
new file mode 100644
index 000000000..6d11d1f19
--- /dev/null
+++ b/app/routes/photo-albums/photo-album/photos/photo.js
@@ -0,0 +1,9 @@
+import { ApplicationRoute } from 'amber-ui/routes/application/application';
+
+export default class PhotoRoute extends ApplicationRoute {
+  queryParams = {};
+
+  model(params) {
+    return this.store.findRecord('photo', params.photo_id, params);
+  }
+}
diff --git a/app/routes/photo-albums/photo-album/photos/photo/destroy.js b/app/routes/photo-albums/photo-album/photos/photo/destroy.js
new file mode 100644
index 000000000..0a3fa6799
--- /dev/null
+++ b/app/routes/photo-albums/photo-album/photos/photo/destroy.js
@@ -0,0 +1,9 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class PhotoDestroyRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Foto verwijderen' };
+
+  canAccess() {
+    return this.abilities.can('destroy photos');
+  }
+}
diff --git a/app/routes/photo-albums/photo-album/photos/show.js b/app/routes/photo-albums/photo-album/photos/photo/index.js
similarity index 80%
rename from app/routes/photo-albums/photo-album/photos/show.js
rename to app/routes/photo-albums/photo-album/photos/photo/index.js
index 90842d78f..86a7ab5f4 100644
--- a/app/routes/photo-albums/photo-album/photos/show.js
+++ b/app/routes/photo-albums/photo-album/photos/photo/index.js
@@ -1,15 +1,22 @@
-import { ApplicationRoute } from 'amber-ui/routes/application/application';
-import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
 import {
   bindKeyboardShortcuts,
   unbindKeyboardShortcuts,
 } from 'ember-keyboard-shortcuts';
+import { ApplicationRoute } from 'amber-ui/routes/application/application';
+import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
 
-export default class ShowPhotosRoute extends ApplicationRoute {
+export default class PhotoIndexRoute extends ApplicationRoute {
   @service intl;
 
-  get breadCrumb() {
+  keyboardShortcuts = {
+    left: 'goToPreviousPhoto',
+    up: 'goToPreviousPhoto',
+    right: 'goToNextPhoto',
+    down: 'goToNextPhoto',
+  };
+
+  get breadcrumb() {
     const photo = this.controller.model;
     const allAlbumPhotos = this.controller.model.photoAlbum.get('sortedPhotos');
     const photoAlbumPhotosLength = allAlbumPhotos.get('length');
@@ -21,7 +28,7 @@ export default class ShowPhotosRoute extends ApplicationRoute {
   get pageActions() {
     return [
       {
-        link: 'photo-albums.photo-album.photos.destroy',
+        link: 'photo-albums.photo-album.photos.photo.destroy',
         linkArgument: this.controller.model,
         title: 'Foto verwijderen',
         icon: 'trash',
@@ -30,12 +37,14 @@ export default class ShowPhotosRoute extends ApplicationRoute {
     ];
   }
 
-  canAccess() {
-    return this.abilities.can('show photo-albums');
+  @action
+  goToPreviousPhoto() {
+    this.controller.send('goToPreviousPhoto');
   }
 
-  model(params) {
-    return this.store.findRecord('photo', params.photo_id, params);
+  @action
+  goToNextPhoto() {
+    this.controller.send('goToNextPhoto');
   }
 
   activate() {
@@ -45,21 +54,4 @@ export default class ShowPhotosRoute extends ApplicationRoute {
   deactivate() {
     unbindKeyboardShortcuts(this);
   }
-
-  keyboardShortcuts = {
-    left: 'goToPreviousPhoto',
-    up: 'goToPreviousPhoto',
-    right: 'goToNextPhoto',
-    down: 'goToNextPhoto',
-  };
-
-  @action
-  goToPreviousPhoto() {
-    this.controller.send('goToPreviousPhoto');
-  }
-
-  @action
-  goToNextPhoto() {
-    this.controller.send('goToNextPhoto');
-  }
 }
diff --git a/app/routes/photo-comments.js b/app/routes/photo-comments.js
new file mode 100644
index 000000000..86c121e87
--- /dev/null
+++ b/app/routes/photo-comments.js
@@ -0,0 +1,7 @@
+import { ApplicationRoute } from 'amber-ui/routes/application/application';
+
+export default class PhotoCommentsRoute extends ApplicationRoute {
+  queryParams = {};
+
+  breadcrumb = { title: 'Foto reacties' };
+}
diff --git a/app/routes/photo-comments/index.js b/app/routes/photo-comments/index.js
index 54a98b0cd..e40c823aa 100644
--- a/app/routes/photo-comments/index.js
+++ b/app/routes/photo-comments/index.js
@@ -1,8 +1,6 @@
 import { ApplicationRoute } from 'amber-ui/routes/application/application';
 
 export default class PhotoCommentsIndexRoute extends ApplicationRoute {
-  breadCrumb = { title: 'Fotoreacties' };
-
   canAccess() {
     return this.abilities.can('show photo-comments');
   }
diff --git a/app/routes/photo-comments/destroy.js b/app/routes/photo-comments/photo-comment.js
similarity index 52%
rename from app/routes/photo-comments/destroy.js
rename to app/routes/photo-comments/photo-comment.js
index 16913b218..f6f3f8cb1 100644
--- a/app/routes/photo-comments/destroy.js
+++ b/app/routes/photo-comments/photo-comment.js
@@ -1,10 +1,10 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class DestroyArticleRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Fotoreactie verwijderen' };
+export default class PhotoCommentRoute extends AuthenticatedRoute {
+  queryParams = {};
 
   canAccess() {
-    return this.abilities.can('destroy photo-comments');
+    return this.abilities.can('show photo-comments');
   }
 
   model(params) {
diff --git a/app/routes/photo-comments/photo-comment/destroy.js b/app/routes/photo-comments/photo-comment/destroy.js
new file mode 100644
index 000000000..b0499d71b
--- /dev/null
+++ b/app/routes/photo-comments/photo-comment/destroy.js
@@ -0,0 +1,9 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class PhotoCommentDestroyRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Foto reactie verwijderen' };
+
+  canAccess() {
+    return this.abilities.can('destroy photo-comments');
+  }
+}
diff --git a/app/routes/polls.js b/app/routes/polls.js
new file mode 100644
index 000000000..2786f429d
--- /dev/null
+++ b/app/routes/polls.js
@@ -0,0 +1,7 @@
+import { ApplicationRoute } from 'amber-ui/routes/application/application';
+
+export default class PollsRoute extends ApplicationRoute {
+  queryParams = {};
+
+  breadcrumb = { title: 'Polls' };
+}
diff --git a/app/routes/polls/destroy.js b/app/routes/polls/destroy.js
deleted file mode 100644
index b2841ab66..000000000
--- a/app/routes/polls/destroy.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
-
-export default class DestroyPollRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Poll verwijderen' };
-
-  canAccess() {
-    return this.abilities.can('destroy polls');
-  }
-
-  model(params) {
-    return this.store.findRecord('poll', params.id, params);
-  }
-}
diff --git a/app/routes/polls/index.js b/app/routes/polls/index.js
index a7c97c2e5..e33d7f9a3 100644
--- a/app/routes/polls/index.js
+++ b/app/routes/polls/index.js
@@ -1,8 +1,6 @@
-import { ApplicationRoute } from 'amber-ui/routes/application/application';
-
-export default class MailAliasIndexRoute extends ApplicationRoute {
-  breadCrumb = { title: 'Polls' };
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
+export default class PollsIndexRoute extends AuthenticatedRoute {
   get pageActions() {
     return [
       {
diff --git a/app/routes/polls/new.js b/app/routes/polls/new.js
index 5e39423ab..1317b3b80 100644
--- a/app/routes/polls/new.js
+++ b/app/routes/polls/new.js
@@ -1,7 +1,7 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class NewPollRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Poll aanmaken' };
+export default class PollsNewRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Poll aanmaken' };
 
   canAccess() {
     return this.abilities.can('create polls');
diff --git a/app/routes/polls/poll.js b/app/routes/polls/poll.js
new file mode 100644
index 000000000..0bddc43ad
--- /dev/null
+++ b/app/routes/polls/poll.js
@@ -0,0 +1,17 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class PollRoute extends AuthenticatedRoute {
+  queryParams = {};
+
+  get breadcrumb() {
+    return { title: this.controller?.model.question.question };
+  }
+
+  canAccess() {
+    return this.abilities.can('show polls');
+  }
+
+  model(params) {
+    return this.store.findRecord('poll', params.id, params);
+  }
+}
diff --git a/app/routes/polls/poll/destroy.js b/app/routes/polls/poll/destroy.js
new file mode 100644
index 000000000..b9c5912dd
--- /dev/null
+++ b/app/routes/polls/poll/destroy.js
@@ -0,0 +1,9 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class PollDestroyRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Poll verwijderen' };
+
+  canAccess() {
+    return this.abilities.can('destroy polls');
+  }
+}
diff --git a/app/routes/polls/edit.js b/app/routes/polls/poll/edit.js
similarity index 56%
rename from app/routes/polls/edit.js
rename to app/routes/polls/poll/edit.js
index 69344befb..62d5acb27 100644
--- a/app/routes/polls/edit.js
+++ b/app/routes/polls/poll/edit.js
@@ -1,16 +1,12 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class EditMailAliasRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Poll aanpassen' };
+export default class PollEditRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Poll aanpassen' };
 
   canAccess(model) {
     return this.abilities.can('edit poll', model);
   }
 
-  model(params) {
-    return this.store.findRecord('poll', params.id, params);
-  }
-
   deactivate() {
     super.deactivate();
     this.controller.model?.rollbackAttributes();
diff --git a/app/routes/polls/show.js b/app/routes/polls/poll/index.js
similarity index 77%
rename from app/routes/polls/show.js
rename to app/routes/polls/poll/index.js
index 54906dd31..623c97358 100644
--- a/app/routes/polls/show.js
+++ b/app/routes/polls/poll/index.js
@@ -1,9 +1,9 @@
-import { hash } from 'rsvp';
-import { inject as service } from '@ember/service';
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 import FormLoadOrCreateUtil from 'amber-ui/utils/form-load-or-create';
+import { hash } from 'rsvp';
+import { inject as service } from '@ember/service';
 
-export default class ShowPollsRoute extends AuthenticatedRoute {
+export default class PollIndexRoute extends AuthenticatedRoute {
   @service store;
 
   constructor() {
@@ -11,22 +11,18 @@ export default class ShowPollsRoute extends AuthenticatedRoute {
     this.formLoadOrCreateUtil = new FormLoadOrCreateUtil(this);
   }
 
-  get breadCrumb() {
-    return { title: this.controller.model.poll.question.question };
-  }
-
   get pageActions() {
     const { poll } = this.controller.model;
     return [
       {
-        link: 'polls.edit',
+        link: 'polls.poll.edit',
         title: 'Wijzigen',
         icon: 'pencil',
         linkArgument: poll,
         canAccess: this.abilities.can('edit poll', poll),
       },
       {
-        link: 'polls.destroy',
+        link: 'polls.poll.destroy',
         title: 'Verwijderen',
         icon: 'trash',
         linkArgument: poll,
@@ -39,9 +35,9 @@ export default class ShowPollsRoute extends AuthenticatedRoute {
     return this.abilities.can('show polls');
   }
 
-  model(params) {
-    const pollPromise = this.store.findRecord('poll', params.id, params);
-    const formPromise = pollPromise.then((poll) => poll.get('form'));
+  model() {
+    const poll = this.modelFor('polls.poll');
+    const formPromise = poll.form;
     const responsePromise = formPromise
       // Load or create the response
       .then((form) =>
@@ -57,7 +53,7 @@ export default class ShowPollsRoute extends AuthenticatedRoute {
       );
 
     return hash({
-      poll: pollPromise,
+      poll,
       form: formPromise,
       currentUserResponse: responsePromise,
     });
diff --git a/app/routes/profile.js b/app/routes/profile.js
new file mode 100644
index 000000000..bfcbea805
--- /dev/null
+++ b/app/routes/profile.js
@@ -0,0 +1,14 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+import { inject as service } from '@ember/service';
+
+export default class ProfileRoute extends AuthenticatedRoute {
+  @service router;
+
+  canAccess() {
+    return this.abilities.can('show users');
+  }
+
+  redirect() {
+    this.router.transitionTo('users.user', this.session.currentUser.id);
+  }
+}
diff --git a/app/routes/quickpost.js b/app/routes/quickpost.js
index 5767ea5e1..170104311 100644
--- a/app/routes/quickpost.js
+++ b/app/routes/quickpost.js
@@ -1,7 +1,7 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
 export default class QuickpostRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Quickpost' };
+  breadcrumb = { title: 'Quickpost' };
 
   canAccess() {
     return this.abilities.can('show quickpost-messages');
diff --git a/app/routes/sog/index.js b/app/routes/sog/index.js
index e9ebd3b76..6e9f15827 100644
--- a/app/routes/sog/index.js
+++ b/app/routes/sog/index.js
@@ -1,7 +1,7 @@
 import { ApplicationRoute } from 'amber-ui/routes/application/application';
 
 export default class SogIndexRoute extends ApplicationRoute {
-  breadCrumb = { title: 'SOG' };
+  breadcrumb = { title: 'SOG' };
 
   canAccess() {
     return this.abilities.can('show sog');
diff --git a/app/routes/sog/name-trainer.js b/app/routes/sog/name-trainer.js
index 3ca2f3db9..46f4a351e 100644
--- a/app/routes/sog/name-trainer.js
+++ b/app/routes/sog/name-trainer.js
@@ -1,7 +1,7 @@
 import { ApplicationRoute } from 'amber-ui/routes/application/application';
 
 export default class SogIndexRoute extends ApplicationRoute {
-  breadCrumb = { title: 'Namen leren' };
+  breadcrumb = { title: 'Namen leren' };
 
   canAccess() {
     return this.abilities.can('show sog/name-trainer');
diff --git a/app/routes/static-pages.js b/app/routes/static-pages.js
new file mode 100644
index 000000000..6fe99a940
--- /dev/null
+++ b/app/routes/static-pages.js
@@ -0,0 +1,15 @@
+import { ApplicationRoute } from 'amber-ui/routes/application/application';
+import { capitalize } from '@ember/string';
+import { inject as service } from '@ember/service';
+
+export default class StaticPagesRoute extends ApplicationRoute {
+  @service intl;
+
+  queryParams = {};
+
+  get breadcrumb() {
+    return {
+      title: capitalize(this.intl.t('model.staticPage.name.other').toString()),
+    };
+  }
+}
diff --git a/app/routes/static-pages/destroy.js b/app/routes/static-pages/destroy.js
deleted file mode 100644
index 6ac0c3ad0..000000000
--- a/app/routes/static-pages/destroy.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
-
-export default class DestroyStaticPageRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Informatie pagina verwijderen' };
-
-  canAccess() {
-    return this.abilities.can('destroy static-pages');
-  }
-
-  model(params) {
-    return this.store.findRecord('static-page', params.id, params);
-  }
-}
diff --git a/app/routes/static-pages/index.js b/app/routes/static-pages/index.js
index 2dc91126a..46530fe6c 100644
--- a/app/routes/static-pages/index.js
+++ b/app/routes/static-pages/index.js
@@ -1,16 +1,6 @@
 import { ApplicationRoute } from 'amber-ui/routes/application/application';
-import { inject as service } from '@ember/service';
-import { capitalize } from '@ember/string';
 
 export default class StaticPagesIndexRoute extends ApplicationRoute {
-  @service intl;
-
-  get breadCrumb() {
-    return {
-      title: capitalize(this.intl.t('model.staticPage.name.other').toString()),
-    };
-  }
-
   get pageActions() {
     return [
       {
@@ -22,10 +12,6 @@ export default class StaticPagesIndexRoute extends ApplicationRoute {
     ];
   }
 
-  canAccess() {
-    return this.abilities.can('show static-pages');
-  }
-
   model(params) {
     return this.store.query('static-page', params);
   }
diff --git a/app/routes/static-pages/new.js b/app/routes/static-pages/new.js
index 94522722e..7ea4942fe 100644
--- a/app/routes/static-pages/new.js
+++ b/app/routes/static-pages/new.js
@@ -1,7 +1,7 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class NewStaticPageRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Informatie pagina aanmaken' };
+export default class StaticPagesNewRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Infopagina aanmaken' };
 
   canAccess() {
     return this.abilities.can('create static-pages');
diff --git a/app/routes/static-pages/static-page.js b/app/routes/static-pages/static-page.js
new file mode 100644
index 000000000..ea9e5afee
--- /dev/null
+++ b/app/routes/static-pages/static-page.js
@@ -0,0 +1,13 @@
+import { ApplicationRoute } from 'amber-ui/routes/application/application';
+
+export default class StaticPageRoute extends ApplicationRoute {
+  queryParams = {};
+
+  get breadcrumb() {
+    return { title: this.controller?.model.title };
+  }
+
+  model(params) {
+    return this.store.findRecord('static-page', params.id, params);
+  }
+}
diff --git a/app/routes/static-pages/static-page/destroy.js b/app/routes/static-pages/static-page/destroy.js
new file mode 100644
index 000000000..71a6fc099
--- /dev/null
+++ b/app/routes/static-pages/static-page/destroy.js
@@ -0,0 +1,9 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class StaticPageDestroyRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Infopagina verwijderen' };
+
+  canAccess() {
+    return this.abilities.can('destroy static-pages');
+  }
+}
diff --git a/app/routes/static-pages/edit.js b/app/routes/static-pages/static-page/edit.js
similarity index 54%
rename from app/routes/static-pages/edit.js
rename to app/routes/static-pages/static-page/edit.js
index 0070ab635..043c438cd 100644
--- a/app/routes/static-pages/edit.js
+++ b/app/routes/static-pages/static-page/edit.js
@@ -1,16 +1,12 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class EditStaticPageRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Informatie pagina aanpassen' };
+export default class StaticPageEditRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Infopagina aanpassen' };
 
   canAccess() {
     return this.abilities.can('edit static-pages');
   }
 
-  model(params) {
-    return this.store.findRecord('static-page', params.id, params);
-  }
-
   deactivate() {
     super.deactivate();
     this.controller.model?.rollbackAttributes();
diff --git a/app/routes/static-pages/show.js b/app/routes/static-pages/static-page/index.js
similarity index 55%
rename from app/routes/static-pages/show.js
rename to app/routes/static-pages/static-page/index.js
index ccb7c7a4a..ed88bb172 100644
--- a/app/routes/static-pages/show.js
+++ b/app/routes/static-pages/static-page/index.js
@@ -1,21 +1,17 @@
 import { ApplicationRoute } from 'amber-ui/routes/application/application';
 
-export default class ShowStaticPagesRoute extends ApplicationRoute {
-  get breadCrumb() {
-    return { title: this.controller.model.title };
-  }
-
+export default class StaticPageIndexRoute extends ApplicationRoute {
   get pageActions() {
     return [
       {
-        link: 'static-pages.edit',
+        link: 'static-pages.static-page.edit',
         title: 'Wijzigen',
         icon: 'pencil',
         linkArgument: this.controller.model,
         canAccess: this.abilities.can('edit static-pages'),
       },
       {
-        link: 'static-pages.destroy',
+        link: 'static-pages.static-page.destroy',
         title: 'Verwijderen',
         icon: 'trash',
         linkArgument: this.controller.model,
@@ -23,12 +19,4 @@ export default class ShowStaticPagesRoute extends ApplicationRoute {
       },
     ];
   }
-
-  canAccess() {
-    return this.abilities.can('show static-pages');
-  }
-
-  model(params) {
-    return this.store.findRecord('static-page', params.id, params);
-  }
 }
diff --git a/app/routes/users.js b/app/routes/users.js
new file mode 100644
index 000000000..9142de30d
--- /dev/null
+++ b/app/routes/users.js
@@ -0,0 +1,7 @@
+import { ApplicationRoute } from 'amber-ui/routes/application/application';
+
+export default class UsersRoute extends ApplicationRoute {
+  queryParams = {};
+
+  breadcrumb = { title: 'Gebruikers' };
+}
diff --git a/app/routes/users/activate-account.js b/app/routes/users/activate-account.js
deleted file mode 100644
index 3e6b5e7da..000000000
--- a/app/routes/users/activate-account.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default Route;
diff --git a/app/routes/users/batch.js b/app/routes/users/batch.js
deleted file mode 100644
index 2e59471b6..000000000
--- a/app/routes/users/batch.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class BatchRoute extends Route {
-  breadCrumb = null;
-}
diff --git a/app/routes/users/batch/new.js b/app/routes/users/batch/new.js
index 19a543fab..2ec7520e7 100644
--- a/app/routes/users/batch/new.js
+++ b/app/routes/users/batch/new.js
@@ -1,7 +1,7 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class EditStaticPageRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Batch gebruikers uploaden' };
+export default class BatchNewRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Batch gebruikers uploaden' };
 
   canAccess() {
     return this.abilities.can('batch upload users');
diff --git a/app/routes/users/destroy.js b/app/routes/users/destroy.js
deleted file mode 100644
index 648375f81..000000000
--- a/app/routes/users/destroy.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
-
-export default class DestroyUserRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Lid verwijderen' };
-
-  canAccess(model) {
-    return this.abilities.can('destroy user', model);
-  }
-
-  model(params) {
-    return this.store.findRecord('user', params.id, params);
-  }
-}
diff --git a/app/routes/users/edit-permissions.js b/app/routes/users/edit-permissions.js
deleted file mode 100644
index 3533de386..000000000
--- a/app/routes/users/edit-permissions.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import EditUserRoute from 'amber-ui/routes/users/edit';
-
-export default class EditUserPermissionsRoute extends EditUserRoute {
-  canAccess() {
-    return this.abilities.can('create permissions-users');
-  }
-}
diff --git a/app/routes/users/edit-privacy.js b/app/routes/users/edit-privacy.js
deleted file mode 100644
index 5ad74fe3d..000000000
--- a/app/routes/users/edit-privacy.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import EditUserRoute from 'amber-ui/routes/users/edit';
-
-export default EditUserRoute;
diff --git a/app/routes/users/edit-security.js b/app/routes/users/edit-security.js
deleted file mode 100644
index 5ad74fe3d..000000000
--- a/app/routes/users/edit-security.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import EditUserRoute from 'amber-ui/routes/users/edit';
-
-export default EditUserRoute;
diff --git a/app/routes/users/forgot-password.js b/app/routes/users/forgot-password.js
deleted file mode 100644
index 3e6b5e7da..000000000
--- a/app/routes/users/forgot-password.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default Route;
diff --git a/app/routes/users/index.js b/app/routes/users/index.js
index ad760a9f0..ab0684d84 100644
--- a/app/routes/users/index.js
+++ b/app/routes/users/index.js
@@ -1,8 +1,6 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class UserIndexRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Gebruikers' };
-
+export default class UsersIndexRoute extends AuthenticatedRoute {
   get pageActions() {
     return [
       {
diff --git a/app/routes/users/members.js b/app/routes/users/members.js
index 84204e6de..55b916f26 100644
--- a/app/routes/users/members.js
+++ b/app/routes/users/members.js
@@ -1,7 +1,7 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class MembersRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Leden' };
+export default class UsersMembersRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Leden' };
 
   get pageActions() {
     return [
diff --git a/app/routes/users/new.js b/app/routes/users/new.js
index c6124d0ab..99045651f 100644
--- a/app/routes/users/new.js
+++ b/app/routes/users/new.js
@@ -1,7 +1,7 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class NewUserRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Gebruiker aanmaken' };
+export default class UsersNewRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Gebruiker aanmaken' };
 
   canAccess() {
     return this.abilities.can('create users');
diff --git a/app/routes/users/resend-activation.js b/app/routes/users/resend-activation.js
deleted file mode 100644
index b3aa96c2f..000000000
--- a/app/routes/users/resend-activation.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
-
-export default class ResendActivationRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Activatiecode hersturen' };
-
-  canAccess(model) {
-    return this.abilities.can('resend activation code of user', model);
-  }
-
-  model(params) {
-    return this.store.findRecord('user', params.id, params);
-  }
-}
diff --git a/app/routes/users/show-groups.js b/app/routes/users/show-groups.js
deleted file mode 100644
index d082da4eb..000000000
--- a/app/routes/users/show-groups.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import ShowUserRouter from 'amber-ui/routes/users/show';
-
-export default class ShowUserGroupsRoute extends ShowUserRouter {
-  pageActions = null;
-}
diff --git a/app/routes/users/show-mail.js b/app/routes/users/show-mail.js
deleted file mode 100644
index 5198630db..000000000
--- a/app/routes/users/show-mail.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import ShowUserRouter from 'amber-ui/routes/users/show';
-
-export default class ShowUserMailRoute extends ShowUserRouter {
-  pageActions = null;
-
-  canAccess() {
-    return this.abilities.can('show mail-aliases');
-  }
-}
diff --git a/app/routes/users/show-mandates.js b/app/routes/users/show-mandates.js
deleted file mode 100644
index 30cbd768a..000000000
--- a/app/routes/users/show-mandates.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import ShowUserRouter from 'amber-ui/routes/users/show';
-
-export default class ShowUserMandatesRoute extends ShowUserRouter {
-  pageActions = null;
-}
diff --git a/app/routes/users/user.js b/app/routes/users/user.js
new file mode 100644
index 000000000..78baa9038
--- /dev/null
+++ b/app/routes/users/user.js
@@ -0,0 +1,17 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class UserRoute extends AuthenticatedRoute {
+  queryParams = {};
+
+  get breadcrumb() {
+    return { title: this.controller?.model.fullName };
+  }
+
+  canAccess() {
+    return this.abilities.can('show users');
+  }
+
+  model(params) {
+    return this.store.findRecord('user', params.id, params);
+  }
+}
diff --git a/app/routes/users/user/destroy.js b/app/routes/users/user/destroy.js
new file mode 100644
index 000000000..0331370df
--- /dev/null
+++ b/app/routes/users/user/destroy.js
@@ -0,0 +1,9 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class UserDestroyRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Lid verwijderen' };
+
+  canAccess(model) {
+    return this.abilities.can('destroy user', model);
+  }
+}
diff --git a/app/routes/users/user/edit.js b/app/routes/users/user/edit.js
new file mode 100644
index 000000000..389b2dcf1
--- /dev/null
+++ b/app/routes/users/user/edit.js
@@ -0,0 +1,7 @@
+import { ApplicationRoute } from 'amber-ui/routes/application/application';
+
+export default class UserEditRoute extends ApplicationRoute {
+  queryParams = {};
+
+  breadcrumb = { title: 'Lid aanpassen' };
+}
diff --git a/app/routes/users/edit.js b/app/routes/users/user/edit/index.js
similarity index 70%
rename from app/routes/users/edit.js
rename to app/routes/users/user/edit/index.js
index 1037fa213..c6d05ee15 100644
--- a/app/routes/users/edit.js
+++ b/app/routes/users/user/edit/index.js
@@ -1,31 +1,29 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class EditUserRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Lid aanpassen' };
-
+export default class EditIndexRoute extends AuthenticatedRoute {
   get tabItems() {
     const user = this.controller.model;
     return [
       {
-        link: 'users.edit',
+        link: 'users.user.edit.index',
         title: 'Algemeen',
         linkArgument: user,
         canAccess: true,
       },
       {
-        link: 'users.edit-permissions',
+        link: 'users.user.edit.permissions',
         title: 'Rechten',
         linkArgument: user,
         canAccess: this.abilities.can('create permissions-users'),
       },
       {
-        link: 'users.edit-privacy',
+        link: 'users.user.edit.privacy',
         title: 'Privacy',
         linkArgument: user,
         canAccess: this.session.currentUser === user,
       },
       {
-        link: 'users.edit-security',
+        link: 'users.user.edit.security',
         title: 'Beveiliging',
         linkArgument: user,
         canAccess: this.session.currentUser === user,
@@ -37,10 +35,6 @@ export default class EditUserRoute extends AuthenticatedRoute {
     return this.abilities.can('edit user', model);
   }
 
-  async model(params) {
-    return await this.store.findRecord('user', params.id, params);
-  }
-
   deactivate() {
     super.deactivate();
     this.controller.model?.rollbackAttributes();
diff --git a/app/routes/users/user/edit/permissions.js b/app/routes/users/user/edit/permissions.js
new file mode 100644
index 000000000..13b78f7fd
--- /dev/null
+++ b/app/routes/users/user/edit/permissions.js
@@ -0,0 +1,7 @@
+import EditIndexRoute from './index';
+
+export default class EditPermissionsRoute extends EditIndexRoute {
+  canAccess() {
+    return this.abilities.can('create permissions-users');
+  }
+}
diff --git a/app/routes/users/user/edit/privacy.js b/app/routes/users/user/edit/privacy.js
new file mode 100644
index 000000000..22cadb533
--- /dev/null
+++ b/app/routes/users/user/edit/privacy.js
@@ -0,0 +1,3 @@
+import EditIndexRoute from './index';
+
+export default class EditPrivacyRoute extends EditIndexRoute {}
diff --git a/app/routes/users/user/edit/security.js b/app/routes/users/user/edit/security.js
new file mode 100644
index 000000000..70f538ff2
--- /dev/null
+++ b/app/routes/users/user/edit/security.js
@@ -0,0 +1,3 @@
+import EditIndexRoute from './index';
+
+export default class EditSecurityRoute extends EditIndexRoute {}
diff --git a/app/routes/users/user/groups.js b/app/routes/users/user/groups.js
new file mode 100644
index 000000000..7bc0ce859
--- /dev/null
+++ b/app/routes/users/user/groups.js
@@ -0,0 +1,5 @@
+import UserIndexRoute from './index';
+
+export default class UserGroupsRoute extends UserIndexRoute {
+  pageActions = null;
+}
diff --git a/app/routes/users/show.js b/app/routes/users/user/index.js
similarity index 74%
rename from app/routes/users/show.js
rename to app/routes/users/user/index.js
index 0761def80..097b306cc 100644
--- a/app/routes/users/show.js
+++ b/app/routes/users/user/index.js
@@ -1,22 +1,18 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class ShowUserRouter extends AuthenticatedRoute {
-  get breadCrumb() {
-    return { title: this.controller.model.fullName };
-  }
-
+export default class UserIndexRoute extends AuthenticatedRoute {
   get pageActions() {
     const user = this.controller.model;
     return [
       {
-        link: 'users.edit',
+        link: 'users.user.edit',
         title: 'Wijzigen',
         icon: 'pencil',
         linkArgument: user,
         canAccess: this.abilities.can('edit user', user),
       },
       {
-        link: 'users.resend_activation',
+        link: 'users.user.resend-activation-code',
         title: 'Verstuur activatie code',
         icon: 'paper-plane',
         linkArgument: user,
@@ -29,37 +25,37 @@ export default class ShowUserRouter extends AuthenticatedRoute {
     const user = this.controller.model;
     return [
       {
-        link: 'users.show',
+        link: 'users.user.index',
         title: 'Algemeen',
         linkArgument: user,
         canAccess: this.abilities.can('show users'),
       },
       {
-        link: 'users.show-groups',
+        link: 'users.user.groups',
         title: 'Groepen',
         linkArgument: user,
         canAccess: this.abilities.can('show memberships'),
       },
       {
-        link: 'users.show-settings',
+        link: 'users.user.settings',
         title: 'Instellingen',
         linkArgument: user,
         canAccess: this.abilities.can('edit user', user),
       },
       {
-        link: 'users.show-mail',
+        link: 'users.user.mail',
         title: 'Mail aliassen',
         linkArgument: user,
         canAccess: this.abilities.can('show mail-aliases'),
       },
       {
-        link: 'users.show-mandates',
+        link: 'users.user.mandates',
         title: 'Incasso mandaten',
         linkArgument: user,
         canAccess: true,
       },
       {
-        link: 'users.show-permissions',
+        link: 'users.user.permissions',
         title: 'Rechten',
         linkArgument: user,
         canAccess: this.abilities.can('show permissions-users'),
@@ -70,8 +66,4 @@ export default class ShowUserRouter extends AuthenticatedRoute {
   canAccess() {
     return this.abilities.can('show individual users');
   }
-
-  model(params) {
-    return this.store.findRecord('user', params.id, params);
-  }
 }
diff --git a/app/routes/users/user/mail.js b/app/routes/users/user/mail.js
new file mode 100644
index 000000000..4a1761eff
--- /dev/null
+++ b/app/routes/users/user/mail.js
@@ -0,0 +1,9 @@
+import UserIndexRoute from './index';
+
+export default class UserMailRoute extends UserIndexRoute {
+  pageActions = null;
+
+  canAccess() {
+    return this.abilities.can('show mail-aliases');
+  }
+}
diff --git a/app/routes/users/user/mandates.js b/app/routes/users/user/mandates.js
new file mode 100644
index 000000000..748466e52
--- /dev/null
+++ b/app/routes/users/user/mandates.js
@@ -0,0 +1,5 @@
+import UserIndexRoute from './index';
+
+export default class UserMandatesRoute extends UserIndexRoute {
+  pageActions = null;
+}
diff --git a/app/routes/users/show-permissions.js b/app/routes/users/user/permissions.js
similarity index 66%
rename from app/routes/users/show-permissions.js
rename to app/routes/users/user/permissions.js
index 9f86099cf..7c4e7d1f9 100644
--- a/app/routes/users/show-permissions.js
+++ b/app/routes/users/user/permissions.js
@@ -1,11 +1,11 @@
-import ShowUserRouter from 'amber-ui/routes/users/show';
+import UserIndexRoute from './index';
 
-export default class ShowUserPermissions extends ShowUserRouter {
+export default class UserPermissionsRoute extends UserIndexRoute {
   get pageActions() {
     const user = this.controller.model;
     return [
       {
-        link: 'users.edit-permissions',
+        link: 'users.user.edit.permissions',
         title: 'Wijzigen',
         icon: 'pencil',
         linkArgument: user,
diff --git a/app/routes/users/user/resend-activation-code.js b/app/routes/users/user/resend-activation-code.js
new file mode 100644
index 000000000..7a730520b
--- /dev/null
+++ b/app/routes/users/user/resend-activation-code.js
@@ -0,0 +1,9 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class UserResendActivationCodeRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Activatiecode hersturen' };
+
+  canAccess(model) {
+    return this.abilities.can('resend activation code of user', model);
+  }
+}
diff --git a/app/routes/users/show-settings.js b/app/routes/users/user/settings.js
similarity index 67%
rename from app/routes/users/show-settings.js
rename to app/routes/users/user/settings.js
index 0bf51dc9d..6c78e7ee0 100644
--- a/app/routes/users/show-settings.js
+++ b/app/routes/users/user/settings.js
@@ -1,11 +1,11 @@
-import ShowUserRouter from 'amber-ui/routes/users/show';
+import UserIndexRoute from './index';
 
-export default class ShowUserSettings extends ShowUserRouter {
+export default class UserSettingsRoute extends UserIndexRoute {
   get pageActions() {
     const user = this.controller.model;
     return [
       {
-        link: 'users.edit-privacy',
+        link: 'users.user.edit.privacy',
         title: 'Wijzigen',
         icon: 'pencil',
         linkArgument: user,
diff --git a/app/routes/users/webdav.js b/app/routes/users/webdav.js
index f64b63e23..3b7ac4709 100644
--- a/app/routes/users/webdav.js
+++ b/app/routes/users/webdav.js
@@ -1,7 +1,7 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class WebdavRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Contactsynchronisatie' };
+export default class UsersWebdavRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Contactsynchronisatie' };
 
   canAccess() {
     return this.abilities.can('show webdav users');
diff --git a/app/routes/vacancies.js b/app/routes/vacancies.js
new file mode 100644
index 000000000..5506a7b2a
--- /dev/null
+++ b/app/routes/vacancies.js
@@ -0,0 +1,7 @@
+import { ApplicationRoute } from 'amber-ui/routes/application/application';
+
+export default class VacanciesRoute extends ApplicationRoute {
+  queryParams = {};
+
+  breadcrumb = { title: 'Vacatures' };
+}
diff --git a/app/routes/vacancies/destroy.js b/app/routes/vacancies/destroy.js
deleted file mode 100644
index ee0cc6647..000000000
--- a/app/routes/vacancies/destroy.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
-
-export default class DestroyVacancyRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Vacature verwijderen' };
-
-  canAccess() {
-    return this.abilities.can('destroy vacancies');
-  }
-
-  model(params) {
-    return this.store.findRecord('vacancy', params.id, params);
-  }
-}
diff --git a/app/routes/vacancies/index.js b/app/routes/vacancies/index.js
index aa82999a4..b7b9ab448 100644
--- a/app/routes/vacancies/index.js
+++ b/app/routes/vacancies/index.js
@@ -1,8 +1,6 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class IndexVacancyRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Vacatures' };
-
+export default class VacanciesIndexRoute extends AuthenticatedRoute {
   queryParams = {
     page: {
       refreshModel: true,
diff --git a/app/routes/vacancies/new.js b/app/routes/vacancies/new.js
index 27aac5d5b..ca5372a97 100644
--- a/app/routes/vacancies/new.js
+++ b/app/routes/vacancies/new.js
@@ -1,7 +1,7 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class NewVacancyRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Vacature aanmaken' };
+export default class VacanciesNewRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Vacature aanmaken' };
 
   canAccess() {
     return this.abilities.can('create vacancies');
diff --git a/app/routes/vacancies/vacancy.js b/app/routes/vacancies/vacancy.js
new file mode 100644
index 000000000..0e42cf08c
--- /dev/null
+++ b/app/routes/vacancies/vacancy.js
@@ -0,0 +1,17 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class VacancyRoute extends AuthenticatedRoute {
+  queryParams = {};
+
+  get breadcrumb() {
+    return { title: this.controller?.model.title };
+  }
+
+  canAccess() {
+    return this.abilities.can('show vacancies');
+  }
+
+  model(params) {
+    return this.store.findRecord('vacancy', params.id, params);
+  }
+}
diff --git a/app/routes/vacancies/vacancy/destroy.js b/app/routes/vacancies/vacancy/destroy.js
new file mode 100644
index 000000000..9b501e50a
--- /dev/null
+++ b/app/routes/vacancies/vacancy/destroy.js
@@ -0,0 +1,9 @@
+import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
+
+export default class VacancyDestroyRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Vacature verwijderen' };
+
+  canAccess() {
+    return this.abilities.can('destroy vacancies');
+  }
+}
diff --git a/app/routes/vacancies/edit.js b/app/routes/vacancies/vacancy/edit.js
similarity index 56%
rename from app/routes/vacancies/edit.js
rename to app/routes/vacancies/vacancy/edit.js
index 12b5e7fe2..e213478e9 100644
--- a/app/routes/vacancies/edit.js
+++ b/app/routes/vacancies/vacancy/edit.js
@@ -1,16 +1,12 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class EditVacancyRoute extends AuthenticatedRoute {
-  breadCrumb = { title: 'Vacature aanpassen' };
+export default class VacancyEditRoute extends AuthenticatedRoute {
+  breadcrumb = { title: 'Vacature aanpassen' };
 
   canAccess(model) {
     return this.abilities.can('edit vacancy', model);
   }
 
-  model(params) {
-    return this.store.findRecord('vacancy', params.id, params);
-  }
-
   deactivate() {
     super.deactivate();
     this.controller.model?.rollbackAttributes();
diff --git a/app/routes/vacancies/show.js b/app/routes/vacancies/vacancy/index.js
similarity index 60%
rename from app/routes/vacancies/show.js
rename to app/routes/vacancies/vacancy/index.js
index 8badbd93d..521623889 100644
--- a/app/routes/vacancies/show.js
+++ b/app/routes/vacancies/vacancy/index.js
@@ -1,25 +1,18 @@
-import { inject as service } from '@ember/service';
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 
-export default class ShowVacancyRoute extends AuthenticatedRoute {
-  @service store;
-
-  get breadCrumb() {
-    return { title: this.controller.model.title };
-  }
-
+export default class VacancyIndexRoute extends AuthenticatedRoute {
   get pageActions() {
     const vacancy = this.controller.model;
     return [
       {
-        link: 'vacancies.edit',
+        link: 'vacancies.vacancy.edit',
         title: 'Wijzigen',
         icon: 'pencil',
         linkArgument: vacancy,
         canAccess: this.abilities.can('edit vacancy', vacancy),
       },
       {
-        link: 'vacancies.destroy',
+        link: 'vacancies.vacancy.destroy',
         title: 'Verwijderen',
         icon: 'trash',
         linkArgument: vacancy,
@@ -31,8 +24,4 @@ export default class ShowVacancyRoute extends AuthenticatedRoute {
   canAccess() {
     return this.abilities.can('show vacancies');
   }
-
-  model(params) {
-    return this.store.findRecord('vacancy', params.id, params);
-  }
 }
diff --git a/app/services/fetch.js b/app/services/fetch.js
index 975d19a92..dfcac2b0f 100644
--- a/app/services/fetch.js
+++ b/app/services/fetch.js
@@ -1,5 +1,5 @@
 import Service, { inject as service } from '@ember/service';
-import ENV from '../config/environment';
+import ENV from 'amber-ui/config/environment';
 import { fetch as basefetch } from 'fetch';
 
 export default class FetchService extends Service {
diff --git a/app/services/flash-notice.js b/app/services/flash-notice.js
index 138dea871..420bc0605 100644
--- a/app/services/flash-notice.js
+++ b/app/services/flash-notice.js
@@ -1,6 +1,6 @@
 import Service, { inject as service } from '@ember/service';
 import { run } from '@ember/runloop';
-import ENV from '../config/environment';
+import ENV from 'amber-ui/config/environment';
 import { tracked } from '@glimmer/tracking';
 
 export default class FlashNoticeService extends Service {
diff --git a/app/templates/activities/destroy.hbs b/app/templates/activities/activity/destroy.hbs
similarity index 83%
rename from app/templates/activities/destroy.hbs
rename to app/templates/activities/activity/destroy.hbs
index f5dae0031..7cfe851bf 100644
--- a/app/templates/activities/destroy.hbs
+++ b/app/templates/activities/activity/destroy.hbs
@@ -11,11 +11,7 @@
     <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
       Verwijderen
     </button>
-    <button
-      {{action 'cancel'}}
-      type="button"
-      class='btn btn-default'
-    >
+    <button {{action 'cancel'}} type="button" class='btn btn-default'>
       Annuleren
     </button>
     {{#if errorMessage}}
diff --git a/app/templates/activities/edit.hbs b/app/templates/activities/activity/edit.hbs
similarity index 100%
rename from app/templates/activities/edit.hbs
rename to app/templates/activities/activity/edit.hbs
diff --git a/app/templates/activities/generate-alias.hbs b/app/templates/activities/activity/generate-alias.hbs
similarity index 100%
rename from app/templates/activities/generate-alias.hbs
rename to app/templates/activities/activity/generate-alias.hbs
diff --git a/app/templates/activities/show.hbs b/app/templates/activities/activity/index.hbs
similarity index 100%
rename from app/templates/activities/show.hbs
rename to app/templates/activities/activity/index.hbs
diff --git a/app/templates/activities/print-enrolled.hbs b/app/templates/activities/activity/print-enrolled.hbs
similarity index 99%
rename from app/templates/activities/print-enrolled.hbs
rename to app/templates/activities/activity/print-enrolled.hbs
index 1cfa922c9..2a5ead808 100644
--- a/app/templates/activities/print-enrolled.hbs
+++ b/app/templates/activities/activity/print-enrolled.hbs
@@ -133,7 +133,7 @@
           Afdrukken
         </button>
         <LinkTo
-          @route='activities.show'
+          @route='activities.activity'
           @model={{@model.id}}
           class='btn btn-default'
         >
diff --git a/app/templates/activities/index.hbs b/app/templates/activities/index.hbs
index 16f0bb8ed..beb78a15e 100644
--- a/app/templates/activities/index.hbs
+++ b/app/templates/activities/index.hbs
@@ -35,7 +35,7 @@
 
   {{#each model as |activity|}}
     <LinkTo
-      @route='activities.show'
+      @route='activities.activity'
       @model={{activity.id}}
       data-test-activity-item={{true}}
     >
diff --git a/app/templates/application.hbs b/app/templates/application.hbs
index 598dce650..92dab66e5 100644
--- a/app/templates/application.hbs
+++ b/app/templates/application.hbs
@@ -1,5 +1,5 @@
 <div class='ember-view'>
-  <HeaderNav />
+  <HeaderNav @routeInfos={{this.routeInfos}} />
   <FlashNotice />
   <div id='ember-wormhole-destination'></div>
 
diff --git a/app/templates/article-comments/destroy.hbs b/app/templates/article-comments/article-comment/destroy.hbs
similarity index 100%
rename from app/templates/article-comments/destroy.hbs
rename to app/templates/article-comments/article-comment/destroy.hbs
diff --git a/app/templates/articles/destroy.hbs b/app/templates/articles/article/destroy.hbs
similarity index 100%
rename from app/templates/articles/destroy.hbs
rename to app/templates/articles/article/destroy.hbs
diff --git a/app/templates/articles/edit.hbs b/app/templates/articles/article/edit.hbs
similarity index 100%
rename from app/templates/articles/edit.hbs
rename to app/templates/articles/article/edit.hbs
diff --git a/app/templates/articles/show.hbs b/app/templates/articles/article/index.hbs
similarity index 100%
rename from app/templates/articles/show.hbs
rename to app/templates/articles/article/index.hbs
diff --git a/app/templates/articles/index.hbs b/app/templates/articles/index.hbs
index d3ad9a381..ffab69f13 100644
--- a/app/templates/articles/index.hbs
+++ b/app/templates/articles/index.hbs
@@ -17,7 +17,7 @@
 <div class='row'>
   {{#each model as |article|}}
     <div class='article-col col-md-6'>
-      <LinkTo @route='articles.show' @model={{article.id}}>
+      <LinkTo @route='articles.article' @model={{article.id}}>
         {{cards/article-card article showExcerpt=true useMaxHeight=true}}
       </LinkTo>
     </div>
diff --git a/app/templates/books/destroy.hbs b/app/templates/books/book/destroy.hbs
similarity index 100%
rename from app/templates/books/destroy.hbs
rename to app/templates/books/book/destroy.hbs
diff --git a/app/templates/books/edit.hbs b/app/templates/books/book/edit.hbs
similarity index 100%
rename from app/templates/books/edit.hbs
rename to app/templates/books/book/edit.hbs
diff --git a/app/templates/books/show.hbs b/app/templates/books/book/index.hbs
similarity index 100%
rename from app/templates/books/show.hbs
rename to app/templates/books/book/index.hbs
diff --git a/app/templates/books/index.hbs b/app/templates/books/index.hbs
index de7878390..daacbe0e7 100644
--- a/app/templates/books/index.hbs
+++ b/app/templates/books/index.hbs
@@ -22,7 +22,7 @@
   </div>
   {{#each model as |book|}}
     <div class='col-lg-3 col-md-4 col-6 mb-3'>
-      <LinkTo @route='books.show' @model={{book.id}}>
+      <LinkTo @route='books.book' @model={{book.id}}>
         <article itemscope itemtype='https://schema.org/Book'>
           <div class='card' data-test-article-card>
             <div class='card-header card-header--overlay'>
diff --git a/app/templates/debit/collections/destroy.hbs b/app/templates/debit/collections/collection/destroy.hbs
similarity index 92%
rename from app/templates/debit/collections/destroy.hbs
rename to app/templates/debit/collections/collection/destroy.hbs
index 2471a07fe..efafb837e 100644
--- a/app/templates/debit/collections/destroy.hbs
+++ b/app/templates/debit/collections/collection/destroy.hbs
@@ -15,7 +15,7 @@
       Verwijderen
     </button>
     <LinkTo
-      @route='debit.collections.show'
+      @route='debit.collections.collection'
       @model={{model.id}}
       class='btn btn-default'
     >
diff --git a/app/templates/debit/collections/edit.hbs b/app/templates/debit/collections/collection/edit.hbs
similarity index 97%
rename from app/templates/debit/collections/edit.hbs
rename to app/templates/debit/collections/collection/edit.hbs
index bc1d402a7..f6f4b0f86 100644
--- a/app/templates/debit/collections/edit.hbs
+++ b/app/templates/debit/collections/collection/edit.hbs
@@ -1,6 +1,6 @@
 <div class='card'>
   <div class='card-header'>
-    <h5>Incasso bewerken</h5>
+    <h5>{{if @model.isNew 'Incasso aanmaken' 'Incasso wijzigen'}}</h5>
   </div>
   <div class='card-body'>
     <form {{action 'submit' on='submit'}}>
diff --git a/app/templates/debit/collections/show.hbs b/app/templates/debit/collections/collection/index.hbs
similarity index 91%
rename from app/templates/debit/collections/show.hbs
rename to app/templates/debit/collections/collection/index.hbs
index 74574eb7e..506218f9d 100644
--- a/app/templates/debit/collections/show.hbs
+++ b/app/templates/debit/collections/collection/index.hbs
@@ -17,7 +17,7 @@
 
   <div class='card-body'>
     {{#each this.groupedTransactions as |transactionGroup|}}
-      <LinkTo @route='users.show' @model={{transactionGroup.user.id}}>
+      <LinkTo @route='users.user' @model={{transactionGroup.user.id}}>
         <h5>{{transactionGroup.user.fullName}}</h5>
       </LinkTo>
       <table class='table table-sm'>
@@ -36,7 +36,7 @@
               <td class="col-1">
                 {{#if (can 'edit debit/transactions')}}
                   <LinkTo
-                    @route='debit.transactions.edit'
+                    @route='debit.transactions.transaction.edit'
                     @model={{transaction.id}}
                   >
                     <FaIcon @icon='pencil' />
@@ -45,7 +45,7 @@
                 <span class="mx-1"></span>
                 {{#if (can 'destroy debit/transactions')}}
                   <LinkTo
-                    @route='debit.transactions.destroy'
+                    @route='debit.transactions.transaction.destroy'
                     @model={{transaction.id}}
                   >
                     <FaIcon @icon='trash' />
diff --git a/app/templates/debit/collections/sepa.hbs b/app/templates/debit/collections/collection/sepa.hbs
similarity index 70%
rename from app/templates/debit/collections/sepa.hbs
rename to app/templates/debit/collections/collection/sepa.hbs
index 2f86d41d9..5847c80a5 100644
--- a/app/templates/debit/collections/sepa.hbs
+++ b/app/templates/debit/collections/collection/sepa.hbs
@@ -1,9 +1,9 @@
 <div class='card'>
   <div class='card-header d-flex justify-content-between'>
-    <h5>Sepa bestand ophalen mislukt!</h5>
+    <h5>SEPA bestand ophalen mislukt!</h5>
   </div>
   <div class='card-body'>
-    Het ophalen van het sepa bestand is mislukt! De volgende errors zijn
+    Het ophalen van het SEPA bestand is mislukt! De volgende errors zijn
     opgetreden:
     <ul>
       {{#each model as |error|}}
diff --git a/app/templates/debit/collections/index.hbs b/app/templates/debit/collections/index.hbs
index f6ec4b253..31a6b2464 100644
--- a/app/templates/debit/collections/index.hbs
+++ b/app/templates/debit/collections/index.hbs
@@ -16,14 +16,14 @@
 
 <div class='card'>
   <div class='row rtable-row header d-none d-md-flex'>
-    <span class='col'> Naam </span>
-    <span class='col-3'> Datum </span>
+    <span class='col'>Naam</span>
+    <span class='col-3'>Datum</span>
   </div>
 
   {{#each model as |collection|}}
-    <LinkTo @route='debit.collections.show' @model={{collection.id}}>
+    <LinkTo @route='debit.collections.collection' @model={{collection.id}}>
       <div class='row rtable-row'>
-        <span class='col-12 col-md-9 rtable-item'> {{collection.name}} </span>
+        <span class='col-12 col-md-9 rtable-item'>{{collection.name}}</span>
         <span class='col-8 col-md-3 text-muted rtable-item'>
           {{moment-format collection.date 'DD-M-YYYY'}}
         </span>
diff --git a/app/templates/debit/mandates/index.hbs b/app/templates/debit/mandates/index.hbs
index da36e1c32..ab3f09b1f 100644
--- a/app/templates/debit/mandates/index.hbs
+++ b/app/templates/debit/mandates/index.hbs
@@ -23,7 +23,7 @@
   </div>
 
   {{#each model as |mandate|}}
-    <LinkTo @route='debit.mandates.show' @model={{mandate.id}}>
+    <LinkTo @route='debit.mandates.mandate' @model={{mandate.id}}>
       <div class='row rtable-row'>
         <span class='col-12 col-md-3 rtable-item'>
           <span class='d-inline d-md-none text-muted'> ID: </span>
@@ -39,7 +39,7 @@
           {{moment-format mandate.endDate 'DD-M-YYYY'}}
         </span>
         <span class='col-8 col-md-3 rtable-item'>
-          <LinkTo @route='users.show' @model={{mandate.user.id}}>
+          <LinkTo @route='users.user' @model={{mandate.user.id}}>
             <span class='d-inline d-md-none text-muted'> Gebruiker: </span>
             {{mandate.user.fullName}}
           </LinkTo>
diff --git a/app/templates/debit/mandates/edit.hbs b/app/templates/debit/mandates/mandate/edit.hbs
similarity index 100%
rename from app/templates/debit/mandates/edit.hbs
rename to app/templates/debit/mandates/mandate/edit.hbs
diff --git a/app/templates/debit/mandates/show.hbs b/app/templates/debit/mandates/mandate/index.hbs
similarity index 95%
rename from app/templates/debit/mandates/show.hbs
rename to app/templates/debit/mandates/mandate/index.hbs
index 6ce9a8277..44d3df75d 100644
--- a/app/templates/debit/mandates/show.hbs
+++ b/app/templates/debit/mandates/mandate/index.hbs
@@ -37,7 +37,7 @@
                   <tr>
                     <td>Gebruiker</td>
                     <td>
-                      <LinkTo @route='users.show' @model={{@model.user.id}}>
+                      <LinkTo @route='users.user' @model={{@model.user.id}}>
                         {{@model.user.fullName}}
                       </LinkTo>
                     </td>
diff --git a/app/templates/debit/transactions/destroy.hbs b/app/templates/debit/transactions/transaction/destroy.hbs
similarity index 93%
rename from app/templates/debit/transactions/destroy.hbs
rename to app/templates/debit/transactions/transaction/destroy.hbs
index 716a8c50b..ba6b2c8b1 100644
--- a/app/templates/debit/transactions/destroy.hbs
+++ b/app/templates/debit/transactions/transaction/destroy.hbs
@@ -16,7 +16,7 @@
       Verwijderen
     </button>
     <LinkTo
-      @route='debit.collections.show'
+      @route='debit.collections.collection'
       @model={{@model.collection}}
       class='btn btn-default'
     >
diff --git a/app/templates/debit/transactions/edit.hbs b/app/templates/debit/transactions/transaction/edit.hbs
similarity index 100%
rename from app/templates/debit/transactions/edit.hbs
rename to app/templates/debit/transactions/transaction/edit.hbs
diff --git a/app/templates/form/responses/destroy.hbs b/app/templates/form/responses/response/destroy.hbs
similarity index 100%
rename from app/templates/form/responses/destroy.hbs
rename to app/templates/form/responses/response/destroy.hbs
diff --git a/app/templates/forum/categories/category/threads/index.hbs b/app/templates/forum/categories/category/threads/index.hbs
index 6033c0876..77de6d7a1 100644
--- a/app/templates/forum/categories/category/threads/index.hbs
+++ b/app/templates/forum/categories/category/threads/index.hbs
@@ -23,7 +23,7 @@
 
   {{#each @model.threads as |thread|}}
     <LinkTo
-      @route='forum.categories.category.threads.thread.show'
+      @route='forum.categories.category.threads.thread'
       @model={{thread.id}}
     >
       <div class='row rtable-row'>
@@ -32,7 +32,7 @@
           {{thread.title}}
         </span>
         <span class='col-6 col-md-3 text-muted rtable-item'>
-          <LinkTo @route='users.show' @model={{thread.author.id}}>
+          <LinkTo @route='users.user' @model={{thread.author.id}}>
             {{thread.author.fullNameWithNickname}}
           </LinkTo>
         </span>
diff --git a/app/templates/forum/categories/category/threads/thread/posts/destroy.hbs b/app/templates/forum/categories/category/threads/thread/posts/post/destroy.hbs
similarity index 100%
rename from app/templates/forum/categories/category/threads/thread/posts/destroy.hbs
rename to app/templates/forum/categories/category/threads/thread/posts/post/destroy.hbs
diff --git a/app/templates/forum/categories/category/threads/thread/posts/edit.hbs b/app/templates/forum/categories/category/threads/thread/posts/post/edit.hbs
similarity index 100%
rename from app/templates/forum/categories/category/threads/thread/posts/edit.hbs
rename to app/templates/forum/categories/category/threads/thread/posts/post/edit.hbs
diff --git a/app/templates/forum/categories/index.hbs b/app/templates/forum/categories/index.hbs
index e39ff79db..c9fe744ab 100644
--- a/app/templates/forum/categories/index.hbs
+++ b/app/templates/forum/categories/index.hbs
@@ -11,7 +11,7 @@
 
   {{#each @model.recentThreads as |thread|}}
     <LinkTo
-      @route='forum.categories.category.threads.thread.show'
+      @route='forum.categories.category.threads.thread'
       @models={{array thread.category thread}}
     >
       <div class='row rtable-row'>
@@ -20,7 +20,7 @@
           {{thread.title}}
         </span>
         <span class='col-6 col-md-3 text-muted rtable-item'>
-          <LinkTo @route='users.show' @model={{thread.author.id}}>
+          <LinkTo @route='users.user' @model={{thread.author.id}}>
             {{thread.author.fullNameWithNickname}}
           </LinkTo>
         </span>
diff --git a/app/templates/groups/edit.hbs b/app/templates/groups/group/edit.hbs
similarity index 100%
rename from app/templates/groups/edit.hbs
rename to app/templates/groups/group/edit.hbs
diff --git a/app/templates/groups/export.hbs b/app/templates/groups/group/export.hbs
similarity index 97%
rename from app/templates/groups/export.hbs
rename to app/templates/groups/group/export.hbs
index 51bdece4e..fcd6a8b5f 100644
--- a/app/templates/groups/export.hbs
+++ b/app/templates/groups/group/export.hbs
@@ -56,7 +56,7 @@
         >
           Exporteren
         </button>
-        <LinkTo @route='groups.show' @model={{model.id}}>
+        <LinkTo @route='groups.group' @model={{model.id}}>
           <button type='button' class='btn btn-default mb-3'>Annuleren</button>
         </LinkTo>
       </div>
diff --git a/app/templates/groups/show.hbs b/app/templates/groups/group/index.hbs
similarity index 95%
rename from app/templates/groups/show.hbs
rename to app/templates/groups/group/index.hbs
index 7f4ed485f..582d92b9a 100644
--- a/app/templates/groups/show.hbs
+++ b/app/templates/groups/group/index.hbs
@@ -1,5 +1,5 @@
 <EmberWormhole @to='navbar-wormhole'>
-  {{page-actions-buttons pageActions}}
+  <PageActionsButtons @pageActions={{pageActions}} />
 </EmberWormhole>
 
 <div class='row'>
@@ -77,14 +77,14 @@
                 </div>
               </ul>
             </div>
-            
+
           </div>
         </div>
         <div class='card-body'>
           <div class='row userlist'>
             {{#each filteredModels as |membership|}}
               <LinkTo
-                @route='users.show'
+                @route='users.user'
                 @model={{membership.user.id}}
                 class='col-6 col-sm-4 col-md-3'
               >
@@ -144,7 +144,11 @@
                   {{alias.moderationType}}
                 </span>
                 {{#if (can 'edit mail-aliases')}}
-                  <LinkTo @route='mail-aliases.edit' @model={{alias.id}} class="col-12 col-md-1 rtable-item">
+                  <LinkTo
+                    @route='mail-aliases.mail-alias.edit'
+                    @model={{alias.id}}
+                    class="col-12 col-md-1 rtable-item"
+                  >
                     <button type='button' class='btn btn-danger py-1 px-2 '>
                       <FaIcon @size="sm" @icon='pencil' />
                     </button>
diff --git a/app/templates/groups/index.hbs b/app/templates/groups/index.hbs
index 803568924..253a82832 100644
--- a/app/templates/groups/index.hbs
+++ b/app/templates/groups/index.hbs
@@ -98,7 +98,7 @@
           <div class='row'>
             {{#each model as |group|}}
               <LinkTo
-                @route='groups.show'
+                @route='groups.group'
                 @model={{group.id}}
                 class='col-6 col-md-12 col-lg-4'
               >
diff --git a/app/templates/login.hbs b/app/templates/login.hbs
index bd684996d..7f20e6cf1 100644
--- a/app/templates/login.hbs
+++ b/app/templates/login.hbs
@@ -58,7 +58,7 @@
 
               <div class='row password-forgot-holder'>
                 <LinkTo
-                  @route='users.forgot_password'
+                  @route='users.forgot-password'
                   class='forgot-password-label'
                 >
                   {{t 'template.login.forgotPassword'}}
diff --git a/app/templates/mail-aliases/index.hbs b/app/templates/mail-aliases/index.hbs
index 810803d0d..314e8c13b 100644
--- a/app/templates/mail-aliases/index.hbs
+++ b/app/templates/mail-aliases/index.hbs
@@ -25,7 +25,7 @@
   </div>
 
   {{#each model as |mailAlias|}}
-    <LinkTo @route='mail-aliases.show' @model={{mailAlias.id}}>
+    <LinkTo @route='mail-aliases.mail-alias' @model={{mailAlias.id}}>
       <div class='row rtable-row'>
         <span class='col-12 col-md-3 rtable-item'> {{mailAlias.email}} </span>
         <span class='col-12 col-md-1 rtable-item'>
@@ -50,12 +50,12 @@
         <span class='col-12 col-md-2 rtable-item'>
           <span class='d-inline d-md-none text-muted'> Groep/Gebruiker: </span>
           {{#if mailAlias.group}}
-            <LinkTo @route='groups.show' @model={{mailAlias.group.id}}>
+            <LinkTo @route='groups.group' @model={{mailAlias.group.id}}>
               <span class='text-muted'> <FaIcon @icon='users' /> </span>
               {{mailAlias.group.name}}
             </LinkTo>
           {{else}}
-            <LinkTo @route='users.show' @model={{mailAlias.user.id}}>
+            <LinkTo @route='users.user' @model={{mailAlias.user.id}}>
               <span class='text-muted'> <FaIcon @icon='user' /> </span>
               {{mailAlias.user.fullNameWithNickname}}
             </LinkTo>
diff --git a/app/templates/mail-aliases/destroy.hbs b/app/templates/mail-aliases/mail-alias/destroy.hbs
similarity index 100%
rename from app/templates/mail-aliases/destroy.hbs
rename to app/templates/mail-aliases/mail-alias/destroy.hbs
diff --git a/app/templates/mail-aliases/edit.hbs b/app/templates/mail-aliases/mail-alias/edit.hbs
similarity index 100%
rename from app/templates/mail-aliases/edit.hbs
rename to app/templates/mail-aliases/mail-alias/edit.hbs
diff --git a/app/templates/mail-aliases/show.hbs b/app/templates/mail-aliases/mail-alias/index.hbs
similarity index 92%
rename from app/templates/mail-aliases/show.hbs
rename to app/templates/mail-aliases/mail-alias/index.hbs
index 5291e8707..32186ab2f 100644
--- a/app/templates/mail-aliases/show.hbs
+++ b/app/templates/mail-aliases/mail-alias/index.hbs
@@ -33,7 +33,7 @@
                     <td>
                       {{#if @model.moderatorGroup}}
                         <LinkTo
-                          @route='groups.show'
+                          @route='groups.group'
                           @model={{@model.moderatorGroup.id}}
                         >
                           {{@model.moderatorGroup.name}}
@@ -55,7 +55,7 @@
                     <td>Groep</td>
                     <td>
                       {{#if @model.group}}
-                        <LinkTo @route='groups.show' @model={{@model.group.id}}>
+                        <LinkTo @route='groups.group' @model={{@model.group.id}}>
                           {{@model.group.name}}
                         </LinkTo>
                       {{else}}
@@ -67,7 +67,7 @@
                     <td>Gebruiker</td>
                     <td>
                       {{#if @model.user}}
-                        <LinkTo @route='users.show' @model={{@model.user.id}}>
+                        <LinkTo @route='users.user' @model={{@model.user.id}}>
                           {{@model.user.fullNameWithNickname}}
                         </LinkTo>
                       {{else}}
diff --git a/app/templates/mail-moderations/index.hbs b/app/templates/mail-moderations/index.hbs
index 27e9f1ebe..d1c7f40b4 100644
--- a/app/templates/mail-moderations/index.hbs
+++ b/app/templates/mail-moderations/index.hbs
@@ -14,27 +14,42 @@
         {{#each model as |storedMail|}}
           <tr>
             <td>
-              <LinkTo @route='mail-moderations.show' @model={{storedMail.id}}>
+              <LinkTo
+                @route='mail-moderations.mail-moderation'
+                @model={{storedMail.id}}
+              >
                 {{storedMail.id}}
               </LinkTo>
             </td>
             <td>
-              <LinkTo @route='mail-moderations.show' @model={{storedMail.id}}>
+              <LinkTo
+                @route='mail-moderations.mail-moderation'
+                @model={{storedMail.id}}
+              >
                 {{moment-format storedMail.date 'ddd D MMM YYYY hh:mm'}}
               </LinkTo>
             </td>
             <td>
-              <LinkTo @route='mail-moderations.show' @model={{storedMail.id}}>
+              <LinkTo
+                @route='mail-moderations.mail-moderation'
+                @model={{storedMail.id}}
+              >
                 {{storedMail.subject}}
               </LinkTo>
             </td>
             <td>
-              <LinkTo @route='mail-moderations.show' @model={{storedMail.id}}>
+              <LinkTo
+                @route='mail-moderations.mail-moderation'
+                @model={{storedMail.id}}
+              >
                 {{storedMail.sender}}
               </LinkTo>
             </td>
             <td>
-              <LinkTo @route='mail-moderations.show' @model={{storedMail.id}}>
+              <LinkTo
+                @route='mail-moderations.mail-moderation'
+                @model={{storedMail.id}}
+              >
                 {{storedMail.mailAlias.email}}
               </LinkTo>
             </td>
diff --git a/app/templates/mail-moderations/accept.hbs b/app/templates/mail-moderations/mail-moderation/accept.hbs
similarity index 91%
rename from app/templates/mail-moderations/accept.hbs
rename to app/templates/mail-moderations/mail-moderation/accept.hbs
index ee67246f2..b87dd72b5 100644
--- a/app/templates/mail-moderations/accept.hbs
+++ b/app/templates/mail-moderations/mail-moderation/accept.hbs
@@ -5,7 +5,7 @@
 
 <button {{action 'submit'}} class='btn btn-danger' type='button'>Ja</button>
 <LinkTo
-  @route='mail-moderations.show'
+  @route='mail-moderations.mail-moderation'
   @model={{@model.id}}
   class='btn btn-default'
 >
diff --git a/app/templates/mail-moderations/destroy.hbs b/app/templates/mail-moderations/mail-moderation/destroy.hbs
similarity index 83%
rename from app/templates/mail-moderations/destroy.hbs
rename to app/templates/mail-moderations/mail-moderation/destroy.hbs
index 8dd94bbee..016612578 100644
--- a/app/templates/mail-moderations/destroy.hbs
+++ b/app/templates/mail-moderations/mail-moderation/destroy.hbs
@@ -1,9 +1,11 @@
 <p>Weet je zeker dat je deze mail ({{@model.subject}}) wil negeren?</p>
 <p>Er wordt geen bericht gestuurd naar de afzender.</p>
 
-<button {{action 'destroyModel'}} class='btn btn-danger' type='button'>Ja</button>
+<button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
+  Ja
+</button>
 <LinkTo
-  @route='mail-moderations.show'
+  @route='mail-moderations.mail-moderation'
   @model={{model.id}}
   class='btn btn-default'
 >
diff --git a/app/templates/mail-moderations/show.hbs b/app/templates/mail-moderations/mail-moderation/index.hbs
similarity index 100%
rename from app/templates/mail-moderations/show.hbs
rename to app/templates/mail-moderations/mail-moderation/index.hbs
diff --git a/app/templates/mail-moderations/reject.hbs b/app/templates/mail-moderations/mail-moderation/reject.hbs
similarity index 90%
rename from app/templates/mail-moderations/reject.hbs
rename to app/templates/mail-moderations/mail-moderation/reject.hbs
index ec4e02de8..2532314c7 100644
--- a/app/templates/mail-moderations/reject.hbs
+++ b/app/templates/mail-moderations/mail-moderation/reject.hbs
@@ -3,7 +3,7 @@
 
 <button {{action 'submit'}} class='btn btn-danger' type='button'>Ja</button>
 <LinkTo
-  @route='mail-moderations.show'
+  @route='mail-moderations.mail-moderation'
   @model={{@model.id}}
   class='btn btn-default'
 >
diff --git a/app/templates/photo-albums/index.hbs b/app/templates/photo-albums/index.hbs
index 8faff4c37..9fe6f567a 100644
--- a/app/templates/photo-albums/index.hbs
+++ b/app/templates/photo-albums/index.hbs
@@ -24,7 +24,7 @@
   {{else}}
     <div class='col-md-12'>
       <div class='alert alert-warning'>
-        Geen foto-albums gevonden
+        Geen fotoalbums gevonden
       </div>
     </div>
   {{/each}}
diff --git a/app/templates/photo-albums/photo-album/destroy.hbs b/app/templates/photo-albums/photo-album/destroy.hbs
index 72e87470d..c714ba059 100644
--- a/app/templates/photo-albums/photo-album/destroy.hbs
+++ b/app/templates/photo-albums/photo-album/destroy.hbs
@@ -1,10 +1,10 @@
 <div class='card'>
   <div class='card-header'>
-    <h5>Foto-album verwijderen</h5>
+    <h5>Fotoalbum verwijderen</h5>
   </div>
   <div class='card-block p-3'>
     <p class='card-text'>
-      Weet je zeker dat je dit foto-album ({{@model.title}}) wilt verwijderen?
+      Weet je zeker dat je dit fotoalbum ({{@model.title}}) wilt verwijderen?
     </p>
     {{#if errorMessage}}
       <div class='text-danger'>{{this.errorMessage}}</div>
@@ -14,6 +14,8 @@
     <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
       Verwijderen
     </button>
-    <button {{action 'cancel'}} class="btn btn-default" type="button">Annuleren</button>
+    <button {{action 'cancel'}} class='btn btn-default' type='button'>
+      Annuleren
+    </button>
   </div>
 </div>
\ No newline at end of file
diff --git a/app/templates/photo-albums/photo-album/photos/index.hbs b/app/templates/photo-albums/photo-album/photos/index.hbs
index 86ca683fb..f0b7fce17 100644
--- a/app/templates/photo-albums/photo-album/photos/index.hbs
+++ b/app/templates/photo-albums/photo-album/photos/index.hbs
@@ -15,7 +15,10 @@
 <div class='row'>
   {{#each sortedPhotos as |photo|}}
     <div class='col-md-3 col-xs-6 photo-album-image-card'>
-      <LinkTo @route='photo-albums.photo-album.photos.show' @model={{photo.id}}>
+      <LinkTo
+        @route='photo-albums.photo-album.photos.photo'
+        @model={{photo.id}}
+      >
         {{#if photo.amountOfComments}}
           <span class='comments-counter badge bg-info bottom-0 start-0'>
             <FaIcon @icon='comments' />
diff --git a/app/templates/photo-albums/photo-album/photos/destroy.hbs b/app/templates/photo-albums/photo-album/photos/photo/destroy.hbs
similarity index 92%
rename from app/templates/photo-albums/photo-album/photos/destroy.hbs
rename to app/templates/photo-albums/photo-album/photos/photo/destroy.hbs
index 60a6c50f7..124993acb 100644
--- a/app/templates/photo-albums/photo-album/photos/destroy.hbs
+++ b/app/templates/photo-albums/photo-album/photos/photo/destroy.hbs
@@ -17,7 +17,7 @@
       Verwijderen
     </button>
     <LinkTo
-      @route='photo-albums.photo-album.photos.show'
+      @route='photo-albums.photo-album.photos.photo'
       @model={{model.id}}
       class='btn btn-default'
     >
diff --git a/app/templates/photo-albums/photo-album/photos/show.hbs b/app/templates/photo-albums/photo-album/photos/photo/index.hbs
similarity index 100%
rename from app/templates/photo-albums/photo-album/photos/show.hbs
rename to app/templates/photo-albums/photo-album/photos/photo/index.hbs
diff --git a/app/templates/photo-comments/index.hbs b/app/templates/photo-comments/index.hbs
index c6c8acf12..d302ab4f5 100644
--- a/app/templates/photo-comments/index.hbs
+++ b/app/templates/photo-comments/index.hbs
@@ -23,7 +23,7 @@
             <div class='row row-cols-1 row-cols-md-2'>
               <div class='col p-0'>
                 <LinkTo
-                  @route='photo-albums.photo-album.photos.show'
+                  @route='photo-albums.photo-album.photos.photo'
                   @models={{array photo.photoAlbum photo.id}}
                 >
                   <PhotoAlbums::Photo @model={{photo}} @showInfo={{false}} />
diff --git a/app/templates/photo-comments/destroy.hbs b/app/templates/photo-comments/photo-comment/destroy.hbs
similarity index 100%
rename from app/templates/photo-comments/destroy.hbs
rename to app/templates/photo-comments/photo-comment/destroy.hbs
diff --git a/app/templates/polls/index.hbs b/app/templates/polls/index.hbs
index c4294bc4e..19f2e43d6 100644
--- a/app/templates/polls/index.hbs
+++ b/app/templates/polls/index.hbs
@@ -22,7 +22,7 @@
   </div>
 
   {{#each model as |poll|}}
-    <LinkTo @route='polls.show' @model={{poll.id}} data-test-poll-item={{true}}>
+    <LinkTo @route='polls.poll' @model={{poll.id}} data-test-poll-item={{true}}>
       <div class='row rtable-row'>
         <span class='col-12 col-md rtable-item'>
           {{form/status-icon poll.form}}
diff --git a/app/templates/polls/destroy.hbs b/app/templates/polls/poll/destroy.hbs
similarity index 81%
rename from app/templates/polls/destroy.hbs
rename to app/templates/polls/poll/destroy.hbs
index 03bf10d44..47d043c82 100644
--- a/app/templates/polls/destroy.hbs
+++ b/app/templates/polls/poll/destroy.hbs
@@ -9,7 +9,11 @@
     </p>
 
     <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>Ja</button>
-    <LinkTo @route='polls.show' @model={{model.id}} class='btn btn-default'>
+    <LinkTo
+      @route='polls.poll'
+      @model={{model.id}}
+      class='btn btn-default'
+    >
       Nee
     </LinkTo>
 
diff --git a/app/templates/polls/edit.hbs b/app/templates/polls/poll/edit.hbs
similarity index 100%
rename from app/templates/polls/edit.hbs
rename to app/templates/polls/poll/edit.hbs
diff --git a/app/templates/polls/show.hbs b/app/templates/polls/poll/index.hbs
similarity index 97%
rename from app/templates/polls/show.hbs
rename to app/templates/polls/poll/index.hbs
index 3d837d004..81b0ad884 100644
--- a/app/templates/polls/show.hbs
+++ b/app/templates/polls/poll/index.hbs
@@ -53,7 +53,7 @@
       <FaIcon @icon='user' />
       <span data-test-poll-author>
         <LinkTo
-          @route='users.show'
+          @route='users.user'
           @model={{@model.poll.author.id}}
           class='link-to card-subtitle-link'
         >
@@ -73,7 +73,7 @@
           @submitButtonLabel='Opslaan'
           @inputLayout='vertical'
         >
-          <LinkTo @route='polls.index' class='btn btn-default'>
+          <LinkTo @route='polls' class='btn btn-default'>
             Annuleren
           </LinkTo>
         </ModelForm::FormActions>
diff --git a/app/templates/static-pages/index.hbs b/app/templates/static-pages/index.hbs
index 22fe7c84b..3e171f1ca 100644
--- a/app/templates/static-pages/index.hbs
+++ b/app/templates/static-pages/index.hbs
@@ -21,7 +21,7 @@
     </div>
 
     {{#each group.items as |staticPage|}}
-      <LinkTo @route='static-pages.show' @model={{staticPage.id}}>
+      <LinkTo @route='static-pages.static-page' @model={{staticPage.id}}>
         <div class='row rtable-row'>
           <span class='col'>{{staticPage.title}}</span>
         </div>
diff --git a/app/templates/static-pages/destroy.hbs b/app/templates/static-pages/static-page/destroy.hbs
similarity index 100%
rename from app/templates/static-pages/destroy.hbs
rename to app/templates/static-pages/static-page/destroy.hbs
diff --git a/app/templates/static-pages/edit.hbs b/app/templates/static-pages/static-page/edit.hbs
similarity index 100%
rename from app/templates/static-pages/edit.hbs
rename to app/templates/static-pages/static-page/edit.hbs
diff --git a/app/templates/static-pages/show.hbs b/app/templates/static-pages/static-page/index.hbs
similarity index 100%
rename from app/templates/static-pages/show.hbs
rename to app/templates/static-pages/static-page/index.hbs
diff --git a/app/templates/users/index.hbs b/app/templates/users/index.hbs
index 71125079e..cda4e3d74 100644
--- a/app/templates/users/index.hbs
+++ b/app/templates/users/index.hbs
@@ -18,7 +18,7 @@
   {{#each model as |user|}}
     {{! only pass id when force reload is required, see http://emberigniter.com/force-store-reload-data-api-backend/ }}
     <LinkTo
-      @route='users.show'
+      @route='users.user'
       @model={{user.id}}
       class='col-6 col-sm-4 col-md-3'
     >
diff --git a/app/templates/users/members.hbs b/app/templates/users/members.hbs
index 9f976871a..995db5eb4 100644
--- a/app/templates/users/members.hbs
+++ b/app/templates/users/members.hbs
@@ -17,7 +17,7 @@
 <div class='row'>
   {{#each model as |user|}}
     <LinkTo
-      @route='users.show'
+      @route='users.user'
       @model={{user.id}}
       class='col-6 col-sm-4 col-md-3'
     >
diff --git a/app/templates/users/activate-account.hbs b/app/templates/users/user/activate-account.hbs
similarity index 100%
rename from app/templates/users/activate-account.hbs
rename to app/templates/users/user/activate-account.hbs
diff --git a/app/templates/users/destroy.hbs b/app/templates/users/user/destroy.hbs
similarity index 100%
rename from app/templates/users/destroy.hbs
rename to app/templates/users/user/destroy.hbs
diff --git a/app/templates/users/edit.hbs b/app/templates/users/user/edit/index.hbs
similarity index 100%
rename from app/templates/users/edit.hbs
rename to app/templates/users/user/edit/index.hbs
diff --git a/app/templates/users/edit-permissions.hbs b/app/templates/users/user/edit/permissions.hbs
similarity index 100%
rename from app/templates/users/edit-permissions.hbs
rename to app/templates/users/user/edit/permissions.hbs
diff --git a/app/templates/users/edit-privacy.hbs b/app/templates/users/user/edit/privacy.hbs
similarity index 100%
rename from app/templates/users/edit-privacy.hbs
rename to app/templates/users/user/edit/privacy.hbs
diff --git a/app/templates/users/edit-security.hbs b/app/templates/users/user/edit/security.hbs
similarity index 100%
rename from app/templates/users/edit-security.hbs
rename to app/templates/users/user/edit/security.hbs
diff --git a/app/templates/users/show-groups.hbs b/app/templates/users/user/groups.hbs
similarity index 98%
rename from app/templates/users/show-groups.hbs
rename to app/templates/users/user/groups.hbs
index a8ee6a957..c5702a368 100644
--- a/app/templates/users/show-groups.hbs
+++ b/app/templates/users/user/groups.hbs
@@ -58,7 +58,7 @@
   <div class='card-body row'>
     {{#each filteredModelsWithAdministrative as |membership|}}
       <LinkTo
-        @route='groups.show'
+        @route='groups.group'
         @model={{membership.group.id}}
         class='col-sm-12 col-md-6 col-lg-4'
       >
diff --git a/app/templates/users/show.hbs b/app/templates/users/user/index.hbs
similarity index 100%
rename from app/templates/users/show.hbs
rename to app/templates/users/user/index.hbs
diff --git a/app/templates/users/show-mail.hbs b/app/templates/users/user/mail.hbs
similarity index 84%
rename from app/templates/users/show-mail.hbs
rename to app/templates/users/user/mail.hbs
index 321816969..3bb07f341 100644
--- a/app/templates/users/show-mail.hbs
+++ b/app/templates/users/user/mail.hbs
@@ -18,7 +18,7 @@
         {{#each @model.mailAliases as |alias|}}
           <tr>
             <td>
-              <LinkTo @route='mail-aliases.show' @model={{alias.id}}>
+              <LinkTo @route='mail-aliases.mail-alias' @model={{alias.id}}>
                 {{alias.email}}
               </LinkTo>
             </td>
@@ -30,14 +30,14 @@
         {{#each @model.groupMailAliases as |alias|}}
           <tr>
             <td>
-              <LinkTo @route='mail-aliases.show' @model={{alias.id}}>
+              <LinkTo @route='mail-aliases.mail-alias' @model={{alias.id}}>
                 {{alias.email}}
               </LinkTo>
             </td>
             <td>{{alias.description}}</td>
             <td>{{alias.moderationType}}</td>
             <td>
-              <LinkTo @route='groups.show' @model={{alias.group.id}}>
+              <LinkTo @route='groups.group' @model={{alias.group.id}}>
                 {{alias.group.name}}
               </LinkTo>
             </td>
diff --git a/app/templates/users/show-mandates.hbs b/app/templates/users/user/mandates.hbs
similarity index 92%
rename from app/templates/users/show-mandates.hbs
rename to app/templates/users/user/mandates.hbs
index 1c9383f00..c0e4bd052 100644
--- a/app/templates/users/show-mandates.hbs
+++ b/app/templates/users/user/mandates.hbs
@@ -18,7 +18,7 @@
       {{#each @model.mandates as |mandate|}}
         <tr>
           <td>
-            <LinkTo @route='debit.mandates.show' @model={{mandate.id}}>
+            <LinkTo @route='debit.mandates.mandate' @model={{mandate.id}}>
               {{mandate.id}}
             </LinkTo>
           </td>
diff --git a/app/templates/users/show-permissions.hbs b/app/templates/users/user/permissions.hbs
similarity index 100%
rename from app/templates/users/show-permissions.hbs
rename to app/templates/users/user/permissions.hbs
diff --git a/app/templates/users/resend-activation.hbs b/app/templates/users/user/resend-activation.hbs
similarity index 66%
rename from app/templates/users/resend-activation.hbs
rename to app/templates/users/user/resend-activation.hbs
index b0ba380c5..7d856bf32 100644
--- a/app/templates/users/resend-activation.hbs
+++ b/app/templates/users/user/resend-activation.hbs
@@ -4,10 +4,10 @@
   opnieuw wil versturen? Dit zal de oude activatiecode ongeldig maken.
 </p>
 
-<button {{action 'resendActivation'}} class='btn btn-danger' type='button'>
+<button {{action 'resendActivationCode'}} class='btn btn-danger' type='button'>
   Ja
 </button>
-<LinkTo @route='users.show' @model={{@model.id}} class='btn btn-default'>
+<LinkTo @route='users.user' @model={{@model.id}} class='btn btn-default'>
   Nee
 </LinkTo>
 
diff --git a/app/templates/users/show-settings.hbs b/app/templates/users/user/settings.hbs
similarity index 100%
rename from app/templates/users/show-settings.hbs
rename to app/templates/users/user/settings.hbs
diff --git a/app/templates/vacancies/index.hbs b/app/templates/vacancies/index.hbs
index 6003c5699..50a7b31af 100644
--- a/app/templates/vacancies/index.hbs
+++ b/app/templates/vacancies/index.hbs
@@ -5,7 +5,7 @@
 <div class='row'>
   {{#each model as |vacancy|}}
     <div class='article-col col-md-6 mb-3'>
-      <LinkTo @route='vacancies.show' @model={{vacancy.id}}>
+      <LinkTo @route='vacancies.vacancy' @model={{vacancy.id}}>
         <div class='article-card d-flex'>
           <div class='card mb-0'>
             <div class='card-header card-header--overlay'>
@@ -27,7 +27,7 @@
                 </div>
 
                 <div class='card-titles'>
-                  <LinkTo @route='vacancies.show' @model={{vacancy.id}}>
+                  <LinkTo @route='vacancies.vacancy' @model={{vacancy.id}}>
                     <h2 class='card-title' itemprop='name headline'>
                       {{vacancy.title}}
                     </h2>
@@ -35,7 +35,7 @@
                   <h3 class='card-subtitle'>
                     {{#if vacancy.group}}
                       <LinkTo
-                        @route='groups.show'
+                        @route='groups.group'
                         @model={{vacancy.group.id}}
                         class='link-to card-subtitle-link'
                       >
@@ -49,7 +49,7 @@
                       </LinkTo>
                     {{else}}
                       <LinkTo
-                        @route='users.show'
+                        @route='users.user'
                         @model={{vacancy.author.id}}
                         class='link-to card-subtitle-link'
                       >
@@ -69,12 +69,12 @@
 
             <div class='card-body'>
               <div class='card-text' itemprop='articleBody'>
-                {{!-- Table without style --}}
-                <table class="mb-4">
+                {{! Table without style }}
+                <table class='mb-4'>
                   {{#if vacancy.deadline}}
                     <tr>
                       <th class="pe-3">Deadline:</th>
-                      <td>{{moment-format vacancy.deadline 'DD-MM-YYYY' }}</td>
+                      <td>{{moment-format vacancy.deadline 'DD-MM-YYYY'}}</td>
                     </tr>
                   {{/if}}
                   {{#if vacancy.workload}}
@@ -91,7 +91,11 @@
                   {{/if}}
                 </table>
 
-                <LinkTo @route='articles.show' @model={{article.id}} itemprop='url'>
+                <LinkTo
+                  @route='articles.article'
+                  @model={{article.id}}
+                  itemprop='url'
+                >
                   {{t 'tag.button.readMore'}}
                 </LinkTo>
               </div>
diff --git a/app/templates/vacancies/destroy.hbs b/app/templates/vacancies/vacancy/destroy.hbs
similarity index 100%
rename from app/templates/vacancies/destroy.hbs
rename to app/templates/vacancies/vacancy/destroy.hbs
diff --git a/app/templates/vacancies/edit.hbs b/app/templates/vacancies/vacancy/edit.hbs
similarity index 100%
rename from app/templates/vacancies/edit.hbs
rename to app/templates/vacancies/vacancy/edit.hbs
diff --git a/app/templates/vacancies/show.hbs b/app/templates/vacancies/vacancy/index.hbs
similarity index 64%
rename from app/templates/vacancies/show.hbs
rename to app/templates/vacancies/vacancy/index.hbs
index f18bbc1ea..09dbba924 100644
--- a/app/templates/vacancies/show.hbs
+++ b/app/templates/vacancies/vacancy/index.hbs
@@ -2,16 +2,15 @@
   <PageActionsButtons @pageActions={{pageActions}} />
 </EmberWormhole>
 
-
 <div class='card'>
   <div
-      class='card-header
-        {{if
-          @model.coverPhotoUrl
-          "card-header--overlay"
-          "card-header--no-overlay"
-        }}'
-    >
+    class='card-header
+      {{if
+        @model.coverPhotoUrl
+        "card-header--overlay"
+        "card-header--no-overlay"
+      }}'
+  >
     {{#if @model.coverPhotoUrl}}
       <img class='card-img-top' src={{@model.coverPhotoUrl}} />
     {{/if}}
@@ -20,20 +19,20 @@
       <div class='hidden-xs-down'>
         {{#if @model.group}}
           <img
-              src='{{@model.group.avatarThumbUrlOrDefault}}'
-              class='profile-picture-medium profile-picture-margin'
-              alt='{{@model.group.fullName}}'
-              height='60px'
-              style='display: inline;'
-            />
+            src='{{@model.group.avatarThumbUrlOrDefault}}'
+            class='profile-picture-medium profile-picture-margin'
+            alt='{{@model.group.fullName}}'
+            height='60px'
+            style='display: inline;'
+          />
         {{else}}
           <img
-              src='{{@model.author.avatarThumbUrlOrDefault}}'
-              class='profile-picture-medium profile-picture-margin'
-              alt='{{@model.author.fullName}}'
-              height='60px'
-              style='display: inline;'
-            />
+            src='{{@model.author.avatarThumbUrlOrDefault}}'
+            class='profile-picture-medium profile-picture-margin'
+            alt='{{@model.author.fullName}}'
+            height='60px'
+            style='display: inline;'
+          />
         {{/if}}
       </div>
 
@@ -45,18 +44,18 @@
           <span class='subtitle-author' data-test-@model-author>
             {{#if @model.group}}
               <LinkTo
-                  @route='groups.show'
-                  @model={{@model.group.id}}
-                  class='link-to card-subtitle-link'
-                >
+                @route='groups.group'
+                @model={{@model.group.id}}
+                class='link-to card-subtitle-link'
+              >
                 {{@model.group.name}}
               </LinkTo>
             {{else}}
               <LinkTo
-                  @route='users.show'
-                  @model={{@model.author.id}}
-                  class='link-to card-subtitle-link'
-                >
+                @route='users.user'
+                @model={{@model.author.id}}
+                class='link-to card-subtitle-link'
+              >
                 {{@model.author.fullName}}
               </LinkTo>
             {{/if}}
@@ -67,16 +66,16 @@
   </div>
 
   <div class='row card-subheader-row ms-0 me-0'>
-    {{#if @model.deadline }}
+    {{#if @model.deadline}}
       <div class='col-12 col-md-4 card-subheader-item align-items-center p-3'>
         <b>Deadline: </b>
         <span>
-          {{moment-format @model.deadline 'DD-MM-YYYY' }}
+          {{moment-format @model.deadline 'DD-MM-YYYY'}}
         </span>
       </div>
     {{/if}}
 
-    {{#if @model.workload }}
+    {{#if @model.workload}}
       <div class='col-12 col-md-4 card-subheader-item align-items-center p-3'>
         <b>Werklast: </b>
         <span>
@@ -85,7 +84,7 @@
       </div>
     {{/if}}
 
-    {{#if @model.workloadPeak }}
+    {{#if @model.workloadPeak}}
       <div class='col-12 col-md-4 card-subheader-item align-items-center p-3'>
         <b>Piekmoment: </b>
         <span>
@@ -103,14 +102,14 @@
       }}
 
       {{#if @model.contact}}
-        <div class="mt-3 mb-2">
+        <div class='mt-3 mb-2'>
           <b>Contact: </b>
           {{#if (is-phone @model.contact)}}
             <a href='tel:{{@model.contact}}'>{{@model.contact}}</a>
           {{else if (is-email @model.contact)}}
             <a href='mailto:{{@model.contact}}'>{{@model.contact}}</a>
           {{else if (is-url @model.contact)}}
-            <a href="{{@model.contact}}" target='_blank'>{{@model.contact}}</a>
+            <a href='{{@model.contact}}' target='_blank'>{{@model.contact}}</a>
           {{else}}
             {{@model.contact}}
           {{/if}}
diff --git a/ember-cli-build.js b/ember-cli-build.js
index ca11174e8..d255229ec 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -12,20 +12,6 @@ module.exports = function (defaults) {
       extensions: ['js'],
     },
 
-    emberCliDropzonejs: {
-      includeDropzoneCss: false,
-    },
-
-    'ember-bootstrap': {
-      blacklist: ['bs-accordion', 'bs-carousel'],
-      bootstrapVersion: 5,
-      importBootstrapCSS: false,
-    },
-
-    'ember-simple-auth': {
-      useSessionSetupMethod: true,
-    },
-
     autoImport: {
       webpack: {
         plugins: [
@@ -40,6 +26,24 @@ module.exports = function (defaults) {
       sourceMaps: 'inline',
     },
 
+    emberCliDropzonejs: {
+      includeDropzoneCss: false,
+    },
+
+    'ember-bootstrap': {
+      blacklist: ['bs-accordion', 'bs-carousel'],
+      bootstrapVersion: 5,
+      importBootstrapCSS: false,
+    },
+
+    'ember-composable-helpers': {
+      only: ['has-next', 'next'],
+    },
+
+    'ember-simple-auth': {
+      useSessionSetupMethod: true,
+    },
+
     fingerprint: {
       extensions: ['js', 'css', 'png', 'jpg', 'gif', 'map', 'svg'],
       replaceExtensions: ['html', 'css', 'js', 'json'],
diff --git a/package.json b/package.json
index 21bd0d9fb..e3c07879b 100644
--- a/package.json
+++ b/package.json
@@ -59,8 +59,8 @@
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
     "ember-cli-update": "^1.0.1",
+    "ember-composable-helpers": "^5.0.0",
     "ember-concurrency": "^3.0.0",
-    "ember-crumbly": "^3.0.1",
     "ember-data": "~3.27.1",
     "ember-fetch": "^8.1.1",
     "ember-file-upload": "^8.0.0",
@@ -115,8 +115,7 @@
   },
   "resolutions": {
     "@embroider/macros": "^1.0.0",
-    "fast-sourcemap-concat": "ef4/fast-sourcemap-concat#ec9dc9981503f2e56d2233430681866741bc170c",
-    "workerpool@^2.3.0": "^2.3.4"
+    "fast-sourcemap-concat": "ef4/fast-sourcemap-concat#ec9dc9981503f2e56d2233430681866741bc170c"
   },
   "engines": {
     "node": ">= 16"
diff --git a/tests/unit/controllers/groups/edit-test.js b/tests/unit/controllers/groups/group/edit-test.js
similarity index 79%
rename from tests/unit/controllers/groups/edit-test.js
rename to tests/unit/controllers/groups/group/edit-test.js
index ef72ec883..e468f92b4 100644
--- a/tests/unit/controllers/groups/edit-test.js
+++ b/tests/unit/controllers/groups/group/edit-test.js
@@ -1,11 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('Unit | Controller | groups/edit', function (hooks) {
+module('Unit | Controller | groups/group/edit', function (hooks) {
   setupTest(hooks);
 
   test('test if groupKindOptions contains options with capitalized labels', function (assert) {
-    const controller = this.owner.lookup('controller:groups/edit');
+    const controller = this.owner.lookup('controller:groups/group/edit');
     assert.equal(
       controller.groupKindOptions.findBy('value', 'bestuur').label,
       'Bestuur'
diff --git a/tests/unit/routes/books/show-test.js b/tests/unit/routes/activities-test.js
similarity index 60%
rename from tests/unit/routes/books/show-test.js
rename to tests/unit/routes/activities-test.js
index 339470a69..aaf2dfeb3 100644
--- a/tests/unit/routes/books/show-test.js
+++ b/tests/unit/routes/activities-test.js
@@ -1,11 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('Unit | Route | books/show', function (hooks) {
+module('Unit | Route | activities', function (hooks) {
   setupTest(hooks);
 
   test('it exists', function (assert) {
-    const route = this.owner.lookup('route:books/show');
+    const route = this.owner.lookup('route:activities');
     assert.ok(route);
   });
 });
diff --git a/tests/unit/routes/activities/activity-test.js b/tests/unit/routes/activities/activity-test.js
new file mode 100644
index 000000000..6c6c45559
--- /dev/null
+++ b/tests/unit/routes/activities/activity-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | activities/activity', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:activities/activity');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/activities/activity/destroy-test.js b/tests/unit/routes/activities/activity/destroy-test.js
new file mode 100644
index 000000000..9d0e5f42c
--- /dev/null
+++ b/tests/unit/routes/activities/activity/destroy-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | activities/activity/destroy', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:activities/activity/destroy');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/activities/activity/edit-test.js b/tests/unit/routes/activities/activity/edit-test.js
new file mode 100644
index 000000000..218014f05
--- /dev/null
+++ b/tests/unit/routes/activities/activity/edit-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | activities/activity/edit', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:activities/activity/edit');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/activities/activity/generate-alias-test.js b/tests/unit/routes/activities/activity/generate-alias-test.js
new file mode 100644
index 000000000..067612621
--- /dev/null
+++ b/tests/unit/routes/activities/activity/generate-alias-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | activities/activity/generate-alias', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:activities/activity/generate-alias');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/activities/print-enrolled-test.js b/tests/unit/routes/activities/activity/index-test.js
similarity index 56%
rename from tests/unit/routes/activities/print-enrolled-test.js
rename to tests/unit/routes/activities/activity/index-test.js
index bdf314db9..9c0a05c8c 100644
--- a/tests/unit/routes/activities/print-enrolled-test.js
+++ b/tests/unit/routes/activities/activity/index-test.js
@@ -1,11 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('Unit | Route | activities/print_enrolled', function (hooks) {
+module('Unit | Route | activities/activity/index', function (hooks) {
   setupTest(hooks);
 
   test('it exists', function (assert) {
-    const route = this.owner.lookup('route:activities/print_enrolled');
+    const route = this.owner.lookup('route:activities/activity/index');
     assert.ok(route);
   });
 });
diff --git a/tests/unit/routes/activities/activity/print-enrolled-test.js b/tests/unit/routes/activities/activity/print-enrolled-test.js
new file mode 100644
index 000000000..ed2223462
--- /dev/null
+++ b/tests/unit/routes/activities/activity/print-enrolled-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | activities/activity/print-enrolled', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:activities/activity/print-enrolled');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/activities/ical-test.js b/tests/unit/routes/activities/ical-test.js
new file mode 100644
index 000000000..0e8b3f0c0
--- /dev/null
+++ b/tests/unit/routes/activities/ical-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | activities/ical', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:activities/ical');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/activities/index-test.js b/tests/unit/routes/activities/index-test.js
new file mode 100644
index 000000000..cc4c79009
--- /dev/null
+++ b/tests/unit/routes/activities/index-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | activities/index', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:activities/index');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/books/destroy-test.js b/tests/unit/routes/activities/new-test.js
similarity index 59%
rename from tests/unit/routes/books/destroy-test.js
rename to tests/unit/routes/activities/new-test.js
index 312cce8fd..0aac20564 100644
--- a/tests/unit/routes/books/destroy-test.js
+++ b/tests/unit/routes/activities/new-test.js
@@ -1,11 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('Unit | Route | books/destroy', function (hooks) {
+module('Unit | Route | activities/new', function (hooks) {
   setupTest(hooks);
 
   test('it exists', function (assert) {
-    const route = this.owner.lookup('route:books/destroy');
+    const route = this.owner.lookup('route:activities/new');
     assert.ok(route);
   });
 });
diff --git a/tests/unit/routes/article-comments-test.js b/tests/unit/routes/article-comments-test.js
new file mode 100644
index 000000000..3241e7466
--- /dev/null
+++ b/tests/unit/routes/article-comments-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | article-comments', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:article-comments');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/article-comments/article-comment-test.js b/tests/unit/routes/article-comments/article-comment-test.js
new file mode 100644
index 000000000..ca0a72804
--- /dev/null
+++ b/tests/unit/routes/article-comments/article-comment-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | article-comments/article-comment', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:article-comments/article-comment');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/article-comments/article-comment/destroy-test.js b/tests/unit/routes/article-comments/article-comment/destroy-test.js
new file mode 100644
index 000000000..62c0f589b
--- /dev/null
+++ b/tests/unit/routes/article-comments/article-comment/destroy-test.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Route | article-comments/article-comment/destroy',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      const route = this.owner.lookup(
+        'route:article-comments/article-comment/destroy'
+      );
+      assert.ok(route);
+    });
+  }
+);
diff --git a/tests/unit/routes/article-comments/article-comment/index.js b/tests/unit/routes/article-comments/article-comment/index.js
new file mode 100644
index 000000000..9ecc7d1d6
--- /dev/null
+++ b/tests/unit/routes/article-comments/article-comment/index.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Route | article-comments/article-comment/index',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      const route = this.owner.lookup(
+        'route:article-comments/article-comment/index'
+      );
+      assert.ok(route);
+    });
+  }
+);
diff --git a/tests/unit/routes/article-comments/index.js b/tests/unit/routes/article-comments/index.js
new file mode 100644
index 000000000..d4a53d00f
--- /dev/null
+++ b/tests/unit/routes/article-comments/index.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | article-comments/index', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:article-comments/index');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/polls/show-test.js b/tests/unit/routes/articles-test.js
similarity index 60%
rename from tests/unit/routes/polls/show-test.js
rename to tests/unit/routes/articles-test.js
index ef2a9786e..85388b5ce 100644
--- a/tests/unit/routes/polls/show-test.js
+++ b/tests/unit/routes/articles-test.js
@@ -1,11 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('Unit | Route | polls/show', function (hooks) {
+module('Unit | Route | articles', function (hooks) {
   setupTest(hooks);
 
   test('it exists', function (assert) {
-    const route = this.owner.lookup('route:polls/show');
+    const route = this.owner.lookup('route:articles');
     assert.ok(route);
   });
 });
diff --git a/tests/unit/routes/articles/article-test.js b/tests/unit/routes/articles/article-test.js
new file mode 100644
index 000000000..932bedd3b
--- /dev/null
+++ b/tests/unit/routes/articles/article-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | articles/article', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:articles/article');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/articles/article/edit-test.js b/tests/unit/routes/articles/article/edit-test.js
new file mode 100644
index 000000000..9d5e9b732
--- /dev/null
+++ b/tests/unit/routes/articles/article/edit-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | articles/article/edit', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:articles/article/edit');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/articles/article/index-test.js b/tests/unit/routes/articles/article/index-test.js
new file mode 100644
index 000000000..ad3ebd322
--- /dev/null
+++ b/tests/unit/routes/articles/article/index-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | articles/article/index', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:articles/article/index');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/books/edit-test.js b/tests/unit/routes/books-tests.js
similarity index 60%
rename from tests/unit/routes/books/edit-test.js
rename to tests/unit/routes/books-tests.js
index fc4def557..0ddd282fe 100644
--- a/tests/unit/routes/books/edit-test.js
+++ b/tests/unit/routes/books-tests.js
@@ -1,11 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('Unit | Route | books/edit', function (hooks) {
+module('Unit | Route | books', function (hooks) {
   setupTest(hooks);
 
   test('it exists', function (assert) {
-    const route = this.owner.lookup('route:books/edit');
+    const route = this.owner.lookup('route:books');
     assert.ok(route);
   });
 });
diff --git a/tests/unit/routes/polls/edit-test.js b/tests/unit/routes/books/book-test.js
similarity index 60%
rename from tests/unit/routes/polls/edit-test.js
rename to tests/unit/routes/books/book-test.js
index b3e38c836..d104f3154 100644
--- a/tests/unit/routes/polls/edit-test.js
+++ b/tests/unit/routes/books/book-test.js
@@ -1,11 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('Unit | Route | polls/edit', function (hooks) {
+module('Unit | Route | books/book', function (hooks) {
   setupTest(hooks);
 
   test('it exists', function (assert) {
-    const route = this.owner.lookup('route:polls/edit');
+    const route = this.owner.lookup('route:books/book');
     assert.ok(route);
   });
 });
diff --git a/tests/unit/routes/polls/destroy-test.js b/tests/unit/routes/books/book/destroy-test.js
similarity index 57%
rename from tests/unit/routes/polls/destroy-test.js
rename to tests/unit/routes/books/book/destroy-test.js
index b7efaf3f6..4bb7f41d4 100644
--- a/tests/unit/routes/polls/destroy-test.js
+++ b/tests/unit/routes/books/book/destroy-test.js
@@ -1,11 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('Unit | Route | polls/destroy', function (hooks) {
+module('Unit | Route | books/book/destroy', function (hooks) {
   setupTest(hooks);
 
   test('it exists', function (assert) {
-    const route = this.owner.lookup('route:polls/destroy');
+    const route = this.owner.lookup('route:books/book/destroy');
     assert.ok(route);
   });
 });
diff --git a/tests/unit/routes/books/book/edit-test.js b/tests/unit/routes/books/book/edit-test.js
new file mode 100644
index 000000000..65c25fbd4
--- /dev/null
+++ b/tests/unit/routes/books/book/edit-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | books/book/edit', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:books/book/edit');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/books/book/index-test.js b/tests/unit/routes/books/book/index-test.js
new file mode 100644
index 000000000..40ddbe200
--- /dev/null
+++ b/tests/unit/routes/books/book/index-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | books/book/index', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:books/book/index');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/debit/collections-test.js b/tests/unit/routes/debit/collections-test.js
new file mode 100644
index 000000000..6916b85cd
--- /dev/null
+++ b/tests/unit/routes/debit/collections-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | debit/collections', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:debit/collections');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/debit/collections/collection-test.js b/tests/unit/routes/debit/collections/collection-test.js
new file mode 100644
index 000000000..86966856b
--- /dev/null
+++ b/tests/unit/routes/debit/collections/collection-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | debit/collections/collection', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:debit/collections/collection');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/debit/collections/collection/destroy-test.js b/tests/unit/routes/debit/collections/collection/destroy-test.js
new file mode 100644
index 000000000..6833de960
--- /dev/null
+++ b/tests/unit/routes/debit/collections/collection/destroy-test.js
@@ -0,0 +1,13 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | debit/collections/collection/destroy', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup(
+      'route:debit/collections/collection/destroy'
+    );
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/debit/collections/collection/edit-test.js b/tests/unit/routes/debit/collections/collection/edit-test.js
new file mode 100644
index 000000000..8359815c2
--- /dev/null
+++ b/tests/unit/routes/debit/collections/collection/edit-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | debit/collections/collection/edit', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:debit/collections/collection/edit');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/debit/collections/collection/index-test.js b/tests/unit/routes/debit/collections/collection/index-test.js
new file mode 100644
index 000000000..7914c2297
--- /dev/null
+++ b/tests/unit/routes/debit/collections/collection/index-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | debit/collections/collection/index', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:debit/collections/collection/index');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/debit/collections/collection/sepa-test.js b/tests/unit/routes/debit/collections/collection/sepa-test.js
new file mode 100644
index 000000000..d53af161f
--- /dev/null
+++ b/tests/unit/routes/debit/collections/collection/sepa-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | debit/collections/collection/sepa', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:debit/collections/collection/sepa');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/debit/collections/index-test.js b/tests/unit/routes/debit/collections/index-test.js
new file mode 100644
index 000000000..cc43126a7
--- /dev/null
+++ b/tests/unit/routes/debit/collections/index-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | debit/collections/index', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:debit/collections/index');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/debit/collections/new-test.js b/tests/unit/routes/debit/collections/new-test.js
new file mode 100644
index 000000000..923d5853a
--- /dev/null
+++ b/tests/unit/routes/debit/collections/new-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | debit/collections/new', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:debit/collections/new');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/articles/edit-test.js b/tests/unit/routes/debit/mandates-test.js
similarity index 59%
rename from tests/unit/routes/articles/edit-test.js
rename to tests/unit/routes/debit/mandates-test.js
index e2bc6d191..134b6d380 100644
--- a/tests/unit/routes/articles/edit-test.js
+++ b/tests/unit/routes/debit/mandates-test.js
@@ -1,11 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('Unit | Route | articles/edit', function (hooks) {
+module('Unit | Route | debit/mandates', function (hooks) {
   setupTest(hooks);
 
   test('it exists', function (assert) {
-    const route = this.owner.lookup('route:articles/edit');
+    const route = this.owner.lookup('route:debit/mandates');
     assert.ok(route);
   });
 });
diff --git a/tests/unit/routes/debit/mandates/index-test.js b/tests/unit/routes/debit/mandates/index-test.js
new file mode 100644
index 000000000..28eb77485
--- /dev/null
+++ b/tests/unit/routes/debit/mandates/index-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | debit/mandates/index', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:debit/mandates/index');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/debit/mandates/mandate-test.js b/tests/unit/routes/debit/mandates/mandate-test.js
new file mode 100644
index 000000000..66487904d
--- /dev/null
+++ b/tests/unit/routes/debit/mandates/mandate-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | debit/mandates/mandate', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:debit/mandates/mandate');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/debit/mandates/mandate/edit-test.js b/tests/unit/routes/debit/mandates/mandate/edit-test.js
new file mode 100644
index 000000000..c0e97c351
--- /dev/null
+++ b/tests/unit/routes/debit/mandates/mandate/edit-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | debit/mandates/mandate/edit', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:debit/mandates/mandate/edit');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/debit/mandates/mandate/index-test.js b/tests/unit/routes/debit/mandates/mandate/index-test.js
new file mode 100644
index 000000000..3856d48e1
--- /dev/null
+++ b/tests/unit/routes/debit/mandates/mandate/index-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | debit/mandates/mandate/index', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:debit/mandates/mandate/index');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/debit/mandates/new-test.js b/tests/unit/routes/debit/mandates/new-test.js
new file mode 100644
index 000000000..20e4c3dfc
--- /dev/null
+++ b/tests/unit/routes/debit/mandates/new-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | debit/mandates/new', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:debit/mandates/new');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/debit/transactions-test.js b/tests/unit/routes/debit/transactions-test.js
new file mode 100644
index 000000000..ad79f29b5
--- /dev/null
+++ b/tests/unit/routes/debit/transactions-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | debit/transactions', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:debit/transactions');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/debit/transactions/transaction-test.js b/tests/unit/routes/debit/transactions/transaction-test.js
new file mode 100644
index 000000000..4e2b95a93
--- /dev/null
+++ b/tests/unit/routes/debit/transactions/transaction-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | debit/transactions/transaction', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:debit/transactions/transaction');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/debit/transactions/transaction/destroy-test.js b/tests/unit/routes/debit/transactions/transaction/destroy-test.js
new file mode 100644
index 000000000..c2ddb39e3
--- /dev/null
+++ b/tests/unit/routes/debit/transactions/transaction/destroy-test.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Route | debit/transactions/transaction/destroy',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      const route = this.owner.lookup(
+        'route:debit/transactions/transaction/destroy'
+      );
+      assert.ok(route);
+    });
+  }
+);
diff --git a/tests/unit/routes/debit/transactions/transaction/edit-test.js b/tests/unit/routes/debit/transactions/transaction/edit-test.js
new file mode 100644
index 000000000..385cc5166
--- /dev/null
+++ b/tests/unit/routes/debit/transactions/transaction/edit-test.js
@@ -0,0 +1,13 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | debit/transactions/transaction/edit', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup(
+      'route:debit/transactions/transaction/edit'
+    );
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/form/responses/response-test.js b/tests/unit/routes/form/responses/response-test.js
new file mode 100644
index 000000000..e82fbe559
--- /dev/null
+++ b/tests/unit/routes/form/responses/response-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | form/responses/response', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:form/responses/response');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/form/responses/response/destroy-test.js b/tests/unit/routes/form/responses/response/destroy-test.js
new file mode 100644
index 000000000..7fa0bc21d
--- /dev/null
+++ b/tests/unit/routes/form/responses/response/destroy-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | form/responses/response/destroy', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:form/responses/response/destroy');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/forum-test.js b/tests/unit/routes/forum-test.js
new file mode 100644
index 000000000..d792acfb1
--- /dev/null
+++ b/tests/unit/routes/forum-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | forum', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:forum');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/forum/categories/category-test.js b/tests/unit/routes/forum/categories/category-test.js
new file mode 100644
index 000000000..ce74f5063
--- /dev/null
+++ b/tests/unit/routes/forum/categories/category-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | forum/categories/category', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:forum/categories/category');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/forum/categories/category/destroy-test.js b/tests/unit/routes/forum/categories/category/destroy-test.js
new file mode 100644
index 000000000..b77324a22
--- /dev/null
+++ b/tests/unit/routes/forum/categories/category/destroy-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | forum/categories/category/destroy', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:forum/categories/category/destroy');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/forum/categories/category/edit-test.js b/tests/unit/routes/forum/categories/category/edit-test.js
new file mode 100644
index 000000000..6a6e4c2db
--- /dev/null
+++ b/tests/unit/routes/forum/categories/category/edit-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | forum/categories/category/edit', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:forum/categories/category/edit');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/forum/categories/category/index-test.js b/tests/unit/routes/forum/categories/category/index-test.js
new file mode 100644
index 000000000..19a1736b7
--- /dev/null
+++ b/tests/unit/routes/forum/categories/category/index-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | forum/categories/category/index', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:forum/categories/category/index');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/forum/categories/category/threads/index-test.js b/tests/unit/routes/forum/categories/category/threads/index-test.js
new file mode 100644
index 000000000..01ebc7501
--- /dev/null
+++ b/tests/unit/routes/forum/categories/category/threads/index-test.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Route | forum/categories/category/threads/index',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      const route = this.owner.lookup(
+        'route:forum/categories/category/threads/index'
+      );
+      assert.ok(route);
+    });
+  }
+);
diff --git a/tests/unit/routes/forum/categories/category/threads/new-test.js b/tests/unit/routes/forum/categories/category/threads/new-test.js
new file mode 100644
index 000000000..6879a0738
--- /dev/null
+++ b/tests/unit/routes/forum/categories/category/threads/new-test.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Route | forum/categories/category/threads/new',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      const route = this.owner.lookup(
+        'route:forum/categories/category/threads/new'
+      );
+      assert.ok(route);
+    });
+  }
+);
diff --git a/tests/unit/routes/forum/categories/category/threads/thread-test.js b/tests/unit/routes/forum/categories/category/threads/thread-test.js
new file mode 100644
index 000000000..48503e795
--- /dev/null
+++ b/tests/unit/routes/forum/categories/category/threads/thread-test.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Route | forum/categories/category/threads/thread',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      const route = this.owner.lookup(
+        'route:forum/categories/category/threads/thread'
+      );
+      assert.ok(route);
+    });
+  }
+);
diff --git a/tests/unit/routes/forum/categories/category/threads/thread/destroy-test.js b/tests/unit/routes/forum/categories/category/threads/thread/destroy-test.js
new file mode 100644
index 000000000..6dab12abe
--- /dev/null
+++ b/tests/unit/routes/forum/categories/category/threads/thread/destroy-test.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Route | forum/categories/category/threads/thread/destroy',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      const route = this.owner.lookup(
+        'route:forum/categories/category/threads/thread/destroy'
+      );
+      assert.ok(route);
+    });
+  }
+);
diff --git a/tests/unit/routes/forum/categories/category/threads/thread/edit-test.js b/tests/unit/routes/forum/categories/category/threads/thread/edit-test.js
new file mode 100644
index 000000000..6b31ba3f3
--- /dev/null
+++ b/tests/unit/routes/forum/categories/category/threads/thread/edit-test.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Route | forum/categories/category/threads/thread/edit',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      const route = this.owner.lookup(
+        'route:forum/categories/category/threads/thread/edit'
+      );
+      assert.ok(route);
+    });
+  }
+);
diff --git a/tests/unit/routes/forum/categories/category/threads/thread/index-test.js b/tests/unit/routes/forum/categories/category/threads/thread/index-test.js
new file mode 100644
index 000000000..2343d2847
--- /dev/null
+++ b/tests/unit/routes/forum/categories/category/threads/thread/index-test.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Route | forum/categories/category/threads/thread/index',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      const route = this.owner.lookup(
+        'route:forum/categories/category/threads/thread/index'
+      );
+      assert.ok(route);
+    });
+  }
+);
diff --git a/tests/unit/routes/forum/categories/category/threads/thread/posts/index-test.js b/tests/unit/routes/forum/categories/category/threads/thread/posts/index-test.js
new file mode 100644
index 000000000..3ac0a2cb2
--- /dev/null
+++ b/tests/unit/routes/forum/categories/category/threads/thread/posts/index-test.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Route | forum/categories/category/threads/thread/posts/index',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      const route = this.owner.lookup(
+        'route:forum/categories/category/threads/thread/posts/index'
+      );
+      assert.ok(route);
+    });
+  }
+);
diff --git a/tests/unit/routes/forum/categories/category/threads/thread/posts/post-test.js b/tests/unit/routes/forum/categories/category/threads/thread/posts/post-test.js
new file mode 100644
index 000000000..c7622e9b9
--- /dev/null
+++ b/tests/unit/routes/forum/categories/category/threads/thread/posts/post-test.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Route | forum/categories/category/threads/thread/posts/post',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      const route = this.owner.lookup(
+        'route:forum/categories/category/threads/thread/posts/post'
+      );
+      assert.ok(route);
+    });
+  }
+);
diff --git a/tests/unit/routes/forum/categories/category/threads/thread/posts/post/destroy-test.js b/tests/unit/routes/forum/categories/category/threads/thread/posts/post/destroy-test.js
new file mode 100644
index 000000000..b9d59558c
--- /dev/null
+++ b/tests/unit/routes/forum/categories/category/threads/thread/posts/post/destroy-test.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Route | forum/categories/category/threads/thread/posts/post/destroy',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      const route = this.owner.lookup(
+        'route:forum/categories/category/threads/thread/posts/post/destroy'
+      );
+      assert.ok(route);
+    });
+  }
+);
diff --git a/tests/unit/routes/forum/categories/category/threads/thread/posts/post/edit-test.js b/tests/unit/routes/forum/categories/category/threads/thread/posts/post/edit-test.js
new file mode 100644
index 000000000..5a637ab2e
--- /dev/null
+++ b/tests/unit/routes/forum/categories/category/threads/thread/posts/post/edit-test.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Route | forum/categories/category/threads/thread/posts/post/edit',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      const route = this.owner.lookup(
+        'route:forum/categories/category/threads/thread/posts/post/edit'
+      );
+      assert.ok(route);
+    });
+  }
+);
diff --git a/tests/unit/routes/forum/categories/index-test.js b/tests/unit/routes/forum/categories/index-test.js
new file mode 100644
index 000000000..9b890f84a
--- /dev/null
+++ b/tests/unit/routes/forum/categories/index-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | forum/categories/index', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:forum/categories/index');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/forum/categories/new-test.js b/tests/unit/routes/forum/categories/new-test.js
new file mode 100644
index 000000000..6c0f310e1
--- /dev/null
+++ b/tests/unit/routes/forum/categories/new-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | forum/categories/new', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:forum/categories/new');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/groups/edit-test.js b/tests/unit/routes/forum/index-test.js
similarity index 60%
rename from tests/unit/routes/groups/edit-test.js
rename to tests/unit/routes/forum/index-test.js
index 2ffd323e7..977ef9d23 100644
--- a/tests/unit/routes/groups/edit-test.js
+++ b/tests/unit/routes/forum/index-test.js
@@ -1,11 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('Unit | Route | groups/edit', function (hooks) {
+module('Unit | Route | forum/index', function (hooks) {
   setupTest(hooks);
 
   test('it exists', function (assert) {
-    const route = this.owner.lookup('route:groups/edit');
+    const route = this.owner.lookup('route:forum/index');
     assert.ok(route);
   });
 });
diff --git a/tests/unit/routes/groups-test.js b/tests/unit/routes/groups-test.js
new file mode 100644
index 000000000..429e4c735
--- /dev/null
+++ b/tests/unit/routes/groups-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | groups', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:groups');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/groups/group-test.js b/tests/unit/routes/groups/group-test.js
new file mode 100644
index 000000000..c7b4cf0f2
--- /dev/null
+++ b/tests/unit/routes/groups/group-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | groups/group', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:groups/group');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/groups/group/edit-test.js b/tests/unit/routes/groups/group/edit-test.js
new file mode 100644
index 000000000..46679dffd
--- /dev/null
+++ b/tests/unit/routes/groups/group/edit-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | groups/group/edit', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:groups/group/edit');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/groups/group/export-test.js b/tests/unit/routes/groups/group/export-test.js
new file mode 100644
index 000000000..ee5fd2abc
--- /dev/null
+++ b/tests/unit/routes/groups/group/export-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | groups/group/export', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:groups/group/export');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/groups/group/index-test.js b/tests/unit/routes/groups/group/index-test.js
new file mode 100644
index 000000000..ec0fb0910
--- /dev/null
+++ b/tests/unit/routes/groups/group/index-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | groups/group/index', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:groups/group/index');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/groups/index-test.js b/tests/unit/routes/groups/index-test.js
new file mode 100644
index 000000000..5d4744582
--- /dev/null
+++ b/tests/unit/routes/groups/index-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | groups/index', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:groups/index');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/login-test.js b/tests/unit/routes/login-test.js
new file mode 100644
index 000000000..164126f6b
--- /dev/null
+++ b/tests/unit/routes/login-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | login', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:login');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/mail-aliases-test.js b/tests/unit/routes/mail-aliases-test.js
new file mode 100644
index 000000000..3f98132ff
--- /dev/null
+++ b/tests/unit/routes/mail-aliases-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | mail-aliases', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:mail-aliases');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/mail-aliases/index-test.js b/tests/unit/routes/mail-aliases/index-test.js
new file mode 100644
index 000000000..792c961d4
--- /dev/null
+++ b/tests/unit/routes/mail-aliases/index-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | mail-aliases/index', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:mail-aliases/index');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/mail-aliases/mail-alias-test.js b/tests/unit/routes/mail-aliases/mail-alias-test.js
new file mode 100644
index 000000000..47fd31c81
--- /dev/null
+++ b/tests/unit/routes/mail-aliases/mail-alias-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | mail-aliases/mail-alias', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:mail-aliases/mail-alias');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/mail-aliases/mail-alias/destroy-test.js b/tests/unit/routes/mail-aliases/mail-alias/destroy-test.js
new file mode 100644
index 000000000..9267177bc
--- /dev/null
+++ b/tests/unit/routes/mail-aliases/mail-alias/destroy-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | mail-aliases/mail-alias/destroy', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:mail-aliases/mail-alias/destroy');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/mail-aliases/mail-alias/edit-test.js b/tests/unit/routes/mail-aliases/mail-alias/edit-test.js
new file mode 100644
index 000000000..6fa98537b
--- /dev/null
+++ b/tests/unit/routes/mail-aliases/mail-alias/edit-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | mail-aliases/mail-alias/edit', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:mail-aliases/mail-alias/edit');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/mail-aliases/mail-alias/index-test.js b/tests/unit/routes/mail-aliases/mail-alias/index-test.js
new file mode 100644
index 000000000..e661d6a29
--- /dev/null
+++ b/tests/unit/routes/mail-aliases/mail-alias/index-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | mail-aliases/mail-alias/index', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:mail-aliases/mail-alias/index');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/mail-aliases/new-test.js b/tests/unit/routes/mail-aliases/new-test.js
new file mode 100644
index 000000000..e941e4a6e
--- /dev/null
+++ b/tests/unit/routes/mail-aliases/new-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | mail-aliases/new', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:mail-aliases/new');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/mail-moderations-test.js b/tests/unit/routes/mail-moderations-test.js
new file mode 100644
index 000000000..1b963ac7f
--- /dev/null
+++ b/tests/unit/routes/mail-moderations-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | mail-moderations', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:mail-moderations');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/mail-moderations/index-test.js b/tests/unit/routes/mail-moderations/index-test.js
new file mode 100644
index 000000000..6cab58a68
--- /dev/null
+++ b/tests/unit/routes/mail-moderations/index-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | mail-moderations/index', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:mail-moderations/index');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/mail-moderations/mail-moderation-test.js b/tests/unit/routes/mail-moderations/mail-moderation-test.js
new file mode 100644
index 000000000..10a27f8ff
--- /dev/null
+++ b/tests/unit/routes/mail-moderations/mail-moderation-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | mail-moderations/mail-moderation', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:mail-moderations/mail-moderation');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/mail-moderations/mail-moderation/accept-test.js b/tests/unit/routes/mail-moderations/mail-moderation/accept-test.js
new file mode 100644
index 000000000..219777864
--- /dev/null
+++ b/tests/unit/routes/mail-moderations/mail-moderation/accept-test.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Route | mail-moderations/mail-moderation/accept',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      const route = this.owner.lookup(
+        'route:mail-moderations/mail-moderation/accept'
+      );
+      assert.ok(route);
+    });
+  }
+);
diff --git a/tests/unit/routes/mail-moderations/mail-moderation/destroy-test.js b/tests/unit/routes/mail-moderations/mail-moderation/destroy-test.js
new file mode 100644
index 000000000..dd4f6a626
--- /dev/null
+++ b/tests/unit/routes/mail-moderations/mail-moderation/destroy-test.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Route | mail-moderations/mail-moderation/destroy',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      const route = this.owner.lookup(
+        'route:mail-moderations/mail-moderation/destroy'
+      );
+      assert.ok(route);
+    });
+  }
+);
diff --git a/tests/unit/routes/mail-moderations/mail-moderation/index-test.js b/tests/unit/routes/mail-moderations/mail-moderation/index-test.js
new file mode 100644
index 000000000..155cd8fd1
--- /dev/null
+++ b/tests/unit/routes/mail-moderations/mail-moderation/index-test.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Route | mail-moderations/mail-moderation/index',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      const route = this.owner.lookup(
+        'route:mail-moderations/mail-moderation/index'
+      );
+      assert.ok(route);
+    });
+  }
+);
diff --git a/tests/unit/routes/mail-moderations/mail-moderation/reject-test.js b/tests/unit/routes/mail-moderations/mail-moderation/reject-test.js
new file mode 100644
index 000000000..4c5a8bc88
--- /dev/null
+++ b/tests/unit/routes/mail-moderations/mail-moderation/reject-test.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Route | mail-moderations/mail-moderation/reject',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      const route = this.owner.lookup(
+        'route:mail-moderations/mail-moderation/reject'
+      );
+      assert.ok(route);
+    });
+  }
+);
diff --git a/tests/unit/routes/oauth/authorize-test.js b/tests/unit/routes/oauth/authorize-test.js
new file mode 100644
index 000000000..304c0c650
--- /dev/null
+++ b/tests/unit/routes/oauth/authorize-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | oauth/authorize', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:oauth/authorize');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/photo-albums-test.js b/tests/unit/routes/photo-albums-test.js
new file mode 100644
index 000000000..b7c28235f
--- /dev/null
+++ b/tests/unit/routes/photo-albums-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | photo-albums', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:photo-albums');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/photo-albums/index-test.js b/tests/unit/routes/photo-albums/index-test.js
new file mode 100644
index 000000000..5fe39d060
--- /dev/null
+++ b/tests/unit/routes/photo-albums/index-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | photo-albums/index', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:photo-albums/index');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/photo-albums/new-test.js b/tests/unit/routes/photo-albums/new-test.js
new file mode 100644
index 000000000..0dcca9334
--- /dev/null
+++ b/tests/unit/routes/photo-albums/new-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | photo-albums/new', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:photo-albums/new');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/photo-albums/photo-album-test.js b/tests/unit/routes/photo-albums/photo-album-test.js
new file mode 100644
index 000000000..53130c918
--- /dev/null
+++ b/tests/unit/routes/photo-albums/photo-album-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | photo-albums/photo-album', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:photo-albums/photo-album');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/photo-albums/photo-album/destroy-test.js b/tests/unit/routes/photo-albums/photo-album/destroy-test.js
new file mode 100644
index 000000000..5d71353da
--- /dev/null
+++ b/tests/unit/routes/photo-albums/photo-album/destroy-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | photo-albums/photo-album/destroy', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:photo-albums/photo-album/destroy');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/photo-albums/photo-album/edit-test.js b/tests/unit/routes/photo-albums/photo-album/edit-test.js
new file mode 100644
index 000000000..0c1e1fb22
--- /dev/null
+++ b/tests/unit/routes/photo-albums/photo-album/edit-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | photo-albums/photo-album/edit', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:photo-albums/photo-album/edit');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/photo-albums/photo-album/index-test.js b/tests/unit/routes/photo-albums/photo-album/index-test.js
new file mode 100644
index 000000000..0f7756abb
--- /dev/null
+++ b/tests/unit/routes/photo-albums/photo-album/index-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | photo-albums/photo-album/index', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:photo-albums/photo-album/index');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/photo-albums/photo-album/photos/index-test.js b/tests/unit/routes/photo-albums/photo-album/photos/index-test.js
new file mode 100644
index 000000000..050f16d36
--- /dev/null
+++ b/tests/unit/routes/photo-albums/photo-album/photos/index-test.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Route | photo-albums/photo-album/photos/index',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      const route = this.owner.lookup(
+        'route:photo-albums/photo-album/photos/index'
+      );
+      assert.ok(route);
+    });
+  }
+);
diff --git a/tests/unit/routes/photo-albums/photo-album/photos/photo-test.js b/tests/unit/routes/photo-albums/photo-album/photos/photo-test.js
new file mode 100644
index 000000000..ffee71751
--- /dev/null
+++ b/tests/unit/routes/photo-albums/photo-album/photos/photo-test.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Route | photo-albums/photo-album/photos/photo',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      const route = this.owner.lookup(
+        'route:photo-albums/photo-album/photos/photo'
+      );
+      assert.ok(route);
+    });
+  }
+);
diff --git a/tests/unit/routes/photo-albums/photo-album/photos/photo/destroy-test.js b/tests/unit/routes/photo-albums/photo-album/photos/photo/destroy-test.js
new file mode 100644
index 000000000..51f998a01
--- /dev/null
+++ b/tests/unit/routes/photo-albums/photo-album/photos/photo/destroy-test.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Route | photo-albums/photo-album/photos/photo/destroy',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      const route = this.owner.lookup(
+        'route:photo-albums/photo-album/photos/photo/destroy'
+      );
+      assert.ok(route);
+    });
+  }
+);
diff --git a/tests/unit/routes/photo-albums/photo-album/photos/photo/index-test.js b/tests/unit/routes/photo-albums/photo-album/photos/photo/index-test.js
new file mode 100644
index 000000000..6fd4d2343
--- /dev/null
+++ b/tests/unit/routes/photo-albums/photo-album/photos/photo/index-test.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Route | photo-albums/photo-album/photos/photo/index',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      const route = this.owner.lookup(
+        'route:photo-albums/photo-album/photos/photo/index'
+      );
+      assert.ok(route);
+    });
+  }
+);
diff --git a/tests/unit/routes/photo-comments-test.js b/tests/unit/routes/photo-comments-test.js
new file mode 100644
index 000000000..e3d0e0b7f
--- /dev/null
+++ b/tests/unit/routes/photo-comments-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | photo-comments', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:photo-comments');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/photo-comments/index-test.js b/tests/unit/routes/photo-comments/index-test.js
new file mode 100644
index 000000000..bd79441a7
--- /dev/null
+++ b/tests/unit/routes/photo-comments/index-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | photo-comments/index', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:photo-comments/index');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/photo-comments/photo-comment-test.js b/tests/unit/routes/photo-comments/photo-comment-test.js
new file mode 100644
index 000000000..d33e8f92b
--- /dev/null
+++ b/tests/unit/routes/photo-comments/photo-comment-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | photo-comments/photo-comment', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:photo-comments/photo-comment');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/photo-comments/photo-comment/destroy-test.js b/tests/unit/routes/photo-comments/photo-comment/destroy-test.js
new file mode 100644
index 000000000..6bc1bd2bd
--- /dev/null
+++ b/tests/unit/routes/photo-comments/photo-comment/destroy-test.js
@@ -0,0 +1,13 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | photo-comments/photo-comment/destroy', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup(
+      'route:photo-comments/photo-comment/destroy'
+    );
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/polls/poll-test.js b/tests/unit/routes/polls/poll-test.js
new file mode 100644
index 000000000..0474f6f9f
--- /dev/null
+++ b/tests/unit/routes/polls/poll-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | polls/poll', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:polls/poll');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/vacancies/destroy-test.js b/tests/unit/routes/polls/poll/destroy-test.js
similarity index 57%
rename from tests/unit/routes/vacancies/destroy-test.js
rename to tests/unit/routes/polls/poll/destroy-test.js
index c7c88d73b..fe293dfb7 100644
--- a/tests/unit/routes/vacancies/destroy-test.js
+++ b/tests/unit/routes/polls/poll/destroy-test.js
@@ -1,11 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('Unit | Route | vacancies/destroy', function (hooks) {
+module('Unit | Route | polls/poll/destroy', function (hooks) {
   setupTest(hooks);
 
   test('it exists', function (assert) {
-    const route = this.owner.lookup('route:vacancies/destroy');
+    const route = this.owner.lookup('route:polls/poll/destroy');
     assert.ok(route);
   });
 });
diff --git a/tests/unit/routes/polls/poll/edit-test.js b/tests/unit/routes/polls/poll/edit-test.js
new file mode 100644
index 000000000..8302691af
--- /dev/null
+++ b/tests/unit/routes/polls/poll/edit-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | polls/poll/edit', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:polls/poll/edit');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/polls/poll/index.js b/tests/unit/routes/polls/poll/index.js
new file mode 100644
index 000000000..24ab882d0
--- /dev/null
+++ b/tests/unit/routes/polls/poll/index.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | polls/poll/index', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:polls/poll/index');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/profile-test.js b/tests/unit/routes/profile-test.js
new file mode 100644
index 000000000..9d402c815
--- /dev/null
+++ b/tests/unit/routes/profile-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | profile', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:profile');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/quickpost-test.js b/tests/unit/routes/quickpost-test.js
new file mode 100644
index 000000000..48cfc0df8
--- /dev/null
+++ b/tests/unit/routes/quickpost-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | quickpost', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:quickpost');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/sponsorkliks-test.js b/tests/unit/routes/sponsorkliks-test.js
new file mode 100644
index 000000000..1d981ba11
--- /dev/null
+++ b/tests/unit/routes/sponsorkliks-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | sponsorkliks', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:sponsorkliks');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/static-pages-test.js b/tests/unit/routes/static-pages-test.js
new file mode 100644
index 000000000..2cf812581
--- /dev/null
+++ b/tests/unit/routes/static-pages-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | static-pages', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:static-pages');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/static-pages/index-test.js b/tests/unit/routes/static-pages/index-test.js
new file mode 100644
index 000000000..632393c68
--- /dev/null
+++ b/tests/unit/routes/static-pages/index-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | static-pages/index', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:static-pages/index');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/static-pages/new-test.js b/tests/unit/routes/static-pages/new-test.js
new file mode 100644
index 000000000..fe7cee5ba
--- /dev/null
+++ b/tests/unit/routes/static-pages/new-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | static-pages/new', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:static-pages/new');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/static-pages/static-page-test.js b/tests/unit/routes/static-pages/static-page-test.js
new file mode 100644
index 000000000..c26471d2a
--- /dev/null
+++ b/tests/unit/routes/static-pages/static-page-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | static-pages/static-page', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:static-pages/static-page');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/static-pages/static-page/destroy-test.js b/tests/unit/routes/static-pages/static-page/destroy-test.js
new file mode 100644
index 000000000..28329f3a4
--- /dev/null
+++ b/tests/unit/routes/static-pages/static-page/destroy-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | static-pages/static-page/destroy', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:static-pages/static-page/destroy');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/static-pages/static-page/edit-test.js b/tests/unit/routes/static-pages/static-page/edit-test.js
new file mode 100644
index 000000000..8f7c8f30e
--- /dev/null
+++ b/tests/unit/routes/static-pages/static-page/edit-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | static-pages/static-page/edit', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:static-pages/static-page/edit');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/static-pages/static-page/index-test.js b/tests/unit/routes/static-pages/static-page/index-test.js
new file mode 100644
index 000000000..4db09d5c0
--- /dev/null
+++ b/tests/unit/routes/static-pages/static-page/index-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | static-pages/static-page/index', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:static-pages/static-page/index');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/users-test.js b/tests/unit/routes/users-test.js
new file mode 100644
index 000000000..01c0b65fd
--- /dev/null
+++ b/tests/unit/routes/users-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | users', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:users');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/users/batch/new-test.js b/tests/unit/routes/users/batch/new-test.js
new file mode 100644
index 000000000..604a2dc1a
--- /dev/null
+++ b/tests/unit/routes/users/batch/new-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | users/batch/new', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:users/batch/new');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/users/edit-test.js b/tests/unit/routes/users/edit-test.js
deleted file mode 100644
index 1e96d27da..000000000
--- a/tests/unit/routes/users/edit-test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
-
-module('Unit | Route | users/edit', function (hooks) {
-  setupTest(hooks);
-
-  test('it exists', function (assert) {
-    const route = this.owner.lookup('route:users/edit');
-    assert.ok(route);
-  });
-});
diff --git a/tests/unit/routes/articles/show-test.js b/tests/unit/routes/users/members-test.js
similarity index 59%
rename from tests/unit/routes/articles/show-test.js
rename to tests/unit/routes/users/members-test.js
index ae97bb5a6..810ff3aa1 100644
--- a/tests/unit/routes/articles/show-test.js
+++ b/tests/unit/routes/users/members-test.js
@@ -1,11 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('Unit | Route | articles/show', function (hooks) {
+module('Unit | Route | users/members', function (hooks) {
   setupTest(hooks);
 
   test('it exists', function (assert) {
-    const route = this.owner.lookup('route:articles/show');
+    const route = this.owner.lookup('route:users/members');
     assert.ok(route);
   });
 });
diff --git a/tests/unit/routes/users/user-test.js b/tests/unit/routes/users/user-test.js
new file mode 100644
index 000000000..40a2d5357
--- /dev/null
+++ b/tests/unit/routes/users/user-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | users/user', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:users/user');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/users/user/destroy-test.js b/tests/unit/routes/users/user/destroy-test.js
new file mode 100644
index 000000000..0edf52bec
--- /dev/null
+++ b/tests/unit/routes/users/user/destroy-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | users/user/destroy', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:users/user/destroy');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/users/user/edit-test.js b/tests/unit/routes/users/user/edit-test.js
new file mode 100644
index 000000000..772886207
--- /dev/null
+++ b/tests/unit/routes/users/user/edit-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | users/user/edit', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:users/user/edit');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/users/user/edit/index-test.js b/tests/unit/routes/users/user/edit/index-test.js
new file mode 100644
index 000000000..4f3490c79
--- /dev/null
+++ b/tests/unit/routes/users/user/edit/index-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | users/user/edit/index', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:users/user/edit/index');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/users/user/edit/permissions-test.js b/tests/unit/routes/users/user/edit/permissions-test.js
new file mode 100644
index 000000000..9f0a2eb93
--- /dev/null
+++ b/tests/unit/routes/users/user/edit/permissions-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | users/user/edit/permissions', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:users/user/edit/permissions');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/users/user/edit/privacy-test.js b/tests/unit/routes/users/user/edit/privacy-test.js
new file mode 100644
index 000000000..eda1e80cc
--- /dev/null
+++ b/tests/unit/routes/users/user/edit/privacy-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | users/user/edit/privacy', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:users/user/edit/privacy');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/users/user/edit/security-test.js b/tests/unit/routes/users/user/edit/security-test.js
new file mode 100644
index 000000000..dc557c7b4
--- /dev/null
+++ b/tests/unit/routes/users/user/edit/security-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | users/user/edit/security', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:users/user/edit/security');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/users/user/groups-test.js b/tests/unit/routes/users/user/groups-test.js
new file mode 100644
index 000000000..1e8cc5229
--- /dev/null
+++ b/tests/unit/routes/users/user/groups-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | users/user/groups', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:users/user/groups');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/users/user/index-test.js b/tests/unit/routes/users/user/index-test.js
new file mode 100644
index 000000000..130ffe094
--- /dev/null
+++ b/tests/unit/routes/users/user/index-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | users/user/index', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:users/user/index');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/users/user/mail-test.js b/tests/unit/routes/users/user/mail-test.js
new file mode 100644
index 000000000..0901f68b3
--- /dev/null
+++ b/tests/unit/routes/users/user/mail-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | users/user/mail', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:users/user/mail');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/users/user/mandates-test.js b/tests/unit/routes/users/user/mandates-test.js
new file mode 100644
index 000000000..187966b86
--- /dev/null
+++ b/tests/unit/routes/users/user/mandates-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | users/user/mandates', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:users/user/mandates');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/users/user/permissions-test.js b/tests/unit/routes/users/user/permissions-test.js
new file mode 100644
index 000000000..3a974e499
--- /dev/null
+++ b/tests/unit/routes/users/user/permissions-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | users/user/permissions', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:users/user/permissions');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/users/user/resend-activation-code-test.js b/tests/unit/routes/users/user/resend-activation-code-test.js
new file mode 100644
index 000000000..1bba745a6
--- /dev/null
+++ b/tests/unit/routes/users/user/resend-activation-code-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | users/user/resend-activation-code', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:users/user/resend-activation-code');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/users/user/settings-test.js b/tests/unit/routes/users/user/settings-test.js
new file mode 100644
index 000000000..da9016b35
--- /dev/null
+++ b/tests/unit/routes/users/user/settings-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | users/user/settings', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:users/user/settings');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/users/webdav-test.js b/tests/unit/routes/users/webdav-test.js
new file mode 100644
index 000000000..7dd11f224
--- /dev/null
+++ b/tests/unit/routes/users/webdav-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | users/webdav', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:users/webdav');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/vacancies.js b/tests/unit/routes/vacancies.js
new file mode 100644
index 000000000..77a07c920
--- /dev/null
+++ b/tests/unit/routes/vacancies.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | vacancies', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:vacancies');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/vacancies/edit-test.js b/tests/unit/routes/vacancies/edit-test.js
deleted file mode 100644
index a5a1f9558..000000000
--- a/tests/unit/routes/vacancies/edit-test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
-
-module('Unit | Route | vacancies/edit', function (hooks) {
-  setupTest(hooks);
-
-  test('it exists', function (assert) {
-    const route = this.owner.lookup('route:vacancies/edit');
-    assert.ok(route);
-  });
-});
diff --git a/tests/unit/routes/vacancies/show-test.js b/tests/unit/routes/vacancies/show-test.js
deleted file mode 100644
index 84e8cfabe..000000000
--- a/tests/unit/routes/vacancies/show-test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
-
-module('Unit | Route | vacancies/show', function (hooks) {
-  setupTest(hooks);
-
-  test('it exists', function (assert) {
-    const route = this.owner.lookup('route:vacancies/show');
-    assert.ok(route);
-  });
-});
diff --git a/tests/unit/routes/vacancies/vacancy-test.js b/tests/unit/routes/vacancies/vacancy-test.js
new file mode 100644
index 000000000..7ef63d7a6
--- /dev/null
+++ b/tests/unit/routes/vacancies/vacancy-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | vacancies/vacancy', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:vacancies/vacancy');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/vacancies/vacancy/destroy-test.js b/tests/unit/routes/vacancies/vacancy/destroy-test.js
new file mode 100644
index 000000000..36262bcb4
--- /dev/null
+++ b/tests/unit/routes/vacancies/vacancy/destroy-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | vacancies/vacancy/destroy', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:vacancies/vacancy/destroy');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/vacancies/vacancy/edit-test.js b/tests/unit/routes/vacancies/vacancy/edit-test.js
new file mode 100644
index 000000000..9080fe782
--- /dev/null
+++ b/tests/unit/routes/vacancies/vacancy/edit-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | vacancies/vacancy/edit', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:vacancies/vacancy/edit');
+    assert.ok(route);
+  });
+});
diff --git a/tests/unit/routes/vacancies/vacancy/index-test.js b/tests/unit/routes/vacancies/vacancy/index-test.js
new file mode 100644
index 000000000..05e6cb0cd
--- /dev/null
+++ b/tests/unit/routes/vacancies/vacancy/index-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | vacancies/vacancy/index', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    const route = this.owner.lookup('route:vacancies/vacancy/index');
+    assert.ok(route);
+  });
+});
diff --git a/translations/en.yaml b/translations/en.yaml
index 77b1bf141..8b2ab3e03 100644
--- a/translations/en.yaml
+++ b/translations/en.yaml
@@ -27,12 +27,12 @@ model:
       other: groups
   mailAlias:
     name:
-      one: mail-alias
-      other: mail-aliases
+      one: mail alias
+      other: mail aliases
   mailModeration:
     name:
-      one: mail-moderation
-      other: mail-moderations
+      one: mail moderation
+      other: mail moderations
   forum:
     name:
       one: forum
@@ -221,9 +221,9 @@ mixin:
     sponsorkliks: Sponsorkliks
     profile: Profile
     settings: Settings
-    mailaliases: Mail aliases
+    mailAliases: Mail aliases
     collections: Collections
-    mailModerations: Mail Moderations
+    mailModerations: Mail moderations
     mandates: Mandates
     tomato: S.O.F.I.A
     nextcloud: Nextcloud
diff --git a/translations/nl.yaml b/translations/nl.yaml
index 77c038daa..f932b35bb 100644
--- a/translations/nl.yaml
+++ b/translations/nl.yaml
@@ -27,24 +27,24 @@ model:
       other: groepen
   mailAlias:
     name:
-      one: mail-alias
-      other: mail-aliassen
+      one: mail alias
+      other: mail aliassen
   mailModeration:
     name:
-      one: mail-moderatie
-      other: mail-moderaties
+      one: mail moderatie
+      other: mail moderaties
   forum:
     name:
       one: forum
       other: fora
   photoAlbum:
     name:
-      one: foto-album
-      other: foto-albums
+      one: fotoalbum
+      other: fotoalbums
   photoComment:
     name:
-      one: fotoreactie
-      other: fotoreacties
+      one: foto reactie
+      other: foto reacties
   photo:
     name:
       one: foto
@@ -223,7 +223,7 @@ mixin:
     sponsorkliks: Sponsorkliks
     profile: Profiel
     settings: Instellingen
-    mailaliases: Mail aliassen
+    mailAliases: Mail aliassen
     collections: Incasso's
     mailModerations: Mail moderaties
     mandates: Mandaten
@@ -234,7 +234,7 @@ mixin:
     activities: Activiteiten
     vacancies: Vacatures
     forum: Forum
-    photoAlbums: Foto-albums
+    photoAlbums: Fotoalbums
     polls: Polls
     groups: Groepen
     users: Gebruikers
diff --git a/yarn.lock b/yarn.lock
index 09d9ddec1..925c0eda5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -65,6 +65,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/core@npm:^7.0.0, @babel/core@npm:^7.16.10, @babel/core@npm:^7.20.12":
+  version: 7.21.8
+  resolution: "@babel/core@npm:7.21.8"
+  dependencies:
+    "@ampproject/remapping": ^2.2.0
+    "@babel/code-frame": ^7.21.4
+    "@babel/generator": ^7.21.5
+    "@babel/helper-compilation-targets": ^7.21.5
+    "@babel/helper-module-transforms": ^7.21.5
+    "@babel/helpers": ^7.21.5
+    "@babel/parser": ^7.21.8
+    "@babel/template": ^7.20.7
+    "@babel/traverse": ^7.21.5
+    "@babel/types": ^7.21.5
+    convert-source-map: ^1.7.0
+    debug: ^4.1.0
+    gensync: ^1.0.0-beta.2
+    json5: ^2.2.2
+    semver: ^6.3.0
+  checksum: f28118447355af2a90bd340e2e60699f94c8020517eba9b71bf8ebff62fa9e00d63f076e033f9dfb97548053ad62ada45fafb0d96584b1a90e8aef5a3b8241b1
+  languageName: node
+  linkType: hard
+
 "@babel/core@npm:^7.1.6, @babel/core@npm:^7.12.0, @babel/core@npm:^7.16.7, @babel/core@npm:^7.3.4":
   version: 7.17.7
   resolution: "@babel/core@npm:7.17.7"
@@ -88,29 +111,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:^7.16.10, @babel/core@npm:^7.20.12":
-  version: 7.21.8
-  resolution: "@babel/core@npm:7.21.8"
-  dependencies:
-    "@ampproject/remapping": ^2.2.0
-    "@babel/code-frame": ^7.21.4
-    "@babel/generator": ^7.21.5
-    "@babel/helper-compilation-targets": ^7.21.5
-    "@babel/helper-module-transforms": ^7.21.5
-    "@babel/helpers": ^7.21.5
-    "@babel/parser": ^7.21.8
-    "@babel/template": ^7.20.7
-    "@babel/traverse": ^7.21.5
-    "@babel/types": ^7.21.5
-    convert-source-map: ^1.7.0
-    debug: ^4.1.0
-    gensync: ^1.0.0-beta.2
-    json5: ^2.2.2
-    semver: ^6.3.0
-  checksum: f28118447355af2a90bd340e2e60699f94c8020517eba9b71bf8ebff62fa9e00d63f076e033f9dfb97548053ad62ada45fafb0d96584b1a90e8aef5a3b8241b1
-  languageName: node
-  linkType: hard
-
 "@babel/generator@npm:^7.17.3, @babel/generator@npm:^7.17.7":
   version: 7.17.7
   resolution: "@babel/generator@npm:7.17.7"
@@ -4108,8 +4108,8 @@ __metadata:
     ember-cli-sri: ^2.1.1
     ember-cli-terser: ^4.0.2
     ember-cli-update: ^1.0.1
+    ember-composable-helpers: ^5.0.0
     ember-concurrency: ^3.0.0
-    ember-crumbly: ^3.0.1
     ember-data: ~3.27.1
     ember-fetch: ^8.1.1
     ember-file-upload: ^8.0.0
@@ -6194,6 +6194,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"broccoli-funnel@npm:2.0.1":
+  version: 2.0.1
+  resolution: "broccoli-funnel@npm:2.0.1"
+  dependencies:
+    array-equal: ^1.0.0
+    blank-object: ^1.0.1
+    broccoli-plugin: ^1.3.0
+    debug: ^2.2.0
+    fast-ordered-set: ^1.0.0
+    fs-tree-diff: ^0.5.3
+    heimdalljs: ^0.2.0
+    minimatch: ^3.0.0
+    mkdirp: ^0.5.0
+    path-posix: ^1.0.0
+    rimraf: ^2.4.3
+    symlink-or-copy: ^1.0.0
+    walk-sync: ^0.3.1
+  checksum: 415257006360c6015835a513c7946f1bc356ea5ed6bd960382bad1f511d81758539690ccbd7cecdc740b7e91f1719088b5bb8f5c024ca4dda089efec229ce0b7
+  languageName: node
+  linkType: hard
+
 "broccoli-funnel@npm:^1.0.1, broccoli-funnel@npm:^1.2.0":
   version: 1.2.0
   resolution: "broccoli-funnel@npm:1.2.0"
@@ -7268,9 +7289,9 @@ __metadata:
   linkType: hard
 
 "caniuse-lite@npm:^1.0.30001449":
-  version: 1.0.30001486
-  resolution: "caniuse-lite@npm:1.0.30001486"
-  checksum: 5e8c2ba2679e4ad17dea6d2761a6449b814441bfeac81af6cc9d58af187df6af4b79b27befcbfc4a557e720b21c0399a7d1911c8705922e38938dcc0f40b5d4b
+  version: 1.0.30001485
+  resolution: "caniuse-lite@npm:1.0.30001485"
+  checksum: 2db8a9e5facf8df5275c96e44714a6caf3b9485813be1fe0aa5a72a7ced974137adeeed806a9a97f713d2f6d1b5c342949b88355ee0323ba35656bfa00d57fea
   languageName: node
   linkType: hard
 
@@ -9266,18 +9287,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ember-cli-htmlbars@npm:^2.0.1":
-  version: 2.0.5
-  resolution: "ember-cli-htmlbars@npm:2.0.5"
-  dependencies:
-    broccoli-persistent-filter: ^1.4.3
-    hash-for-dep: ^1.2.3
-    json-stable-stringify: ^1.0.0
-    strip-bom: ^3.0.0
-  checksum: c9f2e1c9ea1de80ca9b4d6336798a724b3c4d3d0de7f5cd05b8b6b0bf3655a5d922ccef8b94769613d5d8531511a2292f5a505202c6976f36a7bf4305c324b34
-  languageName: node
-  linkType: hard
-
 "ember-cli-htmlbars@npm:^4.3.1":
   version: 4.4.1
   resolution: "ember-cli-htmlbars@npm:4.4.1"
@@ -9857,6 +9866,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ember-composable-helpers@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "ember-composable-helpers@npm:5.0.0"
+  dependencies:
+    "@babel/core": ^7.0.0
+    broccoli-funnel: 2.0.1
+    ember-cli-babel: ^7.26.3
+    resolve: ^1.10.0
+  checksum: 8fdceade42f025cb75cb3718de4a6f3836b1a74eca8d30ca7a8c0313fccdce6663ce6fa5e5bd14fd905ecac2a330d55c169f21f559f092a5900d08ddc290fff6
+  languageName: node
+  linkType: hard
+
 "ember-concurrency-decorators@npm:^2.0.0":
   version: 2.0.3
   resolution: "ember-concurrency-decorators@npm:2.0.3"
@@ -9924,26 +9945,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ember-copy@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "ember-copy@npm:1.0.0"
-  dependencies:
-    ember-cli-babel: ^6.6.0
-  checksum: 41da1aa03148e7de299013f7db3d6356bf28a35a40c14af445149d864baa9e48f1227e0e6a281fd457748ea07047afb6f377db45ea88123e045ba773e93c06f9
-  languageName: node
-  linkType: hard
-
-"ember-crumbly@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "ember-crumbly@npm:3.0.1"
-  dependencies:
-    ember-cli-babel: ^6.6.0
-    ember-cli-htmlbars: ^2.0.1
-    ember-copy: ^1.0.0
-  checksum: 2a87c3a36502f0f173c12ebaa8f3aaedd363118c6ecc7df936896cdd135775a32983854ee3e46aed225638bda906f76bcd09b344b9276ad08878e11676f1d8e7
-  languageName: node
-  linkType: hard
-
 "ember-data@npm:~3.27.1":
   version: 3.27.1
   resolution: "ember-data@npm:3.27.1"
@@ -22868,7 +22869,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"workerpool@npm:^2.3.4":
+"workerpool@npm:^2.3.0":
   version: 2.3.4
   resolution: "workerpool@npm:2.3.4"
   dependencies: