diff --git a/gulliver/system/class.database_mssql.php b/gulliver/system/class.database_mssql.php
index b1beb228c..64d40dff2 100644
--- a/gulliver/system/class.database_mssql.php
+++ b/gulliver/system/class.database_mssql.php
@@ -23,6 +23,10 @@
  *
  */
 
+/**
+ * @package gulliver.system
+*/
+
 G::LoadSystem('database_base');
 
 class database extends database_base {
@@ -424,8 +428,8 @@ class database extends database_base {
    * concatString
    * Generates a string equivalent to the chosen database.
    *
-   * @author Hector Cortez <hector@gmail.com>
-   * @date 2010-08-04
+   * author Hector Cortez <hector@gmail.com>
+   * date 2010-08-04
    *
    * @return string $sConcat
    */ 
@@ -697,7 +701,7 @@ class database extends database_base {
  
   /**
    * It is part of class.pagedTable.php
-   *
+   * @package gulliver.system
    */
   function getLimitRenderTable($nCurrentPage, $nRowsPerPage)
   {
diff --git a/gulliver/system/class.database_mysql.php b/gulliver/system/class.database_mysql.php
index 154679a43..14bffb813 100644
--- a/gulliver/system/class.database_mysql.php
+++ b/gulliver/system/class.database_mysql.php
@@ -23,6 +23,10 @@
  *
  */
 
+/**
+ * @package gulliver.system
+*/
+
 G::LoadSystem('database_base');
 
 class database extends database_base {
@@ -443,8 +447,8 @@ class database extends database_base {
    * concatString
    * Generates a string equivalent to the chosen database.
    *
-   * @author Hector Cortez <hector@gmail.com>
-   * @date 2010-08-04
+   * author Hector Cortez <hector@gmail.com>
+   * date 2010-08-04
    *
    * @return string $sConcat
    */ 
@@ -475,8 +479,8 @@ class database extends database_base {
    * concatString
    * Generates a string equivalent to the case when
    *
-   * @author Hector Cortez <hector@gmail.com>
-   * @date 2010-08-04
+   * author Hector Cortez <hector@gmail.com>
+   * date 2010-08-04
    *
    * @return string $sCompare 
    */ 
@@ -696,7 +700,7 @@ class database extends database_base {
 
   /**
    * It is part of class.pagedTable.php
-   *
+   * @package gulliver.system
    */
   function getLimitRenderTable($nCurrentPage, $nRowsPerPage)
   {
diff --git a/gulliver/system/class.dbMaintenance.php b/gulliver/system/class.dbMaintenance.php
index 134bbf9ae..88ad50fda 100755
--- a/gulliver/system/class.dbMaintenance.php
+++ b/gulliver/system/class.dbMaintenance.php
@@ -27,8 +27,10 @@
  * 
  * Database Maintenance class
  * 
- * @author Erik A. Ortiz <erik@colosa.com, aortiz.erik@gmail.com>
- * @date May 17th, 2010
+ * author Erik A. Ortiz <erik@colosa.com, aortiz.erik@gmail.com>
+ * date May 17th, 2010
+ *
+ * @package gulliver.system
  */
 
 class DataBaseMaintenance 
diff --git a/gulliver/system/class.dbconnection.php b/gulliver/system/class.dbconnection.php
index 86c34c8a2..de3740c12 100644
--- a/gulliver/system/class.dbconnection.php
+++ b/gulliver/system/class.dbconnection.php
@@ -23,7 +23,7 @@
  * 
  */
 /**
- * @package home.gulliver.system2
+ * @package gulliver.system
 */
 /**
  * require dummy line
@@ -39,7 +39,7 @@ define ( 'DB_ERROR_SHOWALL_AND_CONTINUE', 4);
  /**
  * DBConnection class definition
  * It is useful to stablish a connection
- * @package home.gulliver.system2
+ * @package gulliver.system
  * @author Fernando Ontiveros Lira <fernando@colosa.com>
  * @copyright (C) 2002 by Colosa Development Team.
  */
diff --git a/gulliver/system/class.dbrecordset.php b/gulliver/system/class.dbrecordset.php
index adb92c448..2c8b61ac6 100644
--- a/gulliver/system/class.dbrecordset.php
+++ b/gulliver/system/class.dbrecordset.php
@@ -23,12 +23,13 @@
  * 
  */
 /**
- * @package home.gulliver.system2
+ * @package gulliver.system
 */
  /**
  * DBRecordset class definition
  * Provides access to a generalized table it assumes that the dbconnection object is already initialized for the table should be also provided in order to provide
- * @package home.gulliver.system2
+ * @package gulliver.system
+ *
  * @author Fernando Ontiveros Lira <fernando@colosa.com>
  * @copyright (C) 2002 by Colosa Development Team.
  */
diff --git a/gulliver/system/class.dbsession.php b/gulliver/system/class.dbsession.php
index 801ec7c4e..92c26eb24 100644
--- a/gulliver/system/class.dbsession.php
+++ b/gulliver/system/class.dbsession.php
@@ -23,13 +23,13 @@
  * 
  */
 /**
- * @package home.gulliver.system2
+ * @package gulliver.system
 */
 
  /**
  * DBSession class definition
  * It is useful to stablish a database connection using an specific database
- * @package home.gulliver.system2
+ * @package gulliver.system
  * @author Fernando Ontiveros Lira <fernando@colosa.com>
  * @copyright (C) 2002 by Colosa Development Team.
  *
diff --git a/gulliver/system/class.dbtable.php b/gulliver/system/class.dbtable.php
index 516605ca7..c6692f99c 100644
--- a/gulliver/system/class.dbtable.php
+++ b/gulliver/system/class.dbtable.php
@@ -23,7 +23,7 @@
  *
  */
 /**
- * @package home.gulliver.system2
+ * @package gulliver.system
 */
 
 /**
@@ -31,7 +31,7 @@
  * This class provides acces to a generalized table
  * it assumes that the dbconnection object is already initialized, the table name, as well as the primary keys
  * for the table should be also provided in order to provide the class a way to generate an UPDATE query properly.
- * @package home.gulliver.system2
+ * @package gulliver.system
  * @author Fernando Ontiveros Lira <fernando@colosa.com>
  * @copyright (C) 2002 by Colosa Development Team.
  *
diff --git a/gulliver/system/class.dvEditor.php b/gulliver/system/class.dvEditor.php
index c57fa898d..e8dfb5a0a 100644
--- a/gulliver/system/class.dvEditor.php
+++ b/gulliver/system/class.dvEditor.php
@@ -26,7 +26,7 @@
  /**
  * XmlForm_Field_HTML class definition
  * It is useful to see dynaforms how are built
- * @package home.gulliver.system2
+ * @package gulliver.system
  * @author 
  * @copyright (C) 2002 by Colosa Development Team.
  *
diff --git a/gulliver/system/class.dynaformhandler.php b/gulliver/system/class.dynaformhandler.php
index 287adc7bb..780265822 100755
--- a/gulliver/system/class.dynaformhandler.php
+++ b/gulliver/system/class.dynaformhandler.php
@@ -34,9 +34,10 @@
 +-------------------------------------------------------------------------------------------------*/
 
 /**
-* @Author Erik Amaru Ortiz
-* @Date Aug 26th, 2009
-* @Description This class is a Dynaform handler for modify directly into file
+* Author Erik Amaru Ortiz
+* Date Aug 26th, 2009
+* Description This class is a Dynaform handler for modify directly into file
+* @package gulliver.system
 */
 
 class dynaFormHandler
diff --git a/gulliver/system/class.error.php b/gulliver/system/class.error.php
index d87ba9084..b33a356ee 100644
--- a/gulliver/system/class.error.php
+++ b/gulliver/system/class.error.php
@@ -50,6 +50,10 @@ define('G_ERROR_USER_INACTIVE',           -116);
 define('G_ERROR_DUE_DATE',                -117);
 define('G_ERROR_ALREADY_ASSIGNED',        -118);
 
+/**
+ * @package gulliver.system
+*/
+
 class G_Error extends PEAR_Error
 {
   /**
@@ -72,7 +76,7 @@ class G_Error extends PEAR_Error
   /**
   * this function returns the kind of Error
   * @author
-  *
+  * @package gulliver.system
   * @access public
   * @param  string $code
   * @return string
diff --git a/gulliver/system/class.filterForm.php b/gulliver/system/class.filterForm.php
index 20d59828a..924c398f4 100644
--- a/gulliver/system/class.filterForm.php
+++ b/gulliver/system/class.filterForm.php
@@ -22,6 +22,11 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  * 
  */
+
+ /**
+ * @package gulliver.system
+ **/
+
 class filterForm extends form
 {
   var $cols       = 3;
@@ -36,7 +41,7 @@ class filterForm extends form
   * @param  string $template
   * @param  string $scriptContent
   * @return string
-  *
+  * @package gulliver.system
   */
   function render( $template, &$scriptContent )
   {
diff --git a/gulliver/system/class.functionTest.php b/gulliver/system/class.functionTest.php
index aeb67fa11..98d0019b6 100644
--- a/gulliver/system/class.functionTest.php
+++ b/gulliver/system/class.functionTest.php
@@ -22,6 +22,11 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  * 
  */
+
+ /**
+ * @package gulliver.system
+ **/
+
 class functionTest
 {
   var $dbc;
diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php
index bafa50c3d..6a7b1e1a4 100644
--- a/gulliver/system/class.g.php
+++ b/gulliver/system/class.g.php
@@ -24,7 +24,7 @@
  */
 
 /**
- * @package home.gulliver.system2
+ * @package gulliver.system
  */
 
 class G
@@ -1542,7 +1542,6 @@ class G
   /**
    * Function MySQLSintaxis
    * @access public
-   * @parameter
    * @return Boolean
    **/
   function MySQLSintaxis()
diff --git a/gulliver/system/class.htmlArea.php b/gulliver/system/class.htmlArea.php
index 4b57010b7..884a53376 100644
--- a/gulliver/system/class.htmlArea.php
+++ b/gulliver/system/class.htmlArea.php
@@ -22,6 +22,11 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  * 
  */
+
+ /**
+ * @package gulliver.system
+ **/
+
 class XmlForm_Field_HTML extends XmlForm_Field_Textarea
 {
  /* //'default','office2003','silver'
@@ -52,6 +57,7 @@ class XmlForm_Field_HTML extends XmlForm_Field_Textarea
   * @access public
   * @param  string $element
   * @return string
+  * @package gulliver.system
   *
   */
   function attachEvents($element) {
diff --git a/gulliver/system/class.i18n_po.php b/gulliver/system/class.i18n_po.php
index 0613362f9..b1805936e 100755
--- a/gulliver/system/class.i18n_po.php
+++ b/gulliver/system/class.i18n_po.php
@@ -29,7 +29,7 @@
  * 
  * @package gulliver.system
  * @author Erik Amaru Ortiz <erik@colosa.com>
- * @date Aug 31th, 2010
+ * date Aug 31th, 2010
  * @copyright (C) 2002 by Colosa Development Team.
  */
  
diff --git a/gulliver/system/class.mailer.php b/gulliver/system/class.mailer.php
index 0fd8045a7..e81eaa35c 100644
--- a/gulliver/system/class.mailer.php
+++ b/gulliver/system/class.mailer.php
@@ -38,6 +38,11 @@ G::LoadThirdParty('phpmailer','class.phpmailer');
  * @author David Callizaya <davidsantos@colosa.com>
  */
 
+
+ /**
+ * @package gulliver.system
+ **/
+
 class mailer
 {
   
@@ -258,7 +263,7 @@ class mailer
    * html2text
    *
    * empty
-   *
+   * @package gulliver.system
    * @return none
    */   
   function html2text()
diff --git a/gulliver/system/class.menu.php b/gulliver/system/class.menu.php
index bfd3b9cef..016157381 100644
--- a/gulliver/system/class.menu.php
+++ b/gulliver/system/class.menu.php
@@ -23,13 +23,13 @@
  *
  */
 /**
- * @package home.gulliver.system2
+ * @package gulliver.system
 */
 /**
  *
  * Menu class definition
  * Render Menus
- * @package home.gulliver.system2
+ * @package gulliver.system
  * @author Fernando Ontiveros Lira <fernando@colosa.com>
  * @copyright (C) 2002 by Colosa Development Team.
  *
diff --git a/gulliver/system/class.publisher.php b/gulliver/system/class.publisher.php
index 969297ca1..dd1a63027 100644
--- a/gulliver/system/class.publisher.php
+++ b/gulliver/system/class.publisher.php
@@ -23,13 +23,13 @@
  *
  */
 /**
- * @package gulliver.system2
+ * @package gulliver
 */
 
  /**
  * Publisher class definition
  * It is to publish all content in a page
- * @package gulliver.system2
+ * @package gulliver.system
  * @author Fernando Ontiveros Lira <fernando@colosa.com>
  * @copyright (C) 2002 by Colosa Development Team.
  *
diff --git a/gulliver/system/class.rbac.php b/gulliver/system/class.rbac.php
index 6623ff558..4f7f98b3b 100644
--- a/gulliver/system/class.rbac.php
+++ b/gulliver/system/class.rbac.php
@@ -27,7 +27,7 @@
  *
  * RBAC class definition
  *
- * @package gulliver
+ * @package gulliver.system
  * @copyright (C) 2002 by Colosa Development Team.
  * @link http://www.colosa.com
  *
@@ -39,7 +39,7 @@
 /**
  * Clase Wrapper
  *
- * @package rbac
+ * @package gulliver.system
  * @author Fernando Ontiveros
  */
 
diff --git a/gulliver/system/class.table.php b/gulliver/system/class.table.php
index a0a9d6df6..e8d4cbd34 100644
--- a/gulliver/system/class.table.php
+++ b/gulliver/system/class.table.php
@@ -23,13 +23,13 @@
  * 
  */
 /**
- * @package home.gulliver.system2
+ * @package gulliver.system
 */
 /**
  *
  * Table class definition
  * Render table
- * @package home.gulliver.system2
+ * @package gulliver.system
  * @author Fernando Ontiveros Lira <fernando@colosa.com>
  * @copyright (C) 2002 by Colosa Development Team.
  *
diff --git a/gulliver/system/class.templatePower.php b/gulliver/system/class.templatePower.php
index a7355bcfd..99fda2165 100644
--- a/gulliver/system/class.templatePower.php
+++ b/gulliver/system/class.templatePower.php
@@ -60,7 +60,8 @@ define("TP_ROOTBLOCK",    '_ROOT');
 
    /**
     * class TemplatePowerParser
-    *
+    * @package gulliver.system
+    * 
     */
 class TemplatePowerParser
 {
@@ -79,7 +80,6 @@ class TemplatePowerParser
     *
     * @param string $tpl_file
     * @param string $type
-    * @return
     * @access private
     */
   function TemplatePowerParser( $tpl_file, $type )
@@ -94,7 +94,6 @@ class TemplatePowerParser
     * TemplatePowerParser::__errorAlert()
     *
     * @param string $message
-    * @return
     *
     * @access private
     */
@@ -140,7 +139,6 @@ class TemplatePowerParser
      *
      * @param string $tpl_file
      * @param string $type
-     * @return
      * @access private
      */
   function __prepareTemplate( $tpl_file, $type )
@@ -166,8 +164,7 @@ class TemplatePowerParser
      * @param string $tplvar
      * @param string $blockname
      * @param string $initdev
-     * @return 
-     * @access private
+      * @access private
      */
   function __parseTemplate( $tplvar, $blockname, $initdev )
   {
@@ -386,7 +383,7 @@ class TemplatePowerParser
 
    /**
     * class TemplatePower
-    *
+    * @package gulliver.system
     */
 class TemplatePower extends TemplatePowerParser
 {
@@ -700,7 +697,6 @@ class TemplatePower extends TemplatePowerParser
      * TemplatePower::getVarValue()
      *
      * @param $varname
-     * @return
      * @param string $varname
      * @access public
      */
@@ -740,6 +736,7 @@ class TemplatePower extends TemplatePowerParser
      *
      * @return void
      * @access public
+     * @package gulliver.system
      */
   function getOutputContent()
   {
diff --git a/gulliver/system/class.testTools.php b/gulliver/system/class.testTools.php
index 7b6c2ba48..d531daaad 100644
--- a/gulliver/system/class.testTools.php
+++ b/gulliver/system/class.testTools.php
@@ -22,6 +22,10 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  * 
  */
+
+ /**
+ * @package gulliver.system
+ **/
 G::LoadSystem ( 'ymlDomain');
 G::LoadSystem ( 'ymlTestCases');
 G::LoadSystem ( 'unitTest');
@@ -167,9 +171,9 @@ class testTools
 /**
  * domain
  *
- * @param  string $location
- *
+ * @param  string $location *
  * @return object $result
+ * @package gulliver.system
  */   
 
 function domain($location)
diff --git a/gulliver/system/class.tree.php b/gulliver/system/class.tree.php
index 9401ef52b..49f93895c 100644
--- a/gulliver/system/class.tree.php
+++ b/gulliver/system/class.tree.php
@@ -21,6 +21,10 @@
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  * 
+ */
+
+ /**
+ * @package gulliver.system
  */
   G::LoadSystem('objectTemplate');
   class Tree extends Xml_Node {
@@ -137,7 +141,7 @@
     
     /**
      * render
-     *
+     * @package gulliver.system
      * @return $obj->printObject( array( 'node' => &$this ) )
      */   
     function render() {
diff --git a/gulliver/system/class.unitTest.php b/gulliver/system/class.unitTest.php
index 273562ab1..58f0938c1 100644
--- a/gulliver/system/class.unitTest.php
+++ b/gulliver/system/class.unitTest.php
@@ -22,6 +22,11 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  * 
  */
+
+ /**
+  * @package gulliver.system
+  */
+
 class unitTest
 {
   var $dbc;
diff --git a/gulliver/system/class.webResource.php b/gulliver/system/class.webResource.php
index 2062d0df6..3df968ccc 100644
--- a/gulliver/system/class.webResource.php
+++ b/gulliver/system/class.webResource.php
@@ -28,7 +28,11 @@
  * _Function = don't encode
  * JS_function = javascript function.
  * @example: h2b2x/territoriesAjax.php
- * @dependencies: grest.js
+ * @dependencies: grest.js * 
+ */
+
+ /**
+ * @package gulliver.system
  */
 class WebResource
 {
@@ -39,7 +43,7 @@ class WebResource
    *
    * @param  string $uri
    * @param  string $post
-   *
+   * 
    * @return none
    */     
   function WebResource($uri, $post)
@@ -67,7 +71,7 @@ class WebResource
   
   /**
    * _encode
-   *
+   * 
    * @return none
    */     
   function _encode()
diff --git a/gulliver/system/class.xmlDocument.php b/gulliver/system/class.xmlDocument.php
index e0699edf4..b724a267e 100644
--- a/gulliver/system/class.xmlDocument.php
+++ b/gulliver/system/class.xmlDocument.php
@@ -25,7 +25,7 @@
 /**
  * Class Xml_Node
  * @author David S. Callizaya S. <davidsantos@colosa.com>
- * @package gulliver.system.xml
+ * @package gulliver.system
  * @access public
  * @dependencies Xml_Node
  */
@@ -230,7 +230,7 @@ class Xml_Node
 /**
  * Class Xml_document
  * @author David S. Callizaya S. <davidsantos@colosa.com>
- * @package gulliver.system.xml
+ * @package gulliver.system
  * @access public
  * @dependencies Xml_Node
  */
diff --git a/gulliver/system/class.xmlMenu.php b/gulliver/system/class.xmlMenu.php
index 112d244a8..77f9dfa4c 100644
--- a/gulliver/system/class.xmlMenu.php
+++ b/gulliver/system/class.xmlMenu.php
@@ -22,7 +22,10 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  * 
  */
- 
+
+ /**
+ * @package gulliver.system
+ */
   class xmlMenu extends form 
   {
     var $type = 'xmlmenu';
diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php
index bd74cec1b..be1ea8fca 100644
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -25,7 +25,7 @@
 /**
  * Class XmlForm_Field
  * @author David S. Callizaya S. <davidsantos@colosa.com>
- * @package gulliver.system.xmlform
+ * @package gulliver.system
  * @access public
  * @dependencies Services_JSON
  */
@@ -669,7 +669,7 @@ class XmlForm_Field {
 /**
  * Class XmlForm_Field_Title
  * @author David S. Callizaya S. <davidsantos@colosa.com>
- * @package gulliver.system.xmlform
+ * @package gulliver.system
  * @access public
  * @dependencies XmlForm_Field
  */
@@ -698,7 +698,7 @@ class XmlForm_Field_Title extends XmlForm_Field
 /**
  * Class XmlForm_Field_Subtitle
  * @author David S. Callizaya S. <davidsantos@colosa.com>
- * @package gulliver.system.xmlform
+ * @package gulliver.system
  * @access public
  * @dependencies XmlForm_Field
  */
@@ -728,7 +728,7 @@ class XmlForm_Field_Subtitle extends XmlForm_Field
 /**
  * Class XmlForm_Field_SimpleText
  * @author David S. Callizaya S. <davidsantos@colosa.com>
- * @package gulliver.system.xmlform
+ * @package gulliver.system
  * @access public
  * @dependencies XmlForm_Field
  */
@@ -807,7 +807,7 @@ class XmlForm_Field_SimpleText extends XmlForm_Field
 /**
  * Class XmlForm_Field_Text
  * @author David S. Callizaya S. <davidsantos@colosa.com>
- * @package gulliver.system.xmlform
+ * @package gulliver.system
  * @access public
  * @dependencies XmlForm_Field_SimpleText
  */
@@ -937,7 +937,7 @@ class XmlForm_Field_Text extends XmlForm_Field_SimpleText
 /**
  * Class XmlForm_Field_Suggest
  * @author Erik Amaru Ortiz <erik@colosa.com>
- * @package gulliver.system.xmlform
+ * @package gulliver.system
  * @access public
  * @dependencies XmlForm_Field_SimpleText
  */
@@ -1102,7 +1102,7 @@ class XmlForm_Field_Suggest extends XmlForm_Field_SimpleText //by neyek
 
 /**
  * prepare the field for printing
- *
+ * @package gulliver.system
  */
 class XmlForm_Field_Print extends XmlForm_Field_SimpleText //by neyek
 {
@@ -1144,6 +1144,7 @@ class XmlForm_Field_Print extends XmlForm_Field_SimpleText //by neyek
 /*DEPRECATED*/
 /**
  * caption field for dynaforms
+ * @package gulliver.system
  */
 class XmlForm_Field_Caption extends XmlForm_Field {
 
@@ -1222,7 +1223,7 @@ class XmlForm_Field_Caption extends XmlForm_Field {
 /**
  * Class XmlForm_Field_Password
  * @author David S. Callizaya S. <davidsantos@colosa.com>
- * @package gulliver.system.xmlform
+ * @package gulliver.system
  * @access public
  * @dependencies XmlForm_Field
  */
@@ -1271,7 +1272,7 @@ class XmlForm_Field_Password extends XmlForm_Field {
 /**
  * Class XmlForm_Field_Textarea
  * @author David S. Callizaya S. <davidsantos@colosa.com>
- * @package gulliver.system.xmlform
+ * @package gulliver.system
  * @access public
  * @dependencies XmlForm_Field
  */
@@ -1374,7 +1375,7 @@ class XmlForm_Field_Textarea extends XmlForm_Field {
 /**
  * Class XmlForm_Field_Currency
  * @author David S. Callizaya S. <davidsantos@colosa.com>
- * @package gulliver.system.xmlform
+ * @package gulliver.system
  * @access public
  * @dependencies XmlForm_Field_SimpleText
  */
@@ -1398,6 +1399,7 @@ class XmlForm_Field_Currency extends XmlForm_Field_SimpleText {
    * @param <String> $value
    * @param <String> $owner
    * @return <String>
+   * @package gulliver.system
    */
   function render( $value = NULL, $owner = NULL) {
     $onkeypress = G::replaceDataField ( $this->onkeypress, $owner->values );
@@ -1442,7 +1444,7 @@ class XmlForm_Field_CaptionCurrency extends XmlForm_Field {
 /**
  * Class XmlForm_Field_Percentage
  * @author David S. Callizaya S. <davidsantos@colosa.com>
- * @package gulliver.system.xmlform
+ * @package gulliver.system
  * @access public
  * @dependencies XmlForm_Field_SimpleText
  */
@@ -1503,7 +1505,7 @@ class XmlForm_Field_CaptionPercentage extends XmlForm_Field {
 /**
  * Class XmlForm_Field_Date
  * @author David S. Callizaya S. <davidsantos@colosa.com>
- * @package gulliver.system.xmlform
+ * @package gulliver.system
  * @access public
  * @dependencies XmlForm_Field_SimpleText
  */
@@ -1647,6 +1649,7 @@ class XmlForm_Field_Date2 extends XmlForm_Field_SimpleText {
    * @param  $owner
    * @param  $onlyValue
    * @return <String>
+   * @package gulliver.system
    */
   function renderGrid($values = NULL, $owner = NULL, $onlyValue = false) {
     $result = array ();
@@ -1736,7 +1739,7 @@ class XmlForm_Field_DateView extends XmlForm_Field
 /**
  * Class XmlForm_Field_YesNo
  * @author David S. Callizaya S. <davidsantos@colosa.com>
- * @package gulliver.system.xmlform
+ * @package gulliver.system
  * @access public
  * @dependencies XmlForm_Field
  */
@@ -1799,7 +1802,7 @@ class XmlForm_Field_YesNo extends XmlForm_Field
 /**
  * Class XmlForm_Field_Link
  * @author David S. Callizaya S. <davidsantos@colosa.com>
- * @package gulliver.system.xmlform
+ * @package gulliver.system
  * @access public
  * @dependencies XmlForm_Field
  */
@@ -1877,7 +1880,7 @@ class XmlForm_Field_Link extends XmlForm_Field {
 /**
  * Class XmlForm_Field_File
  * @author David S. Callizaya S. <davidsantos@colosa.com>
- * @package gulliver.system.xmlform
+ * @package gulliver.system
  * @access public
  * @dependencies XmlForm_Field
  */
@@ -1891,6 +1894,7 @@ class XmlForm_Field_File extends XmlForm_Field {
    * @access public
    * @param string value
    * @return string
+   * @package gulliver.system
    */
   function render($value = NULL) {
     $mode = ($this->mode == 'view') ? ' disabled="disabled"' : '';
@@ -1935,6 +1939,7 @@ class XmlForm_Field_Dropdownpt extends XmlForm_Field {
   }
 
   /* Used in Form::validatePost
+   * @package gulliver.system
    */
   function maskValue($value, &$owner) {
     return ($value === $this->value) ? $value : $this->falseValue;
@@ -1988,6 +1993,7 @@ class XmlForm_Field_Checkboxpt extends XmlForm_Field {
    * @param $value
    * @param &$owner
    * @return either the value or falseValue attributes
+   * @package gulliver.system
    */
   function maskValue($value, &$owner) {
     return ($value === $this->value) ? $value : $this->falseValue;
@@ -2084,6 +2090,7 @@ class XmlForm_Field_Checkbox extends XmlForm_Field
    * @param  $value
    * @param  $owner
    * @return either the value or falseValue
+   * @package gulliver.system
    */
   function maskValue($value, &$owner)
   {
@@ -2108,7 +2115,7 @@ class XmlForm_Field_Checkbox2 extends XmlForm_Field {
 /**
  * Class XmlForm_Field_Button
  * @author David S. Callizaya S. <davidsantos@colosa.com>
- * @package gulliver.system.xmlform
+ * @package gulliver.system
  * @access public
  * @dependencies XmlForm_Field
  */
@@ -2141,7 +2148,7 @@ class XmlForm_Field_Button extends XmlForm_Field
 /**
  * Class XmlForm_Field_Reset
  * @author David S. Callizaya S. <davidsantos@colosa.com>
- * @package gulliver.system.xmlform
+ * @package gulliver.system
  * @access public
  * @dependencies XmlForm_Field
  */
@@ -2165,7 +2172,7 @@ class XmlForm_Field_Reset extends XmlForm_Field
 /**
  * Class XmlForm_Field_Submit
  * @author David S. Callizaya S. <davidsantos@colosa.com>
- * @package gulliver.system.xmlform
+ * @package gulliver.system
  * @access public
  * @dependencies XmlForm_Field
  */
@@ -2194,7 +2201,7 @@ class XmlForm_Field_Submit extends XmlForm_Field {
 /**
  * Class XmlForm_Field_Hidden
  * @author David S. Callizaya S. <davidsantos@colosa.com>
- * @package gulliver.system.xmlform
+ * @package gulliver.system
  * @access public
  * @dependencies XmlForm_Field
  */
@@ -2270,7 +2277,7 @@ class XmlForm_Field_Hidden extends XmlForm_Field
 /**
  * Class XmlForm_Field_Dropdown
  * @author David S. Callizaya S. <davidsantos@colosa.com>
- * @package gulliver.system.xmlform
+ * @package gulliver.system
  * @access public
  * @dependencies XmlForm_Field
  */
@@ -2387,7 +2394,7 @@ class XmlForm_Field_Dropdown extends XmlForm_Field {
 /**
  * Class XmlForm_Field_Listbox
  * @author David S. Callizaya S. <davidsantos@colosa.com>
- * @package gulliver.system.xmlform
+ * @package gulliver.system
  * @access public
  * @dependencies XmlForm_Field
  */
@@ -2469,7 +2476,7 @@ class XmlForm_Field_Listbox extends XmlForm_Field
 /**
  * Class XmlForm_Field_RadioGroup
  * @author David S. Callizaya S. <davidsantos@colosa.com>
- * @package gulliver.system.xmlform
+ * @package gulliver.system
  * @access public
  * @dependencies XmlForm_Field
  */
@@ -2502,6 +2509,7 @@ class XmlForm_Field_RadioGroup extends XmlForm_Field {
    * @param string value
    * @param string owner
    * @return string
+   * @package gulliver.system
    */
   function render($value = NULL, $owner)
   {
@@ -2574,7 +2582,7 @@ class XmlForm_Field_RadioGroupView extends XmlForm_Field
 /**
  * Class XmlForm_Field_CheckGroup
  * @author David S. Callizaya S. <davidsantos@colosa.com>
- * @package gulliver.system.xmlform
+ * @package gulliver.system
  * @access public
  * @dependencies XmlForm_Field
  */
@@ -2598,6 +2606,7 @@ class XmlForm_Field_CheckGroup extends XmlForm_Field
    * @param string value
    * @param string owner
    * @return string
+   * @package gulliver.system
    */
   function render($value = NULL, $owner = NULL)
   {
@@ -2661,7 +2670,7 @@ class XmlForm_Field_CheckGroupView extends XmlForm_Field
 /**
  * Class XmlForm_Field_Grid
  * @author David S. Callizaya S. <davidsantos@colosa.com>
- * @package gulliver.system.xmlform
+ * @package gulliver.system
  * @access public
  * @dependencies XmlForm_Field  XmlForm  xmlformTemplate
  */
@@ -2811,7 +2820,7 @@ class XmlForm_Field_Grid extends XmlForm_Field
 /**
  * Class XmlForm_Field_JavaScript
  * @author David S. Callizaya S. <davidsantos@colosa.com>
- * @package gulliver.system.xmlform
+ * @package gulliver.system
  * @access public
  * @dependencies XmlForm_Field
  */
@@ -2868,6 +2877,7 @@ class XmlForm_Field_JavaScript extends XmlForm_Field
    * @param string value
    * @param string owner
    * @return string
+   * @package gulliver.system
    */
   function renderGrid($value, $owner)
   {
@@ -2878,6 +2888,7 @@ class XmlForm_Field_JavaScript extends XmlForm_Field
    * A javascript node has no value
    * @param $value
    * @return false
+   * @package gulliver.system
    */
   function validateValue($value)
   {
@@ -3080,6 +3091,7 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
      * - init - Backward compatibility
      *
      * By Erik A. O. <erik@colosa.com>
+     * @package gulliver.system
      */
     if($mask == 'yyyy-mm-dd')
       $mask = '%Y-%m-%d';
@@ -3506,6 +3518,7 @@ class XmlForm_Field_Date5 extends XmlForm_Field_SimpleText
    * @param <Date> $date
    * @param  $mask
    * @return <type>
+   * @package gulliver.system
    */
   function getSplitDate($date, $mask){
   $sw1 = false;
@@ -4158,6 +4171,7 @@ class xmlformTemplate extends Smarty
    * @param string tpl_name
    * @param string smarty_obj
    * @return string
+   * @package gulliver.system
    */
   function _get_trusted($tpl_name, &$smarty_obj)
   {
diff --git a/gulliver/system/class.xmlformExtension.php b/gulliver/system/class.xmlformExtension.php
index 4dc71da02..8cbf55e42 100644
--- a/gulliver/system/class.xmlformExtension.php
+++ b/gulliver/system/class.xmlformExtension.php
@@ -22,6 +22,11 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  * 
  */
+
+ /**
+  * @package gulliver.system
+  */
+
 class XmlForm_Field_Label extends XmlForm_Field
 {
   var $withoutValue = true;
@@ -86,6 +91,7 @@ class XmlForm_Field_cellMark extends XmlForm_Field
  * XmlForm_Field_DVEditor
  *
  * extends XmlForm_Field
+ * @package gulliver.system
  *
  */
 class XmlForm_Field_DVEditor extends XmlForm_Field
@@ -136,7 +142,8 @@ class XmlForm_Field_DVEditor extends XmlForm_Field
  *   <PAGED_TABLE_ID type="private"/>
  *   <PAGED_TABLE_FAST_SEARCH type="text" colAlign="right"  colWidth="180" onkeypress="if (event.keyCode===13)@#PAGED_TABLE_ID.doFastSearch(this.value);if (event.keyCode===13)return false;">
  *     <en>Search</en>
- *   </PAGED_TABLE_FAST_SEARCH> 
+ *   </PAGED_TABLE_FAST_SEARCH>
+ * @package gulliver.system
  */
 class XmlForm_Field_FastSearch extends XmlForm_Field_Text
 {
diff --git a/gulliver/system/class.ymlDomain.php b/gulliver/system/class.ymlDomain.php
index 5ea67a1c1..c185a6549 100644
--- a/gulliver/system/class.ymlDomain.php
+++ b/gulliver/system/class.ymlDomain.php
@@ -26,6 +26,7 @@ require_once( PATH_THIRDPARTY.'lime/yaml.class.php');
 /**
  * ymlDomain class 
  * @copyright (C) 2002 by Colosa Development Team.
+ * @package gulliver.system
  */
 
 class ymlDomain
diff --git a/gulliver/system/class.ymlTestCases.php b/gulliver/system/class.ymlTestCases.php
index 42c672ab0..d6e7b8e7c 100644
--- a/gulliver/system/class.ymlTestCases.php
+++ b/gulliver/system/class.ymlTestCases.php
@@ -39,6 +39,10 @@
  * TestCasesGroup2:
  *   ...
  */
+
+ /**
+ * @package gulliver.system
+ */
 class ymlTestCases
 {
   var $testCaseFile;