diff --git a/workflow/public_html/bootstrap.php b/workflow/public_html/bootstrap.php
index e2324bb55..fcdcb77cf 100755
--- a/workflow/public_html/bootstrap.php
+++ b/workflow/public_html/bootstrap.php
@@ -49,8 +49,123 @@
   define('PATH_HOME',     $pathhome);
   define('PATH_TRUNK',    $pathTrunk);
   define('PATH_OUTTRUNK', $pathOutTrunk);
+  
+  
+  // Defining RBAC Paths constants
+  define( 'PATH_RBAC_HOME',     PATH_TRUNK . 'rbac' . PATH_SEP );
+  
+  // Defining Gulliver framework paths constants
+  define( 'PATH_GULLIVER_HOME', PATH_TRUNK . 'gulliver'  . PATH_SEP );
+  define( 'PATH_GULLIVER',      PATH_GULLIVER_HOME . 'system' . PATH_SEP );   //gulliver system classes
+  define( 'PATH_GULLIVER_BIN',  PATH_GULLIVER_HOME . 'bin' . PATH_SEP );   //gulliver bin classes
+  define( 'PATH_TEMPLATE',      PATH_GULLIVER_HOME . 'templates' . PATH_SEP );
+  define( 'PATH_THIRDPARTY',    PATH_GULLIVER_HOME . 'thirdparty' . PATH_SEP );
+  define( 'PATH_RBAC',          PATH_RBAC_HOME .     'engine'  . PATH_SEP . 'classes' . PATH_SEP );  //to enable rbac version 2
+  define( 'PATH_RBAC_CORE',     PATH_RBAC_HOME .     'engine'  . PATH_SEP );
+  define( 'PATH_HTML',          PATH_HOME .          'public_html' . PATH_SEP );
+  
+  // Defining PMCore Path constants
+  define( 'PATH_CORE',        PATH_HOME . 'engine'       . PATH_SEP );
+  define( 'PATH_SKINS',       PATH_CORE . 'skins'        . PATH_SEP );
+  define( 'PATH_SKIN_ENGINE', PATH_CORE . 'skinEngine'   . PATH_SEP );
+  define( 'PATH_METHODS',     PATH_CORE . 'methods'      . PATH_SEP );
+  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_HTMLMAIL',    PATH_CORE . 'html_templates' . PATH_SEP );
+  define( 'PATH_TPL',         PATH_CORE . 'templates'    . PATH_SEP );
+  define( 'PATH_TEST',        PATH_CORE . 'test'         . PATH_SEP );
+  define( 'PATH_FIXTURES',    PATH_TEST . 'fixtures'     . PATH_SEP );
+  define( 'PATH_RTFDOCS' ,    PATH_CORE . 'rtf_templates' . PATH_SEP );
+  define( 'PATH_DYNACONT',    PATH_CORE . 'content' . PATH_SEP . 'dynaform' . PATH_SEP );
+  //define( 'PATH_LANGUAGECONT',PATH_CORE . 'content' . PATH_SEP . 'languages' . PATH_SEP );
+  define( 'SYS_UPLOAD_PATH',  PATH_HOME . "public_html/files/" );
+  define( 'PATH_UPLOAD',      PATH_HTML . 'files' . PATH_SEP);
+  
+  define( 'PATH_WORKFLOW_MYSQL_DATA', PATH_CORE . 'data' . PATH_SEP.'mysql'.PATH_SEP);
+  define( 'PATH_RBAC_MYSQL_DATA',     PATH_RBAC_CORE . 'data' . PATH_SEP.'mysql'.PATH_SEP);
+  define( 'FILE_PATHS_INSTALLED',     PATH_CORE . 'config' . PATH_SEP . 'paths_installed.php' );
+  define( 'PATH_WORKFLOW_MSSQL_DATA', PATH_CORE . 'data' . PATH_SEP.'mssql'.PATH_SEP);
+  define( 'PATH_RBAC_MSSQL_DATA',     PATH_RBAC_CORE . 'data' . PATH_SEP.'mssql'.PATH_SEP);
+  define( 'PATH_CONTROLLERS',         PATH_CORE . 'controllers' . PATH_SEP );
+  define( 'PATH_SERVICES_REST',       PATH_CORE . 'services' . PATH_SEP . 'rest' . PATH_SEP);
+  
+  // include Gulliver Class
+  require_once( PATH_GULLIVER . PATH_SEP . 'class.g.php');
+  
+  if(file_exists(FILE_PATHS_INSTALLED)) {
+  	// backward compatibility; parsing old definitions in the compiled path constant
+  	$tmp = file_get_contents(FILE_PATHS_INSTALLED);
+  
+  	if (strpos($tmp, 'PATH_OUTTRUNK') !== false) {
+  		@file_put_contents(FILE_PATHS_INSTALLED, str_replace('PATH_OUTTRUNK', 'PATH_DATA', $tmp));
+  	}
+  	// end backward compatibility
+  
+  	// include the workspace installed configuration
+  	require_once FILE_PATHS_INSTALLED;
+  
+  	// defining system constant when a valid workspace environment exists
+  	define('PATH_LANGUAGECONT', PATH_DATA . "META-INF" . PATH_SEP);
+  	define('PATH_CUSTOM_SKINS', PATH_DATA . 'skins'   . PATH_SEP);
+  	define('PATH_TEMPORAL',     PATH_C . 'dynEditor/');
+  	define('PATH_DB',           PATH_DATA . 'sites' . PATH_SEP);
+  	// smarty constants
+  	define('PATH_SMARTY_C',     PATH_C . 'smarty' . PATH_SEP . 'c');
+  	define('PATH_SMARTY_CACHE', PATH_C . 'smarty' . PATH_SEP . 'cache');
+  
+  	if (!is_dir(PATH_SMARTY_C)) {
+  		G::mk_dir(PATH_SMARTY_C);
+  	}
+  
+  	if (!is_dir(PATH_SMARTY_CACHE)) {
+  		G::mk_dir(PATH_SMARTY_CACHE);
+  	}
+  }
+  
+  // set include path
+  set_include_path(
+  PATH_CORE . PATH_SEPARATOR .
+  PATH_THIRDPARTY . PATH_SEPARATOR .
+  PATH_THIRDPARTY . 'pear'. PATH_SEPARATOR .
+  PATH_RBAC_CORE . PATH_SEPARATOR .
+  get_include_path()
+  );
+  
+  /**
+   * Global definitions, before it was the defines.php file
+   */
+  
+  // URL Key
+  define("URL_KEY", 'c0l0s40pt1mu59r1m3' );
+  
+  // Other definitions
+  define('TIMEOUT_RESPONSE',  100 ); //web service timeout
+  define('APPLICATION_CODE',  'ProcessMaker' ); //to login like workflow system
+  define('MAIN_POFILE',       'processmaker');
+  define('PO_SYSTEM_VERSION', 'PM 4.0.1');
+  
+  $G_CONTENT       = NULL;
+  $G_MESSAGE       = "";
+  $G_MESSAGE_TYPE  = "info";
+  $G_MENU_SELECTED = -1;
+  $G_MAIN_MENU     = "default";
+  
+  // Environment definitions
+  define('G_PRO_ENV',  'PRODUCTION');
+  define('G_DEV_ENV',  'DEVELOPMENT');
+  define('G_TEST_ENV', 'TEST');
+  
+  // Number of files per folder at PATH_UPLOAD (cases documents)
+  define('APPLICATION_DOCUMENTS_PER_FOLDER', 1000);
+  
+  // Server of ProcessMaker Library
+  define('PML_SERVER' ,      'http://library.processmaker.com');
+  define('PML_WSDL_URL' ,    PML_SERVER . '/syspmLibrary/en/green/services/wsdl');
+  define('PML_UPLOAD_URL',   PML_SERVER . '/syspmLibrary/en/green/services/uploadProcess');
+  define('PML_DOWNLOAD_URL', PML_SERVER . '/syspmLibrary/en/green/services/download');
+  
   // Including these files we get the PM paths and definitions (that should be just one file.
-  require_once $pathhome . PATH_SEP . 'engine' . PATH_SEP . 'config' . PATH_SEP . 'paths.php';
   require_once PATH_CORE . 'classes' . PATH_SEP . 'class.system.php';
 
   // starting session