From 1353929a7dbd3f2e897fa7d3ab88e959ca573f9f Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 28 May 2016 13:41:54 -0400
Subject: Rename controllers

---
 app/Template/action/index.php                      |  8 +--
 app/Template/action/remove.php                     |  6 +--
 app/Template/action_creation/create.php            |  6 +--
 app/Template/action_creation/event.php             |  6 +--
 app/Template/action_creation/params.php            |  4 +-
 app/Template/action_project/project.php            | 20 -------
 app/Template/activity/project.php                  |  2 +-
 app/Template/analytic/burndown.php                 |  2 +-
 app/Template/analytic/cfd.php                      |  2 +-
 app/Template/analytic/layout.php                   |  2 +-
 app/Template/analytic/lead_cycle_time.php          |  2 +-
 app/Template/analytic/sidebar.php                  | 32 +++++------
 app/Template/auth/index.php                        |  4 +-
 app/Template/board/table_column.php                |  2 +-
 app/Template/board/table_swimlane.php              |  2 +-
 app/Template/board/task_footer.php                 | 16 +++---
 app/Template/board/tooltip_files.php               |  4 +-
 .../board_popover/close_all_tasks_column.php       |  4 +-
 app/Template/calendar/show.php                     |  8 +--
 app/Template/category/edit.php                     |  6 +--
 app/Template/category/index.php                    |  8 +--
 app/Template/category/remove.php                   |  6 +--
 app/Template/column/create.php                     |  4 +-
 app/Template/column/edit.php                       |  6 +--
 app/Template/column/index.php                      |  8 +--
 app/Template/column/remove.php                     |  6 +--
 app/Template/comment/create.php                    |  2 +-
 app/Template/comment/edit.php                      |  2 +-
 app/Template/comment/remove.php                    |  2 +-
 app/Template/comment/show.php                      |  4 +-
 app/Template/comments/create.php                   |  2 +-
 app/Template/comments/show.php                     |  4 +-
 app/Template/config/sidebar.php                    |  4 +-
 app/Template/custom_filter/add.php                 |  2 +-
 app/Template/custom_filter/edit.php                |  4 +-
 app/Template/custom_filter/index.php               |  6 +--
 app/Template/custom_filter/remove.php              |  4 +-
 app/Template/dashboard/calendar.php                |  4 +-
 app/Template/dashboard/layout.php                  |  6 +--
 app/Template/dashboard/projects.php                |  4 +-
 app/Template/export/sidebar.php                    | 10 ++--
 app/Template/file_viewer/show.php                  |  4 +-
 app/Template/gantt/projects.php                    |  4 +-
 app/Template/header.php                            | 10 ++--
 app/Template/layout.php                            |  2 +-
 app/Template/link/create.php                       |  4 +-
 app/Template/link/edit.php                         |  4 +-
 app/Template/link/index.php                        |  6 +--
 app/Template/link/remove.php                       |  6 +--
 app/Template/listing/show.php                      | 62 ----------------------
 app/Template/password_reset/change.php             |  4 +-
 app/Template/password_reset/create.php             |  2 +-
 app/Template/password_reset/email.php              |  4 +-
 app/Template/project/dropdown.php                  | 10 ++--
 app/Template/project/layout.php                    |  4 +-
 app/Template/project/sidebar.php                   | 20 +++----
 app/Template/project_action_duplication/show.php   | 19 +++++++
 app/Template/project_creation/create.php           |  2 +-
 app/Template/project_edit/general.php              |  2 +-
 app/Template/project_file/create.php               |  6 +--
 app/Template/project_file/remove.php               |  6 +--
 app/Template/project_header/dropdown.php           | 14 ++---
 app/Template/project_header/views.php              | 18 +++----
 app/Template/project_list/show.php                 | 10 ++--
 app/Template/project_overview/attachments.php      |  4 +-
 app/Template/project_overview/files.php            |  8 +--
 app/Template/project_overview/images.php           |  8 +--
 app/Template/project_overview/show.php             |  2 +-
 app/Template/project_user/layout.php               | 27 ----------
 app/Template/project_user/roles.php                | 33 ------------
 app/Template/project_user/sidebar.php              | 30 -----------
 app/Template/project_user/tasks.php                | 46 ----------------
 app/Template/project_user/tooltip_users.php        | 16 ------
 app/Template/project_user_overview/layout.php      | 27 ++++++++++
 app/Template/project_user_overview/roles.php       | 33 ++++++++++++
 app/Template/project_user_overview/sidebar.php     | 30 +++++++++++
 app/Template/project_user_overview/tasks.php       | 46 ++++++++++++++++
 .../project_user_overview/tooltip_users.php        | 16 ++++++
 app/Template/project_view/show.php                 |  2 +-
 app/Template/swimlane/create.php                   |  4 +-
 app/Template/swimlane/edit.php                     |  6 +--
 app/Template/swimlane/edit_default.php             |  4 +-
 app/Template/swimlane/index.php                    |  2 +-
 app/Template/swimlane/remove.php                   |  6 +--
 app/Template/swimlane/table.php                    | 16 +++---
 app/Template/task/dropdown.php                     | 10 ++--
 app/Template/task/layout.php                       |  4 +-
 app/Template/task/show.php                         |  2 +-
 app/Template/task/sidebar.php                      | 18 +++----
 app/Template/task_duplication/copy.php             |  4 +-
 app/Template/task_duplication/duplicate.php        |  2 +-
 app/Template/task_duplication/move.php             |  4 +-
 app/Template/task_external_link/create.php         |  6 +--
 app/Template/task_external_link/edit.php           |  6 +--
 app/Template/task_external_link/find.php           |  2 +-
 app/Template/task_external_link/remove.php         |  6 +--
 app/Template/task_external_link/table.php          |  8 +--
 app/Template/task_file/create.php                  |  2 +-
 app/Template/task_file/files.php                   | 10 ++--
 app/Template/task_file/images.php                  | 10 ++--
 app/Template/task_file/remove.php                  |  2 +-
 app/Template/task_file/screenshot.php              |  2 +-
 app/Template/task_list/show.php                    | 62 ++++++++++++++++++++++
 103 files changed, 493 insertions(+), 492 deletions(-)
 delete mode 100644 app/Template/action_project/project.php
 delete mode 100644 app/Template/listing/show.php
 create mode 100644 app/Template/project_action_duplication/show.php
 delete mode 100644 app/Template/project_user/layout.php
 delete mode 100644 app/Template/project_user/roles.php
 delete mode 100644 app/Template/project_user/sidebar.php
 delete mode 100644 app/Template/project_user/tasks.php
 delete mode 100644 app/Template/project_user/tooltip_users.php
 create mode 100644 app/Template/project_user_overview/layout.php
 create mode 100644 app/Template/project_user_overview/roles.php
 create mode 100644 app/Template/project_user_overview/sidebar.php
 create mode 100644 app/Template/project_user_overview/tasks.php
 create mode 100644 app/Template/project_user_overview/tooltip_users.php
 create mode 100644 app/Template/task_list/show.php

(limited to 'app/Template')

diff --git a/app/Template/action/index.php b/app/Template/action/index.php
index 63d63887..0a94e4f0 100644
--- a/app/Template/action/index.php
+++ b/app/Template/action/index.php
@@ -3,11 +3,11 @@
     <ul>
         <li>
             <i class="fa fa-plus fa-fw"></i>
