From 9c9ed02cd7ebc5dbbc99bcaed6f80988ce8a9677 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Tue, 13 Oct 2015 22:19:17 -0400
Subject: Change namespace to add Kanboard as prefix

---
 app/Action/Base.php                                |   6 +-
 app/Action/CommentCreation.php                     |   8 +-
 app/Action/TaskAssignCategoryColor.php             |   4 +-
 app/Action/TaskAssignCategoryLabel.php             |   4 +-
 app/Action/TaskAssignColorCategory.php             |   4 +-
 app/Action/TaskAssignColorColumn.php               |   4 +-
 app/Action/TaskAssignColorLink.php                 |   4 +-
 app/Action/TaskAssignColorUser.php                 |   4 +-
 app/Action/TaskAssignCurrentUser.php               |   4 +-
 app/Action/TaskAssignSpecificUser.php              |   4 +-
 app/Action/TaskAssignUser.php                      |   6 +-
 app/Action/TaskClose.php                           |  10 +-
 app/Action/TaskCreation.php                        |   8 +-
 app/Action/TaskDuplicateAnotherProject.php         |   4 +-
 app/Action/TaskEmail.php                           |   4 +-
 app/Action/TaskLogMoveAnotherColumn.php            |   8 +-
 app/Action/TaskMoveAnotherProject.php              |   4 +-
 app/Action/TaskMoveColumnAssigned.php              |   4 +-
 app/Action/TaskMoveColumnCategoryChange.php        |   4 +-
 app/Action/TaskMoveColumnUnAssigned.php            |   4 +-
 app/Action/TaskOpen.php                            |   6 +-
 app/Action/TaskUpdateStartDate.php                 |   4 +-
 app/Api/Action.php                                 |   4 +-
 app/Api/App.php                                    |   4 +-
 app/Api/Auth.php                                   |   2 +-
 app/Api/Base.php                                   |   4 +-
 app/Api/Board.php                                  |   2 +-
 app/Api/Category.php                               |   4 +-
 app/Api/Comment.php                                |   4 +-
 app/Api/File.php                                   |   6 +-
 app/Api/Link.php                                   |   4 +-
 app/Api/Me.php                                     |   6 +-
 app/Api/Project.php                                |   2 +-
 app/Api/ProjectPermission.php                      |   4 +-
 app/Api/Subtask.php                                |   4 +-
 app/Api/Swimlane.php                               |   4 +-
 app/Api/Task.php                                   |   6 +-
 app/Api/TaskLink.php                               |   4 +-
 app/Api/User.php                                   |   6 +-
 app/Auth/Base.php                                  |   4 +-
 app/Auth/Database.php                              |   6 +-
 app/Auth/Github.php                                |   8 +-
 app/Auth/Gitlab.php                                |   8 +-
 app/Auth/Google.php                                |   8 +-
 app/Auth/Ldap.php                                  |   4 +-
 app/Auth/RememberMe.php                            |   8 +-
 app/Auth/ReverseProxy.php                          |   4 +-
 app/Console/Base.php                               |   2 +-
 app/Console/LocaleComparator.php                   |   2 +-
 app/Console/LocaleSync.php                         |   2 +-
 app/Console/ProjectDailyColumnStatsExport.php      |   4 +-
 app/Console/ProjectDailyStatsCalculation.php       |   4 +-
 app/Console/SubtaskExport.php                      |   4 +-
 app/Console/TaskExport.php                         |   4 +-
 app/Console/TaskOverdueNotification.php            |   2 +-
 app/Console/TransitionExport.php                   |   4 +-
 app/Controller/Action.php                          |   2 +-
 app/Controller/Activity.php                        |   2 +-
 app/Controller/Analytic.php                        |   2 +-
 app/Controller/App.php                             |   4 +-
 app/Controller/Auth.php                            |   2 +-
 app/Controller/Base.php                            |  20 +--
 app/Controller/Board.php                           |   2 +-
 app/Controller/Calendar.php                        |   4 +-
 app/Controller/Category.php                        |   2 +-
 app/Controller/Column.php                          |   2 +-
 app/Controller/Comment.php                         |   2 +-
 app/Controller/Config.php                          |   2 +-
 app/Controller/Currency.php                        |   2 +-
 app/Controller/Customfilter.php                    |   4 +-
 app/Controller/Doc.php                             |   2 +-
 app/Controller/Export.php                          |   2 +-
 app/Controller/Feed.php                            |   2 +-
 app/Controller/File.php                            |   4 +-
 app/Controller/Gantt.php                           |   4 +-
 app/Controller/Ical.php                            |   4 +-
 app/Controller/Link.php                            |   2 +-
 app/Controller/Listing.php                         |   4 +-
 app/Controller/Oauth.php                           |   2 +-
 app/Controller/Project.php                         |   2 +-
 app/Controller/Projectuser.php                     |   6 +-
 app/Controller/Search.php                          |   2 +-
 app/Controller/Subtask.php                         |   4 +-
 app/Controller/Swimlane.php                        |   4 +-
 app/Controller/Task.php                            |   2 +-
 app/Controller/TaskImport.php                      |   4 +-
 app/Controller/Taskcreation.php                    |   2 +-
 app/Controller/Taskduplication.php                 |   2 +-
 app/Controller/Tasklink.php                        |   2 +-
 app/Controller/Taskmodification.php                |   2 +-
 app/Controller/Taskstatus.php                      |   2 +-
 app/Controller/Timer.php                           |   2 +-
 app/Controller/Twofactor.php                       |   2 +-
 app/Controller/User.php                            |   4 +-
 app/Controller/UserImport.php                      |   4 +-
 app/Controller/Webhook.php                         |   2 +-
 app/Controller/Webnotification.php                 |   2 +-
 app/Core/Base.php                                  | 162 ++++++++++-----------
 app/Core/Cache/Base.php                            |   2 +-
 app/Core/Cache/CacheInterface.php                  |   2 +-
 app/Core/Cache/MemoryCache.php                     |   2 +-
 app/Core/Csv.php                                   |   2 +-
 app/Core/EmailClient.php                           |   2 +-
 app/Core/Helper.php                                |   4 +-
 app/Core/HttpClient.php                            |   2 +-
 app/Core/Lexer.php                                 |   2 +-
 app/Core/Markdown.php                              |   4 +-
 app/Core/NotificationInterface.php                 |   2 +-
 app/Core/OAuth2.php                                |   2 +-
 app/Core/ObjectStorage/FileStorage.php             |   2 +-
 app/Core/ObjectStorage/ObjectStorageException.php  |   2 +-
 app/Core/ObjectStorage/ObjectStorageInterface.php  |   2 +-
 app/Core/Paginator.php                             |   2 +-
 app/Core/Plugin/Base.php                           |   4 +-
 app/Core/Plugin/Hook.php                           |   2 +-
 app/Core/Plugin/Loader.php                         |  12 +-
 app/Core/Request.php                               |   2 +-
 app/Core/Response.php                              |   2 +-
 app/Core/Router.php                                |   5 +-
 app/Core/Security.php                              |   2 +-
 app/Core/Session.php                               |   2 +-
 app/Core/Template.php                              |   2 +-
 app/Core/Tool.php                                  |   4 +-
 app/Core/Translator.php                            |   2 +-
 app/Event/AuthEvent.php                            |   2 +-
 app/Event/CommentEvent.php                         |   2 +-
 app/Event/FileEvent.php                            |   2 +-
 app/Event/GenericEvent.php                         |   2 +-
 app/Event/SubtaskEvent.php                         |   2 +-
 app/Event/TaskEvent.php                            |   2 +-
 app/Event/TaskLinkEvent.php                        |   2 +-
 app/Formatter/FormatterInterface.php               |   2 +-
 app/Formatter/ProjectGanttFormatter.php            |   4 +-
 app/Formatter/TaskFilterAutoCompleteFormatter.php  |   6 +-
 app/Formatter/TaskFilterCalendarEvent.php          |   4 +-
 app/Formatter/TaskFilterCalendarFormatter.php      |   2 +-
 app/Formatter/TaskFilterGanttFormatter.php         |   4 +-
 app/Formatter/TaskFilterICalendarFormatter.php     |   2 +-
 app/Helper/App.php                                 |   4 +-
 app/Helper/Asset.php                               |   4 +-
 app/Helper/Board.php                               |   4 +-
 app/Helper/Dt.php                                  |   4 +-
 app/Helper/File.php                                |   4 +-
 app/Helper/Form.php                                |   6 +-
 app/Helper/Hook.php                                |   4 +-
 app/Helper/Subtask.php                             |   4 +-
 app/Helper/Task.php                                |   4 +-
 app/Helper/Text.php                                |   6 +-
 app/Helper/Url.php                                 |   8 +-
 app/Helper/User.php                                |   4 +-
 app/Integration/BitbucketWebhook.php               |   8 +-
 app/Integration/GithubWebhook.php                  |   8 +-
 app/Integration/GitlabWebhook.php                  |   8 +-
 app/Integration/HipchatWebhook.php                 |   4 +-
 app/Integration/Jabber.php                         |   4 +-
 app/Integration/Mailgun.php                        |   6 +-
 app/Integration/Postmark.php                       |   4 +-
 app/Integration/Sendgrid.php                       |   6 +-
 app/Integration/SlackWebhook.php                   |   4 +-
 app/Integration/Smtp.php                           |   4 +-
 app/Model/Acl.php                                  |   2 +-
 app/Model/Action.php                               |  10 +-
 app/Model/Authentication.php                       |   6 +-
 app/Model/Base.php                                 |   4 +-
 app/Model/Board.php                                |   2 +-
 app/Model/Category.php                             |   2 +-
 app/Model/Color.php                                |   2 +-
 app/Model/Comment.php                              |   4 +-
 app/Model/Config.php                               |   8 +-
 app/Model/Currency.php                             |   2 +-
 app/Model/CustomFilter.php                         |   2 +-
 app/Model/DateParser.php                           |   2 +-
 app/Model/EmailNotification.php                    |   4 +-
 app/Model/File.php                                 |   8 +-
 app/Model/LastLogin.php                            |   2 +-
 app/Model/Link.php                                 |   2 +-
 app/Model/Notification.php                         |   4 +-
 app/Model/NotificationFilter.php                   |   2 +-
 app/Model/NotificationType.php                     |   2 +-
 app/Model/OverdueNotification.php                  |   2 +-
 app/Model/Project.php                              |   4 +-
 app/Model/ProjectActivity.php                      |   2 +-
 app/Model/ProjectAnalytic.php                      |   2 +-
 app/Model/ProjectDailyColumnStats.php              |   2 +-
 app/Model/ProjectDailyStats.php                    |   2 +-
 app/Model/ProjectDuplication.php                   |   2 +-
 app/Model/ProjectIntegration.php                   |   2 +-
 app/Model/ProjectPermission.php                    |   2 +-
 app/Model/Subtask.php                              |   4 +-
 app/Model/SubtaskExport.php                        |   2 +-
 app/Model/SubtaskTimeTracking.php                  |   2 +-
 app/Model/Swimlane.php                             |   2 +-
 app/Model/Task.php                                 |   2 +-
 app/Model/TaskAnalytic.php                         |   2 +-
 app/Model/TaskCreation.php                         |   4 +-
 app/Model/TaskDuplication.php                      |   4 +-
 app/Model/TaskExport.php                           |   2 +-
 app/Model/TaskFilter.php                           |   2 +-
 app/Model/TaskFinder.php                           |   2 +-
 app/Model/TaskImport.php                           |   4 +-
 app/Model/TaskLink.php                             |   4 +-
 app/Model/TaskModification.php                     |   4 +-
 app/Model/TaskPermission.php                       |   2 +-
 app/Model/TaskPosition.php                         |   4 +-
 app/Model/TaskStatus.php                           |   4 +-
 app/Model/TaskValidator.php                        |   2 +-
 app/Model/Transition.php                           |   2 +-
 app/Model/User.php                                 |   6 +-
 app/Model/UserImport.php                           |   4 +-
 app/Model/UserSession.php                          |   4 +-
 app/Model/WebNotification.php                      |   4 +-
 app/Model/Webhook.php                              |   2 +-
 app/Schema/Mysql.php                               |   4 +-
 app/Schema/Postgres.php                            |   4 +-
 app/Schema/Sqlite.php                              |   4 +-
 app/ServiceProvider/ClassProvider.php              |  18 +--
 app/ServiceProvider/DatabaseProvider.php           |   2 +-
 app/ServiceProvider/EventDispatcherProvider.php    |  24 +--
 app/ServiceProvider/LoggingProvider.php            |   2 +-
 app/Subscriber/AuthSubscriber.php                  |   8 +-
 app/Subscriber/BootstrapSubscriber.php             |   4 +-
 app/Subscriber/NotificationSubscriber.php          |  22 +--
 app/Subscriber/ProjectActivitySubscriber.php       |  12 +-
 app/Subscriber/ProjectDailySummarySubscriber.php   |   8 +-
 .../ProjectModificationDateSubscriber.php          |   8 +-
 app/Subscriber/RecurringTaskSubscriber.php         |   8 +-
 app/Subscriber/SubtaskTimeTrackingSubscriber.php   |   8 +-
 app/Subscriber/TaskMovedDateSubscriber.php         |   8 +-
 app/Subscriber/TransitionSubscriber.php            |   8 +-
 app/Subscriber/WebhookSubscriber.php               |  18 +--
 app/Template/board/task_footer.php                 |   4 +-
 app/Template/listing/show.php                      |   2 +-
 app/Template/search/results.php                    |   2 +-
 app/Template/task/details.php                      |   2 +-
 app/Template/task/recurring_info.php               |   4 +-
 app/Template/task_modification/edit_recurrence.php |   4 +-
 app/common.php                                     |   8 +-
 app/constants.php                                  |   1 -
 app/functions.php                                  |   2 +-
 239 files changed, 568 insertions(+), 568 deletions(-)

