diff --git a/gulliver/bin/gulliver.php b/gulliver/bin/gulliver.php
index 0d856a7bf..215638ad2 100644
--- a/gulliver/bin/gulliver.php
+++ b/gulliver/bin/gulliver.php
@@ -22,6 +22,12 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  * 
  */
+
+ /**
+ * @package gulliver.system
+ */
+
+
   if (! PATH_THIRDPARTY ) {
     die("You must launch gulliver command line with the gulliver script\n");
   }
diff --git a/gulliver/bin/tasks/pakeBase.php b/gulliver/bin/tasks/pakeBase.php
index 0a7054186..57ebf48fd 100644
--- a/gulliver/bin/tasks/pakeBase.php
+++ b/gulliver/bin/tasks/pakeBase.php
@@ -23,6 +23,10 @@
  * 
  */
 
+ /**
+ * @package gulliver.system
+ */
+
 pake_task('project_exists');
 pake_task('app_exists', 'project_exists');
 pake_task('module_exists', 'app_exists');
diff --git a/gulliver/bin/tasks/pakeGulliver.php b/gulliver/bin/tasks/pakeGulliver.php
index 3b03aa639..f9aae0819 100644
--- a/gulliver/bin/tasks/pakeGulliver.php
+++ b/gulliver/bin/tasks/pakeGulliver.php
@@ -25,6 +25,10 @@
  */
 //dont work mb_internal_encoding('UTF-8');
 
+ /**
+ * @package gulliver.system
+ */
+
 
 pake_desc('gulliver version');
 pake_task('version', 'project_exists');
diff --git a/gulliver/bin/tasks/pakePropel.php b/gulliver/bin/tasks/pakePropel.php
index 32abd3e8a..5dadad3ed 100644
--- a/gulliver/bin/tasks/pakePropel.php
+++ b/gulliver/bin/tasks/pakePropel.php
@@ -31,6 +31,10 @@
  * file that was distributed with this source code.
  */
 
+ /**
+ * @package gulliver.system
+ */
+
 pake_desc('create classes for current model');
 pake_task('propel-build-model', 'project_exists');
 
diff --git a/gulliver/bin/tasks/pakeTest.php b/gulliver/bin/tasks/pakeTest.php
index b40412f82..1aab5d419 100644
--- a/gulliver/bin/tasks/pakeTest.php
+++ b/gulliver/bin/tasks/pakeTest.php
@@ -23,6 +23,10 @@
  * 
  */
 
+ /**
+ * @package gulliver.system
+ */
+
 pake_desc('launch unit tests');
 pake_task('test-unit', 'project_exists');
 
