From 077033adca6eb647a1d3f1cecf302b625745a537 Mon Sep 17 00:00:00 2001
From: Gustavo Cruz <gustavo.cruz.laura@gmail.com>
Date: Tue, 24 Feb 2015 18:14:41 -0400
Subject: [PATCH] Moving the Features folder again in order to ensure
 compatibility with the namespaces convention

---
 framework/src/Maveriks/WebApplication.php     |   4 +-
 rbac/engine/config/paths.php                  |   2 +-
 .../ActionsByEmail/ActionByEmail.php          |   0
 .../ActionsByEmail/ActionsByEmailFeature.php  |   1 +
 .../Services/Api/ActionsByEmailApi.php}       |  15 +-
 .../ActionsByEmail/Services/dataField.php     |   0
 .../ActionsByEmail/Services/dataForm.php      |   0
 .../ActionsByEmail/Services/dataFormPost.php  |   0
 .../ActionsByEmail/Services/utils.php         |   0
 .../ActionsByEmail/actionsByEmail.php         |   0
 .../ActionsByEmail/actionsByEmail.xml         |   0
 .../ActionsByEmail/actionsByEmailAjax.php     |   0
 .../actionsByEmail_FileEdit.html              |   0
 .../actionsByEmail_FileEdit.xml               |   0
 .../ActionsByEmail/class.actionsByEmail.php   |   0
 .../classes/model/AbeConfiguration.php        |   0
 .../classes/model/AbeConfigurationPeer.php    |   0
 .../classes/model/AbeRequests.php             |   0
 .../classes/model/AbeRequestsPeer.php         |   0
 .../classes/model/AbeResponses.php            |   0
 .../classes/model/AbeResponsesPeer.php        |   0
 .../model/map/AbeConfigurationMapBuilder.php  |   0
 .../model/map/AbeRequestsMapBuilder.php       |   0
 .../model/map/AbeResponsesMapBuilder.php      |   0
 .../classes/model/om/BaseAbeConfiguration.php |   0
 .../model/om/BaseAbeConfigurationPeer.php     |   0
 .../classes/model/om/BaseAbeRequests.php      |   0
 .../classes/model/om/BaseAbeRequestsPeer.php  |   0
 .../classes/model/om/BaseAbeResponses.php     |   0
 .../classes/model/om/BaseAbeResponsesPeer.php |   0
 .../ActionsByEmail/config/propel.ini          |   0
 .../ActionsByEmail/config/propel.mysql.ini    |   0
 .../config/schema-transformed.xml             |   0
 .../ActionsByEmail/config/schema.xml          |   0
 .../ActionsByEmail/configActionsByEmail.html  |   0
 .../ActionsByEmail/configActionsByEmail.php   |   0
 .../ActionsByEmail/configActionsByEmail.xml   |   0
 .../ActionsByEmail/data/actionsByEmail.html   |   0
 .../data/actionsByEmailPartner.html           |   0
 .../ActionsByEmail/data/schema.sql            |   0
 .../ActionsByEmail/data/sqldb.map             |   0
 .../documentation/CaseActionsByEmail.png      | Bin
 .../documentation/CaseNoteTask1.png           | Bin
 .../documentation/ConfigurationTask1.png      | Bin
 .../documentation/ConfigurationTask2.png      | Bin
 .../documentation/FormTask1.png               | Bin
 .../ActionsByEmail/documentation/Process1.png | Bin
 .../documentation/ProcessActions.png          | Bin
 .../documentation/ProcessActions1.png         | Bin
 .../documentation/ProcessActions2.png         | Bin
 .../documentation/ProcessFrm1.png             | Bin
 .../documentation/ResponseTask1.png           | Bin
 .../documentation/ResponseTask2.png           | Bin
 .../documentation/VerifyTask1.png             | Bin
 .../documentation/VerifyTask2.png             | Bin
 .../documentation/emailTask1.png              | Bin
 .../documentation/emailTask2.png              | Bin
 .../ActionsByEmail/documentation/overview.php |   0
 .../ActionsByEmail/externalStep.php           |   0
 .../ActionsByEmail/menusetup.php              |   0
 .../ActionsByEmail/pluginConfig.ini           |   0
 .../ActionsByEmail/report.js                  |   0
 .../views/ActivityConfigurationView.php       | 220 ++++++++++++++++++
 .../ActionsByEmail/xmlform.html               |   0
 .../engine/Features/ConfigurationHandler.php  |  36 +++
 .../EnterpriseFeature.php                     |   0
 .../ExtensionManager.php                      |   0
 workflow/engine/Features/FeatureServices.php  |  19 ++
 workflow/engine/Features/FeaturesHandler.php  |  33 +++
 .../ViewContainers/ActivityContainer.php}     |   2 +-
 .../ViewContainers/TriggerContainer.php       |   0
 .../ViewContainers/ViewContainer.php          |   0
 .../ActionsByEmail/views/task.views.php       | 211 -----------------
 .../engine/features/ConfigurationHandler.php  |  10 -
 workflow/engine/features/FeatureHandler.php   |  10 -
 .../Services/Api/Project/Activity.php         |   9 +-
 .../Services/Api/Project/DynaForm.php         |  19 --
 workflow/public_html/app.php                  |   4 +-
 78 files changed, 330 insertions(+), 265 deletions(-)
 rename workflow/engine/{features => Features}/ActionsByEmail/ActionByEmail.php (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/ActionsByEmailFeature.php (94%)
 rename workflow/engine/{features/ActionsByEmail/Services/Api/ActionsByEmail.php => Features/ActionsByEmail/Services/Api/ActionsByEmailApi.php} (98%)
 rename workflow/engine/{features => Features}/ActionsByEmail/Services/dataField.php (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/Services/dataForm.php (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/Services/dataFormPost.php (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/Services/utils.php (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/actionsByEmail.php (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/actionsByEmail.xml (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/actionsByEmailAjax.php (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/actionsByEmail_FileEdit.html (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/actionsByEmail_FileEdit.xml (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/class.actionsByEmail.php (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/classes/model/AbeConfiguration.php (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/classes/model/AbeConfigurationPeer.php (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/classes/model/AbeRequests.php (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/classes/model/AbeRequestsPeer.php (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/classes/model/AbeResponses.php (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/classes/model/AbeResponsesPeer.php (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/classes/model/map/AbeConfigurationMapBuilder.php (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/classes/model/map/AbeRequestsMapBuilder.php (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/classes/model/map/AbeResponsesMapBuilder.php (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/classes/model/om/BaseAbeConfiguration.php (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/classes/model/om/BaseAbeConfigurationPeer.php (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/classes/model/om/BaseAbeRequests.php (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/classes/model/om/BaseAbeRequestsPeer.php (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/classes/model/om/BaseAbeResponses.php (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/classes/model/om/BaseAbeResponsesPeer.php (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/config/propel.ini (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/config/propel.mysql.ini (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/config/schema-transformed.xml (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/config/schema.xml (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/configActionsByEmail.html (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/configActionsByEmail.php (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/configActionsByEmail.xml (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/data/actionsByEmail.html (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/data/actionsByEmailPartner.html (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/data/schema.sql (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/data/sqldb.map (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/documentation/CaseActionsByEmail.png (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/documentation/CaseNoteTask1.png (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/documentation/ConfigurationTask1.png (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/documentation/ConfigurationTask2.png (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/documentation/FormTask1.png (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/documentation/Process1.png (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/documentation/ProcessActions.png (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/documentation/ProcessActions1.png (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/documentation/ProcessActions2.png (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/documentation/ProcessFrm1.png (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/documentation/ResponseTask1.png (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/documentation/ResponseTask2.png (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/documentation/VerifyTask1.png (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/documentation/VerifyTask2.png (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/documentation/emailTask1.png (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/documentation/emailTask2.png (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/documentation/overview.php (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/externalStep.php (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/menusetup.php (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/pluginConfig.ini (100%)
 rename workflow/engine/{features => Features}/ActionsByEmail/report.js (100%)
 create mode 100644 workflow/engine/Features/ActionsByEmail/views/ActivityConfigurationView.php
 rename workflow/engine/{features => Features}/ActionsByEmail/xmlform.html (100%)
 create mode 100644 workflow/engine/Features/ConfigurationHandler.php
 rename workflow/engine/{features => Features}/EnterpriseFeature.php (100%)
 rename workflow/engine/{features => Features}/ExtensionManager.php (100%)
 create mode 100644 workflow/engine/Features/FeatureServices.php
 create mode 100644 workflow/engine/Features/FeaturesHandler.php
 rename workflow/engine/{features/ViewContainers/TaskContainer.php => Features/ViewContainers/ActivityContainer.php} (68%)
 rename workflow/engine/{features => Features}/ViewContainers/TriggerContainer.php (100%)
 rename workflow/engine/{features => Features}/ViewContainers/ViewContainer.php (100%)
 delete mode 100644 workflow/engine/features/ActionsByEmail/views/task.views.php
 delete mode 100644 workflow/engine/features/ConfigurationHandler.php
 delete mode 100644 workflow/engine/features/FeatureHandler.php

diff --git a/framework/src/Maveriks/WebApplication.php b/framework/src/Maveriks/WebApplication.php
index b8a1f3480..593f8b5a9 100644
--- a/framework/src/Maveriks/WebApplication.php
+++ b/framework/src/Maveriks/WebApplication.php
@@ -334,7 +334,7 @@ class WebApplication
             }
 
             // adding features extension api classes
-            $featuresPath = $this->workflowDir .'engine' . DS . 'features';
+            $featuresPath = $this->workflowDir .'engine' . DS . 'Features';
             // $apiDir - contains directory to scan classes and add them to Restler
             $featureDirList = glob($featuresPath . "/*", GLOB_ONLYDIR);
             foreach ($featureDirList as $directory) {
@@ -430,7 +430,7 @@ class WebApplication
         define("PATH_XMLFORM", PATH_CORE . "xmlform" . PATH_SEP);
         define("PATH_CONFIG", PATH_CORE . "config" . PATH_SEP);
         define("PATH_PLUGINS", PATH_CORE . "plugins" . PATH_SEP);
-        define("PATH_FEATURES", PATH_CORE . "features" . PATH_SEP);
+        define("PATH_FEATURES", PATH_CORE . "Features" . PATH_SEP);
         define("PATH_HTMLMAIL", PATH_CORE . "html_templates" . PATH_SEP);
         define("PATH_TPL", PATH_CORE . "templates" . PATH_SEP);
         define("PATH_TEST", PATH_CORE . "test" . PATH_SEP);
diff --git a/rbac/engine/config/paths.php b/rbac/engine/config/paths.php
index 501659baf..20a09ce78 100755
--- a/rbac/engine/config/paths.php
+++ b/rbac/engine/config/paths.php
@@ -50,7 +50,7 @@
   define( 'PATH_METHODS',     PATH_CORE . 'methods'      . PATH_SEP );
   define( 'PATH_XMLFORM',     PATH_CORE . 'xmlform'      . PATH_SEP );
   define( 'PATH_PLUGINS',     PATH_CORE . 'plugins'      . PATH_SEP  );
-  define( 'PATH_FEATURES',    PATH_CORE . 'features'     . PATH_SEP  );
+  define( 'PATH_FEATURES',    PATH_CORE . 'Features'     . PATH_SEP  );
   define( 'PATH_HTMLMAIL',    PATH_CORE . 'html_templates' . PATH_SEP );
   define( 'PATH_TPL',         PATH_CORE . 'templates'    . PATH_SEP );
   define( 'PATH_TEST',        PATH_CORE . 'test'         . PATH_SEP );
diff --git a/workflow/engine/features/ActionsByEmail/ActionByEmail.php b/workflow/engine/Features/ActionsByEmail/ActionByEmail.php
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/ActionByEmail.php
rename to workflow/engine/Features/ActionsByEmail/ActionByEmail.php
diff --git a/workflow/engine/features/ActionsByEmail/ActionsByEmailFeature.php b/workflow/engine/Features/ActionsByEmail/ActionsByEmailFeature.php
similarity index 94%
rename from workflow/engine/features/ActionsByEmail/ActionsByEmailFeature.php
rename to workflow/engine/Features/ActionsByEmail/ActionsByEmailFeature.php
index fd8da06d1..9644ed55a 100644
--- a/workflow/engine/features/ActionsByEmail/ActionsByEmailFeature.php
+++ b/workflow/engine/Features/ActionsByEmail/ActionsByEmailFeature.php
@@ -1,5 +1,6 @@
 <?php
 
+namespace Features;
 /**
  * Description of ActionsByEmailFeature
  * 
diff --git a/workflow/engine/features/ActionsByEmail/Services/Api/ActionsByEmail.php b/workflow/engine/Features/ActionsByEmail/Services/Api/ActionsByEmailApi.php
similarity index 98%
rename from workflow/engine/features/ActionsByEmail/Services/Api/ActionsByEmail.php
rename to workflow/engine/Features/ActionsByEmail/Services/Api/ActionsByEmailApi.php
index c10cb6c11..44e3bd207 100644
--- a/workflow/engine/features/ActionsByEmail/Services/Api/ActionsByEmail.php
+++ b/workflow/engine/Features/ActionsByEmail/Services/Api/ActionsByEmailApi.php
@@ -1,5 +1,5 @@
 <?php
-namespace ProcessMaker\Services\Api;
+namespace Features\ActionsByEmail\Services;
 
 use \ProcessMaker\Services\Api;
 use \Luracast\Restler\RestException;
@@ -13,12 +13,12 @@ require_once 'classes/model/Application.php';
 require_once 'classes/model/Users.php';
 
 /**
- * Class ActionsByEmail
+ * Class ActionsByEmailApi
  *
  * @author gustavo cruz <gustavo.cruz@colosa.com>
  * @protected
  */
-class ActionsByEmail extends Api
+class ActionsByEmailApi extends Api
 {
 
     /**
@@ -203,6 +203,7 @@ class ActionsByEmail extends Api
                 throw $error;
             }
         }
+        return $response;
     }
 
     /**
@@ -318,6 +319,7 @@ class ActionsByEmail extends Api
         $response = array();
         $response['totalCount'] = $totalCount;
         $response['data'] = $data;
+        return $response;
     }
 
     /**
@@ -431,8 +433,7 @@ class ActionsByEmail extends Api
             $message = 'An unexpected error occurred please try again later.';
         }
 
-        print_r($message);
-        die;
+        return $message;
     }
 
     /**
@@ -512,9 +513,7 @@ class ActionsByEmail extends Api
                 }
             }
         }
-
-        print_r($message);
-        die;
+        return $message;
     }
 
 }
diff --git a/workflow/engine/features/ActionsByEmail/Services/dataField.php b/workflow/engine/Features/ActionsByEmail/Services/dataField.php
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/Services/dataField.php
rename to workflow/engine/Features/ActionsByEmail/Services/dataField.php
diff --git a/workflow/engine/features/ActionsByEmail/Services/dataForm.php b/workflow/engine/Features/ActionsByEmail/Services/dataForm.php
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/Services/dataForm.php
rename to workflow/engine/Features/ActionsByEmail/Services/dataForm.php
diff --git a/workflow/engine/features/ActionsByEmail/Services/dataFormPost.php b/workflow/engine/Features/ActionsByEmail/Services/dataFormPost.php
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/Services/dataFormPost.php
rename to workflow/engine/Features/ActionsByEmail/Services/dataFormPost.php
diff --git a/workflow/engine/features/ActionsByEmail/Services/utils.php b/workflow/engine/Features/ActionsByEmail/Services/utils.php
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/Services/utils.php
rename to workflow/engine/Features/ActionsByEmail/Services/utils.php
diff --git a/workflow/engine/features/ActionsByEmail/actionsByEmail.php b/workflow/engine/Features/ActionsByEmail/actionsByEmail.php
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/actionsByEmail.php
rename to workflow/engine/Features/ActionsByEmail/actionsByEmail.php
diff --git a/workflow/engine/features/ActionsByEmail/actionsByEmail.xml b/workflow/engine/Features/ActionsByEmail/actionsByEmail.xml
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/actionsByEmail.xml
rename to workflow/engine/Features/ActionsByEmail/actionsByEmail.xml
diff --git a/workflow/engine/features/ActionsByEmail/actionsByEmailAjax.php b/workflow/engine/Features/ActionsByEmail/actionsByEmailAjax.php
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/actionsByEmailAjax.php
rename to workflow/engine/Features/ActionsByEmail/actionsByEmailAjax.php
diff --git a/workflow/engine/features/ActionsByEmail/actionsByEmail_FileEdit.html b/workflow/engine/Features/ActionsByEmail/actionsByEmail_FileEdit.html
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/actionsByEmail_FileEdit.html
rename to workflow/engine/Features/ActionsByEmail/actionsByEmail_FileEdit.html
diff --git a/workflow/engine/features/ActionsByEmail/actionsByEmail_FileEdit.xml b/workflow/engine/Features/ActionsByEmail/actionsByEmail_FileEdit.xml
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/actionsByEmail_FileEdit.xml
rename to workflow/engine/Features/ActionsByEmail/actionsByEmail_FileEdit.xml
diff --git a/workflow/engine/features/ActionsByEmail/class.actionsByEmail.php b/workflow/engine/Features/ActionsByEmail/class.actionsByEmail.php
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/class.actionsByEmail.php
rename to workflow/engine/Features/ActionsByEmail/class.actionsByEmail.php
diff --git a/workflow/engine/features/ActionsByEmail/classes/model/AbeConfiguration.php b/workflow/engine/Features/ActionsByEmail/classes/model/AbeConfiguration.php
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/classes/model/AbeConfiguration.php
rename to workflow/engine/Features/ActionsByEmail/classes/model/AbeConfiguration.php
diff --git a/workflow/engine/features/ActionsByEmail/classes/model/AbeConfigurationPeer.php b/workflow/engine/Features/ActionsByEmail/classes/model/AbeConfigurationPeer.php
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/classes/model/AbeConfigurationPeer.php
rename to workflow/engine/Features/ActionsByEmail/classes/model/AbeConfigurationPeer.php
diff --git a/workflow/engine/features/ActionsByEmail/classes/model/AbeRequests.php b/workflow/engine/Features/ActionsByEmail/classes/model/AbeRequests.php
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/classes/model/AbeRequests.php
rename to workflow/engine/Features/ActionsByEmail/classes/model/AbeRequests.php
diff --git a/workflow/engine/features/ActionsByEmail/classes/model/AbeRequestsPeer.php b/workflow/engine/Features/ActionsByEmail/classes/model/AbeRequestsPeer.php
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/classes/model/AbeRequestsPeer.php
rename to workflow/engine/Features/ActionsByEmail/classes/model/AbeRequestsPeer.php
diff --git a/workflow/engine/features/ActionsByEmail/classes/model/AbeResponses.php b/workflow/engine/Features/ActionsByEmail/classes/model/AbeResponses.php
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/classes/model/AbeResponses.php
rename to workflow/engine/Features/ActionsByEmail/classes/model/AbeResponses.php
diff --git a/workflow/engine/features/ActionsByEmail/classes/model/AbeResponsesPeer.php b/workflow/engine/Features/ActionsByEmail/classes/model/AbeResponsesPeer.php
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/classes/model/AbeResponsesPeer.php
rename to workflow/engine/Features/ActionsByEmail/classes/model/AbeResponsesPeer.php
diff --git a/workflow/engine/features/ActionsByEmail/classes/model/map/AbeConfigurationMapBuilder.php b/workflow/engine/Features/ActionsByEmail/classes/model/map/AbeConfigurationMapBuilder.php
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/classes/model/map/AbeConfigurationMapBuilder.php
rename to workflow/engine/Features/ActionsByEmail/classes/model/map/AbeConfigurationMapBuilder.php
diff --git a/workflow/engine/features/ActionsByEmail/classes/model/map/AbeRequestsMapBuilder.php b/workflow/engine/Features/ActionsByEmail/classes/model/map/AbeRequestsMapBuilder.php
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/classes/model/map/AbeRequestsMapBuilder.php
rename to workflow/engine/Features/ActionsByEmail/classes/model/map/AbeRequestsMapBuilder.php
diff --git a/workflow/engine/features/ActionsByEmail/classes/model/map/AbeResponsesMapBuilder.php b/workflow/engine/Features/ActionsByEmail/classes/model/map/AbeResponsesMapBuilder.php
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/classes/model/map/AbeResponsesMapBuilder.php
rename to workflow/engine/Features/ActionsByEmail/classes/model/map/AbeResponsesMapBuilder.php
diff --git a/workflow/engine/features/ActionsByEmail/classes/model/om/BaseAbeConfiguration.php b/workflow/engine/Features/ActionsByEmail/classes/model/om/BaseAbeConfiguration.php
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/classes/model/om/BaseAbeConfiguration.php
rename to workflow/engine/Features/ActionsByEmail/classes/model/om/BaseAbeConfiguration.php
diff --git a/workflow/engine/features/ActionsByEmail/classes/model/om/BaseAbeConfigurationPeer.php b/workflow/engine/Features/ActionsByEmail/classes/model/om/BaseAbeConfigurationPeer.php
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/classes/model/om/BaseAbeConfigurationPeer.php
rename to workflow/engine/Features/ActionsByEmail/classes/model/om/BaseAbeConfigurationPeer.php
diff --git a/workflow/engine/features/ActionsByEmail/classes/model/om/BaseAbeRequests.php b/workflow/engine/Features/ActionsByEmail/classes/model/om/BaseAbeRequests.php
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/classes/model/om/BaseAbeRequests.php
rename to workflow/engine/Features/ActionsByEmail/classes/model/om/BaseAbeRequests.php
diff --git a/workflow/engine/features/ActionsByEmail/classes/model/om/BaseAbeRequestsPeer.php b/workflow/engine/Features/ActionsByEmail/classes/model/om/BaseAbeRequestsPeer.php
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/classes/model/om/BaseAbeRequestsPeer.php
rename to workflow/engine/Features/ActionsByEmail/classes/model/om/BaseAbeRequestsPeer.php
diff --git a/workflow/engine/features/ActionsByEmail/classes/model/om/BaseAbeResponses.php b/workflow/engine/Features/ActionsByEmail/classes/model/om/BaseAbeResponses.php
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/classes/model/om/BaseAbeResponses.php
rename to workflow/engine/Features/ActionsByEmail/classes/model/om/BaseAbeResponses.php
diff --git a/workflow/engine/features/ActionsByEmail/classes/model/om/BaseAbeResponsesPeer.php b/workflow/engine/Features/ActionsByEmail/classes/model/om/BaseAbeResponsesPeer.php
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/classes/model/om/BaseAbeResponsesPeer.php
rename to workflow/engine/Features/ActionsByEmail/classes/model/om/BaseAbeResponsesPeer.php
diff --git a/workflow/engine/features/ActionsByEmail/config/propel.ini b/workflow/engine/Features/ActionsByEmail/config/propel.ini
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/config/propel.ini
rename to workflow/engine/Features/ActionsByEmail/config/propel.ini
diff --git a/workflow/engine/features/ActionsByEmail/config/propel.mysql.ini b/workflow/engine/Features/ActionsByEmail/config/propel.mysql.ini
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/config/propel.mysql.ini
rename to workflow/engine/Features/ActionsByEmail/config/propel.mysql.ini
diff --git a/workflow/engine/features/ActionsByEmail/config/schema-transformed.xml b/workflow/engine/Features/ActionsByEmail/config/schema-transformed.xml
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/config/schema-transformed.xml
rename to workflow/engine/Features/ActionsByEmail/config/schema-transformed.xml
diff --git a/workflow/engine/features/ActionsByEmail/config/schema.xml b/workflow/engine/Features/ActionsByEmail/config/schema.xml
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/config/schema.xml
rename to workflow/engine/Features/ActionsByEmail/config/schema.xml
diff --git a/workflow/engine/features/ActionsByEmail/configActionsByEmail.html b/workflow/engine/Features/ActionsByEmail/configActionsByEmail.html
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/configActionsByEmail.html
rename to workflow/engine/Features/ActionsByEmail/configActionsByEmail.html
diff --git a/workflow/engine/features/ActionsByEmail/configActionsByEmail.php b/workflow/engine/Features/ActionsByEmail/configActionsByEmail.php
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/configActionsByEmail.php
rename to workflow/engine/Features/ActionsByEmail/configActionsByEmail.php
diff --git a/workflow/engine/features/ActionsByEmail/configActionsByEmail.xml b/workflow/engine/Features/ActionsByEmail/configActionsByEmail.xml
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/configActionsByEmail.xml
rename to workflow/engine/Features/ActionsByEmail/configActionsByEmail.xml
diff --git a/workflow/engine/features/ActionsByEmail/data/actionsByEmail.html b/workflow/engine/Features/ActionsByEmail/data/actionsByEmail.html
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/data/actionsByEmail.html
rename to workflow/engine/Features/ActionsByEmail/data/actionsByEmail.html
diff --git a/workflow/engine/features/ActionsByEmail/data/actionsByEmailPartner.html b/workflow/engine/Features/ActionsByEmail/data/actionsByEmailPartner.html
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/data/actionsByEmailPartner.html
rename to workflow/engine/Features/ActionsByEmail/data/actionsByEmailPartner.html
diff --git a/workflow/engine/features/ActionsByEmail/data/schema.sql b/workflow/engine/Features/ActionsByEmail/data/schema.sql
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/data/schema.sql
rename to workflow/engine/Features/ActionsByEmail/data/schema.sql
diff --git a/workflow/engine/features/ActionsByEmail/data/sqldb.map b/workflow/engine/Features/ActionsByEmail/data/sqldb.map
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/data/sqldb.map
rename to workflow/engine/Features/ActionsByEmail/data/sqldb.map
diff --git a/workflow/engine/features/ActionsByEmail/documentation/CaseActionsByEmail.png b/workflow/engine/Features/ActionsByEmail/documentation/CaseActionsByEmail.png
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/documentation/CaseActionsByEmail.png
rename to workflow/engine/Features/ActionsByEmail/documentation/CaseActionsByEmail.png
diff --git a/workflow/engine/features/ActionsByEmail/documentation/CaseNoteTask1.png b/workflow/engine/Features/ActionsByEmail/documentation/CaseNoteTask1.png
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/documentation/CaseNoteTask1.png
rename to workflow/engine/Features/ActionsByEmail/documentation/CaseNoteTask1.png
diff --git a/workflow/engine/features/ActionsByEmail/documentation/ConfigurationTask1.png b/workflow/engine/Features/ActionsByEmail/documentation/ConfigurationTask1.png
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/documentation/ConfigurationTask1.png
rename to workflow/engine/Features/ActionsByEmail/documentation/ConfigurationTask1.png
diff --git a/workflow/engine/features/ActionsByEmail/documentation/ConfigurationTask2.png b/workflow/engine/Features/ActionsByEmail/documentation/ConfigurationTask2.png
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/documentation/ConfigurationTask2.png
rename to workflow/engine/Features/ActionsByEmail/documentation/ConfigurationTask2.png
diff --git a/workflow/engine/features/ActionsByEmail/documentation/FormTask1.png b/workflow/engine/Features/ActionsByEmail/documentation/FormTask1.png
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/documentation/FormTask1.png
rename to workflow/engine/Features/ActionsByEmail/documentation/FormTask1.png
diff --git a/workflow/engine/features/ActionsByEmail/documentation/Process1.png b/workflow/engine/Features/ActionsByEmail/documentation/Process1.png
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/documentation/Process1.png
rename to workflow/engine/Features/ActionsByEmail/documentation/Process1.png
diff --git a/workflow/engine/features/ActionsByEmail/documentation/ProcessActions.png b/workflow/engine/Features/ActionsByEmail/documentation/ProcessActions.png
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/documentation/ProcessActions.png
rename to workflow/engine/Features/ActionsByEmail/documentation/ProcessActions.png
diff --git a/workflow/engine/features/ActionsByEmail/documentation/ProcessActions1.png b/workflow/engine/Features/ActionsByEmail/documentation/ProcessActions1.png
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/documentation/ProcessActions1.png
rename to workflow/engine/Features/ActionsByEmail/documentation/ProcessActions1.png
diff --git a/workflow/engine/features/ActionsByEmail/documentation/ProcessActions2.png b/workflow/engine/Features/ActionsByEmail/documentation/ProcessActions2.png
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/documentation/ProcessActions2.png
rename to workflow/engine/Features/ActionsByEmail/documentation/ProcessActions2.png
diff --git a/workflow/engine/features/ActionsByEmail/documentation/ProcessFrm1.png b/workflow/engine/Features/ActionsByEmail/documentation/ProcessFrm1.png
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/documentation/ProcessFrm1.png
rename to workflow/engine/Features/ActionsByEmail/documentation/ProcessFrm1.png
diff --git a/workflow/engine/features/ActionsByEmail/documentation/ResponseTask1.png b/workflow/engine/Features/ActionsByEmail/documentation/ResponseTask1.png
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/documentation/ResponseTask1.png
rename to workflow/engine/Features/ActionsByEmail/documentation/ResponseTask1.png
diff --git a/workflow/engine/features/ActionsByEmail/documentation/ResponseTask2.png b/workflow/engine/Features/ActionsByEmail/documentation/ResponseTask2.png
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/documentation/ResponseTask2.png
rename to workflow/engine/Features/ActionsByEmail/documentation/ResponseTask2.png
diff --git a/workflow/engine/features/ActionsByEmail/documentation/VerifyTask1.png b/workflow/engine/Features/ActionsByEmail/documentation/VerifyTask1.png
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/documentation/VerifyTask1.png
rename to workflow/engine/Features/ActionsByEmail/documentation/VerifyTask1.png
diff --git a/workflow/engine/features/ActionsByEmail/documentation/VerifyTask2.png b/workflow/engine/Features/ActionsByEmail/documentation/VerifyTask2.png
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/documentation/VerifyTask2.png
rename to workflow/engine/Features/ActionsByEmail/documentation/VerifyTask2.png
diff --git a/workflow/engine/features/ActionsByEmail/documentation/emailTask1.png b/workflow/engine/Features/ActionsByEmail/documentation/emailTask1.png
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/documentation/emailTask1.png
rename to workflow/engine/Features/ActionsByEmail/documentation/emailTask1.png
diff --git a/workflow/engine/features/ActionsByEmail/documentation/emailTask2.png b/workflow/engine/Features/ActionsByEmail/documentation/emailTask2.png
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/documentation/emailTask2.png
rename to workflow/engine/Features/ActionsByEmail/documentation/emailTask2.png
diff --git a/workflow/engine/features/ActionsByEmail/documentation/overview.php b/workflow/engine/Features/ActionsByEmail/documentation/overview.php
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/documentation/overview.php
rename to workflow/engine/Features/ActionsByEmail/documentation/overview.php
diff --git a/workflow/engine/features/ActionsByEmail/externalStep.php b/workflow/engine/Features/ActionsByEmail/externalStep.php
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/externalStep.php
rename to workflow/engine/Features/ActionsByEmail/externalStep.php
diff --git a/workflow/engine/features/ActionsByEmail/menusetup.php b/workflow/engine/Features/ActionsByEmail/menusetup.php
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/menusetup.php
rename to workflow/engine/Features/ActionsByEmail/menusetup.php
diff --git a/workflow/engine/features/ActionsByEmail/pluginConfig.ini b/workflow/engine/Features/ActionsByEmail/pluginConfig.ini
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/pluginConfig.ini
rename to workflow/engine/Features/ActionsByEmail/pluginConfig.ini
diff --git a/workflow/engine/features/ActionsByEmail/report.js b/workflow/engine/Features/ActionsByEmail/report.js
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/report.js
rename to workflow/engine/Features/ActionsByEmail/report.js
diff --git a/workflow/engine/Features/ActionsByEmail/views/ActivityConfigurationView.php b/workflow/engine/Features/ActionsByEmail/views/ActivityConfigurationView.php
new file mode 100644
index 000000000..e4e7c62ca
--- /dev/null
+++ b/workflow/engine/Features/ActionsByEmail/views/ActivityConfigurationView.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * Description of ActivityViews
+ * 
+ */
+class ActivityConfigurationView
+{
+    public function retrieveView()
+    {
+        $view = array(
+            'type' => 'form',
+            'language' => 'en',
+            'title' => 'Actions by email configuration',
+            'layouts' => array(),
+            'fields' => array(
+                array(
+                    'name' => 'IFORM',
+                    'type' => 'hidden'
+                ),
+                array(
+                    'name' => 'INDEX',
+                    'type' => 'hidden'
+                ),
+                array(
+                    'name' => 'ABE_UID',
+                    'type' => 'hidden'
+                ),
+                array(
+                    'name' => 'PRO_UID',
+                    'type' => 'hidden'
+                ),
+                array(
+                    'name' => 'PRJ_UID',
+                    'type' => 'hidden'
+                ),
+                array(
+                    'name' => 'TAS_UID',
+                    'type' => 'hidden'
+                ),
+                array(
+                    'name' => 'SYS_LANG',
+                    'type' => 'hidden'
+                ),
+                array(
+                    'name' => 'ABE_EMAIL_FIELD_VALUE',
+                    'type' => 'hidden'
+                ),
+                array(
+                    'name' => 'ABE_ACTION_FIELD_VALUE',
+                    'type' => 'hidden'
+                ),
+                array(
+                    'name' => 'ABE_TYPE',
+                    'label' => 'Type',
+                    'type' => 'dropdown',
+                    'options' => array(
+                        array(
+                            'name' => '',
+                            'value' => '',
+                            'text' => '- None -',
+                            'type' => 'default'
+                        ),
+                        array(
+                            'name' => 'LINK',
+                            'value' => 'LINK',
+                            'text' => 'Link to fill a form',
+                        ),
+                        array(
+                            'name' => 'FIELD',
+                            'value' => 'FIELD',
+                            'text' => 'Use a field to generate actions links',
+                        )
+                    )
+                ),
+                array(
+                    'name' => 'ABE_TEMPLATE',
+                    'label' => 'Template',
+                    'type' => 'dropdown',
+                    'data_source' => array(
+                        'type' => 'REST',
+                        'method' => 'GET',
+                        'end_point' => '/ActionsByEmail/Templates',
+                        'parameters' => array()
+                    ),
+                    'options' => array(
+                        array(
+                            'name' => '',
+                            'value' => '',
+                            'text' => '- Select a Template -',
+                            'type' => 'default'
+                        )
+                    )
+                ),
+                array(
+                    'name' => 'EDIT',
+                    'type' => 'link',
+                    'value' => 'Edit',
+                    'action' => array(
+                        'type' => 'view-render',
+                        'data_source' => array(
+                            'type' => 'REST',
+                            'method' => 'GET',
+                            'end_point' => '/ActionsByEmail/Templates/editTemplate',
+                            'parameters' => array('ABE_TEMPLATE')
+                        )
+                    )
+                ),
+                array(
+                    'name' => 'DYN_UID',
+                    'label' => 'Dynaform',
+                    'value' => 'DYN_UID',
+                    'type' => 'dropdown',
+                    'data_source' => array(
+                        'type' => 'REST',
+                        'method' => 'GET',
+                        'end_point' => '/project/{prj_uid}/dynaforms',
+                        'parameters' => array()
+                    ),
+                    'options' => array(
+                        array(
+                            'name' => '',
+                            'value' => '',
+                            'text' => '- Select a Dynaform -',
+                            'type' => 'default'
+                        )
+                    ),
+                    'events' => array(
+                        'change' => array(
+                            'listeners' => array('email-field', 'action-field')
+                        )
+                    ),
+                ),
+                array(
+                    'name' => 'ABE_EMAIL_FIELD',
+                    'value' => 'ABE_EMAIL_FIELD',
+                    'label' => 'Field with the email',
+                    'type' => 'dropdown',
+                    'options' => array(
+                        array(
+                            'name' => '',
+                            'value' => '',
+                            'text' => '- Send to the email of the assigned user to the task -',
+                            'type' => 'default'
+                        )
+                    ),
+                    'listeners' => array(
+                        array(
+                            'name' => 'email-field',
+                            'action' => array(
+                                'type' => 'field-render',
+                                'data_source' => array(
+                                    'type' => 'REST',
+                                    'method' => 'GET',
+                                    'end_point' => '/project/{prj_uid}/dynaform/{dyn_uid}/fields',
+                                    'parameters' => array()
+                                )
+                            )
+                        )
+                    )
+                ),
+                array(
+                    'name' => 'ABE_ACTION_FIELD',
+                    'value' => 'ABE_ACTION_FIELD',
+                    'label' => 'Field to Send in the Email',
+                    'type' => 'dropdown',
+                    'options' => array(
+                        array(
+                            'name' => '',
+                            'value' => '',
+                            'text' => '- Select a Field -',
+                            'type' => 'default'
+                        )
+                    ),
+                    'listeners' => array(
+                        'name' => 'action-field',
+                        'action' => array(
+                            'type' => 'field-render',
+                            'data_source' => array(
+                                'type' => 'REST',
+                                'method' => 'GET',
+                                'end_point' => '/project/:prj_uid/dynaform/:dyn_uid/fields',
+                                'parameters' => array()
+                            )
+                        )
+                    )
+                ),
+                array(
+                    'name' => 'ABE_CASE_NOTE_IN_RESPONSE',
+                    'value' => true,
+                    'default' => false,
+                    'label' => 'Register a Case Note when the recipient submits the Response',
+                    'type' => 'checkbox'
+                ),
+                array(
+                    'name' => 'APPLY_CHANGES',
+                    'type' => 'button',
+                    'label' => 'Apply Changes',
+                    'value' => 'APPLY_CHANGES',
+                    'action' => array(
+                        'type' => 'view-close',
+                        'data_source' => array(
+                            'type' => 'REST',
+                            'method' => 'POST',
+                            'end_point' => '/ActionsByEmail/saveConfiguration',
+                            'parameters' => array('_ALL')
+                        )
+                    )
+                ),
+                array(
+                    'name' => 'REQUIRED_LABEL',
+                    'type' => 'label',
+                    'label' => 'Required Field',
+                    'value' => 'REQUIRED_LABEL'
+                )
+            )
+        );
+        return $view;
+    }
+
+}
diff --git a/workflow/engine/features/ActionsByEmail/xmlform.html b/workflow/engine/Features/ActionsByEmail/xmlform.html
similarity index 100%
rename from workflow/engine/features/ActionsByEmail/xmlform.html
rename to workflow/engine/Features/ActionsByEmail/xmlform.html
diff --git a/workflow/engine/Features/ConfigurationHandler.php b/workflow/engine/Features/ConfigurationHandler.php
new file mode 100644
index 000000000..cc932e16e
--- /dev/null
+++ b/workflow/engine/Features/ConfigurationHandler.php
@@ -0,0 +1,36 @@
+<?php
+namespace Features;
+/**
+ * Description of ConfigurationManager
+ * 
+ */
+class ConfigurationHandler
+{
+    public function retrieveFeatureConfiguration($feature)
+    {
+        $configuration = new stdClass();
+        $configuration->views = $this->retrieveViews($feature);
+    }
+    
+    public function retrieveViews($feature, $type = 'configuration')
+    {
+        require_once $feature->path . PATH_SEPARATOR . $feature->name;
+    }
+    
+    public function getViewList($feature)
+    {
+        $forbiddenFolders = array();
+        $views = glob($feature->path.'/*', GLOB_ONLYDIR);
+        $viewFiles = array();
+        foreach ($views as $directory) {
+            $feature = new stdClass();
+            if (in_array($directory, $forbiddenFolders)) {
+                continue;
+            }
+            $feature->path = PATH_FEATURES . PATH_SEP . $directory;
+            $feature->name = $directory;
+            $viewFiles[] = $feature;
+        }
+        return $viewFiles;
+    }
+}
diff --git a/workflow/engine/features/EnterpriseFeature.php b/workflow/engine/Features/EnterpriseFeature.php
similarity index 100%
rename from workflow/engine/features/EnterpriseFeature.php
rename to workflow/engine/Features/EnterpriseFeature.php
diff --git a/workflow/engine/features/ExtensionManager.php b/workflow/engine/Features/ExtensionManager.php
similarity index 100%
rename from workflow/engine/features/ExtensionManager.php
rename to workflow/engine/Features/ExtensionManager.php
diff --git a/workflow/engine/Features/FeatureServices.php b/workflow/engine/Features/FeatureServices.php
new file mode 100644
index 000000000..3b7a997d1
--- /dev/null
+++ b/workflow/engine/Features/FeatureServices.php
@@ -0,0 +1,19 @@
+<?php
+namespace Features;
+
+use Features\ActionsByEmail\views\ActivityConfigurationView;
+/**
+ * Description of FeaturesService
+ * 
+ */
+class FeatureServices
+{
+    public function retrieveView($params)
+    {
+        $viewsFolder = 'views';
+        $className = ucfirst($params['type']) . ucfirst($params['view']) . 'View';
+        require_once $viewsFolder.DS.$className.'.php';
+        $view = new $className();
+        return $view->retrieveView();
+    }
+}
diff --git a/workflow/engine/Features/FeaturesHandler.php b/workflow/engine/Features/FeaturesHandler.php
new file mode 100644
index 000000000..188b24cfc
--- /dev/null
+++ b/workflow/engine/Features/FeaturesHandler.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Features;
+/**
+ * Description of FeatureManager
+ * 
+ */
+class FeaturesHandler
+{
+    public function retrieveConfigurations($params)
+    {
+        foreach ($this->getFeatureList() as $feature) {
+            
+        }
+    }
+
+    public function getFeatureList()
+    {
+        $invalidFolders = array('ViewContainers');
+        $featuresFolders = glob(PATH_FEATURES.'/*', GLOB_ONLYDIR);
+        $features = array();
+        foreach ($featuresFolders as $directory) {
+            $feature = new stdClass();
+            if (in_array($directory, $invalidFolders)) {
+                continue;
+            }
+            $feature->path = PATH_FEATURES . PATH_SEP . $directory;
+            $feature->name = $directory;
+            $features[] = $feature;
+        }
+        return $features;
+    }
+}
diff --git a/workflow/engine/features/ViewContainers/TaskContainer.php b/workflow/engine/Features/ViewContainers/ActivityContainer.php
similarity index 68%
rename from workflow/engine/features/ViewContainers/TaskContainer.php
rename to workflow/engine/Features/ViewContainers/ActivityContainer.php
index f9a2558ef..f4751c7f6 100644
--- a/workflow/engine/features/ViewContainers/TaskContainer.php
+++ b/workflow/engine/Features/ViewContainers/ActivityContainer.php
@@ -4,7 +4,7 @@ namespace Features\ViewContainers;
  * Description of TaskContainer
  * 
  */
-class TaskContainer extends ViewContainer
+class ActivityContainer extends ViewContainer
 {    
     
 }
diff --git a/workflow/engine/features/ViewContainers/TriggerContainer.php b/workflow/engine/Features/ViewContainers/TriggerContainer.php
similarity index 100%
rename from workflow/engine/features/ViewContainers/TriggerContainer.php
rename to workflow/engine/Features/ViewContainers/TriggerContainer.php
diff --git a/workflow/engine/features/ViewContainers/ViewContainer.php b/workflow/engine/Features/ViewContainers/ViewContainer.php
similarity index 100%
rename from workflow/engine/features/ViewContainers/ViewContainer.php
rename to workflow/engine/Features/ViewContainers/ViewContainer.php
diff --git a/workflow/engine/features/ActionsByEmail/views/task.views.php b/workflow/engine/features/ActionsByEmail/views/task.views.php
deleted file mode 100644
index a6bda6fc1..000000000
--- a/workflow/engine/features/ActionsByEmail/views/task.views.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-$features['ActionsByEmail']['views'][] = array(
-    'taskConfiguration' => array(
-        'type' => 'form',
-        'language' => 'en',
-        'layouts' => array(),
-        'fields' => array(
-            array(
-                'name' => 'IFORM',
-                'type' => 'hidden'
-            ),
-            array(
-                'name' => 'INDEX',
-                'type' => 'hidden'
-            ),
-            array(
-                'name' => 'ABE_UID',
-                'type' => 'hidden'
-            ),
-            array(
-                'name' => 'PRO_UID',
-                'type' => 'hidden'
-            ),
-            array(
-                'name' => 'TAS_UID',
-                'type' => 'hidden'
-            ),
-            array(
-                'name' => 'SYS_LANG',
-                'type' => 'hidden'
-            ),
-            array(
-                'name' => 'ABE_EMAIL_FIELD_VALUE',
-                'type' => 'hidden'
-            ),
-            array(
-                'name' => 'ABE_ACTION_FIELD_VALUE',
-                'type' => 'hidden'
-            ),
-            array(
-                'name' => 'ABE_TYPE',
-                'label' => 'Type',
-                'type' => 'dropdown',
-                'options' => array(
-                    array(
-                        'name' => '',
-                        'value' => '',
-                        'text' => '- None -',
-                        'type' => 'default'
-                    ),
-                    array(
-                        'name' => 'LINK',
-                        'value' => 'LINK',
-                        'text' => 'Link to fill a form',
-                    ),
-                    array(
-                        'name' => 'FIELD',
-                        'value' => 'FIELD',
-                        'text' => 'Use a field to generate actions links',
-                    )
-                )
-            ),
-            array(
-                'name' => 'ABE_TEMPLATE',
-                'label' => 'Template',
-                'type' => 'dropdown',
-                'data_source' => array(
-                    'type' => 'REST',
-                    'method' => 'GET',
-                    'end_point' => '/ActionsByEmail/Templates',
-                    'parameters' => array()
-                ),
-                'options' => array(
-                    array(
-                        'name' => '',
-                        'value' => '',
-                        'text' => '- Select a Template -',
-                        'type' => 'default'
-                    )
-                )
-            ),
-            array(
-                'name' => 'EDIT',
-                'type' => 'link',
-                'value' => 'Edit',
-                'action' => array (
-                    'type' => 'view-render',
-                    'data_source' => array(
-                        'type' => 'REST',
-                        'method' => 'GET',
-                        'end_point' => '/ActionsByEmail/Templates/editTemplate',
-                        'parameters' => array('ABE_TEMPLATE')
-                    )
-                )
-            ),
-            array(
-                'name' => 'DYN_UID',
-                'value' => 'DYN_UID',
-                'type' => 'dropdown',
-                'data_source' => array(
-                    'type' => 'REST',
-                    'method' => 'GET',
-                    'end_point' => 'Dynaform',
-                    'parameters' => array()
-                ),
-                'options' => array(
-                    array(
-                        'name' => '',
-                        'value' => '',
-                        'text' => '- Select a Dynaform -',
-                        'type' => 'default'
-                    )
-                ),
-                'events' => array(
-                    'change' => array(
-                        'listeners' => array('email-field', 'action-field')
-                    )
-                ),
-            ),
-            array(
-                'name' => 'ABE_EMAIL_FIELD',
-                'value' => 'ABE_EMAIL_FIELD',
-                'label' => 'Field with the email',
-                'type' => 'dropdown',
-                'options' => array(
-                    array(
-                        'name' => '',
-                        'value' => '',
-                        'text' => '- Send to the email of the assigned user to the task -',
-                        'type' => 'default'
-                    )
-                ),
-                'listeners' => array (
-                    array (
-                        'name' => 'email-field',
-                        'action' => array (
-                            'type' => 'field-render',
-                            'data_source' => array (
-                                'type' => 'REST',
-                                'method' => 'GET',
-                                'end_point' => '/ActionsByEmail/Dynaform/loadFields',
-                                'parameters' => array('DYN_UID')
-                            )
-                        )
-                    )
-                )
-            ),
-            array(
-                'name' => 'ABE_ACTION_FIELD',
-                'value' => 'ABE_ACTION_FIELD',
-                'label' => 'Field to Send in the Email',
-                'type' => 'dropdown',
-                'options' => array(
-                    array(
-                        'name' => '',
-                        'value' => '',
-                        'text' => '- Select a Field -',
-                        'type' => 'default'
-                    )
-                ),
-                'listeners' => array(
-                    'name' => 'action-field',
-                    'action' => array(
-                        'type' => 'field-render',
-                        'data_source' => array(
-                            'type' => 'REST',
-                            'method' => 'GET',
-                            'end_point' => '/ActionsByEmail/Dynaform/loadFields',
-                            'parameters' => array('DYN_UID')
-                        )
-                    )
-                )
-            ),
-            array(
-                'name' => 'ABE_CASE_NOTE_IN_RESPONSE',
-                'value' => true,
-                'default' => false,
-                'label' => 'Register a Case Note when the recipient submits the Response',
-                'type' => 'checkbox'
-            ),
-            array(
-                'name' => 'APPLY_CHANGES',
-                'type' => 'button',                
-                'label' => 'Apply Changes',
-                'value' => 'APPLY_CHANGES',
-                'action' => array (
-                    'type' => 'view-close',
-                    'data_source' => array(
-                        'type' => 'REST',
-                        'method' => 'POST',
-                        'end_point' => '/ActionsByEmail/saveConfiguration',
-                        'parameters' => array('_ALL')
-                    )
-                )
-            ),
-            array(
-                'name' => 'REQUIRED_LABEL',
-                'type' => 'label',
-                'label' => 'Required Field',
-                'value' => 'REQUIRED_LABEL'
-            )
-        )
-    )
-);
diff --git a/workflow/engine/features/ConfigurationHandler.php b/workflow/engine/features/ConfigurationHandler.php
deleted file mode 100644
index 9c3c4fe9e..000000000
--- a/workflow/engine/features/ConfigurationHandler.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-/**
- * Description of ConfigurationManager
- * 
- */
-class ConfigurationHandler
-{
-    //put your code here
-}
diff --git a/workflow/engine/features/FeatureHandler.php b/workflow/engine/features/FeatureHandler.php
deleted file mode 100644
index a64046dda..000000000
--- a/workflow/engine/features/FeatureHandler.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-/**
- * Description of FeatureManager
- * 
- */
-class FeatureHandler
-{
-    //put your code here
-}
diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php b/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php
index acaa004a0..559852d2d 100644
--- a/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php
+++ b/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php
@@ -74,7 +74,14 @@ class Activity extends Api
     public function doGetProjectActivityFeatureConfiguration($prj_uid, $act_uid, $filter = '')
     {
         try {
-            return array('status' => 200, 'message' => 'success');
+            $featureServices = new \Features\FeatureServices();
+            $configuration = $featureServices->retrieveView(array(
+                'type' => 'activity',
+                'view' => 'configuration',
+                'prj_uid' => $prj_uid,
+                'act_uid' => $act_uid
+            ));
+            return $configuration;
         } catch (\Exception $e) {
             throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
         }
diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Project/DynaForm.php b/workflow/engine/src/ProcessMaker/Services/Api/Project/DynaForm.php
index 6f953c11c..4c7bd8036 100644
--- a/workflow/engine/src/ProcessMaker/Services/Api/Project/DynaForm.php
+++ b/workflow/engine/src/ProcessMaker/Services/Api/Project/DynaForm.php
@@ -31,25 +31,6 @@ class DynaForm extends Api
         }
     }
     
-    /**
-     * @url GET /:prj_uid/dynaform
-     *
-     * @param string $prj_uid {@min 32}{@max 32}
-     */
-    public function doGetDynaFormList($prj_uid)
-    {
-        try {
-            $dynaForm = new \ProcessMaker\BusinessModel\DynaForm();
-            $dynaForm->setFormatFieldNameInUppercase(false);
-
-            $response = $dynaForm->getDynaForm();
-
-            return $response;
-        } catch (\Exception $e) {
-            throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
-        }
-    }
-
     /**
      * @url POST /:prj_uid/dynaform
      *
diff --git a/workflow/public_html/app.php b/workflow/public_html/app.php
index df7df25ae..b2c837b49 100644
--- a/workflow/public_html/app.php
+++ b/workflow/public_html/app.php
@@ -29,10 +29,10 @@ try {
         }
     }
 
+    $loader->add($rootDir . 'workflow/engine/', 'Features');
     $loader->add($rootDir . 'workflow/engine/src/', "ProcessMaker");
-    //$loader->add($rootDir . "workflow/engine/classes/model/");
     $loader->add($rootDir . 'workflow/engine/src/');
-
+    
     // add vendors to autoloader
     $loader->add($rootDir . 'vendor/luracast/restler/vendor', "Luracast");
     $loader->add($rootDir . 'vendor/bshaffer/oauth2-server-php/src/', "OAuth2");