-            <?= $this->url->link(t('Add a new action'), 'ActionCreation', 'create', array('project_id' => $project['id']), false, 'popover') ?>
+            <?= $this->url->link(t('Add a new action'), 'ActionCreationController', 'create', array('project_id' => $project['id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-copy fa-fw"></i>
-            <?= $this->url->link(t('Import from another project'), 'ActionProject', 'project', array('project_id' => $project['id']), false, 'popover') ?>
+            <?= $this->url->link(t('Import from another project'), 'ProjectActionDuplicationController', 'show', array('project_id' => $project['id']), false, 'popover') ?>
         </li>
     </ul>
 </div>
@@ -63,9 +63,9 @@
                 </ul>
             </td>
             <td>
-                <?= $this->url->link(t('Remove'), 'action', 'confirm', array('project_id' => $project['id'], 'action_id' => $action['id']), false, 'popover') ?>
+                <?= $this->url->link(t('Remove'), 'ActionController', 'confirm', array('project_id' => $project['id'], 'action_id' => $action['id']), false, 'popover') ?>
             </td>
         </tr>
         <?php endforeach ?>
     </table>
-<?php endif ?>
\ No newline at end of file
+<?php endif ?>
diff --git a/app/Template/action/remove.php b/app/Template/action/remove.php
index 070a7918..384bec7a 100644
--- a/app/Template/action/remove.php
+++ b/app/Template/action/remove.php
@@ -8,8 +8,8 @@
     </p>
 
     <div class="form-actions">
-        <?= $this->url->link(t('Yes'), 'action', 'remove', array('project_id' => $project['id'], 'action_id' => $action['id']), true, 'btn btn-red') ?>
+        <?= $this->url->link(t('Yes'), 'ActionController', 'remove', array('project_id' => $project['id'], 'action_id' => $action['id']), true, 'btn btn-red') ?>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'action', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'ActionController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/Template/action_creation/create.php b/app/Template/action_creation/create.php
index bccb19b3..c0d2880e 100644
--- a/app/Template/action_creation/create.php
+++ b/app/Template/action_creation/create.php
@@ -1,7 +1,7 @@
 <div class="page-header">
     <h2><?= t('Add an action') ?></h2>
 </div>
-<form class="popover-form" method="post" action="<?= $this->url->href('ActionCreation', 'event', array('project_id' => $project['id'])) ?>">
+<form class="popover-form" method="post" action="<?= $this->url->href('ActionCreationController', 'event', array('project_id' => $project['id'])) ?>">
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('project_id', $values) ?>
 
@@ -11,6 +11,6 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Next step') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'Action', 'index', array(), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'ActionController', 'index', array(), false, 'close-popover') ?>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/Template/action_creation/event.php b/app/Template/action_creation/event.php
index e7e5aaf9..cdf00310 100644
--- a/app/Template/action_creation/event.php
+++ b/app/Template/action_creation/event.php
@@ -2,7 +2,7 @@
     <h2><?= t('Choose an event') ?></h2>
 </div>
 
-<form class="popover-form" method="post" action="<?= $this->url->href('ActionCreation', 'params', array('project_id' => $project['id'])) ?>">
+<form class="popover-form" method="post" action="<?= $this->url->href('ActionCreationController', 'params', array('project_id' => $project['id'])) ?>">
 
     <?= $this->form->csrf() ?>
 
@@ -22,6 +22,6 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Next step') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'action', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'ActionController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/Template/action_creation/params.php b/app/Template/action_creation/params.php
index 46ca52a4..fa892177 100644
--- a/app/Template/action_creation/params.php
+++ b/app/Template/action_creation/params.php
@@ -2,7 +2,7 @@
     <h2><?= t('Define action parameters') ?></h2>
 </div>
 
-<form class="popover-form" method="post" action="<?= $this->url->href('ActionCreation', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
+<form class="popover-form" method="post" action="<?= $this->url->href('ActionCreationController', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
@@ -50,6 +50,6 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'action', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'ActionController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
 </form>
diff --git a/app/Template/action_project/project.php b/app/Template/action_project/project.php
deleted file mode 100644
index 226f3b19..00000000
--- a/app/Template/action_project/project.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Import actions from another project') ?></h2>
-</div>
-<?php if (empty($projects_list)): ?>
-    <p class="alert"><?= t('There is no available project.') ?></p>
-<?php else: ?>
-    <form class="popover-form" method="post" action="<?= $this->url->href('ActionProject', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
-
-        <?= $this->form->csrf() ?>
-
-        <?= $this->form->label(t('Create from another project'), 'src_project_id') ?>
-        <?= $this->form->select('src_project_id', $projects_list) ?>
-
-        <div class="form-actions">
-            <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
-            <?= t('or') ?>
-            <?= $this->url->link(t('cancel'), 'Action', 'index', array(), false, 'close-popover') ?>
-        </div>
-    </form>
-<?php endif ?>
\ No newline at end of file
diff --git a/app/Template/activity/project.php b/app/Template/activity/project.php
index 70235cfc..ce1c8c0f 100644
--- a/app/Template/activity/project.php
+++ b/app/Template/activity/project.php
@@ -1,5 +1,5 @@
 <section id="main">
-    <?= $this->projectHeader->render($project, 'Analytic', $this->app->getRouterAction()) ?>
+    <?= $this->projectHeader->render($project, 'AnalyticController', $this->app->getRouterAction()) ?>
 
     <?php if ($project['is_public']): ?>
     <div class="menu-inline pull-right">
diff --git a/app/Template/analytic/burndown.php b/app/Template/analytic/burndown.php
index ed6c8aeb..e979595d 100644
--- a/app/Template/analytic/burndown.php
+++ b/app/Template/analytic/burndown.php
@@ -12,7 +12,7 @@
 
 <hr/>
 
-<form method="post" class="form-inline" action="<?= $this->url->href('analytic', 'burndown', array('project_id' => $project['id'])) ?>" autocomplete="off">
+<form method="post" class="form-inline" action="<?= $this->url->href('AnalyticController', 'burndown', array('project_id' => $project['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
diff --git a/app/Template/analytic/cfd.php b/app/Template/analytic/cfd.php
index ee259c70..8dfb5b00 100644
--- a/app/Template/analytic/cfd.php
+++ b/app/Template/analytic/cfd.php
@@ -12,7 +12,7 @@
 
 <hr/>
 
-<form method="post" class="form-inline" action="<?= $this->url->href('analytic', 'cfd', array('project_id' => $project['id'])) ?>" autocomplete="off">
+<form method="post" class="form-inline" action="<?= $this->url->href('AnalyticController', 'cfd', array('project_id' => $project['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
diff --git a/app/Template/analytic/layout.php b/app/Template/analytic/layout.php
index e9b9db61..e3c6099f 100644
--- a/app/Template/analytic/layout.php
+++ b/app/Template/analytic/layout.php
@@ -1,5 +1,5 @@
 <section id="main">
-    <?= $this->projectHeader->render($project, 'Listing', 'show') ?>
+    <?= $this->projectHeader->render($project, 'TaskListController', 'show') ?>
     <section class="sidebar-container">
         <?= $this->render($sidebar_template, array('project' => $project)) ?>
 
diff --git a/app/Template/analytic/lead_cycle_time.php b/app/Template/analytic/lead_cycle_time.php
index 82ffe534..2dccc136 100644
--- a/app/Template/analytic/lead_cycle_time.php
+++ b/app/Template/analytic/lead_cycle_time.php
@@ -16,7 +16,7 @@
 
         <div id="chart" data-metrics='<?= json_encode($metrics, JSON_HEX_APOS) ?>' data-label-cycle="<?= t('Cycle Time') ?>" data-label-lead="<?= t('Lead Time') ?>"></div>
 
-        <form method="post" class="form-inline" action="<?= $this->url->href('analytic', 'leadAndCycleTime', array('project_id' => $project['id'])) ?>" autocomplete="off">
+        <form method="post" class="form-inline" action="<?= $this->url->href('AnalyticController', 'leadAndCycleTime', array('project_id' => $project['id'])) ?>" autocomplete="off">
 
             <?= $this->form->csrf() ?>
 
diff --git a/app/Template/analytic/sidebar.php b/app/Template/analytic/sidebar.php
index 76289b9f..de3dccf8 100644
--- a/app/Template/analytic/sidebar.php
+++ b/app/Template/analytic/sidebar.php
@@ -1,29 +1,29 @@
 <div class="sidebar">
     <h2><?= t('Reportings') ?></h2>
     <ul>
-        <li <?= $this->app->checkMenuSelection('analytic', 'tasks') ?>>
-            <?= $this->url->link(t('Task distribution'), 'analytic', 'tasks', array('project_id' => $project['id'])) ?>
+        <li <?= $this->app->checkMenuSelection('AnalyticController', 'tasks') ?>>
+            <?= $this->url->link(t('Task distribution'), 'AnalyticController', 'tasks', array('project_id' => $project['id'])) ?>
         </li>
-        <li <?= $this->app->checkMenuSelection('analytic', 'users') ?>>
-            <?= $this->url->link(t('User repartition'), 'analytic', 'users', array('project_id' => $project['id'])) ?>
+        <li <?= $this->app->checkMenuSelection('AnalyticController', 'users') ?>>
+            <?= $this->url->link(t('User repartition'), 'AnalyticController', 'users', array('project_id' => $project['id'])) ?>
         </li>
-        <li <?= $this->app->checkMenuSelection('analytic', 'cfd') ?>>
-            <?= $this->url->link(t('Cumulative flow diagram'), 'analytic', 'cfd', array('project_id' => $project['id'])) ?>
+        <li <?= $this->app->checkMenuSelection('AnalyticController', 'cfd') ?>>
+            <?= $this->url->link(t('Cumulative flow diagram'), 'AnalyticController', 'cfd', array('project_id' => $project['id'])) ?>
         </li>
-        <li <?= $this->app->checkMenuSelection('analytic', 'burndown') ?>>
-            <?= $this->url->link(t('Burndown chart'), 'analytic', 'burndown', array('project_id' => $project['id'])) ?>
+        <li <?= $this->app->checkMenuSelection('AnalyticController', 'burndown') ?>>
+            <?= $this->url->link(t('Burndown chart'), 'AnalyticController', 'burndown', array('project_id' => $project['id'])) ?>
         </li>
-        <li <?= $this->app->checkMenuSelection('analytic', 'averageTimeByColumn') ?>>
-            <?= $this->url->link(t('Average time into each column'), 'analytic', 'averageTimeByColumn', array('project_id' => $project['id'])) ?>
+        <li <?= $this->app->checkMenuSelection('AnalyticController', 'averageTimeByColumn') ?>>
+            <?= $this->url->link(t('Average time into each column'), 'AnalyticController', 'averageTimeByColumn', array('project_id' => $project['id'])) ?>
         </li>
-        <li <?= $this->app->checkMenuSelection('analytic', 'leadAndCycleTime') ?>>
-            <?= $this->url->link(t('Lead and cycle time'), 'analytic', 'leadAndCycleTime', array('project_id' => $project['id'])) ?>
+        <li <?= $this->app->checkMenuSelection('AnalyticController', 'leadAndCycleTime') ?>>
+            <?= $this->url->link(t('Lead and cycle time'), 'AnalyticController', 'leadAndCycleTime', array('project_id' => $project['id'])) ?>
         </li>
-        <li <?= $this->app->checkMenuSelection('analytic', 'compareHours') ?>>
-            <?= $this->url->link(t('Estimated vs actual time'), 'analytic', 'compareHours', array('project_id' => $project['id'])) ?>
+        <li <?= $this->app->checkMenuSelection('AnalyticController', 'compareHours') ?>>
+            <?= $this->url->link(t('Estimated vs actual time'), 'AnalyticController', 'compareHours', array('project_id' => $project['id'])) ?>
         </li>
-        
+
         <?= $this->hook->render('template:analytic:sidebar', array('project' => $project)) ?>
-        
+
     </ul>
 </div>
diff --git a/app/Template/auth/index.php b/app/Template/auth/index.php
index 0f5129bd..45bbdb8e 100644
--- a/app/Template/auth/index.php
+++ b/app/Template/auth/index.php
@@ -7,7 +7,7 @@
     <?php endif ?>
 
     <?php if (! HIDE_LOGIN_FORM): ?>
-    <form method="post" action="<?= $this->url->href('auth', 'check') ?>">
+    <form method="post" action="<?= $this->url->href('AuthController', 'check') ?>">
 
         <?= $this->form->csrf() ?>
 
@@ -32,7 +32,7 @@
         </div>
         <?php if ($this->app->config('password_reset') == 1): ?>
             <div class="reset-password">
-                <?= $this->url->link(t('Forgot password?'), 'PasswordReset', 'create') ?>
+                <?= $this->url->link(t('Forgot password?'), 'PasswordResetController', 'create') ?>
             </div>
         <?php endif ?>
     </form>
diff --git a/app/Template/board/table_column.php b/app/Template/board/table_column.php
index eced52dc..f7a9f6ad 100644
--- a/app/Template/board/table_column.php
+++ b/app/Template/board/table_column.php
@@ -43,7 +43,7 @@
                                 <?php if ($column['nb_tasks'] > 0): ?>
                                     <li>
                                         <i class="fa fa-close fa-fw"></i>
-                                        <?= $this->url->link(t('Close all tasks of this column'), 'BoardPopover', 'confirmCloseColumnTasks', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?>
+                                        <?= $this->url->link(t('Close all tasks of this column'), 'BoardPopoverController', 'confirmCloseColumnTasks', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?>
                                     </li>
                                 <?php endif ?>
                             <?php endif ?>
diff --git a/app/Template/board/table_swimlane.php b/app/Template/board/table_swimlane.php
index 349b9acb..c5937e01 100644
--- a/app/Template/board/table_swimlane.php
+++ b/app/Template/board/table_swimlane.php
@@ -14,7 +14,7 @@
             <span
                 title="<?= t('Description') ?>"
                 class="tooltip"
-                data-href="<?= $this->url->href('BoardTooltip', 'swimlane', array('swimlane_id' => $swimlane['id'], 'project_id' => $project['id'])) ?>">
+                data-href="<?= $this->url->href('BoardTooltipController', 'swimlane', array('swimlane_id' => $swimlane['id'], 'project_id' => $project['id'])) ?>">
                 <i class="fa fa-info-circle"></i>
             </span>
         <?php endif ?>
diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php
index 67cae77a..8cf3e709 100644
--- a/app/Template/board/task_footer.php
+++ b/app/Template/board/task_footer.php
@@ -34,35 +34,35 @@
     <?php endif ?>
 
     <?php if ($task['recurrence_status'] == \Kanboard\Model\Task::RECURRING_STATUS_PENDING): ?>
-        <span title="<?= t('Recurrence') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltip', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-refresh fa-rotate-90"></i></span>
+        <span title="<?= t('Recurrence') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-refresh fa-rotate-90"></i></span>
     <?php endif ?>
 
     <?php if ($task['recurrence_status'] == \Kanboard\Model\Task::RECURRING_STATUS_PROCESSED): ?>
-        <span title="<?= t('Recurrence') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltip', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-refresh fa-rotate-90 fa-inverse"></i></span>
+        <span title="<?= t('Recurrence') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-refresh fa-rotate-90 fa-inverse"></i></span>
     <?php endif ?>
 
     <?php if (! empty($task['nb_links'])): ?>
-        <span title="<?= t('Links') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltip', 'tasklinks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-code-fork fa-fw"></i><?= $task['nb_links'] ?></span>
+        <span title="<?= t('Links') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'tasklinks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-code-fork fa-fw"></i><?= $task['nb_links'] ?></span>
     <?php endif ?>
 
     <?php if (! empty($task['nb_external_links'])): ?>
-        <span title="<?= t('External links') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltip', 'externallinks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-external-link fa-fw"></i><?= $task['nb_external_links'] ?></span>
+        <span title="<?= t('External links') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'externallinks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-external-link fa-fw"></i><?= $task['nb_external_links'] ?></span>
     <?php endif ?>
 
     <?php if (! empty($task['nb_subtasks'])): ?>
-		<span title="<?= t('Sub-Tasks') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltip', 'subtasks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-bars"></i>&nbsp;<?= round($task['nb_completed_subtasks']/$task['nb_subtasks']*100, 0).'%' ?></span>
+		<span title="<?= t('Sub-Tasks') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'subtasks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-bars"></i>&nbsp;<?= round($task['nb_completed_subtasks']/$task['nb_subtasks']*100, 0).'%' ?></span>
     <?php endif ?>
 
     <?php if (! empty($task['nb_files'])): ?>
-        <span title="<?= t('Attachments') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltip', 'attachments', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-paperclip"></i>&nbsp;<?= $task['nb_files'] ?></span>
+        <span title="<?= t('Attachments') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'attachments', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-paperclip"></i>&nbsp;<?= $task['nb_files'] ?></span>
     <?php endif ?>
 
     <?php if (! empty($task['nb_comments'])): ?>
-        <span title="<?= $task['nb_comments'] == 1 ? t('%d comment', $task['nb_comments']) : t('%d comments', $task['nb_comments']) ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltip', 'comments', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-comment-o"></i>&nbsp;<?= $task['nb_comments'] ?></span>
+        <span title="<?= $task['nb_comments'] == 1 ? t('%d comment', $task['nb_comments']) : t('%d comments', $task['nb_comments']) ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'comments', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-comment-o"></i>&nbsp;<?= $task['nb_comments'] ?></span>
     <?php endif ?>
 
     <?php if (! empty($task['description'])): ?>
-        <span title="<?= t('Description') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltip', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
+        <span title="<?= t('Description') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
             <i class="fa fa-file-text-o"></i>
         </span>
     <?php endif ?>
diff --git a/app/Template/board/tooltip_files.php b/app/Template/board/tooltip_files.php
index 5ade5b5b..6f9e2640 100644
--- a/app/Template/board/tooltip_files.php
+++ b/app/Template/board/tooltip_files.php
@@ -9,9 +9,9 @@
         </tr>
         <tr>
             <td>
-                <i class="fa fa-download fa-fw"></i><?= $this->url->link(t('download'), 'FileViewer', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
+                <i class="fa fa-download fa-fw"></i><?= $this->url->link(t('download'), 'FileViewerController', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
                 <?php if ($file['is_image'] == 1): ?>
-                    &nbsp;<i class="fa fa-eye"></i> <?= $this->url->link(t('open file'), 'FileViewer', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
+                    &nbsp;<i class="fa fa-eye"></i> <?= $this->url->link(t('open file'), 'FileViewerController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
                 <?php endif ?>
             </td>
         </tr>
diff --git a/app/Template/board_popover/close_all_tasks_column.php b/app/Template/board_popover/close_all_tasks_column.php
index 5090f499..bd167786 100644
--- a/app/Template/board_popover/close_all_tasks_column.php
+++ b/app/Template/board_popover/close_all_tasks_column.php
@@ -2,7 +2,7 @@
     <div class="page-header">
         <h2><?= t('Do you really want to close all tasks of this column?') ?></h2>
     </div>
-    <form method="post" action="<?= $this->url->href('BoardPopover', 'closeColumnTasks', array('project_id' => $project['id'])) ?>">
+    <form method="post" action="<?= $this->url->href('BoardPopoverController', 'closeColumnTasks', array('project_id' => $project['id'])) ?>">
         <?= $this->form->csrf() ?>
         <?= $this->form->hidden('column_id', $values) ?>
         <?= $this->form->hidden('swimlane_id', $values) ?>
@@ -15,4 +15,4 @@
             <?= $this->url->link(t('cancel'), 'board', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
         </div>
     </form>
-</section>
\ No newline at end of file
+</section>
diff --git a/app/Template/calendar/show.php b/app/Template/calendar/show.php
index f00e810b..3635f627 100644
--- a/app/Template/calendar/show.php
+++ b/app/Template/calendar/show.php
@@ -1,9 +1,9 @@
 <section id="main">
-    <?= $this->projectHeader->render($project, 'Calendar', 'show') ?>
+    <?= $this->projectHeader->render($project, 'CalendarController', 'show') ?>
     <div id="calendar"
-         data-save-url="<?= $this->url->href('calendar', 'save', array('project_id' => $project['id'])) ?>"
-         data-check-url="<?= $this->url->href('calendar', 'project', array('project_id' => $project['id'])) ?>"
+         data-save-url="<?= $this->url->href('CalendarController', 'save', array('project_id' => $project['id'])) ?>"
+         data-check-url="<?= $this->url->href('CalendarController', 'project', array('project_id' => $project['id'])) ?>"
          data-check-interval="<?= $check_interval ?>"
     >
     </div>
-</section>
\ No newline at end of file
+</section>
diff --git a/app/Template/category/edit.php b/app/Template/category/edit.php
index 7b592689..fac56db3 100644
--- a/app/Template/category/edit.php
+++ b/app/Template/category/edit.php
@@ -2,7 +2,7 @@
     <h2><?= t('Category modification for the project "%s"', $project['name']) ?></h2>
 </div>
 
-<form class="popover-form" method="post" action="<?= $this->url->href('category', 'update', array('project_id' => $project['id'], 'category_id' => $values['id'])) ?>" autocomplete="off">
+<form class="popover-form" method="post" action="<?= $this->url->href('CategoryController', 'update', array('project_id' => $project['id'], 'category_id' => $values['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
@@ -18,6 +18,6 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'category', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'CategoryController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/Template/category/index.php b/app/Template/category/index.php
index b3bdfd81..a103d89f 100644
--- a/app/Template/category/index.php
+++ b/app/Template/category/index.php
@@ -15,10 +15,10 @@
             <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog fa-fw"></i><i class="fa fa-caret-down"></i></a>
             <ul>
                 <li>
-                    <?= $this->url->link(t('Edit'), 'category', 'edit', array('project_id' => $project['id'], 'category_id' => $category_id), false, 'popover') ?>
+                    <?= $this->url->link(t('Edit'), 'CategoryController', 'edit', array('project_id' => $project['id'], 'category_id' => $category_id), false, 'popover') ?>
                 </li>
                 <li>
-                    <?= $this->url->link(t('Remove'), 'category', 'confirm', array('project_id' => $project['id'], 'category_id' => $category_id), false, 'popover') ?>
+                    <?= $this->url->link(t('Remove'), 'CategoryController', 'confirm', array('project_id' => $project['id'], 'category_id' => $category_id), false, 'popover') ?>
                 </li>
             </ul>
             </div>
@@ -31,7 +31,7 @@
 <div class="page-header">
     <h2><?= t('Add a new category') ?></h2>
 </div>
-<form method="post" action="<?= $this->url->href('category', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
+<form method="post" action="<?= $this->url->href('CategoryController', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('project_id', $values) ?>
@@ -42,4 +42,4 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/Template/category/remove.php b/app/Template/category/remove.php
index cad58d37..e7b9c9b4 100644
--- a/app/Template/category/remove.php
+++ b/app/Template/category/remove.php
@@ -9,9 +9,9 @@
         </p>
 
         <div class="form-actions">
-            <?= $this->url->link(t('Yes'), 'category', 'remove', array('project_id' => $project['id'], 'category_id' => $category['id']), true, 'btn btn-red') ?>
+            <?= $this->url->link(t('Yes'), 'CategoryController', 'remove', array('project_id' => $project['id'], 'category_id' => $category['id']), true, 'btn btn-red') ?>
             <?= t('or') ?>
-            <?= $this->url->link(t('cancel'), 'category', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
+            <?= $this->url->link(t('cancel'), 'CategoryController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
         </div>
     </div>
-</section>
\ No newline at end of file
+</section>
diff --git a/app/Template/column/create.php b/app/Template/column/create.php
index 2d325f76..023de525 100644
--- a/app/Template/column/create.php
+++ b/app/Template/column/create.php
@@ -1,7 +1,7 @@
 <div class="page-header">
     <h2><?= t('Add a new column') ?></h2>
 </div>
-<form class="popover-form" method="post" action="<?= $this->url->href('Column', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
+<form class="popover-form" method="post" action="<?= $this->url->href('ColumnController', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
@@ -21,4 +21,4 @@
         <?= t('or') ?>
         <?= $this->url->link(t('cancel'), 'column', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/Template/column/edit.php b/app/Template/column/edit.php
index 412858a9..a742e4b9 100644
--- a/app/Template/column/edit.php
+++ b/app/Template/column/edit.php
@@ -2,7 +2,7 @@
     <h2><?= t('Edit column "%s"', $column['title']) ?></h2>
 </div>
 
-<form class="popover-form" method="post" action="<?= $this->url->href('column', 'update', array('project_id' => $project['id'], 'column_id' => $column['id'])) ?>" autocomplete="off">
+<form class="popover-form" method="post" action="<?= $this->url->href('ColumnController', 'update', array('project_id' => $project['id'], 'column_id' => $column['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
@@ -21,6 +21,6 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'column', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'ColumnController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/Template/column/index.php b/app/Template/column/index.php
index 6bc67c5a..4f5f0a60 100644
--- a/app/Template/column/index.php
+++ b/app/Template/column/index.php
@@ -3,7 +3,7 @@
     <ul>
         <li>
             <i class="fa fa-plus fa-fw"></i>
-            <?= $this->url->link(t('Add a new column'), 'Column', 'create', array('project_id' => $project['id']), false, 'popover') ?>
+            <?= $this->url->link(t('Add a new column'), 'ColumnController', 'create', array('project_id' => $project['id']), false, 'popover') ?>
         </li>
     </ul>
 </div>
@@ -13,7 +13,7 @@
 <?php else: ?>
     <table
         class="columns-table table-stripped"
-        data-save-position-url="<?= $this->url->href('Column', 'move', array('project_id' => $project['id'])) ?>">
+        data-save-position-url="<?= $this->url->href('ColumnController', 'move', array('project_id' => $project['id'])) ?>">
         <thead>
         <tr>
             <th class="column-70"><?= t('Column title') ?></th>
@@ -41,10 +41,10 @@
                 <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog fa-fw"></i><i class="fa fa-caret-down"></i></a>
                 <ul>
                     <li>
-                        <?= $this->url->link(t('Edit'), 'column', 'edit', array('project_id' => $project['id'], 'column_id' => $column['id']), false, 'popover') ?>
+                        <?= $this->url->link(t('Edit'), 'ColumnController', 'edit', array('project_id' => $project['id'], 'column_id' => $column['id']), false, 'popover') ?>
                     </li>
                     <li>
-                        <?= $this->url->link(t('Remove'), 'column', 'confirm', array('project_id' => $project['id'], 'column_id' => $column['id']), false, 'popover') ?>
+                        <?= $this->url->link(t('Remove'), 'ColumnController', 'confirm', array('project_id' => $project['id'], 'column_id' => $column['id']), false, 'popover') ?>
                     </li>
                 </ul>
                 </div>
diff --git a/app/Template/column/remove.php b/app/Template/column/remove.php
index ccab889d..b231a9a7 100644
--- a/app/Template/column/remove.php
+++ b/app/Template/column/remove.php
@@ -9,7 +9,7 @@
     </p>
 
     <div class="form-actions">
-        <?= $this->url->link(t('Yes'), 'column', 'remove', array('project_id' => $project['id'], 'column_id' => $column['id'], 'remove' => 'yes'), true, 'btn btn-red') ?>
-        <?= t('or') ?> <?= $this->url->link(t('cancel'), 'column', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('Yes'), 'ColumnController', 'remove', array('project_id' => $project['id'], 'column_id' => $column['id'], 'remove' => 'yes'), true, 'btn btn-red') ?>
+        <?= t('or') ?> <?= $this->url->link(t('cancel'), 'ColumnController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/Template/comment/create.php b/app/Template/comment/create.php
index 2a92a2f8..0358107a 100644
--- a/app/Template/comment/create.php
+++ b/app/Template/comment/create.php
@@ -1,7 +1,7 @@
 <div class="page-header">
     <h2><?= t('Add a comment') ?></h2>
 </div>
-<form class="popover-form" method="post" action="<?= $this->url->href('comment', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
+<form class="popover-form" method="post" action="<?= $this->url->href('CommentController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('task_id', $values) ?>
     <?= $this->form->hidden('user_id', $values) ?>
diff --git a/app/Template/comment/edit.php b/app/Template/comment/edit.php
index abe98804..f69fc0c1 100644
--- a/app/Template/comment/edit.php
+++ b/app/Template/comment/edit.php
@@ -2,7 +2,7 @@
     <h2><?= t('Edit a comment') ?></h2>
 </div>
 
-<form class="popover-form" method="post" action="<?= $this->url->href('comment', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id'])) ?>" autocomplete="off">
+<form class="popover-form" method="post" action="<?= $this->url->href('CommentController', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('id', $values) ?>
diff --git a/app/Template/comment/remove.php b/app/Template/comment/remove.php
index c7de8053..55587b67 100644
--- a/app/Template/comment/remove.php
+++ b/app/Template/comment/remove.php
@@ -14,7 +14,7 @@
     )) ?>
 
     <div class="form-actions">
-        <?= $this->url->link(t('Yes'), 'comment', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), true, 'btn btn-red') ?>
+        <?= $this->url->link(t('Yes'), 'CommentController', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), true, 'btn btn-red') ?>
         <?= t('or') ?>
         <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
diff --git a/app/Template/comment/show.php b/app/Template/comment/show.php
index 2aca26b3..8419a14e 100644
--- a/app/Template/comment/show.php
+++ b/app/Template/comment/show.php
@@ -26,11 +26,11 @@
                 <?php if ($editable && ($this->user->isAdmin() || $this->user->isCurrentUser($comment['user_id']))): ?>
                     <li>
                         <i class="fa fa-remove fa-fw"></i>
-                        <?= $this->url->link(t('remove'), 'comment', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), false, 'popover') ?>
+                        <?= $this->url->link(t('remove'), 'CommentController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), false, 'popover') ?>
                     </li>
                     <li>
                         <i class="fa fa-edit fa-fw"></i>
-                        <?= $this->url->link(t('edit'), 'comment', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), false, 'popover') ?>
+                        <?= $this->url->link(t('edit'), 'CommentController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), false, 'popover') ?>
                     </li>
                 <?php endif ?>
             </ul>
diff --git a/app/Template/comments/create.php b/app/Template/comments/create.php
index 633f4392..3fa6ddc0 100644
--- a/app/Template/comments/create.php
+++ b/app/Template/comments/create.php
@@ -1,4 +1,4 @@
-<form method="post" action="<?= $this->url->href('comment', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
+<form method="post" action="<?= $this->url->href('CommentController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('task_id', $values) ?>
     <?= $this->form->hidden('user_id', $values) ?>
diff --git a/app/Template/comments/show.php b/app/Template/comments/show.php
index 76af5593..43f6b2c2 100644
--- a/app/Template/comments/show.php
+++ b/app/Template/comments/show.php
@@ -6,7 +6,7 @@
         <?php if (!isset($is_public) || !$is_public): ?>
             <div class="comment-sorting">
                 <i class="fa fa-sort"></i>
-                <?= $this->url->link(t('change sorting'), 'comment', 'toggleSorting', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+                <?= $this->url->link(t('change sorting'), 'CommentController', 'toggleSorting', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
             </div>
         <?php endif ?>
         <?php foreach ($comments as $comment): ?>
@@ -30,4 +30,4 @@
             )) ?>
         <?php endif ?>
     </div>
-</section>
\ No newline at end of file
+</section>
diff --git a/app/Template/config/sidebar.php b/app/Template/config/sidebar.php
index e6b4631d..187ecd93 100644
--- a/app/Template/config/sidebar.php
+++ b/app/Template/config/sidebar.php
@@ -16,8 +16,8 @@
         <li <?= $this->app->checkMenuSelection('ConfigController', 'calendar') ?>>
             <?= $this->url->link(t('Calendar settings'), 'ConfigController', 'calendar') ?>
         </li>
-        <li <?= $this->app->checkMenuSelection('link') ?>>
-            <?= $this->url->link(t('Link settings'), 'link', 'index') ?>
+        <li <?= $this->app->checkMenuSelection('LinkController') ?>>
+            <?= $this->url->link(t('Link settings'), 'LinkController', 'index') ?>
         </li>
         <li <?= $this->app->checkMenuSelection('CurrencyController', 'index') ?>>
             <?= $this->url->link(t('Currency rates'), 'CurrencyController', 'index') ?>
diff --git a/app/Template/custom_filter/add.php b/app/Template/custom_filter/add.php
index 56f7921c..3801cc30 100644
--- a/app/Template/custom_filter/add.php
+++ b/app/Template/custom_filter/add.php
@@ -1,7 +1,7 @@
 <div class="page-header">
     <h2><?= t('Add a new filter') ?></h2>
 </div>
-<form method="post" action="<?= $this->url->href('customfilter', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
+<form method="post" action="<?= $this->url->href('CustomFilterController', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('project_id', $values) ?>
diff --git a/app/Template/custom_filter/edit.php b/app/Template/custom_filter/edit.php
index 051a5062..26da8da2 100644
--- a/app/Template/custom_filter/edit.php
+++ b/app/Template/custom_filter/edit.php
@@ -2,7 +2,7 @@
     <h2><?= t('Edit custom filter') ?></h2>
 </div>
 
-<form class="form-popover" method="post" action="<?= $this->url->href('customfilter', 'update', array('project_id' => $filter['project_id'], 'filter_id' => $filter['id'])) ?>" autocomplete="off">
+<form class="form-popover" method="post" action="<?= $this->url->href('CustomFilterController', 'update', array('project_id' => $filter['project_id'], 'filter_id' => $filter['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
@@ -27,6 +27,6 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'customfilter', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'CustomFilterController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
 </form>
diff --git a/app/Template/custom_filter/index.php b/app/Template/custom_filter/index.php
index 12a4eece..08c8040c 100644
--- a/app/Template/custom_filter/index.php
+++ b/app/Template/custom_filter/index.php
@@ -32,12 +32,12 @@
             </td>
             <td><?= $this->text->e($filter['owner_name'] ?: $filter['owner_username']) ?></td>
             <td>
-                <?php if ($filter['user_id'] == $this->user->getId() || $this->user->hasProjectAccess('customfilter', 'edit', $project['id'])): ?>
+                <?php if ($filter['user_id'] == $this->user->getId() || $this->user->hasProjectAccess('CustomFilterController', 'edit', $project['id'])): ?>
                     <div class="dropdown">
                     <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog fa-fw"></i><i class="fa fa-caret-down"></i></a>
                     <ul>
-                        <li><?= $this->url->link(t('Remove'), 'customfilter', 'confirm', array('project_id' => $filter['project_id'], 'filter_id' => $filter['id']), false, 'popover') ?></li>
-                        <li><?= $this->url->link(t('Edit'), 'customfilter', 'edit', array('project_id' => $filter['project_id'], 'filter_id' => $filter['id']), false, 'popover') ?></li>
+                        <li><?= $this->url->link(t('Remove'), 'CustomFilterController', 'confirm', array('project_id' => $filter['project_id'], 'filter_id' => $filter['id']), false, 'popover') ?></li>
+                        <li><?= $this->url->link(t('Edit'), 'CustomFilterController', 'edit', array('project_id' => $filter['project_id'], 'filter_id' => $filter['id']), false, 'popover') ?></li>
                     </ul>
                     </div>
                 <?php endif ?>
diff --git a/app/Template/custom_filter/remove.php b/app/Template/custom_filter/remove.php
index d4c67a2b..609f19b2 100644
--- a/app/Template/custom_filter/remove.php
+++ b/app/Template/custom_filter/remove.php
@@ -9,9 +9,9 @@
         </p>
 
         <div class="form-actions">
-            <?= $this->url->link(t('Yes'), 'customfilter', 'remove', array('project_id' => $project['id'], 'filter_id' => $filter['id']), true, 'btn btn-red') ?>
+            <?= $this->url->link(t('Yes'), 'CustomFilterController', 'remove', array('project_id' => $project['id'], 'filter_id' => $filter['id']), true, 'btn btn-red') ?>
             <?= t('or') ?>
-            <?= $this->url->link(t('cancel'), 'customfilter', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
+            <?= $this->url->link(t('cancel'), 'CustomFilterController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
         </div>
     </div>
 </section>
diff --git a/app/Template/dashboard/calendar.php b/app/Template/dashboard/calendar.php
index a154203b..75c96d83 100644
--- a/app/Template/dashboard/calendar.php
+++ b/app/Template/dashboard/calendar.php
@@ -1,5 +1,5 @@
 <div id="calendar"
-     data-check-url="<?= $this->url->href('calendar', 'user', array('user_id' => $user['id'])) ?>"
-     data-save-url="<?= $this->url->href('calendar', 'save') ?>"
+     data-check-url="<?= $this->url->href('CalendarController', 'user', array('user_id' => $user['id'])) ?>"
+     data-save-url="<?= $this->url->href('CalendarController', 'save') ?>"
 >
 </div>
diff --git a/app/Template/dashboard/layout.php b/app/Template/dashboard/layout.php
index f73e02b5..795537a6 100644
--- a/app/Template/dashboard/layout.php
+++ b/app/Template/dashboard/layout.php
@@ -1,16 +1,16 @@
 <section id="main">
     <div class="page-header">
         <ul>
-            <?php if ($this->user->hasAccess('ProjectCreation', 'create')): ?>
+            <?php if ($this->user->hasAccess('ProjectCreationController', 'create')): ?>
                 <li>
                     <i class="fa fa-plus fa-fw"></i>
-                    <?= $this->url->link(t('New project'), 'ProjectCreation', 'create', array(), false, 'popover') ?>
+                    <?= $this->url->link(t('New project'), 'ProjectCreationController', 'create', array(), false, 'popover') ?>
                 </li>
             <?php endif ?>
             <?php if ($this->app->config('disable_private_project', 0) == 0): ?>
             <li>
                 <i class="fa fa-lock fa-fw"></i>
-                <?= $this->url->link(t('New private project'), 'ProjectCreation', 'createPrivate', array(), false, 'popover') ?>
+                <?= $this->url->link(t('New private project'), 'ProjectCreationController', 'createPrivate', array(), false, 'popover') ?>
             </li>
             <?php endif ?>
             <li>
diff --git a/app/Template/dashboard/projects.php b/app/Template/dashboard/projects.php
index cdf19bdf..c5615230 100644
--- a/app/Template/dashboard/projects.php
+++ b/app/Template/dashboard/projects.php
@@ -26,8 +26,8 @@
                     <?= $this->url->link('<i class="fa fa-sliders fa-fw"></i>', 'gantt', 'project', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Gantt chart')) ?>
                 <?php endif ?>
 
-                <?= $this->url->link('<i class="fa fa-list"></i>', 'listing', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('List')) ?>&nbsp;
-                <?= $this->url->link('<i class="fa fa-calendar"></i>', 'calendar', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Calendar')) ?>&nbsp;
+                <?= $this->url->link('<i class="fa fa-list"></i>', 'TaskListController', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('List')) ?>&nbsp;
+                <?= $this->url->link('<i class="fa fa-calendar"></i>', 'CalendarController', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Calendar')) ?>&nbsp;
 
                 <?= $this->url->link($this->text->e($project['name']), 'board', 'show', array('project_id' => $project['id'])) ?>
                 <?php if (! empty($project['description'])): ?>
diff --git a/app/Template/export/sidebar.php b/app/Template/export/sidebar.php
index 6a1de7e9..c9d4d0a3 100644
--- a/app/Template/export/sidebar.php
+++ b/app/Template/export/sidebar.php
@@ -2,17 +2,17 @@
     <h2><?= t('Exports') ?></h2>
     <ul>
         <li <?= $this->app->getRouterAction() === 'tasks' ? 'class="active"' : '' ?>>
-            <?= $this->url->link(t('Tasks'), 'export', 'tasks', array('project_id' => $project['id'])) ?>
+            <?= $this->url->link(t('Tasks'), 'ExportController', 'tasks', array('project_id' => $project['id'])) ?>
         </li>
         <li <?= $this->app->getRouterAction() === 'subtasks' ? 'class="active"' : '' ?>>
-            <?= $this->url->link(t('Subtasks'), 'export', 'subtasks', array('project_id' => $project['id'])) ?>
+            <?= $this->url->link(t('Subtasks'), 'ExportController', 'subtasks', array('project_id' => $project['id'])) ?>
         </li>
         <li <?= $this->app->getRouterAction() === 'transitions' ? 'class="active"' : '' ?>>
-            <?= $this->url->link(t('Task transitions'), 'export', 'transitions', array('project_id' => $project['id'])) ?>
+            <?= $this->url->link(t('Task transitions'), 'ExportController', 'transitions', array('project_id' => $project['id'])) ?>
         </li>
         <li <?= $this->app->getRouterAction() === 'summary' ? 'class="active"' : '' ?>>
-            <?= $this->url->link(t('Daily project summary'), 'export', 'summary', array('project_id' => $project['id'])) ?>
+            <?= $this->url->link(t('Daily project summary'), 'ExportController', 'summary', array('project_id' => $project['id'])) ?>
         </li>
         <?= $this->hook->render('template:export:sidebar') ?>
     </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/Template/file_viewer/show.php b/app/Template/file_viewer/show.php
index 191aaa6c..e829a178 100644
--- a/app/Template/file_viewer/show.php
+++ b/app/Template/file_viewer/show.php
@@ -3,7 +3,7 @@
 </div>
 <div class="file-viewer">
     <?php if ($file['is_image']): ?>
-        <img src="<?= $this->url->href('FileViewer', 'image', $params) ?>" alt="<?= $this->text->e($file['name']) ?>">
+        <img src="<?= $this->url->href('FileViewerController', 'image', $params) ?>" alt="<?= $this->text->e($file['name']) ?>">
     <?php elseif ($type === 'markdown'): ?>
         <article class="markdown">
             <?= $this->text->markdown($content) ?>
@@ -11,4 +11,4 @@
     <?php elseif ($type === 'text'): ?>
         <pre><?= $content ?></pre>
     <?php endif ?>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/Template/gantt/projects.php b/app/Template/gantt/projects.php
index b8431d03..9241e372 100644
--- a/app/Template/gantt/projects.php
+++ b/app/Template/gantt/projects.php
@@ -4,8 +4,8 @@
             <li>
                 <i class="fa fa-folder fa-fw"></i><?= $this->url->link(t('Projects list'), 'ProjectListController', 'show') ?>
             </li>
-            <?php if ($this->user->hasAccess('projectuser', 'managers')): ?>
-                <li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('Users overview'), 'projectuser', 'managers') ?></li>
+            <?php if ($this->user->hasAccess('ProjectUserOverviewController', 'managers')): ?>
+                <li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('Users overview'), 'ProjectUserOverviewController', 'managers') ?></li>
             <?php endif ?>
         </ul>
     </div>
diff --git a/app/Template/header.php b/app/Template/header.php
index 300df76d..266b0724 100644
--- a/app/Template/header.php
+++ b/app/Template/header.php
@@ -38,7 +38,7 @@
                     </span>
                 <?php endif ?>
 
-                <?php $has_project_creation_access = $this->user->hasAccess('ProjectCreation', 'create'); ?>
+                <?php $has_project_creation_access = $this->user->hasAccess('ProjectCreationController', 'create'); ?>
                 <?php $is_private_project_enabled = $this->app->config('disable_private_project', 0) == 0; ?>
 
                 <?php if ($has_project_creation_access || (!$has_project_creation_access && $is_private_project_enabled)): ?>
@@ -46,11 +46,13 @@
                     <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-plus fa-fw"></i><i class="fa fa-caret-down"></i></a>
                     <ul>
                         <?php if ($has_project_creation_access): ?>
-                            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New project'), 'ProjectCreation', 'create', array(), false, 'popover') ?></li>
+                            <li><i class="fa fa-plus fa-fw"></i>
+                            <?= $this->url->link(t('New project'), 'ProjectCreationController', 'create', array(), false, 'popover') ?></li>
                         <?php endif ?>
                         <?php if ($is_private_project_enabled): ?>
                         <li>
-                            <i class="fa fa-lock fa-fw"></i><?= $this->url->link(t('New private project'), 'ProjectCreation', 'createPrivate', array(), false, 'popover') ?>
+                            <i class="fa fa-lock fa-fw"></i>
+                            <?= $this->url->link(t('New private project'), 'ProjectCreationController', 'createPrivate', array(), false, 'popover') ?>
                         </li>
                         <?php endif ?>
                     </ul>
@@ -98,7 +100,7 @@
                         <?php if (! DISABLE_LOGOUT): ?>
                             <li>
                                 <i class="fa fa-sign-out fa-fw"></i>
-                                <?= $this->url->link(t('Logout'), 'auth', 'logout') ?>
+                                <?= $this->url->link(t('Logout'), 'AuthController', 'logout') ?>
                             </li>
                         <?php endif ?>
                     </ul>
diff --git a/app/Template/layout.php b/app/Template/layout.php
index 6c02de91..9c4d69c5 100644
--- a/app/Template/layout.php
+++ b/app/Template/layout.php
@@ -45,7 +45,7 @@
         <?= $this->hook->render('template:layout:head') ?>
     </head>
     <body data-status-url="<?= $this->url->href('UserAjaxController', 'status') ?>"
-          data-login-url="<?= $this->url->href('auth', 'login') ?>"
+          data-login-url="<?= $this->url->href('AuthController', 'login') ?>"
           data-keyboard-shortcut-url="<?= $this->url->href('DocumentationController', 'shortcuts') ?>"
           data-timezone="<?= $this->app->getTimezone() ?>"
           data-js-lang="<?= $this->app->jsLang() ?>">
diff --git a/app/Template/link/create.php b/app/Template/link/create.php
index 3b36abee..23990604 100644
--- a/app/Template/link/create.php
+++ b/app/Template/link/create.php
@@ -2,7 +2,7 @@
     <h2><?= t('Add a new link') ?></h2>
 </div>
 
-<form action="<?= $this->url->href('link', 'save') ?>" method="post" autocomplete="off">
+<form action="<?= $this->url->href('LinkController', 'save') ?>" method="post" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
@@ -15,4 +15,4 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/Template/link/edit.php b/app/Template/link/edit.php
index e91422be..0ad73275 100644
--- a/app/Template/link/edit.php
+++ b/app/Template/link/edit.php
@@ -2,7 +2,7 @@
     <h2><?= t('Link modification') ?></h2>
 </div>
 
-<form action="<?= $this->url->href('link', 'update', array('link_id' => $link['id'])) ?>" method="post" autocomplete="off">
+<form action="<?= $this->url->href('LinkController', 'update', array('link_id' => $link['id'])) ?>" method="post" autocomplete="off">
 
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('id', $values) ?>
@@ -18,4 +18,4 @@
         <?= t('or') ?>
         <?= $this->url->link(t('cancel'), 'link', 'index') ?>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/Template/link/index.php b/app/Template/link/index.php
index 1475bd50..7e32069a 100644
--- a/app/Template/link/index.php
+++ b/app/Template/link/index.php
@@ -18,9 +18,9 @@
         </td>
         <td>
             <ul>
-                <?= $this->url->link(t('Edit'), 'link', 'edit', array('link_id' => $link['id'])) ?>
+                <?= $this->url->link(t('Edit'), 'LinkController', 'edit', array('link_id' => $link['id'])) ?>
                 <?= t('or') ?>
-                <?= $this->url->link(t('Remove'), 'link', 'confirm', array('link_id' => $link['id'])) ?>
+                <?= $this->url->link(t('Remove'), 'LinkController', 'confirm', array('link_id' => $link['id'])) ?>
             </ul>
         </td>
     </tr>
@@ -30,4 +30,4 @@
     <?= t('There is no link.') ?>
 <?php endif ?>
 
-<?= $this->render('link/create', array('values' => $values, 'errors' => $errors)) ?>
\ No newline at end of file
+<?= $this->render('link/create', array('values' => $values, 'errors' => $errors)) ?>
diff --git a/app/Template/link/remove.php b/app/Template/link/remove.php
index 12ca14bb..b7fbef5e 100644
--- a/app/Template/link/remove.php
+++ b/app/Template/link/remove.php
@@ -8,8 +8,8 @@
     </p>
 
     <div class="form-actions">
-        <?= $this->url->link(t('Yes'), 'link', 'remove', array('link_id' => $link['id']), true, 'btn btn-red') ?>
+        <?= $this->url->link(t('Yes'), 'LinkController', 'remove', array('link_id' => $link['id']), true, 'btn btn-red') ?>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'link', 'index') ?>
+        <?= $this->url->link(t('cancel'), 'LinkController', 'index') ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/Template/listing/show.php b/app/Template/listing/show.php
deleted file mode 100644
index 4ceb7f87..00000000
--- a/app/Template/listing/show.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<section id="main">
-    <?= $this->projectHeader->render($project, 'Listing', 'show') ?>
-
-    <?php if ($paginator->isEmpty()): ?>
-        <p class="alert"><?= t('No tasks found.') ?></p>
-    <?php elseif (! $paginator->isEmpty()): ?>
-        <table class="table-fixed table-small">
-            <tr>
-                <th class="column-5"><?= $paginator->order(t('Id'), 'tasks.id') ?></th>
-                <th class="column-10"><?= $paginator->order(t('Swimlane'), 'tasks.swimlane_id') ?></th>
-                <th class="column-10"><?= $paginator->order(t('Column'), 'tasks.column_id') ?></th>
-                <th class="column-10"><?= $paginator->order(t('Category'), 'tasks.category_id') ?></th>
-                <th><?= $paginator->order(t('Title'), 'tasks.title') ?></th>
-                <th class="column-10"><?= $paginator->order(t('Assignee'), 'users.username') ?></th>
-                <th class="column-10"><?= $paginator->order(t('Due date'), 'tasks.date_due') ?></th>
-                <th class="column-5"><?= $paginator->order(t('Status'), 'tasks.is_active') ?></th>
-            </tr>
-            <?php foreach ($paginator->getCollection() as $task): ?>
-            <tr>
-                <td class="task-table color-<?= $task['color_id'] ?>">
-                    <?php if ($this->user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?>
-                        <?= $this->render('task/dropdown', array('task' => $task)) ?>
-                    <?php else: ?>
-                        #<?= $task['id'] ?>
-                    <?php endif ?>
-                </td>
-                <td>
-                    <?= $this->text->e($task['swimlane_name'] ?: $task['default_swimlane']) ?>
-                </td>
-                <td>
-                    <?= $this->text->e($task['column_name']) ?>
-                </td>
-                <td>
-                    <?= $this->text->e($task['category_name']) ?>
-                </td>
-                <td>
-                    <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
-                </td>
-                <td>
-                    <?php if ($task['assignee_username']): ?>
-                        <?= $this->text->e($task['assignee_name'] ?: $task['assignee_username']) ?>
-                    <?php else: ?>
-                        <?= t('Unassigned') ?>
-                    <?php endif ?>
-                </td>
-                <td>
-                    <?= $this->dt->date($task['date_due']) ?>
-                </td>
-                <td>
-                    <?php if ($task['is_active'] == \Kanboard\Model\Task::STATUS_OPEN): ?>
-                        <?= t('Open') ?>
-                    <?php else: ?>
-                        <?= t('Closed') ?>
-                    <?php endif ?>
-                </td>
-            </tr>
-            <?php endforeach ?>
-        </table>
-
-        <?= $paginator ?>
-    <?php endif ?>
-</section>
diff --git a/app/Template/password_reset/change.php b/app/Template/password_reset/change.php
index 0a1d8de4..80a035da 100644
--- a/app/Template/password_reset/change.php
+++ b/app/Template/password_reset/change.php
@@ -1,6 +1,6 @@
 <div class="form-login">
     <h2><?= t('Password Reset') ?></h2>
-    <form method="post" action="<?= $this->url->href('PasswordReset', 'update', array('token' => $token)) ?>">
+    <form method="post" action="<?= $this->url->href('PasswordResetController', 'update', array('token' => $token)) ?>">
         <?= $this->form->csrf() ?>
 
         <?= $this->form->label(t('New password'), 'password') ?>
@@ -13,4 +13,4 @@
             <button type="submit" class="btn btn-blue"><?= t('Change Password') ?></button>
         </div>
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/Template/password_reset/create.php b/app/Template/password_reset/create.php
index f1877aa7..f43d95fc 100644
--- a/app/Template/password_reset/create.php
+++ b/app/Template/password_reset/create.php
@@ -1,6 +1,6 @@
 <div class="form-login">
     <h2><?= t('Password Reset') ?></h2>
-    <form method="post" action="<?= $this->url->href('PasswordReset', 'save') ?>">
+    <form method="post" action="<?= $this->url->href('PasswordResetController', 'save') ?>">
         <?= $this->form->csrf() ?>
 
         <?= $this->form->label(t('Username'), 'username') ?>
diff --git a/app/Template/password_reset/email.php b/app/Template/password_reset/email.php
index 62788b49..63b08e49 100644
--- a/app/Template/password_reset/email.php
+++ b/app/Template/password_reset/email.php
@@ -1,6 +1,6 @@
 <p><?= t('To reset your password click on this link:') ?></p>
 
-<p><?= $this->url->to('PasswordReset', 'change', array('token' => $token), '', true) ?></p>
+<p><?= $this->url->to('PasswordResetController', 'change', array('token' => $token), '', true) ?></p>
 
 <hr>
-Kanboard
\ No newline at end of file
+Kanboard
diff --git a/app/Template/project/dropdown.php b/app/Template/project/dropdown.php
index edebdd65..10288b81 100644
--- a/app/Template/project/dropdown.php
+++ b/app/Template/project/dropdown.php
@@ -7,11 +7,11 @@
         </li>
         <li>
             <i class="fa fa-calendar fa-fw"></i>
-            <?= $this->url->link(t('Calendar'), 'calendar', 'show', array('project_id' => $project['id'])) ?>
+            <?= $this->url->link(t('Calendar'), 'CalendarController', 'show', array('project_id' => $project['id'])) ?>
         </li>
         <li>
             <i class="fa fa-list fa-fw"></i>
-            <?= $this->url->link(t('Listing'), 'listing', 'show', array('project_id' => $project['id'])) ?>
+            <?= $this->url->link(t('Listing'), 'TaskListController', 'show', array('project_id' => $project['id'])) ?>
         </li>
         <?php if ($this->user->hasProjectAccess('Gantt', 'project', $project['id'])): ?>
         <li>
@@ -22,13 +22,13 @@
 
         <li>
             <i class="fa fa-dashboard fa-fw"></i>&nbsp;
-            <?= $this->url->link(t('Activity'), 'activity', 'project', array('project_id' => $project['id'])) ?>
+            <?= $this->url->link(t('Activity'), 'ActivityController', 'project', array('project_id' => $project['id'])) ?>
         </li>
 
-        <?php if ($this->user->hasProjectAccess('analytic', 'tasks', $project['id'])): ?>
+        <?php if ($this->user->hasProjectAccess('AnalyticController', 'tasks', $project['id'])): ?>
             <li>
                 <i class="fa fa-line-chart fa-fw"></i>&nbsp;
-                <?= $this->url->link(t('Analytics'), 'analytic', 'tasks', array('project_id' => $project['id'])) ?>
+                <?= $this->url->link(t('Analytics'), 'AnalyticController', 'tasks', array('project_id' => $project['id'])) ?>
             </li>
         <?php endif ?>
 
diff --git a/app/Template/project/layout.php b/app/Template/project/layout.php
index fcb3e5f3..ec039202 100644
--- a/app/Template/project/layout.php
+++ b/app/Template/project/layout.php
@@ -1,5 +1,5 @@
 <section id="main">
-    <?= $this->projectHeader->render($project, 'Listing', 'show') ?>
+    <?= $this->projectHeader->render($project, 'TaskListController', 'show') ?>
     <section class="sidebar-container">
 
         <?= $this->render($sidebar_template, array('project' => $project)) ?>
@@ -8,4 +8,4 @@
             <?= $content_for_sublayout ?>
         </div>
     </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/app/Template/project/sidebar.php b/app/Template/project/sidebar.php
index 0f58c112..3fac3fd1 100644
--- a/app/Template/project/sidebar.php
+++ b/app/Template/project/sidebar.php
@@ -4,9 +4,9 @@
         <li <?= $this->app->checkMenuSelection('ProjectViewController', 'show') ?>>
             <?= $this->url->link(t('Summary'), 'ProjectViewController', 'show', array('project_id' => $project['id'])) ?>
         </li>
-        <?php if ($this->user->hasProjectAccess('customfilter', 'index', $project['id'])): ?>
-        <li <?= $this->app->checkMenuSelection('customfilter') ?>>
-            <?= $this->url->link(t('Custom filters'), 'customfilter', 'index', array('project_id' => $project['id'])) ?>
+        <?php if ($this->user->hasProjectAccess('CustomFilterController', 'index', $project['id'])): ?>
+        <li <?= $this->app->checkMenuSelection('CustomFilterController') ?>>
+            <?= $this->url->link(t('Custom filters'), 'CustomFilterController', 'index', array('project_id' => $project['id'])) ?>
         </li>
         <?php endif ?>
 
@@ -23,22 +23,22 @@
             <li <?= $this->app->checkMenuSelection('ProjectViewController', 'integrations') ?>>
                 <?= $this->url->link(t('Integrations'), 'ProjectViewController', 'integrations', array('project_id' => $project['id'])) ?>
             </li>
-            <li <?= $this->app->checkMenuSelection('column') ?>>
-                <?= $this->url->link(t('Columns'), 'column', 'index', array('project_id' => $project['id'])) ?>
+            <li <?= $this->app->checkMenuSelection('ColumnController') ?>>
+                <?= $this->url->link(t('Columns'), 'ColumnController', 'index', array('project_id' => $project['id'])) ?>
             </li>
-            <li <?= $this->app->checkMenuSelection('swimlane') ?>>
-                <?= $this->url->link(t('Swimlanes'), 'swimlane', 'index', array('project_id' => $project['id'])) ?>
+            <li <?= $this->app->checkMenuSelection('SwimlaneController') ?>>
+                <?= $this->url->link(t('Swimlanes'), 'SwimlaneController', 'index', array('project_id' => $project['id'])) ?>
             </li>
             <li <?= $this->app->checkMenuSelection('category') ?>>
-                <?= $this->url->link(t('Categories'), 'category', 'index', array('project_id' => $project['id'])) ?>
+                <?= $this->url->link(t('Categories'), 'CategoryController', 'index', array('project_id' => $project['id'])) ?>
             </li>
             <?php if ($project['is_private'] == 0): ?>
             <li <?= $this->app->checkMenuSelection('ProjectPermissionController') ?>>
                 <?= $this->url->link(t('Permissions'), 'ProjectPermissionController', 'index', array('project_id' => $project['id'])) ?>
             </li>
             <?php endif ?>
-            <li <?= $this->app->checkMenuSelection('action') ?>>
-                <?= $this->url->link(t('Automatic actions'), 'action', 'index', array('project_id' => $project['id'])) ?>
+            <li <?= $this->app->checkMenuSelection('ActionController') ?>>
+                <?= $this->url->link(t('Automatic actions'), 'ActionController', 'index', array('project_id' => $project['id'])) ?>
             </li>
             <li <?= $this->app->checkMenuSelection('ProjectViewController', 'duplicate') ?>>
                 <?= $this->url->link(t('Duplicate'), 'ProjectViewController', 'duplicate', array('project_id' => $project['id'])) ?>
diff --git a/app/Template/project_action_duplication/show.php b/app/Template/project_action_duplication/show.php
new file mode 100644
index 00000000..2eebb262
--- /dev/null
+++ b/app/Template/project_action_duplication/show.php
@@ -0,0 +1,19 @@
+<div class="page-header">
+    <h2><?= t('Import actions from another project') ?></h2>
+</div>
+<?php if (empty($projects_list)): ?>
+    <p class="alert"><?= t('There is no available project.') ?></p>
+<?php else: ?>
+    <form class="popover-form" method="post" action="<?= $this->url->href('ProjectActionDuplicationController', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
+        <?= $this->form->csrf() ?>
+
+        <?= $this->form->label(t('Create from another project'), 'src_project_id') ?>
+        <?= $this->form->select('src_project_id', $projects_list) ?>
+
+        <div class="form-actions">
+            <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
+            <?= t('or') ?>
+            <?= $this->url->link(t('cancel'), 'Action', 'index', array(), false, 'close-popover') ?>
+        </div>
+    </form>
+<?php endif ?>
diff --git a/app/Template/project_creation/create.php b/app/Template/project_creation/create.php
index ea5783a6..fb892012 100644
--- a/app/Template/project_creation/create.php
+++ b/app/Template/project_creation/create.php
@@ -2,7 +2,7 @@
     <div class="page-header">
         <h2><?= $title ?></h2>
     </div>
-    <form class="popover-form" id="project-creation-form" method="post" action="<?= $this->url->href('ProjectCreation', 'save') ?>" autocomplete="off">
+    <form class="popover-form" id="project-creation-form" method="post" action="<?= $this->url->href('ProjectCreationController', 'save') ?>" autocomplete="off">
 
         <?= $this->form->csrf() ?>
         <?= $this->form->hidden('is_private', $values) ?>
diff --git a/app/Template/project_edit/general.php b/app/Template/project_edit/general.php
index b817bcd4..c7421477 100644
--- a/app/Template/project_edit/general.php
+++ b/app/Template/project_edit/general.php
@@ -24,7 +24,7 @@
         <?= $this->form->select('owner_id', $owners, $values, $errors) ?>
     </div>
 
-    <?php if ($this->user->hasProjectAccess('ProjectCreation', 'create', $project['id'])): ?>
+    <?php if ($this->user->hasProjectAccess('ProjectCreationController', 'create', $project['id'])): ?>
         <hr>
         <?= $this->form->checkbox('is_private', t('Private project'), 1, $project['is_private'] == 1) ?>
         <p class="form-help"><?= t('Private projects do not have users and groups management.') ?></p>
diff --git a/app/Template/project_file/create.php b/app/Template/project_file/create.php
index 9858b273..e262799b 100644
--- a/app/Template/project_file/create.php
+++ b/app/Template/project_file/create.php
@@ -4,7 +4,7 @@
 <div id="file-done" style="display:none">
     <p class="alert alert-success">
         <?= t('All files have been uploaded successfully.') ?>
-        <?= $this->url->link(t('View uploaded files'), 'ProjectOverview', 'show', array('project_id' => $project['id'])) ?>
+        <?= $this->url->link(t('View uploaded files'), 'ProjectOverviewController', 'show', array('project_id' => $project['id'])) ?>
     </p>
 </div>
 
@@ -18,7 +18,7 @@
 <div
     id="file-dropzone"
     data-max-size="<?= $max_size ?>"
-    data-url="<?= $this->url->href('ProjectFile', 'save', array('project_id' => $project['id'])) ?>">
+    data-url="<?= $this->url->href('ProjectFileController', 'save', array('project_id' => $project['id'])) ?>">
     <div id="file-dropzone-inner">
         <?= t('Drag and drop your files here') ?> <?= t('or') ?> <a href="#" id="file-browser"><?= t('choose files') ?></a>
     </div>
@@ -29,5 +29,5 @@
 <div class="form-actions">
     <input type="submit" value="<?= t('Upload files') ?>" class="btn btn-blue" id="file-upload-button" disabled>
     <?= t('or') ?>
-    <?= $this->url->link(t('cancel'), 'ProjectOverview', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
+    <?= $this->url->link(t('cancel'), 'ProjectOverviewController', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
 </div>
diff --git a/app/Template/project_file/remove.php b/app/Template/project_file/remove.php
index ba834288..0517a9e7 100644
--- a/app/Template/project_file/remove.php
+++ b/app/Template/project_file/remove.php
@@ -8,8 +8,8 @@
     </p>
 
     <div class="form-actions">
-        <?= $this->url->link(t('Yes'), 'ProjectFile', 'remove', array('project_id' => $project['id'], 'file_id' => $file['id']), true, 'btn btn-red') ?>
+        <?= $this->url->link(t('Yes'), 'ProjectFileController', 'remove', array('project_id' => $project['id'], 'file_id' => $file['id']), true, 'btn btn-red') ?>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'ProjectOverview', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'ProjectOverviewController', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/Template/project_header/dropdown.php b/app/Template/project_header/dropdown.php
index 5a27e981..d98552e6 100644
--- a/app/Template/project_header/dropdown.php
+++ b/app/Template/project_header/dropdown.php
@@ -39,13 +39,13 @@
 
         <li>
             <i class="fa fa-dashboard fa-fw"></i>
-            <?= $this->url->link(t('Activity'), 'activity', 'project', array('project_id' => $project['id'])) ?>
+            <?= $this->url->link(t('Activity'), 'ActivityController', 'project', array('project_id' => $project['id'])) ?>
         </li>
 
-        <?php if ($this->user->hasProjectAccess('customfilter', 'index', $project['id'])): ?>
+        <?php if ($this->user->hasProjectAccess('CustomFilterController', 'index', $project['id'])): ?>
             <li>
                 <i class="fa fa-filter fa-fw"></i>
-                <?= $this->url->link(t('Custom filters'), 'customfilter', 'index', array('project_id' => $project['id'])) ?>
+                <?= $this->url->link(t('Custom filters'), 'CustomFilterController', 'index', array('project_id' => $project['id'])) ?>
             </li>
         <?php endif ?>
 
@@ -58,17 +58,17 @@
 
         <?= $this->hook->render('template:project:dropdown', array('project' => $project)) ?>
 
-        <?php if ($this->user->hasProjectAccess('analytic', 'tasks', $project['id'])): ?>
+        <?php if ($this->user->hasProjectAccess('AnalyticController', 'tasks', $project['id'])): ?>
             <li>
                 <i class="fa fa-line-chart fa-fw"></i>
-                <?= $this->url->link(t('Analytics'), 'analytic', 'tasks', array('project_id' => $project['id'])) ?>
+                <?= $this->url->link(t('Analytics'), 'AnalyticController', 'tasks', array('project_id' => $project['id'])) ?>
             </li>
         <?php endif ?>
 
-        <?php if ($this->user->hasProjectAccess('export', 'tasks', $project['id'])): ?>
+        <?php if ($this->user->hasProjectAccess('ExportController', 'tasks', $project['id'])): ?>
             <li>
                 <i class="fa fa-download fa-fw"></i>
-                <?= $this->url->link(t('Exports'), 'export', 'tasks', array('project_id' => $project['id'])) ?>
+                <?= $this->url->link(t('Exports'), 'ExportController', 'tasks', array('project_id' => $project['id'])) ?>
             </li>
         <?php endif ?>
 
diff --git a/app/Template/project_header/views.php b/app/Template/project_header/views.php
index 353e4b62..e444235a 100644
--- a/app/Template/project_header/views.php
+++ b/app/Template/project_header/views.php
@@ -1,24 +1,24 @@
 <ul class="views">
-    <li <?= $this->app->getRouterController() === 'ProjectOverview' ? 'class="active"' : '' ?>>
+    <li <?= $this->app->checkMenuSelection('ProjectOverviewController') ?>>
         <i class="fa fa-eye fa-fw"></i>
-        <?= $this->url->link(t('Overview'), 'ProjectOverview', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-overview', t('Keyboard shortcut: "%s"', 'v o')) ?>
+        <?= $this->url->link(t('Overview'), 'ProjectOverviewController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-overview', t('Keyboard shortcut: "%s"', 'v o')) ?>
     </li>
-    <li <?= $this->app->getRouterController() === 'Board' ? 'class="active"' : '' ?>>
+    <li <?= $this->app->checkMenuSelection('Board') ?>>
         <i class="fa fa-th fa-fw"></i>
         <?= $this->url->link(t('Board'), 'board', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-board', t('Keyboard shortcut: "%s"', 'v b')) ?>
     </li>
-    <li <?= $this->app->getRouterController() === 'Calendar' ? 'class="active"' : '' ?>>
+    <li <?= $this->app->checkMenuSelection('Calendar') ?>>
         <i class="fa fa-calendar fa-fw"></i>
-        <?= $this->url->link(t('Calendar'), 'calendar', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-calendar', t('Keyboard shortcut: "%s"', 'v c')) ?>
+        <?= $this->url->link(t('Calendar'), 'CalendarController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-calendar', t('Keyboard shortcut: "%s"', 'v c')) ?>
     </li>
-    <li <?= $this->app->getRouterController() === 'Listing' ? 'class="active"' : '' ?>>
+    <li <?= $this->app->checkMenuSelection('TaskListController') ?>>
         <i class="fa fa-list fa-fw"></i>
-        <?= $this->url->link(t('List'), 'listing', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-listing', t('Keyboard shortcut: "%s"', 'v l')) ?>
+        <?= $this->url->link(t('List'), 'TaskListController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-listing', t('Keyboard shortcut: "%s"', 'v l')) ?>
     </li>
     <?php if ($this->user->hasProjectAccess('gantt', 'project', $project['id'])): ?>
-    <li <?= $this->app->getRouterController() === 'Gantt' ? 'class="active"' : '' ?>>
+    <li <?= $this->app->checkMenuSelection('Gantt') ?>>
         <i class="fa fa-sliders fa-fw"></i>
         <?= $this->url->link(t('Gantt'), 'gantt', 'project', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-gantt', t('Keyboard shortcut: "%s"', 'v g')) ?>
     </li>
     <?php endif ?>
-</ul>
\ No newline at end of file
+</ul>
diff --git a/app/Template/project_list/show.php b/app/Template/project_list/show.php
index 06e4a626..3fd69f41 100644
--- a/app/Template/project_list/show.php
+++ b/app/Template/project_list/show.php
@@ -1,8 +1,8 @@
 <section id="main">
     <div class="page-header">
         <ul>
-            <?php if ($this->user->hasAccess('projectuser', 'managers')): ?>
-                <li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('Users overview'), 'projectuser', 'managers') ?></li>
+            <?php if ($this->user->hasAccess('ProjectUserOverviewController', 'managers')): ?>
+                <li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('Users overview'), 'ProjectUserOverviewController', 'managers') ?></li>
             <?php endif ?>
             <?php if ($this->user->hasAccess('gantt', 'projects')): ?>
                 <li><i class="fa fa-sliders fa-fw"></i><?= $this->url->link(t('Projects Gantt chart'), 'gantt', 'projects') ?></li>
@@ -20,7 +20,7 @@
                 <th class="column-8"><?= $paginator->order(t('Start date'), 'start_date') ?></th>
                 <th class="column-8"><?= $paginator->order(t('End date'), 'end_date') ?></th>
                 <th class="column-15"><?= $paginator->order(t('Owner'), 'owner_id') ?></th>
-                <?php if ($this->user->hasAccess('projectuser', 'managers')): ?>
+                <?php if ($this->user->hasAccess('ProjectUserOverviewController', 'managers')): ?>
                     <th class="column-10"><?= t('Users') ?></th>
                 <?php endif ?>
                 <th><?= t('Columns') ?></th>
@@ -64,10 +64,10 @@
                         <?= $this->text->e($project['owner_name'] ?: $project['owner_username']) ?>
                     <?php endif ?>
                 </td>
-                <?php if ($this->user->hasAccess('projectuser', 'managers')): ?>
+                <?php if ($this->user->hasAccess('ProjectUserOverviewController', 'managers')): ?>
                     <td>
                         <i class="fa fa-users fa-fw"></i>
-                        <span class="tooltip" title="<?= t('Members') ?>" data-href="<?= $this->url->href('Projectuser', 'users', array('project_id' => $project['id'])) ?>"><?= t('Members') ?></span>
+                        <span class="tooltip" title="<?= t('Members') ?>" data-href="<?= $this->url->href('ProjectUserOverviewController', 'users', array('project_id' => $project['id'])) ?>"><?= t('Members') ?></span>
                     </td>
                 <?php endif ?>
                 <td class="dashboard-project-stats">
diff --git a/app/Template/project_overview/attachments.php b/app/Template/project_overview/attachments.php
index eaabfd5f..ab8cf2ad 100644
--- a/app/Template/project_overview/attachments.php
+++ b/app/Template/project_overview/attachments.php
@@ -3,9 +3,9 @@
         <h3><a href="#" class="fa accordion-toggle"></a> <?= t('Attachments') ?></h3>
     </div>
     <div class="accordion-content">
-        <?php if ($this->user->hasProjectAccess('ProjectFile', 'create', $project['id'])): ?>
+        <?php if ($this->user->hasProjectAccess('ProjectFileController', 'create', $project['id'])): ?>
         <div class="buttons-header">
-            <?= $this->url->button('fa-plus', t('Upload a file'), 'ProjectFile', 'create', array('project_id' => $project['id']), 'popover') ?>
+            <?= $this->url->button('fa-plus', t('Upload a file'), 'ProjectFileController', 'create', array('project_id' => $project['id']), 'popover') ?>
         </div>
         <?php endif ?>
 
diff --git a/app/Template/project_overview/files.php b/app/Template/project_overview/files.php
index c570b771..fa870938 100644
--- a/app/Template/project_overview/files.php
+++ b/app/Template/project_overview/files.php
@@ -16,17 +16,17 @@
                             <?php if ($this->file->getPreviewType($file['name']) !== null): ?>
                                 <li>
                                     <i class="fa fa-eye fa-fw"></i>
-                                    <?= $this->url->link(t('View file'), 'FileViewer', 'show', array('project_id' => $project['id'], 'file_id' => $file['id']), false, 'popover') ?>
+                                    <?= $this->url->link(t('View file'), 'FileViewerController', 'show', array('project_id' => $project['id'], 'file_id' => $file['id']), false, 'popover') ?>
                                 </li>
                             <?php endif ?>
                             <li>
                                 <i class="fa fa-download fa-fw"></i>
-                                <?= $this->url->link(t('Download'), 'FileViewer', 'download', array('project_id' => $project['id'], 'file_id' => $file['id'])) ?>
+                                <?= $this->url->link(t('Download'), 'FileViewerController', 'download', array('project_id' => $project['id'], 'file_id' => $file['id'])) ?>
                             </li>
-                            <?php if ($this->user->hasProjectAccess('ProjectFile', 'remove', $project['id'])): ?>
+                            <?php if ($this->user->hasProjectAccess('ProjectFileController', 'remove', $project['id'])): ?>
                                 <li>
                                     <i class="fa fa-trash fa-fw"></i>
-                                    <?= $this->url->link(t('Remove'), 'ProjectFile', 'confirm', array('project_id' => $project['id'], 'file_id' => $file['id']), false, 'popover') ?>
+                                    <?= $this->url->link(t('Remove'), 'ProjectFileController', 'confirm', array('project_id' => $project['id'], 'file_id' => $file['id']), false, 'popover') ?>
                                 </li>
                             <?php endif ?>
                         </ul>
diff --git a/app/Template/project_overview/images.php b/app/Template/project_overview/images.php
index f6937e12..7f38e2b1 100644
--- a/app/Template/project_overview/images.php
+++ b/app/Template/project_overview/images.php
@@ -2,7 +2,7 @@
     <div class="file-thumbnails">
         <?php foreach ($images as $file): ?>
             <div class="file-thumbnail">
-                <a href="<?= $this->url->href('FileViewer', 'show', array('project_id' => $project['id'], 'file_id' => $file['id'])) ?>" class="popover"><img src="<?= $this->url->href('FileViewer', 'thumbnail', array('file_id' => $file['id'], 'project_id' => $project['id'])) ?>" title="<?= $this->text->e($file['name']) ?>" alt="<?= $this->text->e($file['name']) ?>"></a>
+                <a href="<?= $this->url->href('FileViewerController', 'show', array('project_id' => $project['id'], 'file_id' => $file['id'])) ?>" class="popover"><img src="<?= $this->url->href('FileViewerController', 'thumbnail', array('file_id' => $file['id'], 'project_id' => $project['id'])) ?>" title="<?= $this->text->e($file['name']) ?>" alt="<?= $this->text->e($file['name']) ?>"></a>
                 <div class="file-thumbnail-content">
                     <div class="file-thumbnail-title">
                         <div class="dropdown">
@@ -10,12 +10,12 @@
                             <ul>
                                 <li>
                                     <i class="fa fa-download fa-fw"></i>
-                                    <?= $this->url->link(t('Download'), 'FileViewer', 'download', array('project_id' => $project['id'], 'file_id' => $file['id'])) ?>
+                                    <?= $this->url->link(t('Download'), 'FileViewerController', 'download', array('project_id' => $project['id'], 'file_id' => $file['id'])) ?>
                                 </li>
-                                <?php if ($this->user->hasProjectAccess('ProjectFile', 'remove', $project['id'])): ?>
+                                <?php if ($this->user->hasProjectAccess('ProjectFileController', 'remove', $project['id'])): ?>
                                     <li>
                                         <i class="fa fa-trash fa-fw"></i>
-                                        <?= $this->url->link(t('Remove'), 'ProjectFile', 'confirm', array('project_id' => $project['id'], 'file_id' => $file['id']), false, 'popover') ?>
+                                        <?= $this->url->link(t('Remove'), 'ProjectFileController', 'confirm', array('project_id' => $project['id'], 'file_id' => $file['id']), false, 'popover') ?>
                                     </li>
                                 <?php endif ?>
                             </ul>
diff --git a/app/Template/project_overview/show.php b/app/Template/project_overview/show.php
index 6fe815b3..6b2bc2cf 100644
--- a/app/Template/project_overview/show.php
+++ b/app/Template/project_overview/show.php
@@ -1,5 +1,5 @@
 <section id="main">
-    <?= $this->projectHeader->render($project, 'ProjectOverview', 'show') ?>
+    <?= $this->projectHeader->render($project, 'ProjectOverviewController', 'show') ?>
     <?= $this->render('project_overview/columns', array('project' => $project)) ?>
     <?= $this->render('project_overview/description', array('project' => $project)) ?>
     <?= $this->render('project_overview/attachments', array('project' => $project, 'images' => $images, 'files' => $files)) ?>
diff --git a/app/Template/project_user/layout.php b/app/Template/project_user/layout.php
deleted file mode 100644
index ab4326f6..00000000
--- a/app/Template/project_user/layout.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <ul>
-            <li>
-                <i class="fa fa-folder fa-fw"></i>
-                <?= $this->url->link(t('Projects list'), 'ProjectListController', 'show') ?>
-            </li>
-            <?php if ($this->user->hasAccess('gantt', 'projects')): ?>
-                <li>
-                    <i class="fa fa-sliders fa-fw"></i>
-                    <?= $this->url->link(t('Projects Gantt chart'), 'gantt', 'projects') ?>
-                </li>
-            <?php endif ?>
-        </ul>
-    </div>
-    <section class="sidebar-container">
-
-        <?= $this->render($sidebar_template, array('users' => $users, 'filter' => $filter)) ?>
-
-        <div class="sidebar-content">
-            <div class="page-header">
-                <h2><?= $this->text->e($title) ?></h2>
-            </div>
-            <?= $content_for_sublayout ?>
-        </div>
-    </section>
-</section>
diff --git a/app/Template/project_user/roles.php b/app/Template/project_user/roles.php
deleted file mode 100644
index 6be929d8..00000000
--- a/app/Template/project_user/roles.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php if ($paginator->isEmpty()): ?>
-    <p class="alert"><?= t('No project') ?></p>
-<?php else: ?>
-    <table class="table-fixed">
-        <tr>
-            <th class="column-20"><?= $paginator->order(t('User'), 'users.username') ?></th>
-            <th class="column-25"><?= $paginator->order(t('Project'), 'projects.name') ?></th>
-            <th><?= t('Columns') ?></th>
-        </tr>
-        <?php foreach ($paginator->getCollection() as $project): ?>
-        <tr>
-            <td>
-                <?= $this->text->e($this->user->getFullname($project)) ?>
-            </td>
-            <td>
-                <?= $this->url->link('<i class="fa fa-th"></i>', 'board', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Board')) ?>
-                <?= $this->url->link('<i class="fa fa-sliders fa-fw"></i>', 'gantt', 'project', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Gantt chart')) ?>
-                <?= $this->url->link('<i class="fa fa-cog fa-fw"></i>', 'ProjectViewController', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Project settings')) ?>
-
-                <?= $this->text->e($project['project_name']) ?>
-            </td>
-            <td class="dashboard-project-stats">
-                <?php foreach ($project['columns'] as $column): ?>
-                    <strong title="<?= t('Task count') ?>"><?= $column['nb_tasks'] ?></strong>
-                    <span><?= $this->text->e($column['title']) ?></span>
-                <?php endforeach ?>
-            </td>
-        </tr>
-        <?php endforeach ?>
-    </table>
-
-    <?= $paginator ?>
-<?php endif ?>
diff --git a/app/Template/project_user/sidebar.php b/app/Template/project_user/sidebar.php
deleted file mode 100644
index f1cffcad..00000000
--- a/app/Template/project_user/sidebar.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<div class="sidebar">
-    <h2><?= t('Actions') ?></h2>
-
-    <?= $this->form->select(
-            'user_id',
-            $users,
-            $filter,
-            array(),
-            array('data-redirect-url="'.$this->url->href('projectuser', $this->app->getRouterAction(), array('user_id' => 'USER_ID')).'"', 'data-redirect-regex="USER_ID"'),
-            'chosen-select select-auto-redirect'
-        ) ?>
-
-    <br><br>
-    <ul>
-        <li <?= $this->app->checkMenuSelection('projectuser', 'managers') ?>>
-            <?= $this->url->link(t('Project managers'), 'projectuser', 'managers', $filter) ?>
-        </li>
-        <li <?= $this->app->checkMenuSelection('projectuser', 'members') ?>>
-            <?= $this->url->link(t('Project members'), 'projectuser', 'members', $filter) ?>
-        </li>
-        <li <?= $this->app->checkMenuSelection('projectuser', 'opens') ?>>
-            <?= $this->url->link(t('Open tasks'), 'projectuser', 'opens', $filter) ?>
-        </li>
-        <li <?= $this->app->checkMenuSelection('projectuser', 'closed') ?>>
-            <?= $this->url->link(t('Closed tasks'), 'projectuser', 'closed', $filter) ?>
-        </li>
-
-        <?= $this->hook->render('template:project-user:sidebar') ?>
-    </ul>
-</div>
diff --git a/app/Template/project_user/tasks.php b/app/Template/project_user/tasks.php
deleted file mode 100644
index d459c133..00000000
--- a/app/Template/project_user/tasks.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php if ($paginator->isEmpty()): ?>
-    <p class="alert"><?= t('No tasks found.') ?></p>
-<?php elseif (! $paginator->isEmpty()): ?>
-    <table class="table-small">
-        <tr>
-            <th class="column-5"><?= $paginator->order(t('Id'), 'tasks.id') ?></th>
-            <th class="column-10"><?= $paginator->order(t('Project'), 'projects.name') ?></th>
-            <th class="column-15"><?= $paginator->order(t('Column'), 'tasks.column_id') ?></th>
-            <th><?= $paginator->order(t('Title'), 'tasks.title') ?></th>
-            <th class="column-15"><?= $paginator->order(t('Assignee'), 'users.username') ?></th>
-            <th class="column-15"><?= $paginator->order(t('Start date'), 'tasks.date_started') ?></th>
-            <th class="column-15"><?= $paginator->order(t('Due date'), 'tasks.date_due') ?></th>
-        </tr>
-        <?php foreach ($paginator->getCollection() as $task): ?>
-        <tr>
-            <td class="task-table color-<?= $task['color_id'] ?>">
-                <?= $this->url->link('#'.$this->text->e($task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
-            </td>
-            <td>
-                <?= $this->url->link($this->text->e($task['project_name']), 'board', 'show', array('project_id' => $task['project_id'])) ?>
-            </td>
-            <td>
-                <?= $this->text->e($task['column_name']) ?>
-            </td>
-            <td>
-                <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
-            </td>
-            <td>
-                <?php if ($task['assignee_username']): ?>
-                    <?= $this->text->e($task['assignee_name'] ?: $task['assignee_username']) ?>
-                <?php else: ?>
-                    <?= t('Unassigned') ?>
-                <?php endif ?>
-            </td>
-            <td>
-                <?= $this->dt->date($task['date_started']) ?>
-            </td>
-            <td>
-                <?= $this->dt->date($task['date_due']) ?>
-            </td>
-        </tr>
-        <?php endforeach ?>
-    </table>
-
-    <?= $paginator ?>
-<?php endif ?>
diff --git a/app/Template/project_user/tooltip_users.php b/app/Template/project_user/tooltip_users.php
deleted file mode 100644
index 81300eaa..00000000
--- a/app/Template/project_user/tooltip_users.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php if (empty($users)): ?>
-    <p><?= t('There is no project member.') ?></p>
-<?php else: ?>
-    <table>
-    <?php foreach ($roles as $role => $role_name): ?>
-        <?php if (isset($users[$role])): ?>
-        <tr><th><?= $role_name ?></th></tr>
-            <?php foreach ($users[$role] as $user_id => $user): ?>
-                <tr><td>
-                <?= $this->url->link($this->text->e($user), 'Projectuser', 'opens', array('user_id' => $user_id)) ?>
-                </td></tr>
-            <?php endforeach ?>
-        <?php endif ?>
-    <?php endforeach ?>
-    </table>
-<?php endif ?>
diff --git a/app/Template/project_user_overview/layout.php b/app/Template/project_user_overview/layout.php
new file mode 100644
index 00000000..ab4326f6
--- /dev/null
+++ b/app/Template/project_user_overview/layout.php
@@ -0,0 +1,27 @@
+<section id="main">
+    <div class="page-header">
+        <ul>
+            <li>
+                <i class="fa fa-folder fa-fw"></i>
+                <?= $this->url->link(t('Projects list'), 'ProjectListController', 'show') ?>
+            </li>
+            <?php if ($this->user->hasAccess('gantt', 'projects')): ?>
+                <li>
+                    <i class="fa fa-sliders fa-fw"></i>
+                    <?= $this->url->link(t('Projects Gantt chart'), 'gantt', 'projects') ?>
+                </li>
+            <?php endif ?>
+        </ul>
+    </div>
+    <section class="sidebar-container">
+
+        <?= $this->render($sidebar_template, array('users' => $users, 'filter' => $filter)) ?>
+
+        <div class="sidebar-content">
+            <div class="page-header">
+                <h2><?= $this->text->e($title) ?></h2>
+            </div>
+            <?= $content_for_sublayout ?>
+        </div>
+    </section>
+</section>
diff --git a/app/Template/project_user_overview/roles.php b/app/Template/project_user_overview/roles.php
new file mode 100644
index 00000000..6be929d8
--- /dev/null
+++ b/app/Template/project_user_overview/roles.php
@@ -0,0 +1,33 @@
+<?php if ($paginator->isEmpty()): ?>
+    <p class="alert"><?= t('No project') ?></p>
+<?php else: ?>
+    <table class="table-fixed">
+        <tr>
+            <th class="column-20"><?= $paginator->order(t('User'), 'users.username') ?></th>
+            <th class="column-25"><?= $paginator->order(t('Project'), 'projects.name') ?></th>
+            <th><?= t('Columns') ?></th>
+        </tr>
+        <?php foreach ($paginator->getCollection() as $project): ?>
+        <tr>
+            <td>
+                <?= $this->text->e($this->user->getFullname($project)) ?>
+            </td>
+            <td>
+                <?= $this->url->link('<i class="fa fa-th"></i>', 'board', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Board')) ?>
+                <?= $this->url->link('<i class="fa fa-sliders fa-fw"></i>', 'gantt', 'project', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Gantt chart')) ?>
+                <?= $this->url->link('<i class="fa fa-cog fa-fw"></i>', 'ProjectViewController', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Project settings')) ?>
+
+                <?= $this->text->e($project['project_name']) ?>
+            </td>
+            <td class="dashboard-project-stats">
+                <?php foreach ($project['columns'] as $column): ?>
+                    <strong title="<?= t('Task count') ?>"><?= $column['nb_tasks'] ?></strong>
+                    <span><?= $this->text->e($column['title']) ?></span>
+                <?php endforeach ?>
+            </td>
+        </tr>
+        <?php endforeach ?>
+    </table>
+
+    <?= $paginator ?>
+<?php endif ?>
diff --git a/app/Template/project_user_overview/sidebar.php b/app/Template/project_user_overview/sidebar.php
new file mode 100644
index 00000000..9a87d4eb
--- /dev/null
+++ b/app/Template/project_user_overview/sidebar.php
@@ -0,0 +1,30 @@
+<div class="sidebar">
+    <h2><?= t('Actions') ?></h2>
+
+    <?= $this->form->select(
+            'user_id',
+            $users,
+            $filter,
+            array(),
+            array('data-redirect-url="'.$this->url->href('ProjectUserOverviewController', $this->app->getRouterAction(), array('user_id' => 'USER_ID')).'"', 'data-redirect-regex="USER_ID"'),
+            'chosen-select select-auto-redirect'
+        ) ?>
+
+    <br><br>
+    <ul>
+        <li <?= $this->app->checkMenuSelection('ProjectUserOverviewController', 'managers') ?>>
+            <?= $this->url->link(t('Project managers'), 'ProjectUserOverviewController', 'managers', $filter) ?>
+        </li>
+        <li <?= $this->app->checkMenuSelection('ProjectUserOverviewController', 'members') ?>>
+            <?= $this->url->link(t('Project members'), 'ProjectUserOverviewController', 'members', $filter) ?>
+        </li>
+        <li <?= $this->app->checkMenuSelection('ProjectUserOverviewController', 'opens') ?>>
+            <?= $this->url->link(t('Open tasks'), 'ProjectUserOverviewController', 'opens', $filter) ?>
+        </li>
+        <li <?= $this->app->checkMenuSelection('ProjectUserOverviewController', 'closed') ?>>
+            <?= $this->url->link(t('Closed tasks'), 'ProjectUserOverviewController', 'closed', $filter) ?>
+        </li>
+
+        <?= $this->hook->render('template:project-user:sidebar') ?>
+    </ul>
+</div>
diff --git a/app/Template/project_user_overview/tasks.php b/app/Template/project_user_overview/tasks.php
new file mode 100644
index 00000000..d459c133
--- /dev/null
+++ b/app/Template/project_user_overview/tasks.php
@@ -0,0 +1,46 @@
+<?php if ($paginator->isEmpty()): ?>
+    <p class="alert"><?= t('No tasks found.') ?></p>
+<?php elseif (! $paginator->isEmpty()): ?>
+    <table class="table-small">
+        <tr>
+            <th class="column-5"><?= $paginator->order(t('Id'), 'tasks.id') ?></th>
+            <th class="column-10"><?= $paginator->order(t('Project'), 'projects.name') ?></th>
+            <th class="column-15"><?= $paginator->order(t('Column'), 'tasks.column_id') ?></th>
+            <th><?= $paginator->order(t('Title'), 'tasks.title') ?></th>
+            <th class="column-15"><?= $paginator->order(t('Assignee'), 'users.username') ?></th>
+            <th class="column-15"><?= $paginator->order(t('Start date'), 'tasks.date_started') ?></th>
+            <th class="column-15"><?= $paginator->order(t('Due date'), 'tasks.date_due') ?></th>
+        </tr>
+        <?php foreach ($paginator->getCollection() as $task): ?>
+        <tr>
+            <td class="task-table color-<?= $task['color_id'] ?>">
+                <?= $this->url->link('#'.$this->text->e($task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+            </td>
+            <td>
+                <?= $this->url->link($this->text->e($task['project_name']), 'board', 'show', array('project_id' => $task['project_id'])) ?>
+            </td>
+            <td>
+                <?= $this->text->e($task['column_name']) ?>
+            </td>
+            <td>
+                <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+            </td>
+            <td>
+                <?php if ($task['assignee_username']): ?>
+                    <?= $this->text->e($task['assignee_name'] ?: $task['assignee_username']) ?>
+                <?php else: ?>
+                    <?= t('Unassigned') ?>
+                <?php endif ?>
+            </td>
+            <td>
+                <?= $this->dt->date($task['date_started']) ?>
+            </td>
+            <td>
+                <?= $this->dt->date($task['date_due']) ?>
+            </td>
+        </tr>
+        <?php endforeach ?>
+    </table>
+
+    <?= $paginator ?>
+<?php endif ?>
diff --git a/app/Template/project_user_overview/tooltip_users.php b/app/Template/project_user_overview/tooltip_users.php
new file mode 100644
index 00000000..7117a87f
--- /dev/null
+++ b/app/Template/project_user_overview/tooltip_users.php
@@ -0,0 +1,16 @@
+<?php if (empty($users)): ?>
+    <p><?= t('There is no project member.') ?></p>
+<?php else: ?>
+    <table>
+    <?php foreach ($roles as $role => $role_name): ?>
+        <?php if (isset($users[$role])): ?>
+        <tr><th><?= $role_name ?></th></tr>
+            <?php foreach ($users[$role] as $user_id => $user): ?>
+                <tr><td>
+                <?= $this->url->link($this->text->e($user), 'ProjectUserOverviewController', 'opens', array('user_id' => $user_id)) ?>
+                </td></tr>
+            <?php endforeach ?>
+        <?php endif ?>
+    <?php endforeach ?>
+    </table>
+<?php endif ?>
diff --git a/app/Template/project_view/show.php b/app/Template/project_view/show.php
index 3a0d7f03..b03e0dd8 100644
--- a/app/Template/project_view/show.php
+++ b/app/Template/project_view/show.php
@@ -39,7 +39,7 @@
         <?php endif ?>
 
         <?php if ($stats['nb_inactive_tasks'] > 0): ?>
-            <li><?= $this->url->link(t('%d closed tasks', $stats['nb_inactive_tasks']), 'listing', 'show', array('project_id' => $project['id'], 'search' => 'status:closed')) ?></li>
+            <li><?= $this->url->link(t('%d closed tasks', $stats['nb_inactive_tasks']), 'TaskListController', 'show', array('project_id' => $project['id'], 'search' => 'status:closed')) ?></li>
         <?php endif ?>
 
         <li><?= t('%d tasks in total', $stats['nb_tasks']) ?></li>
diff --git a/app/Template/swimlane/create.php b/app/Template/swimlane/create.php
index a9b4374b..f5aa1591 100644
--- a/app/Template/swimlane/create.php
+++ b/app/Template/swimlane/create.php
@@ -1,7 +1,7 @@
 <div class="page-header">
     <h2><?= t('Add a new swimlane') ?></h2>
 </div>
-<form class="popover-form" method="post" action="<?= $this->url->href('swimlane', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
+<form class="popover-form" method="post" action="<?= $this->url->href('SwimlaneController', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('project_id', $values) ?>
@@ -15,6 +15,6 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'Swimlane', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'SwimlaneController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
 </form>
diff --git a/app/Template/swimlane/edit.php b/app/Template/swimlane/edit.php
index b08099ae..b10cdd52 100644
--- a/app/Template/swimlane/edit.php
+++ b/app/Template/swimlane/edit.php
@@ -2,7 +2,7 @@
     <h2><?= t('Swimlane modification for the project "%s"', $project['name']) ?></h2>
 </div>
 
-<form class="popover-form" method="post" action="<?= $this->url->href('swimlane', 'update', array('project_id' => $project['id'], 'swimlane_id' => $values['id'])) ?>" autocomplete="off">
+<form class="popover-form" method="post" action="<?= $this->url->href('SwimlaneController', 'update', array('project_id' => $project['id'], 'swimlane_id' => $values['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
@@ -18,6 +18,6 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'swimlane', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'SwimlaneController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/Template/swimlane/edit_default.php b/app/Template/swimlane/edit_default.php
index 3bf82568..f271c513 100644
--- a/app/Template/swimlane/edit_default.php
+++ b/app/Template/swimlane/edit_default.php
@@ -1,7 +1,7 @@
 <div class="page-header">
     <h2><?= t('Change default swimlane') ?></h2>
 </div>
-<form class="popover-form" method="post" action="<?= $this->url->href('swimlane', 'updateDefault', array('project_id' => $project['id'])) ?>" autocomplete="off">
+<form class="popover-form" method="post" action="<?= $this->url->href('SwimlaneController', 'updateDefault', array('project_id' => $project['id'])) ?>" autocomplete="off">
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('id', $values) ?>
 
@@ -13,6 +13,6 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'Swimlane', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'SwimlaneController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
 </form>
diff --git a/app/Template/swimlane/index.php b/app/Template/swimlane/index.php
index fad35306..4f78a405 100644
--- a/app/Template/swimlane/index.php
+++ b/app/Template/swimlane/index.php
@@ -3,7 +3,7 @@
     <ul>
         <li>
             <i class="fa fa-plus fa-fw"></i>
-            <?= $this->url->link(t('Add a new swimlane'), 'Swimlane', 'create', array('project_id' => $project['id']), false, 'popover') ?>
+            <?= $this->url->link(t('Add a new swimlane'), 'SwimlaneController', 'create', array('project_id' => $project['id']), false, 'popover') ?>
         </li>
     </ul>
 </div>
diff --git a/app/Template/swimlane/remove.php b/app/Template/swimlane/remove.php
index 9be39ff8..f16b778c 100644
--- a/app/Template/swimlane/remove.php
+++ b/app/Template/swimlane/remove.php
@@ -9,9 +9,9 @@
         </p>
 
         <div class="form-actions">
-            <?= $this->url->link(t('Yes'), 'swimlane', 'remove', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true, 'btn btn-red') ?>
+            <?= $this->url->link(t('Yes'), 'SwimlaneController', 'remove', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true, 'btn btn-red') ?>
             <?= t('or') ?>
-            <?= $this->url->link(t('cancel'), 'swimlane', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
+            <?= $this->url->link(t('cancel'), 'SwimlaneController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
         </div>
     </div>
-</section>
\ No newline at end of file
+</section>
diff --git a/app/Template/swimlane/table.php b/app/Template/swimlane/table.php
index ec3cb621..be123b08 100644
--- a/app/Template/swimlane/table.php
+++ b/app/Template/swimlane/table.php
@@ -1,6 +1,6 @@
 <table
     class="swimlanes-table table-stripped"
-    data-save-position-url="<?= $this->url->href('Swimlane', 'move', array('project_id' => $project['id'])) ?>">
+    data-save-position-url="<?= $this->url->href('SwimlaneController', 'move', array('project_id' => $project['id'])) ?>">
     <thead>
         <tr>
             <th><?= t('Name') ?></th>
@@ -20,13 +20,13 @@
                 <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog fa-fw"></i><i class="fa fa-caret-down"></i></a>
                 <ul>
                     <li>
-                        <?= $this->url->link(t('Edit'), 'Swimlane', 'editDefault', array('project_id' => $project['id']), false, 'popover') ?>
+                        <?= $this->url->link(t('Edit'), 'SwimlaneController', 'editDefault', array('project_id' => $project['id']), false, 'popover') ?>
                     </li>
                     <li>
                         <?php if ($default_swimlane['show_default_swimlane'] == 1): ?>
-                            <?= $this->url->link(t('Disable'), 'Swimlane', 'disableDefault', array('project_id' => $project['id']), true) ?>
+                            <?= $this->url->link(t('Disable'), 'SwimlaneController', 'disableDefault', array('project_id' => $project['id']), true) ?>
                         <?php else: ?>
-                            <?= $this->url->link(t('Enable'), 'Swimlane', 'enableDefault', array('project_id' => $project['id']), true) ?>
+                            <?= $this->url->link(t('Enable'), 'SwimlaneController', 'enableDefault', array('project_id' => $project['id']), true) ?>
                         <?php endif ?>
                     </li>
                 </ul>
@@ -55,17 +55,17 @@
                 <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog fa-fw"></i><i class="fa fa-caret-down"></i></a>
                 <ul>
                     <li>
-                        <?= $this->url->link(t('Edit'), 'swimlane', 'edit', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?>
+                        <?= $this->url->link(t('Edit'), 'SwimlaneController', 'edit', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?>
                     </li>
                     <li>
                         <?php if ($swimlane['is_active']): ?>
-                            <?= $this->url->link(t('Disable'), 'swimlane', 'disable', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true) ?>
+                            <?= $this->url->link(t('Disable'), 'SwimlaneController', 'disable', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true) ?>
                         <?php else: ?>
-                            <?= $this->url->link(t('Enable'), 'swimlane', 'enable', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true) ?>
+                            <?= $this->url->link(t('Enable'), 'SwimlaneController', 'enable', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true) ?>
                         <?php endif ?>
                     </li>
                     <li>
-                        <?= $this->url->link(t('Remove'), 'swimlane', 'confirm', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?>
+                        <?= $this->url->link(t('Remove'), 'SwimlaneController', 'confirm', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?>
                     </li>
                 </ul>
                 </div>
diff --git a/app/Template/task/dropdown.php b/app/Template/task/dropdown.php
index 6f887c0a..472c819f 100644
--- a/app/Template/task/dropdown.php
+++ b/app/Template/task/dropdown.php
@@ -33,11 +33,11 @@
         </li>
         <li>
             <i class="fa fa-external-link fa-fw"></i>
-            <?= $this->url->link(t('Add external link'), 'TaskExternalLink', 'find', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Add external link'), 'TaskExternalLinkController', 'find', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-comment-o fa-fw"></i>
-            <?= $this->url->link(t('Add a comment'), 'comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Add a comment'), 'CommentController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-camera fa-fw"></i>
@@ -45,15 +45,15 @@
         </li>
         <li>
             <i class="fa fa-files-o fa-fw"></i>
-            <?= $this->url->link(t('Duplicate'), 'taskduplication', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Duplicate'), 'TaskDuplicationController', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-clipboard fa-fw"></i>
-            <?= $this->url->link(t('Duplicate to another project'), 'taskduplication', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Duplicate to another project'), 'TaskDuplicationController', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-clone fa-fw"></i>
-            <?= $this->url->link(t('Move to another project'), 'taskduplication', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Move to another project'), 'TaskDuplicationController', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <?php if ($this->user->canRemoveTask($task)): ?>
             <li>
diff --git a/app/Template/task/layout.php b/app/Template/task/layout.php
index 0a755617..00e0e9ae 100644
--- a/app/Template/task/layout.php
+++ b/app/Template/task/layout.php
@@ -1,5 +1,5 @@
 <section id="main">
-    <?= $this->projectHeader->render($project, 'Listing', 'show') ?>
+    <?= $this->projectHeader->render($project, 'TaskListController', 'show') ?>
     <?= $this->hook->render('template:task:layout:top', array('task' => $task)) ?>
     <section
         class="sidebar-container" id="task-view"
@@ -7,7 +7,7 @@
         data-description-url="<?= $this->url->href('TaskModificationController', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"
         data-subtask-url="<?= $this->url->href('SubtaskController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"
         data-internal-link-url="<?= $this->url->href('TaskInternalLinkController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"
-        data-comment-url="<?= $this->url->href('comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
+        data-comment-url="<?= $this->url->href('CommentController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
 
         <?= $this->render($sidebar_template, array('task' => $task)) ?>
 
diff --git a/app/Template/task/show.php b/app/Template/task/show.php
index b79903b4..2b54eea8 100644
--- a/app/Template/task/show.php
+++ b/app/Template/task/show.php
@@ -46,7 +46,7 @@
     'task' => $task,
     'comments' => $comments,
     'project' => $project,
-    'editable' => $this->user->hasProjectAccess('comment', 'edit', $project['id']),
+    'editable' => $this->user->hasProjectAccess('CommentController', 'edit', $project['id']),
 )) ?>
 
 <?= $this->hook->render('template:task:show:bottom', array('task' => $task, 'project' => $project)) ?>
diff --git a/app/Template/task/sidebar.php b/app/Template/task/sidebar.php
index a8e8ba09..ff3883e1 100644
--- a/app/Template/task/sidebar.php
+++ b/app/Template/task/sidebar.php
@@ -5,9 +5,9 @@
             <i class="fa fa-newspaper-o fa-fw"></i>
             <?= $this->url->link(t('Summary'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
         </li>
-        <li <?= $this->app->checkMenuSelection('activity', 'task') ?>>
+        <li <?= $this->app->checkMenuSelection('ActivityController', 'task') ?>>
             <i class="fa fa-dashboard fa-fw"></i>
-            <?= $this->url->link(t('Activity stream'), 'activity', 'task', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->url->link(t('Activity stream'), 'ActivityController', 'task', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
         </li>
         <li <?= $this->app->checkMenuSelection('TaskViewController', 'transitions') ?>>
             <i class="fa fa-arrows-h fa-fw"></i>
@@ -52,31 +52,31 @@
         </li>
         <li>
             <i class="fa fa-external-link fa-fw"></i>
-            <?= $this->url->link(t('Add external link'), 'TaskExternalLink', 'find', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Add external link'), 'TaskExternalLinkController', 'find', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-comment-o fa-fw"></i>
-            <?= $this->url->link(t('Add a comment'), 'comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Add a comment'), 'CommentController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-file fa-fw"></i>
-            <?= $this->url->link(t('Attach a document'), 'TaskFile', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Attach a document'), 'TaskFileController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-camera fa-fw"></i>
-            <?= $this->url->link(t('Add a screenshot'), 'TaskFile', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Add a screenshot'), 'TaskFileController', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-files-o fa-fw"></i>
-            <?= $this->url->link(t('Duplicate'), 'taskduplication', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Duplicate'), 'TaskDuplicationController', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-clipboard fa-fw"></i>
-            <?= $this->url->link(t('Duplicate to another project'), 'taskduplication', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Duplicate to another project'), 'TaskDuplicationController', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-clone fa-fw"></i>
-            <?= $this->url->link(t('Move to another project'), 'taskduplication', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Move to another project'), 'TaskDuplicationController', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <?php if ($task['is_active'] == 1): ?>
diff --git a/app/Template/task_duplication/copy.php b/app/Template/task_duplication/copy.php
index f7215f3d..58b4d837 100644
--- a/app/Template/task_duplication/copy.php
+++ b/app/Template/task_duplication/copy.php
@@ -6,7 +6,7 @@
     <p class="alert"><?= t('There is no destination project available.') ?></p>
 <?php else: ?>
 
-    <form class="popover-form" method="post" action="<?= $this->url->href('taskduplication', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
+    <form class="popover-form" method="post" action="<?= $this->url->href('TaskDuplicationController', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
 
         <?= $this->form->csrf() ?>
         <?= $this->form->hidden('id', $values) ?>
@@ -17,7 +17,7 @@
             $projects_list,
             $values,
             array(),
-            array('data-redirect="'.$this->url->href('taskduplication', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'dst_project_id' => 'PROJECT_ID')).'"'),
+            array('data-redirect="'.$this->url->href('TaskDuplicationController', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'dst_project_id' => 'PROJECT_ID')).'"'),
             'task-reload-project-destination'
         ) ?>
         <span class="loading-icon" style="display: none">&nbsp;<i class="fa fa-spinner fa-spin"></i></span>
diff --git a/app/Template/task_duplication/duplicate.php b/app/Template/task_duplication/duplicate.php
index 1be6b706..c0baf94e 100644
--- a/app/Template/task_duplication/duplicate.php
+++ b/app/Template/task_duplication/duplicate.php
@@ -8,7 +8,7 @@
     </p>
 
     <div class="form-actions">
-        <?= $this->url->link(t('Yes'), 'taskduplication', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red') ?>
+        <?= $this->url->link(t('Yes'), 'TaskDuplicationController', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red') ?>
         <?= t('or') ?>
         <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
diff --git a/app/Template/task_duplication/move.php b/app/Template/task_duplication/move.php
index 50b29363..8f01c4b9 100644
--- a/app/Template/task_duplication/move.php
+++ b/app/Template/task_duplication/move.php
@@ -6,7 +6,7 @@
     <p class="alert"><?= t('There is no destination project available.') ?></p>
 <?php else: ?>
 
-    <form class="popover-form" method="post" action="<?= $this->url->href('taskduplication', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
+    <form class="popover-form" method="post" action="<?= $this->url->href('TaskDuplicationController', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
 
         <?= $this->form->csrf() ?>
         <?= $this->form->hidden('id', $values) ?>
@@ -17,7 +17,7 @@
             $projects_list,
             $values,
             array(),
-            array('data-redirect="'.$this->url->href('taskduplication', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'dst_project_id' => 'PROJECT_ID')).'"'),
+            array('data-redirect="'.$this->url->href('TaskDuplicationController', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'dst_project_id' => 'PROJECT_ID')).'"'),
             'task-reload-project-destination'
         ) ?>
         <span class="loading-icon" style="display: none">&nbsp;<i class="fa fa-spinner fa-spin"></i></span>
diff --git a/app/Template/task_external_link/create.php b/app/Template/task_external_link/create.php
index 5d49eef0..beddfc90 100644
--- a/app/Template/task_external_link/create.php
+++ b/app/Template/task_external_link/create.php
@@ -2,12 +2,12 @@
     <h2><?= t('Add a new external link') ?></h2>
 </div>
 
-<form class="popover-form" action="<?= $this->url->href('TaskExternalLink', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off">
+<form class="popover-form" action="<?= $this->url->href('TaskExternalLinkController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off">
     <?= $this->render('task_external_link/form', array('task' => $task, 'dependencies' => $dependencies, 'values' => $values, 'errors' => $errors)) ?>
 
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'TaskExternalLink', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'TaskExternalLinkController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/Template/task_external_link/edit.php b/app/Template/task_external_link/edit.php
index dcbc2633..917a28b9 100644
--- a/app/Template/task_external_link/edit.php
+++ b/app/Template/task_external_link/edit.php
@@ -2,12 +2,12 @@
     <h2><?= t('Edit external link') ?></h2>
 </div>
 
-<form class="popover-form" action="<?= $this->url->href('TaskExternalLink', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off">
+<form class="popover-form" action="<?= $this->url->href('TaskExternalLinkController', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off">
     <?= $this->render('task_external_link/form', array('task' => $task, 'dependencies' => $dependencies, 'values' => $values, 'errors' => $errors)) ?>
 
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'TaskExternalLink', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'TaskExternalLinkController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/Template/task_external_link/find.php b/app/Template/task_external_link/find.php
index 09843d2f..a88b29ce 100644
--- a/app/Template/task_external_link/find.php
+++ b/app/Template/task_external_link/find.php
@@ -2,7 +2,7 @@
     <h2><?= t('Add a new external link') ?></h2>
 </div>
 
-<form class="popover-form" action="<?= $this->url->href('TaskExternalLink', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off">
+<form class="popover-form" action="<?= $this->url->href('TaskExternalLinkController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off">
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('task_id', array('task_id' => $task['id'])) ?>
 
diff --git a/app/Template/task_external_link/remove.php b/app/Template/task_external_link/remove.php
index 01535255..2a888a60 100644
--- a/app/Template/task_external_link/remove.php
+++ b/app/Template/task_external_link/remove.php
@@ -8,8 +8,8 @@
     </p>
 
     <div class="form-actions">
-        <?= $this->url->link(t('Yes'), 'TaskExternalLink', 'remove', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), true, 'btn btn-red') ?>
+        <?= $this->url->link(t('Yes'), 'TaskExternalLinkController', 'remove', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), true, 'btn btn-red') ?>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'TaskExternalLink', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'TaskExternalLinkController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/Template/task_external_link/table.php b/app/Template/task_external_link/table.php
index 1f32f4dd..56ef0363 100644
--- a/app/Template/task_external_link/table.php
+++ b/app/Template/task_external_link/table.php
@@ -6,7 +6,7 @@
         <th class="column-10"><?= t('Dependency') ?></th>
         <th class="column-15"><?= t('Creator') ?></th>
         <th class="column-15"><?= t('Date') ?></th>
-        <?php if ($this->user->hasProjectAccess('TaskExternalLink', 'edit', $task['project_id'])): ?>
+        <?php if ($this->user->hasProjectAccess('TaskExternalLinkController', 'edit', $task['project_id'])): ?>
             <th class="column-5"><?= t('Action') ?></th>
         <?php endif ?>
     </tr>
@@ -27,13 +27,13 @@
             <td>
                 <?= $this->dt->date($link['date_creation']) ?>
             </td>
-            <?php if ($this->user->hasProjectAccess('TaskExternalLink', 'edit', $task['project_id'])): ?>
+            <?php if ($this->user->hasProjectAccess('TaskExternalLinkController', 'edit', $task['project_id'])): ?>
                 <td>
                     <div class="dropdown">
                         <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog fa-fw"></i><i class="fa fa-caret-down"></i></a>
                         <ul>
-                            <li><?= $this->url->link(t('Edit'), 'TaskExternalLink', 'edit', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li>
-                            <li><?= $this->url->link(t('Remove'), 'TaskExternalLink', 'confirm', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li>
+                            <li><?= $this->url->link(t('Edit'), 'TaskExternalLinkController', 'edit', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li>
+                            <li><?= $this->url->link(t('Remove'), 'TaskExternalLinkController', 'confirm', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li>
                         </ul>
                     </div>
                 </td>
diff --git a/app/Template/task_file/create.php b/app/Template/task_file/create.php
index e3bbfa2b..e05cf829 100644
--- a/app/Template/task_file/create.php
+++ b/app/Template/task_file/create.php
@@ -18,7 +18,7 @@
 <div
     id="file-dropzone"
     data-max-size="<?= $max_size ?>"
-    data-url="<?= $this->url->href('TaskFile', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
+    data-url="<?= $this->url->href('TaskFileController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
     <div id="file-dropzone-inner">
         <?= t('Drag and drop your files here') ?> <?= t('or') ?> <a href="#" id="file-browser"><?= t('choose files') ?></a>
     </div>
diff --git a/app/Template/task_file/files.php b/app/Template/task_file/files.php
index 5603014e..7ca59b1c 100644
--- a/app/Template/task_file/files.php
+++ b/app/Template/task_file/files.php
@@ -16,17 +16,17 @@
                             <?php if ($this->file->getPreviewType($file['name']) !== null): ?>
                                 <li>
                                     <i class="fa fa-eye fa-fw"></i>
-                                    <?= $this->url->link(t('View file'), 'FileViewer', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
+                                    <?= $this->url->link(t('View file'), 'FileViewerController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
                                 </li>
                             <?php endif ?>
                             <li>
                                 <i class="fa fa-download fa-fw"></i>
-                                <?= $this->url->link(t('Download'), 'FileViewer', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
+                                <?= $this->url->link(t('Download'), 'FileViewerController', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
                             </li>
-                            <?php if ($this->user->hasProjectAccess('TaskFile', 'remove', $task['project_id'])): ?>
+                            <?php if ($this->user->hasProjectAccess('TaskFileController', 'remove', $task['project_id'])): ?>
                                 <li>
                                     <i class="fa fa-trash fa-fw"></i>
-                                    <?= $this->url->link(t('Remove'), 'TaskFile', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
+                                    <?= $this->url->link(t('Remove'), 'TaskFileController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
                                 </li>
                             <?php endif ?>
                         </ul>
@@ -44,4 +44,4 @@
             </tr>
         <?php endforeach ?>
     </table>
-<?php endif ?>
\ No newline at end of file
+<?php endif ?>
diff --git a/app/Template/task_file/images.php b/app/Template/task_file/images.php
index 55c098cb..81c33151 100644
--- a/app/Template/task_file/images.php
+++ b/app/Template/task_file/images.php
@@ -2,7 +2,7 @@
     <div class="file-thumbnails">
         <?php foreach ($images as $file): ?>
             <div class="file-thumbnail">
-                <a href="<?= $this->url->href('FileViewer', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>" class="popover"><img src="<?= $this->url->href('FileViewer', 'thumbnail', array('file_id' => $file['id'], 'project_id' => $task['project_id'], 'task_id' => $file['task_id'])) ?>" title="<?= $this->text->e($file['name']) ?>" alt="<?= $this->text->e($file['name']) ?>"></a>
+                <a href="<?= $this->url->href('FileViewerController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>" class="popover"><img src="<?= $this->url->href('FileViewerController', 'thumbnail', array('file_id' => $file['id'], 'project_id' => $task['project_id'], 'task_id' => $file['task_id'])) ?>" title="<?= $this->text->e($file['name']) ?>" alt="<?= $this->text->e($file['name']) ?>"></a>
                 <div class="file-thumbnail-content">
                     <div class="file-thumbnail-title">
                         <div class="dropdown">
@@ -10,12 +10,12 @@
                             <ul>
                                 <li>
                                     <i class="fa fa-download fa-fw"></i>
-                                    <?= $this->url->link(t('Download'), 'FileViewer', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
+                                    <?= $this->url->link(t('Download'), 'FileViewerController', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
                                 </li>
-                                <?php if ($this->user->hasProjectAccess('TaskFile', 'remove', $task['project_id'])): ?>
+                                <?php if ($this->user->hasProjectAccess('TaskFileController', 'remove', $task['project_id'])): ?>
                                     <li>
                                         <i class="fa fa-trash fa-fw"></i>
-                                        <?= $this->url->link(t('Remove'), 'TaskFile', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
+                                        <?= $this->url->link(t('Remove'), 'TaskFileController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
                                     </li>
                                 <?php endif ?>
                             </ul>
@@ -31,4 +31,4 @@
             </div>
         <?php endforeach ?>
     </div>
-<?php endif ?>
\ No newline at end of file
+<?php endif ?>
diff --git a/app/Template/task_file/remove.php b/app/Template/task_file/remove.php
index 5097c66a..42894f05 100644
--- a/app/Template/task_file/remove.php
+++ b/app/Template/task_file/remove.php
@@ -8,7 +8,7 @@
     </p>
 
     <div class="form-actions">
-        <?= $this->url->link(t('Yes'), 'TaskFile', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), true, 'btn btn-red') ?>
+        <?= $this->url->link(t('Yes'), 'TaskFileController', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), true, 'btn btn-red') ?>
         <?= t('or') ?>
         <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
diff --git a/app/Template/task_file/screenshot.php b/app/Template/task_file/screenshot.php
index 75958db1..6300159f 100644
--- a/app/Template/task_file/screenshot.php
+++ b/app/Template/task_file/screenshot.php
@@ -6,7 +6,7 @@
     <p id="screenshot-inner"><?= t('Take a screenshot and press CTRL+V or ⌘+V to paste here.') ?></p>
 </div>
 
-<form class="popover-form" action="<?= $this->url->href('TaskFile', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post">
+<form class="popover-form" action="<?= $this->url->href('TaskFileController', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post">
     <input type="hidden" name="screenshot"/>
     <?= $this->form->csrf() ?>
     <div class="form-actions">
diff --git a/app/Template/task_list/show.php b/app/Template/task_list/show.php
new file mode 100644
index 00000000..9ffcb2e8
--- /dev/null
+++ b/app/Template/task_list/show.php
@@ -0,0 +1,62 @@
+<section id="main">
+    <?= $this->projectHeader->render($project, 'TaskListController', 'show') ?>
+
+    <?php if ($paginator->isEmpty()): ?>
+        <p class="alert"><?= t('No tasks found.') ?></p>
+    <?php elseif (! $paginator->isEmpty()): ?>
+        <table class="table-fixed table-small">
+            <tr>
+                <th class="column-5"><?= $paginator->order(t('Id'), 'tasks.id') ?></th>
+                <th class="column-10"><?= $paginator->order(t('Swimlane'), 'tasks.swimlane_id') ?></th>
+                <th class="column-10"><?= $paginator->order(t('Column'), 'tasks.column_id') ?></th>
+                <th class="column-10"><?= $paginator->order(t('Category'), 'tasks.category_id') ?></th>
+                <th><?= $paginator->order(t('Title'), 'tasks.title') ?></th>
+                <th class="column-10"><?= $paginator->order(t('Assignee'), 'users.username') ?></th>
+                <th class="column-10"><?= $paginator->order(t('Due date'), 'tasks.date_due') ?></th>
+                <th class="column-5"><?= $paginator->order(t('Status'), 'tasks.is_active') ?></th>
+            </tr>
+            <?php foreach ($paginator->getCollection() as $task): ?>
+            <tr>
+                <td class="task-table color-<?= $task['color_id'] ?>">
+                    <?php if ($this->user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?>
+                        <?= $this->render('task/dropdown', array('task' => $task)) ?>
+                    <?php else: ?>
+                        #<?= $task['id'] ?>
+                    <?php endif ?>
+                </td>
+                <td>
+                    <?= $this->text->e($task['swimlane_name'] ?: $task['default_swimlane']) ?>
+                </td>
+                <td>
+                    <?= $this->text->e($task['column_name']) ?>
+                </td>
+                <td>
+                    <?= $this->text->e($task['category_name']) ?>
+                </td>
+                <td>
+                    <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+                </td>
+                <td>
+                    <?php if ($task['assignee_username']): ?>
+                        <?= $this->text->e($task['assignee_name'] ?: $task['assignee_username']) ?>
+                    <?php else: ?>
+                        <?= t('Unassigned') ?>
+                    <?php endif ?>
+                </td>
+                <td>
+                    <?= $this->dt->date($task['date_due']) ?>
+                </td>
+                <td>
+                    <?php if ($task['is_active'] == \Kanboard\Model\Task::STATUS_OPEN): ?>
+                        <?= t('Open') ?>
+                    <?php else: ?>
+                        <?= t('Closed') ?>
+                    <?php endif ?>
+                </td>
+            </tr>
+            <?php endforeach ?>
+        </table>
+
+        <?= $paginator ?>
+    <?php endif ?>
+</section>
-- 
cgit v1.2.3