diff --git a/app/Console/Base.php b/app/Console/Base.php
index b2066a636..25d48e442 100644
--- a/app/Console/Base.php
+++ b/app/Console/Base.php
@@ -11,16 +11,16 @@ use Symfony\Component\Console\Command\Command;
  * @package  console
  * @author   Frederic Guillot
  *
+ * @property \Kanboard\Export\SubtaskExport                             $subtaskExport
+ * @property \Kanboard\Export\TaskExport                                $taskExport
+ * @property \Kanboard\Export\TransitionExport                          $transitionExport
  * @property \Kanboard\Model\Notification                               $notification
  * @property \Kanboard\Model\Project                                    $project
  * @property \Kanboard\Model\ProjectPermission                          $projectPermission
  * @property \Kanboard\Model\ProjectDailyColumnStats                    $projectDailyColumnStats
  * @property \Kanboard\Model\ProjectDailyStats                          $projectDailyStats
- * @property \Kanboard\Model\SubtaskExport                              $subtaskExport
  * @property \Kanboard\Model\Task                                       $task
- * @property \Kanboard\Model\TaskExport                                 $taskExport
  * @property \Kanboard\Model\TaskFinder                                 $taskFinder
- * @property \Kanboard\Model\Transition                                 $transition
  * @property \Kanboard\Model\UserNotification                           $userNotification
  * @property \Kanboard\Model\UserNotificationFilter                     $userNotificationFilter
  * @property \Symfony\Component\EventDispatcher\EventDispatcher         $dispatcher
diff --git a/app/Controller/Export.php b/app/Controller/Export.php
index 726edd42d..c2ff652e6 100644
--- a/app/Controller/Export.php
+++ b/app/Controller/Export.php
@@ -80,6 +80,6 @@ class Export extends Base
      */
     public function transitions()
     {
-        $this->common('transition', 'export', t('Transitions'), 'transitions', t('Task transitions export'));
+        $this->common('transitionExport', 'export', t('Transitions'), 'transitions', t('Task transitions export'));
     }
 }
diff --git a/app/Core/Base.php b/app/Core/Base.php
index c84fcbac0..d4ab6c81a 100644
--- a/app/Core/Base.php
+++ b/app/Core/Base.php
@@ -90,14 +90,12 @@ use Pimple\Container;
  * @property \Kanboard\Model\ProjectNotificationType                    $projectNotificationType
  * @property \Kanboard\Model\RememberMeSession                          $rememberMeSession
  * @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\TaskExternalLink                           $taskExternalLink
  * @property \Kanboard\Model\TaskFinder                                 $taskFinder
  * @property \Kanboard\Model\TaskFilter                                 $taskFilter
@@ -108,7 +106,6 @@ use Pimple\Container;
  * @property \Kanboard\Model\TaskStatus                                 $taskStatus
  * @property \Kanboard\Model\TaskMetadata                               $taskMetadata
  * @property \Kanboard\Model\Transition                                 $transition
- * @property \Kanboard\Model\TransitionExport                           $transitionExport
  * @property \Kanboard\Model\User                                       $user
  * @property \Kanboard\Model\UserLocking                                $userLocking
  * @property \Kanboard\Model\UserMention                                $userMention
@@ -121,7 +118,6 @@ use Pimple\Container;
  * @property \Kanboard\Validator\AuthValidator                          $authValidator
  * @property \Kanboard\Validator\ColumnValidator                        $columnValidator
  * @property \Kanboard\Validator\CategoryValidator                      $categoryValidator
- * @property \Kanboard\Validator\ColumnValidator                        $columnValidator
  * @property \Kanboard\Validator\CommentValidator                       $commentValidator
  * @property \Kanboard\Validator\CurrencyValidator                      $currencyValidator
  * @property \Kanboard\Validator\CustomFilterValidator                  $customFilterValidator
@@ -137,6 +133,9 @@ use Pimple\Container;
  * @property \Kanboard\Validator\UserValidator                          $userValidator
  * @property \Kanboard\Import\TaskImport                                $taskImport
  * @property \Kanboard\Import\UserImport                                $userImport
+ * @property \Kanboard\Export\SubtaskExport                             $subtaskExport
+ * @property \Kanboard\Export\TaskExport                                $taskExport
+ * @property \Kanboard\Export\TransitionExport                          $transitionExport
  * @property \Psr\Log\LoggerInterface                                   $logger
  * @property \PicoDb\Database                                           $db
  * @property \Symfony\Component\EventDispatcher\EventDispatcher         $dispatcher
diff --git a/app/Model/SubtaskExport.php b/app/Export/SubtaskExport.php
similarity index 95%
rename from app/Model/SubtaskExport.php
rename to app/Export/SubtaskExport.php
index 7c4e941de..386c566b6 100644
--- a/app/Model/SubtaskExport.php
+++ b/app/Export/SubtaskExport.php
@@ -1,11 +1,16 @@
 <?php
 
