diff --git a/Assets.php b/Assets.php
deleted file mode 100644
index 2ddf1305..00000000
--- a/Assets.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace humhub\modules\tasks;
-
-use yii\web\AssetBundle;
-
-class Assets extends AssetBundle
-{
-    public $css = [
-        'tasks.css',
-    ];
-
-    public function init()
-    {
-        $this->sourcePath = __DIR__ . '/assets';
-        parent::init();
-    }
-
-}
diff --git a/CalendarUtils.php b/helpers/CalendarUtils.php
similarity index 97%
rename from CalendarUtils.php
rename to helpers/CalendarUtils.php
index 07ae0d81..08fb220c 100644
--- a/CalendarUtils.php
+++ b/helpers/CalendarUtils.php
@@ -7,7 +7,7 @@
  *
  */
 
-namespace humhub\modules\tasks;
+namespace humhub\modules\tasks\helpers;
 
 use DateTime;
 
diff --git a/models/forms/TaskFilter.php b/models/forms/TaskFilter.php
index b27f9e90..d1f98930 100644
--- a/models/forms/TaskFilter.php
+++ b/models/forms/TaskFilter.php
@@ -17,11 +17,11 @@
 namespace humhub\modules\tasks\models\forms;
 
 use humhub\libs\DbDateValidator;
-use humhub\modules\tasks\CalendarUtils;
-use Yii;
-use humhub\modules\tasks\models\Task;
 use humhub\modules\content\components\ContentContainerActiveRecord;
+use humhub\modules\tasks\helpers\CalendarUtils;
+use humhub\modules\tasks\models\Task;
 use humhub\modules\tasks\models\user\TaskUser;
+use Yii;
 use yii\base\Model;
 
 class TaskFilter extends Model