(limited to 'app')

diff --git a/app/Action/Base.php b/app/Action/Base.php
index c8ff02a4..4d2d6da6 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 4029c875..73fedc3b 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 ba319a1f..ffa1ac2a 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 1383d491..0ef474b6 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 a362c68f..a2332f78 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 deb3e2b0..53140733 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 d055f225..67b2ef62 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 6161514d..6bf02c36 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 ff3aaee1..f34c4f36 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 4c96f7f0..dfcb281b 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 c28df9fb..a5821729 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 0fe58dac..d80bd023 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 bb5b05c2..af1403f0 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 7b7c6bf6..1f6684dd 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 363a01c6..355a49d8 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 621e8e6c..39c7710f 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 ee212998..476e2036 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 70ad7699..16622ee4 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 a0f41ba4..1e12be4a 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 2216c8d0..617c75a8 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 ee42ab32..2e53efae 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 4cd50c9a..4cd548af 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 a67e915c..eab20a6c 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 9b3ceb94..d082bcfb 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 18fe9ff9..b741694b 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 0287e0ec..152ceeab 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 93b99cce..d615b1dc 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 ad3c5ef9..3e5b3a34 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 e40968b9..a13c36d4 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 ad736ad4..760ee5ed 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 d883013d..049fcddb 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 e7611554..f4857b58 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 8ed382cb..4c491ced 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 7dd2dec6..80323395 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 2b8e7a1f..7b526023 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 13838d77..84c699ab 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 23a8c5bf..8911c2f1 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 6b23d051..47d70d1e 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 4884c45c..00d35796 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 ebf6681b..a354c200 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 e69f18a9..36be669e 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 2d1b7b26..28478b56 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 d9a985bf..306a474d 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 10ecfe8f..76e65fb6 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 3a48c402..78820d2e 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 54e60422..6569463d 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 7818254c..6f998a34 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 86da1465..018c55ab 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 6eec42dc..fcc3a995 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 ab95651b..bc3918da 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 4db33b6a..2513fbf1 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 4b77c556..9884cc1c 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 9816574b..aaa95276 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 862c1b0d..4515bf95 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 2428ad35..ffb9fab5 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 27d8de64..9ae41417 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 d92385c7..8e31fb30 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 234e4be4..24327c23 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 ca2146ed..1082b462 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 8a1a6e2b..50ac1d32 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 bb1154e4..b40811f4 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 e0fd59cb..8883a676 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 a2cde287..06c9a2ff 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 7050e54b..131d87aa 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 e8d83f2d..065da80b 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 89c495a6..a07a1fe1 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 cf0af615..90d9d6df 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 1ae390c8..ba3c690a 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 10fb90da..d3f9de5f 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 80d18a17..26e6cc87 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 f9f0a675..282f5d15 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 8b558c0a..cdedcb88 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 c08919c2..95b81fb8 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 ef90c55a..673e2669 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 879ab377..dd02626f 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 e89b7e38..ee2b1518 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 482e415c..73cd95f9 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 2c197e3e..b9c851f5 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 b0f13dc3..d9fb513b 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 3e3e47ce..5a3edf7a 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 4456ce3d..5729d662 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 f6dc7a32..67e2df82 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 338918fb..79b74896 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 f92e9fe3..69fdf3df 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 8e577839..ab7a8a9c 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 0343b1dc..387374c5 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 b9e9a33c..db33a130 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 8d329ca4..2eea1567 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 dd076802..c9649cc6 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 638af594..6bd2b25e 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 1768b773..b38a143f 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 2a4531ba..b2096f9f 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 a8b0351f..029ee048 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 0b39619d..15e9a0ee 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 9c27aa06..59defa0a 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 1a4cfe9a..1b3a659b 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 a481e9b8..52e3f266 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 7503e840..331b67e3 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 a16c12f0..d62b8507 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 8675ef8e..d9e9747a 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 b1de96bc..c4fb7ca4 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 6e7816f6..37f51b27 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 b1986502..38d6b3f1 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 64eaed23..5edaa3f0 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 99534cfe..4ec5396e 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 d7e6fde4..92443c2c 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 fa4e8080..4101a3b3 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 5dca74e5..b6cd1781 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 a7d04f33..ee6a7837 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 75160e79..683a9e7f 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 e89aeb25..9e98ff51 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 48444d2d..92277084 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 d00df7ce..763cb8b9 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 1b7ac8f5..d8b196e1 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 fa14af13..a3bcd918 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 9a884dae..ea512c4e 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 d0fcdb8e..f553d7cd 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 71d99524..c27f0a1d 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 55ebe4a8..8f366daf 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 0bd7c991..126de2fd 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 4f5fde70..a93131c7 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 9ca904de..d1e0c25a 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 39e42b83..1bd43a40 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 e9aa1f3f..7dd67363 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 ec1bec99..7cbced83 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 75a132d7..3ac6a236 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 81bd83c9..482a4eab 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 b29d8f32..1129fd16 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 229db860..f34bb60c 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 e2fb30fe..021cd4b7 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 9499eef9..b90dcdff 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 4193bd4e..0bb61292 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 652b947d..b629bdfa 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 999a8949..c9af4654 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 8733ee83..12ea8687 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 f3f42b97..1b5d6ca4 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 069daa3d..08059d4c 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 8aed1e20..bdf6b6c2 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 5fb89afe..0e84f694 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 fd555e07..c4178e8c 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 452a3b70..430d1858 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 b338fdc8..e717a4c0 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 a35e4283..b0a7f675 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 e8664771..92d07ccc 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 dc76e5e7..7b691949 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 6348ebd1..d103d453 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 79c412e1..1405a167 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 4b8e99bd..d2075fe4 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 22e9035e..f120252d 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 6b7d6f73..dc394738 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 d9dc45b1..b78c4d77 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 a725f5b9..c948ea8b 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 b8925daf..4b90ef7f 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 1d08e514..af1e4495 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 eaf1c5a8..9c7dcd40 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 076c311a..045284d2 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 05bdf58b..b57f92d4 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 fd58342a..2da87119 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 71244739..e216ed5b 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 ad2f30f8..3ef6539d 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 35488c63..92ce0c5a 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 57bd5b0d..b48e3ae3 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 93a463f1..acd563bc 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 902ab269..4c7ada7c 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 7217542d..6b450d22 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 f50c0f48..9cc2a193 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 6df7beb8..4ded2e1e 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 c1c800c3..c7125a25 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 bbc86a88..6561efc8 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 d04df763..c1156610 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 b7ccdf99..6550b4a7 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 002fc038..8159341d 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 39b60fc1..312828e4 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 1d44a415..e4430217 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 dd64284e..f4be8a9d 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 467710bd..4e1b4e6b 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 525e7f13..692f37a7 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 62795512..f1ad367b 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 3fd5c157..b0514b19 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 19bd0987..f44c8dd7 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 1bd5b624..b767af26 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 a9222fcc..527abf58 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 dbca4eed..34d152d1 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 774ed7f9..2228dcf8 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 56a51730..b98c23ff 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 6e054a4b..f0c66834 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 bcbfeae5..d07e4167 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 c412b7a9..36987d47 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 3c6269f1..bb6606b3 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 23dcc019..7c4e941d 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 4a18c8aa..86a4b213 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 06e879a4..1aa19fee 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 a1bbca93..f1cd094f 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 33a645c1..c6d4191c 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 4373fa63..b6d8fbae 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 958b2b3e..60fcac0c 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 90aa1964..d38a5384 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 efd3be61..6500edda 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 9e76e62e..9514fe4a 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 2eb4eb8f..92c8f400 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 1c7d6287..fafcde65 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 b67106e1..9cca5b30 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 e2420e10..501c8edc 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 874633b1..1ad17b36 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 23d77fa4..a5199ed9 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 89c66f2f..683cb0b1 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 ac3fba54..b1f8f678 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 2b6436f8..138b77b2 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 3d7c0feb..1a398d12 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 4c0364ce..56359bf2 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 4f4e8afb..02bcc956 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 e3af37f7..dd277bf8 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 6ece2785..a0febc1a 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 d4fae317..517ded85 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 2b9ceadc..e9e86fcc 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 2db0ec54..d91bced7 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 8300fe7d..a49a5f1b 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 aa71d61b..353d607b 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 16fa6cec..4344bccc 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 b814057f..2461b52c 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 793ba3e7..25b919f7 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 b99c2945..610fbadb 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 82b13d8e..f8d5d150 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 db180dea..bfa6cd42 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 2c01173b..1f99840d 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 68d704f0..793233c6 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 2d3b5f99..bb522b2e 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 16a75c19..9857f4b3 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 5804dab7..f14590f7 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 5176a7ff..8a2bd080 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 0fb5ea8d..3583ee1a 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 fc8a607b..aa17b228 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 04cb6a19..88eed87c 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 e8fdf5cd..9cd10dda 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 ad64ae19..83ca0960 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 f63f1516..dc4faa7a 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 e63d82bb..33e45f0d 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 0d8ffd87..004f7cf7 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 e4b38cdd..9bb7a8c8 100644
--- a/app/functions.php
+++ b/app/functions.php
@@ -1,6 +1,6 @@
 <?php
 
-use Core\Translator;
+use Kanboard\Core\Translator;
 
 /**
  * Translate a string
-- 
cgit v1.2.3