diff --git a/Module.php b/Module.php
index 04c12fcb..066bc765 100644
--- a/Module.php
+++ b/Module.php
@@ -392,7 +392,7 @@ protected function addAclRules()
     public function setPublicAppLayout(Event $event)
     {
         $routeName = $event->getRouteMatch()->getMatchedRouteName();
-        if (0 !== strpos($routeName, 'scripto')) {
+        if (0 !== strpos($routeName, 'site/scripto')) {
             // Not a public application Scripto route.
             return;
         }
diff --git a/config/module.config.php b/config/module.config.php
index e3d63f51..ab81e423 100644
--- a/config/module.config.php
+++ b/config/module.config.php
@@ -90,293 +90,281 @@
     ],
     'router' => [
         'routes' => [
-            'scripto' => [
-                'type' => 'Segment',
-                'options' => [
-                    'route' => '/scripto[/s/:site-slug/:site-project-id][/:action]',
-                    'constraints' => [
-                        'site-slug' => '[a-zA-Z0-9_-]+',
-                        'site-project-id' => '\d+',
-                        'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
-                    ],
-                    'defaults' => [
-                        '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
-                        'controller' => 'index',
-                        'action' => 'index',
-                    ],
-                ],
-            ],
-            'scripto-user-contributions' => [
-                'type' => 'Segment',
-                'options' => [
-                    'route' => '/scripto[/s/:site-slug/:site-project-id]/user/:user-id/contributions',
-                    'constraints' => [
-                        'site-slug' => '[a-zA-Z0-9_-]+',
-                        'site-project-id' => '\d+',
-                    ],
-                    'defaults' => [
-                        '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
-                        'controller' => 'user',
-                        'action' => 'contributions',
-                    ],
-                ],
-            ],
-            'scripto-user-watchlist' => [
-                'type' => 'Segment',
-                'options' => [
-                    'route' => '/scripto[/s/:site-slug/:site-project-id]/user/:user-id/watchlist',
-                    'constraints' => [
-                        'site-slug' => '[a-zA-Z0-9_-]+',
-                        'site-project-id' => '\d+',
-                    ],
-                    'defaults' => [
-                        '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
-                        'controller' => 'user',
-                        'action' => 'watchlist',
-                    ],
-                ],
-            ],
-            'scripto-project' => [
-                'type' => 'Segment',
-                'options' => [
-                    'route' => '/scripto[/s/:site-slug/:site-project-id]/project[/:action]',
-                    'constraints' => [
-                        'site-slug' => '[a-zA-Z0-9_-]+',
-                        'site-project-id' => '\d+',
-                        'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
-                    ],
-                    'defaults' => [
-                        '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
-                        'controller' => 'project',
-                        'action' => 'browse',
-                    ],
-                ],
-            ],
-            'scripto-project-id' => [
-                'type' => 'Segment',
-                'options' => [
-                    'route' => '/scripto[/s/:site-slug/:site-project-id]/:project-id[/:action]',
-                    'constraints' => [
-                        'site-slug' => '[a-zA-Z0-9_-]+',
-                        'site-project-id' => '\d+',
-                        'project-id' => '\d+',
-                        'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
-                    ],
-                    'defaults' => [
-                        '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
-                        'controller' => 'project',
-                        'action' => 'show',
-                    ],
-                ],
-            ],
-            'scripto-item' => [
-                'type' => 'Segment',
-                'options' => [
-                    'route' => '/scripto[/s/:site-slug/:site-project-id]/:project-id/item[/:action]',
-                    'constraints' => [
-                        'site-slug' => '[a-zA-Z0-9_-]+',
-                        'site-project-id' => '\d+',
-                        'project-id' => '\d+',
-                        'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
-                    ],
-                    'defaults' => [
-                        '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
-                        'controller' => 'item',
-                        'action' => 'browse',
-                    ],
-                ],
-            ],
-            'scripto-item-id' => [
-                'type' => 'Segment',
-                'options' => [
-                    'route' => '/scripto[/s/:site-slug/:site-project-id]/:project-id/:item-id[/:action]',
-                    'constraints' => [
-                        'site-slug' => '[a-zA-Z0-9_-]+',
-                        'site-project-id' => '\d+',
-                        'project-id' => '\d+',
-                        'item-id' => '\d+',
-                        'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
-                    ],
-                    'defaults' => [
-                        '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
-                        'controller' => 'item',
-                        'action' => 'show',
-                    ],
-                ],
-            ],
-            'scripto-media' => [
-                'type' => 'Segment',
-                'options' => [
-                    'route' => '/scripto[/s/:site-slug/:site-project-id]/:project-id/:item-id/media[/:action]',
-                    'constraints' => [
-                        'site-slug' => '[a-zA-Z0-9_-]+',
-                        'site-project-id' => '\d+',
-                        'project-id' => '\d+',
-                        'item-id' => '\d+',
-                        'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
-                    ],
-                    'defaults' => [
-                        '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
-                        'controller' => 'media',
-                        'action' => 'browse',
-                    ],
-                ],
-            ],
-            'scripto-media-id' => [
-                'type' => 'Segment',
-                'options' => [
-                    'route' => '/scripto[/s/:site-slug/:site-project-id]/:project-id/:item-id/:media-id[/:action]',
-                    'constraints' => [
-                        'site-slug' => '[a-zA-Z0-9_-]+',
-                        'site-project-id' => '\d+',
-                        'project-id' => '\d+',
-                        'item-id' => '\d+',
-                        'media-id' => '\d+',
-                        'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+            'site' => [
+                'child_routes' => [
+                    'scripto' => [
+                        'type' => 'Segment',
+                        'options' => [
+                            'route' => '/scripto/:site-project-id[/:action]',
+                            'constraints' => [
+                                'site-project-id' => '\d+',
+                                'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                            ],
+                            'defaults' => [
+                                '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
+                                'controller' => 'index',
+                                'action' => 'index',
+                            ],
+                        ],
                     ],
-                    'defaults' => [
-                        '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
-                        'controller' => 'media',
-                        'action' => 'show',
+                    'scripto-user-contributions' => [
+                        'type' => 'Segment',
+                        'options' => [
+                            'route' => '/scripto/:site-project-id/user/:user-id/contributions',
+                            'constraints' => [
+                                'site-project-id' => '\d+',
+                            ],
+                            'defaults' => [
+                                '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
+                                'controller' => 'user',
+                                'action' => 'contributions',
+                            ],
+                        ],
                     ],
-                ],
-            ],
-            'scripto-revision' => [
-                'type' => 'Segment',
-                'options' => [
-                    'route' => '/scripto[/s/:site-slug/:site-project-id]/:project-id/:item-id/:media-id/revision[/:action]',
-                    'constraints' => [
-                        'site-slug' => '[a-zA-Z0-9_-]+',
-                        'site-project-id' => '\d+',
-                        'project-id' => '\d+',
-                        'item-id' => '\d+',
-                        'media-id' => '\d+',
-                        'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                    'scripto-user-watchlist' => [
+                        'type' => 'Segment',
+                        'options' => [
+                            'route' => '/scripto/:site-project-id/user/:user-id/watchlist',
+                            'constraints' => [
+                                'site-project-id' => '\d+',
+                            ],
+                            'defaults' => [
+                                '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
+                                'controller' => 'user',
+                                'action' => 'watchlist',
+                            ],
+                        ],
                     ],
-                    'defaults' => [
-                        '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
-                        'controller' => 'revision',
-                        'action' => 'browse',
+                    'scripto-project' => [
+                        'type' => 'Segment',
+                        'options' => [
+                            'route' => '/scripto/:site-project-id/project[/:action]',
+                            'constraints' => [
+                                'site-project-id' => '\d+',
+                                'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                            ],
+                            'defaults' => [
+                                '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
+                                'controller' => 'project',
+                                'action' => 'browse',
+                            ],
+                        ],
                     ],
-                ],
-            ],
-            'scripto-revision-id' => [
-                'type' => 'Segment',
-                'options' => [
-                    'route' => '/scripto[/s/:site-slug/:site-project-id]/:project-id/:item-id/:media-id/revision/:revision-id[/:action]',
-                    'constraints' => [
-                        'site-slug' => '[a-zA-Z0-9_-]+',
-                        'site-project-id' => '\d+',
-                        'project-id' => '\d+',
-                        'item-id' => '\d+',
-                        'media-id' => '\d+',
-                        'revision-id' => '\d+',
-                        'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                    'scripto-project-id' => [
+                        'type' => 'Segment',
+                        'options' => [
+                            'route' => '/scripto/:site-project-id/:project-id[/:action]',
+                            'constraints' => [
+                                'site-project-id' => '\d+',
+                                'project-id' => '\d+',
+                                'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                            ],
+                            'defaults' => [
+                                '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
+                                'controller' => 'project',
+                                'action' => 'show',
+                            ],
+                        ],
                     ],
-                    'defaults' => [
-                        '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
-                        'controller' => 'revision',
-                        'action' => 'show',
+                    'scripto-item' => [
+                        'type' => 'Segment',
+                        'options' => [
+                            'route' => '/scripto/:site-project-id/:project-id/item[/:action]',
+                            'constraints' => [
+                                'site-project-id' => '\d+',
+                                'project-id' => '\d+',
+                                'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                            ],
+                            'defaults' => [
+                                '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
+                                'controller' => 'item',
+                                'action' => 'browse',
+                            ],
+                        ],
                     ],
-                ],
-            ],
-            'scripto-revision-compare' => [
-                'type' => 'Segment',
-                'options' => [
-                    'route' => '/scripto[/s/:site-slug/:site-project-id]/:project-id/:item-id/:media-id/revision/:from-revision-id/:to-revision-id[/:action]',
-                    'constraints' => [
-                        'site-slug' => '[a-zA-Z0-9_-]+',
-                        'site-project-id' => '\d+',
-                        'project-id' => '\d+',
-                        'item-id' => '\d+',
-                        'media-id' => '\d+',
-                        'from-revision-id' => '\d+',
-                        'to-revision-id' => '\d+',
-                        'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                    'scripto-item-id' => [
+                        'type' => 'Segment',
+                        'options' => [
+                            'route' => '/scripto/:site-project-id/:project-id/:item-id[/:action]',
+                            'constraints' => [
+                                'site-project-id' => '\d+',
+                                'project-id' => '\d+',
+                                'item-id' => '\d+',
+                                'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                            ],
+                            'defaults' => [
+                                '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
+                                'controller' => 'item',
+                                'action' => 'show',
+                            ],
+                        ],
                     ],
-                    'defaults' => [
-                        '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
-                        'controller' => 'revision',
-                        'action' => 'compare',
+                    'scripto-media' => [
+                        'type' => 'Segment',
+                        'options' => [
+                            'route' => '/scripto/:site-project-id/:project-id/:item-id/media[/:action]',
+                            'constraints' => [
+                                'site-project-id' => '\d+',
+                                'project-id' => '\d+',
+                                'item-id' => '\d+',
+                                'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                            ],
+                            'defaults' => [
+                                '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
+                                'controller' => 'media',
+                                'action' => 'browse',
+                            ],
+                        ],
                     ],
-                ],
-            ],
-            'scripto-talk-media-id' => [
-                'type' => 'Segment',
-                'options' => [
-                    'route' => '/scripto[/s/:site-slug/:site-project-id]/:project-id/:item-id/:media-id/talk[/:action]',
-                    'constraints' => [
-                        'site-slug' => '[a-zA-Z0-9_-]+',
-                        'site-project-id' => '\d+',
-                        'project-id' => '\d+',
-                        'item-id' => '\d+',
-                        'media-id' => '\d+',
-                        'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                    'scripto-media-id' => [
+                        'type' => 'Segment',
+                        'options' => [
+                            'route' => '/scripto/:site-project-id/:project-id/:item-id/:media-id[/:action]',
+                            'constraints' => [
+                                'site-project-id' => '\d+',
+                                'project-id' => '\d+',
+                                'item-id' => '\d+',
+                                'media-id' => '\d+',
+                                'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                            ],
+                            'defaults' => [
+                                '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
+                                'controller' => 'media',
+                                'action' => 'show',
+                            ],
+                        ],
                     ],
-                    'defaults' => [
-                        '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
-                        'controller' => 'media',
-                        'action' => 'show-talk',
+                    'scripto-revision' => [
+                        'type' => 'Segment',
+                        'options' => [
+                            'route' => '/scripto/:site-project-id/:project-id/:item-id/:media-id/revision[/:action]',
+                            'constraints' => [
+                                'site-project-id' => '\d+',
+                                'project-id' => '\d+',
+                                'item-id' => '\d+',
+                                'media-id' => '\d+',
+                                'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                            ],
+                            'defaults' => [
+                                '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
+                                'controller' => 'revision',
+                                'action' => 'browse',
+                            ],
+                        ],
                     ],
-                ],
-            ],
-            'scripto-talk-revision' => [
-                'type' => 'Segment',
-                'options' => [
-                    'route' => '/scripto[/s/:site-slug/:site-project-id]/:project-id/:item-id/:media-id/talk/revision[/:action]',
-                    'constraints' => [
-                        'site-slug' => '[a-zA-Z0-9_-]+',
-                        'site-project-id' => '\d+',
-                        'project-id' => '\d+',
-                        'item-id' => '\d+',
-                        'media-id' => '\d+',
-                        'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                    'scripto-revision-id' => [
+                        'type' => 'Segment',
+                        'options' => [
+                            'route' => '/scripto/:site-project-id/:project-id/:item-id/:media-id/revision/:revision-id[/:action]',
+                            'constraints' => [
+                                'site-project-id' => '\d+',
+                                'project-id' => '\d+',
+                                'item-id' => '\d+',
+                                'media-id' => '\d+',
+                                'revision-id' => '\d+',
+                                'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                            ],
+                            'defaults' => [
+                                '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
+                                'controller' => 'revision',
+                                'action' => 'show',
+                            ],
+                        ],
                     ],
-                    'defaults' => [
-                        '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
-                        'controller' => 'revision',
-                        'action' => 'browse-talk',
+                    'scripto-revision-compare' => [
+                        'type' => 'Segment',
+                        'options' => [
+                            'route' => '/scripto/:site-project-id/:project-id/:item-id/:media-id/revision/:from-revision-id/:to-revision-id[/:action]',
+                            'constraints' => [
+                                'site-project-id' => '\d+',
+                                'project-id' => '\d+',
+                                'item-id' => '\d+',
+                                'media-id' => '\d+',
+                                'from-revision-id' => '\d+',
+                                'to-revision-id' => '\d+',
+                                'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                            ],
+                            'defaults' => [
+                                '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
+                                'controller' => 'revision',
+                                'action' => 'compare',
+                            ],
+                        ],
                     ],
-                ],
-            ],
-            'scripto-talk-revision-id' => [
-                'type' => 'Segment',
-                'options' => [
-                    'route' => '/scripto[/s/:site-slug/:site-project-id]/:project-id/:item-id/:media-id/talk/revision/:revision-id[/:action]',
-                    'constraints' => [
-                        'site-slug' => '[a-zA-Z0-9_-]+',
-                        'site-project-id' => '\d+',
-                        'project-id' => '\d+',
-                        'item-id' => '\d+',
-                        'media-id' => '\d+',
-                        'revision-id' => '\d+',
-                        'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                    'scripto-talk-media-id' => [
+                        'type' => 'Segment',
+                        'options' => [
+                            'route' => '/scripto/:site-project-id/:project-id/:item-id/:media-id/talk[/:action]',
+                            'constraints' => [
+                                'site-project-id' => '\d+',
+                                'project-id' => '\d+',
+                                'item-id' => '\d+',
+                                'media-id' => '\d+',
+                                'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                            ],
+                            'defaults' => [
+                                '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
+                                'controller' => 'media',
+                                'action' => 'show-talk',
+                            ],
+                        ],
                     ],
-                    'defaults' => [
-                        '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
-                        'controller' => 'revision',
-                        'action' => 'show-talk',
+                    'scripto-talk-revision' => [
+                        'type' => 'Segment',
+                        'options' => [
+                            'route' => '/scripto/:site-project-id/:project-id/:item-id/:media-id/talk/revision[/:action]',
+                            'constraints' => [
+                                'site-project-id' => '\d+',
+                                'project-id' => '\d+',
+                                'item-id' => '\d+',
+                                'media-id' => '\d+',
+                                'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                            ],
+                            'defaults' => [
+                                '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
+                                'controller' => 'revision',
+                                'action' => 'browse-talk',
+                            ],
+                        ],
                     ],
-                ],
-            ],
-            'scripto-talk-revision-compare' => [
-                'type' => 'Segment',
-                'options' => [
-                    'route' => '/scripto[/s/:site-slug/:site-project-id]/:project-id/:item-id/:media-id/talk/revision/:from-revision-id/:to-revision-id[/:action]',
-                    'constraints' => [
-                        'site-slug' => '[a-zA-Z0-9_-]+',
-                        'site-project-id' => '\d+',
-                        'project-id' => '\d+',
-                        'item-id' => '\d+',
-                        'media-id' => '\d+',
-                        'from-revision-id' => '\d+',
-                        'to-revision-id' => '\d+',
-                        'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                    'scripto-talk-revision-id' => [
+                        'type' => 'Segment',
+                        'options' => [
+                            'route' => '/scripto/:site-project-id/:project-id/:item-id/:media-id/talk/revision/:revision-id[/:action]',
+                            'constraints' => [
+                                'site-project-id' => '\d+',
+                                'project-id' => '\d+',
+                                'item-id' => '\d+',
+                                'media-id' => '\d+',
+                                'revision-id' => '\d+',
+                                'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                            ],
+                            'defaults' => [
+                                '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
+                                'controller' => 'revision',
+                                'action' => 'show-talk',
+                            ],
+                        ],
                     ],
-                    'defaults' => [
-                        '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
-                        'controller' => 'revision',
-                        'action' => 'compare-talk',
+                    'scripto-talk-revision-compare' => [
+                        'type' => 'Segment',
+                        'options' => [
+                            'route' => '/scripto/:site-project-id/:project-id/:item-id/:media-id/talk/revision/:from-revision-id/:to-revision-id[/:action]',
+                            'constraints' => [
+                                'site-project-id' => '\d+',
+                                'project-id' => '\d+',
+                                'item-id' => '\d+',
+                                'media-id' => '\d+',
+                                'from-revision-id' => '\d+',
+                                'to-revision-id' => '\d+',
+                                'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                            ],
+                            'defaults' => [
+                                '__NAMESPACE__' => 'Scripto\Controller\PublicApp',
+                                'controller' => 'revision',
+                                'action' => 'compare-talk',
+                            ],
+                        ],
                     ],
                 ],
             ],
diff --git a/src/Api/Representation/ScriptoItemRepresentation.php b/src/Api/Representation/ScriptoItemRepresentation.php
index e754f8f9..19efffb3 100644
--- a/src/Api/Representation/ScriptoItemRepresentation.php
+++ b/src/Api/Representation/ScriptoItemRepresentation.php
@@ -21,7 +21,7 @@ public function url($action = null, $canonical = false)
         }
         $urlHelper = $this->getViewHelper('Url');
         return $urlHelper(
-            'scripto-item-id',
+            'site/scripto-item-id',
             [
                 'action' => $action,
                 'project-id' => $this->resource->getScriptoProject()->getId(),
diff --git a/src/Api/Representation/ScriptoMediaRepresentation.php b/src/Api/Representation/ScriptoMediaRepresentation.php
index b29491f4..ddd0e32d 100644
--- a/src/Api/Representation/ScriptoMediaRepresentation.php
+++ b/src/Api/Representation/ScriptoMediaRepresentation.php
@@ -22,7 +22,7 @@ public function url($action = null, $canonical = false)
         }
         $urlHelper = $this->getViewHelper('Url');
         return $urlHelper(
-            'scripto-media-id',
+            'site/scripto-media-id',
             [
                 'action' => $action,
                 'project-id' => $this->resource->getScriptoItem()->getScriptoProject()->getId(),
diff --git a/src/Api/Representation/ScriptoProjectRepresentation.php b/src/Api/Representation/ScriptoProjectRepresentation.php
index 134ad0e7..2e89e369 100644
--- a/src/Api/Representation/ScriptoProjectRepresentation.php
+++ b/src/Api/Representation/ScriptoProjectRepresentation.php
@@ -13,7 +13,7 @@ public function url($action = null, $canonical = false)
         }
         $urlHelper = $this->getViewHelper('Url');
         return $urlHelper(
-            'scripto-project-id',
+            'site/scripto-project-id',
             [
                 'action' => $action,
                 'project-id' => $this->resource->getId(),
diff --git a/src/Controller/PublicApp/IndexController.php b/src/Controller/PublicApp/IndexController.php
index ba4eadbc..3f374e5f 100644
--- a/src/Controller/PublicApp/IndexController.php
+++ b/src/Controller/PublicApp/IndexController.php
@@ -13,6 +13,7 @@ public function indexAction()
         $userInfo = $this->scripto()->apiClient()->queryUserInfo();
         $user = $this->scripto()->apiClient()->queryUser($userInfo['name']);
 
+
         $userCons = [];
         $watchlist = [];
         if ($this->scripto()->apiClient()->userIsLoggedIn()) {
@@ -49,7 +50,7 @@ public function createAccountAction()
                         $formData['email'], $formData['realname']
                     );
                     $this->messenger()->addSuccess('Your Scripto account has been created! Please check your email for a link to activate your account.'); // @translate
-                    return $this->redirect()->toRoute('scripto');
+                    return $this->redirect()->toRoute('site/scripto', ['action' => 'index'], [], true);
                 } catch (CreateaccountException $e) {
                     $this->messenger()->addError($e->getMessage());
                 }
diff --git a/src/Controller/PublicApp/ItemController.php b/src/Controller/PublicApp/ItemController.php
index 408e78ae..6f8b0c29 100644
--- a/src/Controller/PublicApp/ItemController.php
+++ b/src/Controller/PublicApp/ItemController.php
@@ -10,7 +10,7 @@ public function browseAction()
     {
         $project = $this->scripto()->getRepresentation($this->params('project-id'));
         if (!$project) {
-            return $this->redirect()->toRoute('scripto');
+            return $this->redirect()->toRoute('site/scripto');
         }
 
         $this->setBrowseDefaults('id');
@@ -39,7 +39,7 @@ public function browseAction()
     public function showAction()
     {
         return $this->redirect()->toRoute(
-            'scripto-media',
+            'site/scripto-media',
             ['action' => 'browse'],
             ['query' => $this->params()->fromQuery()],
             true
diff --git a/src/Controller/PublicApp/MediaController.php b/src/Controller/PublicApp/MediaController.php
index c32b6bb6..74019408 100644
--- a/src/Controller/PublicApp/MediaController.php
+++ b/src/Controller/PublicApp/MediaController.php
@@ -14,7 +14,7 @@ public function browseAction()
             $this->params('item-id')
         );
         if (!$sItem) {
-            return $this->redirect()->toRoute('scripto');
+            return $this->redirect()->toRoute('site/scripto');
         }
 
         $this->setBrowseDefaults('position', 'asc');
@@ -102,7 +102,7 @@ public function handleShow($namespace)
             $this->params('media-id')
         );
         if (!$sMedia) {
-            return $this->redirect()->toRoute('scripto');
+            return $this->redirect()->toRoute('site/scripto');
         }
 
         $sItem = $sMedia->scriptoItem();
@@ -133,7 +133,7 @@ public function handleEdit($namespace)
             $this->params('media-id')
         );
         if (!$sMedia) {
-            return $this->redirect()->toRoute('scripto');
+            return $this->redirect()->toRoute('site/scripto');
         }
 
         $action = (0 === $namespace) ? 'show' : 'talk';
diff --git a/src/Controller/PublicApp/ProjectController.php b/src/Controller/PublicApp/ProjectController.php
index 0ad2f61a..1a5786ac 100644
--- a/src/Controller/PublicApp/ProjectController.php
+++ b/src/Controller/PublicApp/ProjectController.php
@@ -22,7 +22,7 @@ public function guidelinesAction()
     {
         $project = $this->scripto()->getRepresentation($this->params('project-id'));
         if (!$project) {
-            return $this->redirect()->toRoute('scripto');
+            return $this->redirect()->toRoute('site/scripto');
         }
 
         $view = new ViewModel;
@@ -34,7 +34,7 @@ public function guidelinesAction()
     public function showAction()
     {
         return $this->redirect()->toRoute(
-            'scripto-item',
+            'site/scripto-item',
             ['action' => 'browse'],
             ['query' => $this->params()->fromQuery()],
             true
diff --git a/src/Controller/PublicApp/RevisionController.php b/src/Controller/PublicApp/RevisionController.php
index 03609992..4e592613 100644
--- a/src/Controller/PublicApp/RevisionController.php
+++ b/src/Controller/PublicApp/RevisionController.php
@@ -50,7 +50,7 @@ public function handleBrowse($namespace)
             $this->params('media-id')
         );
         if (!$sMedia) {
-            return $this->redirect()->toRoute('scripto');
+            return $this->redirect()->toRoute('site/scripto');
         }
 
         $response = $sMedia->pageRevisions($namespace, 100, $this->params()->fromQuery('continue'));
@@ -87,7 +87,7 @@ public function handleShow($namespace)
             $this->params('media-id')
         );
         if (!$sMedia) {
-            return $this->redirect()->toRoute('scripto');
+            return $this->redirect()->toRoute('site/scripto');
         }
 
         try {
diff --git a/src/Controller/PublicApp/UserController.php b/src/Controller/PublicApp/UserController.php
index 583157c5..b897a92b 100644
--- a/src/Controller/PublicApp/UserController.php
+++ b/src/Controller/PublicApp/UserController.php
@@ -32,14 +32,14 @@ public function watchlistAction()
     {
         if (!$this->scripto()->apiClient()->userIsLoggedIn()) {
             // User must be logged in.
-            return $this->redirect()->toRoute('scripto');
+            return $this->redirect()->toRoute('site/scripto');
         }
 
         $userName = $this->params('user-id');
         $currentUser = $this->scripto()->apiClient()->queryUserInfo();
         if ($userName !== $currentUser['name']) {
             // Logged in user must be current user.
-            return $this->redirect()->toRoute('scripto-user-watchlist', ['user-id' => $currentUser['name']]);
+            return $this->redirect()->toRoute('site/scripto-user-watchlist', ['user-id' => $currentUser['name']]);
         }
 
         $hours = $this->params()->fromQuery('hours', 720); // 30 days
diff --git a/src/Site/Navigation/Link/Scripto.php b/src/Site/Navigation/Link/Scripto.php
index e70aa7f6..d19ed7bf 100644
--- a/src/Site/Navigation/Link/Scripto.php
+++ b/src/Site/Navigation/Link/Scripto.php
@@ -42,7 +42,7 @@ public function getLabel(array $data, SiteRepresentation $site)
     public function toZend(array $data, SiteRepresentation $site)
     {
         return [
-            'route' => 'scripto-project-id',
+            'route' => 'site/scripto-project-id',
             'params' => [
                 'site-slug' => $site->slug(),
                 'site-project-id' => $data['project_id'],
diff --git a/src/ViewHelper/Scripto.php b/src/ViewHelper/Scripto.php
index 2de2a5b1..a034bbd8 100644
--- a/src/ViewHelper/Scripto.php
+++ b/src/ViewHelper/Scripto.php
@@ -123,7 +123,7 @@ public function publicAppProjectLink()
             ? $this->publicAppProject->link($view->translate('Project'), null, ['class' => 'page-link'])
             : $view->hyperlink(
                 $view->translate('Projects'),
-                $view->url('scripto-project', ['action' => 'browse'], true),
+                $view->url('site/scripto-project', ['action' => 'browse'], true),
                 ['class' => 'page-link']
             );
     }
@@ -263,9 +263,10 @@ public function loginBar()
             $userInfo = $this->apiClient->queryUserInfo();
             $form = $this->formElementManager->get(ScriptoLogoutForm::class);
             $form->setAttribute('action', $view->url(
-                'scripto',
+                'site/scripto',
                 ['action' => 'logout'],
-                ['query' => ['redirect' => $this->getCurrentUrl()]]
+                ['query' => ['redirect' => $this->getCurrentUrl()]],
+                true
             ));
             return sprintf(
                 '<div class="user logged-in">
@@ -280,17 +281,18 @@ public function loginBar()
                 %s',
                 $view->translate('User menu'), // @translate
                 sprintf($view->translate('Logged in to Scripto as %s'), sprintf('<span class="username">%s</span>', $userInfo['name'])),
-                $view->hyperlink($view->translate('Dashboard'), $view->url('scripto', ['action' => 'index'], true)),
-                $view->hyperlink($view->translate('Contributions'), $view->url('scripto-user-contributions', ['action' => 'contributions', 'user-id' => $userInfo['name']], true)),
-                $view->hyperlink($view->translate('Watchlist'), $view->url('scripto-user-watchlist', ['action' => 'watchlist', 'user-id' => $userInfo['name']], true)),
+                $view->hyperlink($view->translate('Dashboard'), $view->url('site/scripto', ['action' => 'index'], true)),
+                $view->hyperlink($view->translate('Contributions'), $view->url('site/scripto-user-contributions', ['action' => 'contributions', 'user-id' => $userInfo['name']], true)),
+                $view->hyperlink($view->translate('Watchlist'), $view->url('site/scripto-user-watchlist', ['action' => 'watchlist', 'user-id' => $userInfo['name']], true)),
                 $view->form($form)
             );
         } else {
             $form = $this->formElementManager->get(ScriptoLoginForm::class);
             $form->setAttribute('action', $view->url(
-                'scripto',
+                'site/scripto',
                 ['action' => 'login'],
-                ['query' => ['redirect' => $this->getCurrentUrl()]]
+                ['query' => ['redirect' => $this->getCurrentUrl()]],
+                true
             ));
             return sprintf(
                 '<div class="user logged-out"><a href="#" class="user-toggle page-link menu-toggle">%s</a><div class="user-menu">%s</div></div>',
@@ -609,7 +611,7 @@ public function getUserSignature()
         $userInfo = $this->apiClient->queryUserInfo();
         return sprintf(
             '-- [%s %s] ~~~~~',
-            $view->url('scripto-user-contributions', ['user-id' => $userInfo['name']], ['force_canonical' => true]),
+            $view->url('site/scripto-user-contributions', ['user-id' => $userInfo['name']], ['force_canonical' => true], true),
             $userInfo['name']
         );
     }
diff --git a/view/common/block-layout/scripto-block.phtml b/view/common/block-layout/scripto-block.phtml
index 7a72e00b..c2f34379 100644
--- a/view/common/block-layout/scripto-block.phtml
+++ b/view/common/block-layout/scripto-block.phtml
@@ -2,7 +2,7 @@
 <p><?php echo $this->hyperlink(
     $project->title(),
     $this->url(
-        'scripto-project-id',
+        'site/scripto-project-id',
         [
             'site-slug' => $site->slug(),
             'site-project-id' => $project->id(),
diff --git a/view/common/media-head.phtml b/view/common/media-head.phtml
index deadaaeb..eda51517 100644
--- a/view/common/media-head.phtml
+++ b/view/common/media-head.phtml
@@ -2,10 +2,10 @@
     <div class="tab-actions">
     <?php if ($userCanEdit): ?>
         <?php echo $sMedia->link($this->scripto()->translate($project->contentType(), 'Edit'), 'edit'); ?>
-        <?php echo $this->hyperlink($this->translate('Browse revision history'), $this->url('scripto-revision', ['action' => 'browse'], true)); ?>
+        <?php echo $this->hyperlink($this->translate('Browse revision history'), $this->url('site/scripto-revision', ['action' => 'browse'], true)); ?>
     <?php endif; ?>
     <?php echo $sMedia->link($this->translate('View notes'), 'show-talk'); ?>
     <?php echo $this->scripto()->watchlistToggle($sMedia, $project->mediaType()); ?>
     </div>
     <?php echo $this->scripto()->mediaPagination(); ?>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/layout/layout-scripto-public-app.phtml b/view/layout/layout-scripto-public-app.phtml
index 8d68b150..b1fe5452 100644
--- a/view/layout/layout-scripto-public-app.phtml
+++ b/view/layout/layout-scripto-public-app.phtml
@@ -25,7 +25,7 @@ $this->headScript()->appendFile($this->assetUrl('js/public-app.js', 'Scripto'));
     </head>
     <header class="site-header" role="banner">
         <div class="wrapper">
-            <?php echo $this->hyperlink($title, $this->url('scripto', ['action' => 'index'], true), ['class' => 'site-title']); ?>
+            <?php echo $this->hyperlink($title, $this->url('site/scripto', ['action' => 'index'], true), ['class' => 'site-title']); ?>
             <nav class="top-nav">
                 <input type="checkbox" id="nav-trigger" class="nav-trigger" aria-label="<?php echo $this->translate('Toggle menu'); ?>"/>
                 <label for="nav-trigger">
@@ -37,7 +37,7 @@ $this->headScript()->appendFile($this->assetUrl('js/public-app.js', 'Scripto'));
                         <?php echo $this->scripto()->publicAppSiteLink(); ?>
                         <?php echo $this->scripto()->loginBar(); ?>
                         <?php if (!$this->scripto()->apiClient()->userIsLoggedIn()): ?>
-                        <?php echo $this->hyperlink($this->translate('Create account'), $this->url('scripto', ['action' => 'create-account'], true), ['class' => 'page-link']); ?>
+                        <?php echo $this->hyperlink($this->translate('Create account'), $this->url('site/scripto', ['action' => 'create-account'], true), ['class' => 'page-link']); ?>
                         <?php endif; ?>
                     </div>
                     <?php if (isset($project)): ?>
diff --git a/view/scripto/public-app/index/index.phtml b/view/scripto/public-app/index/index.phtml
index 897d5f05..85febb7d 100644
--- a/view/scripto/public-app/index/index.phtml
+++ b/view/scripto/public-app/index/index.phtml
@@ -2,7 +2,7 @@
         <h4>
             <?php echo $this->translate('Your recent contributions'); ?>
             <?php if (!isset($user['invalid'])): ?>
-            <?php echo $this->hyperlink($this->translate('View your contributions'), $this->url('scripto-user-contributions', ['action' => 'contributions', 'user-id' => $user['name']], true), ['class' => 'button']); ?>
+            <?php echo $this->hyperlink($this->translate('View your contributions'), $this->url('site/scripto-user-contributions', ['action' => 'contributions', 'user-id' => $user['name']], true), ['class' => 'button']); ?>
             <?php endif; ?>
         </h4>
         <?php if (!isset($user['invalid']) && $userCons): ?>
@@ -27,7 +27,7 @@
                     '%s: %s (%s) (%s | %s) %s (%s) <i>%s</i>',
                     $this->scripto()->translate($project->itemType(), 'Item'),
                     $this->hyperlink($sItem->item()->displayTitle(), $this->url(
-                        $isTalk ? 'scripto-talk-media-id' : 'scripto-media-id',
+                        $isTalk ? 'site/scripto-talk-media-id' : 'site/scripto-media-id',
                         [
                             'action' => 'show',
                             'project-id' => $project->id(),
@@ -41,7 +41,7 @@
                         : sprintf($this->scripto()->translate($project->mediaType(), 'Media #%s'), $sMedia->position()),
                     $userCon['parentid']
                         ? $this->hyperlink($this->translate('diff'), $this->url(
-                            $isTalk ? 'scripto-talk-revision-compare' : 'scripto-revision-compare',
+                            $isTalk ? 'site/scripto-talk-revision-compare' : 'site/scripto-revision-compare',
                             [
                                 'action' => 'compare',
                                 'project-id' => $project->id(),
@@ -54,7 +54,7 @@
                         ))
                         : $this->translate('diff'),
                     $this->hyperlink($this->translate('hist'), $this->url(
-                        $isTalk ? 'scripto-talk-revision' : 'scripto-revision',
+                        $isTalk ? 'site/scripto-talk-revision' : 'site/scripto-revision',
                         [
                             'action' => 'browse',
                             'project-id' => $project->id(),
@@ -64,7 +64,7 @@
                         true
                     )),
                     $this->hyperlink($date, $this->url(
-                        $isTalk ? 'scripto-talk-revision-id' : 'scripto-revision-id',
+                        $isTalk ? 'site/scripto-talk-revision-id' : 'site/scripto-revision-id',
                         [
                             'action' => 'show',
                             'project-id' => $project->id(),
@@ -96,7 +96,7 @@
         <h4>
             <?php echo $this->translate('Your recent watchlist'); ?>
             <?php if (!isset($user['invalid'])): ?>
-            <?php echo $this->hyperlink($this->translate('View your watchlist'), $this->url('scripto-user-watchlist', ['action' => 'watchlist', 'user-id' => $user['name']], true), ['class' => 'button']); ?>
+            <?php echo $this->hyperlink($this->translate('View your watchlist'), $this->url('site/scripto-user-watchlist', ['action' => 'watchlist', 'user-id' => $user['name']], true), ['class' => 'button']); ?>
             <?php endif; ?>
         </h4>
         <?php if (!isset($user['invalid']) && $watchlist): ?>
@@ -122,7 +122,7 @@
                     '%s: %s (%s) (%s | %s) %s (%s) <i>%s</i>',
                     $this->scripto()->translate($project->itemType(), 'Item'),
                     $this->hyperlink($sItem->item()->displayTitle(), $this->url(
-                        $isTalk ? 'scripto-talk-media-id' : 'scripto-media-id',
+                        $isTalk ? 'site/scripto-talk-media-id' : 'site/scripto-media-id',
                         [
                             'action' => 'show',
                             'project-id' => $project->id(),
@@ -136,7 +136,7 @@
                         : sprintf($this->scripto()->translate($project->mediaType(), 'Media #%s'), $sMedia->position()),
                     $page['old_revid']
                         ? $this->hyperlink($this->translate('diff'), $this->url(
-                            $isTalk ? 'scripto-talk-revision-compare' : 'scripto-revision-compare',
+                            $isTalk ? 'site/scripto-talk-revision-compare' : 'site/scripto-revision-compare',
                             [
                                 'action' => 'compare',
                                 'project-id' => $project->id(),
@@ -149,7 +149,7 @@
                         ))
                         : $this->translate('diff'),
                     $this->hyperlink($this->translate('hist'), $this->url(
-                        $isTalk ? 'scripto-talk-revision' : 'scripto-revision',
+                        $isTalk ? 'site/scripto-talk-revision' : 'site/scripto-revision',
                         [
                             'action' => 'browse',
                             'project-id' => $project->id(),
@@ -159,7 +159,7 @@
                         true
                     )),
                     $this->hyperlink($date, $this->url(
-                        $isTalk ? 'scripto-talk-revision-id' : 'scripto-revision-id',
+                        $isTalk ? 'site/scripto-talk-revision-id' : 'site/scripto-revision-id',
                         [
                             'action' => 'show',
                             'project-id' => $project->id(),
diff --git a/view/scripto/public-app/media/show-talk.phtml b/view/scripto/public-app/media/show-talk.phtml
index f7c6801b..83a2455b 100644
--- a/view/scripto/public-app/media/show-talk.phtml
+++ b/view/scripto/public-app/media/show-talk.phtml
@@ -38,7 +38,7 @@ $this->scripto()->postSubtitle(sprintf($this->translate('Original title: %s'), $
         <ul class="note-actions">
         <?php if ($userCanEdit): ?>
             <li><?php echo $sMedia->link($this->translate('Edit'), 'edit-talk'); ?></li>
-            <li><?php echo $this->hyperlink($this->translate('Browse notes history'), $this->url('scripto-talk-revision', ['action' => 'browse-talk'], true)); ?></li>
+            <li><?php echo $this->hyperlink($this->translate('Browse notes history'), $this->url('site/scripto-talk-revision', ['action' => 'browse-talk'], true)); ?></li>
         <?php endif; ?>
         </ul>
     </div>
diff --git a/view/scripto/public-app/revision/browse-talk.phtml b/view/scripto/public-app/revision/browse-talk.phtml
index 259e0252..1d80aaf8 100644
--- a/view/scripto/public-app/revision/browse-talk.phtml
+++ b/view/scripto/public-app/revision/browse-talk.phtml
@@ -33,10 +33,10 @@ $this->scripto()->postSubtitle($sMedia->link($media->displayTitle(), 'show-talk'
                             <?php echo sprintf(
                                 '%s | %s',
                                 $latestId !== $revision['revid']
-                                    ? $this->hyperlink($this->translate('cur'), $this->url('scripto-talk-revision-compare', ['action' => 'compare-talk', 'from-revision-id' => $revision['revid'], 'to-revision-id' => $latestId], true))
+                                    ? $this->hyperlink($this->translate('cur'), $this->url('site/scripto-talk-revision-compare', ['action' => 'compare-talk', 'from-revision-id' => $revision['revid'], 'to-revision-id' => $latestId], true))
                                     : $this->translate('cur'),
                                 $childRevision
-                                    ? $this->hyperlink($this->translate('prev'), $this->url('scripto-talk-revision-compare', ['action' => 'compare-talk', 'from-revision-id' => $childRevision['revid'], 'to-revision-id' => $revision['revid']], true))
+                                    ? $this->hyperlink($this->translate('prev'), $this->url('site/scripto-talk-revision-compare', ['action' => 'compare-talk', 'from-revision-id' => $childRevision['revid'], 'to-revision-id' => $revision['revid']], true))
                                     : $this->translate('prev')
                             ); ?>
                             </div>
@@ -56,7 +56,7 @@ $this->scripto()->postSubtitle($sMedia->link($media->displayTitle(), 'show-talk'
                     <td>
                         <?php echo $this->hyperlink(
                             $revision['timestamp']->format('G:i:s, j F Y'),
-                            $this->url('scripto-talk-revision-id', ['action' => 'show-talk', 'revision-id' => $revision['revid']], true)
+                            $this->url('site/scripto-talk-revision-id', ['action' => 'show-talk', 'revision-id' => $revision['revid']], true)
                         ); ?>
                         <?php if ($revision['revid'] === $sMedia->completedRevision()): ?>
                         <div class="green">This revision marked as completed.</div>
@@ -65,7 +65,7 @@ $this->scripto()->postSubtitle($sMedia->link($media->displayTitle(), 'show-talk'
                         <div class="green">This revision marked as approved.</div>
                         <?php endif; ?>
                     </td>
-                    <td><?php echo $this->hyperlink($revision['user'], $this->url('scripto-user-contributions', ['action' => 'contributions', 'user-id' => $revision['user']], true)); ?></td>
+                    <td><?php echo $this->hyperlink($revision['user'], $this->url('site/scripto-user-contributions', ['action' => 'contributions', 'user-id' => $revision['user']], true)); ?></td>
                     <td><?php
                     $sizeDiff = $childRevision ? $revision['size'] - $childRevision['size'] : 0;
                     echo sprintf(
diff --git a/view/scripto/public-app/revision/browse.phtml b/view/scripto/public-app/revision/browse.phtml
index 576d3a46..ddaecfff 100644
--- a/view/scripto/public-app/revision/browse.phtml
+++ b/view/scripto/public-app/revision/browse.phtml
@@ -32,10 +32,10 @@ $this->scripto()->postSubtitle($sMedia->link($media->displayTitle(), 'show-talk'
                             <?php echo sprintf(
                                 '%s | %s',
                                 $latestId !== $revision['revid']
-                                    ? $this->hyperlink($this->translate('cur'), $this->url('scripto-revision-compare', ['action' => 'compare', 'from-revision-id' => $revision['revid'], 'to-revision-id' => $latestId], true))
+                                    ? $this->hyperlink($this->translate('cur'), $this->url('site/scripto-revision-compare', ['action' => 'compare', 'from-revision-id' => $revision['revid'], 'to-revision-id' => $latestId], true))
                                     : $this->translate('cur'),
                                 $childRevision
-                                    ? $this->hyperlink($this->translate('prev'), $this->url('scripto-revision-compare', ['action' => 'compare', 'from-revision-id' => $childRevision['revid'], 'to-revision-id' => $revision['revid']], true))
+                                    ? $this->hyperlink($this->translate('prev'), $this->url('site/scripto-revision-compare', ['action' => 'compare', 'from-revision-id' => $childRevision['revid'], 'to-revision-id' => $revision['revid']], true))
                                     : $this->translate('prev')
                             ); ?>
                             </div>
@@ -55,7 +55,7 @@ $this->scripto()->postSubtitle($sMedia->link($media->displayTitle(), 'show-talk'
                     <td>
                         <?php echo $this->hyperlink(
                             $revision['timestamp']->format('G:i:s, j F Y'),
-                            $this->url('scripto-revision-id', ['action' => 'show', 'revision-id' => $revision['revid']], true)
+                            $this->url('site/scripto-revision-id', ['action' => 'show', 'revision-id' => $revision['revid']], true)
                         ); ?>
                         <?php if ($revision['revid'] === $sMedia->completedRevision()): ?>
                         <div class="green">This revision marked as completed.</div>
@@ -64,7 +64,7 @@ $this->scripto()->postSubtitle($sMedia->link($media->displayTitle(), 'show-talk'
                         <div class="green">This revision marked as approved.</div>
                         <?php endif; ?>
                     </td>
-                    <td><?php echo $this->hyperlink($revision['user'], $this->url('scripto-user-contributions', ['action' => 'contributions', 'user-id' => $revision['user']], true)); ?></td>
+                    <td><?php echo $this->hyperlink($revision['user'], $this->url('site/scripto-user-contributions', ['action' => 'contributions', 'user-id' => $revision['user']], true)); ?></td>
                     <td><?php
                     $sizeDiff = $childRevision ? $revision['size'] - $childRevision['size'] : 0;
                     echo sprintf(
diff --git a/view/scripto/public-app/revision/compare-talk.phtml b/view/scripto/public-app/revision/compare-talk.phtml
index 0c834b97..314d1fbf 100644
--- a/view/scripto/public-app/revision/compare-talk.phtml
+++ b/view/scripto/public-app/revision/compare-talk.phtml
@@ -3,7 +3,7 @@ $this->scripto()->postTitle(sprintf($this->translate('Compare note revisions: %s
 ?>
 <div class="resource-content">
     <div class="browse-controls">
-        <?php echo $this->hyperlink($this->translate('Return to revision history'), $this->url('scripto-talk-revision', ['action' => 'browse'], true)); ?>
+        <?php echo $this->hyperlink($this->translate('Return to revision history'), $this->url('site/scripto-talk-revision', ['action' => 'browse'], true)); ?>
         <?php echo $this->scripto()->compareRevisionsPagination(); ?>
     </div>
     <table id="compare-table">
@@ -16,20 +16,20 @@ $this->scripto()->postTitle(sprintf($this->translate('Compare note revisions: %s
         <thead>
             <tr>
                 <th colspan="2">
-                    <div class="revision-timestamp"><?php echo $this->hyperlink(sprintf($this->translate('Revision as of %s'), $fromRevision['timestamp']->format('G:i:s, j F Y')), $this->url('scripto-talk-revision-id', ['action' => 'show-talk', 'revision-id' => $fromRevision['revid']], true)); ?>
+                    <div class="revision-timestamp"><?php echo $this->hyperlink(sprintf($this->translate('Revision as of %s'), $fromRevision['timestamp']->format('G:i:s, j F Y')), $this->url('site/scripto-talk-revision-id', ['action' => 'show-talk', 'revision-id' => $fromRevision['revid']], true)); ?>
                     <?php echo sprintf(
                         $this->translate('by %s'),
-                        $this->hyperlink($fromRevision['user'], $this->url('scripto-user-contributions', ['action' => 'contributions', 'user-id' => $fromRevision['user']], true))
+                        $this->hyperlink($fromRevision['user'], $this->url('site/scripto-user-contributions', ['action' => 'contributions', 'user-id' => $fromRevision['user']], true))
                     ); ?></div>
                     <?php if ($fromRevision['parsedcomment']): ?>
                     <div class="parsed-comment"><?php echo strip_tags($fromRevision['parsedcomment']); ?></div>
                     <?php endif; ?>
                 </th>
                 <th colspan="2">
-                    <div class="revision-timestamp"><?php echo $this->hyperlink(sprintf($this->translate('Revision as of %s'), $toRevision['timestamp']->format('G:i:s, j F Y')), $this->url('scripto-talk-revision-id', ['action' => 'show-talk', 'revision-id' => $toRevision['revid']], true)); ?>
+                    <div class="revision-timestamp"><?php echo $this->hyperlink(sprintf($this->translate('Revision as of %s'), $toRevision['timestamp']->format('G:i:s, j F Y')), $this->url('site/scripto-talk-revision-id', ['action' => 'show-talk', 'revision-id' => $toRevision['revid']], true)); ?>
                     <?php echo sprintf(
                         $this->translate('by %s'),
-                        $this->hyperlink($toRevision['user'], $this->url('scripto-user-contributions', ['action' => 'contributions', 'user-id' => $toRevision['user']], true))
+                        $this->hyperlink($toRevision['user'], $this->url('site/scripto-user-contributions', ['action' => 'contributions', 'user-id' => $toRevision['user']], true))
                     ); ?></div>
                     <?php if ($toRevision['parsedcomment']): ?>
                     <div class="parsed-comment"><?php echo strip_tags($toRevision['parsedcomment']); ?></div>
diff --git a/view/scripto/public-app/revision/compare.phtml b/view/scripto/public-app/revision/compare.phtml
index 6654b5ab..b747d644 100644
--- a/view/scripto/public-app/revision/compare.phtml
+++ b/view/scripto/public-app/revision/compare.phtml
@@ -3,7 +3,7 @@ $this->scripto()->postTitle(sprintf($this->translate('Compare revisions: %s'), $
 ?>
 <div class="resource-content">
     <div class="browse-controls">
-        <?php echo $this->hyperlink($this->translate('Return to revision history'), $this->url('scripto-revision', ['action' => 'browse'], true)); ?>
+        <?php echo $this->hyperlink($this->translate('Return to revision history'), $this->url('site/scripto-revision', ['action' => 'browse'], true)); ?>
         <?php echo $this->scripto()->compareRevisionsPagination(); ?>
     </div>
     <table id="compare-table">
@@ -16,20 +16,20 @@ $this->scripto()->postTitle(sprintf($this->translate('Compare revisions: %s'), $
         <thead>
             <tr>
                 <th colspan="2">
-                    <div class="revision-timestamp"><?php echo $this->hyperlink(sprintf($this->translate('Revision as of %s'), $fromRevision['timestamp']->format('G:i:s, j F Y')), $this->url('scripto-revision-id', ['action' => 'show', 'revision-id' => $fromRevision['revid']], true)); ?>
+                    <div class="revision-timestamp"><?php echo $this->hyperlink(sprintf($this->translate('Revision as of %s'), $fromRevision['timestamp']->format('G:i:s, j F Y')), $this->url('site/scripto-revision-id', ['action' => 'show', 'revision-id' => $fromRevision['revid']], true)); ?>
                     <?php echo sprintf(
                         $this->translate('by %s'),
-                        $this->hyperlink($fromRevision['user'], $this->url('scripto-user-contributions', ['action' => 'contributions', 'user-id' => $fromRevision['user']], true))
+                        $this->hyperlink($fromRevision['user'], $this->url('site/scripto-user-contributions', ['action' => 'contributions', 'user-id' => $fromRevision['user']], true))
                     ); ?></div>
                     <?php if ($fromRevision['parsedcomment']): ?>
                     <div class="parsed-comment"><?php echo strip_tags($fromRevision['parsedcomment']); ?></div>
                     <?php endif; ?>
                 </th>
                 <th colspan="2">
-                    <div class="revision-timestamp"><?php echo $this->hyperlink(sprintf($this->translate('Revision as of %s'), $toRevision['timestamp']->format('G:i:s, j F Y')), $this->url('scripto-revision-id', ['action' => 'show', 'revision-id' => $toRevision['revid']], true)); ?>
+                    <div class="revision-timestamp"><?php echo $this->hyperlink(sprintf($this->translate('Revision as of %s'), $toRevision['timestamp']->format('G:i:s, j F Y')), $this->url('site/scripto-revision-id', ['action' => 'show', 'revision-id' => $toRevision['revid']], true)); ?>
                     <?php echo sprintf(
                         $this->translate('by %s'),
-                        $this->hyperlink($toRevision['user'], $this->url('scripto-user-contributions', ['action' => 'contributions', 'user-id' => $toRevision['user']], true))
+                        $this->hyperlink($toRevision['user'], $this->url('site/scripto-user-contributions', ['action' => 'contributions', 'user-id' => $toRevision['user']], true))
                     ); ?></div>
                     <?php if ($toRevision['parsedcomment']): ?>
                     <div class="parsed-comment"><?php echo strip_tags($toRevision['parsedcomment']); ?></div>
diff --git a/view/scripto/public-app/revision/show-talk.phtml b/view/scripto/public-app/revision/show-talk.phtml
index bd766456..ee2bae04 100644
--- a/view/scripto/public-app/revision/show-talk.phtml
+++ b/view/scripto/public-app/revision/show-talk.phtml
@@ -3,12 +3,12 @@ $this->scripto()->postTitle(sprintf($this->translate('Notes revision: %s'), $sMe
 $this->scripto()->postSubtitle(sprintf(
     $this->translate('Revision as of %s by %s'),
     $revision['timestamp']->format('G:i:s, j F Y'),
-    $this->hyperlink($revision['user'], $this->url('scripto-user-contributions', ['action' => 'contributions', 'user-id' => $revision['user']], true))
+    $this->hyperlink($revision['user'], $this->url('site/scripto-user-contributions', ['action' => 'contributions', 'user-id' => $revision['user']], true))
 ));
 ?>
 <div class="resource-content">
     <div class="browse-controls">
-        <?php echo $this->hyperlink($this->translate('Return to revision history'), $this->url('scripto-talk-revision', ['action' => 'browse'], true)); ?>
+        <?php echo $this->hyperlink($this->translate('Return to revision history'), $this->url('site/scripto-talk-revision', ['action' => 'browse'], true)); ?>
     </div>
     <div class="media wikitext">
         <h3><?php echo $this->translate('Wikitext'); ?></h3>
diff --git a/view/scripto/public-app/revision/show.phtml b/view/scripto/public-app/revision/show.phtml
index c6d7cad4..35120018 100644
--- a/view/scripto/public-app/revision/show.phtml
+++ b/view/scripto/public-app/revision/show.phtml
@@ -3,12 +3,12 @@ $this->scripto()->postTitle(sprintf($this->translate('Revision: %s'), $sMedia->l
 $this->scripto()->postSubtitle(sprintf(
     $this->translate('Revision as of %s by %s'),
     $revision['timestamp']->format('G:i:s, j F Y'),
-    $this->hyperlink($revision['user'], $this->url('scripto-user-contributions', ['action' => 'contributions', 'user-id' => $revision['user']], true))
+    $this->hyperlink($revision['user'], $this->url('site/scripto-user-contributions', ['action' => 'contributions', 'user-id' => $revision['user']], true))
 ));
 ?>
 <div class="resource-content">
     <div class="browse-controls">
-        <?php echo $this->hyperlink($this->translate('Return to revision history'), $this->url('scripto-revision', ['action' => 'browse'], true)); ?>
+        <?php echo $this->hyperlink($this->translate('Return to revision history'), $this->url('site/scripto-revision', ['action' => 'browse'], true)); ?>
     </div>
     <div class="media wikitext">
         <h3><?php echo $this->translate('Wikitext'); ?></h3>
diff --git a/view/scripto/public-app/user/contributions.phtml b/view/scripto/public-app/user/contributions.phtml
index dbee758b..3b42db82 100644
--- a/view/scripto/public-app/user/contributions.phtml
+++ b/view/scripto/public-app/user/contributions.phtml
@@ -35,7 +35,7 @@ $this->scripto()->postTitle(sprintf($this->translate('Contributions by %s'), $us
                 <td class="revision">
                     <?php echo $sMedia
                     ? $this->hyperlink($date, $this->url(
-                        $isTalk ? 'scripto-talk-revision-id' : 'scripto-revision-id',
+                        $isTalk ? 'site/scripto-talk-revision-id' : 'site/scripto-revision-id',
                         [
                             'action' => 'show',
                             'project-id' => $project->id(),
@@ -54,7 +54,7 @@ $this->scripto()->postTitle(sprintf($this->translate('Contributions by %s'), $us
                         '(%s | %s)',
                         $userCon['parentid']
                             ? $this->hyperlink($this->translate('diff'), $this->url(
-                                $isTalk ? 'scripto-talk-revision-compare' : 'scripto-revision-compare',
+                                $isTalk ? 'site/scripto-talk-revision-compare' : 'site/scripto-revision-compare',
                                 [
                                     'action' => 'compare',
                                     'project-id' => $project->id(),
@@ -67,7 +67,7 @@ $this->scripto()->postTitle(sprintf($this->translate('Contributions by %s'), $us
                             ))
                             : $this->translate('diff'),
                         $this->hyperlink($this->translate('hist'), $this->url(
-                            $isTalk ? 'scripto-talk-revision' : 'scripto-revision',
+                            $isTalk ? 'site/scripto-talk-revision' : 'site/scripto-revision',
                             [
                                 'action' => 'browse',
                                 'project-id' => $project->id(),
diff --git a/view/scripto/public-app/user/watchlist.phtml b/view/scripto/public-app/user/watchlist.phtml
index 0cf00728..4d2abe4d 100644
--- a/view/scripto/public-app/user/watchlist.phtml
+++ b/view/scripto/public-app/user/watchlist.phtml
@@ -45,7 +45,7 @@ $this->scripto()->postTitle($this->translate('Your watchlist'));
                 <td>
                     <?php echo $sMedia
                     ? $this->hyperlink($date, $this->url(
-                        $isTalk ? 'scripto-talk-revision-id' : 'scripto-revision-id',
+                        $isTalk ? 'site/scripto-talk-revision-id' : 'site/scripto-revision-id',
                         [
                             'action' => 'show',
                             'project-id' => $project->id(),
@@ -63,7 +63,7 @@ $this->scripto()->postTitle($this->translate('Your watchlist'));
                         '(%s | %s)',
                         $page['old_revid']
                             ? $this->hyperlink($this->translate('diff'), $this->url(
-                                $isTalk ? 'scripto-talk-revision-compare' : 'scripto-revision-compare',
+                                $isTalk ? 'site/scripto-talk-revision-compare' : 'site/scripto-revision-compare',
                                 [
                                     'action' => 'compare',
                                     'project-id' => $project->id(),
@@ -76,7 +76,7 @@ $this->scripto()->postTitle($this->translate('Your watchlist'));
                             ))
                             : $this->translate('diff'),
                         $this->hyperlink($this->translate('hist'), $this->url(
-                            $isTalk ? 'scripto-talk-revision' : 'scripto-revision',
+                            $isTalk ? 'site/scripto-talk-revision' : 'site/scripto-revision',
                             [
                                 'action' => 'browse',
                                 'project-id' => $project->id(),
@@ -98,7 +98,7 @@ $this->scripto()->postTitle($this->translate('Your watchlist'));
                         number_format($sizeDiff)
                     )
                 ); ?></td>
-                <td><?php echo $this->hyperlink($page['user'], $this->url('scripto-user-contributions', ['action' => 'contributions', 'user-id' => $page['user']], true)); ?></td>
+                <td><?php echo $this->hyperlink($page['user'], $this->url('site/scripto-user-contributions', ['action' => 'contributions', 'user-id' => $page['user']], true)); ?></td>
                 <td><i><?php echo strip_tags($page['parsedcomment']); ?></i></td>
             </tr>
         <?php endforeach; ?>