2 files changed, 34 insertions, 2 deletions
diff --git a/app/ServiceProvider/ClassProvider.php b/app/ServiceProvider/ClassProvider.php
index f939a9b5..b883c905 100644
--- a/app/ServiceProvider/ClassProvider.php
+++ b/app/ServiceProvider/ClassProvider.php
@@ -117,9 +117,7 @@ class ClassProvider implements ServiceProviderInterface
         ),
         'Core' => array(
             'DateParser',
-            'Helper',
             'Lexer',
-            'Template',
         ),
         'Core\Event' => array(
             'EventManager',
diff --git a/app/ServiceProvider/HelperProvider.php b/app/ServiceProvider/HelperProvider.php
new file mode 100644
index 00000000..42a0c85e
--- /dev/null
+++ b/app/ServiceProvider/HelperProvider.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Kanboard\ServiceProvider;
+
+use Kanboard\Core\Helper;
+use Kanboard\Core\Template;
+use Pimple\Container;
+use Pimple\ServiceProviderInterface;
+
+class HelperProvider implements ServiceProviderInterface
+{
+    public function register(Container $container)
+    {
+        $container['helper'] = new Helper($container);
+        $container['helper']->register('app', '\Kanboard\Helper\AppHelper');
+        $container['helper']->register('asset', '\Kanboard\Helper\AssetHelper');
+        $container['helper']->register('board', '\Kanboard\Helper\BoardHelper');
+        $container['helper']->register('dt', '\Kanboard\Helper\DateHelper');
+        $container['helper']->register('file', '\Kanboard\Helper\FileHelper');
+        $container['helper']->register('form', '\Kanboard\Helper\FormHelper');
+        $container['helper']->register('hook', '\Kanboard\Helper\HookHelper');
+        $container['helper']->register('layout', '\Kanboard\Helper\LayoutHelper');
+        $container['helper']->register('model', '\Kanboard\Helper\ModelHelper');
+        $container['helper']->register('subtask', '\Kanboard\Helper\SubtaskHelper');
+        $container['helper']->register('task', '\Kanboard\Helper\TaskHelper');
+        $container['helper']->register('text', '\Kanboard\Helper\TextHelper');
+        $container['helper']->register('url', '\Kanboard\Helper\UrlHelper');
+        $container['helper']->register('user', '\Kanboard\Helper\UserHelper');
+
+        $container['template'] = new Template($container['helper']);
+
+        return $container;
+    }
+}