diff --git a/app/config/routes.yml b/app/config/routes.yml
index 610ed71..8974a32 100644
--- a/app/config/routes.yml
+++ b/app/config/routes.yml
@@ -4,58 +4,61 @@ router:
   routes:
     home-route:
       pattern: '/'
-      path:
-        controller: index
-        action: index
+      path: Index::index
     about-route:
       pattern: '/about'
-      path:
-        controller: index
-        action: about
+      path: Index::about
+
+    # Callbacks
+
+    cb-list:
+      pattern: '/callback/list'
+      path: Callback::list
+    cb-new:
+      pattern: '/callback/new'
+      path: Callback::new
     cb-created:
       pattern: '/callback/created/{id}'
-      path:
-        controller: callback
-        action: created
+      path: Callback::created
+    cb-show:
+      pattern: '/callback/show/{id}'
+      path: Callback::show
     cb-endpoint:
       pattern: '/cb/{id}/:params'
-      path:
-        controller: api
-        action: endpoint
+      path: Api::endpoint
+
+    # login
+
     login:
       pattern: '/login'
-      path:
-        controller: auth
-        action: index
+      path: Auth::index
     logout:
       pattern: '/logout'
-      path:
-        controller: auth
-        action: logout
+      path: Auth::logout
     oauth:
       pattern: '/login/{strategy:([a-z]+)}/:params'
-      path:
-        controller: auth
-        action: oauth
+      path: Auth::oauth
     oauth-disconnect:
       pattern: '/oauth/{provider:([a-z]+)}/disconnect'
       path: 'User::oauthdisconnect'
     oauth-disconnect-confirm:
       pattern: '/oauth/{provider:([a-z]+)}/disconnect/{confirm}'
       path: 'User::oauthdisconnect'
+
+    # User
+
     user-register:
       pattern: '/register'
       path: Auth::register
     user-settings:
       pattern: '/settings'
-      path:
-        controller: user
-        action: settings
+      path: User::settings
+    user-activity-log:
+      pattern: '/user/activity'
+      path: User::activity
     activation-link:
       pattern: '/activate/{link}'
-      path:
-        controller: api
-        action: activationlink
+      path: Api::activationlink
 
     # Backend
     backend-home:
@@ -75,10 +78,7 @@ router:
       path: backend::user::activation-email
     backend-user-status:
       pattern: '/admin/user/{id:([0-9]+)}/status/{type}'
-      path:
-        module: backend
-        controller: user
-        action: status
+      path: backend::user::status
     backend-log:
       pattern: '/admin/log{page:/?([0-9]+)?}'
       path: backend::log::index