Consistent phpdoc entries

2013-03-20 09:35:19 +11:00
parent 2cdd130d1a
commit f2816dd902
207 changed files with 570 additions and 743 deletions
--- a/modules/adsl/classes/ADSL.php
+++ b/modules/adsl/classes/ADSL.php
@@ -3,12 +3,11 @@
 /**
 * This class looks after ADSL products
 *
- * @package    OSB
- * @subpackage Product
- * @category   Helpers
+ * @package    ADSL
+ * @category   Product
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */
 class ADSL {
 	// Map the table fields
--- a/modules/adsl/classes/Model/Adsl/Plan.php
+++ b/modules/adsl/classes/Model/Adsl/Plan.php
@@ -3,11 +3,10 @@
 /**
 * This class supports ADSL Plans
 *
- * @package    OSB
- * @subpackage ADSL
+ * @package    ADSL
 * @category   Models
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Model_Adsl_Plan extends ORM_OSB {
--- a/modules/adsl/classes/Model/Adsl/Supplier.php
+++ b/modules/adsl/classes/Model/Adsl/Supplier.php
@@ -3,11 +3,10 @@
 /**
 * This class supports ADSL Suppliers
 *
- * @package    OSB
- * @subpackage ADSL
+ * @package    ADSL
 * @category   Models
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Model_Adsl_Supplier extends ORM_OSB {
--- a/modules/adsl/classes/Model/Adsl/Supplier/Plan.php
+++ b/modules/adsl/classes/Model/Adsl/Supplier/Plan.php
@@ -3,11 +3,10 @@
 /**
 * This class supports ADSL Plans
 *
- * @package    OSB
- * @subpackage ADSL
+ * @package    ADSL
 * @category   Models
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Model_Adsl_Supplier_Plan extends ORM_OSB {
--- a/modules/adsl/classes/Model/Product/Plugin/ADSL.php
+++ b/modules/adsl/classes/Model/Product/Plugin/ADSL.php
@@ -3,11 +3,10 @@
 /**
 * This class supports ADSL products
 *
- * @package    OSB
- * @subpackage Product/ADSL
+ * @package    ADSL
 * @category   Models
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Model_Product_Plugin_ADSL extends Model_Product_Plugin {
--- a/modules/adsl/classes/Model/Service/Plugin/Adsl.php
+++ b/modules/adsl/classes/Model/Service/Plugin/Adsl.php
@@ -3,11 +3,10 @@
 /**
 * This class supports Services
 *
- * @package    OSB
- * @subpackage ADSL
+ * @package    ADSL
 * @category   Models
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Model_Service_Plugin_Adsl extends Model_Service_Plugin {
--- a/modules/adsl/classes/Model/Service/Plugin/Adsl/Traffic.php
+++ b/modules/adsl/classes/Model/Service/Plugin/Adsl/Traffic.php
@@ -3,11 +3,10 @@
 /**
 * This class supports Services Traffic for ADSL
 *
- * @package    OSB
- * @subpackage Service
+ * @package    ADSL
 * @category   Models
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Model_Service_Plugin_Adsl_Traffic extends ORM_OSB {
--- a/modules/adsl/classes/Service/Traffic/Adsl.php
+++ b/modules/adsl/classes/Service/Traffic/Adsl.php
@@ -3,12 +3,11 @@
 /**
 * This class will take care of ADSL Traffic.
 *
- * @package    OSB
- * @subpackage Service
- * @category   Helpers
+ * @package    ADSL
+ * @category   Service
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */
 class Service_Traffic_Adsl {
 	protected $so;
--- a/modules/adsl/classes/Service/Traffic/Adsl/Exetelhspa.php
+++ b/modules/adsl/classes/Service/Traffic/Adsl/Exetelhspa.php
@@ -6,11 +6,10 @@
 * Traffic information is collected by each service, and cached,
 * returning just the date in question.
 *
- * @package    OSB
- * @subpackage Service
- * @category   Helpers
+ * @package    ADSL
+ * @category   Service
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Service_Traffic_Adsl_Exetelhspa extends Service_Traffic_Adsl {
--- a/modules/adsl/classes/Service/Traffic/Adsl/Exetelpe.php
+++ b/modules/adsl/classes/Service/Traffic/Adsl/Exetelpe.php
@@ -6,11 +6,10 @@
 * Traffic information is collected by each service, and cached,
 * returning just the date in question.
 *
- * @package    OSB
- * @subpackage Service
- * @category   Helpers
+ * @package    ADSL
+ * @category   Service
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Service_Traffic_Adsl_Exetelpe extends Service_Traffic_Adsl {
--- a/modules/adsl/classes/Service/Traffic/Adsl/Exetelvisp.php
+++ b/modules/adsl/classes/Service/Traffic/Adsl/Exetelvisp.php
@@ -3,11 +3,10 @@
 /**
 * This class is able to collect traffic information for Exetel VISP
 *
- * @package    OSB
- * @subpackage Service
- * @category   Helpers
+ * @package    ADSL
+ * @category   Service
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Service_Traffic_Adsl_Exetelvisp extends Service_Traffic_Adsl {
--- a/modules/adsl/classes/Service/Traffic/Adsl/PeopleAgent.php
+++ b/modules/adsl/classes/Service/Traffic/Adsl/PeopleAgent.php
@@ -3,11 +3,10 @@
 /**
 * This class is able to collect traffic information for People Agent
 *
- * @package    OSB
- * @subpackage Service
- * @category   Helpers
+ * @package    ADSL
+ * @category   Service
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Service_Traffic_ADSL_PeopleAgent extends Service_Traffic_ADSL {
--- a/modules/adsl/classes/Service/Traffic/Adsl/iiNetADSL.php
+++ b/modules/adsl/classes/Service/Traffic/Adsl/iiNetADSL.php
@@ -6,11 +6,10 @@
 * Traffic information is collected by each service, and cached,
 * returning just the date in question.
 *
- * @package    OSB
- * @subpackage Service
- * @category   Helpers
+ * @package    ADSL
+ * @category   Service
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Service_Traffic_ADSL_iiNetADSL extends Service_Traffic_ADSL {
--- a/modules/affiliate/classes/Model/Affiliate.php
+++ b/modules/affiliate/classes/Model/Affiliate.php
@@ -3,11 +3,10 @@
 /**
 * This class supports affiliates
 *
- * @package    OSB
- * @subpackage Affiliate
+ * @package    Affiliate
 * @category   Models
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Model_Affiliate extends ORM_OSB {
--- a/modules/cart/classes/Cart.php
+++ b/modules/cart/classes/Cart.php
@@ -3,12 +3,11 @@
 /**
 * This class provides a order cart
 *
- * @package    OSB
- * @subpackage Cart
+ * @package    Cart
 * @category   Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */
 class Cart {
 	private $id = NULL;
--- a/modules/cart/classes/Cart/Item.php
+++ b/modules/cart/classes/Cart/Item.php
@@ -3,12 +3,11 @@
 /**
 * This class provides a Cart Item
 *
- * @package    OSB
- * @subpackage Cart
+ * @package    Cart
 * @category   Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */
 class Cart_Item {
 	// Quantity
--- a/modules/cart/classes/Cartable.php
+++ b/modules/cart/classes/Cartable.php
@@ -3,12 +3,11 @@
 /**
 * This interface ensures that all cart processing objects have the right methods
 *
- * @package    OSB
- * @subpackage Cart
- * @category   Helpers
+ * @package    Cart
+ * @category   Interface
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */
 interface Cartable {
 	// Render a cart line item.
--- a/modules/cart/classes/Controller/Cart.php
+++ b/modules/cart/classes/Controller/Cart.php
@@ -3,12 +3,11 @@
 /**
 * This class provides a order cart
 *
- * @package    OSB
- * @subpackage Cart
+ * @package    Cart
 * @category   Controllers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */
 class Controller_Cart extends Controller_TemplateDefault {
 	/**
--- a/modules/cart/classes/Model/Cart.php
+++ b/modules/cart/classes/Model/Cart.php
@@ -3,11 +3,10 @@
 /**
 * This class supports a product cart
 *
- * @package    OSB
- * @subpackage Cart
+ * @package    Cart
 * @category   Models
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Model_Cart extends ORM_OSB {
--- a/modules/charge/classes/Controller/Admin/Charge.php
+++ b/modules/charge/classes/Controller/Admin/Charge.php
@@ -3,11 +3,10 @@
 /**
 * This class provides charge capabilities.
 *
- * @package    OSB
- * @subpackage Charge
+ * @package    Charge
 * @category   Controllers/Admin
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Controller_Admin_Charge extends Controller_TemplateDefault_Admin {
--- a/modules/charge/classes/Model/Charge.php
+++ b/modules/charge/classes/Model/Charge.php
@@ -3,11 +3,10 @@
 /**
 * This class provides charge item capabilities.
 *
- * @package    OSB
- * @subpackage Charge
+ * @package    Charge
 * @category   Models
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Model_Charge extends ORM_OSB {
--- a/modules/checkout/classes/Checkout/Plugin.php
+++ b/modules/checkout/classes/Checkout/Plugin.php
@@ -3,12 +3,11 @@
 /**
 * This class provides CHECKOUT Plugin Support
 *
- * @package    OSB
- * @subpackage Checkout Plugins
+ * @package    Checkout
 * @category   Plugins
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 * @todo Does this need to be Serializable?
 */
 abstract class Checkout_Plugin implements Serializable {
--- a/modules/checkout/classes/Checkout/Plugin/Paypal.php
+++ b/modules/checkout/classes/Checkout/Plugin/Paypal.php
@@ -3,12 +3,11 @@
 /**
 * This class provides PAYPAL support
 *
- * @package    OSB
- * @subpackage Plugins/Paypal
+ * @package    Checkout
 * @category   Plugins
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */
 abstract class Checkout_Plugin_Paypal extends Checkout_Plugin {
 	protected $url_prod = 'www.paypal.com';
--- a/modules/checkout/classes/Checkout/Plugin/Paypal/Cart.php
+++ b/modules/checkout/classes/Checkout/Plugin/Paypal/Cart.php
@@ -3,12 +3,11 @@
 /**
 * This class provides PAYPAL CART support
 *
- * @package    OSB
- * @subpackage Plugins/Paypal
+ * @package    Checkout
 * @category   Plugins
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */
 class Checkout_Plugin_Paypal_Cart extends Checkout_Plugin_Paypal {
 	private $test_mode = FALSE;
--- a/modules/checkout/classes/Controller/Checkout.php
+++ b/modules/checkout/classes/Controller/Checkout.php
@@ -3,11 +3,10 @@
 /**
 * This class provides checkout capabilities.
 *
- * @package    OSB
- * @subpackage Checkout
+ * @package    Checkout
 * @category   Controllers
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Controller_Checkout extends Controller_TemplateDefault {
--- a/modules/checkout/classes/Model/Checkout.php
+++ b/modules/checkout/classes/Model/Checkout.php
@@ -3,11 +3,10 @@
 /**
 * This class provides checkout capabilities.
 *
- * @package    OSB
- * @subpackage Checkout
+ * @package    Checkout
 * @category   Models
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Model_Checkout extends ORM_OSB {
--- a/modules/checkout/classes/Model/Checkout/Notify.php
+++ b/modules/checkout/classes/Model/Checkout/Notify.php
@@ -3,11 +3,10 @@
 /**
 * This class provides checkout capabilities.
 *
- * @package    OSB
- * @subpackage Checkout
+ * @package    Checkout
 * @category   Models
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Model_Checkout_Notify extends ORM_OSB {
--- a/modules/domain/classes/Domain.php
+++ b/modules/domain/classes/Domain.php
@@ -3,12 +3,11 @@
 /**
 * This class looks after DOMAIN NAME products
 *
- * @package    OSB
- * @subpackage Product
+ * @package    Domain
 * @category   Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */
 class DOMAIN {
 	/**
--- a/modules/domain/classes/Model/Domain/Registrar.php
+++ b/modules/domain/classes/Model/Domain/Registrar.php
@@ -3,11 +3,10 @@
 /**
 * This class supports Domain TLD Registrars
 *
- * @package    OSB
- * @subpackage Host_TLD_Registrar
+ * @package    Domain
 * @category   Models
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Model_Domain_Registrar extends ORM_OSB {
--- a/modules/domain/classes/Model/Domain/TLD.php
+++ b/modules/domain/classes/Model/Domain/TLD.php
@@ -3,11 +3,10 @@
 /**
 * This class supports Domain TLD
 *
- * @package    OSB
- * @subpackage Domains
+ * @package    Domain
 * @category   Models
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Model_Domain_Tld extends ORM_OSB {
--- a/modules/domain/classes/Model/Product/Plugin/DOMAIN.php
+++ b/modules/domain/classes/Model/Product/Plugin/DOMAIN.php
@@ -3,11 +3,10 @@
 /**
 * This class supports DOMAIN products
 *
- * @package    OSB
- * @subpackage Product/Domain
- * @category   Models
+ * @package    Domain
+ * @category   Plugins
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Model_Product_Plugin_DOMAIN extends Model_Product_Plugin {
--- a/modules/domain/classes/Model/Service/Plugin/Domain.php
+++ b/modules/domain/classes/Model/Service/Plugin/Domain.php
@@ -3,11 +3,10 @@
 /**
 * This class supports Services
 *
- * @package    OSB
- * @subpackage DOMAIN
+ * @package    Domain
 * @category   Models
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Model_Service_Plugin_Domain extends Model_Service_Plugin {
--- a/modules/domain/classes/Service/Domain.php
+++ b/modules/domain/classes/Service/Domain.php
@@ -3,12 +3,11 @@
 /**
 * This class will take care of Domain Registrars.
 *
- * @package    OSB
- * @subpackage Service
- * @category   Helpers
+ * @package    Domain
+ * @category   Service
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */
 abstract class Service_Domain {
 	protected $so;
--- a/modules/domain/classes/Service/Domain/Manual.php
+++ b/modules/domain/classes/Service/Domain/Manual.php
@@ -3,11 +3,10 @@
 /**
 * This class is able to interact with TPP
 *
- * @package    OSB
- * @subpackage Service
- * @category   Helpers
+ * @package    Domain
+ * @category   Service
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Service_Domain_Manual extends Service_Domain {
--- a/modules/domain/classes/Service/Domain/PlanetDomain.php
+++ b/modules/domain/classes/Service/Domain/PlanetDomain.php
@@ -3,11 +3,10 @@
 /**
 * This class is able to interact with TPP
 *
- * @package    OSB
- * @subpackage Service
- * @category   Helpers
+ * @package    Domain
+ * @category   Service
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Service_Domain_PlanetDomain extends Service_Domain {
--- a/modules/domain/classes/Service/Domain/TPP.php
+++ b/modules/domain/classes/Service/Domain/TPP.php
@@ -3,11 +3,10 @@
 /**
 * This class is able to interact with TPP
 *
- * @package    OSB
- * @subpackage Service
- * @category   Helpers
+ * @package    Domain
+ * @category   Service
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Service_Domain_TPP extends Service_Domain {
--- a/modules/email/classes/Controller/Admin/Email.php
+++ b/modules/email/classes/Controller/Admin/Email.php
@@ -3,12 +3,11 @@
 /**
 * This class provides Admin Email management
 *
- * @package    lnApp
- * @subpackage Page/Email
- * @category   Controllers
+ * @package    Email
+ * @category   Controllers/Admin
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */
 class Controller_Admin_Email extends Controller_TemplateDefault_Admin {
 	protected $secure_actions = array(
--- a/modules/email/classes/Controller/Email.php
+++ b/modules/email/classes/Controller/Email.php
@@ -3,12 +3,11 @@
 /**
 * This class provides email management
 *
- * @package    lnApp
- * @subpackage Page/Email
+ * @package    Email
 * @category   Controllers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */
 class Controller_Email extends Controller_TemplateDefault {
 }
--- a/modules/email/classes/Controller/Email/Template.php
+++ b/modules/email/classes/Controller/Email/Template.php
@@ -3,12 +3,11 @@
 /**
 * This class provides email management
 *
- * @package    lnApp
- * @subpackage Page/Email
+ * @package    Email
 * @category   Controllers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */
 class Controller_EmailTemplate extends Controller_TemplateDefault {
 }
--- a/modules/email/classes/Controller/User/Email.php
+++ b/modules/email/classes/Controller/User/Email.php
@@ -3,12 +3,11 @@
 /**
 * This class provides User Email View functions
 *
- * @package    OSB
- * @subpackage Email
+ * @package    Email
 * @category   Controllers/User
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */
 class Controller_User_Email extends Controller_TemplateDefault_User {
 	protected $secure_actions = array(
--- a/modules/email/classes/Email/Template.php
+++ b/modules/email/classes/Email/Template.php
@@ -3,12 +3,11 @@
 /**
 * This class provides email template functions
 *
- * @package    OSB
- * @subpackage Email_Template
+ * @package    Email
 * @category   Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */
 class Email_Template {
 	// We'll store the template here
--- a/modules/email/classes/Model/Email/Log.php
+++ b/modules/email/classes/Model/Email/Log.php
@@ -3,11 +3,10 @@
 /**
 * This class supports Email Logging
 *
- * @package    OSB
- * @subpackage Email
+ * @package    Email
 * @category   Models
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Model_Email_Log extends ORM_OSB {
--- a/modules/email/classes/Model/Email/Template.php
+++ b/modules/email/classes/Model/Email/Template.php
@@ -2,12 +2,11 @@

 /**
 *
- * @package    OSB
- * @subpackage EmailTemplate
+ * @package    Email
 * @category   Models
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */
 class Model_Email_Template extends ORM_OSB {
 	protected $_has_many = array(
--- a/modules/email/classes/Model/Email/Template/Translate.php
+++ b/modules/email/classes/Model/Email/Template/Translate.php
@@ -2,12 +2,11 @@

 /**
 *
- * @package    OSB
- * @subpackage EmailTemplate
+ * @package    Email
 * @category   Models
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */
 class Model_Email_Template_Translate extends ORM_OSB {
 	// This module doesnt keep track of column updates automatically
--- a/modules/export/classes/Controller/Admin/Export.php
+++ b/modules/export/classes/Controller/Admin/Export.php
@@ -3,11 +3,10 @@
 /**
 * This class provides OSB exporting capabilities.
 *
- * @package    OSB
- * @subpackage Export
+ * @package    Export
 * @category   Controllers/Admin
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Controller_Admin_Export extends Controller_TemplateDefault_Admin {
--- a/modules/export/classes/Controller/Affiliate/Export.php
+++ b/modules/export/classes/Controller/Affiliate/Export.php
@@ -3,11 +3,10 @@
 /**
 * This class provides OSB exporting capabilities.
 *
- * @package    OSB
- * @subpackage Export
+ * @package    Export
 * @category   Controllers/Affiliate
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Controller_Affiliate_Export extends Controller_TemplateDefault_Affiliate {
--- a/modules/export/classes/Controller/Export.php
+++ b/modules/export/classes/Controller/Export.php
@@ -3,12 +3,11 @@
 /**
 * This class provides service management
 *
- * @package    lnApp
- * @subpackage Page/Export
+ * @package    Export
 * @category   Controllers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */
 class Controller_Export extends Controller_TemplateDefault {
 }
--- a/modules/export/classes/Export.php
+++ b/modules/export/classes/Export.php
@@ -3,11 +3,10 @@
 /**
 * This class provides OSB exporting capabilities for OSB.
 *
- * @package    OSB
- * @subpackage Export
+ * @package    Export
 * @category   Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Export {
--- a/modules/export/classes/Export/Quicken.php
+++ b/modules/export/classes/Export/Quicken.php
@@ -3,11 +3,10 @@
 /**
 * This class provides OSB exporting capabilities for Quickbooks.
 *
- * @package    OSB
- * @subpackage Export/Quicken
- * @category   Controllers/Admin
+ * @package    Export
+ * @category   Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Export_Quicken extends Export {
--- a/modules/export/classes/Model/Export.php
+++ b/modules/export/classes/Model/Export.php
@@ -3,11 +3,10 @@
 /**
 * This class supports OSB exporting by rending the exportable items.
 *
- * @package    OSB
- * @subpackage Export
- * @category   Models
+ * @package    Export
+ * @category   Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Model_Export extends ORM_OSB {
--- a/modules/export/classes/OSBExport.php
+++ b/modules/export/classes/OSBExport.php
@@ -3,11 +3,10 @@
 /**
 * This is the abstract class for all export capabilities.
 *
- * @package    OSB
- * @subpackage Export
- * @category   Classes/Abstract
+ * @package    Export
+ * @category   Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 abstract class OSBExport {
--- a/modules/export/classes/Quicken.php
+++ b/modules/export/classes/Quicken.php
@@ -3,11 +3,10 @@
 /**
 * This class provides Quicken exporting capabilities.
 *
- * @package    OSB
- * @subpackage Export
- * @category   Classes/Quicken
+ * @package    Export
+ * @category   Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Quicken extends OSBExport {
--- a/modules/export/classes/Quicken/Invoice.php
+++ b/modules/export/classes/Quicken/Invoice.php
@@ -3,11 +3,10 @@
 /**
 * This class provides Quicken exporting capabilities.
 *
- * @package    OSB
- * @subpackage Export
- * @category   Classes/Quicken
+ * @package    Export
+ * @category   Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Quicken_Invoice extends Quicken {
--- a/modules/export/classes/Quicken/InvoiceItem.php
+++ b/modules/export/classes/Quicken/InvoiceItem.php
@@ -3,11 +3,10 @@
 /**
 * This class provides Quicken exporting capabilities.
 *
- * @package    OSB
- * @subpackage Export
- * @category   Classes/Quicken
+ * @package    Export
+ * @category   Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Quicken_InvoiceItem extends Quicken {
--- a/modules/export/classes/Quicken/Payment.php
+++ b/modules/export/classes/Quicken/Payment.php
@@ -3,11 +3,10 @@
 /**
 * This class provides Quicken exporting capabilities.
 *
- * @package    OSB
- * @subpackage Export
- * @category   Classes/Quicken
+ * @package    Export
+ * @category   Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Quicken_Payment extends Quicken {
--- a/modules/gchart/classes/GoogleChart.php
+++ b/modules/gchart/classes/GoogleChart.php
@@ -3,11 +3,10 @@
 /**
 * This class provides access to Google's Chart API
 *
- * @package    lnApp
- * @subpackage GoogleChart
+ * @package    GoogleChart
 * @category   Helper
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
+ * @copyright  (c) 2009-2013 Deon George
 * @license    http://dev.leenooks.net/license.html
 */
 abstract class GoogleChart implements Iterator,Countable {
--- a/modules/gchart/classes/GoogleChart/ComboChart.php
+++ b/modules/gchart/classes/GoogleChart/ComboChart.php
@@ -3,11 +3,10 @@
 /**
 * This class provides access to Google's Chart API
 *
- * @package    lnApp
- * @subpackage GoogleChart
+ * @package    GoogleChart
 * @category   Helper
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
+ * @copyright  (c) 2009-2013 Deon George
 * @license    http://dev.leenooks.net/license.html
 */
 class GoogleChart_ComboChart extends GoogleChart {
--- a/modules/gchart/classes/GoogleChart/Legacy.php
+++ b/modules/gchart/classes/GoogleChart/Legacy.php
@@ -3,11 +3,10 @@
 /**
 * This class provides access to Google's Chart Legacy API
 *
- * @package    lnApp
- * @subpackage GoogleChart
+ * @package    GoogleChart
 * @category   Helper
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
+ * @copyright  (c) 2009-2013 Deon George
 * @license    http://dev.leenooks.net/license.html
 */
 class GoogleChart_Legacy extends GoogleChart {
--- a/modules/host/classes/Controller/Admin/Host.php
+++ b/modules/host/classes/Controller/Admin/Host.php
@@ -1,13 +1,13 @@
 <?php defined('SYSPATH') or die('No direct access allowed.');
+
 /**
 * This class provides Host Server functions
 *
- * @package    OSB
- * @subpackage HostServer
+ * @package    Host
 * @category   Controllers/Admin
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */
 class Controller_Admin_Host extends Controller_TemplateDefault_Admin {
 	protected $secure_actions = array(
--- a/modules/host/classes/Controller/Task/Host.php
+++ b/modules/host/classes/Controller/Task/Host.php
@@ -1,13 +1,13 @@
 <?php defined('SYSPATH') or die('No direct access allowed.');
+
 /**
 * This class provides Host Server functions
 *
- * @package    OSB
- * @subpackage HostServer
+ * @package    Host
 * @category   Controllers/Task
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */
 class Controller_Task_Host extends Controller_Task {
 	private $so; // Service Object
--- a/modules/host/classes/Host/Plugin.php
+++ b/modules/host/classes/Host/Plugin.php
@@ -3,12 +3,11 @@
 /**
 * This class provides HOST Plugin Support
 *
- * @package    OSB
- * @subpackage Host Plugins
+ * @package    Host
 * @category   Plugins
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */
 abstract class Host_Plugin implements Serializable {
 	protected $hso; // Our Host Serve Object
--- a/modules/host/classes/Host/Plugin/Plesk.php
+++ b/modules/host/classes/Host/Plugin/Plesk.php
@@ -3,12 +3,11 @@
 /**
 * This class provides PLESK support
 *
- * @package    OSB
- * @subpackage Plugins/Plesk
+ * @package    Host
 * @category   Plugins
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */
 abstract class Host_Plugin_Plesk extends Host_Plugin {
 	// Service Object
--- a/modules/host/classes/Host/Plugin/Plesk/10.php
+++ b/modules/host/classes/Host/Plugin/Plesk/10.php
@@ -3,12 +3,11 @@
 /**
 * This class provides PLESK client support
 *
- * @package    OSB
- * @subpackage Plugins/Plesk
+ * @package    Host
 * @category   Plugins
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */
 class Host_Plugin_Plesk_10 extends Host_Plugin_Plesk {
 	protected $protocol = '1.6.3.0';
--- a/modules/host/classes/Host/Plugin/Plesk/9.php
+++ b/modules/host/classes/Host/Plugin/Plesk/9.php
@@ -3,12 +3,11 @@
 /**
 * This class provides PLESK client support
 *
- * @package    OSB
- * @subpackage Plugins/Plesk
+ * @package    Host
 * @category   Plugins
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */
 class Host_Plugin_Plesk_9 extends Host_Plugin_Plesk {
 	protected $protocol = '1.6.0.1';
--- a/modules/host/classes/Model/Host/Server.php
+++ b/modules/host/classes/Model/Host/Server.php
@@ -3,11 +3,10 @@
 /**
 * This class supports OSB Web Hosting
 *
- * @package    OSB
- * @subpackage Product
+ * @package    Host
 * @category   Models
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Model_Host_Server extends ORM_OSB {
--- a/modules/host/classes/Model/Host/Server/Affiliate.php
+++ b/modules/host/classes/Model/Host/Server/Affiliate.php
@@ -3,11 +3,10 @@
 /**
 * This class supports affiliates Host Server Configuration
 *
- * @package    OSB
- * @subpackage HostServer/Affiliate
+ * @package    Host
 * @category   Models
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Model_Host_Server_Affiliate extends ORM_OSB {
--- a/modules/host/classes/Model/Product/Plugin/Host.php
+++ b/modules/host/classes/Model/Product/Plugin/Host.php
@@ -3,14 +3,13 @@
 /**
 * This class supports Host products
 *
- * @package    OSB
- * @subpackage Product/Host
+ * @package    Host
 * @category   Models
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
-class Model_Product_Plugin_HOST extends Model_Product_Plugin {
+class Model_Product_Plugin_Host extends Model_Product_Plugin {
 	// @todo This model doesnt have a database table
 	public function __construct() {
 	}
--- a/modules/host/classes/Model/Service/Plugin/Host.php
+++ b/modules/host/classes/Model/Service/Plugin/Host.php
@@ -3,11 +3,10 @@
 /**
 * This class supports Services
 *
- * @package    OSB
- * @subpackage Hosting
+ * @package    Host
 * @category   Models
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Model_Service_Plugin_Host extends Model_Service_Plugin {
--- a/modules/invoice/classes/Controller/Admin/Invoice.php
+++ b/modules/invoice/classes/Controller/Admin/Invoice.php
@@ -3,11 +3,10 @@
 /**
 * This class provides invoice capabilities.
 *
- * @package    OSB
- * @subpackage Invoice
+ * @package    Invoice
 * @category   Controllers/Admin
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 *
 * Column Definitions:
--- a/modules/invoice/classes/Controller/Invoice.php
+++ b/modules/invoice/classes/Controller/Invoice.php
@@ -3,11 +3,10 @@
 /**
 * This class provides invoice capabilities.
 *
- * @package    OSB
- * @subpackage Invoice
+ * @package    Invoice
 * @category   Controllers
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Controller_Invoice extends Controller_TemplateDefault {
--- a/modules/invoice/classes/Controller/Task/Invoice.php
+++ b/modules/invoice/classes/Controller/Task/Invoice.php
@@ -3,11 +3,10 @@
 /**
 * This class provides OSB invoice task capabilities.
 *
- * @package    OSB
- * @subpackage Invoice
- * @category   Controllers/Task
+ * @package    Invoice
+ * @category   Controllers
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Controller_Task_Invoice extends Controller_Task {
--- a/modules/invoice/classes/Controller/User/Invoice.php
+++ b/modules/invoice/classes/Controller/User/Invoice.php
@@ -3,12 +3,11 @@
 /**
 * This class provides User Invoice functions
 *
- * @package    OSB
- * @subpackage Invoice
+ * @package    Invoice
 * @category   Controllers/User
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */
 class Controller_User_Invoice extends Controller_TemplateDefault_User {
 	protected $secure_actions = array(
--- a/modules/invoice/classes/Invoice.php
+++ b/modules/invoice/classes/Invoice.php
@@ -3,12 +3,11 @@
 /**
 * This class provides invoice information
 *
- * @package    OSB
- * @subpackage Invoice
+ * @package    Invoice
 * @category   Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */
 class Invoice {
 	// This invoice Object
--- a/modules/invoice/classes/Invoice/TCPDF.php
+++ b/modules/invoice/classes/Invoice/TCPDF.php
@@ -3,22 +3,16 @@
 /**
 * This class provides invoice PDF rendering capability
 *
- * @package    OSB
- * @subpackage Invoice
+ * @package    Invoice
 * @category   Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */

 define('FPDF_FONTPATH','includes/tcpdf/fonts/');
 require_once('includes/tcpdf/tcpdf.php');

-/**
- * PDF Invoice Base
- *
- * @subpackage Module:Invoice
- */
 abstract class Invoice_TCPDF extends TCPDF {
 	// Our invoice object
 	protected $io;
--- a/modules/invoice/classes/Invoice/TCPDF/Default.php
+++ b/modules/invoice/classes/Invoice/TCPDF/Default.php
@@ -3,12 +3,11 @@
 /**
 * This class provides invoice rending use TCPDF
 *
- * @package    OSB
- * @subpackage Invoice
+ * @package    Invoice
 * @category   Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
- * @license    http://dev.leenooks.net/license.html
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
 */
 class Invoice_TCPDF_Default extends Invoice_TCPDF {
 	// Current line being printed
--- a/modules/invoice/classes/Model/Invoice.php
+++ b/modules/invoice/classes/Model/Invoice.php
@@ -3,11 +3,10 @@
 /**
 * This class provides invoice capabilities.
 *
- * @package    OSB
- * @subpackage Invoice
+ * @package    Invoice
 * @category   Models
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Model_Invoice extends ORM_OSB implements Cartable {
--- a/modules/invoice/classes/Model/Invoice/Item.php
+++ b/modules/invoice/classes/Model/Invoice/Item.php
@@ -3,11 +3,10 @@
 /**
 * This class provides invoice item capabilities.
 *
- * @package    OSB
- * @subpackage Invoice
+ * @package    Invoice
 * @category   Models
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Model_Invoice_Item extends ORM_OSB {
--- a/modules/invoice/classes/Task/Invoice/Complete.php
+++ b/modules/invoice/classes/Task/Invoice/Complete.php
@@ -3,11 +3,10 @@
 /**
 * Mark all invoices that have been paid as complete, so that they are not processed again.
 *
- * @package    OSB
- * @subpackage Invoice
- * @category   Task/Invoice
+ * @package    Invoice
+ * @category   Tasks
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Task_Invoice_Complete extends Task {
--- a/modules/lnApp/classes/lnApp/Block.php
+++ b/modules/lnApp/classes/lnApp/Block.php
@@ -6,10 +6,9 @@
 * It will provide a header, body and footer.
 *
 * @package    lnApp
- * @subpackage Page
- * @category   Helpers
+ * @category   lnApp/Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
+ * @copyright  (c) 2009-2013 Deon George
 * @license    http://dev.leenooks.net/license.html
 * @uses       Style
 */
--- a/modules/lnApp/classes/lnApp/Block/Sub.php
+++ b/modules/lnApp/classes/lnApp/Block/Sub.php
@@ -6,10 +6,9 @@
 * It will provide a header, body and footer.
 *
 * @package    lnApp
- * @subpackage Page
- * @category   Helpers
+ * @category   lnApp/Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
+ * @copyright  (c) 2009-2013 Deon George
 * @license    http://dev.leenooks.net/license.html
 * @uses       Style
 */
--- a/modules/lnApp/classes/lnApp/BreadCrumb.php
+++ b/modules/lnApp/classes/lnApp/BreadCrumb.php
@@ -4,10 +4,9 @@
 * This class is for rendering a BreadCrumb menu.
 *
 * @package    lnApp
- * @subpackage Page
- * @category   Helpers
+ * @category   lnApp/Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
+ * @copyright  (c) 2009-2013 Deon George
 * @license    http://dev.leenooks.net/license.html
 */
 abstract class lnApp_BreadCrumb extends HTMLRender {
--- a/modules/lnApp/classes/lnApp/Controller/Default.php
+++ b/modules/lnApp/classes/lnApp/Controller/Default.php
@@ -4,10 +4,9 @@
 * This class provides the default controller for rendering pages.
 *
 * @package    lnApp
- * @subpackage Page
- * @category   Abstract/Controllers
+ * @category   lnApp/Controllers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
+ * @copyright  (c) 2009-2013 Deon George
 * @license    http://dev.leenooks.net/license.html
 */
 abstract class lnApp_Controller_Default extends Controller {
--- a/modules/lnApp/classes/lnApp/Controller/Login.php
+++ b/modules/lnApp/classes/lnApp/Controller/Login.php
@@ -4,10 +4,9 @@
 * This class provides login capability
 *
 * @package    lnApp
- * @subpackage Page/Login
- * @category   Controllers
+ * @category   lnApp/Controllers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
+ * @copyright  (c) 2009-2013 Deon George
 * @license    http://dev.leenooks.net/license.html
 * @also       [logout]
 */
--- a/modules/lnApp/classes/lnApp/Controller/Logout.php
+++ b/modules/lnApp/classes/lnApp/Controller/Logout.php
@@ -4,10 +4,9 @@
 * This class provides logout capability
 *
 * @package    lnApp
- * @subpackage Page/Logout
- * @category   Controllers
+ * @category   lnApp/Controllers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
+ * @copyright  (c) 2009-2013 Deon George
 * @license    http://dev.leenooks.net/license.html
 * @also       [login]
 */
--- a/modules/lnApp/classes/lnApp/Controller/Media.php
+++ b/modules/lnApp/classes/lnApp/Controller/Media.php
@@ -4,10 +4,9 @@
 * This class provides access to rendering media items (javascript, images and css).
 *
 * @package    lnApp
- * @subpackage Page/Media
- * @category   Controllers
+ * @category   lnApp/Controllers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
+ * @copyright  (c) 2009-2013 Deon George
 * @license    http://dev.leenooks.net/license.html
 */
 abstract class lnApp_Controller_Media extends Controller {
--- a/modules/lnApp/classes/lnApp/Controller/Task.php
+++ b/modules/lnApp/classes/lnApp/Controller/Task.php
@@ -4,10 +4,9 @@
 * This class provides the default controller for tasks.
 *
 * @package    lnApp
- * @subpackage Task
- * @category   Abstract/Controllers
+ * @category   lnApp/Controllers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
+ * @copyright  (c) 2009-2013 Deon George
 * @license    http://dev.leenooks.net/license.html
 */
 abstract class lnApp_Controller_Task extends Controller {
--- a/modules/lnApp/classes/lnApp/Controller/TemplateDefault.php
+++ b/modules/lnApp/classes/lnApp/Controller/TemplateDefault.php
@@ -4,10 +4,9 @@
 * This class provides the default template controller for rendering pages.
 *
 * @package    lnApp
- * @subpackage Page/Template
- * @category   Controllers
+ * @category   lnApp/Controllers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
+ * @copyright  (c) 2009-2013 Deon George
 * @license    http://dev.leenooks.net/license.html
 */
 abstract class lnApp_Controller_TemplateDefault extends Controller_Template {
@@ -159,10 +158,11 @@ abstract class lnApp_Controller_TemplateDefault extends Controller_Template {

 		if ($this->auto_render) {
 			// Application Title
-			if ($mo=ORM::factory('Module',array('name'=>Request::current()->controller())) AND $mo->loaded())
+			if (class_exists('Model_Module') AND $mo=ORM::factory('Module',array('name'=>Request::current()->controller())) AND $mo->loaded())
 				$this->meta->title = sprintf('%s: %s',Kohana::$config->load('config')->appname,$mo->display('name'));
 			else
 				$this->meta->title = Kohana::$config->load('config')->appname;
+
 			$this->template->title = '';

 			// Language
--- a/modules/lnApp/classes/lnApp/Controller/Tree.php
+++ b/modules/lnApp/classes/lnApp/Controller/Tree.php
@@ -4,11 +4,10 @@
 * This class extends renders OSB menu tree.
 *
 * @package    lnApp
- * @subpackage Tree
- * @category   Controllers
+ * @category   lnApp/Controllers
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
- * @license    http://dev.osbill.net/license.html
+ * @copyright  (c) 2009-2013 Deon George
+ * @license    http://dev.leenooks.net/license.html
 */
 class lnApp_Controller_Tree extends Controller_Default {
 	/**
--- a/modules/lnApp/classes/lnApp/HTML.php
+++ b/modules/lnApp/classes/lnApp/HTML.php
@@ -3,11 +3,10 @@
 /**
 * This class extends Kohana's HTML
 *
- * @package    lnApp/Modifications
- * @category   Classes
- * @category   Helpers
+ * @package    lnApp
+ * @category   Modifications
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
+ * @copyright  (c) 2009-2013 Deon George
 * @license    http://dev.leenooks.net/license.html
 */
 abstract class lnApp_HTML extends Kohana_HTML {
--- a/modules/lnApp/classes/lnApp/HTMLRender.php
+++ b/modules/lnApp/classes/lnApp/HTMLRender.php
@@ -5,10 +5,9 @@
 * for rendering.
 *
 * @package    lnApp
- * @subpackage Page
- * @category   Abstract/Helpers
+ * @category   lnApp/Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
+ * @copyright  (c) 2009-2013 Deon George
 * @license    http://dev.leenooks.net/license.html
 */
 abstract class lnApp_HTMLRender {
--- a/modules/lnApp/classes/lnApp/HeadImages.php
+++ b/modules/lnApp/classes/lnApp/HeadImages.php
@@ -4,10 +4,9 @@
 * This class is for all image icons shown on the page header.
 *
 * @package    lnApp
- * @subpackage Page
- * @category   Helpers
+ * @category   lnApp/Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
+ * @copyright  (c) 2009-2013 Deon George
 * @license    http://dev.leenooks.net/license.html
 */
 abstract class lnApp_HeadImages extends HTMLRender {
--- a/modules/lnApp/classes/lnApp/Meta.php
+++ b/modules/lnApp/classes/lnApp/Meta.php
@@ -4,10 +4,9 @@
 * This is class is for all HTML page attributes.
 *
 * @package    lnApp
- * @subpackage Page
- * @category   Helpers
+ * @category   lnApp/Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
+ * @copyright  (c) 2009-2013 Deon George
 * @license    http://dev.leenooks.net/license.html
 */
 abstract class lnApp_Meta {
--- a/modules/lnApp/classes/lnApp/PWgen.php
+++ b/modules/lnApp/classes/lnApp/PWgen.php
@@ -4,10 +4,9 @@
 * This class is for providing password from a password genarator
 *
 * @package    lnApp
- * @subpackage PWGen
- * @category   Helpers
+ * @category   lnApp/Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
+ * @copyright  (c) 2009-2013 Deon George
 * @license    http://dev.leenooks.net/license.html
 */
 abstract class lnApp_PWgen {
--- a/modules/lnApp/classes/lnApp/Random.php
+++ b/modules/lnApp/classes/lnApp/Random.php
@@ -4,9 +4,9 @@
 * This class is for generating Random data.
 *
 * @package    lnApp
- * @category   Helpers
+ * @category   lnApp/Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
+ * @copyright  (c) 2009-2013 Deon George
 * @license    http://dev.leenooks.net/license.html
 */
 abstract class lnApp_Random {
--- a/modules/lnApp/classes/lnApp/Script.php
+++ b/modules/lnApp/classes/lnApp/Script.php
@@ -4,10 +4,9 @@
 * This class is for rendering HTML script tags
 *
 * @package    lnApp
- * @subpackage Page
- * @category   Helpers
+ * @category   lnApp/Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
+ * @copyright  (c) 2009-2013 Deon George
 * @license    http://dev.leenooks.net/license.html
 */
 abstract class lnApp_Script extends HTMLRender {
--- a/modules/lnApp/classes/lnApp/Sort.php
+++ b/modules/lnApp/classes/lnApp/Sort.php
@@ -4,10 +4,9 @@
 * This class is used to sort multiple dimension arrays.
 *
 * @package    lnApp
- * @subpackage Sort
- * @category   Helpers
+ * @category   lnApp/Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
+ * @copyright  (c) 2009-2013 Deon George
 * @license    http://dev.leenooks.net/license.html
 * @uses       Style
 */
--- a/modules/lnApp/classes/lnApp/Style.php
+++ b/modules/lnApp/classes/lnApp/Style.php
@@ -4,10 +4,9 @@
 * This class is for rendering HTML style tags
 *
 * @package    lnApp
- * @subpackage Page
- * @category   Helpers
+ * @category   lnApp/Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
+ * @copyright  (c) 2009-2013 Deon George
 * @license    http://dev.leenooks.net/license.html
 */
 abstract class lnApp_Style extends HTMLRender {
--- a/modules/lnApp/classes/lnApp/SystemMessage.php
+++ b/modules/lnApp/classes/lnApp/SystemMessage.php
@@ -4,10 +4,9 @@
 * This class is for rendering system information messages.
 *
 * @package    lnApp
- * @subpackage SystemMessage
- * @category   Helpers
+ * @category   lnApp/Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
+ * @copyright  (c) 2009-2013 Deon George
 * @license    http://dev.leenooks.net/license.html
 */
 abstract class lnApp_SystemMessage extends HTMLRender {
--- a/modules/lnApp/classes/lnApp/Table.php
+++ b/modules/lnApp/classes/lnApp/Table.php
@@ -4,10 +4,9 @@
 * This class is for rendering a table of data.
 *
 * @package    lnApp
- * @subpackage Page
- * @category   Helpers
+ * @category   lnApp/Helpers
 * @author     Deon George
- * @copyright  (c) 2010 Deon George
+ * @copyright  (c) 2009-2013 Deon George
 * @license    http://dev.leenooks.net/license.html
 * @uses       Style
 */
--- a/modules/payment/classes/Controller/Admin/Payment.php
+++ b/modules/payment/classes/Controller/Admin/Payment.php
@@ -3,11 +3,10 @@
 /**
 * This class provides payment capabilities.
 *
- * @package    OSB
- * @subpackage Payment
+ * @package    Payment
 * @category   Controllers/Admin
 * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
 * @license    http://dev.osbill.net/license.html
 */
 class Controller_Admin_Payment extends Controller_TemplateDefault_Admin {
--- a/Show More
+++ b/Show More