diff --git a/ChangeLog b/ChangeLog
index 7b054099e..f43d97a1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 Version 1.0.20 (unreleased)
 ---------------------------
 
+Breaking changes:
+
+- Add namespace Kanboard
+
 New features:
 
 * Add CSV import for users and tasks
diff --git a/app/Action/Base.php b/app/Action/Base.php
index c8ff02a4e..4d2d6da69 100644
--- a/app/Action/Base.php
+++ b/app/Action/Base.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Action;
+namespace Kanboard\Action;
 
-use Event\GenericEvent;
+use Kanboard\Event\GenericEvent;
 use Pimple\Container;
 
 /**
@@ -11,7 +11,7 @@ use Pimple\Container;
  * @package action
  * @author  Frederic Guillot
  */
-abstract class Base extends \Core\Base
+abstract class Base extends \Kanboard\Core\Base
 {
     /**
      * Flag for called listener
diff --git a/app/Action/CommentCreation.php b/app/Action/CommentCreation.php
index 4029c8753..73fedc3b7 100644
--- a/app/Action/CommentCreation.php
+++ b/app/Action/CommentCreation.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Action;
+namespace Kanboard\Action;
 
-use Integration\BitbucketWebhook;
-use Integration\GithubWebhook;
-use Integration\GitlabWebhook;
+use Kanboard\Integration\BitbucketWebhook;
+use Kanboard\Integration\GithubWebhook;
+use Kanboard\Integration\GitlabWebhook;
 
 /**
  * Create automatically a comment from a webhook
diff --git a/app/Action/TaskAssignCategoryColor.php b/app/Action/TaskAssignCategoryColor.php
index ba319a1f3..ffa1ac2a7 100644
--- a/app/Action/TaskAssignCategoryColor.php
+++ b/app/Action/TaskAssignCategoryColor.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Action;
+namespace Kanboard\Action;
 
-use Model\Task;
+use Kanboard\Model\Task;
 
 /**
  * Set a category automatically according to the color
diff --git a/app/Action/TaskAssignCategoryLabel.php b/app/Action/TaskAssignCategoryLabel.php
index 1383d4919..0ef474b64 100644
--- a/app/Action/TaskAssignCategoryLabel.php
+++ b/app/Action/TaskAssignCategoryLabel.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Action;
+namespace Kanboard\Action;
 
-use Integration\GithubWebhook;
+use Kanboard\Integration\GithubWebhook;
 
 /**
  * Set a category automatically according to a label
diff --git a/app/Action/TaskAssignColorCategory.php b/app/Action/TaskAssignColorCategory.php
index a362c68fa..a2332f78d 100644
--- a/app/Action/TaskAssignColorCategory.php
+++ b/app/Action/TaskAssignColorCategory.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Action;
+namespace Kanboard\Action;
 
-use Model\Task;
+use Kanboard\Model\Task;
 
 /**
  * Assign a color to a specific category
diff --git a/app/Action/TaskAssignColorColumn.php b/app/Action/TaskAssignColorColumn.php
index deb3e2b01..531407334 100644
--- a/app/Action/TaskAssignColorColumn.php
+++ b/app/Action/TaskAssignColorColumn.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Action;
+namespace Kanboard\Action;
 
-use Model\Task;
+use Kanboard\Model\Task;
 
 /**
  * Assign a color to a task
diff --git a/app/Action/TaskAssignColorLink.php b/app/Action/TaskAssignColorLink.php
index d055f2251..67b2ef62c 100644
--- a/app/Action/TaskAssignColorLink.php
+++ b/app/Action/TaskAssignColorLink.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Action;
+namespace Kanboard\Action;
 
-use Model\TaskLink;
+use Kanboard\Model\TaskLink;
 
 /**
  * Assign a color to a specific task link
diff --git a/app/Action/TaskAssignColorUser.php b/app/Action/TaskAssignColorUser.php
index 6161514d6..6bf02c36b 100644
--- a/app/Action/TaskAssignColorUser.php
+++ b/app/Action/TaskAssignColorUser.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Action;
+namespace Kanboard\Action;
 
-use Model\Task;
+use Kanboard\Model\Task;
 
 /**
  * Assign a color to a specific user
diff --git a/app/Action/TaskAssignCurrentUser.php b/app/Action/TaskAssignCurrentUser.php
index ff3aaee18..f34c4f366 100644
--- a/app/Action/TaskAssignCurrentUser.php
+++ b/app/Action/TaskAssignCurrentUser.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Action;
+namespace Kanboard\Action;
 
-use Model\Task;
+use Kanboard\Model\Task;
 
 /**
  * Assign a task to the logged user
diff --git a/app/Action/TaskAssignSpecificUser.php b/app/Action/TaskAssignSpecificUser.php
index 4c96f7f0f..dfcb281be 100644
--- a/app/Action/TaskAssignSpecificUser.php
+++ b/app/Action/TaskAssignSpecificUser.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Action;
+namespace Kanboard\Action;
 
-use Model\Task;
+use Kanboard\Model\Task;
 
 /**
  * Assign a task to a specific user
diff --git a/app/Action/TaskAssignUser.php b/app/Action/TaskAssignUser.php
index c28df9fbc..a5821729d 100644
--- a/app/Action/TaskAssignUser.php
+++ b/app/Action/TaskAssignUser.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Action;
+namespace Kanboard\Action;
 
-use Integration\GithubWebhook;
-use Integration\BitbucketWebhook;
+use Kanboard\Integration\GithubWebhook;
+use Kanboard\Integration\BitbucketWebhook;
 
 /**
  * Assign a task to someone
diff --git a/app/Action/TaskClose.php b/app/Action/TaskClose.php
index 0fe58dacc..d80bd0233 100644
--- a/app/Action/TaskClose.php
+++ b/app/Action/TaskClose.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Action;
+namespace Kanboard\Action;
 
-use Integration\GitlabWebhook;
-use Integration\GithubWebhook;
-use Integration\BitbucketWebhook;
-use Model\Task;
+use Kanboard\Integration\GitlabWebhook;
+use Kanboard\Integration\GithubWebhook;
+use Kanboard\Integration\BitbucketWebhook;
+use Kanboard\Model\Task;
 
 /**
  * Close automatically a task
diff --git a/app/Action/TaskCreation.php b/app/Action/TaskCreation.php
index bb5b05c2a..af1403f0d 100644
--- a/app/Action/TaskCreation.php
+++ b/app/Action/TaskCreation.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Action;
+namespace Kanboard\Action;
 
-use Integration\GithubWebhook;
-use Integration\GitlabWebhook;
-use Integration\BitbucketWebhook;
+use Kanboard\Integration\GithubWebhook;
+use Kanboard\Integration\GitlabWebhook;
+use Kanboard\Integration\BitbucketWebhook;
 
 /**
  * Create automatically a task from a webhook
diff --git a/app/Action/TaskDuplicateAnotherProject.php b/app/Action/TaskDuplicateAnotherProject.php
index 7b7c6bf60..1f6684dd5 100644
--- a/app/Action/TaskDuplicateAnotherProject.php
+++ b/app/Action/TaskDuplicateAnotherProject.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Action;
+namespace Kanboard\Action;
 
-use Model\Task;
+use Kanboard\Model\Task;
 
 /**
  * Duplicate a task to another project
diff --git a/app/Action/TaskEmail.php b/app/Action/TaskEmail.php
index 363a01c6b..355a49d86 100644
--- a/app/Action/TaskEmail.php
+++ b/app/Action/TaskEmail.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Action;
+namespace Kanboard\Action;
 
-use Model\Task;
+use Kanboard\Model\Task;
 
 /**
  * Email a task to someone
diff --git a/app/Action/TaskLogMoveAnotherColumn.php b/app/Action/TaskLogMoveAnotherColumn.php
index 621e8e6c4..39c7710f6 100644
--- a/app/Action/TaskLogMoveAnotherColumn.php
+++ b/app/Action/TaskLogMoveAnotherColumn.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Action;
+namespace Kanboard\Action;
 
-use Model\GithubWebhook;
-use Model\Task;
+use Kanboard\Model\GithubWebhook;
+use Kanboard\Model\Task;
 
 /**
  * Add a log of the triggering event to the task description.
@@ -60,7 +60,7 @@ class TaskLogMoveAnotherColumn extends Base
         if (! $this->userSession->isLogged()) {
             return false;
         }
-        
+
         $column = $this->board->getColumn($data['column_id']);
 
         return (bool) $this->comment->create(array(
diff --git a/app/Action/TaskMoveAnotherProject.php b/app/Action/TaskMoveAnotherProject.php
index ee212998d..476e2036b 100644
--- a/app/Action/TaskMoveAnotherProject.php
+++ b/app/Action/TaskMoveAnotherProject.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Action;
+namespace Kanboard\Action;
 
-use Model\Task;
+use Kanboard\Model\Task;
 
 /**
  * Move a task to another project
diff --git a/app/Action/TaskMoveColumnAssigned.php b/app/Action/TaskMoveColumnAssigned.php
index 70ad76991..16622ee42 100644
--- a/app/Action/TaskMoveColumnAssigned.php
+++ b/app/Action/TaskMoveColumnAssigned.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Action;
+namespace Kanboard\Action;
 
-use Model\Task;
+use Kanboard\Model\Task;
 
 /**
  * Move a task to another column when an assignee is set
diff --git a/app/Action/TaskMoveColumnCategoryChange.php b/app/Action/TaskMoveColumnCategoryChange.php
index a0f41ba42..1e12be4a9 100644
--- a/app/Action/TaskMoveColumnCategoryChange.php
+++ b/app/Action/TaskMoveColumnCategoryChange.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Action;
+namespace Kanboard\Action;
 
-use Model\Task;
+use Kanboard\Model\Task;
 
 /**
  * Move a task to another column when the category is changed
diff --git a/app/Action/TaskMoveColumnUnAssigned.php b/app/Action/TaskMoveColumnUnAssigned.php
index 2216c8d03..617c75a8b 100644
--- a/app/Action/TaskMoveColumnUnAssigned.php
+++ b/app/Action/TaskMoveColumnUnAssigned.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Action;
+namespace Kanboard\Action;
 
-use Model\Task;
+use Kanboard\Model\Task;
 
 /**
  * Move a task to another column when an assignee is cleared
diff --git a/app/Action/TaskOpen.php b/app/Action/TaskOpen.php
index ee42ab321..2e53efae6 100644
--- a/app/Action/TaskOpen.php
+++ b/app/Action/TaskOpen.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Action;
+namespace Kanboard\Action;
 
-use Integration\GithubWebhook;
-use Integration\BitbucketWebhook;
+use Kanboard\Integration\GithubWebhook;
+use Kanboard\Integration\BitbucketWebhook;
 
 /**
  * Open automatically a task
diff --git a/app/Action/TaskUpdateStartDate.php b/app/Action/TaskUpdateStartDate.php
index 4cd50c9ad..4cd548afa 100644
--- a/app/Action/TaskUpdateStartDate.php
+++ b/app/Action/TaskUpdateStartDate.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Action;
+namespace Kanboard\Action;
 
-use Model\Task;
+use Kanboard\Model\Task;
 
 /**
  * Set the start date of task
diff --git a/app/Api/Action.php b/app/Api/Action.php
index a67e915cd..eab20a6ca 100644
--- a/app/Api/Action.php
+++ b/app/Api/Action.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Api;
+namespace Kanboard\Api;
 
 /**
  * Action API controller
@@ -8,7 +8,7 @@ namespace Api;
  * @package  api
  * @author   Frederic Guillot
  */
-class Action extends \Core\Base
+class Action extends \Kanboard\Core\Base
 {
     public function getAvailableActions()
     {
diff --git a/app/Api/App.php b/app/Api/App.php
index 9b3ceb942..d082bcfb9 100644
--- a/app/Api/App.php
+++ b/app/Api/App.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Api;
+namespace Kanboard\Api;
 
 /**
  * App API controller
@@ -8,7 +8,7 @@ namespace Api;
  * @package  api
  * @author   Frederic Guillot
  */
-class App extends \Core\Base
+class App extends \Kanboard\Core\Base
 {
     public function getTimezone()
     {
diff --git a/app/Api/Auth.php b/app/Api/Auth.php
index 18fe9ff97..b741694be 100644
--- a/app/Api/Auth.php
+++ b/app/Api/Auth.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Api;
+namespace Kanboard\Api;
 
 use JsonRPC\AuthenticationFailure;
 use Symfony\Component\EventDispatcher\Event;
diff --git a/app/Api/Base.php b/app/Api/Base.php
index 0287e0ec8..152ceeab3 100644
--- a/app/Api/Base.php
+++ b/app/Api/Base.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Api;
+namespace Kanboard\Api;
 
 use JsonRPC\AuthenticationFailure;
 use JsonRPC\AccessDeniedException;
@@ -11,7 +11,7 @@ use JsonRPC\AccessDeniedException;
  * @package  api
  * @author   Frederic Guillot
  */
-abstract class Base extends \Core\Base
+abstract class Base extends \Kanboard\Core\Base
 {
     private $user_allowed_procedures = array(
         'getMe',
diff --git a/app/Api/Board.php b/app/Api/Board.php
index 93b99ccec..d615b1dcf 100644
--- a/app/Api/Board.php
+++ b/app/Api/Board.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Api;
+namespace Kanboard\Api;
 
 /**
  * Board API controller
diff --git a/app/Api/Category.php b/app/Api/Category.php
index ad3c5ef92..3e5b3a348 100644
--- a/app/Api/Category.php
+++ b/app/Api/Category.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Api;
+namespace Kanboard\Api;
 
 /**
  * Category API controller
@@ -8,7 +8,7 @@ namespace Api;
  * @package  api
  * @author   Frederic Guillot
  */
-class Category extends \Core\Base
+class Category extends \Kanboard\Core\Base
 {
     public function getCategory($category_id)
     {
diff --git a/app/Api/Comment.php b/app/Api/Comment.php
index e40968b9c..a13c36d44 100644
--- a/app/Api/Comment.php
+++ b/app/Api/Comment.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Api;
+namespace Kanboard\Api;
 
 /**
  * Comment API controller
@@ -8,7 +8,7 @@ namespace Api;
  * @package  api
  * @author   Frederic Guillot
  */
-class Comment extends \Core\Base
+class Comment extends \Kanboard\Core\Base
 {
     public function getComment($comment_id)
     {
diff --git a/app/Api/File.php b/app/Api/File.php
index ad736ad48..760ee5edb 100644
--- a/app/Api/File.php
+++ b/app/Api/File.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Api;
+namespace Kanboard\Api;
 
-use Core\ObjectStorage\ObjectStorageException;
+use Kanboard\Core\ObjectStorage\ObjectStorageException;
 
 /**
  * File API controller
@@ -10,7 +10,7 @@ use Core\ObjectStorage\ObjectStorageException;
  * @package  api
  * @author   Frederic Guillot
  */
-class File extends \Core\Base
+class File extends \Kanboard\Core\Base
 {
     public function getFile($file_id)
     {
diff --git a/app/Api/Link.php b/app/Api/Link.php
index d883013d3..049fcddba 100644
--- a/app/Api/Link.php
+++ b/app/Api/Link.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Api;
+namespace Kanboard\Api;
 
 /**
  * Link API controller
@@ -8,7 +8,7 @@ namespace Api;
  * @package  api
  * @author   Frederic Guillot
  */
-class Link extends \Core\Base
+class Link extends \Kanboard\Core\Base
 {
     /**
      * Get a link by id
diff --git a/app/Api/Me.php b/app/Api/Me.php
index e76115544..f4857b58c 100644
--- a/app/Api/Me.php
+++ b/app/Api/Me.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Api;
+namespace Kanboard\Api;
 
-use Model\Subtask as SubtaskModel;
-use Model\Task as TaskModel;
+use Kanboard\Model\Subtask as SubtaskModel;
+use Kanboard\Model\Task as TaskModel;
 
 /**
  * Me API controller
diff --git a/app/Api/Project.php b/app/Api/Project.php
index 8ed382cb5..4c491ced8 100644
--- a/app/Api/Project.php
+++ b/app/Api/Project.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Api;
+namespace Kanboard\Api;
 
 /**
  * Project API controller
diff --git a/app/Api/ProjectPermission.php b/app/Api/ProjectPermission.php
index 7dd2dec62..80323395e 100644
--- a/app/Api/ProjectPermission.php
+++ b/app/Api/ProjectPermission.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Api;
+namespace Kanboard\Api;
 
 /**
  * ProjectPermission API controller
@@ -8,7 +8,7 @@ namespace Api;
  * @package  api
  * @author   Frederic Guillot
  */
-class ProjectPermission extends \Core\Base
+class ProjectPermission extends \Kanboard\Core\Base
 {
     public function getMembers($project_id)
     {
diff --git a/app/Api/Subtask.php b/app/Api/Subtask.php
index 2b8e7a1fc..7b5260231 100644
--- a/app/Api/Subtask.php
+++ b/app/Api/Subtask.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Api;
+namespace Kanboard\Api;
 
 /**
  * Subtask API controller
@@ -8,7 +8,7 @@ namespace Api;
  * @package  api
  * @author   Frederic Guillot
  */
-class Subtask extends \Core\Base
+class Subtask extends \Kanboard\Core\Base
 {
     public function getSubtask($subtask_id)
     {
diff --git a/app/Api/Swimlane.php b/app/Api/Swimlane.php
index 13838d772..84c699ab7 100644
--- a/app/Api/Swimlane.php
+++ b/app/Api/Swimlane.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Api;
+namespace Kanboard\Api;
 
 /**
  * Swimlane API controller
@@ -8,7 +8,7 @@ namespace Api;
  * @package  api
  * @author   Frederic Guillot
  */
-class Swimlane extends \Core\Base
+class Swimlane extends \Kanboard\Core\Base
 {
     public function getActiveSwimlanes($project_id)
     {
diff --git a/app/Api/Task.php b/app/Api/Task.php
index 23a8c5bfc..8911c2f16 100644
--- a/app/Api/Task.php
+++ b/app/Api/Task.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Api;
+namespace Kanboard\Api;
 
-use Model\Task as TaskModel;
+use Kanboard\Model\Task as TaskModel;
 
 /**
  * Task API controller
@@ -34,7 +34,7 @@ class Task extends Base
     {
         return $this->taskFinder->getOverdueTasks();
     }
-    
+
     public function getOverdueTasksByProject($project_id)
     {
         $this->checkProjectPermission($project_id);
diff --git a/app/Api/TaskLink.php b/app/Api/TaskLink.php
index 6b23d051e..47d70d1eb 100644
--- a/app/Api/TaskLink.php
+++ b/app/Api/TaskLink.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Api;
+namespace Kanboard\Api;
 
 /**
  * TaskLink API controller
@@ -8,7 +8,7 @@ namespace Api;
  * @package  api
  * @author   Frederic Guillot
  */
-class TaskLink extends \Core\Base
+class TaskLink extends \Kanboard\Core\Base
 {
     /**
      * Get a task link
diff --git a/app/Api/User.php b/app/Api/User.php
index 4884c45cd..00d357966 100644
--- a/app/Api/User.php
+++ b/app/Api/User.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Api;
+namespace Kanboard\Api;
 
-use Auth\Ldap;
+use Kanboard\Auth\Ldap;
 
 /**
  * User API controller
@@ -10,7 +10,7 @@ use Auth\Ldap;
  * @package  api
  * @author   Frederic Guillot
  */
-class User extends \Core\Base
+class User extends \Kanboard\Core\Base
 {
     public function getUser($user_id)
     {
diff --git a/app/Auth/Base.php b/app/Auth/Base.php
index ebf6681bd..a354c200d 100644
--- a/app/Auth/Base.php
+++ b/app/Auth/Base.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Auth;
+namespace Kanboard\Auth;
 
 use Pimple\Container;
 
@@ -10,7 +10,7 @@ use Pimple\Container;
  * @package  auth
  * @author   Frederic Guillot
  */
-abstract class Base extends \Core\Base
+abstract class Base extends \Kanboard\Core\Base
 {
     /**
      * Database instance
diff --git a/app/Auth/Database.php b/app/Auth/Database.php
index e69f18a92..36be669e3 100644
--- a/app/Auth/Database.php
+++ b/app/Auth/Database.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Auth;
+namespace Kanboard\Auth;
 
-use Model\User;
-use Event\AuthEvent;
+use Kanboard\Model\User;
+use Kanboard\Event\AuthEvent;
 
 /**
  * Database authentication
diff --git a/app/Auth/Github.php b/app/Auth/Github.php
index 2d1b7b26c..28478b562 100644
--- a/app/Auth/Github.php
+++ b/app/Auth/Github.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Auth;
+namespace Kanboard\Auth;
 
-use Event\AuthEvent;
+use Kanboard\Event\AuthEvent;
 
 /**
  * Github backend
@@ -22,7 +22,7 @@ class Github extends Base
      * OAuth2 instance
      *
      * @access private
-     * @var \Core\OAuth2
+     * @var \Kanboard\Core\OAuth2
      */
     private $service;
 
@@ -85,7 +85,7 @@ class Github extends Base
      * Get OAuth2 configured service
      *
      * @access public
-     * @return \Core\OAuth2
+     * @return KanboardCore\OAuth2
      */
     public function getService()
     {
diff --git a/app/Auth/Gitlab.php b/app/Auth/Gitlab.php
index d9a985bf1..306a474dc 100644
--- a/app/Auth/Gitlab.php
+++ b/app/Auth/Gitlab.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Auth;
+namespace Kanboard\Auth;
 
-use Event\AuthEvent;
+use Kanboard\Event\AuthEvent;
 
 /**
  * Gitlab backend
@@ -22,7 +22,7 @@ class Gitlab extends Base
      * OAuth2 instance
      *
      * @access private
-     * @var \Core\OAuth2
+     * @var \Kanboard\Core\OAuth2
      */
     private $service;
 
@@ -85,7 +85,7 @@ class Gitlab extends Base
      * Get OAuth2 configured service
      *
      * @access public
-     * @return \Core\OAuth2
+     * @return KanboardCore\OAuth2
      */
     public function getService()
     {
diff --git a/app/Auth/Google.php b/app/Auth/Google.php
index 10ecfe8f3..76e65fb6a 100644
--- a/app/Auth/Google.php
+++ b/app/Auth/Google.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Auth;
+namespace Kanboard\Auth;
 
-use Event\AuthEvent;
+use Kanboard\Event\AuthEvent;
 
 /**
  * Google backend
@@ -23,7 +23,7 @@ class Google extends Base
      * OAuth2 instance
      *
      * @access private
-     * @var \Core\OAuth2
+     * @var \Kanboard\Core\OAuth2
      */
     private $service;
 
@@ -86,7 +86,7 @@ class Google extends Base
      * Get OAuth2 configured service
      *
      * @access public
-     * @return \Core\OAuth2
+     * @return KanboardCore\OAuth2
      */
     public function getService()
     {
diff --git a/app/Auth/Ldap.php b/app/Auth/Ldap.php
index 3a48c4020..78820d2eb 100644
--- a/app/Auth/Ldap.php
+++ b/app/Auth/Ldap.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Auth;
+namespace Kanboard\Auth;
 
-use Event\AuthEvent;
+use Kanboard\Event\AuthEvent;
 
 /**
  * LDAP model
diff --git a/app/Auth/RememberMe.php b/app/Auth/RememberMe.php
index 54e60422d..6569463d1 100644
--- a/app/Auth/RememberMe.php
+++ b/app/Auth/RememberMe.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Auth;
+namespace Kanboard\Auth;
 
-use Core\Request;
-use Event\AuthEvent;
-use Core\Security;
+use Kanboard\Core\Request;
+use Kanboard\Event\AuthEvent;
+use Kanboard\Core\Security;
 
 /**
  * RememberMe model
diff --git a/app/Auth/ReverseProxy.php b/app/Auth/ReverseProxy.php
index 7818254c4..6f998a347 100644
--- a/app/Auth/ReverseProxy.php
+++ b/app/Auth/ReverseProxy.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Auth;
+namespace Kanboard\Auth;
 
-use Event\AuthEvent;
+use Kanboard\Event\AuthEvent;
 
 /**
  * ReverseProxy backend
diff --git a/app/Console/Base.php b/app/Console/Base.php
index 86da1465b..018c55ab0 100644
--- a/app/Console/Base.php
+++ b/app/Console/Base.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Console;
+namespace Kanboard\Console;
 
 use Pimple\Container;
 use Symfony\Component\Console\Command\Command;
diff --git a/app/Console/LocaleComparator.php b/app/Console/LocaleComparator.php
index 6eec42dcb..fcc3a995f 100644
--- a/app/Console/LocaleComparator.php
+++ b/app/Console/LocaleComparator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Console;
+namespace Kanboard\Console;
 
 use RecursiveIteratorIterator;
 use RecursiveDirectoryIterator;
diff --git a/app/Console/LocaleSync.php b/app/Console/LocaleSync.php
index ab95651b9..bc3918dad 100644
--- a/app/Console/LocaleSync.php
+++ b/app/Console/LocaleSync.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Console;
+namespace Kanboard\Console;
 
 use DirectoryIterator;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/app/Console/ProjectDailyColumnStatsExport.php b/app/Console/ProjectDailyColumnStatsExport.php
index 4db33b6ad..2513fbf14 100644
--- a/app/Console/ProjectDailyColumnStatsExport.php
+++ b/app/Console/ProjectDailyColumnStatsExport.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Console;
+namespace Kanboard\Console;
 
-use Core\Csv;
+use Kanboard\Core\Csv;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
diff --git a/app/Console/ProjectDailyStatsCalculation.php b/app/Console/ProjectDailyStatsCalculation.php
index 4b77c5563..9884cc1c6 100644
--- a/app/Console/ProjectDailyStatsCalculation.php
+++ b/app/Console/ProjectDailyStatsCalculation.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Console;
+namespace Kanboard\Console;
 
-use Model\Project;
+use Kanboard\Model\Project;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
diff --git a/app/Console/SubtaskExport.php b/app/Console/SubtaskExport.php
index 9816574b1..aaa95276a 100644
--- a/app/Console/SubtaskExport.php
+++ b/app/Console/SubtaskExport.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Console;
+namespace Kanboard\Console;
 
-use Core\Csv;
+use Kanboard\Core\Csv;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
diff --git a/app/Console/TaskExport.php b/app/Console/TaskExport.php
index 862c1b0d7..4515bf959 100644
--- a/app/Console/TaskExport.php
+++ b/app/Console/TaskExport.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Console;
+namespace Kanboard\Console;
 
-use Core\Csv;
+use Kanboard\Core\Csv;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
diff --git a/app/Console/TaskOverdueNotification.php b/app/Console/TaskOverdueNotification.php
index 2428ad356..ffb9fab55 100644
--- a/app/Console/TaskOverdueNotification.php
+++ b/app/Console/TaskOverdueNotification.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Console;
+namespace Kanboard\Console;
 
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/app/Console/TransitionExport.php b/app/Console/TransitionExport.php
index 27d8de643..9ae41417a 100644
--- a/app/Console/TransitionExport.php
+++ b/app/Console/TransitionExport.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Console;
+namespace Kanboard\Console;
 
-use Core\Csv;
+use Kanboard\Core\Csv;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
diff --git a/app/Controller/Action.php b/app/Controller/Action.php
index d92385c79..8e31fb30b 100644
--- a/app/Controller/Action.php
+++ b/app/Controller/Action.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 /**
  * Automatic actions management
diff --git a/app/Controller/Activity.php b/app/Controller/Activity.php
index 234e4be46..24327c234 100644
--- a/app/Controller/Activity.php
+++ b/app/Controller/Activity.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 /**
  * Activity stream
diff --git a/app/Controller/Analytic.php b/app/Controller/Analytic.php
index ca2146edd..1082b462f 100644
--- a/app/Controller/Analytic.php
+++ b/app/Controller/Analytic.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 /**
  * Project Analytic controller
diff --git a/app/Controller/App.php b/app/Controller/App.php
index 8a1a6e2be..50ac1d323 100644
--- a/app/Controller/App.php
+++ b/app/Controller/App.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
-use Model\Subtask as SubtaskModel;
+use Kanboard\Model\Subtask as SubtaskModel;
 
 /**
  * Application controller
diff --git a/app/Controller/Auth.php b/app/Controller/Auth.php
index bb1154e4c..b40811f44 100644
--- a/app/Controller/Auth.php
+++ b/app/Controller/Auth.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 use Gregwar\Captcha\CaptchaBuilder;
 
diff --git a/app/Controller/Base.php b/app/Controller/Base.php
index e0fd59cb5..8883a6761 100644
--- a/app/Controller/Base.php
+++ b/app/Controller/Base.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 use Pimple\Container;
-use Core\Security;
-use Core\Request;
-use Core\Response;
-use Core\Template;
-use Core\Session;
-use Model\LastLogin;
+use Kanboard\Core\Security;
+use Kanboard\Core\Request;
+use Kanboard\Core\Response;
+use Kanboard\Core\Template;
+use Kanboard\Core\Session;
+use Kanboard\Model\LastLogin;
 use Symfony\Component\EventDispatcher\Event;
 
 /**
@@ -17,13 +17,13 @@ use Symfony\Component\EventDispatcher\Event;
  * @package  controller
  * @author   Frederic Guillot
  */
-abstract class Base extends \Core\Base
+abstract class Base extends \Kanboard\Core\Base
 {
     /**
      * Request instance
      *
      * @accesss protected
-     * @var \Core\Request
+     * @var \Kanboard\Core\Request
      */
     protected $request;
 
@@ -31,7 +31,7 @@ abstract class Base extends \Core\Base
      * Response instance
      *
      * @accesss protected
-     * @var \Core\Response
+     * @var \Kanboard\Core\Response
      */
     protected $response;
 
diff --git a/app/Controller/Board.php b/app/Controller/Board.php
index a2cde287b..06c9a2ff1 100644
--- a/app/Controller/Board.php
+++ b/app/Controller/Board.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 /**
  * Board controller
diff --git a/app/Controller/Calendar.php b/app/Controller/Calendar.php
index 7050e54bd..131d87aa5 100644
--- a/app/Controller/Calendar.php
+++ b/app/Controller/Calendar.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
-use Model\Task as TaskModel;
+use Kanboard\Model\Task as TaskModel;
 
 /**
  * Project Calendar controller
diff --git a/app/Controller/Category.php b/app/Controller/Category.php
index e8d83f2d8..065da80bf 100644
--- a/app/Controller/Category.php
+++ b/app/Controller/Category.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 /**
  * Category management
diff --git a/app/Controller/Column.php b/app/Controller/Column.php
index 89c495a6e..a07a1fe19 100644
--- a/app/Controller/Column.php
+++ b/app/Controller/Column.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 /**
  * Column controller
diff --git a/app/Controller/Comment.php b/app/Controller/Comment.php
index cf0af6154..90d9d6dfe 100644
--- a/app/Controller/Comment.php
+++ b/app/Controller/Comment.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 /**
  * Comment controller
diff --git a/app/Controller/Config.php b/app/Controller/Config.php
index 1ae390c86..ba3c690af 100644
--- a/app/Controller/Config.php
+++ b/app/Controller/Config.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 /**
  * Config controller
diff --git a/app/Controller/Currency.php b/app/Controller/Currency.php
index 10fb90da6..d3f9de5f2 100644
--- a/app/Controller/Currency.php
+++ b/app/Controller/Currency.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 /**
  * Currency controller
diff --git a/app/Controller/Customfilter.php b/app/Controller/Customfilter.php
index 80d18a179..26e6cc87a 100644
--- a/app/Controller/Customfilter.php
+++ b/app/Controller/Customfilter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 /**
  * Custom Filter management
@@ -115,7 +115,7 @@ class Customfilter extends Base
         if (! isset($values['is_shared'])) {
             $values += array('is_shared' => 0);
         }
-        
+
         if (! isset($values['append'])) {
             $values += array('append' => 0);
         }
diff --git a/app/Controller/Doc.php b/app/Controller/Doc.php
index f9f0a6753..282f5d151 100644
--- a/app/Controller/Doc.php
+++ b/app/Controller/Doc.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 use Parsedown;
 
diff --git a/app/Controller/Export.php b/app/Controller/Export.php
index 8b558c0ab..cdedcb884 100644
--- a/app/Controller/Export.php
+++ b/app/Controller/Export.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 /**
  * Export controller
diff --git a/app/Controller/Feed.php b/app/Controller/Feed.php
index c08919c21..95b81fb8a 100644
--- a/app/Controller/Feed.php
+++ b/app/Controller/Feed.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 /**
  * Atom/RSS Feed controller
diff --git a/app/Controller/File.php b/app/Controller/File.php
index ef90c55a6..673e2669a 100644
--- a/app/Controller/File.php
+++ b/app/Controller/File.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
-use Core\ObjectStorage\ObjectStorageException;
+use Kanboard\Core\ObjectStorage\ObjectStorageException;
 
 /**
  * File controller
diff --git a/app/Controller/Gantt.php b/app/Controller/Gantt.php
index 879ab3776..dd02626fb 100644
--- a/app/Controller/Gantt.php
+++ b/app/Controller/Gantt.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
-use Model\Task as TaskModel;
+use Kanboard\Model\Task as TaskModel;
 
 /**
  * Gantt controller
diff --git a/app/Controller/Ical.php b/app/Controller/Ical.php
index e89b7e380..ee2b1518d 100644
--- a/app/Controller/Ical.php
+++ b/app/Controller/Ical.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
-use Model\TaskFilter;
+use Kanboard\Model\TaskFilter;
 use Eluceo\iCal\Component\Calendar as iCalendar;
 
 /**
diff --git a/app/Controller/Link.php b/app/Controller/Link.php
index 482e415c0..73cd95f97 100644
--- a/app/Controller/Link.php
+++ b/app/Controller/Link.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 /**
  * Link controller
diff --git a/app/Controller/Listing.php b/app/Controller/Listing.php
index 2c197e3ed..b9c851f56 100644
--- a/app/Controller/Listing.php
+++ b/app/Controller/Listing.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
-use Model\Task as TaskModel;
+use Kanboard\Model\Task as TaskModel;
 
 /**
  * List view controller
diff --git a/app/Controller/Oauth.php b/app/Controller/Oauth.php
index b0f13dc38..d9fb513bd 100644
--- a/app/Controller/Oauth.php
+++ b/app/Controller/Oauth.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 /**
  * OAuth controller
diff --git a/app/Controller/Project.php b/app/Controller/Project.php
index 3e3e47ce0..5a3edf7a4 100644
--- a/app/Controller/Project.php
+++ b/app/Controller/Project.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 /**
  * Project controller (Settings + creation/edition)
diff --git a/app/Controller/Projectuser.php b/app/Controller/Projectuser.php
index 4456ce3dd..5729d662f 100644
--- a/app/Controller/Projectuser.php
+++ b/app/Controller/Projectuser.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
-use Model\User as UserModel;
-use Model\Task as TaskModel;
+use Kanboard\Model\User as UserModel;
+use Kanboard\Model\Task as TaskModel;
 
 /**
  * Project User overview
diff --git a/app/Controller/Search.php b/app/Controller/Search.php
index f6dc7a329..67e2df820 100644
--- a/app/Controller/Search.php
+++ b/app/Controller/Search.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 /**
  * Search controller
diff --git a/app/Controller/Subtask.php b/app/Controller/Subtask.php
index 338918fbf..79b74896c 100644
--- a/app/Controller/Subtask.php
+++ b/app/Controller/Subtask.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
-use Model\Subtask as SubtaskModel;
+use Kanboard\Model\Subtask as SubtaskModel;
 
 /**
  * Subtask controller
diff --git a/app/Controller/Swimlane.php b/app/Controller/Swimlane.php
index f92e9fe31..69fdf3dfe 100644
--- a/app/Controller/Swimlane.php
+++ b/app/Controller/Swimlane.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
-use Model\Swimlane as SwimlaneModel;
+use Kanboard\Model\Swimlane as SwimlaneModel;
 
 /**
  * Swimlanes
diff --git a/app/Controller/Task.php b/app/Controller/Task.php
index 8e577839a..ab7a8a9c7 100644
--- a/app/Controller/Task.php
+++ b/app/Controller/Task.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 /**
  * Task controller
diff --git a/app/Controller/TaskImport.php b/app/Controller/TaskImport.php
index 0343b1dcc..387374c5f 100644
--- a/app/Controller/TaskImport.php
+++ b/app/Controller/TaskImport.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
-use Core\Csv;
+use Kanboard\Core\Csv;
 
 /**
  * Task Import controller
diff --git a/app/Controller/Taskcreation.php b/app/Controller/Taskcreation.php
index b9e9a33ce..db33a1300 100644
--- a/app/Controller/Taskcreation.php
+++ b/app/Controller/Taskcreation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 /**
  * Task Creation controller
diff --git a/app/Controller/Taskduplication.php b/app/Controller/Taskduplication.php
index 8d329ca42..2eea1567c 100644
--- a/app/Controller/Taskduplication.php
+++ b/app/Controller/Taskduplication.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 /**
  * Task Duplication controller
diff --git a/app/Controller/Tasklink.php b/app/Controller/Tasklink.php
index dd076802b..c9649cc67 100644
--- a/app/Controller/Tasklink.php
+++ b/app/Controller/Tasklink.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 /**
  * TaskLink controller
diff --git a/app/Controller/Taskmodification.php b/app/Controller/Taskmodification.php
index 638af5948..6bd2b25ef 100644
--- a/app/Controller/Taskmodification.php
+++ b/app/Controller/Taskmodification.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 /**
  * Task Modification controller
diff --git a/app/Controller/Taskstatus.php b/app/Controller/Taskstatus.php
index 1768b773e..b38a143f5 100644
--- a/app/Controller/Taskstatus.php
+++ b/app/Controller/Taskstatus.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 /**
  * Task Status controller
diff --git a/app/Controller/Timer.php b/app/Controller/Timer.php
index 2a4531baf..b2096f9f6 100644
--- a/app/Controller/Timer.php
+++ b/app/Controller/Timer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 /**
  * Time Tracking controller
diff --git a/app/Controller/Twofactor.php b/app/Controller/Twofactor.php
index a8b0351f0..029ee0482 100644
--- a/app/Controller/Twofactor.php
+++ b/app/Controller/Twofactor.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 use Otp\Otp;
 use Otp\GoogleAuthenticator;
diff --git a/app/Controller/User.php b/app/Controller/User.php
index 0b39619db..15e9a0ee3 100644
--- a/app/Controller/User.php
+++ b/app/Controller/User.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
-use Model\NotificationType;
+use Kanboard\Model\NotificationType;
 
 /**
  * User controller
diff --git a/app/Controller/UserImport.php b/app/Controller/UserImport.php
index 9c27aa06c..59defa0a6 100644
--- a/app/Controller/UserImport.php
+++ b/app/Controller/UserImport.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
-use Core\Csv;
+use Kanboard\Core\Csv;
 
 /**
  * User Import controller
diff --git a/app/Controller/Webhook.php b/app/Controller/Webhook.php
index 1a4cfe9a0..1b3a659b7 100644
--- a/app/Controller/Webhook.php
+++ b/app/Controller/Webhook.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 /**
  * Webhook controller
diff --git a/app/Controller/Webnotification.php b/app/Controller/Webnotification.php
index a481e9b8e..52e3f2664 100644
--- a/app/Controller/Webnotification.php
+++ b/app/Controller/Webnotification.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controller;
+namespace Kanboard\Controller;
 
 /**
  * Web notification controller
diff --git a/app/Core/Base.php b/app/Core/Base.php
index 7503e840d..331b67e32 100644
--- a/app/Core/Base.php
+++ b/app/Core/Base.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core;
+namespace Kanboard\Core;
 
 use Pimple\Container;
 
@@ -10,86 +10,86 @@ use Pimple\Container;
  * @package core
  * @author  Frederic Guillot
  *
- * @property \Core\Helper                                      $helper
- * @property \Core\EmailClient                                 $emailClient
- * @property \Core\HttpClient                                  $httpClient
- * @property \Core\Paginator                                   $paginator
- * @property \Core\Request                                     $request
- * @property \Core\Session                                     $session
- * @property \Core\Template                                    $template
- * @property \Core\OAuth2                                      $oauth
- * @property \Core\Router                                      $router
- * @property \Core\Lexer                                       $lexer
- * @property \Core\ObjectStorage\ObjectStorageInterface        $objectStorage
- * @property \Core\Cache\Cache                                 $memoryCache
- * @property \Core\Plugin\Hook                                 $hook
- * @property \Core\Plugin\Loader                               $pluginLoader
- * @property \Integration\BitbucketWebhook                     $bitbucketWebhook
- * @property \Integration\GithubWebhook                        $githubWebhook
- * @property \Integration\GitlabWebhook                        $gitlabWebhook
- * @property \Integration\HipchatWebhook                       $hipchatWebhook
- * @property \Integration\Jabber                               $jabber
- * @property \Integration\Mailgun                              $mailgun
- * @property \Integration\Postmark                             $postmark
- * @property \Integration\Sendgrid                             $sendgrid
- * @property \Integration\SlackWebhook                         $slackWebhook
- * @property \Integration\Smtp                                 $smtp
- * @property \Formatter\ProjectGanttFormatter                  $projectGanttFormatter
- * @property \Formatter\TaskFilterGanttFormatter               $taskFilterGanttFormatter
- * @property \Formatter\TaskFilterAutoCompleteFormatter        $taskFilterAutoCompleteFormatter
- * @property \Formatter\TaskFilterCalendarFormatter            $taskFilterCalendarFormatter
- * @property \Formatter\TaskFilterICalendarFormatter           $taskFilterICalendarFormatter
- * @property \Model\Acl                                        $acl
- * @property \Model\Action                                     $action
- * @property \Model\Authentication                             $authentication
- * @property \Model\Board                                      $board
- * @property \Model\Category                                   $category
- * @property \Model\Color                                      $color
- * @property \Model\Comment                                    $comment
- * @property \Model\Config                                     $config
- * @property \Model\Currency                                   $currency
- * @property \Model\CustomFilter                               $customFilter
- * @property \Model\DateParser                                 $dateParser
- * @property \Model\File                                       $file
- * @property \Model\LastLogin                                  $lastLogin
- * @property \Model\Link                                       $link
- * @property \Model\Notification                               $notification
- * @property \Model\NotificationType                           $notificationType
- * @property \Model\NotificationFilter                         $notificationFilter
- * @property \Model\OverdueNotification                        $overdueNotification
- * @property \Model\WebNotification                            $webNotification
- * @property \Model\Project                                    $project
- * @property \Model\ProjectActivity                            $projectActivity
- * @property \Model\ProjectAnalytic                            $projectAnalytic
- * @property \Model\ProjectDuplication                         $projectDuplication
- * @property \Model\ProjectDailyColumnStats                    $projectDailyColumnStats
- * @property \Model\ProjectDailyStats                          $projectDailyStats
- * @property \Model\ProjectIntegration                         $projectIntegration
- * @property \Model\ProjectPermission                          $projectPermission
- * @property \Model\Subtask                                    $subtask
- * @property \Model\SubtaskExport                              $subtaskExport
- * @property \Model\SubtaskTimeTracking                        $subtaskTimeTracking
- * @property \Model\Swimlane                                   $swimlane
- * @property \Model\Task                                       $task
- * @property \Model\TaskAnalytic                               $taskAnalytic
- * @property \Model\TaskCreation                               $taskCreation
- * @property \Model\TaskDuplication                            $taskDuplication
- * @property \Model\TaskExport                                 $taskExport
- * @property \Model\TaskFinder                                 $taskFinder
- * @property \Model\TaskFilter                                 $taskFilter
- * @property \Model\TaskLink                                   $taskLink
- * @property \Model\TaskModification                           $taskModification
- * @property \Model\TaskPermission                             $taskPermission
- * @property \Model\TaskPosition                               $taskPosition
- * @property \Model\TaskStatus                                 $taskStatus
- * @property \Model\TaskValidator                              $taskValidator
- * @property \Model\Transition                                 $transition
- * @property \Model\User                                       $user
- * @property \Model\UserSession                                $userSession
- * @property \Model\Webhook                                    $webhook
- * @property \Psr\Log\LoggerInterface                          $logger
- * @property \League\HTMLToMarkdown\HtmlConverter              $htmlConverter
- * @property \PicoDb\Database                                  $db
+ * @property \Kanboard\Core\Helper                                      $helper
+ * @property \Kanboard\Core\EmailClient                                 $emailClient
+ * @property \Kanboard\Core\HttpClient                                  $httpClient
+ * @property \Kanboard\Core\Paginator                                   $paginator
+ * @property \Kanboard\Core\Request                                     $request
+ * @property \Kanboard\Core\Session                                     $session
+ * @property \Kanboard\Core\Template                                    $template
+ * @property \Kanboard\Core\OAuth2                                      $oauth
+ * @property \Kanboard\Core\Router                                      $router
+ * @property \Kanboard\Core\Lexer                                       $lexer
+ * @property \Kanboard\Core\ObjectStorage\ObjectStorageInterface        $objectStorage
+ * @property \Kanboard\Core\Cache\Cache                                 $memoryCache
+ * @property \Kanboard\Core\Plugin\Hook                                 $hook
+ * @property \Kanboard\Core\Plugin\Loader                               $pluginLoader
+ * @property \Kanboard\Integration\BitbucketWebhook                     $bitbucketWebhook
+ * @property \Kanboard\Integration\GithubWebhook                        $githubWebhook
+ * @property \Kanboard\Integration\GitlabWebhook                        $gitlabWebhook
+ * @property \Kanboard\Integration\HipchatWebhook                       $hipchatWebhook
+ * @property \Kanboard\Integration\Jabber                               $jabber
+ * @property \Kanboard\Integration\Mailgun                              $mailgun
+ * @property \Kanboard\Integration\Postmark                             $postmark
+ * @property \Kanboard\Integration\Sendgrid                             $sendgrid
+ * @property \Kanboard\Integration\SlackWebhook                         $slackWebhook
+ * @property \Kanboard\Integration\Smtp                                 $smtp
+ * @property \Kanboard\Formatter\ProjectGanttFormatter                  $projectGanttFormatter
+ * @property \Kanboard\Formatter\TaskFilterGanttFormatter               $taskFilterGanttFormatter
+ * @property \Kanboard\Formatter\TaskFilterAutoCompleteFormatter        $taskFilterAutoCompleteFormatter
+ * @property \Kanboard\Formatter\TaskFilterCalendarFormatter            $taskFilterCalendarFormatter
+ * @property \Kanboard\Formatter\TaskFilterICalendarFormatter           $taskFilterICalendarFormatter
+ * @property \Kanboard\Model\Acl                                        $acl
+ * @property \Kanboard\Model\Action                                     $action
+ * @property \Kanboard\Model\Authentication                             $authentication
+ * @property \Kanboard\Model\Board                                      $board
+ * @property \Kanboard\Model\Category                                   $category
+ * @property \Kanboard\Model\Color                                      $color
+ * @property \Kanboard\Model\Comment                                    $comment
+ * @property \Kanboard\Model\Config                                     $config
+ * @property \Kanboard\Model\Currency                                   $currency
+ * @property \Kanboard\Model\CustomFilter                               $customFilter
+ * @property \Kanboard\Model\DateParser                                 $dateParser
+ * @property \Kanboard\Model\File                                       $file
+ * @property \Kanboard\Model\LastLogin                                  $lastLogin
+ * @property \Kanboard\Model\Link                                       $link
+ * @property \Kanboard\Model\Notification                               $notification
+ * @property \Kanboard\Model\NotificationType                           $notificationType
+ * @property \Kanboard\Model\NotificationFilter                         $notificationFilter
+ * @property \Kanboard\Model\OverdueNotification                        $overdueNotification
+ * @property \Kanboard\Model\WebNotification                            $webNotification
+ * @property \Kanboard\Model\Project                                    $project
+ * @property \Kanboard\Model\ProjectActivity                            $projectActivity
+ * @property \Kanboard\Model\ProjectAnalytic                            $projectAnalytic
+ * @property \Kanboard\Model\ProjectDuplication                         $projectDuplication
+ * @property \Kanboard\Model\ProjectDailyColumnStats                    $projectDailyColumnStats
+ * @property \Kanboard\Model\ProjectDailyStats                          $projectDailyStats
+ * @property \Kanboard\Model\ProjectIntegration                         $projectIntegration
+ * @property \Kanboard\Model\ProjectPermission                          $projectPermission
+ * @property \Kanboard\Model\Subtask                                    $subtask
+ * @property \Kanboard\Model\SubtaskExport                              $subtaskExport
+ * @property \Kanboard\Model\SubtaskTimeTracking                        $subtaskTimeTracking
+ * @property \Kanboard\Model\Swimlane                                   $swimlane
+ * @property \Kanboard\Model\Task                                       $task
+ * @property \Kanboard\Model\TaskAnalytic                               $taskAnalytic
+ * @property \Kanboard\Model\TaskCreation                               $taskCreation
+ * @property \Kanboard\Model\TaskDuplication                            $taskDuplication
+ * @property \Kanboard\Model\TaskExport                                 $taskExport
+ * @property \Kanboard\Model\TaskFinder                                 $taskFinder
+ * @property \Kanboard\Model\TaskFilter                                 $taskFilter
+ * @property \Kanboard\Model\TaskLink                                   $taskLink
+ * @property \Kanboard\Model\TaskModification                           $taskModification
+ * @property \Kanboard\Model\TaskPermission                             $taskPermission
+ * @property \Kanboard\Model\TaskPosition                               $taskPosition
+ * @property \Kanboard\Model\TaskStatus                                 $taskStatus
+ * @property \Kanboard\Model\TaskValidator                              $taskValidator
+ * @property \Kanboard\Model\Transition                                 $transition
+ * @property \Kanboard\Model\User                                       $user
+ * @property \Kanboard\Model\UserSession                                $userSession
+ * @property \Kanboard\Model\Webhook                                    $webhook
+ * @property \Psr\Log\LoggerInterface                                   $logger
+ * @property \League\HTMLToMarkdown\HtmlConverter                       $htmlConverter
+ * @property \PicoDb\Database                                           $db
  */
 abstract class Base
 {
diff --git a/app/Core/Cache/Base.php b/app/Core/Cache/Base.php
index a16c12f09..d62b8507f 100644
--- a/app/Core/Cache/Base.php
+++ b/app/Core/Cache/Base.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core\Cache;
+namespace Kanboard\Core\Cache;
 
 /**
  * Base class for cache drivers
diff --git a/app/Core/Cache/CacheInterface.php b/app/Core/Cache/CacheInterface.php
index 8675ef8eb..d9e9747ae 100644
--- a/app/Core/Cache/CacheInterface.php
+++ b/app/Core/Cache/CacheInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core\Cache;
+namespace Kanboard\Core\Cache;
 
 /**
  * Cache Interface
diff --git a/app/Core/Cache/MemoryCache.php b/app/Core/Cache/MemoryCache.php
index b1de96bca..c4fb7ca42 100644
--- a/app/Core/Cache/MemoryCache.php
+++ b/app/Core/Cache/MemoryCache.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core\Cache;
+namespace Kanboard\Core\Cache;
 
 /**
  * Memory Cache
diff --git a/app/Core/Csv.php b/app/Core/Csv.php
index 6e7816f6f..37f51b271 100644
--- a/app/Core/Csv.php
+++ b/app/Core/Csv.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core;
+namespace Kanboard\Core;
 
 use SplFileObject;
 
diff --git a/app/Core/EmailClient.php b/app/Core/EmailClient.php
index b19865025..38d6b3f18 100644
--- a/app/Core/EmailClient.php
+++ b/app/Core/EmailClient.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core;
+namespace Kanboard\Core;
 
 /**
  * Mail client
diff --git a/app/Core/Helper.php b/app/Core/Helper.php
index 64eaed238..5edaa3f0c 100644
--- a/app/Core/Helper.php
+++ b/app/Core/Helper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core;
+namespace Kanboard\Core;
 
 use Pimple\Container;
 
@@ -60,7 +60,7 @@ class Helper
     public function __get($name)
     {
         if (! isset($this->helpers[$name])) {
-            $class = '\Helper\\'.ucfirst($name);
+            $class = '\Kanboard\Helper\\'.ucfirst($name);
             $this->helpers[$name] = new $class($this->container);
         }
 
diff --git a/app/Core/HttpClient.php b/app/Core/HttpClient.php
index 99534cfe9..4ec5396e2 100644
--- a/app/Core/HttpClient.php
+++ b/app/Core/HttpClient.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core;
+namespace Kanboard\Core;
 
 /**
  * HTTP client
diff --git a/app/Core/Lexer.php b/app/Core/Lexer.php
index d7e6fde4a..92443c2cf 100644
--- a/app/Core/Lexer.php
+++ b/app/Core/Lexer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core;
+namespace Kanboard\Core;
 
 /**
  * Lexer
diff --git a/app/Core/Markdown.php b/app/Core/Markdown.php
index fa4e8080a..4101a3b3f 100644
--- a/app/Core/Markdown.php
+++ b/app/Core/Markdown.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Core;
+namespace Kanboard\Core;
 
 use Parsedown;
-use Helper\Url;
+use Kanboard\Helper\Url;
 
 /**
  * Specific Markdown rules for Kanboard
diff --git a/app/Core/NotificationInterface.php b/app/Core/NotificationInterface.php
index 5dca74e5f..b6cd17811 100644
--- a/app/Core/NotificationInterface.php
+++ b/app/Core/NotificationInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core;
+namespace Kanboard\Core;
 
 /**
  * Notification Interface
diff --git a/app/Core/OAuth2.php b/app/Core/OAuth2.php
index a7d04f33e..ee6a7837c 100644
--- a/app/Core/OAuth2.php
+++ b/app/Core/OAuth2.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core;
+namespace Kanboard\Core;
 
 /**
  * OAuth2 client
diff --git a/app/Core/ObjectStorage/FileStorage.php b/app/Core/ObjectStorage/FileStorage.php
index 75160e796..683a9e7fb 100644
--- a/app/Core/ObjectStorage/FileStorage.php
+++ b/app/Core/ObjectStorage/FileStorage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core\ObjectStorage;
+namespace Kanboard\Core\ObjectStorage;
 
 /**
  * Local File Storage
diff --git a/app/Core/ObjectStorage/ObjectStorageException.php b/app/Core/ObjectStorage/ObjectStorageException.php
index e89aeb25b..9e98ff51c 100644
--- a/app/Core/ObjectStorage/ObjectStorageException.php
+++ b/app/Core/ObjectStorage/ObjectStorageException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core\ObjectStorage;
+namespace Kanboard\Core\ObjectStorage;
 
 use Exception;
 
diff --git a/app/Core/ObjectStorage/ObjectStorageInterface.php b/app/Core/ObjectStorage/ObjectStorageInterface.php
index 48444d2d6..92277084e 100644
--- a/app/Core/ObjectStorage/ObjectStorageInterface.php
+++ b/app/Core/ObjectStorage/ObjectStorageInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core\ObjectStorage;
+namespace Kanboard\Core\ObjectStorage;
 
 /**
  * Object Storage Interface
diff --git a/app/Core/Paginator.php b/app/Core/Paginator.php
index d00df7ce5..763cb8b9e 100644
--- a/app/Core/Paginator.php
+++ b/app/Core/Paginator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core;
+namespace Kanboard\Core;
 
 use Pimple\Container;
 use PicoDb\Table;
diff --git a/app/Core/Plugin/Base.php b/app/Core/Plugin/Base.php
index 1b7ac8f5d..d8b196e1a 100644
--- a/app/Core/Plugin/Base.php
+++ b/app/Core/Plugin/Base.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core\Plugin;
+namespace Kanboard\Core\Plugin;
 
 /**
  * Plugin Base class
@@ -8,7 +8,7 @@ namespace Core\Plugin;
  * @package  plugin
  * @author   Frederic Guillot
  */
-abstract class Base extends \Core\Base
+abstract class Base extends \Kanboard\Core\Base
 {
     /**
      * Method called for each request
diff --git a/app/Core/Plugin/Hook.php b/app/Core/Plugin/Hook.php
index fa14af131..a3bcd9189 100644
--- a/app/Core/Plugin/Hook.php
+++ b/app/Core/Plugin/Hook.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core\Plugin;
+namespace Kanboard\Core\Plugin;
 
 /**
  * Plugin Hooks Handler
diff --git a/app/Core/Plugin/Loader.php b/app/Core/Plugin/Loader.php
index 9a884daed..ea512c4e6 100644
--- a/app/Core/Plugin/Loader.php
+++ b/app/Core/Plugin/Loader.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Core\Plugin;
+namespace Kanboard\Core\Plugin;
 
 use DirectoryIterator;
 use PDOException;
-use Core\Tool;
+use Kanboard\Core\Tool;
 
 /**
  * Plugin Loader
@@ -12,7 +12,7 @@ use Core\Tool;
  * @package  plugin
  * @author   Frederic Guillot
  */
-class Loader extends \Core\Base
+class Loader extends \Kanboard\Core\Base
 {
     /**
      * Schema version table for plugins
@@ -57,7 +57,7 @@ class Loader extends \Core\Base
      */
     public function load($plugin)
     {
-        $class = '\Plugin\\'.$plugin.'\\Plugin';
+        $class = '\Kanboard\Plugin\\'.$plugin.'\\Plugin';
         $instance = new $class($this->container);
 
         Tool::buildDic($this->container, $instance->getClasses());
@@ -90,7 +90,7 @@ class Loader extends \Core\Base
      */
     public function migrateSchema($plugin)
     {
-        $last_version = constant('\Plugin\\'.$plugin.'\Schema\VERSION');
+        $last_version = constant('\Kanboard\Plugin\\'.$plugin.'\Schema\VERSION');
         $current_version = $this->getSchemaVersion($plugin);
 
         try {
@@ -99,7 +99,7 @@ class Loader extends \Core\Base
             $this->db->getDriver()->disableForeignKeys();
 
             for ($i = $current_version + 1; $i <= $last_version; $i++) {
-                $function_name = '\Plugin\\'.$plugin.'\Schema\version_'.$i;
+                $function_name = '\Kanboard\Plugin\\'.$plugin.'\Schema\version_'.$i;
 
                 if (function_exists($function_name)) {
                     call_user_func($function_name, $this->db->getConnection());
diff --git a/app/Core/Request.php b/app/Core/Request.php
index d0fcdb8e0..f553d7cdb 100644
--- a/app/Core/Request.php
+++ b/app/Core/Request.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core;
+namespace Kanboard\Core;
 
 /**
  * Request class
diff --git a/app/Core/Response.php b/app/Core/Response.php
index 71d995249..c27f0a1d0 100644
--- a/app/Core/Response.php
+++ b/app/Core/Response.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core;
+namespace Kanboard\Core;
 
 /**
  * Response class
diff --git a/app/Core/Router.php b/app/Core/Router.php
index 55ebe4a87..8f366daf5 100644
--- a/app/Core/Router.php
+++ b/app/Core/Router.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core;
+namespace Kanboard\Core;
 
 /**
  * Router class
@@ -219,7 +219,8 @@ class Router extends Base
             $plugin = '';
         }
 
-        $class = empty($plugin) ? '\Controller\\'.ucfirst($this->controller) : '\Plugin\\'.ucfirst($plugin).'\Controller\\'.ucfirst($this->controller);
+        $class = '\Kanboard\\';
+        $class .= empty($plugin) ? 'Controller\\'.ucfirst($this->controller) : 'Plugin\\'.ucfirst($plugin).'\Controller\\'.ucfirst($this->controller);
 
         $instance = new $class($this->container);
         $instance->beforeAction($this->controller, $this->action);
diff --git a/app/Core/Security.php b/app/Core/Security.php
index 0bd7c9916..126de2fd9 100644
--- a/app/Core/Security.php
+++ b/app/Core/Security.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core;
+namespace Kanboard\Core;
 
 /**
  * Security class
diff --git a/app/Core/Session.php b/app/Core/Session.php
index 4f5fde707..a93131c7b 100644
--- a/app/Core/Session.php
+++ b/app/Core/Session.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core;
+namespace Kanboard\Core;
 
 use ArrayAccess;
 
diff --git a/app/Core/Template.php b/app/Core/Template.php
index 9ca904de6..d1e0c25a4 100644
--- a/app/Core/Template.php
+++ b/app/Core/Template.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core;
+namespace Kanboard\Core;
 
 /**
  * Template class
diff --git a/app/Core/Tool.php b/app/Core/Tool.php
index 39e42b83c..1bd43a40e 100644
--- a/app/Core/Tool.php
+++ b/app/Core/Tool.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core;
+namespace Kanboard\Core;
 
 use Pimple\Container;
 
@@ -44,7 +44,7 @@ class Tool
     {
         foreach ($namespaces as $namespace => $classes) {
             foreach ($classes as $name) {
-                $class = '\\'.$namespace.'\\'.$name;
+                $class = '\\Kanboard\\'.$namespace.'\\'.$name;
                 $container[lcfirst($name)] = function ($c) use ($class) {
                     return new $class($c);
                 };
diff --git a/app/Core/Translator.php b/app/Core/Translator.php
index e9aa1f3fb..7dd673633 100644
--- a/app/Core/Translator.php
+++ b/app/Core/Translator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core;
+namespace Kanboard\Core;
 
 /**
  * Translator class
diff --git a/app/Event/AuthEvent.php b/app/Event/AuthEvent.php
index ec1bec99b..7cbced837 100644
--- a/app/Event/AuthEvent.php
+++ b/app/Event/AuthEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Event;
+namespace Kanboard\Event;
 
 use Symfony\Component\EventDispatcher\Event as BaseEvent;
 
diff --git a/app/Event/CommentEvent.php b/app/Event/CommentEvent.php
index 75a132d72..3ac6a2361 100644
--- a/app/Event/CommentEvent.php
+++ b/app/Event/CommentEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Event;
+namespace Kanboard\Event;
 
 class CommentEvent extends GenericEvent
 {
diff --git a/app/Event/FileEvent.php b/app/Event/FileEvent.php
index 81bd83c96..482a4eab0 100644
--- a/app/Event/FileEvent.php
+++ b/app/Event/FileEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Event;
+namespace Kanboard\Event;
 
 class FileEvent extends GenericEvent
 {
diff --git a/app/Event/GenericEvent.php b/app/Event/GenericEvent.php
index b29d8f321..1129fd16f 100644
--- a/app/Event/GenericEvent.php
+++ b/app/Event/GenericEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Event;
+namespace Kanboard\Event;
 
 use ArrayAccess;
 use Symfony\Component\EventDispatcher\Event as BaseEvent;
diff --git a/app/Event/SubtaskEvent.php b/app/Event/SubtaskEvent.php
index 229db8609..f34bb60cd 100644
--- a/app/Event/SubtaskEvent.php
+++ b/app/Event/SubtaskEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Event;
+namespace Kanboard\Event;
 
 class SubtaskEvent extends GenericEvent
 {
diff --git a/app/Event/TaskEvent.php b/app/Event/TaskEvent.php
index e2fb30fee..021cd4b7c 100644
--- a/app/Event/TaskEvent.php
+++ b/app/Event/TaskEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Event;
+namespace Kanboard\Event;
 
 class TaskEvent extends GenericEvent
 {
diff --git a/app/Event/TaskLinkEvent.php b/app/Event/TaskLinkEvent.php
index 9499eef95..b90dcdff5 100644
--- a/app/Event/TaskLinkEvent.php
+++ b/app/Event/TaskLinkEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Event;
+namespace Kanboard\Event;
 
 class TaskLinkEvent extends GenericEvent
 {
diff --git a/app/Formatter/FormatterInterface.php b/app/Formatter/FormatterInterface.php
index 4193bd4e3..0bb612922 100644
--- a/app/Formatter/FormatterInterface.php
+++ b/app/Formatter/FormatterInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Formatter;
+namespace Kanboard\Formatter;
 
 /**
  * Formatter Interface
diff --git a/app/Formatter/ProjectGanttFormatter.php b/app/Formatter/ProjectGanttFormatter.php
index 652b947db..b629bdfab 100644
--- a/app/Formatter/ProjectGanttFormatter.php
+++ b/app/Formatter/ProjectGanttFormatter.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Formatter;
+namespace Kanboard\Formatter;
 
-use Model\Project;
+use Kanboard\Model\Project;
 
 /**
  * Gantt chart formatter for projects
diff --git a/app/Formatter/TaskFilterAutoCompleteFormatter.php b/app/Formatter/TaskFilterAutoCompleteFormatter.php
index 999a89497..c9af46543 100644
--- a/app/Formatter/TaskFilterAutoCompleteFormatter.php
+++ b/app/Formatter/TaskFilterAutoCompleteFormatter.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Formatter;
+namespace Kanboard\Formatter;
 
-use Model\Task;
-use Model\TaskFilter;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskFilter;
 
 /**
  * Autocomplete formatter for task filter
diff --git a/app/Formatter/TaskFilterCalendarEvent.php b/app/Formatter/TaskFilterCalendarEvent.php
index 8733ee83d..12ea86873 100644
--- a/app/Formatter/TaskFilterCalendarEvent.php
+++ b/app/Formatter/TaskFilterCalendarEvent.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Formatter;
+namespace Kanboard\Formatter;
 
-use Model\TaskFilter;
+use Kanboard\Model\TaskFilter;
 
 /**
  * Common class to handle calendar events
diff --git a/app/Formatter/TaskFilterCalendarFormatter.php b/app/Formatter/TaskFilterCalendarFormatter.php
index f3f42b977..1b5d6ca43 100644
--- a/app/Formatter/TaskFilterCalendarFormatter.php
+++ b/app/Formatter/TaskFilterCalendarFormatter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Formatter;
+namespace Kanboard\Formatter;
 
 /**
  * Calendar event formatter for task filter
diff --git a/app/Formatter/TaskFilterGanttFormatter.php b/app/Formatter/TaskFilterGanttFormatter.php
index 069daa3db..08059d4c3 100644
--- a/app/Formatter/TaskFilterGanttFormatter.php
+++ b/app/Formatter/TaskFilterGanttFormatter.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Formatter;
+namespace Kanboard\Formatter;
 
-use Model\TaskFilter;
+use Kanboard\Model\TaskFilter;
 
 /**
  * Gantt chart formatter for task filter
diff --git a/app/Formatter/TaskFilterICalendarFormatter.php b/app/Formatter/TaskFilterICalendarFormatter.php
index 8aed1e206..bdf6b6c23 100644
--- a/app/Formatter/TaskFilterICalendarFormatter.php
+++ b/app/Formatter/TaskFilterICalendarFormatter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Formatter;
+namespace Kanboard\Formatter;
 
 use DateTime;
 use Eluceo\iCal\Component\Calendar;
diff --git a/app/Helper/App.php b/app/Helper/App.php
index 5fb89afe7..0e84f694b 100644
--- a/app/Helper/App.php
+++ b/app/Helper/App.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Helper;
+namespace Kanboard\Helper;
 
 /**
  * Application helpers
@@ -8,7 +8,7 @@ namespace Helper;
  * @package helper
  * @author  Frederic Guillot
  */
-class App extends \Core\Base
+class App extends \Kanboard\Core\Base
 {
     /**
      * Get router controller
diff --git a/app/Helper/Asset.php b/app/Helper/Asset.php
index fd555e079..c4178e8c5 100644
--- a/app/Helper/Asset.php
+++ b/app/Helper/Asset.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Helper;
+namespace Kanboard\Helper;
 
 /**
  * Assets helpers
@@ -8,7 +8,7 @@ namespace Helper;
  * @package helper
  * @author  Frederic Guillot
  */
-class Asset extends \Core\Base
+class Asset extends \Kanboard\Core\Base
 {
     /**
      * Add a Javascript asset
diff --git a/app/Helper/Board.php b/app/Helper/Board.php
index 452a3b70e..430d1858e 100644
--- a/app/Helper/Board.php
+++ b/app/Helper/Board.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Helper;
+namespace Kanboard\Helper;
 
 /**
  * Board Helper
@@ -8,7 +8,7 @@ namespace Helper;
  * @package helper
  * @author  Frederic Guillot
  */
-class Board extends \Core\Base
+class Board extends \Kanboard\Core\Base
 {
     /**
      * Return true if tasks are collapsed
diff --git a/app/Helper/Dt.php b/app/Helper/Dt.php
index b338fdc8f..e717a4c0e 100644
--- a/app/Helper/Dt.php
+++ b/app/Helper/Dt.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Helper;
+namespace Kanboard\Helper;
 
 use DateTime;
 
@@ -10,7 +10,7 @@ use DateTime;
  * @package helper
  * @author  Frederic Guillot
  */
-class Dt extends \Core\Base
+class Dt extends \Kanboard\Core\Base
 {
     /**
      * Get duration in seconds into human format
diff --git a/app/Helper/File.php b/app/Helper/File.php
index a35e42834..b0a7f6751 100644
--- a/app/Helper/File.php
+++ b/app/Helper/File.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Helper;
+namespace Kanboard\Helper;
 
 /**
  * File helpers
@@ -8,7 +8,7 @@ namespace Helper;
  * @package helper
  * @author  Frederic Guillot
  */
-class File extends \Core\Base
+class File extends \Kanboard\Core\Base
 {
     /**
      * Get file icon
diff --git a/app/Helper/Form.php b/app/Helper/Form.php
index e86647714..92d07ccc9 100644
--- a/app/Helper/Form.php
+++ b/app/Helper/Form.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Helper;
+namespace Kanboard\Helper;
 
-use Core\Security;
+use Kanboard\Core\Security;
 
 /**
  * Form helpers
@@ -10,7 +10,7 @@ use Core\Security;
  * @package helper
  * @author  Frederic Guillot
  */
-class Form extends \Core\Base
+class Form extends \Kanboard\Core\Base
 {
     /**
      * Hidden CSRF token field
diff --git a/app/Helper/Hook.php b/app/Helper/Hook.php
index dc76e5e77..7b6919493 100644
--- a/app/Helper/Hook.php
+++ b/app/Helper/Hook.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Helper;
+namespace Kanboard\Helper;
 
 /**
  * Template Hook helpers
@@ -8,7 +8,7 @@ namespace Helper;
  * @package helper
  * @author  Frederic Guillot
  */
-class Hook extends \Core\Base
+class Hook extends \Kanboard\Core\Base
 {
     /**
      * Add assets JS or CSS
diff --git a/app/Helper/Subtask.php b/app/Helper/Subtask.php
index 6348ebd12..d103d453a 100644
--- a/app/Helper/Subtask.php
+++ b/app/Helper/Subtask.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Helper;
+namespace Kanboard\Helper;
 
 /**
  * Subtask helpers
@@ -8,7 +8,7 @@ namespace Helper;
  * @package helper
  * @author  Frederic Guillot
  */
-class Subtask extends \Core\Base
+class Subtask extends \Kanboard\Core\Base
 {
     /**
      * Get the link to toggle subtask status
diff --git a/app/Helper/Task.php b/app/Helper/Task.php
index 79c412e13..1405a1673 100644
--- a/app/Helper/Task.php
+++ b/app/Helper/Task.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Helper;
+namespace Kanboard\Helper;
 
 /**
  * Task helpers
@@ -8,7 +8,7 @@ namespace Helper;
  * @package helper
  * @author  Frederic Guillot
  */
-class Task extends \Core\Base
+class Task extends \Kanboard\Core\Base
 {
     public function getColors()
     {
diff --git a/app/Helper/Text.php b/app/Helper/Text.php
index 4b8e99bd3..d2075fe49 100644
--- a/app/Helper/Text.php
+++ b/app/Helper/Text.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Helper;
+namespace Kanboard\Helper;
 
-use Core\Markdown;
+use Kanboard\Core\Markdown;
 
 /**
  * Text helpers
@@ -10,7 +10,7 @@ use Core\Markdown;
  * @package helper
  * @author  Frederic Guillot
  */
-class Text extends \Core\Base
+class Text extends \Kanboard\Core\Base
 {
     /**
      * Markdown transformation
diff --git a/app/Helper/Url.php b/app/Helper/Url.php
index 22e9035ee..f120252d9 100644
--- a/app/Helper/Url.php
+++ b/app/Helper/Url.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Helper;
+namespace Kanboard\Helper;
 
-use Core\Request;
-use Core\Security;
+use Kanboard\Core\Request;
+use Kanboard\Core\Security;
 
 /**
  * Url helpers
@@ -11,7 +11,7 @@ use Core\Security;
  * @package helper
  * @author  Frederic Guillot
  */
-class Url extends \Core\Base
+class Url extends \Kanboard\Core\Base
 {
     private $base = '';
     private $directory = '';
diff --git a/app/Helper/User.php b/app/Helper/User.php
index 6b7d6f73e..dc394738f 100644
--- a/app/Helper/User.php
+++ b/app/Helper/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Helper;
+namespace Kanboard\Helper;
 
 /**
  * User helpers
@@ -8,7 +8,7 @@ namespace Helper;
  * @package helper
  * @author  Frederic Guillot
  */
-class User extends \Core\Base
+class User extends \Kanboard\Core\Base
 {
     /**
      * Return true if the logged user as unread notifications
diff --git a/app/Integration/BitbucketWebhook.php b/app/Integration/BitbucketWebhook.php
index d9dc45b1d..b78c4d77a 100644
--- a/app/Integration/BitbucketWebhook.php
+++ b/app/Integration/BitbucketWebhook.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Integration;
+namespace Kanboard\Integration;
 
-use Event\GenericEvent;
-use Model\Task;
+use Kanboard\Event\GenericEvent;
+use Kanboard\Model\Task;
 
 /**
  * Bitbucket Webhook
@@ -11,7 +11,7 @@ use Model\Task;
  * @package  integration
  * @author   Frederic Guillot
  */
-class BitbucketWebhook extends \Core\Base
+class BitbucketWebhook extends \Kanboard\Core\Base
 {
     /**
      * Events
diff --git a/app/Integration/GithubWebhook.php b/app/Integration/GithubWebhook.php
index a725f5b9c..c948ea8b2 100644
--- a/app/Integration/GithubWebhook.php
+++ b/app/Integration/GithubWebhook.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Integration;
+namespace Kanboard\Integration;
 
-use Event\GenericEvent;
-use Model\Task;
+use Kanboard\Event\GenericEvent;
+use Kanboard\Model\Task;
 
 /**
  * Github Webhook
@@ -11,7 +11,7 @@ use Model\Task;
  * @package  integration
  * @author   Frederic Guillot
  */
-class GithubWebhook extends \Core\Base
+class GithubWebhook extends \Kanboard\Core\Base
 {
     /**
      * Events
diff --git a/app/Integration/GitlabWebhook.php b/app/Integration/GitlabWebhook.php
index b8925dafb..4b90ef7fe 100644
--- a/app/Integration/GitlabWebhook.php
+++ b/app/Integration/GitlabWebhook.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Integration;
+namespace Kanboard\Integration;
 
-use Event\GenericEvent;
-use Model\Task;
+use Kanboard\Event\GenericEvent;
+use Kanboard\Model\Task;
 
 /**
  * Gitlab Webhook
@@ -11,7 +11,7 @@ use Model\Task;
  * @package  integration
  * @author   Frederic Guillot
  */
-class GitlabWebhook extends \Core\Base
+class GitlabWebhook extends \Kanboard\Core\Base
 {
     /**
      * Events
diff --git a/app/Integration/HipchatWebhook.php b/app/Integration/HipchatWebhook.php
index 1d08e514d..af1e44958 100644
--- a/app/Integration/HipchatWebhook.php
+++ b/app/Integration/HipchatWebhook.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Integration;
+namespace Kanboard\Integration;
 
 /**
  * Hipchat webhook
@@ -8,7 +8,7 @@ namespace Integration;
  * @package  integration
  * @author   Frederic Guillot
  */
-class HipchatWebhook extends \Core\Base
+class HipchatWebhook extends \Kanboard\Core\Base
 {
     /**
      * Return true if Hipchat is enabled for this project or globally
diff --git a/app/Integration/Jabber.php b/app/Integration/Jabber.php
index eaf1c5a86..9c7dcd408 100644
--- a/app/Integration/Jabber.php
+++ b/app/Integration/Jabber.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Integration;
+namespace Kanboard\Integration;
 
 use Exception;
 use Fabiang\Xmpp\Options;
@@ -14,7 +14,7 @@ use Fabiang\Xmpp\Protocol\Presence;
  * @package  integration
  * @author   Frederic Guillot
  */
-class Jabber extends \Core\Base
+class Jabber extends \Kanboard\Core\Base
 {
     /**
      * Return true if Jabber is enabled for this project or globally
diff --git a/app/Integration/Mailgun.php b/app/Integration/Mailgun.php
index 076c311a3..045284d22 100644
--- a/app/Integration/Mailgun.php
+++ b/app/Integration/Mailgun.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Integration;
+namespace Kanboard\Integration;
 
-use Core\Tool;
+use Kanboard\Core\Tool;
 
 /**
  * Mailgun Integration
@@ -10,7 +10,7 @@ use Core\Tool;
  * @package  integration
  * @author   Frederic Guillot
  */
-class Mailgun extends \Core\Base
+class Mailgun extends \Kanboard\Core\Base
 {
     /**
      * Send a HTML email
diff --git a/app/Integration/Postmark.php b/app/Integration/Postmark.php
index 05bdf58ba..b57f92d42 100644
--- a/app/Integration/Postmark.php
+++ b/app/Integration/Postmark.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Integration;
+namespace Kanboard\Integration;
 
 /**
  * Postmark integration
@@ -8,7 +8,7 @@ namespace Integration;
  * @package  integration
  * @author   Frederic Guillot
  */
-class Postmark extends \Core\Base
+class Postmark extends \Kanboard\Core\Base
 {
     /**
      * Send a HTML email
diff --git a/app/Integration/Sendgrid.php b/app/Integration/Sendgrid.php
index fd58342ab..2da871194 100644
--- a/app/Integration/Sendgrid.php
+++ b/app/Integration/Sendgrid.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Integration;
+namespace Kanboard\Integration;
 
-use Core\Tool;
+use Kanboard\Core\Tool;
 
 /**
  * Sendgrid Integration
@@ -10,7 +10,7 @@ use Core\Tool;
  * @package  integration
  * @author   Frederic Guillot
  */
-class Sendgrid extends \Core\Base
+class Sendgrid extends \Kanboard\Core\Base
 {
     /**
      * Send a HTML email
diff --git a/app/Integration/SlackWebhook.php b/app/Integration/SlackWebhook.php
index 712447390..e216ed5b3 100644
--- a/app/Integration/SlackWebhook.php
+++ b/app/Integration/SlackWebhook.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Integration;
+namespace Kanboard\Integration;
 
 /**
  * Slack Webhook
@@ -8,7 +8,7 @@ namespace Integration;
  * @package  integration
  * @author   Frederic Guillot
  */
-class SlackWebhook extends \Core\Base
+class SlackWebhook extends \Kanboard\Core\Base
 {
     /**
      * Return true if Slack is enabled for this project or globally
diff --git a/app/Integration/Smtp.php b/app/Integration/Smtp.php
index ad2f30f84..3ef6539d4 100644
--- a/app/Integration/Smtp.php
+++ b/app/Integration/Smtp.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Integration;
+namespace Kanboard\Integration;
 
 use Swift_Message;
 use Swift_Mailer;
@@ -15,7 +15,7 @@ use Swift_TransportException;
  * @package  integration
  * @author   Frederic Guillot
  */
-class Smtp extends \Core\Base
+class Smtp extends \Kanboard\Core\Base
 {
     /**
      * Send a HTML email
diff --git a/app/Model/Acl.php b/app/Model/Acl.php
index 35488c637..92ce0c5a0 100644
--- a/app/Model/Acl.php
+++ b/app/Model/Acl.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 /**
  * Access List
diff --git a/app/Model/Action.php b/app/Model/Action.php
index 57bd5b0d3..b48e3ae35 100644
--- a/app/Model/Action.php
+++ b/app/Model/Action.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
-use Integration\GitlabWebhook;
-use Integration\GithubWebhook;
-use Integration\BitbucketWebhook;
+use Kanboard\Integration\GitlabWebhook;
+use Kanboard\Integration\GithubWebhook;
+use Kanboard\Integration\BitbucketWebhook;
 use SimpleValidator\Validator;
 use SimpleValidator\Validators;
 
@@ -320,7 +320,7 @@ class Action extends Base
      */
     public function load($name, $project_id, $event)
     {
-        $className = $name{0} !== '\\' ? '\Action\\'.$name : $name;
+        $className = $name{0} !== '\\' ? '\Kanboard\Action\\'.$name : $name;
         return new $className($this->container, $project_id, $event);
     }
 
diff --git a/app/Model/Authentication.php b/app/Model/Authentication.php
index 93a463f1e..acd563bce 100644
--- a/app/Model/Authentication.php
+++ b/app/Model/Authentication.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
-use Core\Request;
+use Kanboard\Core\Request;
 use SimpleValidator\Validator;
 use SimpleValidator\Validators;
 use Gregwar\Captcha\CaptchaBuilder;
@@ -25,7 +25,7 @@ class Authentication extends Base
     public function backend($name)
     {
         if (! isset($this->container[$name])) {
-            $class = '\Auth\\'.ucfirst($name);
+            $class = '\Kanboard\Auth\\'.ucfirst($name);
             $this->container[$name] = new $class($this->container);
         }
 
diff --git a/app/Model/Base.php b/app/Model/Base.php
index 902ab2696..4c7ada7c4 100644
--- a/app/Model/Base.php
+++ b/app/Model/Base.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 use Pimple\Container;
 
@@ -10,7 +10,7 @@ use Pimple\Container;
  * @package  model
  * @author   Frederic Guillot
  */
-abstract class Base extends \Core\Base
+abstract class Base extends \Kanboard\Core\Base
 {
     /**
      * Save a record in the database
diff --git a/app/Model/Board.php b/app/Model/Board.php
index 7217542d2..6b450d224 100644
--- a/app/Model/Board.php
+++ b/app/Model/Board.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 use SimpleValidator\Validator;
 use SimpleValidator\Validators;
diff --git a/app/Model/Category.php b/app/Model/Category.php
index f50c0f488..9cc2a193c 100644
--- a/app/Model/Category.php
+++ b/app/Model/Category.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 use SimpleValidator\Validator;
 use SimpleValidator\Validators;
diff --git a/app/Model/Color.php b/app/Model/Color.php
index 6df7beb8e..4ded2e1ef 100644
--- a/app/Model/Color.php
+++ b/app/Model/Color.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 /**
  * Color model
diff --git a/app/Model/Comment.php b/app/Model/Comment.php
index c1c800c3d..c7125a252 100644
--- a/app/Model/Comment.php
+++ b/app/Model/Comment.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
-use Event\CommentEvent;
+use Kanboard\Event\CommentEvent;
 use SimpleValidator\Validator;
 use SimpleValidator\Validators;
 
diff --git a/app/Model/Config.php b/app/Model/Config.php
index bbc86a880..6561efc84 100644
--- a/app/Model/Config.php
+++ b/app/Model/Config.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
-use Core\Translator;
-use Core\Security;
-use Core\Session;
+use Kanboard\Core\Translator;
+use Kanboard\Core\Security;
+use Kanboard\Core\Session;
 
 /**
  * Config model
diff --git a/app/Model/Currency.php b/app/Model/Currency.php
index d04df7633..c1156610e 100644
--- a/app/Model/Currency.php
+++ b/app/Model/Currency.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 use SimpleValidator\Validator;
 use SimpleValidator\Validators;
diff --git a/app/Model/CustomFilter.php b/app/Model/CustomFilter.php
index b7ccdf99f..6550b4a75 100644
--- a/app/Model/CustomFilter.php
+++ b/app/Model/CustomFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 use SimpleValidator\Validator;
 use SimpleValidator\Validators;
diff --git a/app/Model/DateParser.php b/app/Model/DateParser.php
index 002fc0385..8159341d7 100644
--- a/app/Model/DateParser.php
+++ b/app/Model/DateParser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 use DateTime;
 
diff --git a/app/Model/EmailNotification.php b/app/Model/EmailNotification.php
index 39b60fc17..312828e4c 100644
--- a/app/Model/EmailNotification.php
+++ b/app/Model/EmailNotification.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
-use Core\NotificationInterface;
+use Kanboard\Core\NotificationInterface;
 
 /**
  * Email Notification model
diff --git a/app/Model/File.php b/app/Model/File.php
index 1d44a415c..e4430217f 100644
--- a/app/Model/File.php
+++ b/app/Model/File.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
-use Event\FileEvent;
-use Core\Tool;
-use Core\ObjectStorage\ObjectStorageException;
+use Kanboard\Event\FileEvent;
+use Kanboard\Core\Tool;
+use Kanboard\Core\ObjectStorage\ObjectStorageException;
 
 /**
  * File model
diff --git a/app/Model/LastLogin.php b/app/Model/LastLogin.php
index dd64284ef..f4be8a9dc 100644
--- a/app/Model/LastLogin.php
+++ b/app/Model/LastLogin.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 /**
  * LastLogin model
diff --git a/app/Model/Link.php b/app/Model/Link.php
index 467710bd8..4e1b4e6b1 100644
--- a/app/Model/Link.php
+++ b/app/Model/Link.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 use PDO;
 use SimpleValidator\Validator;
diff --git a/app/Model/Notification.php b/app/Model/Notification.php
index 525e7f13e..692f37a79 100644
--- a/app/Model/Notification.php
+++ b/app/Model/Notification.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
-use Core\Translator;
+use Kanboard\Core\Translator;
 
 /**
  * Notification model
diff --git a/app/Model/NotificationFilter.php b/app/Model/NotificationFilter.php
index 627955121..f1ad367bb 100644
--- a/app/Model/NotificationFilter.php
+++ b/app/Model/NotificationFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 /**
  * Notification Filter model
diff --git a/app/Model/NotificationType.php b/app/Model/NotificationType.php
index 3fd5c1570..b0514b19f 100644
--- a/app/Model/NotificationType.php
+++ b/app/Model/NotificationType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 /**
  * Notification Type model
diff --git a/app/Model/OverdueNotification.php b/app/Model/OverdueNotification.php
index 19bd09876..f44c8dd76 100644
--- a/app/Model/OverdueNotification.php
+++ b/app/Model/OverdueNotification.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 /**
  * Task Overdue Notification model
diff --git a/app/Model/Project.php b/app/Model/Project.php
index 1bd5b6247..b767af262 100644
--- a/app/Model/Project.php
+++ b/app/Model/Project.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 use SimpleValidator\Validator;
 use SimpleValidator\Validators;
-use Core\Security;
+use Kanboard\Core\Security;
 
 /**
  * Project model
diff --git a/app/Model/ProjectActivity.php b/app/Model/ProjectActivity.php
index a9222fcc7..527abf589 100644
--- a/app/Model/ProjectActivity.php
+++ b/app/Model/ProjectActivity.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 /**
  * Project activity model
diff --git a/app/Model/ProjectAnalytic.php b/app/Model/ProjectAnalytic.php
index dbca4eedb..34d152d12 100644
--- a/app/Model/ProjectAnalytic.php
+++ b/app/Model/ProjectAnalytic.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 /**
  * Project analytic model
diff --git a/app/Model/ProjectDailyColumnStats.php b/app/Model/ProjectDailyColumnStats.php
index 774ed7f9d..2228dcf8b 100644
--- a/app/Model/ProjectDailyColumnStats.php
+++ b/app/Model/ProjectDailyColumnStats.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 /**
  * Project Daily Column Stats
diff --git a/app/Model/ProjectDailyStats.php b/app/Model/ProjectDailyStats.php
index 56a51730d..b98c23ffb 100644
--- a/app/Model/ProjectDailyStats.php
+++ b/app/Model/ProjectDailyStats.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 /**
  * Project Daily Stats
diff --git a/app/Model/ProjectDuplication.php b/app/Model/ProjectDuplication.php
index 6e054a4bb..f0c668348 100644
--- a/app/Model/ProjectDuplication.php
+++ b/app/Model/ProjectDuplication.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 /**
  * Project Duplication
diff --git a/app/Model/ProjectIntegration.php b/app/Model/ProjectIntegration.php
index bcbfeae58..d07e41676 100644
--- a/app/Model/ProjectIntegration.php
+++ b/app/Model/ProjectIntegration.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 /**
  * Project integration
diff --git a/app/Model/ProjectPermission.php b/app/Model/ProjectPermission.php
index c412b7a91..36987d475 100644
--- a/app/Model/ProjectPermission.php
+++ b/app/Model/ProjectPermission.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 use SimpleValidator\Validator;
 use SimpleValidator\Validators;
diff --git a/app/Model/Subtask.php b/app/Model/Subtask.php
index 3c6269f12..bb6606b3c 100644
--- a/app/Model/Subtask.php
+++ b/app/Model/Subtask.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
-use Event\SubtaskEvent;
+use Kanboard\Event\SubtaskEvent;
 use SimpleValidator\Validator;
 use SimpleValidator\Validators;
 
diff --git a/app/Model/SubtaskExport.php b/app/Model/SubtaskExport.php
index 23dcc0193..7c4e941de 100644
--- a/app/Model/SubtaskExport.php
+++ b/app/Model/SubtaskExport.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 /**
  * Subtask Export
diff --git a/app/Model/SubtaskTimeTracking.php b/app/Model/SubtaskTimeTracking.php
index 4a18c8aad..86a4b2138 100644
--- a/app/Model/SubtaskTimeTracking.php
+++ b/app/Model/SubtaskTimeTracking.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 use DateTime;
 
diff --git a/app/Model/Swimlane.php b/app/Model/Swimlane.php
index 06e879a43..1aa19fee5 100644
--- a/app/Model/Swimlane.php
+++ b/app/Model/Swimlane.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 use SimpleValidator\Validator;
 use SimpleValidator\Validators;
diff --git a/app/Model/Task.php b/app/Model/Task.php
index a1bbca93f..f1cd094fb 100644
--- a/app/Model/Task.php
+++ b/app/Model/Task.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 /**
  * Task model
diff --git a/app/Model/TaskAnalytic.php b/app/Model/TaskAnalytic.php
index 33a645c1d..c6d4191cd 100644
--- a/app/Model/TaskAnalytic.php
+++ b/app/Model/TaskAnalytic.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 /**
  * Task Analytic
diff --git a/app/Model/TaskCreation.php b/app/Model/TaskCreation.php
index 4373fa638..b6d8fbae5 100644
--- a/app/Model/TaskCreation.php
+++ b/app/Model/TaskCreation.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
-use Event\TaskEvent;
+use Kanboard\Event\TaskEvent;
 
 /**
  * Task Creation
diff --git a/app/Model/TaskDuplication.php b/app/Model/TaskDuplication.php
index 958b2b3ec..60fcac0cb 100755
--- a/app/Model/TaskDuplication.php
+++ b/app/Model/TaskDuplication.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 use DateTime;
 use DateInterval;
-use Event\TaskEvent;
+use Kanboard\Event\TaskEvent;
 
 /**
  * Task Duplication
diff --git a/app/Model/TaskExport.php b/app/Model/TaskExport.php
index 90aa19642..d38a5384b 100644
--- a/app/Model/TaskExport.php
+++ b/app/Model/TaskExport.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 use PDO;
 
diff --git a/app/Model/TaskFilter.php b/app/Model/TaskFilter.php
index efd3be616..6500eddae 100644
--- a/app/Model/TaskFilter.php
+++ b/app/Model/TaskFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 /**
  * Task Filter
diff --git a/app/Model/TaskFinder.php b/app/Model/TaskFinder.php
index 9e76e62e9..9514fe4ae 100644
--- a/app/Model/TaskFinder.php
+++ b/app/Model/TaskFinder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 use PDO;
 
diff --git a/app/Model/TaskImport.php b/app/Model/TaskImport.php
index 2eb4eb8f3..92c8f4007 100644
--- a/app/Model/TaskImport.php
+++ b/app/Model/TaskImport.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
-use Core\Csv;
+use Kanboard\Core\Csv;
 use SimpleValidator\Validator;
 use SimpleValidator\Validators;
 
diff --git a/app/Model/TaskLink.php b/app/Model/TaskLink.php
index 1c7d6287b..fafcde654 100644
--- a/app/Model/TaskLink.php
+++ b/app/Model/TaskLink.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 use SimpleValidator\Validator;
 use SimpleValidator\Validators;
-use Event\TaskLinkEvent;
+use Kanboard\Event\TaskLinkEvent;
 
 /**
  * TaskLink model
diff --git a/app/Model/TaskModification.php b/app/Model/TaskModification.php
index b67106e15..9cca5b309 100644
--- a/app/Model/TaskModification.php
+++ b/app/Model/TaskModification.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
-use Event\TaskEvent;
+use Kanboard\Event\TaskEvent;
 
 /**
  * Task Modification
diff --git a/app/Model/TaskPermission.php b/app/Model/TaskPermission.php
index e2420e102..501c8edcc 100644
--- a/app/Model/TaskPermission.php
+++ b/app/Model/TaskPermission.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 /**
  * Task permission model
diff --git a/app/Model/TaskPosition.php b/app/Model/TaskPosition.php
index 874633b18..1ad17b367 100644
--- a/app/Model/TaskPosition.php
+++ b/app/Model/TaskPosition.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
-use Event\TaskEvent;
+use Kanboard\Event\TaskEvent;
 
 /**
  * Task Position
diff --git a/app/Model/TaskStatus.php b/app/Model/TaskStatus.php
index 23d77fa4a..a5199ed96 100644
--- a/app/Model/TaskStatus.php
+++ b/app/Model/TaskStatus.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
-use Event\TaskEvent;
+use Kanboard\Event\TaskEvent;
 
 /**
  * Task Status
diff --git a/app/Model/TaskValidator.php b/app/Model/TaskValidator.php
index 89c66f2ff..683cb0b19 100644
--- a/app/Model/TaskValidator.php
+++ b/app/Model/TaskValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 use SimpleValidator\Validator;
 use SimpleValidator\Validators;
diff --git a/app/Model/Transition.php b/app/Model/Transition.php
index ac3fba549..b1f8f678b 100644
--- a/app/Model/Transition.php
+++ b/app/Model/Transition.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 /**
  * Transition model
diff --git a/app/Model/User.php b/app/Model/User.php
index 2b6436f80..138b77b2b 100644
--- a/app/Model/User.php
+++ b/app/Model/User.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 use SimpleValidator\Validator;
 use SimpleValidator\Validators;
-use Core\Session;
-use Core\Security;
+use Kanboard\Core\Session;
+use Kanboard\Core\Security;
 
 /**
  * User model
diff --git a/app/Model/UserImport.php b/app/Model/UserImport.php
index 3d7c0febf..1a398d120 100644
--- a/app/Model/UserImport.php
+++ b/app/Model/UserImport.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 use SimpleValidator\Validator;
 use SimpleValidator\Validators;
-use Core\Csv;
+use Kanboard\Core\Csv;
 
 /**
  * User Import
diff --git a/app/Model/UserSession.php b/app/Model/UserSession.php
index 4c0364ce1..56359bf2a 100644
--- a/app/Model/UserSession.php
+++ b/app/Model/UserSession.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
-use Core\Translator;
+use Kanboard\Core\Translator;
 
 /**
  * User Session
diff --git a/app/Model/WebNotification.php b/app/Model/WebNotification.php
index 4f4e8afb3..02bcc9561 100644
--- a/app/Model/WebNotification.php
+++ b/app/Model/WebNotification.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
-use Core\NotificationInterface;
+use Kanboard\Core\NotificationInterface;
 
 /**
  * Web Notification model
diff --git a/app/Model/Webhook.php b/app/Model/Webhook.php
index e3af37f74..dd277bf8d 100644
--- a/app/Model/Webhook.php
+++ b/app/Model/Webhook.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Model;
+namespace Kanboard\Model;
 
 /**
  * Webhook model
diff --git a/app/Schema/Mysql.php b/app/Schema/Mysql.php
index 6ece27852..a0febc1ad 100644
--- a/app/Schema/Mysql.php
+++ b/app/Schema/Mysql.php
@@ -3,8 +3,8 @@
 namespace Schema;
 
 use PDO;
-use Core\Security;
-use Model\Link;
+use Kanboard\Core\Security;
+use Kanboard\Model\Link;
 
 const VERSION = 91;
 
diff --git a/app/Schema/Postgres.php b/app/Schema/Postgres.php
index d4fae317c..517ded859 100644
--- a/app/Schema/Postgres.php
+++ b/app/Schema/Postgres.php
@@ -3,8 +3,8 @@
 namespace Schema;
 
 use PDO;
-use Core\Security;
-use Model\Link;
+use Kanboard\Core\Security;
+use Kanboard\Model\Link;
 
 const VERSION = 71;
 
diff --git a/app/Schema/Sqlite.php b/app/Schema/Sqlite.php
index 2b9ceadc6..e9e86fcc1 100644
--- a/app/Schema/Sqlite.php
+++ b/app/Schema/Sqlite.php
@@ -2,9 +2,9 @@
 
 namespace Schema;
 
-use Core\Security;
+use Kanboard\Core\Security;
 use PDO;
-use Model\Link;
+use Kanboard\Model\Link;
 
 const VERSION = 86;
 
diff --git a/app/ServiceProvider/ClassProvider.php b/app/ServiceProvider/ClassProvider.php
index 2db0ec54d..d91bced7b 100644
--- a/app/ServiceProvider/ClassProvider.php
+++ b/app/ServiceProvider/ClassProvider.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace ServiceProvider;
+namespace Kanboard\ServiceProvider;
 
-use Core\Plugin\Loader;
-use Core\ObjectStorage\FileStorage;
-use Core\Paginator;
-use Core\OAuth2;
-use Core\Tool;
-use Model\Config;
-use Model\Project;
-use Model\Webhook;
+use Kanboard\Core\Plugin\Loader;
+use Kanboard\Core\ObjectStorage\FileStorage;
+use Kanboard\Core\Paginator;
+use Kanboard\Core\OAuth2;
+use Kanboard\Core\Tool;
+use Kanboard\Model\Config;
+use Kanboard\Model\Project;
+use Kanboard\Model\Webhook;
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 use League\HTMLToMarkdown\HtmlConverter;
diff --git a/app/ServiceProvider/DatabaseProvider.php b/app/ServiceProvider/DatabaseProvider.php
index 8300fe7df..a49a5f1b5 100644
--- a/app/ServiceProvider/DatabaseProvider.php
+++ b/app/ServiceProvider/DatabaseProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ServiceProvider;
+namespace Kanboard\ServiceProvider;
 
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
diff --git a/app/ServiceProvider/EventDispatcherProvider.php b/app/ServiceProvider/EventDispatcherProvider.php
index aa71d61bc..353d607b0 100644
--- a/app/ServiceProvider/EventDispatcherProvider.php
+++ b/app/ServiceProvider/EventDispatcherProvider.php
@@ -1,21 +1,21 @@
 <?php
 
-namespace ServiceProvider;
+namespace Kanboard\ServiceProvider;
 
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 use Symfony\Component\EventDispatcher\EventDispatcher;
-use Subscriber\AuthSubscriber;
-use Subscriber\BootstrapSubscriber;
-use Subscriber\NotificationSubscriber;
-use Subscriber\ProjectActivitySubscriber;
-use Subscriber\ProjectDailySummarySubscriber;
-use Subscriber\ProjectModificationDateSubscriber;
-use Subscriber\WebhookSubscriber;
-use Subscriber\SubtaskTimeTrackingSubscriber;
-use Subscriber\TaskMovedDateSubscriber;
-use Subscriber\TransitionSubscriber;
-use Subscriber\RecurringTaskSubscriber;
+use Kanboard\Subscriber\AuthSubscriber;
+use Kanboard\Subscriber\BootstrapSubscriber;
+use Kanboard\Subscriber\NotificationSubscriber;
+use Kanboard\Subscriber\ProjectActivitySubscriber;
+use Kanboard\Subscriber\ProjectDailySummarySubscriber;
+use Kanboard\Subscriber\ProjectModificationDateSubscriber;
+use Kanboard\Subscriber\WebhookSubscriber;
+use Kanboard\Subscriber\SubtaskTimeTrackingSubscriber;
+use Kanboard\Subscriber\TaskMovedDateSubscriber;
+use Kanboard\Subscriber\TransitionSubscriber;
+use Kanboard\Subscriber\RecurringTaskSubscriber;
 
 class EventDispatcherProvider implements ServiceProviderInterface
 {
diff --git a/app/ServiceProvider/LoggingProvider.php b/app/ServiceProvider/LoggingProvider.php
index 16fa6cec1..4344bcccc 100644
--- a/app/ServiceProvider/LoggingProvider.php
+++ b/app/ServiceProvider/LoggingProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ServiceProvider;
+namespace Kanboard\ServiceProvider;
 
 use Psr\Log\LogLevel;
 use Pimple\Container;
diff --git a/app/Subscriber/AuthSubscriber.php b/app/Subscriber/AuthSubscriber.php
index b814057fe..2461b52c0 100644
--- a/app/Subscriber/AuthSubscriber.php
+++ b/app/Subscriber/AuthSubscriber.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Subscriber;
+namespace Kanboard\Subscriber;
 
-use Core\Request;
-use Event\AuthEvent;
+use Kanboard\Core\Request;
+use Kanboard\Event\AuthEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class AuthSubscriber extends \Core\Base implements EventSubscriberInterface
+class AuthSubscriber extends \Kanboard\Core\Base implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
diff --git a/app/Subscriber/BootstrapSubscriber.php b/app/Subscriber/BootstrapSubscriber.php
index 793ba3e76..25b919f77 100644
--- a/app/Subscriber/BootstrapSubscriber.php
+++ b/app/Subscriber/BootstrapSubscriber.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Subscriber;
+namespace Kanboard\Subscriber;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class BootstrapSubscriber extends \Core\Base implements EventSubscriberInterface
+class BootstrapSubscriber extends \Kanboard\Core\Base implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
diff --git a/app/Subscriber/NotificationSubscriber.php b/app/Subscriber/NotificationSubscriber.php
index b99c29450..610fbadb6 100644
--- a/app/Subscriber/NotificationSubscriber.php
+++ b/app/Subscriber/NotificationSubscriber.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Subscriber;
+namespace Kanboard\Subscriber;
 
-use Event\GenericEvent;
-use Model\Task;
-use Model\Comment;
-use Model\Subtask;
-use Model\File;
+use Kanboard\Event\GenericEvent;
+use Kanboard\Model\Task;
+use Kanboard\Model\Comment;
+use Kanboard\Model\Subtask;
+use Kanboard\Model\File;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class NotificationSubscriber extends \Core\Base implements EventSubscriberInterface
+class NotificationSubscriber extends \Kanboard\Core\Base implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
@@ -40,19 +40,19 @@ class NotificationSubscriber extends \Core\Base implements EventSubscriberInterf
         $values = array();
 
         switch (get_class($event)) {
-            case 'Event\TaskEvent':
+            case 'Kanboard\Event\TaskEvent':
                 $values['task'] = $this->taskFinder->getDetails($event['task_id']);
                 $values['changes'] = isset($event['changes']) ? $event['changes'] : array();
                 break;
-            case 'Event\SubtaskEvent':
+            case 'Kanboard\Event\SubtaskEvent':
                 $values['subtask'] = $this->subtask->getById($event['id'], true);
                 $values['task'] = $this->taskFinder->getDetails($values['subtask']['task_id']);
                 break;
-            case 'Event\FileEvent':
+            case 'Kanboard\Event\FileEvent':
                 $values['file'] = $event->getAll();
                 $values['task'] = $this->taskFinder->getDetails($values['file']['task_id']);
                 break;
-            case 'Event\CommentEvent':
+            case 'Kanboard\Event\CommentEvent':
                 $values['comment'] = $this->comment->getById($event['id']);
                 $values['task'] = $this->taskFinder->getDetails($values['comment']['task_id']);
                 break;
diff --git a/app/Subscriber/ProjectActivitySubscriber.php b/app/Subscriber/ProjectActivitySubscriber.php
index 82b13d8e3..f8d5d1506 100644
--- a/app/Subscriber/ProjectActivitySubscriber.php
+++ b/app/Subscriber/ProjectActivitySubscriber.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Subscriber;
+namespace Kanboard\Subscriber;
 
-use Event\GenericEvent;
-use Model\Task;
-use Model\Comment;
-use Model\Subtask;
+use Kanboard\Event\GenericEvent;
+use Kanboard\Model\Task;
+use Kanboard\Model\Comment;
+use Kanboard\Model\Subtask;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class ProjectActivitySubscriber extends \Core\Base implements EventSubscriberInterface
+class ProjectActivitySubscriber extends \Kanboard\Core\Base implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
diff --git a/app/Subscriber/ProjectDailySummarySubscriber.php b/app/Subscriber/ProjectDailySummarySubscriber.php
index db180dea8..bfa6cd425 100644
--- a/app/Subscriber/ProjectDailySummarySubscriber.php
+++ b/app/Subscriber/ProjectDailySummarySubscriber.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Subscriber;
+namespace Kanboard\Subscriber;
 
-use Event\TaskEvent;
-use Model\Task;
+use Kanboard\Event\TaskEvent;
+use Kanboard\Model\Task;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class ProjectDailySummarySubscriber extends \Core\Base implements EventSubscriberInterface
+class ProjectDailySummarySubscriber extends \Kanboard\Core\Base implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
diff --git a/app/Subscriber/ProjectModificationDateSubscriber.php b/app/Subscriber/ProjectModificationDateSubscriber.php
index 2c01173b9..1f99840d2 100644
--- a/app/Subscriber/ProjectModificationDateSubscriber.php
+++ b/app/Subscriber/ProjectModificationDateSubscriber.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Subscriber;
+namespace Kanboard\Subscriber;
 
-use Event\GenericEvent;
-use Model\Task;
+use Kanboard\Event\GenericEvent;
+use Kanboard\Model\Task;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class ProjectModificationDateSubscriber extends \Core\Base implements EventSubscriberInterface
+class ProjectModificationDateSubscriber extends \Kanboard\Core\Base implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
diff --git a/app/Subscriber/RecurringTaskSubscriber.php b/app/Subscriber/RecurringTaskSubscriber.php
index 68d704f09..793233c62 100644
--- a/app/Subscriber/RecurringTaskSubscriber.php
+++ b/app/Subscriber/RecurringTaskSubscriber.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Subscriber;
+namespace Kanboard\Subscriber;
 
-use Event\TaskEvent;
-use Model\Task;
+use Kanboard\Event\TaskEvent;
+use Kanboard\Model\Task;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class RecurringTaskSubscriber extends \Core\Base implements EventSubscriberInterface
+class RecurringTaskSubscriber extends \Kanboard\Core\Base implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
diff --git a/app/Subscriber/SubtaskTimeTrackingSubscriber.php b/app/Subscriber/SubtaskTimeTrackingSubscriber.php
index 2d3b5f994..bb522b2ee 100644
--- a/app/Subscriber/SubtaskTimeTrackingSubscriber.php
+++ b/app/Subscriber/SubtaskTimeTrackingSubscriber.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Subscriber;
+namespace Kanboard\Subscriber;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Model\Subtask;
-use Event\SubtaskEvent;
+use Kanboard\Model\Subtask;
+use Kanboard\Event\SubtaskEvent;
 
-class SubtaskTimeTrackingSubscriber extends \Core\Base implements EventSubscriberInterface
+class SubtaskTimeTrackingSubscriber extends \Kanboard\Core\Base implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
diff --git a/app/Subscriber/TaskMovedDateSubscriber.php b/app/Subscriber/TaskMovedDateSubscriber.php
index 16a75c198..9857f4b39 100644
--- a/app/Subscriber/TaskMovedDateSubscriber.php
+++ b/app/Subscriber/TaskMovedDateSubscriber.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Subscriber;
+namespace Kanboard\Subscriber;
 
-use Event\TaskEvent;
-use Model\Task;
+use Kanboard\Event\TaskEvent;
+use Kanboard\Model\Task;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class TaskMovedDateSubscriber extends \Core\Base implements EventSubscriberInterface
+class TaskMovedDateSubscriber extends \Kanboard\Core\Base implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
diff --git a/app/Subscriber/TransitionSubscriber.php b/app/Subscriber/TransitionSubscriber.php
index 5804dab7a..f14590f77 100644
--- a/app/Subscriber/TransitionSubscriber.php
+++ b/app/Subscriber/TransitionSubscriber.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Subscriber;
+namespace Kanboard\Subscriber;
 
-use Event\TaskEvent;
-use Model\Task;
+use Kanboard\Event\TaskEvent;
+use Kanboard\Model\Task;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class TransitionSubscriber extends \Core\Base implements EventSubscriberInterface
+class TransitionSubscriber extends \Kanboard\Core\Base implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
diff --git a/app/Subscriber/WebhookSubscriber.php b/app/Subscriber/WebhookSubscriber.php
index 5176a7ff7..8a2bd080f 100644
--- a/app/Subscriber/WebhookSubscriber.php
+++ b/app/Subscriber/WebhookSubscriber.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Subscriber;
+namespace Kanboard\Subscriber;
 
-use Event\CommentEvent;
-use Event\GenericEvent;
-use Event\TaskEvent;
-use Model\Comment;
-use Model\Task;
-use Model\File;
-use Model\Subtask;
+use Kanboard\Event\CommentEvent;
+use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
+use Kanboard\Model\Comment;
+use Kanboard\Model\Task;
+use Kanboard\Model\File;
+use Kanboard\Model\Subtask;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class WebhookSubscriber extends \Core\Base implements EventSubscriberInterface
+class WebhookSubscriber extends \Kanboard\Core\Base implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php
index 0fb5ea8d1..3583ee1a1 100644
--- a/app/Template/board/task_footer.php
+++ b/app/Template/board/task_footer.php
@@ -26,11 +26,11 @@
         </span>
     <?php endif ?>
 
-    <?php if ($task['recurrence_status'] == \Model\Task::RECURRING_STATUS_PENDING): ?>
+    <?php if ($task['recurrence_status'] == \Kanboard\Model\Task::RECURRING_STATUS_PENDING): ?>
         <span title="<?= t('Recurrence') ?>" class="tooltip" data-href="<?= $this->url->href('board', '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'] == \Model\Task::RECURRING_STATUS_PROCESSED): ?>
+    <?php if ($task['recurrence_status'] == \Kanboard\Model\Task::RECURRING_STATUS_PROCESSED): ?>
         <span title="<?= t('Recurrence') ?>" class="tooltip" data-href="<?= $this->url->href('board', '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 ?>
 
diff --git a/app/Template/listing/show.php b/app/Template/listing/show.php
index fc8a607b8..aa17b2284 100644
--- a/app/Template/listing/show.php
+++ b/app/Template/listing/show.php
@@ -46,7 +46,7 @@
                     <?= dt('%B %e, %Y', $task['date_due']) ?>
                 </td>
                 <td>
-                    <?php if ($task['is_active'] == \Model\Task::STATUS_OPEN): ?>
+                    <?php if ($task['is_active'] == \Kanboard\Model\Task::STATUS_OPEN): ?>
                         <?= t('Open') ?>
                     <?php else: ?>
                         <?= t('Closed') ?>
diff --git a/app/Template/search/results.php b/app/Template/search/results.php
index 04cb6a194..88eed87c8 100644
--- a/app/Template/search/results.php
+++ b/app/Template/search/results.php
@@ -41,7 +41,7 @@
             <?= dt('%B %e, %Y', $task['date_due']) ?>
         </td>
         <td>
-            <?php if ($task['is_active'] == \Model\Task::STATUS_OPEN): ?>
+            <?php if ($task['is_active'] == \Kanboard\Model\Task::STATUS_OPEN): ?>
                 <?= t('Open') ?>
             <?php else: ?>
                 <?= t('Closed') ?>
diff --git a/app/Template/task/details.php b/app/Template/task/details.php
index e8fdf5cd6..9cd10dda4 100644
--- a/app/Template/task/details.php
+++ b/app/Template/task/details.php
@@ -86,7 +86,7 @@
         </li>
         <?php endif ?>
 
-        <?php if (! isset($not_editable) && $task['recurrence_status'] != \Model\Task::RECURRING_STATUS_NONE): ?>
+        <?php if (! isset($not_editable) && $task['recurrence_status'] != \Kanboard\Model\Task::RECURRING_STATUS_NONE): ?>
         <li>
             <strong><?= t('Recurring information') ?></strong>
             <?= $this->render('task/recurring_info', array(
diff --git a/app/Template/task/recurring_info.php b/app/Template/task/recurring_info.php
index ad64ae19e..83ca09607 100644
--- a/app/Template/task/recurring_info.php
+++ b/app/Template/task/recurring_info.php
@@ -1,7 +1,7 @@
 <ul>
-    <?php if ($task['recurrence_status'] == \Model\Task::RECURRING_STATUS_PENDING): ?>
+    <?php if ($task['recurrence_status'] == \Kanboard\Model\Task::RECURRING_STATUS_PENDING): ?>
         <li><?= t('Recurrent task is scheduled to be generated') ?></li>
-    <?php elseif ($task['recurrence_status'] == \Model\Task::RECURRING_STATUS_PROCESSED): ?>
+    <?php elseif ($task['recurrence_status'] == \Kanboard\Model\Task::RECURRING_STATUS_PROCESSED): ?>
         <li><?= t('Recurrent task has been generated:') ?>
             <ul>
                 <li>
diff --git a/app/Template/task_modification/edit_recurrence.php b/app/Template/task_modification/edit_recurrence.php
index f63f15164..dc4faa7a7 100644
--- a/app/Template/task_modification/edit_recurrence.php
+++ b/app/Template/task_modification/edit_recurrence.php
@@ -2,7 +2,7 @@
     <h2><?= t('Edit recurrence') ?></h2>
 </div>
 
-<?php if ($task['recurrence_status'] != \Model\Task::RECURRING_STATUS_NONE): ?>
+<?php if ($task['recurrence_status'] != \Kanboard\Model\Task::RECURRING_STATUS_NONE): ?>
 <div class="listing">
     <?= $this->render('task/recurring_info', array(
         'task' => $task,
@@ -13,7 +13,7 @@
 </div>
 <?php endif ?>
 
-<?php if ($task['recurrence_status'] != \Model\Task::RECURRING_STATUS_PROCESSED): ?>
+<?php if ($task['recurrence_status'] != \Kanboard\Model\Task::RECURRING_STATUS_PROCESSED): ?>
 
     <form method="post" action="<?= $this->url->href('taskmodification', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
 
diff --git a/app/common.php b/app/common.php
index e63d82bb2..33e45f0d1 100644
--- a/app/common.php
+++ b/app/common.php
@@ -24,10 +24,10 @@ require __DIR__.'/constants.php';
 require __DIR__.'/check_setup.php';
 
 $container = new Pimple\Container;
-$container->register(new ServiceProvider\LoggingProvider);
-$container->register(new ServiceProvider\DatabaseProvider);
-$container->register(new ServiceProvider\ClassProvider);
-$container->register(new ServiceProvider\EventDispatcherProvider);
+$container->register(new Kanboard\ServiceProvider\LoggingProvider);
+$container->register(new Kanboard\ServiceProvider\DatabaseProvider);
+$container->register(new Kanboard\ServiceProvider\ClassProvider);
+$container->register(new Kanboard\ServiceProvider\EventDispatcherProvider);
 
 if (ENABLE_URL_REWRITE) {
     require __DIR__.'/routes.php';
diff --git a/app/constants.php b/app/constants.php
index 0d8ffd874..004f7cf74 100644
--- a/app/constants.php
+++ b/app/constants.php
@@ -126,4 +126,3 @@ defined('HTTP_PROXY_HOSTNAME') or define('HTTP_PROXY_HOSTNAME', '');
 defined('HTTP_PROXY_PORT') or define('HTTP_PROXY_PORT', '3128');
 defined('HTTP_PROXY_USERNAME') or define('HTTP_PROXY_USERNAME', '');
 defined('HTTP_PROXY_PASSWORD') or define('HTTP_PROXY_PASSWORD', '');
-
diff --git a/app/functions.php b/app/functions.php
index e4b38cdd5..9bb7a8c8a 100644
--- a/app/functions.php
+++ b/app/functions.php
@@ -1,6 +1,6 @@
 <?php
 
-use Core\Translator;
+use Kanboard\Core\Translator;
 
 /**
  * Translate a string
diff --git a/composer.json b/composer.json
index e7f1e0b1e..338ece117 100644
--- a/composer.json
+++ b/composer.json
@@ -21,10 +21,8 @@
     "autoload" : {
         "classmap" : ["app/"],
         "psr-4" : {
-            "Plugin\\": "plugins/"
-        },
-        "psr-0" : {
-            "" : "app/"
+            "Kanboard\\Plugin\\": "plugins/",
+            "Kanboard\\" : "app/"
         },
         "files" : [
             "app/functions.php",
diff --git a/composer.lock b/composer.lock
index ca0034c93..38869985d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,20 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "66d81a6b6a317dfb617413cf9d971bc0",
+    "hash": "dedbdec5041e89f475dd55d5f11a9bd6",
     "packages": [
         {
             "name": "christian-riesen/base32",
-            "version": "1.2.1",
+            "version": "1.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ChristianRiesen/base32.git",
-                "reference": "6943e7b010ab224139fd4248ccf84865aa7b0f91"
+                "reference": "fbe67d49d45dc789f942ef828c787550ebb894bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ChristianRiesen/base32/zipball/6943e7b010ab224139fd4248ccf84865aa7b0f91",
-                "reference": "6943e7b010ab224139fd4248ccf84865aa7b0f91",
+                "url": "https://api.github.com/repos/ChristianRiesen/base32/zipball/fbe67d49d45dc789f942ef828c787550ebb894bc",
+                "reference": "fbe67d49d45dc789f942ef828c787550ebb894bc",
                 "shasum": ""
             },
             "require": {
@@ -58,7 +58,7 @@
                 "encode",
                 "rfc4648"
             ],
-            "time": "2015-02-12 09:08:33"
+            "time": "2015-09-27 23:45:02"
         },
         {
             "name": "christian-riesen/otp",
@@ -406,16 +406,16 @@
         },
         {
             "name": "gregwar/captcha",
-            "version": "v1.1",
+            "version": "v1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Gregwar/Captcha.git",
-                "reference": "9caea9eb001a809ab8734b201ae07ebe4179238d"
+                "reference": "1240ab993ca713680573b2d4166900da5f758623"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Gregwar/Captcha/zipball/9caea9eb001a809ab8734b201ae07ebe4179238d",
-                "reference": "9caea9eb001a809ab8734b201ae07ebe4179238d",
+                "url": "https://api.github.com/repos/Gregwar/Captcha/zipball/1240ab993ca713680573b2d4166900da5f758623",
+                "reference": "1240ab993ca713680573b2d4166900da5f758623",
                 "shasum": ""
             },
             "require": {
@@ -450,7 +450,7 @@
                 "captcha",
                 "spam"
             ],
-            "time": "2015-05-13 06:34:33"
+            "time": "2015-09-11 15:23:20"
         },
         {
             "name": "league/html-to-markdown",
@@ -651,16 +651,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v2.7.4",
+            "version": "v2.7.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/Console.git",
-                "reference": "9ff9032151186bd66ecee727d728f1319f52d1d8"
+                "url": "https://github.com/symfony/console.git",
+                "reference": "06cb17c013a82f94a3d840682b49425cd00a2161"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Console/zipball/9ff9032151186bd66ecee727d728f1319f52d1d8",
-                "reference": "9ff9032151186bd66ecee727d728f1319f52d1d8",
+                "url": "https://api.github.com/repos/symfony/console/zipball/06cb17c013a82f94a3d840682b49425cd00a2161",
+                "reference": "06cb17c013a82f94a3d840682b49425cd00a2161",
                 "shasum": ""
             },
             "require": {
@@ -704,20 +704,20 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2015-09-03 11:40:38"
+            "time": "2015-09-25 08:32:23"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v2.7.4",
+            "version": "v2.7.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/EventDispatcher.git",
-                "reference": "b58c916f1db03a611b72dd702564f30ad8fe83fa"
+                "url": "https://github.com/symfony/event-dispatcher.git",
+                "reference": "ae4dcc2a8d3de98bd794167a3ccda1311597c5d9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/b58c916f1db03a611b72dd702564f30ad8fe83fa",
-                "reference": "b58c916f1db03a611b72dd702564f30ad8fe83fa",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ae4dcc2a8d3de98bd794167a3ccda1311597c5d9",
+                "reference": "ae4dcc2a8d3de98bd794167a3ccda1311597c5d9",
                 "shasum": ""
             },
             "require": {
@@ -762,22 +762,22 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2015-08-24 07:13:45"
+            "time": "2015-09-22 13:49:29"
         }
     ],
     "packages-dev": [
         {
             "name": "symfony/stopwatch",
-            "version": "v2.7.4",
+            "version": "v2.7.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/Stopwatch.git",
-                "reference": "abc61bac76fb10ffa2c6373d7932bc35190dbf3b"
+                "url": "https://github.com/symfony/stopwatch.git",
+                "reference": "08dd97b3f22ab9ee658cd16e6758f8c3c404336e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/abc61bac76fb10ffa2c6373d7932bc35190dbf3b",
-                "reference": "abc61bac76fb10ffa2c6373d7932bc35190dbf3b",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/08dd97b3f22ab9ee658cd16e6758f8c3c404336e",
+                "reference": "08dd97b3f22ab9ee658cd16e6758f8c3c404336e",
                 "shasum": ""
             },
             "require": {
@@ -813,7 +813,7 @@
             ],
             "description": "Symfony Stopwatch Component",
             "homepage": "https://symfony.com",
-            "time": "2015-08-24 07:13:45"
+            "time": "2015-09-22 13:49:29"
         }
     ],
     "aliases": [],
diff --git a/doc/plugins.markdown b/doc/plugins.markdown
index 9e0a4cfe0..0a0577f9b 100644
--- a/doc/plugins.markdown
+++ b/doc/plugins.markdown
@@ -45,9 +45,9 @@ Example of `Plugin.php` file (`plugins/Foobar/Plugin.php`):
 ```php
 <?php
 
-namespace Plugin\Foobar;
+namespace Kanboard\Plugin\Foobar;
 
-use Core\Plugin\Base;
+use Kanboard\Core\Plugin\Base;
 
 class Plugin extends Plugin\Base
 {
@@ -58,14 +58,14 @@ class Plugin extends Plugin\Base
 }
 ```
 
-This file should contains a class `Plugin` defined under the namespace `Plugin\Yourplugin` and extends `Core\Plugin\Base`.
+This file should contains a class `Plugin` defined under the namespace `Kanboard\Plugin\Yourplugin` and extends `Kanboard\Core\Plugin\Base`.
 
 The only required method is `initialize()`. This method is called for each request when the plugin is loaded.
 
 Plugin methods
 --------------
 
-Available methods from `Core\Plugin\Base`:
+Available methods from `Kanboard\Core\Plugin\Base`:
 
 - `initialize()`: Executed when the plugin is loaded
 - `getClasses()`: Return all classes that should be stored in the dependency injection container
@@ -76,7 +76,7 @@ Available methods from `Core\Plugin\Base`:
 - `getPluginDescription()`: Should return plugin description
 - `getPluginHomepage()`: Should return plugin Homepage (link)
 
-Your plugin registration class also inherit from `Core\Base`, that means you can access to all classes and methods of Kanboard easily.
+Your plugin registration class also inherit from `Kanboard\Core\Base`, that means you can access to all classes and methods of Kanboard easily.
 
 This example will fetch the user #123:
 
@@ -91,7 +91,7 @@ Hooks can extend, replace, filter data or change the default behavior. Each hook
 
 ### Listen on hook events
 
-In your `initialize()` method you need to call the method `on()` of the class `Core\Plugin\Hook`:
+In your `initialize()` method you need to call the method `on()` of the class `Kanboard\Core\Plugin\Hook`:
 
 ```php
 $this->hook->on('hook_name', $callable);
@@ -169,9 +169,9 @@ Example to add a new stylesheet:
 ```php
 <?php
 
-namespace Plugin\Css;
+namespace Kanboard\Plugin\Css;
 
-use Core\Plugin\Base;
+use Kanboard\Core\Plugin\Base;
 
 class Plugin extends Base
 {
@@ -264,16 +264,16 @@ To define a new automatic action with a plugin, you just need to call the method
 ```php
 <?php
 
-namespace Plugin\AutomaticAction;
+namespace Kanboard\Plugin\AutomaticAction;
 
-use Core\Plugin\Base;
+use Kanboard\Core\Plugin\Base;
 
 class Plugin extends Base
 {
     public function initialize()
     {
         $this->action->extendActions(
-            '\Plugin\AutomaticAction\Action\SendSlackMessage', // Use absolute namespace
+            '\Kanboard\Plugin\AutomaticAction\Action\SendSlackMessage', // Use absolute namespace
             t('Send a message to Slack when the task color change')
         );
     }
@@ -337,9 +337,11 @@ If you would like to replace the default HTTP Content Security Policy header, yo
 ```php
 <?php
 
-namespace Plugin\Csp;
+namespace Kanboard\Plugin\Csp;
 
-class Plugin extends \Core\Plugin\Base
+use Kanboard\Core\Plugin\Base;
+
+class Plugin extends Base
 {
     public function initialize()
     {
@@ -398,7 +400,7 @@ Each file contains all migrations, here an example for Sqlite:
 ```php
 <?php
 
-namespace Plugin\Something\Schema;
+namespace Kanboard\Plugin\Something\Schema;
 
 const VERSION = 1;
 
diff --git a/jsonrpc.php b/jsonrpc.php
index adeb4ac4c..6778603f3 100644
--- a/jsonrpc.php
+++ b/jsonrpc.php
@@ -2,24 +2,42 @@
 
 require __DIR__.'/app/common.php';
 
-$server = new JsonRPC\Server;
-$server->setAuthenticationHeader(API_AUTHENTICATION_HEADER);
-$server->before(array(new Api\Auth($container), 'checkCredentials'));
+use JsonRPC\Server;
+use Kanboard\Api\Auth;
+use Kanboard\Api\Me;
+use Kanboard\Api\Action;
+use Kanboard\Api\App;
+use Kanboard\Api\Board;
+use Kanboard\Api\Category;
+use Kanboard\Api\Comment;
+use Kanboard\Api\File;
+use Kanboard\Api\Link;
+use Kanboard\Api\Project;
+use Kanboard\Api\ProjectPermission;
+use Kanboard\Api\Subtask;
+use Kanboard\Api\Swimlane;
+use Kanboard\Api\Task;
+use Kanboard\Api\TaskLink;
+use Kanboard\Api\User;
 
-$server->attach(new Api\Me($container));
-$server->attach(new Api\Action($container));
-$server->attach(new Api\App($container));
-$server->attach(new Api\Board($container));
-$server->attach(new Api\Category($container));
-$server->attach(new Api\Comment($container));
-$server->attach(new Api\File($container));
-$server->attach(new Api\Link($container));
-$server->attach(new Api\Project($container));
-$server->attach(new Api\ProjectPermission($container));
-$server->attach(new Api\Subtask($container));
-$server->attach(new Api\Swimlane($container));
-$server->attach(new Api\Task($container));
-$server->attach(new Api\TaskLink($container));
-$server->attach(new Api\User($container));
+$server = new Server;
+$server->setAuthenticationHeader(API_AUTHENTICATION_HEADER);
+$server->before(array(new Auth($container), 'checkCredentials'));
+
+$server->attach(new Me($container));
+$server->attach(new Action($container));
+$server->attach(new App($container));
+$server->attach(new Board($container));
+$server->attach(new Category($container));
+$server->attach(new Comment($container));
+$server->attach(new File($container));
+$server->attach(new Link($container));
+$server->attach(new Project($container));
+$server->attach(new ProjectPermission($container));
+$server->attach(new Subtask($container));
+$server->attach(new Swimlane($container));
+$server->attach(new Task($container));
+$server->attach(new TaskLink($container));
+$server->attach(new User($container));
 
 echo $server->execute();
diff --git a/tests/functionals/ApiTest.php b/tests/functionals/ApiTest.php
index 17741771c..7f2db3219 100644
--- a/tests/functionals/ApiTest.php
+++ b/tests/functionals/ApiTest.php
@@ -24,7 +24,7 @@ class Api extends PHPUnit_Framework_TestCase
             $pdo = null;
         }
 
-        $service = new ServiceProvider\DatabaseProvider;
+        $service = new Kanboard\ServiceProvider\DatabaseProvider;
 
         $db = $service->getInstance();
         $db->table('settings')->eq('option', 'api_token')->update(array('value' => API_KEY));
diff --git a/tests/functionals/UserApiTest.php b/tests/functionals/UserApiTest.php
index 96df14ff9..3abb7b289 100644
--- a/tests/functionals/UserApiTest.php
+++ b/tests/functionals/UserApiTest.php
@@ -26,7 +26,7 @@ class UserApi extends PHPUnit_Framework_TestCase
             $pdo = null;
         }
 
-        $service = new ServiceProvider\DatabaseProvider;
+        $service = new Kanboard\ServiceProvider\DatabaseProvider;
 
         $db = $service->getInstance();
         $db->table('settings')->eq('option', 'api_token')->update(array('value' => API_KEY));
diff --git a/tests/units/Action/CommentCreationTest.php b/tests/units/Action/CommentCreationTest.php
index 6b5fe1ea3..8a689309d 100644
--- a/tests/units/Action/CommentCreationTest.php
+++ b/tests/units/Action/CommentCreationTest.php
@@ -2,18 +2,19 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Event\GenericEvent;
-use Model\Task;
-use Model\TaskCreation;
-use Model\Comment;
-use Model\Project;
-use Integration\GithubWebhook;
+use Kanboard\Event\GenericEvent;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\Comment;
+use Kanboard\Model\Project;
+use Kanboard\Integration\GithubWebhook;
+use Kanboard\Action\CommentCreation;
 
 class CommentCreationTest extends Base
 {
     public function testWithoutRequiredParams()
     {
-        $action = new Action\CommentCreation($this->container, 1, GithubWebhook::EVENT_ISSUE_COMMENT);
+        $action = new CommentCreation($this->container, 1, GithubWebhook::EVENT_ISSUE_COMMENT);
 
         // We create a task in the first column
         $tc = new TaskCreation($this->container);
@@ -38,7 +39,7 @@ class CommentCreationTest extends Base
 
     public function testWithCommitMessage()
     {
-        $action = new Action\CommentCreation($this->container, 1, GithubWebhook::EVENT_ISSUE_COMMENT);
+        $action = new CommentCreation($this->container, 1, GithubWebhook::EVENT_ISSUE_COMMENT);
 
         // We create a task in the first column
         $tc = new TaskCreation($this->container);
@@ -66,7 +67,7 @@ class CommentCreationTest extends Base
 
     public function testWithUser()
     {
-        $action = new Action\CommentCreation($this->container, 1, GithubWebhook::EVENT_ISSUE_COMMENT);
+        $action = new CommentCreation($this->container, 1, GithubWebhook::EVENT_ISSUE_COMMENT);
 
         // We create a task in the first column
         $tc = new TaskCreation($this->container);
@@ -95,7 +96,7 @@ class CommentCreationTest extends Base
 
     public function testWithNoUser()
     {
-        $action = new Action\CommentCreation($this->container, 1, GithubWebhook::EVENT_ISSUE_COMMENT);
+        $action = new CommentCreation($this->container, 1, GithubWebhook::EVENT_ISSUE_COMMENT);
 
         // We create a task in the first column
         $tc = new TaskCreation($this->container);
diff --git a/tests/units/Action/TaskAssignColorCategoryTest.php b/tests/units/Action/TaskAssignColorCategoryTest.php
index 44d239437..1bd3493bd 100644
--- a/tests/units/Action/TaskAssignColorCategoryTest.php
+++ b/tests/units/Action/TaskAssignColorCategoryTest.php
@@ -2,18 +2,19 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Task;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\Project;
-use Model\Category;
-use Event\GenericEvent;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\Project;
+use Kanboard\Model\Category;
+use Kanboard\Event\GenericEvent;
+use Kanboard\Action\TaskAssignColorCategory;
 
-class TaskAssignColorCategory extends Base
+class TaskAssignColorCategoryTest extends Base
 {
     public function testBadProject()
     {
-        $action = new Action\TaskAssignColorCategory($this->container, 3, Task::EVENT_CREATE_UPDATE);
+        $action = new TaskAssignColorCategory($this->container, 3, Task::EVENT_CREATE_UPDATE);
 
         $event = array(
             'project_id' => 2,
@@ -27,7 +28,7 @@ class TaskAssignColorCategory extends Base
 
     public function testExecute()
     {
-        $action = new Action\TaskAssignColorCategory($this->container, 1, Task::EVENT_CREATE_UPDATE);
+        $action = new TaskAssignColorCategory($this->container, 1, Task::EVENT_CREATE_UPDATE);
         $action->setParam('category_id', 1);
         $action->setParam('color_id', 'blue');
 
diff --git a/tests/units/Action/TaskAssignColorColumnTest.php b/tests/units/Action/TaskAssignColorColumnTest.php
index 557673278..c09dc96e8 100644
--- a/tests/units/Action/TaskAssignColorColumnTest.php
+++ b/tests/units/Action/TaskAssignColorColumnTest.php
@@ -2,17 +2,18 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Event\GenericEvent;
-use Model\Task;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\Project;
+use Kanboard\Event\GenericEvent;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\Project;
+use Kanboard\Action\TaskAssignColorColumn;
 
 class TaskAssignColorColumnTest extends Base
 {
     public function testColorChange()
     {
-        $action = new Action\TaskAssignColorColumn($this->container, 1, Task::EVENT_MOVE_COLUMN);
+        $action = new TaskAssignColorColumn($this->container, 1, Task::EVENT_MOVE_COLUMN);
         $action->setParam('column_id', 2);
         $action->setParam('color_id', 'green');
 
diff --git a/tests/units/Action/TaskAssignColorLinkTest.php b/tests/units/Action/TaskAssignColorLinkTest.php
index c78af5bb4..36a831dd0 100644
--- a/tests/units/Action/TaskAssignColorLinkTest.php
+++ b/tests/units/Action/TaskAssignColorLinkTest.php
@@ -2,18 +2,19 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Event\TaskLinkEvent;
-use Model\Task;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\TaskLink;
-use Model\Project;
+use Kanboard\Event\TaskLinkEvent;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\TaskLink;
+use Kanboard\Model\Project;
+use Kanboard\Action\TaskAssignColorLink;
 
 class TaskAssignColorLinkTest extends Base
 {
     public function testExecute()
     {
-        $action = new Action\TaskAssignColorLink($this->container, 1, TaskLink::EVENT_CREATE_UPDATE);
+        $action = new TaskAssignColorLink($this->container, 1, TaskLink::EVENT_CREATE_UPDATE);
         $action->setParam('link_id', 2);
         $action->setParam('color_id', 'green');
 
diff --git a/tests/units/Action/TaskAssignColorUserTest.php b/tests/units/Action/TaskAssignColorUserTest.php
index 896b48fcc..ea2a8f38d 100644
--- a/tests/units/Action/TaskAssignColorUserTest.php
+++ b/tests/units/Action/TaskAssignColorUserTest.php
@@ -2,17 +2,18 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Task;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\Project;
-use Event\GenericEvent;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\Project;
+use Kanboard\Event\GenericEvent;
+use Kanboard\Action\TaskAssignColorUser;
 
-class TaskAssignColorUser extends Base
+class TaskAssignColorUserTest extends Base
 {
     public function testBadProject()
     {
-        $action = new Action\TaskAssignColorUser($this->container, 3, Task::EVENT_CREATE);
+        $action = new TaskAssignColorUser($this->container, 3, Task::EVENT_CREATE);
 
         $event = array(
             'project_id' => 2,
@@ -26,7 +27,7 @@ class TaskAssignColorUser extends Base
 
     public function testExecute()
     {
-        $action = new Action\TaskAssignColorUser($this->container, 1, Task::EVENT_ASSIGNEE_CHANGE);
+        $action = new TaskAssignColorUser($this->container, 1, Task::EVENT_ASSIGNEE_CHANGE);
         $action->setParam('user_id', 1);
         $action->setParam('color_id', 'blue');
 
diff --git a/tests/units/Action/TaskAssignCurrentUserTest.php b/tests/units/Action/TaskAssignCurrentUserTest.php
index 9ea816d43..f89465775 100644
--- a/tests/units/Action/TaskAssignCurrentUserTest.php
+++ b/tests/units/Action/TaskAssignCurrentUserTest.php
@@ -2,18 +2,19 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Event\GenericEvent;
-use Model\Task;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\Project;
-use Model\UserSession;
+use Kanboard\Event\GenericEvent;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\Project;
+use Kanboard\Model\UserSession;
+use Kanboard\Action\TaskAssignCurrentUser;
 
-class TaskAssignCurrentUser extends Base
+class TaskAssignCurrentUserTest extends Base
 {
     public function testBadProject()
     {
-        $action = new Action\TaskAssignCurrentUser($this->container, 3, Task::EVENT_CREATE);
+        $action = new TaskAssignCurrentUser($this->container, 3, Task::EVENT_CREATE);
         $action->setParam('column_id', 5);
 
         $event = array(
@@ -28,7 +29,7 @@ class TaskAssignCurrentUser extends Base
 
     public function testBadColumn()
     {
-        $action = new Action\TaskAssignCurrentUser($this->container, 3, Task::EVENT_CREATE);
+        $action = new TaskAssignCurrentUser($this->container, 3, Task::EVENT_CREATE);
         $action->setParam('column_id', 5);
 
         $event = array(
@@ -42,7 +43,7 @@ class TaskAssignCurrentUser extends Base
 
     public function testExecute()
     {
-        $action = new Action\TaskAssignCurrentUser($this->container, 1, Task::EVENT_MOVE_COLUMN);
+        $action = new TaskAssignCurrentUser($this->container, 1, Task::EVENT_MOVE_COLUMN);
         $action->setParam('column_id', 2);
         $_SESSION = array(
             'user' => array('id' => 5)
diff --git a/tests/units/Action/TaskAssignSpecificUserTest.php b/tests/units/Action/TaskAssignSpecificUserTest.php
index ae8de1775..a67335e8a 100644
--- a/tests/units/Action/TaskAssignSpecificUserTest.php
+++ b/tests/units/Action/TaskAssignSpecificUserTest.php
@@ -2,17 +2,18 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Event\GenericEvent;
-use Model\Task;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\Project;
+use Kanboard\Event\GenericEvent;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\Project;
+use Kanboard\Action\TaskAssignSpecificUser;
 
-class TaskAssignSpecificUser extends Base
+class TaskAssignSpecificUserTest extends Base
 {
     public function testBadProject()
     {
-        $action = new Action\TaskAssignSpecificUser($this->container, 3, Task::EVENT_MOVE_COLUMN);
+        $action = new TaskAssignSpecificUser($this->container, 3, Task::EVENT_MOVE_COLUMN);
         $action->setParam('column_id', 5);
 
         $event = array(
@@ -27,7 +28,7 @@ class TaskAssignSpecificUser extends Base
 
     public function testBadColumn()
     {
-        $action = new Action\TaskAssignSpecificUser($this->container, 3, Task::EVENT_MOVE_COLUMN);
+        $action = new TaskAssignSpecificUser($this->container, 3, Task::EVENT_MOVE_COLUMN);
         $action->setParam('column_id', 5);
 
         $event = array(
@@ -41,7 +42,7 @@ class TaskAssignSpecificUser extends Base
 
     public function testExecute()
     {
-        $action = new Action\TaskAssignSpecificUser($this->container, 1, Task::EVENT_MOVE_COLUMN);
+        $action = new TaskAssignSpecificUser($this->container, 1, Task::EVENT_MOVE_COLUMN);
         $action->setParam('column_id', 2);
         $action->setParam('user_id', 1);
 
diff --git a/tests/units/Action/TaskCloseTest.php b/tests/units/Action/TaskCloseTest.php
index 8cee6f134..b2d83194b 100644
--- a/tests/units/Action/TaskCloseTest.php
+++ b/tests/units/Action/TaskCloseTest.php
@@ -2,18 +2,19 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Event\GenericEvent;
-use Model\Task;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\Project;
-use Integration\GithubWebhook;
+use Kanboard\Event\GenericEvent;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\Project;
+use Kanboard\Integration\GithubWebhook;
+use Kanboard\Action\TaskClose;
 
 class TaskCloseTest extends Base
 {
     public function testExecutable()
     {
-        $action = new Action\TaskClose($this->container, 3, Task::EVENT_MOVE_COLUMN);
+        $action = new TaskClose($this->container, 3, Task::EVENT_MOVE_COLUMN);
         $action->setParam('column_id', 5);
 
         $event = array(
@@ -24,7 +25,7 @@ class TaskCloseTest extends Base
 
         $this->assertTrue($action->isExecutable($event));
 
-        $action = new Action\TaskClose($this->container, 3, GithubWebhook::EVENT_COMMIT);
+        $action = new TaskClose($this->container, 3, GithubWebhook::EVENT_COMMIT);
 
         $event = array(
             'project_id' => 3,
@@ -36,7 +37,7 @@ class TaskCloseTest extends Base
 
     public function testBadEvent()
     {
-        $action = new Action\TaskClose($this->container, 3, Task::EVENT_UPDATE);
+        $action = new TaskClose($this->container, 3, Task::EVENT_UPDATE);
         $action->setParam('column_id', 5);
 
         $event = array(
@@ -51,7 +52,7 @@ class TaskCloseTest extends Base
 
     public function testBadProject()
     {
-        $action = new Action\TaskClose($this->container, 3, Task::EVENT_MOVE_COLUMN);
+        $action = new TaskClose($this->container, 3, Task::EVENT_MOVE_COLUMN);
         $action->setParam('column_id', 5);
 
         $event = array(
@@ -66,7 +67,7 @@ class TaskCloseTest extends Base
 
     public function testBadColumn()
     {
-        $action = new Action\TaskClose($this->container, 3, Task::EVENT_MOVE_COLUMN);
+        $action = new TaskClose($this->container, 3, Task::EVENT_MOVE_COLUMN);
         $action->setParam('column_id', 5);
 
         $event = array(
@@ -80,7 +81,7 @@ class TaskCloseTest extends Base
 
     public function testExecute()
     {
-        $action = new Action\TaskClose($this->container, 1, Task::EVENT_MOVE_COLUMN);
+        $action = new TaskClose($this->container, 1, Task::EVENT_MOVE_COLUMN);
         $action->setParam('column_id', 2);
 
         // We create a task in the first column
diff --git a/tests/units/Action/TaskDuplicateAnotherProjectTest.php b/tests/units/Action/TaskDuplicateAnotherProjectTest.php
index 37eb4052f..50cbad01a 100644
--- a/tests/units/Action/TaskDuplicateAnotherProjectTest.php
+++ b/tests/units/Action/TaskDuplicateAnotherProjectTest.php
@@ -2,17 +2,18 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Event\GenericEvent;
-use Model\Task;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\Project;
+use Kanboard\Event\GenericEvent;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\Project;
+use Kanboard\Action\TaskDuplicateAnotherProject;
 
-class TaskDuplicateAnotherProject extends Base
+class TaskDuplicateAnotherProjectTest extends Base
 {
     public function testBadProject()
     {
-        $action = new Action\TaskDuplicateAnotherProject($this->container, 3, Task::EVENT_MOVE_COLUMN);
+        $action = new TaskDuplicateAnotherProject($this->container, 3, Task::EVENT_MOVE_COLUMN);
         $action->setParam('column_id', 5);
 
         $event = array(
@@ -27,7 +28,7 @@ class TaskDuplicateAnotherProject extends Base
 
     public function testBadColumn()
     {
-        $action = new Action\TaskDuplicateAnotherProject($this->container, 3, Task::EVENT_MOVE_COLUMN);
+        $action = new TaskDuplicateAnotherProject($this->container, 3, Task::EVENT_MOVE_COLUMN);
         $action->setParam('column_id', 5);
 
         $event = array(
@@ -41,7 +42,7 @@ class TaskDuplicateAnotherProject extends Base
 
     public function testExecute()
     {
-        $action = new Action\TaskDuplicateAnotherProject($this->container, 1, Task::EVENT_MOVE_COLUMN);
+        $action = new TaskDuplicateAnotherProject($this->container, 1, Task::EVENT_MOVE_COLUMN);
 
         // We create a task in the first column
         $tc = new TaskCreation($this->container);
diff --git a/tests/units/Action/TaskEmailTest.php b/tests/units/Action/TaskEmailTest.php
index d74e1af2c..863e5677c 100644
--- a/tests/units/Action/TaskEmailTest.php
+++ b/tests/units/Action/TaskEmailTest.php
@@ -2,18 +2,19 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Event\GenericEvent;
-use Model\Task;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\Project;
-use Model\User;
+use Kanboard\Event\GenericEvent;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\Project;
+use Kanboard\Model\User;
+use Kanboard\Action\TaskEmail;
 
 class TaskEmailTest extends Base
 {
     public function testNoEmail()
     {
-        $action = new Action\TaskEmail($this->container, 1, Task::EVENT_MOVE_COLUMN);
+        $action = new TaskEmail($this->container, 1, Task::EVENT_MOVE_COLUMN);
         $action->setParam('column_id', 2);
         $action->setParam('user_id', 1);
         $action->setParam('subject', 'My email subject');
@@ -43,7 +44,7 @@ class TaskEmailTest extends Base
 
     public function testWrongColumn()
     {
-        $action = new Action\TaskEmail($this->container, 1, Task::EVENT_MOVE_COLUMN);
+        $action = new TaskEmail($this->container, 1, Task::EVENT_MOVE_COLUMN);
         $action->setParam('column_id', 2);
         $action->setParam('user_id', 1);
         $action->setParam('subject', 'My email subject');
@@ -73,7 +74,7 @@ class TaskEmailTest extends Base
 
     public function testMoveColumn()
     {
-        $action = new Action\TaskEmail($this->container, 1, Task::EVENT_MOVE_COLUMN);
+        $action = new TaskEmail($this->container, 1, Task::EVENT_MOVE_COLUMN);
         $action->setParam('column_id', 2);
         $action->setParam('user_id', 1);
         $action->setParam('subject', 'My email subject');
@@ -111,7 +112,7 @@ class TaskEmailTest extends Base
 
     public function testTaskClose()
     {
-        $action = new Action\TaskEmail($this->container, 1, Task::EVENT_CLOSE);
+        $action = new TaskEmail($this->container, 1, Task::EVENT_CLOSE);
         $action->setParam('column_id', 2);
         $action->setParam('user_id', 1);
         $action->setParam('subject', 'My email subject');
diff --git a/tests/units/Action/TaskMoveAnotherProjectTest.php b/tests/units/Action/TaskMoveAnotherProjectTest.php
index 78bc65704..93ee3b949 100644
--- a/tests/units/Action/TaskMoveAnotherProjectTest.php
+++ b/tests/units/Action/TaskMoveAnotherProjectTest.php
@@ -2,17 +2,18 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Event\GenericEvent;
-use Model\Task;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\Project;
+use Kanboard\Event\GenericEvent;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\Project;
+use Kanboard\Action\TaskMoveAnotherProject;
 
-class TaskMoveAnotherProject extends Base
+class TaskMoveAnotherProjectTest extends Base
 {
     public function testBadProject()
     {
-        $action = new Action\TaskMoveAnotherProject($this->container, 3, Task::EVENT_MOVE_COLUMN);
+        $action = new TaskMoveAnotherProject($this->container, 3, Task::EVENT_MOVE_COLUMN);
         $action->setParam('column_id', 5);
 
         $event = array(
@@ -27,7 +28,7 @@ class TaskMoveAnotherProject extends Base
 
     public function testBadColumn()
     {
-        $action = new Action\TaskMoveAnotherProject($this->container, 3, Task::EVENT_MOVE_COLUMN);
+        $action = new TaskMoveAnotherProject($this->container, 3, Task::EVENT_MOVE_COLUMN);
         $action->setParam('column_id', 5);
 
         $event = array(
@@ -41,7 +42,7 @@ class TaskMoveAnotherProject extends Base
 
     public function testExecute()
     {
-        $action = new Action\TaskMoveAnotherProject($this->container, 1, Task::EVENT_MOVE_COLUMN);
+        $action = new TaskMoveAnotherProject($this->container, 1, Task::EVENT_MOVE_COLUMN);
 
         // We create a task in the first column
         $tc = new TaskCreation($this->container);
diff --git a/tests/units/Action/TaskMoveColumnCategoryChangeTest.php b/tests/units/Action/TaskMoveColumnCategoryChangeTest.php
index 4b7dec685..03423776d 100644
--- a/tests/units/Action/TaskMoveColumnCategoryChangeTest.php
+++ b/tests/units/Action/TaskMoveColumnCategoryChangeTest.php
@@ -2,19 +2,20 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Event\GenericEvent;
-use Model\Task;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\Project;
-use Model\Category;
-use Integration\GithubWebhook;
+use Kanboard\Event\GenericEvent;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\Project;
+use Kanboard\Model\Category;
+use Kanboard\Integration\GithubWebhook;
+use Kanboard\Action\TaskMoveColumnCategoryChange;
 
 class TaskMoveColumnCategoryChangeTest extends Base
 {
     public function testExecute()
     {
-        $action = new Action\TaskMoveColumnCategoryChange($this->container, 1, Task::EVENT_UPDATE);
+        $action = new TaskMoveColumnCategoryChange($this->container, 1, Task::EVENT_UPDATE);
         $action->setParam('dest_column_id', 3);
         $action->setParam('category_id', 1);
 
diff --git a/tests/units/Action/TaskUpdateStartDateTest.php b/tests/units/Action/TaskUpdateStartDateTest.php
index 14f3b5b71..7d558e28c 100644
--- a/tests/units/Action/TaskUpdateStartDateTest.php
+++ b/tests/units/Action/TaskUpdateStartDateTest.php
@@ -2,17 +2,18 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Event\GenericEvent;
-use Model\Task;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\Project;
+use Kanboard\Event\GenericEvent;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\Project;
+use Kanboard\Action\TaskUpdateStartDate;
 
 class TaskUpdateStartDateTest extends Base
 {
     public function testExecute()
     {
-        $action = new Action\TaskUpdateStartDate($this->container, 1, Task::EVENT_MOVE_COLUMN);
+        $action = new TaskUpdateStartDate($this->container, 1, Task::EVENT_MOVE_COLUMN);
         $action->setParam('column_id', 2);
 
         // We create a task in the first column
diff --git a/tests/units/Auth/LdapTest.php b/tests/units/Auth/LdapTest.php
index 6edd42fc2..19e7d7e25 100644
--- a/tests/units/Auth/LdapTest.php
+++ b/tests/units/Auth/LdapTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Auth;
+namespace Kanboard\Auth;
 
 require_once __DIR__.'/../Base.php';
 
@@ -67,7 +67,7 @@ class LdapTest extends \Base
     public function testConnectSuccess()
     {
         $ldap = $this
-            ->getMockBuilder('\Auth\Ldap')
+            ->getMockBuilder('\Kanboard\Auth\Ldap')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('getLdapServer'))
             ->getMock();
@@ -92,7 +92,7 @@ class LdapTest extends \Base
     public function testConnectFailure()
     {
         $ldap = $this
-            ->getMockBuilder('\Auth\Ldap')
+            ->getMockBuilder('\Kanboard\Auth\Ldap')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('getLdapServer'))
             ->getMock();
@@ -117,7 +117,7 @@ class LdapTest extends \Base
     public function testBindAnonymous()
     {
         $ldap = $this
-            ->getMockBuilder('\Auth\Ldap')
+            ->getMockBuilder('\Kanboard\Auth\Ldap')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('getLdapBindType'))
             ->getMock();
@@ -143,7 +143,7 @@ class LdapTest extends \Base
     public function testBindUser()
     {
         $ldap = $this
-            ->getMockBuilder('\Auth\Ldap')
+            ->getMockBuilder('\Kanboard\Auth\Ldap')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('getLdapUsername', 'getLdapBindType'))
             ->getMock();
@@ -174,7 +174,7 @@ class LdapTest extends \Base
     public function testBindProxy()
     {
         $ldap = $this
-            ->getMockBuilder('\Auth\Ldap')
+            ->getMockBuilder('\Kanboard\Auth\Ldap')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('getLdapUsername', 'getLdapPassword', 'getLdapBindType'))
             ->getMock();
@@ -238,7 +238,7 @@ class LdapTest extends \Base
         );
 
         $ldap = $this
-            ->getMockBuilder('\Auth\Ldap')
+            ->getMockBuilder('\Kanboard\Auth\Ldap')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('getLdapUserPattern', 'getLdapBaseDn'))
             ->getMock();
@@ -308,7 +308,7 @@ class LdapTest extends \Base
         );
 
         $ldap = $this
-            ->getMockBuilder('\Auth\Ldap')
+            ->getMockBuilder('\Kanboard\Auth\Ldap')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('getLdapUserPattern', 'getLdapBaseDn'))
             ->getMock();
@@ -359,7 +359,7 @@ class LdapTest extends \Base
     public function testSearchWithUserNotFound()
     {
         $ldap = $this
-            ->getMockBuilder('\Auth\Ldap')
+            ->getMockBuilder('\Kanboard\Auth\Ldap')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('getLdapUserPattern', 'getLdapBaseDn'))
             ->getMock();
@@ -400,19 +400,19 @@ class LdapTest extends \Base
     public function testSuccessfulAuthentication()
     {
         $this->container['userSession'] = $this
-            ->getMockBuilder('\Model\UserSession')
+            ->getMockBuilder('\Kanboard\Model\UserSession')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('refresh'))
             ->getMock();
 
         $this->container['user'] = $this
-            ->getMockBuilder('\Model\User')
+            ->getMockBuilder('\Kanboard\Model\User')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('getByUsername'))
             ->getMock();
 
         $ldap = $this
-            ->getMockBuilder('\Auth\Ldap')
+            ->getMockBuilder('\Kanboard\Auth\Ldap')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('findUser'))
             ->getMock();
@@ -444,19 +444,19 @@ class LdapTest extends \Base
     public function testAuthenticationWithExistingLocalUser()
     {
         $this->container['userSession'] = $this
-            ->getMockBuilder('\Model\UserSession')
+            ->getMockBuilder('\Kanboard\Model\UserSession')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('refresh'))
             ->getMock();
 
         $this->container['user'] = $this
-            ->getMockBuilder('\Model\User')
+            ->getMockBuilder('\Kanboard\Model\User')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('getByUsername'))
             ->getMock();
 
         $ldap = $this
-            ->getMockBuilder('\Auth\Ldap')
+            ->getMockBuilder('\Kanboard\Auth\Ldap')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('findUser'))
             ->getMock();
@@ -490,19 +490,19 @@ class LdapTest extends \Base
         $ldap_profile = array('username' => 'user', 'name' => 'My user', 'email' => 'user@here');
 
         $this->container['userSession'] = $this
-            ->getMockBuilder('\Model\UserSession')
+            ->getMockBuilder('\Kanboard\Model\UserSession')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('refresh'))
             ->getMock();
 
         $this->container['user'] = $this
-            ->getMockBuilder('\Model\User')
+            ->getMockBuilder('\Kanboard\Model\User')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('getByUsername', 'create'))
             ->getMock();
 
         $ldap = $this
-            ->getMockBuilder('\Auth\Ldap')
+            ->getMockBuilder('\Kanboard\Auth\Ldap')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('findUser'))
             ->getMock();
@@ -552,19 +552,19 @@ class LdapTest extends \Base
         $ldap_profile = array('username' => 'user', 'name' => 'My user', 'email' => 'user@here');
 
         $this->container['userSession'] = $this
-            ->getMockBuilder('\Model\UserSession')
+            ->getMockBuilder('\Kanboard\Model\UserSession')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('refresh'))
             ->getMock();
 
         $this->container['user'] = $this
-            ->getMockBuilder('\Model\User')
+            ->getMockBuilder('\Kanboard\Model\User')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('getByUsername', 'create'))
             ->getMock();
 
         $ldap = $this
-            ->getMockBuilder('\Auth\Ldap')
+            ->getMockBuilder('\Kanboard\Auth\Ldap')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('findUser'))
             ->getMock();
@@ -637,7 +637,7 @@ class LdapTest extends \Base
         );
 
         $ldap = $this
-            ->getMockBuilder('\Auth\Ldap')
+            ->getMockBuilder('\Kanboard\Auth\Ldap')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('connect', 'getLdapUserPattern', 'getLdapBaseDn', 'getLdapAccountId'))
             ->getMock();
diff --git a/tests/units/Auth/ReverseProxyTest.php b/tests/units/Auth/ReverseProxyTest.php
index bbab7c0db..6aaa5a670 100644
--- a/tests/units/Auth/ReverseProxyTest.php
+++ b/tests/units/Auth/ReverseProxyTest.php
@@ -2,8 +2,8 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Auth\ReverseProxy;
-use Model\User;
+use Kanboard\Auth\ReverseProxy;
+use Kanboard\Model\User;
 
 class ReverseProxyTest extends Base
 {
diff --git a/tests/units/Base.php b/tests/units/Base.php
index 0a045a097..3b7ffa2a4 100644
--- a/tests/units/Base.php
+++ b/tests/units/Base.php
@@ -74,8 +74,8 @@ abstract class Base extends PHPUnit_Framework_TestCase
         }
 
         $this->container = new Pimple\Container;
-        $this->container->register(new ServiceProvider\DatabaseProvider);
-        $this->container->register(new ServiceProvider\ClassProvider);
+        $this->container->register(new Kanboard\ServiceProvider\DatabaseProvider);
+        $this->container->register(new Kanboard\ServiceProvider\ClassProvider);
 
         $this->container['dispatcher'] = new TraceableEventDispatcher(
             new EventDispatcher,
diff --git a/tests/units/Core/Cache/MemoryCacheTest.php b/tests/units/Core/Cache/MemoryCacheTest.php
index b28604ed5..7a9217ae0 100644
--- a/tests/units/Core/Cache/MemoryCacheTest.php
+++ b/tests/units/Core/Cache/MemoryCacheTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../../Base.php';
 
-use Core\Cache\MemoryCache;
+use Kanboard\Core\Cache\MemoryCache;
 
 class MemoryCacheTest extends Base
 {
diff --git a/tests/units/Core/CsvTest.php b/tests/units/Core/CsvTest.php
index 1534584ef..71542c20a 100644
--- a/tests/units/Core/CsvTest.php
+++ b/tests/units/Core/CsvTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Core\Csv;
+use Kanboard\Core\Csv;
 
 class CsvTest extends Base
 {
diff --git a/tests/units/Core/FileStorageTest.php b/tests/units/Core/FileStorageTest.php
index 2475b5474..a3ad2448a 100644
--- a/tests/units/Core/FileStorageTest.php
+++ b/tests/units/Core/FileStorageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core\ObjectStorage;
+namespace Kanboard\Core\ObjectStorage;
 
 require_once __DIR__.'/../Base.php';
 
@@ -146,7 +146,7 @@ class FileStorageTest extends \Base
     }
 
     /**
-     * @expectedException \Core\ObjectStorage\ObjectStorageException
+     * @expectedException \Kanboard\Core\ObjectStorage\ObjectStorageException
      */
     public function testPutWhenNotAbleToCreateFolder()
     {
@@ -196,7 +196,7 @@ class FileStorageTest extends \Base
     }
 
     /**
-     * @expectedException \Core\ObjectStorage\ObjectStorageException
+     * @expectedException \Kanboard\Core\ObjectStorage\ObjectStorageException
      */
     public function testGetWithFileNotFound()
     {
diff --git a/tests/units/Core/LexerTest.php b/tests/units/Core/LexerTest.php
index 044655fcf..9e14ff6b1 100644
--- a/tests/units/Core/LexerTest.php
+++ b/tests/units/Core/LexerTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Core\Lexer;
+use Kanboard\Core\Lexer;
 
 class LexerTest extends Base
 {
diff --git a/tests/units/Core/OAuth2Test.php b/tests/units/Core/OAuth2Test.php
index a0e4b43f6..d57136085 100644
--- a/tests/units/Core/OAuth2Test.php
+++ b/tests/units/Core/OAuth2Test.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Core\OAuth2;
+use Kanboard\Core\OAuth2;
 
 class OAuth2Test extends Base
 {
diff --git a/tests/units/Core/Plugin/HookTest.php b/tests/units/Core/Plugin/HookTest.php
index f8646cbf0..8b7716970 100644
--- a/tests/units/Core/Plugin/HookTest.php
+++ b/tests/units/Core/Plugin/HookTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../../Base.php';
 
-use Core\Plugin\Hook;
+use Kanboard\Core\Plugin\Hook;
 
 class HookTest extends Base
 {
diff --git a/tests/units/Core/Plugin/LoaderTest.php b/tests/units/Core/Plugin/LoaderTest.php
index 40c23fbba..448723d82 100644
--- a/tests/units/Core/Plugin/LoaderTest.php
+++ b/tests/units/Core/Plugin/LoaderTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../../Base.php';
 
-use Core\Plugin\Loader;
+use Kanboard\Core\Plugin\Loader;
 
 class LoaderTest extends Base
 {
diff --git a/tests/units/Core/RouterTest.php b/tests/units/Core/RouterTest.php
index 56a87662b..753e1204d 100644
--- a/tests/units/Core/RouterTest.php
+++ b/tests/units/Core/RouterTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Core\Router;
+use Kanboard\Core\Router;
 
 class RouterTest extends Base
 {
diff --git a/tests/units/Core/TemplateTest.php b/tests/units/Core/TemplateTest.php
index 9833397b3..19c0da1a7 100644
--- a/tests/units/Core/TemplateTest.php
+++ b/tests/units/Core/TemplateTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Core\Template;
+use Kanboard\Core\Template;
 
 class TemplateTest extends Base
 {
diff --git a/tests/units/Core/ToolTest.php b/tests/units/Core/ToolTest.php
index e714f5068..2422d73c8 100644
--- a/tests/units/Core/ToolTest.php
+++ b/tests/units/Core/ToolTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Core\Tool;
+use Kanboard\Core\Tool;
 
 class ToolTest extends Base
 {
diff --git a/tests/units/Formatter/TaskFilterCalendarFormatterTest.php b/tests/units/Formatter/TaskFilterCalendarFormatterTest.php
index 2ea327ff7..d5ff532b2 100644
--- a/tests/units/Formatter/TaskFilterCalendarFormatterTest.php
+++ b/tests/units/Formatter/TaskFilterCalendarFormatterTest.php
@@ -2,15 +2,15 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Formatter\TaskFilterCalendarFormatter;
-use Model\Project;
-use Model\User;
-use Model\TaskCreation;
-use Model\DateParser;
-use Model\Category;
-use Model\Subtask;
-use Model\Config;
-use Model\Swimlane;
+use Kanboard\Formatter\TaskFilterCalendarFormatter;
+use Kanboard\Model\Project;
+use Kanboard\Model\User;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\DateParser;
+use Kanboard\Model\Category;
+use Kanboard\Model\Subtask;
+use Kanboard\Model\Config;
+use Kanboard\Model\Swimlane;
 
 class TaskFilterCalendarFormatterTest extends Base
 {
diff --git a/tests/units/Formatter/TaskFilterGanttFormatterTest.php b/tests/units/Formatter/TaskFilterGanttFormatterTest.php
index 9006e164c..86815089b 100644
--- a/tests/units/Formatter/TaskFilterGanttFormatterTest.php
+++ b/tests/units/Formatter/TaskFilterGanttFormatterTest.php
@@ -2,10 +2,10 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Formatter\TaskFilterGanttFormatter;
-use Model\Project;
-use Model\TaskCreation;
-use Model\DateParser;
+use Kanboard\Formatter\TaskFilterGanttFormatter;
+use Kanboard\Model\Project;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\DateParser;
 
 class TaskFilterGanttFormatterTest extends Base
 {
diff --git a/tests/units/Formatter/TaskFilterICalendarFormatterTest.php b/tests/units/Formatter/TaskFilterICalendarFormatterTest.php
index 176025206..cd5057d91 100644
--- a/tests/units/Formatter/TaskFilterICalendarFormatterTest.php
+++ b/tests/units/Formatter/TaskFilterICalendarFormatterTest.php
@@ -3,15 +3,15 @@
 require_once __DIR__.'/../Base.php';
 
 use Eluceo\iCal\Component\Calendar;
-use Formatter\TaskFilterICalendarFormatter;
-use Model\Project;
-use Model\User;
-use Model\TaskCreation;
-use Model\DateParser;
-use Model\Category;
-use Model\Subtask;
-use Model\Config;
-use Model\Swimlane;
+use Kanboard\Formatter\TaskFilterICalendarFormatter;
+use Kanboard\Model\Project;
+use Kanboard\Model\User;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\DateParser;
+use Kanboard\Model\Category;
+use Kanboard\Model\Subtask;
+use Kanboard\Model\Config;
+use Kanboard\Model\Swimlane;
 
 class TaskFilterICalendarFormatterTest extends Base
 {
diff --git a/tests/units/Helper/AppHelperTest.php b/tests/units/Helper/AppHelperTest.php
index 54ccd697f..cbd8b8ab2 100644
--- a/tests/units/Helper/AppHelperTest.php
+++ b/tests/units/Helper/AppHelperTest.php
@@ -2,9 +2,9 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Core\Session;
-use Helper\App;
-use Model\Config;
+use Kanboard\Core\Session;
+use Kanboard\Helper\App;
+use Kanboard\Model\Config;
 
 class AppHelperTest extends Base
 {
diff --git a/tests/units/Helper/AssetHelperTest.php b/tests/units/Helper/AssetHelperTest.php
index ece81d046..7e1edb124 100644
--- a/tests/units/Helper/AssetHelperTest.php
+++ b/tests/units/Helper/AssetHelperTest.php
@@ -2,8 +2,8 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Helper\Asset;
-use Model\Config;
+use Kanboard\Helper\Asset;
+use Kanboard\Model\Config;
 
 class AssetHelperTest extends Base
 {
diff --git a/tests/units/Helper/DatetimeHelperTest.php b/tests/units/Helper/DatetimeHelperTest.php
index d4fc3c3db..8e9c461bb 100644
--- a/tests/units/Helper/DatetimeHelperTest.php
+++ b/tests/units/Helper/DatetimeHelperTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Helper\Dt;
+use Kanboard\Helper\Dt;
 
 class DatetimeHelperTest extends Base
 {
diff --git a/tests/units/Helper/FileHelperText.php b/tests/units/Helper/FileHelperText.php
index cd5ebffd0..a681c8904 100644
--- a/tests/units/Helper/FileHelperText.php
+++ b/tests/units/Helper/FileHelperText.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Helper\File;
+use Kanboard\Helper\File;
 
 class FileHelperTest extends Base
 {
diff --git a/tests/units/Helper/HookHelperTest.php b/tests/units/Helper/HookHelperTest.php
index 7745c6749..aec4a771d 100644
--- a/tests/units/Helper/HookHelperTest.php
+++ b/tests/units/Helper/HookHelperTest.php
@@ -2,14 +2,14 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Helper\Hook;
+use Kanboard\Helper\Hook;
 
 class HookHelperTest extends Base
 {
     public function testMultipleHooks()
     {
         $this->container['template'] = $this
-            ->getMockBuilder('\Core\Template')
+            ->getMockBuilder('\Kanboard\Core\Template')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('render'))
             ->getMock();
@@ -41,7 +41,7 @@ class HookHelperTest extends Base
     public function testAssetHooks()
     {
         $this->container['helper']->asset = $this
-            ->getMockBuilder('\Helper\Asset')
+            ->getMockBuilder('\Kanboard\Helper\Asset')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('css', 'js'))
             ->getMock();
diff --git a/tests/units/Helper/TextHelperTest.php b/tests/units/Helper/TextHelperTest.php
index 5495cd1cf..30c537a94 100644
--- a/tests/units/Helper/TextHelperTest.php
+++ b/tests/units/Helper/TextHelperTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Helper\Text;
+use Kanboard\Helper\Text;
 
 class TextHelperTest extends Base
 {
diff --git a/tests/units/Helper/UrlHelperTest.php b/tests/units/Helper/UrlHelperTest.php
index 5c2477b54..cbacbc738 100644
--- a/tests/units/Helper/UrlHelperTest.php
+++ b/tests/units/Helper/UrlHelperTest.php
@@ -2,8 +2,8 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Helper\Url;
-use Model\Config;
+use Kanboard\Helper\Url;
+use Kanboard\Model\Config;
 
 class UrlHelperTest extends Base
 {
diff --git a/tests/units/Helper/UserHelperTest.php b/tests/units/Helper/UserHelperTest.php
index 24f2b3b21..4cc9fa657 100644
--- a/tests/units/Helper/UserHelperTest.php
+++ b/tests/units/Helper/UserHelperTest.php
@@ -2,11 +2,11 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Helper\User;
-use Model\Project;
-use Model\ProjectPermission;
-use Model\User as UserModel;
-use Core\Session;
+use Kanboard\Helper\User;
+use Kanboard\Model\Project;
+use Kanboard\Model\ProjectPermission;
+use Kanboard\Model\User as UserModel;
+use Kanboard\Core\Session;
 
 class UserHelperTest extends Base
 {
diff --git a/tests/units/Integration/BitbucketWebhookTest.php b/tests/units/Integration/BitbucketWebhookTest.php
index 1902f738b..66d65d370 100644
--- a/tests/units/Integration/BitbucketWebhookTest.php
+++ b/tests/units/Integration/BitbucketWebhookTest.php
@@ -2,12 +2,12 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Integration\BitbucketWebhook;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\Project;
-use Model\ProjectPermission;
-use Model\User;
+use Kanboard\Integration\BitbucketWebhook;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\Project;
+use Kanboard\Model\ProjectPermission;
+use Kanboard\Model\User;
 
 class BitbucketWebhookTest extends Base
 {
diff --git a/tests/units/Integration/GithubWebhookTest.php b/tests/units/Integration/GithubWebhookTest.php
index 3b67ad1c9..d64e783e4 100644
--- a/tests/units/Integration/GithubWebhookTest.php
+++ b/tests/units/Integration/GithubWebhookTest.php
@@ -2,12 +2,12 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Integration\GithubWebhook;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\Project;
-use Model\ProjectPermission;
-use Model\User;
+use Kanboard\Integration\GithubWebhook;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\Project;
+use Kanboard\Model\ProjectPermission;
+use Kanboard\Model\User;
 
 class GithubWebhookTest extends Base
 {
diff --git a/tests/units/Integration/GitlabWebhookTest.php b/tests/units/Integration/GitlabWebhookTest.php
index ec073fee9..6d37819b0 100644
--- a/tests/units/Integration/GitlabWebhookTest.php
+++ b/tests/units/Integration/GitlabWebhookTest.php
@@ -2,12 +2,12 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Integration\GitlabWebhook;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\Project;
-use Model\ProjectPermission;
-use Model\User;
+use Kanboard\Integration\GitlabWebhook;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\Project;
+use Kanboard\Model\ProjectPermission;
+use Kanboard\Model\User;
 
 class GitlabWebhookTest extends Base
 {
diff --git a/tests/units/Integration/MailgunTest.php b/tests/units/Integration/MailgunTest.php
index 67914b0a2..25599f8e0 100644
--- a/tests/units/Integration/MailgunTest.php
+++ b/tests/units/Integration/MailgunTest.php
@@ -2,12 +2,12 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Integration\Mailgun;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\Project;
-use Model\ProjectPermission;
-use Model\User;
+use Kanboard\Integration\Mailgun;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\Project;
+use Kanboard\Model\ProjectPermission;
+use Kanboard\Model\User;
 
 class MailgunTest extends Base
 {
diff --git a/tests/units/Integration/PostmarkTest.php b/tests/units/Integration/PostmarkTest.php
index 9115e24ab..fba6dbba9 100644
--- a/tests/units/Integration/PostmarkTest.php
+++ b/tests/units/Integration/PostmarkTest.php
@@ -2,12 +2,12 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Integration\Postmark;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\Project;
-use Model\ProjectPermission;
-use Model\User;
+use Kanboard\Integration\Postmark;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\Project;
+use Kanboard\Model\ProjectPermission;
+use Kanboard\Model\User;
 
 class PostmarkTest extends Base
 {
diff --git a/tests/units/Integration/SendgridTest.php b/tests/units/Integration/SendgridTest.php
index b23520761..85303ce70 100644
--- a/tests/units/Integration/SendgridTest.php
+++ b/tests/units/Integration/SendgridTest.php
@@ -2,12 +2,12 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Integration\Sendgrid;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\Project;
-use Model\ProjectPermission;
-use Model\User;
+use Kanboard\Integration\Sendgrid;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\Project;
+use Kanboard\Model\ProjectPermission;
+use Kanboard\Model\User;
 
 class SendgridTest extends Base
 {
diff --git a/tests/units/Integration/SlackWebhookTest.php b/tests/units/Integration/SlackWebhookTest.php
index 3b9a3c1b0..cf8c86456 100644
--- a/tests/units/Integration/SlackWebhookTest.php
+++ b/tests/units/Integration/SlackWebhookTest.php
@@ -2,9 +2,9 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Integration\SlackWebhook;
-use Model\Project;
-use Model\Task;
+use Kanboard\Integration\SlackWebhook;
+use Kanboard\Model\Project;
+use Kanboard\Model\Task;
 
 class SlackWebhookTest extends Base
 {
@@ -13,7 +13,7 @@ class SlackWebhookTest extends Base
         $slack = new SlackWebhook($this->container);
 
         $this->container['config'] = $this
-            ->getMockBuilder('\Model\Config')
+            ->getMockBuilder('\Kanboard\Model\Config')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array(
                 'get',
@@ -34,7 +34,7 @@ class SlackWebhookTest extends Base
         $slack = new SlackWebhook($this->container);
 
         $this->container['config'] = $this
-            ->getMockBuilder('\Model\Config')
+            ->getMockBuilder('\Kanboard\Model\Config')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array(
                 'get',
@@ -42,7 +42,7 @@ class SlackWebhookTest extends Base
             ->getMock();
 
         $this->container['projectIntegration'] = $this
-            ->getMockBuilder('\Model\ProjectIntegration')
+            ->getMockBuilder('\Kanboard\Model\ProjectIntegration')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array(
                 'hasValue',
@@ -73,7 +73,7 @@ class SlackWebhookTest extends Base
         $slack = new SlackWebhook($this->container);
 
         $this->container['config'] = $this
-            ->getMockBuilder('\Model\Config')
+            ->getMockBuilder('\Kanboard\Model\Config')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array(
                 'get',
@@ -81,7 +81,7 @@ class SlackWebhookTest extends Base
             ->getMock();
 
         $this->container['projectIntegration'] = $this
-            ->getMockBuilder('\Model\ProjectIntegration')
+            ->getMockBuilder('\Kanboard\Model\ProjectIntegration')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array(
                 'hasValue',
@@ -112,7 +112,7 @@ class SlackWebhookTest extends Base
         $slack = new SlackWebhook($this->container);
 
         $this->container['config'] = $this
-            ->getMockBuilder('\Model\Config')
+            ->getMockBuilder('\Kanboard\Model\Config')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array(
                 'get',
@@ -133,7 +133,7 @@ class SlackWebhookTest extends Base
         $slack = new SlackWebhook($this->container);
 
         $this->container['config'] = $this
-            ->getMockBuilder('\Model\Config')
+            ->getMockBuilder('\Kanboard\Model\Config')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array(
                 'get',
@@ -141,7 +141,7 @@ class SlackWebhookTest extends Base
             ->getMock();
 
         $this->container['projectIntegration'] = $this
-            ->getMockBuilder('\Model\ProjectIntegration')
+            ->getMockBuilder('\Kanboard\Model\ProjectIntegration')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array(
                 'getParameters',
@@ -168,7 +168,7 @@ class SlackWebhookTest extends Base
         $slack = new SlackWebhook($this->container);
 
         $this->container['config'] = $this
-            ->getMockBuilder('\Model\Config')
+            ->getMockBuilder('\Kanboard\Model\Config')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array(
                 'get',
@@ -195,7 +195,7 @@ class SlackWebhookTest extends Base
         $slack = new SlackWebhook($this->container);
 
         $this->container['config'] = $this
-            ->getMockBuilder('\Model\Config')
+            ->getMockBuilder('\Kanboard\Model\Config')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array(
                 'get',
@@ -203,7 +203,7 @@ class SlackWebhookTest extends Base
             ->getMock();
 
         $this->container['projectIntegration'] = $this
-            ->getMockBuilder('\Model\ProjectIntegration')
+            ->getMockBuilder('\Kanboard\Model\ProjectIntegration')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array(
                 'getParameters',
@@ -228,7 +228,7 @@ class SlackWebhookTest extends Base
     public function testSendPayloadWithChannel()
     {
         $this->container['httpClient'] = $this
-            ->getMockBuilder('\Core\HttpClient')
+            ->getMockBuilder('\Kanboard\Core\HttpClient')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array(
                 'postJson',
@@ -236,7 +236,7 @@ class SlackWebhookTest extends Base
             ->getMock();
 
         $slack = $this
-            ->getMockBuilder('\Integration\SlackWebhook')
+            ->getMockBuilder('\Kanboard\Integration\SlackWebhook')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array(
                 'getChannel',
@@ -274,7 +274,7 @@ class SlackWebhookTest extends Base
     public function testSendPayloadWithoutChannel()
     {
         $this->container['httpClient'] = $this
-            ->getMockBuilder('\Core\HttpClient')
+            ->getMockBuilder('\Kanboard\Core\HttpClient')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array(
                 'postJson',
@@ -282,7 +282,7 @@ class SlackWebhookTest extends Base
             ->getMock();
 
         $slack = $this
-            ->getMockBuilder('\Integration\SlackWebhook')
+            ->getMockBuilder('\Kanboard\Integration\SlackWebhook')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array(
                 'getChannel',
@@ -328,7 +328,7 @@ class SlackWebhookTest extends Base
         );
 
         $slack = $this
-            ->getMockBuilder('\Integration\SlackWebhook')
+            ->getMockBuilder('\Kanboard\Integration\SlackWebhook')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array(
                 'sendPayload',
@@ -357,7 +357,7 @@ class SlackWebhookTest extends Base
         $this->assertTrue($this->container['config']->save(array('integration_slack_webhook' => 1)));
 
         $slack = $this
-            ->getMockBuilder('\Integration\SlackWebhook')
+            ->getMockBuilder('\Kanboard\Integration\SlackWebhook')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array(
                 'sendMessage',
diff --git a/tests/units/Model/AclTest.php b/tests/units/Model/AclTest.php
index 205e7ee39..28687a5c2 100644
--- a/tests/units/Model/AclTest.php
+++ b/tests/units/Model/AclTest.php
@@ -2,11 +2,11 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Core\Session;
-use Model\Acl;
-use Model\Project;
-use Model\ProjectPermission;
-use Model\User;
+use Kanboard\Core\Session;
+use Kanboard\Model\Acl;
+use Kanboard\Model\Project;
+use Kanboard\Model\ProjectPermission;
+use Kanboard\Model\User;
 
 class AclTest extends Base
 {
diff --git a/tests/units/Model/ActionTest.php b/tests/units/Model/ActionTest.php
index 66b2cfe36..30f6b22cb 100644
--- a/tests/units/Model/ActionTest.php
+++ b/tests/units/Model/ActionTest.php
@@ -2,18 +2,18 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Action;
-use Model\Project;
-use Model\Board;
-use Model\Task;
-use Model\TaskPosition;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\Category;
-use Model\User;
-use Model\ProjectPermission;
-use Integration\GithubWebhook;
-use Integration\BitbucketWebhook;
+use Kanboard\Model\Action;
+use Kanboard\Model\Project;
+use Kanboard\Model\Board;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskPosition;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\Category;
+use Kanboard\Model\User;
+use Kanboard\Model\ProjectPermission;
+use Kanboard\Integration\GithubWebhook;
+use Kanboard\Integration\BitbucketWebhook;
 
 class ActionTest extends Base
 {
diff --git a/tests/units/Model/AuthenticationTest.php b/tests/units/Model/AuthenticationTest.php
index 7ce81d8b2..6b48affe9 100644
--- a/tests/units/Model/AuthenticationTest.php
+++ b/tests/units/Model/AuthenticationTest.php
@@ -2,8 +2,8 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\User;
-use Model\Authentication;
+use Kanboard\Model\User;
+use Kanboard\Model\Authentication;
 
 class AuthenticationTest extends Base
 {
diff --git a/tests/units/Model/BoardTest.php b/tests/units/Model/BoardTest.php
index 106c6dc91..125b9962d 100644
--- a/tests/units/Model/BoardTest.php
+++ b/tests/units/Model/BoardTest.php
@@ -2,12 +2,12 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Project;
-use Model\Board;
-use Model\Config;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\Swimlane;
+use Kanboard\Model\Project;
+use Kanboard\Model\Board;
+use Kanboard\Model\Config;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\Swimlane;
 
 class BoardTest extends Base
 {
diff --git a/tests/units/Model/CategoryTest.php b/tests/units/Model/CategoryTest.php
index 0467dda4b..85d9eaae6 100644
--- a/tests/units/Model/CategoryTest.php
+++ b/tests/units/Model/CategoryTest.php
@@ -2,12 +2,12 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Task;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\Project;
-use Model\Category;
-use Model\User;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\Project;
+use Kanboard\Model\Category;
+use Kanboard\Model\User;
 
 class CategoryTest extends Base
 {
diff --git a/tests/units/Model/CommentTest.php b/tests/units/Model/CommentTest.php
index 5e532b8a1..07c39fe38 100644
--- a/tests/units/Model/CommentTest.php
+++ b/tests/units/Model/CommentTest.php
@@ -2,10 +2,10 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Task;
-use Model\TaskCreation;
-use Model\Project;
-use Model\Comment;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\Project;
+use Kanboard\Model\Comment;
 
 class CommentTest extends Base
 {
diff --git a/tests/units/Model/ConfigTest.php b/tests/units/Model/ConfigTest.php
index 832575b8a..7670daac1 100644
--- a/tests/units/Model/ConfigTest.php
+++ b/tests/units/Model/ConfigTest.php
@@ -2,8 +2,8 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Config;
-use Core\Session;
+use Kanboard\Model\Config;
+use Kanboard\Core\Session;
 
 class ConfigTest extends Base
 {
diff --git a/tests/units/Model/CustomFilterTest.php b/tests/units/Model/CustomFilterTest.php
index 4178aea61..190da8990 100644
--- a/tests/units/Model/CustomFilterTest.php
+++ b/tests/units/Model/CustomFilterTest.php
@@ -2,9 +2,9 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Project;
-use Model\User;
-use Model\CustomFilter;
+use Kanboard\Model\Project;
+use Kanboard\Model\User;
+use Kanboard\Model\CustomFilter;
 
 class CustomFilterTest extends Base
 {
diff --git a/tests/units/Model/DateParserTest.php b/tests/units/Model/DateParserTest.php
index 23c31f14e..5d8d6ab10 100644
--- a/tests/units/Model/DateParserTest.php
+++ b/tests/units/Model/DateParserTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\DateParser;
+use Kanboard\Model\DateParser;
 
 class DateParserTest extends Base
 {
diff --git a/tests/units/Model/EmailNotificationTest.php b/tests/units/Model/EmailNotificationTest.php
index 7193f9239..afe8d1960 100644
--- a/tests/units/Model/EmailNotificationTest.php
+++ b/tests/units/Model/EmailNotificationTest.php
@@ -2,17 +2,17 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\TaskFinder;
-use Model\TaskCreation;
-use Model\Subtask;
-use Model\Comment;
-use Model\User;
-use Model\File;
-use Model\Project;
-use Model\Task;
-use Model\ProjectPermission;
-use Model\EmailNotification;
-use Subscriber\NotificationSubscriber;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\Subtask;
+use Kanboard\Model\Comment;
+use Kanboard\Model\User;
+use Kanboard\Model\File;
+use Kanboard\Model\Project;
+use Kanboard\Model\Task;
+use Kanboard\Model\ProjectPermission;
+use Kanboard\Model\EmailNotification;
+use Kanboard\Subscriber\NotificationSubscriber;
 
 class EmailNotificationTest extends Base
 {
@@ -42,7 +42,7 @@ class EmailNotificationTest extends Base
         $this->assertNotEmpty($comment);
         $this->assertNotEmpty($file);
 
-        foreach (Subscriber\NotificationSubscriber::getSubscribedEvents() as $event => $values) {
+        foreach (NotificationSubscriber::getSubscribedEvents() as $event => $values) {
             $this->assertNotEmpty($en->getMailContent($event, array(
                 'task' => $task,
                 'comment' => $comment,
@@ -74,7 +74,7 @@ class EmailNotificationTest extends Base
         $this->assertTrue($u->update(array('id' => 1, 'email' => 'test@localhost')));
 
         $this->container['emailClient'] = $this
-            ->getMockBuilder('\Core\EmailClient')
+            ->getMockBuilder('\Kanboard\Core\EmailClient')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('send'))
             ->getMock();
@@ -104,7 +104,7 @@ class EmailNotificationTest extends Base
         $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
 
         $this->container['emailClient'] = $this
-            ->getMockBuilder('\Core\EmailClient')
+            ->getMockBuilder('\Kanboard\Core\EmailClient')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('send'))
             ->getMock();
diff --git a/tests/units/Model/FileTest.php b/tests/units/Model/FileTest.php
index d1ad72487..e311cf751 100644
--- a/tests/units/Model/FileTest.php
+++ b/tests/units/Model/FileTest.php
@@ -2,10 +2,10 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Task;
-use Model\File;
-use Model\TaskCreation;
-use Model\Project;
+use Kanboard\Model\Task;
+use Kanboard\Model\File;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\Project;
 
 class FileTest extends Base
 {
@@ -14,7 +14,7 @@ class FileTest extends Base
         parent::setUp();
 
         $this->container['objectStorage'] = $this
-            ->getMockBuilder('\Core\ObjectStorage\FileStorage')
+            ->getMockBuilder('\Kanboard\Core\ObjectStorage\FileStorage')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('put', 'moveFile', 'remove'))
             ->getMock();
@@ -104,7 +104,7 @@ class FileTest extends Base
         $data = base64_encode('image data');
 
         $f = $this
-            ->getMockBuilder('\Model\File')
+            ->getMockBuilder('\Kanboard\Model\File')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('generateThumbnailFromData'))
             ->getMock();
diff --git a/tests/units/Model/LinkTest.php b/tests/units/Model/LinkTest.php
index 0399f13ec..de9d843ac 100644
--- a/tests/units/Model/LinkTest.php
+++ b/tests/units/Model/LinkTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Link;
+use Kanboard\Model\Link;
 
 class LinkTest extends Base
 {
diff --git a/tests/units/Model/NotificationFilterTest.php b/tests/units/Model/NotificationFilterTest.php
index 73417fb1d..2f8cdc8a2 100644
--- a/tests/units/Model/NotificationFilterTest.php
+++ b/tests/units/Model/NotificationFilterTest.php
@@ -2,10 +2,10 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\User;
-use Model\Project;
-use Model\NotificationFilter;
-use Model\Notification;
+use Kanboard\Model\User;
+use Kanboard\Model\Project;
+use Kanboard\Model\NotificationFilter;
+use Kanboard\Model\Notification;
 
 class NotificationFilterTest extends Base
 {
diff --git a/tests/units/Model/NotificationTest.php b/tests/units/Model/NotificationTest.php
index 88c647448..251ae1b24 100644
--- a/tests/units/Model/NotificationTest.php
+++ b/tests/units/Model/NotificationTest.php
@@ -2,19 +2,19 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\TaskFinder;
-use Model\TaskCreation;
-use Model\Subtask;
-use Model\Comment;
-use Model\User;
-use Model\File;
-use Model\Project;
-use Model\Task;
-use Model\ProjectPermission;
-use Model\Notification;
-use Model\NotificationFilter;
-use Model\NotificationType;
-use Subscriber\NotificationSubscriber;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\Subtask;
+use Kanboard\Model\Comment;
+use Kanboard\Model\User;
+use Kanboard\Model\File;
+use Kanboard\Model\Project;
+use Kanboard\Model\Task;
+use Kanboard\Model\ProjectPermission;
+use Kanboard\Model\Notification;
+use Kanboard\Model\NotificationFilter;
+use Kanboard\Model\NotificationType;
+use Kanboard\Subscriber\NotificationSubscriber;
 
 class NotificationTest extends Base
 {
@@ -173,13 +173,13 @@ class NotificationTest extends Base
         ));
 
         $this->container['emailNotification'] = $this
-            ->getMockBuilder('\Model\EmailNotification')
+            ->getMockBuilder('\Kanboard\Model\EmailNotification')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('send'))
             ->getMock();
 
         $this->container['webNotification'] = $this
-            ->getMockBuilder('\Model\WebNotification')
+            ->getMockBuilder('\Kanboard\Model\WebNotification')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('send'))
             ->getMock();
diff --git a/tests/units/Model/NotificationTypeTest.php b/tests/units/Model/NotificationTypeTest.php
index 1a3d01970..bf3c78a0f 100644
--- a/tests/units/Model/NotificationTypeTest.php
+++ b/tests/units/Model/NotificationTypeTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\NotificationType;
+use Kanboard\Model\NotificationType;
 
 class NotificationTypeTest extends Base
 {
diff --git a/tests/units/Model/ProjectActivityTest.php b/tests/units/Model/ProjectActivityTest.php
index fa45d7406..e8adc10d2 100644
--- a/tests/units/Model/ProjectActivityTest.php
+++ b/tests/units/Model/ProjectActivityTest.php
@@ -2,11 +2,11 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Task;
-use Model\TaskFinder;
-use Model\TaskCreation;
-use Model\ProjectActivity;
-use Model\Project;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\ProjectActivity;
+use Kanboard\Model\Project;
 
 class ProjectActivityTest extends Base
 {
diff --git a/tests/units/Model/ProjectDailyColumnStatsTest.php b/tests/units/Model/ProjectDailyColumnStatsTest.php
index e01bdcc4a..4c801e027 100644
--- a/tests/units/Model/ProjectDailyColumnStatsTest.php
+++ b/tests/units/Model/ProjectDailyColumnStatsTest.php
@@ -2,11 +2,11 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Project;
-use Model\ProjectDailyColumnStats;
-use Model\Task;
-use Model\TaskCreation;
-use Model\TaskStatus;
+use Kanboard\Model\Project;
+use Kanboard\Model\ProjectDailyColumnStats;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskStatus;
 
 class ProjectDailyColumnStatsTest extends Base
 {
diff --git a/tests/units/Model/ProjectDuplicationTest.php b/tests/units/Model/ProjectDuplicationTest.php
index 0388d4a2c..e3234dfe5 100644
--- a/tests/units/Model/ProjectDuplicationTest.php
+++ b/tests/units/Model/ProjectDuplicationTest.php
@@ -2,16 +2,16 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Action;
-use Model\Project;
-use Model\Category;
-use Model\ProjectPermission;
-use Model\ProjectDuplication;
-use Model\User;
-use Model\Swimlane;
-use Model\Task;
-use Model\TaskCreation;
-use Model\TaskFinder;
+use Kanboard\Model\Action;
+use Kanboard\Model\Project;
+use Kanboard\Model\Category;
+use Kanboard\Model\ProjectPermission;
+use Kanboard\Model\ProjectDuplication;
+use Kanboard\Model\User;
+use Kanboard\Model\Swimlane;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
 
 class ProjectDuplicationTest extends Base
 {
diff --git a/tests/units/Model/ProjectPermissionTest.php b/tests/units/Model/ProjectPermissionTest.php
index 475dd0130..1ee63a76f 100644
--- a/tests/units/Model/ProjectPermissionTest.php
+++ b/tests/units/Model/ProjectPermissionTest.php
@@ -2,9 +2,9 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Project;
-use Model\ProjectPermission;
-use Model\User;
+use Kanboard\Model\Project;
+use Kanboard\Model\ProjectPermission;
+use Kanboard\Model\User;
 
 class ProjectPermissionTest extends Base
 {
diff --git a/tests/units/Model/ProjectTest.php b/tests/units/Model/ProjectTest.php
index 3373037dd..f90c0dc1e 100644
--- a/tests/units/Model/ProjectTest.php
+++ b/tests/units/Model/ProjectTest.php
@@ -2,17 +2,17 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Core\Translator;
-use Subscriber\ProjectModificationDateSubscriber;
-use Model\Project;
-use Model\ProjectPermission;
-use Model\User;
-use Model\Task;
-use Model\TaskCreation;
-use Model\Acl;
-use Model\Board;
-use Model\Config;
-use Model\Category;
+use Kanboard\Core\Translator;
+use Kanboard\Subscriber\ProjectModificationDateSubscriber;
+use Kanboard\Model\Project;
+use Kanboard\Model\ProjectPermission;
+use Kanboard\Model\User;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\Acl;
+use Kanboard\Model\Board;
+use Kanboard\Model\Config;
+use Kanboard\Model\Category;
 
 class ProjectTest extends Base
 {
@@ -165,7 +165,7 @@ class ProjectTest extends Base
         $this->assertEquals(1, $tc->create(array('title' => 'Task #1', 'project_id' => 1)));
 
         $called = $this->container['dispatcher']->getCalledListeners();
-        $this->assertArrayHasKey(Task::EVENT_CREATE_UPDATE.'.Subscriber\ProjectModificationDateSubscriber::execute', $called);
+        $this->assertArrayHasKey(Task::EVENT_CREATE_UPDATE.'.Kanboard\Subscriber\ProjectModificationDateSubscriber::execute', $called);
 
         $project = $p->getById(1);
         $this->assertNotEmpty($project);
diff --git a/tests/units/Model/SubtaskTest.php b/tests/units/Model/SubtaskTest.php
index 5773893c3..ba57ab010 100644
--- a/tests/units/Model/SubtaskTest.php
+++ b/tests/units/Model/SubtaskTest.php
@@ -2,20 +2,20 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Task;
-use Model\TaskCreation;
-use Model\Subtask;
-use Model\Project;
-use Model\Category;
-use Model\User;
-use Core\Session;
-use Model\UserSession;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\Subtask;
+use Kanboard\Model\Project;
+use Kanboard\Model\Category;
+use Kanboard\Model\User;
+use Kanboard\Core\Session;
+use Kanboard\Model\UserSession;
 
 class SubTaskTest extends Base
 {
     public function onSubtaskCreated($event)
     {
-        $this->assertInstanceOf('Event\SubtaskEvent', $event);
+        $this->assertInstanceOf('Kanboard\Event\SubtaskEvent', $event);
         $data = $event->getAll();
 
         $this->assertArrayHasKey('id', $data);
@@ -33,7 +33,7 @@ class SubTaskTest extends Base
 
     public function onSubtaskUpdated($event)
     {
-        $this->assertInstanceOf('Event\SubtaskEvent', $event);
+        $this->assertInstanceOf('Kanboard\Event\SubtaskEvent', $event);
         $data = $event->getAll();
 
         $this->assertArrayHasKey('id', $data);
@@ -55,7 +55,7 @@ class SubTaskTest extends Base
 
     public function onSubtaskDeleted($event)
     {
-        $this->assertInstanceOf('Event\SubtaskEvent', $event);
+        $this->assertInstanceOf('Kanboard\Event\SubtaskEvent', $event);
         $data = $event->getAll();
 
         $this->assertArrayHasKey('id', $data);
diff --git a/tests/units/Model/SubtaskTimeTrackingTest.php b/tests/units/Model/SubtaskTimeTrackingTest.php
index f68f283df..309be64a9 100644
--- a/tests/units/Model/SubtaskTimeTrackingTest.php
+++ b/tests/units/Model/SubtaskTimeTrackingTest.php
@@ -2,14 +2,14 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\TaskFinder;
-use Model\TaskCreation;
-use Model\Subtask;
-use Model\SubtaskTimeTracking;
-use Model\Project;
-use Model\Category;
-use Model\User;
-use Core\Session;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\Subtask;
+use Kanboard\Model\SubtaskTimeTracking;
+use Kanboard\Model\Project;
+use Kanboard\Model\Category;
+use Kanboard\Model\User;
+use Kanboard\Core\Session;
 
 class SubtaskTimeTrackingTest extends Base
 {
diff --git a/tests/units/Model/SwimlaneTest.php b/tests/units/Model/SwimlaneTest.php
index 7e1adb8eb..3d048abd7 100644
--- a/tests/units/Model/SwimlaneTest.php
+++ b/tests/units/Model/SwimlaneTest.php
@@ -2,11 +2,11 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Project;
-use Model\Task;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\Swimlane;
+use Kanboard\Model\Project;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\Swimlane;
 
 class SwimlaneTest extends Base
 {
diff --git a/tests/units/Model/TaskCreationTest.php b/tests/units/Model/TaskCreationTest.php
index 2a9ced2d0..ea0d32e65 100644
--- a/tests/units/Model/TaskCreationTest.php
+++ b/tests/units/Model/TaskCreationTest.php
@@ -2,19 +2,19 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Config;
-use Model\Task;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\TaskStatus;
-use Model\Project;
-use Model\ProjectPermission;
+use Kanboard\Model\Config;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\TaskStatus;
+use Kanboard\Model\Project;
+use Kanboard\Model\ProjectPermission;
 
 class TaskCreationTest extends Base
 {
     public function onCreate($event)
     {
-        $this->assertInstanceOf('Event\TaskEvent', $event);
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
 
         $event_data = $event->getAll();
         $this->assertNotEmpty($event_data);
diff --git a/tests/units/Model/TaskDuplicationTest.php b/tests/units/Model/TaskDuplicationTest.php
index f79bc9f49..95c393089 100644
--- a/tests/units/Model/TaskDuplicationTest.php
+++ b/tests/units/Model/TaskDuplicationTest.php
@@ -2,16 +2,16 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Task;
-use Model\TaskCreation;
-use Model\TaskDuplication;
-use Model\TaskFinder;
-use Model\TaskStatus;
-use Model\Project;
-use Model\ProjectPermission;
-use Model\Category;
-use Model\User;
-use Model\Swimlane;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskDuplication;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\TaskStatus;
+use Kanboard\Model\Project;
+use Kanboard\Model\ProjectPermission;
+use Kanboard\Model\Category;
+use Kanboard\Model\User;
+use Kanboard\Model\Swimlane;
 
 class TaskDuplicationTest extends Base
 {
@@ -414,7 +414,7 @@ class TaskDuplicationTest extends Base
 
     public function onMoveProject($event)
     {
-        $this->assertInstanceOf('Event\TaskEvent', $event);
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
 
         $event_data = $event->getAll();
         $this->assertNotEmpty($event_data);
diff --git a/tests/units/Model/TaskExportTest.php b/tests/units/Model/TaskExportTest.php
index 529963691..f7f8e2eb3 100644
--- a/tests/units/Model/TaskExportTest.php
+++ b/tests/units/Model/TaskExportTest.php
@@ -2,13 +2,13 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Task;
-use Model\TaskCreation;
-use Model\TaskExport;
-use Model\Project;
-use Model\Category;
-use Model\User;
-use Model\Swimlane;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskExport;
+use Kanboard\Model\Project;
+use Kanboard\Model\Category;
+use Kanboard\Model\User;
+use Kanboard\Model\Swimlane;
 
 class TaskExportTest extends Base
 {
diff --git a/tests/units/Model/TaskFilterTest.php b/tests/units/Model/TaskFilterTest.php
index 28b5d24a9..20e716226 100644
--- a/tests/units/Model/TaskFilterTest.php
+++ b/tests/units/Model/TaskFilterTest.php
@@ -2,15 +2,15 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Project;
-use Model\User;
-use Model\TaskFilter;
-use Model\TaskCreation;
-use Model\DateParser;
-use Model\Category;
-use Model\Subtask;
-use Model\Config;
-use Model\Swimlane;
+use Kanboard\Model\Project;
+use Kanboard\Model\User;
+use Kanboard\Model\TaskFilter;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\DateParser;
+use Kanboard\Model\Category;
+use Kanboard\Model\Subtask;
+use Kanboard\Model\Config;
+use Kanboard\Model\Swimlane;
 
 class TaskFilterTest extends Base
 {
diff --git a/tests/units/Model/TaskFinderTest.php b/tests/units/Model/TaskFinderTest.php
index 1d850ba76..e22f14e1d 100644
--- a/tests/units/Model/TaskFinderTest.php
+++ b/tests/units/Model/TaskFinderTest.php
@@ -2,13 +2,13 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Task;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\Project;
-use Model\ProjectPermission;
-use Model\Category;
-use Model\User;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\Project;
+use Kanboard\Model\ProjectPermission;
+use Kanboard\Model\Category;
+use Kanboard\Model\User;
 
 class TaskFinderTest extends Base
 {
diff --git a/tests/units/Model/TaskLinkTest.php b/tests/units/Model/TaskLinkTest.php
index 639f3dc8c..4db42d993 100644
--- a/tests/units/Model/TaskLinkTest.php
+++ b/tests/units/Model/TaskLinkTest.php
@@ -2,11 +2,11 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Link;
-use Model\TaskFinder;
-use Model\TaskLink;
-use Model\TaskCreation;
-use Model\Project;
+use Kanboard\Model\Link;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\TaskLink;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\Project;
 
 class TaskLinkTest extends Base
 {
diff --git a/tests/units/Model/TaskModificationTest.php b/tests/units/Model/TaskModificationTest.php
index f85f1c103..49b51f9b5 100644
--- a/tests/units/Model/TaskModificationTest.php
+++ b/tests/units/Model/TaskModificationTest.php
@@ -2,19 +2,19 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Task;
-use Model\TaskCreation;
-use Model\TaskModification;
-use Model\TaskFinder;
-use Model\TaskStatus;
-use Model\Project;
-use Model\ProjectPermission;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskModification;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\TaskStatus;
+use Kanboard\Model\Project;
+use Kanboard\Model\ProjectPermission;
 
 class TaskModificationTest extends Base
 {
     public function onCreateUpdate($event)
     {
-        $this->assertInstanceOf('Event\TaskEvent', $event);
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
 
         $event_data = $event->getAll();
         $this->assertNotEmpty($event_data);
@@ -24,7 +24,7 @@ class TaskModificationTest extends Base
 
     public function onUpdate($event)
     {
-        $this->assertInstanceOf('Event\TaskEvent', $event);
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
 
         $event_data = $event->getAll();
         $this->assertNotEmpty($event_data);
@@ -34,7 +34,7 @@ class TaskModificationTest extends Base
 
     public function onAssigneeChange($event)
     {
-        $this->assertInstanceOf('Event\TaskEvent', $event);
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
 
         $event_data = $event->getAll();
         $this->assertNotEmpty($event_data);
diff --git a/tests/units/Model/TaskMovedDateSubscriberTest.php b/tests/units/Model/TaskMovedDateSubscriberTest.php
index 6e3fb3bde..0dd6e9952 100644
--- a/tests/units/Model/TaskMovedDateSubscriberTest.php
+++ b/tests/units/Model/TaskMovedDateSubscriberTest.php
@@ -2,12 +2,12 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\TaskPosition;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\Project;
-use Model\Swimlane;
-use Subscriber\TaskMovedDateSubscriber;
+use Kanboard\Model\TaskPosition;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\Project;
+use Kanboard\Model\Swimlane;
+use Kanboard\Subscriber\TaskMovedDateSubscriber;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 
 class TaskMovedDateSubscriberTest extends Base
diff --git a/tests/units/Model/TaskPermissionTest.php b/tests/units/Model/TaskPermissionTest.php
index af413a764..52a365499 100644
--- a/tests/units/Model/TaskPermissionTest.php
+++ b/tests/units/Model/TaskPermissionTest.php
@@ -2,14 +2,14 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Task;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\TaskPermission;
-use Model\Project;
-use Model\Category;
-use Model\User;
-use Model\UserSession;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\TaskPermission;
+use Kanboard\Model\Project;
+use Kanboard\Model\Category;
+use Kanboard\Model\User;
+use Kanboard\Model\UserSession;
 
 class TaskPermissionTest extends Base
 {
diff --git a/tests/units/Model/TaskPositionTest.php b/tests/units/Model/TaskPositionTest.php
index 86814c036..d1838d526 100644
--- a/tests/units/Model/TaskPositionTest.php
+++ b/tests/units/Model/TaskPositionTest.php
@@ -2,14 +2,14 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Task;
-use Model\Board;
-use Model\TaskStatus;
-use Model\TaskPosition;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\Project;
-use Model\Swimlane;
+use Kanboard\Model\Task;
+use Kanboard\Model\Board;
+use Kanboard\Model\TaskStatus;
+use Kanboard\Model\TaskPosition;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\Project;
+use Kanboard\Model\Swimlane;
 
 class TaskPositionTest extends Base
 {
@@ -597,7 +597,7 @@ class TaskPositionTest extends Base
 
     public function onMoveColumn($event)
     {
-        $this->assertInstanceOf('Event\TaskEvent', $event);
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
 
         $event_data = $event->getAll();
         $this->assertNotEmpty($event_data);
@@ -609,7 +609,7 @@ class TaskPositionTest extends Base
 
     public function onMovePosition($event)
     {
-        $this->assertInstanceOf('Event\TaskEvent', $event);
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
 
         $event_data = $event->getAll();
         $this->assertNotEmpty($event_data);
@@ -621,7 +621,7 @@ class TaskPositionTest extends Base
 
     public function onMoveSwimlane($event)
     {
-        $this->assertInstanceOf('Event\TaskEvent', $event);
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
 
         $event_data = $event->getAll();
         $this->assertNotEmpty($event_data);
diff --git a/tests/units/Model/TaskStatusTest.php b/tests/units/Model/TaskStatusTest.php
index e5172c4d2..de08ffb3e 100644
--- a/tests/units/Model/TaskStatusTest.php
+++ b/tests/units/Model/TaskStatusTest.php
@@ -2,13 +2,13 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Subtask;
-use Model\Task;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\TaskStatus;
-use Model\Project;
-use Model\ProjectPermission;
+use Kanboard\Model\Subtask;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\TaskStatus;
+use Kanboard\Model\Project;
+use Kanboard\Model\ProjectPermission;
 
 class TaskStatusTest extends Base
 {
@@ -64,14 +64,14 @@ class TaskStatusTest extends Base
 
     public function onTaskOpen($event)
     {
-        $this->assertInstanceOf('Event\TaskEvent', $event);
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
         $this->assertArrayHasKey('task_id', $event);
         $this->assertNotEmpty($event['task_id']);
     }
 
     public function onTaskClose($event)
     {
-        $this->assertInstanceOf('Event\TaskEvent', $event);
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
         $this->assertArrayHasKey('task_id', $event);
         $this->assertNotEmpty($event['task_id']);
     }
diff --git a/tests/units/Model/TaskTest.php b/tests/units/Model/TaskTest.php
index 37c68a783..192dc0980 100644
--- a/tests/units/Model/TaskTest.php
+++ b/tests/units/Model/TaskTest.php
@@ -2,14 +2,14 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Task;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\TaskStatus;
-use Model\Project;
-use Model\ProjectPermission;
-use Model\Category;
-use Model\User;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\TaskStatus;
+use Kanboard\Model\Project;
+use Kanboard\Model\ProjectPermission;
+use Kanboard\Model\Category;
+use Kanboard\Model\User;
 
 class TaskTest extends Base
 {
diff --git a/tests/units/Model/UserSessionTest.php b/tests/units/Model/UserSessionTest.php
index 31072e6a6..66f6faa7d 100644
--- a/tests/units/Model/UserSessionTest.php
+++ b/tests/units/Model/UserSessionTest.php
@@ -2,8 +2,8 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Core\Session;
-use Model\UserSession;
+use Kanboard\Core\Session;
+use Kanboard\Model\UserSession;
 
 class UserSessionTest extends Base
 {
diff --git a/tests/units/Model/UserTest.php b/tests/units/Model/UserTest.php
index 85631cd64..90a80954f 100644
--- a/tests/units/Model/UserTest.php
+++ b/tests/units/Model/UserTest.php
@@ -2,13 +2,13 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\User;
-use Model\Subtask;
-use Model\Comment;
-use Model\Task;
-use Model\TaskCreation;
-use Model\TaskFinder;
-use Model\Project;
+use Kanboard\Model\User;
+use Kanboard\Model\Subtask;
+use Kanboard\Model\Comment;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\Project;
 
 class UserTest extends Base
 {
diff --git a/tests/units/Model/WebNotificationTest.php b/tests/units/Model/WebNotificationTest.php
index fffeb475f..8ed37692b 100644
--- a/tests/units/Model/WebNotificationTest.php
+++ b/tests/units/Model/WebNotificationTest.php
@@ -2,16 +2,16 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\TaskFinder;
-use Model\TaskCreation;
-use Model\Subtask;
-use Model\Comment;
-use Model\User;
-use Model\File;
-use Model\Task;
-use Model\Project;
-use Model\WebNotification;
-use Subscriber\NotificationSubscriber;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\Subtask;
+use Kanboard\Model\Comment;
+use Kanboard\Model\User;
+use Kanboard\Model\File;
+use Kanboard\Model\Task;
+use Kanboard\Model\Project;
+use Kanboard\Model\WebNotification;
+use Kanboard\Subscriber\NotificationSubscriber;
 
 class WebNotificationTest extends Base
 {
@@ -41,7 +41,7 @@ class WebNotificationTest extends Base
         $this->assertNotEmpty($comment);
         $this->assertNotEmpty($file);
 
-        foreach (Subscriber\NotificationSubscriber::getSubscribedEvents() as $event_name => $values) {
+        foreach (NotificationSubscriber::getSubscribedEvents() as $event_name => $values) {
             $title = $wn->getTitleFromEvent($event_name, array(
                 'task' => $task,
                 'comment' => $comment,
diff --git a/tests/units/Model/WebhookTest.php b/tests/units/Model/WebhookTest.php
index 8ed630e44..39819ba75 100644
--- a/tests/units/Model/WebhookTest.php
+++ b/tests/units/Model/WebhookTest.php
@@ -2,13 +2,13 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Model\Config;
-use Model\Task;
-use Model\TaskCreation;
-use Model\TaskModification;
-use Model\Project;
-use Model\Comment;
-use Subscriber\WebhookSubscriber;
+use Kanboard\Model\Config;
+use Kanboard\Model\Task;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskModification;
+use Kanboard\Model\Project;
+use Kanboard\Model\Comment;
+use Kanboard\Subscriber\WebhookSubscriber;
 
 class WebhookTest extends Base
 {