diff --git a/app/Models/Process.php b/app/Models/Process.php
deleted file mode 100644
index e45241287..000000000
--- a/app/Models/Process.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Model;
-
-class Process extends Model
-{
-    /**
-     * Retrieve all applications that belong to this process
-     */
-    public function applications()
-    {
-        return $this->hasMany(Application::class, 'PRO_ID', 'PRO_ID');
-
-    }
-}
diff --git a/app/Models/Task.php b/app/Models/Task.php
deleted file mode 100644
index a79ef4a9c..000000000
--- a/app/Models/Task.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Model;
-
-class Task extends Model
-{
-    //
-}
diff --git a/app/Models/Application.php b/workflow/engine/src/ProcessMaker/Model/Application.php
similarity index 80%
rename from app/Models/Application.php
rename to workflow/engine/src/ProcessMaker/Model/Application.php
index 6afa38919..d0dd1f479 100644
--- a/app/Models/Application.php
+++ b/workflow/engine/src/ProcessMaker/Model/Application.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace ProcessMaker\Model;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Models/Delegation.php b/workflow/engine/src/ProcessMaker/Model/Delegation.php
similarity index 96%
rename from app/Models/Delegation.php
rename to workflow/engine/src/ProcessMaker/Model/Delegation.php
index d620c9d27..c33dd4e32 100644
--- a/app/Models/Delegation.php
+++ b/workflow/engine/src/ProcessMaker/Model/Delegation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace ProcessMaker\Model;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/workflow/engine/src/ProcessMaker/Model/Process.php b/workflow/engine/src/ProcessMaker/Model/Process.php
index f131fb318..e9b3cb972 100644
--- a/workflow/engine/src/ProcessMaker/Model/Process.php
+++ b/workflow/engine/src/ProcessMaker/Model/Process.php
@@ -17,5 +17,13 @@ class Process extends Model
     // We do have a created at, but we don't store an updated at
     const CREATED_AT = 'PRO_CREATE_DATE';
     const UPDATED_AT = null;
+    
+    /**
+     * Retrieve all applications that belong to this process
+     */
+    public function applications()
+    {
+        return $this->hasMany(Application::class, 'PRO_ID', 'PRO_ID');
 
+    }
 }
\ No newline at end of file
diff --git a/workflow/engine/src/ProcessMaker/Model/Task.php b/workflow/engine/src/ProcessMaker/Model/Task.php
new file mode 100644
index 000000000..ad2812698
--- /dev/null
+++ b/workflow/engine/src/ProcessMaker/Model/Task.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace ProcessMaker\Model;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Task extends Model
+{
+    protected $table = 'TASK';
+
+    public function process()
+    {
+        return $this->belongsTo(Process::class, 'PRO_UID', 'PRO_UID');
+    }
+
+    public function delegations()
+    {
+        return $this->hasMany(Delegation::class, 'TAS_ID', 'TAS_ID');
+    }
+}
diff --git a/app/Models/User.php b/workflow/engine/src/ProcessMaker/Model/User.php
similarity index 90%
rename from app/Models/User.php
rename to workflow/engine/src/ProcessMaker/Model/User.php
index 2c7442d51..f8c992bc1 100644
--- a/app/Models/User.php
+++ b/workflow/engine/src/ProcessMaker/Model/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace ProcessMaker\Model;
 
 use Illuminate\Database\Eloquent\Model;