diff --git a/rbac/engine/classes/model/map/AuthenticationSourceMapBuilder.php b/rbac/engine/classes/model/map/AuthenticationSourceMapBuilder.php
index a3630eb86..42174f0ab 100644
--- a/rbac/engine/classes/model/map/AuthenticationSourceMapBuilder.php
+++ b/rbac/engine/classes/model/map/AuthenticationSourceMapBuilder.php
@@ -14,7 +14,7 @@ include_once 'creole/CreoleTypes.php';
  * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
  * (i.e. if it's a text column type).
  *
- * @package    classes.model.map
+ * @package    classes.model
  */
 class AuthenticationSourceMapBuilder {
 
diff --git a/rbac/engine/classes/model/map/PermissionsMapBuilder.php b/rbac/engine/classes/model/map/PermissionsMapBuilder.php
index b741e6bdb..694fcfa30 100644
--- a/rbac/engine/classes/model/map/PermissionsMapBuilder.php
+++ b/rbac/engine/classes/model/map/PermissionsMapBuilder.php
@@ -14,7 +14,7 @@ include_once 'creole/CreoleTypes.php';
  * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
  * (i.e. if it's a text column type).
  *
- * @package    classes.model.map
+ * @package    classes.model
  */
 class PermissionsMapBuilder {
 
diff --git a/rbac/engine/classes/model/map/RbacUsersMapBuilder.php b/rbac/engine/classes/model/map/RbacUsersMapBuilder.php
index e232e1309..60776440b 100644
--- a/rbac/engine/classes/model/map/RbacUsersMapBuilder.php
+++ b/rbac/engine/classes/model/map/RbacUsersMapBuilder.php
@@ -14,7 +14,7 @@ include_once 'creole/CreoleTypes.php';
  * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
  * (i.e. if it's a text column type).
  *
- * @package    classes.model.map
+ * @package    classes.model
  */
 class RbacUsersMapBuilder {
 
diff --git a/rbac/engine/classes/model/map/RolesMapBuilder.php b/rbac/engine/classes/model/map/RolesMapBuilder.php
index c10cbd089..01df6a9f6 100644
--- a/rbac/engine/classes/model/map/RolesMapBuilder.php
+++ b/rbac/engine/classes/model/map/RolesMapBuilder.php
@@ -14,7 +14,7 @@ include_once 'creole/CreoleTypes.php';
  * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
  * (i.e. if it's a text column type).
  *
- * @package    classes.model.map
+ * @package    classes.model
  */
 class RolesMapBuilder {
 
diff --git a/rbac/engine/classes/model/map/RolesPermissionsMapBuilder.php b/rbac/engine/classes/model/map/RolesPermissionsMapBuilder.php
index 2840ea90b..0f17c5a72 100644
--- a/rbac/engine/classes/model/map/RolesPermissionsMapBuilder.php
+++ b/rbac/engine/classes/model/map/RolesPermissionsMapBuilder.php
@@ -14,7 +14,7 @@ include_once 'creole/CreoleTypes.php';
  * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
  * (i.e. if it's a text column type).
  *
- * @package    classes.model.map
+ * @package    classes.model
  */
 class RolesPermissionsMapBuilder {
 
diff --git a/rbac/engine/classes/model/map/SystemsMapBuilder.php b/rbac/engine/classes/model/map/SystemsMapBuilder.php
index 9be92edf9..94354dff2 100644
--- a/rbac/engine/classes/model/map/SystemsMapBuilder.php
+++ b/rbac/engine/classes/model/map/SystemsMapBuilder.php
@@ -14,7 +14,7 @@ include_once 'creole/CreoleTypes.php';
  * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
  * (i.e. if it's a text column type).
  *
- * @package    classes.model.map
+ * @package    classes.model
  */
 class SystemsMapBuilder {
 
diff --git a/rbac/engine/classes/model/map/UsersRolesMapBuilder.php b/rbac/engine/classes/model/map/UsersRolesMapBuilder.php
index a6050125c..e761b1859 100644
--- a/rbac/engine/classes/model/map/UsersRolesMapBuilder.php
+++ b/rbac/engine/classes/model/map/UsersRolesMapBuilder.php
@@ -14,7 +14,7 @@ include_once 'creole/CreoleTypes.php';
  * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
  * (i.e. if it's a text column type).
  *
- * @package    classes.model.map
+ * @package    classes.model
  */
 class UsersRolesMapBuilder {
 
diff --git a/rbac/engine/classes/model/om/BaseAuthenticationSource.php b/rbac/engine/classes/model/om/BaseAuthenticationSource.php
index 062608934..ad9835179 100644
--- a/rbac/engine/classes/model/om/BaseAuthenticationSource.php
+++ b/rbac/engine/classes/model/om/BaseAuthenticationSource.php
@@ -14,7 +14,7 @@ include_once 'classes/model/AuthenticationSourcePeer.php';
  *
  * 
  *
- * @package    classes.model.om
+ * @package    classes.model
  */
 abstract class BaseAuthenticationSource extends BaseObject  implements Persistent {
 
diff --git a/rbac/engine/classes/model/om/BaseAuthenticationSourcePeer.php b/rbac/engine/classes/model/om/BaseAuthenticationSourcePeer.php
index b95b623e6..f65b59d57 100644
--- a/rbac/engine/classes/model/om/BaseAuthenticationSourcePeer.php
+++ b/rbac/engine/classes/model/om/BaseAuthenticationSourcePeer.php
@@ -10,7 +10,7 @@ include_once 'classes/model/AuthenticationSource.php';
  *
  * 
  *
- * @package    classes.model.om
+ * @package    classes.model
  */
 abstract class BaseAuthenticationSourcePeer {
 
diff --git a/rbac/engine/classes/model/om/BasePermissions.php b/rbac/engine/classes/model/om/BasePermissions.php
index 2ee7a0e63..253e1ed6e 100644
--- a/rbac/engine/classes/model/om/BasePermissions.php
+++ b/rbac/engine/classes/model/om/BasePermissions.php
@@ -14,7 +14,7 @@ include_once 'classes/model/PermissionsPeer.php';
  *
  * 
  *
- * @package    classes.model.om
+ * @package    classes.model
  */
 abstract class BasePermissions extends BaseObject  implements Persistent {
 
diff --git a/rbac/engine/classes/model/om/BasePermissionsPeer.php b/rbac/engine/classes/model/om/BasePermissionsPeer.php
index e6562ac01..356bf5cfb 100644
--- a/rbac/engine/classes/model/om/BasePermissionsPeer.php
+++ b/rbac/engine/classes/model/om/BasePermissionsPeer.php
@@ -10,7 +10,7 @@ include_once 'classes/model/Permissions.php';
  *
  * 
  *
- * @package    classes.model.om
+ * @package    classes.model
  */
 abstract class BasePermissionsPeer {
 
diff --git a/rbac/engine/classes/model/om/BaseRbacUsers.php b/rbac/engine/classes/model/om/BaseRbacUsers.php
index ad5dab95d..aa265d83b 100644
--- a/rbac/engine/classes/model/om/BaseRbacUsers.php
+++ b/rbac/engine/classes/model/om/BaseRbacUsers.php
@@ -14,7 +14,7 @@ include_once 'classes/model/RbacUsersPeer.php';
  *
  * 
  *
- * @package    classes.model.om
+ * @package    classes.model
  */
 abstract class BaseRbacUsers extends BaseObject  implements Persistent {
 
diff --git a/rbac/engine/classes/model/om/BaseRbacUsersPeer.php b/rbac/engine/classes/model/om/BaseRbacUsersPeer.php
index 24805a2ba..71138b28f 100644
--- a/rbac/engine/classes/model/om/BaseRbacUsersPeer.php
+++ b/rbac/engine/classes/model/om/BaseRbacUsersPeer.php
@@ -10,7 +10,7 @@ include_once 'classes/model/RbacUsers.php';
  *
  * 
  *
- * @package    classes.model.om
+ * @package    classes.model
  */
 abstract class BaseRbacUsersPeer {
 
diff --git a/rbac/engine/classes/model/om/BaseRoles.php b/rbac/engine/classes/model/om/BaseRoles.php
index ff52a45e7..0d338ddab 100644
--- a/rbac/engine/classes/model/om/BaseRoles.php
+++ b/rbac/engine/classes/model/om/BaseRoles.php
@@ -14,7 +14,7 @@ include_once 'classes/model/RolesPeer.php';
  *
  * 
  *
- * @package    classes.model.om
+ * @package    classes.model
  */
 abstract class BaseRoles extends BaseObject  implements Persistent {
 
diff --git a/rbac/engine/classes/model/om/BaseRolesPeer.php b/rbac/engine/classes/model/om/BaseRolesPeer.php
index 6deb769c7..e91f820a3 100644
--- a/rbac/engine/classes/model/om/BaseRolesPeer.php
+++ b/rbac/engine/classes/model/om/BaseRolesPeer.php
@@ -10,7 +10,7 @@ include_once 'classes/model/Roles.php';
  *
  * 
  *
- * @package    classes.model.om
+ * @package    classes.model
  */
 abstract class BaseRolesPeer {
 
diff --git a/rbac/engine/classes/model/om/BaseRolesPermissions.php b/rbac/engine/classes/model/om/BaseRolesPermissions.php
index 2039e8ff6..9954ddcee 100644
--- a/rbac/engine/classes/model/om/BaseRolesPermissions.php
+++ b/rbac/engine/classes/model/om/BaseRolesPermissions.php
@@ -14,7 +14,7 @@ include_once 'classes/model/RolesPermissionsPeer.php';
  *
  * 
  *
- * @package    classes.model.om
+ * @package    classes.model
  */
 abstract class BaseRolesPermissions extends BaseObject  implements Persistent {
 
diff --git a/rbac/engine/classes/model/om/BaseRolesPermissionsPeer.php b/rbac/engine/classes/model/om/BaseRolesPermissionsPeer.php
index 8db29e92f..837af57da 100644
--- a/rbac/engine/classes/model/om/BaseRolesPermissionsPeer.php
+++ b/rbac/engine/classes/model/om/BaseRolesPermissionsPeer.php
@@ -10,7 +10,7 @@ include_once 'classes/model/RolesPermissions.php';
  *
  * 
  *
- * @package    classes.model.om
+ * @package    classes.model
  */
 abstract class BaseRolesPermissionsPeer {
 
diff --git a/rbac/engine/classes/model/om/BaseSystems.php b/rbac/engine/classes/model/om/BaseSystems.php
index 64ca83b12..1e0ad3a0a 100644
--- a/rbac/engine/classes/model/om/BaseSystems.php
+++ b/rbac/engine/classes/model/om/BaseSystems.php
@@ -14,7 +14,7 @@ include_once 'classes/model/SystemsPeer.php';
  *
  * 
  *
- * @package    classes.model.om
+ * @package    classes.model
  */
 abstract class BaseSystems extends BaseObject  implements Persistent {
 
diff --git a/rbac/engine/classes/model/om/BaseSystemsPeer.php b/rbac/engine/classes/model/om/BaseSystemsPeer.php
index a0f94888b..f39c29024 100644
--- a/rbac/engine/classes/model/om/BaseSystemsPeer.php
+++ b/rbac/engine/classes/model/om/BaseSystemsPeer.php
@@ -10,7 +10,7 @@ include_once 'classes/model/Systems.php';
  *
  * 
  *
- * @package    classes.model.om
+ * @package    classes.model
  */
 abstract class BaseSystemsPeer {
 
diff --git a/rbac/engine/classes/model/om/BaseUsersRoles.php b/rbac/engine/classes/model/om/BaseUsersRoles.php
index 4ce9f6dc5..b2d746fba 100644
--- a/rbac/engine/classes/model/om/BaseUsersRoles.php
+++ b/rbac/engine/classes/model/om/BaseUsersRoles.php
@@ -14,7 +14,7 @@ include_once 'classes/model/UsersRolesPeer.php';
  *
  * 
  *
- * @package    classes.model.om
+ * @package    classes.model
  */
 abstract class BaseUsersRoles extends BaseObject  implements Persistent {
 
diff --git a/rbac/engine/classes/model/om/BaseUsersRolesPeer.php b/rbac/engine/classes/model/om/BaseUsersRolesPeer.php
index 497465dbc..3c748a4d5 100644
--- a/rbac/engine/classes/model/om/BaseUsersRolesPeer.php
+++ b/rbac/engine/classes/model/om/BaseUsersRolesPeer.php
@@ -10,7 +10,7 @@ include_once 'classes/model/UsersRoles.php';
  *
  * 
  *
- * @package    classes.model.om
+ * @package    classes.model
  */
 abstract class BaseUsersRolesPeer {
 
diff --git a/rbac/engine/methods/rbac/appEdit.php b/rbac/engine/methods/rbac/appEdit.php
index 786dd2d0b..341f98c65 100644
--- a/rbac/engine/methods/rbac/appEdit.php
+++ b/rbac/engine/methods/rbac/appEdit.php
@@ -23,6 +23,10 @@
  * 
  */
 
+/**
+ * @package    classes.model
+ */
+
 $G_MAIN_MENU = "rbac";
 $G_SUB_MENU  = "rbac.appEdit";
 $G_MENU_SELECTED = 1;
diff --git a/rbac/engine/methods/rbac/appList.php b/rbac/engine/methods/rbac/appList.php
index 1ae75dc2d..7872ea833 100644
--- a/rbac/engine/methods/rbac/appList.php
+++ b/rbac/engine/methods/rbac/appList.php
@@ -26,7 +26,7 @@
 {
   function render( $value = NULL )
   {
-    return "·asdsad";
+    return "�asdsad";
   }
 }
 class filterForm extends form