-namespace Kanboard\Model;
+namespace Kanboard\Export;
+
+use Kanboard\Core\Base;
+use Kanboard\Model\Task;
+use Kanboard\Model\Subtask;
+use Kanboard\Model\User;
 
 /**
  * Subtask Export
  *
- * @package  model
+ * @package  export
  * @author   Frederic Guillot
  */
 class SubtaskExport extends Base
diff --git a/app/Model/TaskExport.php b/app/Export/TaskExport.php
similarity index 97%
rename from app/Model/TaskExport.php
rename to app/Export/TaskExport.php
index 64f5e77ab..b98582aa4 100644
--- a/app/Model/TaskExport.php
+++ b/app/Export/TaskExport.php
@@ -1,14 +1,16 @@
 <?php
 
-namespace Kanboard\Model;
+namespace Kanboard\Export;
 
+use Kanboard\Core\Base;
 use Kanboard\Core\DateParser;
+use Kanboard\Model\Task;
 use PDO;
 
 /**
- * Task Export model
+ * Task Export
  *
- * @package  model
+ * @package  export
  * @author   Frederic Guillot
  */
 class TaskExport extends Base
diff --git a/app/Model/TransitionExport.php b/app/Export/TransitionExport.php
similarity index 96%
rename from app/Model/TransitionExport.php
rename to app/Export/TransitionExport.php
index 33becb820..97dc28a73 100644
--- a/app/Model/TransitionExport.php
+++ b/app/Export/TransitionExport.php
@@ -1,13 +1,14 @@
 <?php
 
-namespace Kanboard\Model;
+namespace Kanboard\Export;
 
+use Kanboard\Core\Base;
 use Kanboard\Core\DateParser;
 
 /**
  * Transition Export
  *
- * @package  model
+ * @package  export
  * @author   Frederic Guillot
  */
 class TransitionExport extends Base
diff --git a/app/ServiceProvider/ClassProvider.php b/app/ServiceProvider/ClassProvider.php
index 6612844b4..f939a9b59 100644
--- a/app/ServiceProvider/ClassProvider.php
+++ b/app/ServiceProvider/ClassProvider.php
@@ -53,14 +53,12 @@ class ClassProvider implements ServiceProviderInterface
             'ProjectUserRoleFilter',
             'RememberMeSession',
             'Subtask',
-            'SubtaskExport',
             'SubtaskTimeTracking',
             'Swimlane',
             'Task',
             'TaskAnalytic',
             'TaskCreation',
             'TaskDuplication',
-            'TaskExport',
             'TaskExternalLink',
             'TaskFinder',
             'TaskFile',
@@ -72,7 +70,6 @@ class ClassProvider implements ServiceProviderInterface
             'TaskStatus',
             'TaskMetadata',
             'Transition',
-            'TransitionExport',
             'User',
             'UserLocking',
             'UserMention',
@@ -113,6 +110,11 @@ class ClassProvider implements ServiceProviderInterface
             'TaskImport',
             'UserImport',
         ),
+        'Export' => array(
+            'SubtaskExport',
+            'TaskExport',
+            'TransitionExport',
+        ),
         'Core' => array(
             'DateParser',
             'Helper',
diff --git a/tests/units/Model/TaskExportTest.php b/tests/units/Export/TaskExportTest.php
similarity index 96%
rename from tests/units/Model/TaskExportTest.php
rename to tests/units/Export/TaskExportTest.php
index 559d53efe..f0637c250 100644
--- a/tests/units/Model/TaskExportTest.php
+++ b/tests/units/Export/TaskExportTest.php
@@ -1,9 +1,9 @@
 <?php
 
-require_once __DIR__.'/../Base.php';
+require_once __DIR__ . '/../Base.php';
 
 use Kanboard\Model\TaskCreation;
-use Kanboard\Model\TaskExport;
+use Kanboard\Export\TaskExport;
 use Kanboard\Model\Project;
 use Kanboard\Model\Category;
 use Kanboard\Model\Swimlane;
diff --git a/tests/units/Model/TransitionExportTest.php b/tests/units/Export/TransitionExportTest.php
similarity index 94%
rename from tests/units/Model/TransitionExportTest.php
rename to tests/units/Export/TransitionExportTest.php
index 98b4356d3..7ff3082e2 100644
--- a/tests/units/Model/TransitionExportTest.php
+++ b/tests/units/Export/TransitionExportTest.php
@@ -1,10 +1,10 @@
 <?php
 
-require_once __DIR__.'/../Base.php';
+require_once __DIR__ . '/../Base.php';
 
 use Kanboard\Model\TaskCreation;
 use Kanboard\Model\Transition;
-use Kanboard\Model\TransitionExport;
+use Kanboard\Export\TransitionExport;
 use Kanboard\Model\Project;
 
 class TransitionExportTest extends Base