diff --git a/framework/src/Maveriks/Util/ClassLoader.php b/framework/src/Maveriks/Util/ClassLoader.php
index a09a890ae..53597022c 100644
--- a/framework/src/Maveriks/Util/ClassLoader.php
+++ b/framework/src/Maveriks/Util/ClassLoader.php
@@ -5,6 +5,8 @@ class ClassLoader
 {
     private static $includePath = array();
     private static $includePathNs = array();
+    private static $includeModelPath = array();
+    private static $includeClassPath = array();
     protected static $instance;
 
     /**
@@ -60,6 +62,22 @@ class ClassLoader
         }
     }
 
+    public function addModelClassPath($classPath)
+    {
+        self::$includeModelPath[] = $classPath;
+    }
+
+    public function addClass($class, $path)
+    {
+        self::$includeClassPath[$class] = $path;
+    }
+
+    /**
+     * Loads the given class or interface.
+     *
+     * @param string $className The name of the class to load.
+     * @return void
+     */
     function loadClass($className)
     {
         $classPath  = str_replace(NS, DS, $className);
@@ -78,9 +96,25 @@ class ClassLoader
             }
         }
 
+        if (isset(self::$includeClassPath[$className]) && file_exists(self::$includeClassPath[$className])) {
+            require self::$includeClassPath[$className];
+        }
+
+        foreach (self::$includeModelPath as $path) {
+            if (file_exists($path.$className.".php")) {
+                require $path.$className.".php";
+                return true;
+            } elseif (file_exists($path."om".DS.$className.".php")) {
+                require $path."om".DS.$className.".php";
+                return true;
+            } elseif (file_exists($path."map".DS.$className.".php")) {
+                require $path."map".DS.$className.".php";
+                return true;
+            }
+        }
+
         foreach (self::$includePath as $path) {
             $filename = $path . $classPath . ".php";
-            //var_dump($filename);
 
             if (file_exists($filename)) {
                 require $filename;
@@ -91,27 +125,6 @@ class ClassLoader
         return false;
     }
 
-    /**
-     * Loads the given class or interface.
-     *
-     * @param string $className The name of the class to load.
-     * @return void
-     */
-    public function loadClass2($className)
-    {
-        if (null === $this->_namespace || $this->_namespace.$this->_namespaceSeparator === substr($className, 0, strlen($this->_namespace.$this->_namespaceSeparator))) {
-            $fileName = '';
-            $namespace = '';
 
-            if (false !== ($lastNsPos = strripos($className, $this->_namespaceSeparator))) {
-                $namespace = substr($className, 0, $lastNsPos);
-                $className = substr($className, $lastNsPos + 1);
-                $fileName = str_replace($this->_namespaceSeparator, DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
-            }
 
-            $fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className) . $this->_fileExtension;
-
-            require ($this->_includePath !== null ? $this->_includePath . DIRECTORY_SEPARATOR : '') . $fileName;
-        }
-    }
 }
\ No newline at end of file
diff --git a/framework/src/Maveriks/WebApplication.php b/framework/src/Maveriks/WebApplication.php
index 30be72a6b..70de86dfb 100644
--- a/framework/src/Maveriks/WebApplication.php
+++ b/framework/src/Maveriks/WebApplication.php
@@ -257,6 +257,7 @@ class WebApplication
         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_CORE', PATH_HOME . 'engine' . PATH_SEP);
+        define('PATH_CLASSES', PATH_HOME . "engine" . PATH_SEP . "classes" . 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);
@@ -283,18 +284,17 @@ class WebApplication
 
         spl_autoload_register(array("Bootstrap", "autoloadClass"));
 
-        \Bootstrap::registerClass("G", PATH_GULLIVER . "class.g.php");
-        \Bootstrap::registerClass("System", PATH_HOME . "engine/classes/class.system.php");
+//        \Bootstrap::registerClass("G", PATH_GULLIVER . "class.g.php");
+//        \Bootstrap::registerClass("System", PATH_HOME . "engine/classes/class.system.php");
 
         // define autoloading for others
-        \Bootstrap::registerClass("wsBase", PATH_HOME . "engine/classes/class.wsBase.php");
-        \Bootstrap::registerClass('Xml_Node', PATH_GULLIVER . "class.xmlDocument.php");
-        \Bootstrap::registerClass('XmlForm_Field_TextPM', PATH_HOME . "engine/classes/class.XmlForm_Field_TextPM.php");
-        \Bootstrap::registerClass('XmlForm_Field_SimpleText', PATH_GULLIVER . "class.xmlformExtension.php");
-        \Bootstrap::registerClass('XmlForm_Field', PATH_GULLIVER . "class.xmlform.php");
+//        \Bootstrap::registerClass("wsBase", PATH_HOME . "engine/classes/class.wsBase.php");
+//        \Bootstrap::registerClass('Xml_Node', PATH_GULLIVER . "class.xmlDocument.php");
+//        \Bootstrap::registerClass('XmlForm_Field_TextPM', PATH_HOME . "engine/classes/class.XmlForm_Field_TextPM.php");
+//        \Bootstrap::registerClass('XmlForm_Field_SimpleText', PATH_GULLIVER . "class.xmlformExtension.php");
+//        \Bootstrap::registerClass('XmlForm_Field', PATH_GULLIVER . "class.xmlform.php");
+
 
