diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php
index f75f01c53..8b0c3eb70 100755
--- a/workflow/public_html/sysGeneric.php
+++ b/workflow/public_html/sysGeneric.php
@@ -57,9 +57,10 @@ define( 'PATH_OUTTRUNK', $pathOutTrunk );
 define( 'PATH_HTML', PATH_HOME . 'public_html' . PATH_SEP );
 
 //this is the first path, if the file exists...
-$request = substr($_SERVER['REQUEST_URI'],1,strlen($_SERVER['REQUEST_URI']));
-$fileWithoutParam = explode("?",$request);
-$requestFile = PATH_HTML . $fileWithoutParam[0];
+$request = substr($_SERVER['REQUEST_URI'], 1, strlen($_SERVER['REQUEST_URI'])); //removes the first '/' 
+$fileWithoutParam = explode("?", $request); // split the URI by '?'
+$request = $fileWithoutParam[0];            // get the first element of the split URI
+$requestFile = PATH_HTML . $request;        // temporary assemble a path for the file embedded in the URI
 if (file_exists($requestFile)) {
     if (!is_file($requestFile)) {
         header( "location: /errors/error404.php?url=" . urlencode( $_SERVER['REQUEST_URI'] ) );
@@ -116,6 +117,7 @@ if (file_exists($requestFile)) {
     die;
 }
 
+
 // Defining RBAC Paths constants
 define( 'PATH_RBAC_HOME', PATH_TRUNK . 'rbac' . PATH_SEP );
 
@@ -154,12 +156,6 @@ define( 'PATH_RBAC_MSSQL_DATA', PATH_RBAC_CORE . 'data' . PATH_SEP . 'mssql' . P
 define( 'PATH_CONTROLLERS', PATH_CORE . 'controllers' . PATH_SEP );
 define( 'PATH_SERVICES_REST', PATH_CORE . 'services' . PATH_SEP . 'rest' . PATH_SEP );
 
-//TEST
-//if($_SERVER['REQUEST_URI'] == "/sysworkflow/en/classic/processes/mainInit")
-//{
-//    echo PATH_TRUNK . "engine/methods/processes/mainInit.php";
-//}
-
 // include Gulliver Class
 require_once (PATH_GULLIVER . PATH_SEP . 'class.bootstrap.php');
 
@@ -473,6 +469,10 @@ Bootstrap::registerClass('BaseAppHistory',     PATH_HOME . "engine/classes/model
 Bootstrap::registerClass('AppHistory',         PATH_HOME . "engine/classes/model/AppHistory.php");
 Bootstrap::registerClass('AppHistoryPeer',     PATH_HOME . "engine/classes/model/AppHistoryPeer.php");
 
+Bootstrap::registerClass('BaseAppFolder',      PATH_HOME . "engine/classes/model/om/BaseAppFolder.php");
+Bootstrap::registerClass('AppFolder',          PATH_HOME . "engine/classes/model/AppFolder.php");
+Bootstrap::registerClass('AppFolderPeer',      PATH_HOME . "engine/classes/model/AppFolderPeer.php");
+
 Bootstrap::registerClass('BaseAppMessage',     PATH_HOME . "engine/classes/model/om/BaseAppMessage.php");
 Bootstrap::registerClass('AppMessage',         PATH_HOME . "engine/classes/model/AppMessage.php");
 Bootstrap::registerClass('BaseAppMessagePeer', PATH_HOME . "engine/classes/model/om/BaseAppMessagePeer.php");
@@ -495,8 +495,8 @@ Bootstrap::registerClass('BaseAppThread',       PATH_HOME . "engine/classes/mode
 Bootstrap::registerClass('AppThread',           PATH_HOME . "engine/classes/model/AppThread.php");
 Bootstrap::registerClass('AppThreadPeer',       PATH_HOME . "engine/classes/model/AppThreadPeer.php");
 
-Bootstrap::registerClass('BaseCaseScheduler',  PATH_HOME . "engine/classes/model/om/BaseCaseScheduler.php");
-Bootstrap::registerClass('CaseScheduler',      PATH_HOME . "engine/classes/model/CaseScheduler.php");
+Bootstrap::registerClass('BaseCaseScheduler',   PATH_HOME . "engine/classes/model/om/BaseCaseScheduler.php");
+Bootstrap::registerClass('CaseScheduler',       PATH_HOME . "engine/classes/model/CaseScheduler.php");
 
 Bootstrap::registerClass('BaseCaseTracker',     PATH_HOME . "engine/classes/model/om/BaseCaseTracker.php");
 Bootstrap::registerClass('CaseTracker',         PATH_HOME . "engine/classes/model/CaseTracker.php");