-        //\Bootstrap::registerDir('model', PATH_CORE . 'classes' . PATH_SEP . 'model');
-        //\Bootstrap::registerDir('rbac/model', PATH_RBAC_HOME . 'engine' . PATH_SEP . 'classes' . PATH_SEP . 'model');
 
         //\Bootstrap::LoadThirdParty("smarty/libs", "Smarty.class");
 
@@ -319,7 +319,6 @@ class WebApplication
         define('MEMCACHED_SERVER',   $config['memcached_server']);
         define('TIME_ZONE', $config['time_zone']);
 
-
         // set include path
         set_include_path(
             PATH_CORE . PATH_SEPARATOR .
@@ -335,7 +334,7 @@ class WebApplication
          */
 
         // include the server installed configuration
-        require_once FILE_PATHS_INSTALLED;
+        require_once PATH_CORE . 'config' . PATH_SEP . 'paths_installed.php';
 
         define('SYS_SYS', $workspace);
 
@@ -373,7 +372,7 @@ class WebApplication
         }
 
         // create memcached singleton
-        \Bootstrap::LoadClass('memcached');
+        //\Bootstrap::LoadClass('memcached');
         //$memcache = PMmemcached::getSingleton( SYS_SYS );
 
         \Propel::init(PATH_CONFIG . "databases.php");
diff --git a/gulliver/system/class.bootstrap.php b/gulliver/system/class.bootstrap.php
index f41a655e3..819d37ba9 100644
--- a/gulliver/system/class.bootstrap.php
+++ b/gulliver/system/class.bootstrap.php
@@ -27,34 +27,12 @@ class Bootstrap
             return true;
         }
         return false;
-        $classHasNamespaceSeparator = strpos($class, '\\') !== false ? true : false;
-
-        foreach (BootStrap::$includePaths as $path) {
-            if ($classHasNamespaceSeparator) {
-                $classPath = str_replace('\\', DIRECTORY_SEPARATOR, $class);
-            } else {
-                $classPath = str_replace('_', DIRECTORY_SEPARATOR, $class);
-            }
-
-            $path = rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
-            $classFile = $path . $classPath . '.php';
-
-            if (file_exists($classFile)) {
-                require_once $classFile;
-
-                return true;
-            }
-        }
-
-        //error_log(' ==> CLass not found: ' . $class);
-
-        return false;
     }
 
-    public static function registerClass($classname, $includeFile)
+    public static function registerClass($className, $includePath)
     {
-        BootStrap::$includeClassPaths[strtolower($classname)] = $includeFile;
-        return;
+        $loader = Maveriks\Util\ClassLoader::getInstance();
+        $loader->addClass($className, $includePath);
     }
 
     public static function registerDir($name, $dir)
@@ -78,249 +56,213 @@ class Bootstrap
 
     public static function registerSystemClasses()
     {
+        // Propel
         self::registerClass("Propel", PATH_THIRDPARTY . "propel" . PATH_SEP . "Propel.php");
         self::registerClass("Creole", PATH_THIRDPARTY . "creole" . PATH_SEP . "Creole.php");
         self::registerClass("Criteria", PATH_THIRDPARTY . "propel" . PATH_SEP . "util" . PATH_SEP . "Criteria.php");
         self::registerClass("BasePeer", PATH_THIRDPARTY . "propel" . PATH_SEP . "util" . PATH_SEP . "BasePeer.php");
 
-        //DATABASE propel classes used in "Cases" Options
-        self::registerClass("Entity_Base", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "entities" . PATH_SEP . "Base.php");
+        // Gulliver
+        self::registerClass("PmSessionHandler", PATH_GULLIVER_HOME . "core/Session/PmSessionHandler.php");
 
-        self::registerClass("BaseContent", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseContent.php");
-        self::registerClass("Content", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Content.php");
-        self::registerClass("BaseContentPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseContentPeer.php");
-        self::registerClass("ContentPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "ContentPeer.php");
-        self::registerClass("BaseApplication", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseApplication.php");
-        self::registerClass("ApplicationPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "ApplicationPeer.php");
-        self::registerClass("Application", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Application.php");
-
-        self::registerClass("BaseAppDelegation", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseAppDelegation.php");
-        self::registerClass("BaseHoliday", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseHoliday.php");
-        self::registerClass("BaseHolidayPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseHolidayPeer.php");
-        self::registerClass("BaseTask", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseTask.php");
-        self::registerClass("BaseTaskPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseTaskPeer.php");
-        self::registerClass("HolidayPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "HolidayPeer.php");
-        self::registerClass("Holiday", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Holiday.php");
-        self::registerClass("Task", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Task.php");
-        self::registerClass("TaskPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "TaskPeer.php");
-        self::registerClass("dates", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.dates.php");
-        self::registerClass("AppDelegation", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppDelegation.php");
-        self::registerClass("BaseAppDelegationPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseAppDelegationPeer.php");
-        self::registerClass("AppDelegationPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppDelegationPeer.php");
-        self::registerClass("BaseAppDelay", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseAppDelay.php");
-        self::registerClass("AppDelayPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppDelayPeer.php");
-        self::registerClass("AppDelay", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppDelay.php");
-        self::registerClass("BaseAdditionalTables", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseAdditionalTables.php");
-        self::registerClass("AdditionalTables", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AdditionalTables.php");
-        self::registerClass("AdditionalTablesPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AdditionalTablesPeer.php");
-        self::registerClass("BaseAppCacheView", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseAppCacheView.php");
-        self::registerClass("AppCacheView", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppCacheView.php");
-        self::registerClass("BaseAppCacheViewPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseAppCacheViewPeer.php");
-        self::registerClass("AppCacheViewPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppCacheViewPeer.php");
-
-        self::registerClass("BaseInputDocument", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseInputDocument.php");
-        self::registerClass("InputDocument", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "InputDocument.php");
-        self::registerClass("BaseAppDocument", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseAppDocument.php");
-        self::registerClass("AppDocument", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppDocument.php");
-        self::registerClass("AppDocumentPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppDocumentPeer.php");
-
-        self::registerClass("BaseAppEvent", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseAppEvent.php");
-        self::registerClass("AppEvent", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppEvent.php");
-        self::registerClass("AppEventPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppEventPeer.php");
-
-        self::registerClass("BaseAppHistory", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseAppHistory.php");
-        self::registerClass("AppHistory", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppHistory.php");
-        self::registerClass("AppHistoryPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppHistoryPeer.php");
-
-        self::registerClass("BaseAppFolder", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseAppFolder.php");
-        self::registerClass("AppFolder", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppFolder.php");
-        self::registerClass("AppFolderPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppFolderPeer.php");
-
-        self::registerClass("BaseAppMessage", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseAppMessage.php");
-        self::registerClass("AppMessage", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppMessage.php");
-
-        self::registerClass("BaseAppMessagePeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseAppMessagePeer.php");
-        self::registerClass("AppMessagePeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppMessagePeer.php");
-
-        self::registerClass("BaseAppNotesPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseAppNotesPeer.php");
-        self::registerClass("AppNotesPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppNotesPeer.php");
-
-        self::registerClass("BaseAppNotes", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseAppNotes.php");
-        self::registerClass("AppNotes", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppNotes.php");
-
-        self::registerClass("BaseAppOwner", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseAppOwner.php");
-        self::registerClass("AppOwner", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppOwner.php");
-        self::registerClass("AppOwnerPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppOwnerPeer.php");
-
-        self::registerClass("BaseAppSolrQueue", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseAppSolrQueue.php");
-        self::registerClass("Entity_SolrRequestData", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "entities" . PATH_SEP . "SolrRequestData.php");
-        self::registerClass("Entity_SolrUpdateDocument", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "entities" . PATH_SEP . "SolrUpdateDocument.php");
-        self::registerClass("Entity_AppSolrQueue", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "entities" . PATH_SEP . "AppSolrQueue.php");
-        self::registerClass("AppSolrQueue", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppSolrQueue.php");
-        self::registerClass("AppSolrQueuePeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppSolrQueuePeer.php");
-
-        self::registerClass("BaseAppThread", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseAppThread.php");
-        self::registerClass("AppThread", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppThread.php");
-        self::registerClass("AppThreadPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppThreadPeer.php");
-
-        self::registerClass("BaseCaseScheduler", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseCaseScheduler.php");
-        self::registerClass("CaseScheduler", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "CaseScheduler.php");
-
-        self::registerClass("BaseCaseSchedulerPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseCaseSchedulerPeer.php");
-        self::registerClass("CaseSchedulerPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "CaseSchedulerPeer.php");
-
-        self::registerClass("BaseCaseTracker", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseCaseTracker.php");
-        self::registerClass("CaseTracker", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "CaseTracker.php");
-
-        self::registerClass("BaseCaseTrackerPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseCaseTrackerPeer.php");
-        self::registerClass("CaseTrackerPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "CaseTrackerPeer.php");
-
-        self::registerClass("BaseCaseTrackerObject", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseCaseTrackerObject.php");
-        self::registerClass("CaseTrackerObject", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "CaseTrackerObject.php");
-
-        self::registerClass("BaseCaseTrackerObjectPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseCaseTrackerObjectPeer.php");
-        self::registerClass("CaseTrackerObjectPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "CaseTrackerObjectPeer.php");
-
-        self::registerClass("BaseConfiguration", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseConfiguration.php");
-        self::registerClass("Configuration", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Configuration.php");
-
-        self::registerClass("BaseDbSource", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseDbSource.php");
-        self::registerClass("DbSource", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "DbSource.php");
-
-        self::registerClass("XMLDB", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.xmlDb.php");
+        self::registerClass("Bootstrap", PATH_GULLIVER . "class.bootstrap.php");
+        self::registerClass("Controller", PATH_GULLIVER . "class.controller.php");
+        self::registerClass("database_base", PATH_GULLIVER . "class.database_base.php");
+        self::registerClass("database", PATH_GULLIVER . "class.database_mssql.php");
+        self::registerClass("database", PATH_GULLIVER . "class.database_mysql.php");
+        self::registerClass("DataBaseMaintenance", PATH_GULLIVER . "class.dbMaintenance.php");
+        self::registerClass("DBConnection", PATH_GULLIVER . "class.dbconnection.php");
+        self::registerClass("DBRecordSet", PATH_GULLIVER . "class.dbrecordset.php");
+        self::registerClass("DBSession", PATH_GULLIVER . "class.dbsession.php");
+        self::registerClass("DBTable", PATH_GULLIVER . "class.dbtable.php");
+        self::registerClass("XmlForm_Field_HTML", PATH_GULLIVER . "class.dvEditor.php");
         self::registerClass("dynaFormHandler", PATH_GULLIVER . "class.dynaformhandler.php");
-        self::registerClass("DynaFormField", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.dynaFormField.php");
-        self::registerClass("BaseDynaform", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseDynaform.php");
-        self::registerClass("Dynaform", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Dynaform.php");
-        self::registerClass("DynaformPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "DynaformPeer.php");
-
-        self::registerClass("BaseEvent", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseEvent.php");
-        self::registerClass("Event", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Event.php");
-
-        self::registerClass("BaseEventPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseEventPeer.php");
-        self::registerClass("EventPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "EventPeer.php");
-
-        self::registerClass("BaseFields", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseFields.php");
-        self::registerClass("Fields", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Fields.php");
-
-        self::registerClass("BaseGateway", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseGateway.php");
-        self::registerClass("Gateway", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Gateway.php");
-
-        self::registerClass("BaseGroupUser", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseGroupUser.php");
-        self::registerClass("Groupwf", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Groupwf.php");
-        self::registerClass("GroupUser", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "GroupUser.php");
-
-        self::registerClass("BaseGroupUserPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseGroupUserPeer.php");
-        self::registerClass("GroupUserPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "GroupUserPeer.php");
-
-        self::registerClass("BaseGroupwfPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseGroupwfPeer.php");
-        self::registerClass("GroupwfPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "GroupwfPeer.php");
-
-        self::registerClass("BaseInputDocumentPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseInputDocumentPeer.php");
-        self::registerClass("InputDocumentPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "InputDocumentPeer.php");
-
-        self::registerClass("BaseIsoCountry", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseIsoCountry.php");
-        self::registerClass("IsoCountry", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "IsoCountry.php");
-        self::registerClass("BaseTranslation", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseTranslation.php");
-        self::registerClass("Translation", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Translation.php");
-        self::registerClass("BaseLanguage", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseLanguage.php");
-        self::registerClass("Language", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Language.php");
-
-        self::registerClass("BaseLogCasesScheduler", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseLogCasesScheduler.php");
-        self::registerClass("LogCasesScheduler", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "LogCasesScheduler.php");
-
-        self::registerClass("BaseObjectPermission", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseObjectPermission.php");
-        self::registerClass("ObjectPermission", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "ObjectPermission.php");
-        self::registerClass("ObjectPermissionPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "ObjectPermissionPeer.php");
-
-        self::registerClass("BaseOutputDocument", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseOutputDocument.php");
-        self::registerClass("OutputDocument", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "OutputDocument.php");
-        self::registerClass("OutputDocumentPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "OutputDocumentPeer.php");
-
-        self::registerClass("BaseProcess", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseProcess.php");
-        self::registerClass("BaseProcessCategory", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseProcessCategory.php");
-        self::registerClass("ProcessCategory", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "ProcessCategory.php");
-        self::registerClass("ProcessCategoryPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "ProcessCategoryPeer.php");
-        self::registerClass("ProcessPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "ProcessPeer.php");
-        self::registerClass("Process", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Process.php");
-
-        self::registerClass("BaseProcessUser", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseProcessUser.php");
-        self::registerClass("ProcessUser", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "ProcessUser.php");
-
-        self::registerClass("BaseProcessUserPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseProcessUserPeer.php");
-        self::registerClass("ProcessUserPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "ProcessUserPeer.php");
-
-        self::registerClass("BaseReportTable", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseReportTable.php");
-        self::registerClass("ReportTable", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "ReportTable.php");
-        self::registerClass("ReportTablePeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "ReportTablePeer.php");
-
-        self::registerClass("BaseReportVar", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseReportVar.php");
-        self::registerClass("ReportVar", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "ReportVar.php");
-
-        self::registerClass("BaseReportVarPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseReportVarPeer.php");
-        self::registerClass("ReportVarPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "ReportVarPeer.php");
-
-        self::registerClass("BaseRoute", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseRoute.php");
-        self::registerClass("Route", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Route.php");
-        self::registerClass("RoutePeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "RoutePeer.php");
-
-        self::registerClass("BaseStep", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseStep.php");
-        self::registerClass("Step", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Step.php");
-        self::registerClass("StepPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "StepPeer.php");
-
-        self::registerClass("BaseStepSupervisor", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseStepSupervisor.php");
-        self::registerClass("StepSupervisor", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "StepSupervisor.php");
-
-        self::registerClass("BaseStepSupervisorPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseStepSupervisorPeer.php");
-        self::registerClass("StepSupervisorPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "StepSupervisorPeer.php");
-
-        self::registerClass("BaseStepTrigger", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseStepTrigger.php");
-        self::registerClass("StepTrigger", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "StepTrigger.php");
-        self::registerClass("StepTriggerPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "StepTriggerPeer.php");
-
-        self::registerClass("BaseSwimlanesElements", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseSwimlanesElements.php");
-        self::registerClass("SwimlanesElements", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "SwimlanesElements.php");
-        self::registerClass("BaseSwimlanesElementsPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseSwimlanesElementsPeer.php");
-        self::registerClass("SwimlanesElementsPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "SwimlanesElementsPeer.php");
-
-        self::registerClass("BaseSubApplication", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseSubApplication.php");
-        self::registerClass("SubApplication", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "SubApplication.php");
-        self::registerClass("SubApplicationPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "SubApplicationPeer.php");
-
-        self::registerClass("BaseSubProcess", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseSubProcess.php");
-        self::registerClass("SubProcess", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "SubProcess.php");
-
-        self::registerClass("BaseSubProcessPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseSubProcessPeer.php");
-        self::registerClass("SubProcessPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "SubProcessPeer.php");
-
-        self::registerClass("BaseTask", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseTask.php");
-        self::registerClass("Task", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Task.php");
-
-        self::registerClass("BaseTaskUser", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseTaskUser.php");
-        self::registerClass("TaskUserPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "TaskUserPeer.php");
-        self::registerClass("TaskUser", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "TaskUser.php");
-
-        self::registerClass("BaseTriggers", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseTriggers.php");
-        self::registerClass("Triggers", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Triggers.php");
-        self::registerClass("BaseTriggersPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseTriggersPeer.php");
-        self::registerClass("TriggersPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "TriggersPeer.php");
-
-        self::registerClass("BaseUsers", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseUsers.php");
-        self::registerClass("IsoCountry", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "IsoCountry.php");
-        self::registerClass("BaseIsoSubdivision", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseIsoSubdivision.php");
-        self::registerClass("IsoSubdivision", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "IsoSubdivision.php");
-        self::registerClass("BaseIsoLocation", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseIsoLocation.php");
-        self::registerClass("IsoLocation", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "IsoLocation.php");
-        self::registerClass("Users", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Users.php");
-        self::registerClass("UsersPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "UsersPeer.php");
-        self::registerClass("ReportTables", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.reportTables.php");
-        self::registerClass("PMPluginRegistry", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.pluginRegistry.php");
-
+        self::registerClass("G_Error", PATH_GULLIVER . "class.error.php");
+        self::registerClass("filterForm", PATH_GULLIVER . "class.filterForm.php");
+        self::registerClass("Form", PATH_GULLIVER . "class.form.php");
+        self::registerClass("functionTest", PATH_GULLIVER . "class.functionTest.php");
+        self::registerClass("G", PATH_GULLIVER . "class.g.php");
+        self::registerClass("headPublisher", PATH_GULLIVER . "class.headPublisher.php");
+        self::registerClass("Helper", PATH_GULLIVER . "class.helper.php");
+        self::registerClass("XmlForm_Field_HTML", PATH_GULLIVER . "class.htmlArea.php");
+        self::registerClass("HttpProxyController", PATH_GULLIVER . "class.httpProxyController.php");
+        self::registerClass("i18n_PO", PATH_GULLIVER . "class.i18n_po.php");
+        self::registerClass("InputFilter", PATH_GULLIVER . "class.inputfilter.php");
+        self::registerClass("Logger", PATH_GULLIVER . "class.logger.php");
+        self::registerClass("mailer", PATH_GULLIVER . "class.mailer.php");
+        self::registerClass("Menu", PATH_GULLIVER . "class.menu.php");
+        self::registerClass("objectTemplate", PATH_GULLIVER . "class.objectTemplate.php");
+        self::registerClass("pagedTable", PATH_GULLIVER . "class.pagedTable.php");
+        self::registerClass("PHPSQLParser", PATH_GULLIVER . "class.phpSqlParser.php");
+        self::registerClass("PMException", PATH_GULLIVER . "class.pmException.php");
+        self::registerClass("Publisher", PATH_GULLIVER . "class.publisher.php");
+        self::registerClass("RBAC", PATH_GULLIVER . "class.rbac.php");
+        self::registerClass("RestClient", PATH_GULLIVER . "class.restClient.php");
+        self::registerClass("soapNtlm", PATH_GULLIVER . "class.soapNtlm.php");
+        self::registerClass("NTLMSoapClient", PATH_GULLIVER . "class.soapNtlm.php");
+        self::registerClass("PMServiceNTLMSoapClient", PATH_GULLIVER . "class.soapNtlm.php");
+        self::registerClass("PMServiceProviderNTLMStream", PATH_GULLIVER . "class.soapNtlm.php");
+        self::registerClass("Table", PATH_GULLIVER . "class.table.php");
+        self::registerClass("TemplatePowerParser", PATH_GULLIVER . "class.templatePower.php");
+        self::registerClass("TemplatePower", PATH_GULLIVER . "class.templatePower.php");
+        self::registerClass("testTools", PATH_GULLIVER . "class.testTools.php");
+        self::registerClass("Tree", PATH_GULLIVER . "class.tree.php");
+        self::registerClass("unitTest", PATH_GULLIVER . "class.unitTest.php");
+        self::registerClass("WebResource", PATH_GULLIVER . "class.webResource.php");
+        self::registerClass("XmlForm_Field_WYSIWYG_EDITOR", PATH_GULLIVER . "class.wysiwygEditor.php");
         self::registerClass("Xml_Node", PATH_GULLIVER . "class.xmlDocument.php");
+        self::registerClass("Xml_document", PATH_GULLIVER . "class.xmlDocument.php");
+        self::registerClass("xmlMenu", PATH_GULLIVER . "class.xmlMenu.php");
+        self::registerClass("XmlForm_Field_XmlMenu", PATH_GULLIVER . "class.xmlMenu.php");
+        self::registerClass("XmlForm_Field", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Title", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Subtitle", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_SimpleText", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Text", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Suggest", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Print", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Caption", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Password", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Textarea", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Currency", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_CaptionCurrency", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Percentage", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_CaptionPercentage", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Date2", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_DateView", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_YesNo", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Link", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_File", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Dropdownpt", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Checkboxpt", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Checkbox", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Checkbox2", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Button", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Reset", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Submit", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Hidden", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Dropdown", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Listbox", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_RadioGroup", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_RadioGroupView", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_CheckGroup", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_CheckGroupView", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Grid", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_JavaScript", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Date", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Date5", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Xmlform", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("xmlformTemplate", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Image", PATH_GULLIVER . "class.xmlform.php");
+        self::registerClass("XmlForm_Field_Label", PATH_GULLIVER . "class.xmlformExtension.php");
+        self::registerClass("XmlForm_Field_cellMark", PATH_GULLIVER . "class.xmlformExtension.php");
+        self::registerClass("XmlForm_Field_DVEditor", PATH_GULLIVER . "class.xmlformExtension.php");
+        self::registerClass("XmlForm_Field_FastSearch", PATH_GULLIVER . "class.xmlformExtension.php");
+        self::registerClass("ymlDomain", PATH_GULLIVER . "class.ymlDomain.php");
+        self::registerClass("ymlTestCases", PATH_GULLIVER . "class.ymlTestCases.php");
 
-        self::registerClass("Tasks",  PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.tasks.php");
-        self::registerClass("Processes",  PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.processes.php");
-
+        // ProcessMaker classes
+        self::registerClass("InvalidIndexSearchTextException", PATH_CLASSES . "class.AppSolr.php");
+        self::registerClass("ApplicationWithoutDelegationRecordsException", PATH_CLASSES . "class.AppSolr.php");
+        self::registerClass("ApplicationWithCorruptDynaformException", PATH_CLASSES . "class.AppSolr.php");
+        self::registerClass("ApplicationAPP_DATAUnserializeException", PATH_CLASSES . "class.AppSolr.php");
+        self::registerClass("AppSolr", PATH_CLASSES . "class.AppSolr.php");
+        self::registerClass("ArrayBasePeer", PATH_CLASSES . "class.ArrayPeer.php");
+        self::registerClass("GulliverBasePeer", PATH_CLASSES . "class.BasePeer.php");
+        self::registerClass("Installer", PATH_CLASSES . "class.Installer.php");
+        self::registerClass("Applications", PATH_CLASSES . "class.applications.php");
+        self::registerClass("archive", PATH_CLASSES . "class.archive.php");
+        self::registerClass("tar_file", PATH_CLASSES . "class.archive.php");
+        self::registerClass("gzip_file", PATH_CLASSES . "class.archive.php");
+        self::registerClass("bzip_file", PATH_CLASSES . "class.archive.php");
+        self::registerClass("zip_file", PATH_CLASSES . "class.archive.php");
+        self::registerClass("calendar", PATH_CLASSES . "class.calendar.php");
+        self::registerClass("Cases", PATH_CLASSES . "class.case.php");
+        self::registerClass("CLI", PATH_CLASSES . "class.cli.php");
+        self::registerClass("Configurations", PATH_CLASSES . "class.configuration.php");
+        self::registerClass("dashletOpenVSCompleted", PATH_CLASSES . "class.dashletOpenVSCompleted.php");
+        self::registerClass("dashletProcessMakerCommunity", PATH_CLASSES . "class.dashletProcessMakerCommunity.php");
+        self::registerClass("dashletProcessMakerEnterprise", PATH_CLASSES . "class.dashletProcessMakerEnterprise.php");
+        self::registerClass("dashletRssReader", PATH_CLASSES . "class.dashletRssReader.php");
+        self::registerClass("dates", PATH_CLASSES . "class.dates.php");
+        self::registerClass("dbConnections", PATH_CLASSES . "class.dbConnections.php");
+        self::registerClass("Derivation", PATH_CLASSES . "class.derivation.php");
+        self::registerClass("DynaFormField", PATH_CLASSES . "class.dynaFormField.php");
+        self::registerClass("dynaformEditor", PATH_CLASSES . "class.dynaformEditor.php");
+        self::registerClass("dynaformEditorAjax", PATH_CLASSES . "class.dynaformEditor.php");
+        self::registerClass("FieldValidator", PATH_CLASSES . "class.fieldValidator.php");
+        self::registerClass("FileCache", PATH_CLASSES . "class.fileCache.php");
+        self::registerClass("GroupUser", PATH_CLASSES . "class.groupUser.php");
+        self::registerClass("Groups", PATH_CLASSES . "class.groups.php");
+        self::registerClass("JavaBridgePM", PATH_CLASSES . "class.javaBridgePM.php");
+        self::registerClass("Jrml", PATH_CLASSES . "class.jrml.php");
+        self::registerClass("PMmemcached", PATH_CLASSES . "class.memcached.php");
+        self::registerClass("multipleFilesBackup", PATH_CLASSES . "class.multipleFilesBackup.php");
+        self::registerClass("NET", PATH_CLASSES . "class.net.php");
+        self::registerClass("Stat", PATH_CLASSES . "class.net.php");
+        self::registerClass("patch", PATH_CLASSES . "class.patch.php");
+        self::registerClass("p11835", PATH_CLASSES . "class.patch.php");
+        self::registerClass("PMPlugin", PATH_CLASSES . "class.plugin.php");
+        self::registerClass("menuDetail", PATH_CLASSES . "class.plugin.php");
+        self::registerClass("toolbarDetail", PATH_CLASSES . "class.plugin.php");
+        self::registerClass("cssFile", PATH_CLASSES . "class.plugin.php");
+        self::registerClass("triggerDetail", PATH_CLASSES . "class.plugin.php");
+        self::registerClass("folderDetail", PATH_CLASSES . "class.plugin.php");
+        self::registerClass("stepDetail", PATH_CLASSES . "class.plugin.php");
+        self::registerClass("redirectDetail", PATH_CLASSES . "class.plugin.php");
+        self::registerClass("folderData", PATH_CLASSES . "class.plugin.php");
+        self::registerClass("uploadDocumentData", PATH_CLASSES . "class.plugin.php");
+        self::registerClass("loginInfo", PATH_CLASSES . "class.plugin.php");
+        self::registerClass("caseSchedulerPlugin", PATH_CLASSES . "class.plugin.php");
+        self::registerClass("taskExtendedProperty", PATH_CLASSES . "class.plugin.php");
+        self::registerClass("dashboardPage", PATH_CLASSES . "class.plugin.php");
+        self::registerClass("cronFile", PATH_CLASSES . "class.plugin.php");
+        self::registerClass("pluginDetail", PATH_CLASSES . "class.pluginRegistry.php");
+        self::registerClass("PMPluginRegistry", PATH_CLASSES . "class.pluginRegistry.php");
+        self::registerClass("PMDashlet", PATH_CLASSES . "class.pmDashlet.php");
+        self::registerClass("pmGauge", PATH_CLASSES . "class.pmGauge.php");
+        self::registerClass("pmPhing", PATH_CLASSES . "class.pmPhing.php");
+        self::registerClass("PMScript", PATH_CLASSES . "class.pmScript.php");
+        self::registerClass("PmTable", PATH_CLASSES . "class.pmTable.php");
+        self::registerClass("popupMenu", PATH_CLASSES . "class.popupMenu.php");
+        self::registerClass("XmlForm_Field_popupOption", PATH_CLASSES . "class.popupMenu.php");
+        self::registerClass("processMap", PATH_CLASSES . "class.processMap.php");
+        self::registerClass("Processes", PATH_CLASSES . "class.processes.php");
+        self::registerClass("ObjectDocument", PATH_CLASSES . "class.processes.php");
+        self::registerClass("ObjectCellection", PATH_CLASSES . "class.processes.php");
+        self::registerClass("propelTable", PATH_CLASSES . "class.propelTable.php");
+        self::registerClass("replacementLogo", PATH_CLASSES . "class.replacementLogo.php");
+        self::registerClass("Report", PATH_CLASSES . "class.report.php");
+        self::registerClass("ReportTables", PATH_CLASSES . "class.reportTables.php");
+        self::registerClass("BpmnEngine_Services_SearchIndex", PATH_CLASSES . "class.searchIndex.php");
+        self::registerClass("serverConf", PATH_CLASSES . "class.serverConfiguration.php");
+        self::registerClass("Sessions", PATH_CLASSES . "class.sessions.php");
+        self::registerClass("BpmnEngine_SearchIndexAccess_Solr", PATH_CLASSES . "class.solr.php");
+        self::registerClass("spoolRun", PATH_CLASSES . "class.spool.php");
+        self::registerClass("System", PATH_CLASSES . "class.system.php");
+        self::registerClass("Tasks", PATH_CLASSES . "class.tasks.php");
+        self::registerClass("ToolBar", PATH_CLASSES . "class.toolBar.php");
+        self::registerClass("XmlForm_Field_ToolBar", PATH_CLASSES . "class.toolBar.php");
+        self::registerClass("XmlForm_Field_toolButton", PATH_CLASSES . "class.toolBar.php");
+        self::registerClass("triggerLibrary", PATH_CLASSES . "class.triggerLibrary.php");
+        self::registerClass("ProcessMakerWebDav", PATH_CLASSES . "class.webdav.php");
+        self::registerClass("wsBase", PATH_CLASSES . "class.wsBase.php");
+        self::registerClass("wsResponse", PATH_CLASSES . "class.wsResponse.php");
+        self::registerClass("wsCreateUserResponse", PATH_CLASSES . "class.wsResponse.php");
+        self::registerClass("wsCreateGroupResponse", PATH_CLASSES . "class.wsResponse.php");
+        self::registerClass("wsCreateDepartmentResponse", PATH_CLASSES . "class.wsResponse.php");
+        self::registerClass("wsGetVariableResponse", PATH_CLASSES . "class.wsResponse.php");
+        self::registerClass("wsGetCaseNotesResponse", PATH_CLASSES . "class.wsResponse.php");
+        self::registerClass("workspaceTools", PATH_CLASSES . "class.wsTools.php");
+        self::registerClass("XMLDB", PATH_CLASSES . "class.xmlDb.php");
+        self::registerClass("XMLConnection", PATH_CLASSES . "class.xmlDb.php");
+        self::registerClass("XMLResult", PATH_CLASSES . "class.xmlDb.php");
+        self::registerClass("XmlForm_Field_Image", PATH_CLASSES . "class.xmlfield_Image.php");
+        self::registerClass("XmlForm_Field_TextPM", PATH_CLASSES . "class.xmlfield_InputPM.php");
+        self::registerClass("XmlForm_Field_TextareaPM", PATH_CLASSES . "class.xmlfield_InputPM.php");
+        self::registerClass("XmlForm_Field_hours", PATH_CLASSES . "class.xmlfield_InputPM.php");
+        self::registerClass("XmlForm_Field_CheckBoxTable", PATH_CLASSES . "class.xmlfield_InputPM.php");
     }
 
     //below this line, still not approved methods
diff --git a/workflow/public_html/app.php b/workflow/public_html/app.php
index 2fe4b6161..4af0332b4 100644
--- a/workflow/public_html/app.php
+++ b/workflow/public_html/app.php
@@ -35,13 +35,15 @@ try {
     $loader = Maveriks\Util\ClassLoader::getInstance();
     $loader->add($rootDir . 'framework/src/', "Maveriks");
     $loader->add($rootDir . 'workflow/engine/src/', "ProcessMaker");
+    //$loader->add($rootDir . "workflow/engine/classes/model/");
     $loader->add($rootDir . 'workflow/engine/src/');
-    $loader->add($rootDir . 'workflow/engine/classes/model/');
 
     // and vendors to autoloader
     $loader->add($rootDir . 'vendor/luracast/restler/vendor', "Luracast");
     $loader->add($rootDir . 'vendor/bshaffer/oauth2-server-php/src/', "OAuth2");
 
+    $loader->addModelClassPath($rootDir . "workflow/engine/classes/model/");
+
     $app = new Maveriks\WebApplication();
 
     $app->setRootDir($rootDir);
diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php
index 149813d1e..9f0690828 100755
--- a/workflow/public_html/sysGeneric.php
+++ b/workflow/public_html/sysGeneric.php
@@ -185,6 +185,7 @@ define( 'PATH_RBAC_CORE', PATH_RBAC_HOME . 'engine' . PATH_SEP );
 
 // Defining PMCore Path constants
 define( 'PATH_CORE', PATH_HOME . 'engine' . PATH_SEP );
+define( 'PATH_CLASSES', PATH_HOME . "engine" . PATH_SEP . "classes" . 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 );
@@ -328,10 +329,7 @@ define( 'PATH_LANGUAGECONT', PATH_HOME . 'engine/content/languages/' );
 Bootstrap::LoadThirdParty("smarty/libs", "Smarty.class");
 
 //Loading the autoloader libraries feature
-spl_autoload_register(array("Bootstrap", "autoloadClass"));
-
-Bootstrap::registerClass("G",      PATH_GULLIVER . "class.g.php");
-Bootstrap::registerClass("System", PATH_HOME . "engine/classes/class.system.php");
+Bootstrap::registerSystemClasses();
 
 $skinPathErrors = G::skinGetPathToSrcByVirtualUri("errors", $config);
 $skinPathUpdate = G::skinGetPathToSrcByVirtualUri("update", $config);
@@ -485,40 +483,6 @@ if (defined( 'PATH_DATA' ) && file_exists( PATH_DATA )) {
     $oServerConf = & serverConf::getSingleton();
 }
 
-// Call more Classes
-Bootstrap::registerClass('headPublisher', PATH_GULLIVER . "class.headPublisher.php");
-Bootstrap::registerClass('publisher', PATH_GULLIVER . "class.publisher.php");
-Bootstrap::registerClass('xmlform', PATH_GULLIVER . "class.xmlform.php");
-Bootstrap::registerClass('XmlForm_Field', PATH_GULLIVER . "class.xmlform.php");
-Bootstrap::registerClass('xmlformExtension', PATH_GULLIVER . "class.xmlformExtension.php");
-Bootstrap::registerClass('form',         PATH_GULLIVER . "class.form.php");
-Bootstrap::registerClass('menu',         PATH_GULLIVER . "class.menu.php");
-Bootstrap::registerClass('Xml_Document', PATH_GULLIVER . "class.xmlDocument.php");
-Bootstrap::registerClass('DBSession',    PATH_GULLIVER . "class.dbsession.php");
-Bootstrap::registerClass('DBConnection', PATH_GULLIVER . "class.dbconnection.php");
-Bootstrap::registerClass('DBRecordset',  PATH_GULLIVER . "class.dbrecordset.php");
-Bootstrap::registerClass('DBTable',      PATH_GULLIVER . "class.dbtable.php");
-Bootstrap::registerClass('xmlMenu',      PATH_GULLIVER . "class.xmlMenu.php");
-Bootstrap::registerClass('XmlForm_Field_FastSearch', PATH_GULLIVER . "class.xmlformExtension.php");
-Bootstrap::registerClass('XmlForm_Field_XmlMenu', PATH_GULLIVER . "class.xmlMenu.php");
-Bootstrap::registerClass('XmlForm_Field_HTML',  PATH_GULLIVER . "class.dvEditor.php");
-Bootstrap::registerClass('XmlForm_Field_WYSIWYG_EDITOR',  PATH_GULLIVER . "class.wysiwygEditor.php");
-Bootstrap::registerClass('Controller',          PATH_GULLIVER . "class.controller.php");
-Bootstrap::registerClass('HttpProxyController', PATH_GULLIVER . "class.httpProxyController.php");
-Bootstrap::registerClass('templatePower',            PATH_GULLIVER . "class.templatePower.php");
-Bootstrap::registerClass('XmlForm_Field_SimpleText', PATH_GULLIVER . "class.xmlformExtension.php");
-Bootstrap::registerClass('PmSessionHandler',   PATH_GULLIVER_HOME . 'core/Session/PmSessionHandler.php');
-Bootstrap::registerClass('Groups',       PATH_HOME . "engine/classes/class.groups.php");
-Bootstrap::registerClass('Tasks',        PATH_HOME . "engine/classes/class.tasks.php");
-Bootstrap::registerClass('Calendar',     PATH_HOME . "engine/classes/class.calendar.php");
-Bootstrap::registerClass('processMap',   PATH_HOME . "engine/classes/class.processMap.php");
-
-Bootstrap::registerSystemClasses();
-
-Bootstrap::registerDir('src', PATH_HOME . 'engine/src/');
-Bootstrap::registerDir('model', PATH_CORE . 'classes' . PATH_SEP . 'model');
-Bootstrap::registerDir('rbac/model', PATH_RBAC_HOME . 'engine' . PATH_SEP . 'classes' . PATH_SEP . 'model');
-
 require_once  PATH_THIRDPARTY . '/pear/PEAR.php';
 
 //Bootstrap::LoadSystem( 'pmException' );