diff --git a/application/classes/Auth/ORM.php b/application/classes/Auth/ORM.php
index 02e3ac30..4f44b9b2 100644
--- a/application/classes/Auth/ORM.php
+++ b/application/classes/Auth/ORM.php
@@ -3,12 +3,11 @@
 /**
  * This class overrides Kohana's Auth
  *
- * @package    lnApp/Modifications
- * @subpackage Auth
- * @category   Overrides
+ * @package    OSB
+ * @category   Modifications
  * @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 Auth_ORM extends Kohana_Auth_ORM {
 	// Override Kohana Auth requirement to have a hash_key
diff --git a/application/classes/Auth/OSB.php b/application/classes/Auth/OSB.php
index 21596839..9f08bf14 100644
--- a/application/classes/Auth/OSB.php
+++ b/application/classes/Auth/OSB.php
@@ -4,11 +4,10 @@
  * OSB Auth driver.
  *
  * @package    OSB
- * @subpackage Account
- * @category   Auth
+ * @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 Auth_OSB extends Auth_ORM {
 	/**
diff --git a/application/classes/Company.php b/application/classes/Company.php
index 09e29100..21a1c338 100644
--- a/application/classes/Company.php
+++ b/application/classes/Company.php
@@ -4,10 +4,9 @@
  * This class is for access company information.
  *
  * @package    OSB
- * @subpackage Company
  * @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 Company {
diff --git a/application/classes/Config.php b/application/classes/Config.php
index e16eacee..5492eba3 100644
--- a/application/classes/Config.php
+++ b/application/classes/Config.php
@@ -1,13 +1,13 @@
 <?php defined('SYSPATH') or die('No direct access allowed.');
 
 /**
- * This class is for access system configuration.
+ * This class extends the core Kohana class by adding some core application
+ * specific functions, and configuration.
  *
  * @package    OSB
- * @subpackage Config
- * @category   Helpers
+ * @category   Modifications
  * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
+ * @copyright  (c) 2009-2013 Open Source Billing
  * @license    http://dev.osbill.net/license.html
  */
 class Config extends Kohana_Config {
@@ -82,7 +82,7 @@ class Config extends Kohana_Config {
 
 	/**
 	 * The URI to show for the login prompt.
-	 * Normally if the user is logged in, we can replace it with a user edit call, instead of login
+	 * Normally if the user is logged in, we can replace it with something else
 	 */
 	public static function login_uri() {
 		return ($ao = Auth::instance()->get_user() AND is_object($ao)) ? HTML::anchor(URL::link('user','account/edit'),$ao->name()) : HTML::anchor('login',_('Login'));
@@ -92,10 +92,10 @@ class Config extends Kohana_Config {
 		return HTML::image(static::logo_uri(),array('class'=>'headlogo','alt'=>_('Logo')));
 	}
 
-	public static function logo_uri() {
+	public static function logo_uri($protocol=NULL) {
 		list ($path,$suffix) = explode('.',static::$logo);
 
-		return URL::site(Route::get('default/media')->uri(array('file'=>$path.'.'.$suffix),array('alt'=>static::sitename())),'http');
+		return URL::site(Route::get('default/media')->uri(array('file'=>$path.'.'.$suffix),array('alt'=>static::sitename())),$protocol);
 	}
 
 	/**
@@ -136,14 +136,17 @@ class Config extends Kohana_Config {
 		return Company::instance()->site($format);
 	}
 
-	public static function sitename() {
-		return Company::instance()->name();
-	}
-
+	/**
+	 * Work out our site mode (dev,test,prod)
+	 */
 	public static function sitemode() {
 		return Company::instance()->sitemode();
 	}
 
+	public static function sitename() {
+		return Company::instance()->name();
+	}
+
 	/**
 	 * See if our emails for the template should be sent to configured admin(s)
 	 *
diff --git a/application/classes/Controller/Account.php b/application/classes/Controller/Account.php
index b822a52a..7e27cc6f 100644
--- a/application/classes/Controller/Account.php
+++ b/application/classes/Controller/Account.php
@@ -3,12 +3,11 @@
 /**
  * This class provides account management
  *
- * @package    lnApp
- * @subpackage Page/Account
+ * @package    OSB
  * @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
  * @also       [logout]
  */
 class Controller_Account extends Controller_TemplateDefault {
diff --git a/application/classes/Controller/Admin/Account.php b/application/classes/Controller/Admin/Account.php
index ede9798a..2dbb8ef7 100644
--- a/application/classes/Controller/Admin/Account.php
+++ b/application/classes/Controller/Admin/Account.php
@@ -3,12 +3,11 @@
 /**
  * This class provides Admin Account management
  *
- * @package    lnApp
- * @subpackage Page/Account
- * @category   Controllers
+ * @package    OSB
+ * @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_Account extends Controller_TemplateDefault_Admin {
 	protected $secure_actions = array(
diff --git a/application/classes/Controller/Admin/Module.php b/application/classes/Controller/Admin/Module.php
index de96aa89..b3361648 100644
--- a/application/classes/Controller/Admin/Module.php
+++ b/application/classes/Controller/Admin/Module.php
@@ -3,12 +3,11 @@
 /**
  * This class provides MODULE management
  *
- * @package    lnApp
- * @subpackage Page/Module
- * @category   Controllers
+ * @package    OSB
+ * @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_Module extends Controller_TemplateDefault_Admin {
 	protected $secure_actions = array(
diff --git a/application/classes/Controller/Admin/Module/Method.php b/application/classes/Controller/Admin/Module/Method.php
index 9bf61ddb..95fcc9d9 100644
--- a/application/classes/Controller/Admin/Module/Method.php
+++ b/application/classes/Controller/Admin/Module/Method.php
@@ -3,12 +3,11 @@
 /**
  * This class provides MODULE management
  *
- * @package    lnApp
- * @subpackage Page/Module
- * @category   Controllers
+ * @package    OSB
+ * @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_Module_Method extends Controller_Admin_Module {
 	/**
diff --git a/application/classes/Controller/Admin/Setup.php b/application/classes/Controller/Admin/Setup.php
index 07bdb6d4..df7f3017 100644
--- a/application/classes/Controller/Admin/Setup.php
+++ b/application/classes/Controller/Admin/Setup.php
@@ -3,12 +3,11 @@
 /**
  * This class provides Siet Configuration Setup
  *
- * @package    lnApp
- * @subpackage Page/Setup
- * @category   Controllers
+ * @package    OSB
+ * @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_Setup extends Controller_TemplateDefault_Admin {
 	protected $secure_actions = array(
diff --git a/application/classes/Controller/Admin/Welcome.php b/application/classes/Controller/Admin/Welcome.php
index 9acc0829..b20db8ba 100644
--- a/application/classes/Controller/Admin/Welcome.php
+++ b/application/classes/Controller/Admin/Welcome.php
@@ -4,11 +4,10 @@
  * OSB Admin Main home page
  *
  * @package    OSB
- * @subpackage Page/Home
- * @category   Controllers
+ * @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_Welcome extends Controller_TemplateDefault_Admin {
 	public $secure_actions = array(
diff --git a/application/classes/Controller/Affiliate/Account.php b/application/classes/Controller/Affiliate/Account.php
index 6df4d10e..29dd1602 100644
--- a/application/classes/Controller/Affiliate/Account.php
+++ b/application/classes/Controller/Affiliate/Account.php
@@ -4,10 +4,9 @@
  * This class provides Affiliate Account functions
  *
  * @package    OSB
- * @subpackage Account
  * @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_Account extends Controller_TemplateDefault_Affiliate {
diff --git a/application/classes/Controller/Debug.php b/application/classes/Controller/Debug.php
index fc976ed7..bf24b47c 100644
--- a/application/classes/Controller/Debug.php
+++ b/application/classes/Controller/Debug.php
@@ -1,5 +1,13 @@
 <?php defined('SYSPATH') or die('No direct access allowed.');
 
+/**
+ *
+ * @package    OSB
+ * @category   Controllers
+ * @author     Deon George
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
+*/
 class Controller_Debug extends Controller_TemplateDefault {
 	public function before() {
 		if (! in_array(Config::sitemode(),array(Kohana::DEVELOPMENT,Kohana::TESTING)))
diff --git a/application/classes/Controller/Login.php b/application/classes/Controller/Login.php
index 305f8c8f..3807c02f 100644
--- a/application/classes/Controller/Login.php
+++ b/application/classes/Controller/Login.php
@@ -1,16 +1,15 @@
 <?php defined('SYSPATH') or die('No direct access allowed.');
+
 /**
  * This class provides login capability
  *
  * @package    OSB
- * @subpackage Page/Login
  * @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
  * @also       [logout]
  */
-
 class Controller_Login extends lnApp_Controller_Login {
 	/**
 	 * Enable site registration
diff --git a/application/classes/Controller/Module.php b/application/classes/Controller/Module.php
index fccea93a..8c4829fa 100644
--- a/application/classes/Controller/Module.php
+++ b/application/classes/Controller/Module.php
@@ -3,12 +3,11 @@
 /**
  * This class provides MODULE management
  *
- * @package    lnApp
- * @subpackage Page/Module
+ * @package    OSB
  * @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_Module extends Controller_TemplateDefault {
 }
diff --git a/application/classes/Controller/TemplateDefault.php b/application/classes/Controller/TemplateDefault.php
index 32e692d7..54188ddd 100644
--- a/application/classes/Controller/TemplateDefault.php
+++ b/application/classes/Controller/TemplateDefault.php
@@ -4,11 +4,10 @@
  * This class provides the default template controller for rendering pages.
  *
  * @package    OSB
- * @subpackage Page/Template
  * @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_TemplateDefault extends lnApp_Controller_TemplateDefault {
 	public function __construct(Request $request, Response $response) {
diff --git a/application/classes/Controller/TemplateDefault/Admin.php b/application/classes/Controller/TemplateDefault/Admin.php
index f68c44ae..e5b24824 100644
--- a/application/classes/Controller/TemplateDefault/Admin.php
+++ b/application/classes/Controller/TemplateDefault/Admin.php
@@ -3,12 +3,11 @@
 /**
  * lnApp User Main home page controller
  *
- * @package    lnApp
- * @subpackage Page/Admin
- * @category   Controllers
+ * @package    OSB
+ * @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_TemplateDefault_Admin extends Controller_TemplateDefault_User {
 	protected function setup(array $config_items=array()) {
diff --git a/application/classes/Controller/TemplateDefault/Affiliate.php b/application/classes/Controller/TemplateDefault/Affiliate.php
index 5f0b41fe..ac7a18c9 100644
--- a/application/classes/Controller/TemplateDefault/Affiliate.php
+++ b/application/classes/Controller/TemplateDefault/Affiliate.php
@@ -4,11 +4,10 @@
  * OSB User Main home page controller
  *
  * @package    OSB
- * @subpackage Page/Affiliate
- * @category   Controllers
+ * @category   Controllers/Affiliate
  * @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_TemplateDefault_Affiliate extends Controller_TemplateDefault_User {
 	/**
diff --git a/application/classes/Controller/TemplateDefault/User.php b/application/classes/Controller/TemplateDefault/User.php
index ad274530..cd137ea6 100644
--- a/application/classes/Controller/TemplateDefault/User.php
+++ b/application/classes/Controller/TemplateDefault/User.php
@@ -3,12 +3,11 @@
 /**
  * lnApp User Main home page controller
  *
- * @package    lnApp
- * @subpackage Page/User
- * @category   Controllers
+ * @package    OSB
+ * @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_TemplateDefault_User extends Controller_TemplateDefault {
 	protected $auth_required = TRUE;
diff --git a/application/classes/Controller/Tree.php b/application/classes/Controller/Tree.php
index 1d9b86dd..f6e27a8b 100644
--- a/application/classes/Controller/Tree.php
+++ b/application/classes/Controller/Tree.php
@@ -3,11 +3,10 @@
 /**
  * This class extends renders OSB menu tree.
  *
- * @package    lnApp
- * @subpackage Tree
+ * @package    OSB
  * @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_Tree extends lnApp_Controller_Tree {
diff --git a/application/classes/Controller/User/Account.php b/application/classes/Controller/User/Account.php
index 7c43e560..482bd3bb 100644
--- a/application/classes/Controller/User/Account.php
+++ b/application/classes/Controller/User/Account.php
@@ -4,11 +4,10 @@
  * This class provides User Account Update functions
  *
  * @package    OSB
- * @subpackage Account
  * @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_Account extends Controller_TemplateDefault_User {
 	protected $secure_actions = array(
diff --git a/application/classes/Controller/User/Welcome.php b/application/classes/Controller/User/Welcome.php
index 34e87f27..2d202d93 100644
--- a/application/classes/Controller/User/Welcome.php
+++ b/application/classes/Controller/User/Welcome.php
@@ -3,12 +3,11 @@
 /**
  * lnApp Main home page
  *
- * @package    lnApp
- * @subpackage Page/Home
- * @category   Controllers
+ * @package    OSB
+ * @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_Welcome extends Controller_TemplateDefault_User {
 	protected $secure_actions = array(
diff --git a/application/classes/Controller/Welcome.php b/application/classes/Controller/Welcome.php
index e47a2f07..29ccdcc8 100644
--- a/application/classes/Controller/Welcome.php
+++ b/application/classes/Controller/Welcome.php
@@ -4,11 +4,10 @@
  * OSB Main home page
  *
  * @package    OSB
- * @subpackage Page/Home
  * @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_Welcome extends Controller_TemplateDefault {
 	protected $auth_required = FALSE;
diff --git a/application/classes/Cookie.php b/application/classes/Cookie.php
index 2364f9dc..e00da708 100644
--- a/application/classes/Cookie.php
+++ b/application/classes/Cookie.php
@@ -3,12 +3,11 @@
 /**
  * This class overrides Kohana's Cookie
  *
- * @package    OSB/Modifications
- * @category   Classes
+ * @package    OSB
  * @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 Cookie extends Kohana_Cookie {
 	public static $salt = 'OSB';
diff --git a/application/classes/Country.php b/application/classes/Country.php
index c22b14fb..3af63013 100644
--- a/application/classes/Country.php
+++ b/application/classes/Country.php
@@ -4,11 +4,10 @@
  * This class provides Country routines
  *
  * @package    OSB
- * @subpackage Country
  * @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 Country {
 	public static function icon($cid) {
diff --git a/application/classes/Currency.php b/application/classes/Currency.php
index 87b8a194..73cf881f 100644
--- a/application/classes/Currency.php
+++ b/application/classes/Currency.php
@@ -6,8 +6,8 @@
  * @package    OSB
  * @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 Currency {
 	public static function display($amount) {
diff --git a/application/classes/DB.php b/application/classes/DB.php
index 93db8698..2e885b4b 100644
--- a/application/classes/DB.php
+++ b/application/classes/DB.php
@@ -3,12 +3,11 @@
 /**
  * This class overrides Kohana's DB
  *
- * @package    OSB/Modifications
- * @category   Classes
- * @category   Helpers
+ * @package    OSB
+ * @category   Modifications
  * @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 DB extends Kohana_DB {
 	// Add the site_id to the delete query
diff --git a/application/classes/Database/Mysql.php b/application/classes/Database/Mysql.php
index 4cf17ba6..5b7e889f 100644
--- a/application/classes/Database/Mysql.php
+++ b/application/classes/Database/Mysql.php
@@ -6,12 +6,11 @@
  * Modified for OSB, so that ORM can use enhanced SQL queries. This has been
  * achieved by simply removing the identifier backtick.
  *
- * @package    OSB/Modifications
- * @subpackage Database
- * @category   Drivers
+ * @package    OSB
+ * @category   Modifications
  * @author     Deon George
- * @copyright  (c) 2010 Open Source Billing
- * @license    http://dev.osbill.net/license
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
  */
 class Database_MySQL extends Kohana_Database_MySQL {
 	// MySQL uses a backtick for identifiers
diff --git a/application/classes/Editor.php b/application/classes/Editor.php
index f60b2ff8..c80266b6 100644
--- a/application/classes/Editor.php
+++ b/application/classes/Editor.php
@@ -3,12 +3,11 @@
 /**
  * This class is for rendering the tinyMCE editor
  *
- * @package    lnApp
- * @subpackage Editor
+ * @package    OSB
  * @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 Editor {
 	private static $added = FALSE;
diff --git a/application/classes/Form.php b/application/classes/Form.php
index cabca21f..4b723290 100644
--- a/application/classes/Form.php
+++ b/application/classes/Form.php
@@ -3,12 +3,11 @@
 /**
  * This class overrides Kohana's Form
  *
- * @package    lnApp/Modifications
- * @category   Classes
- * @category   Helpers
+ * @package    OSB
+ * @category   Modifications
  * @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 Form extends Kohana_Form {
 	// Enable 3.0 features, default to current URI for empty Form::open()
diff --git a/application/classes/HTTP/Exception/404.php b/application/classes/HTTP/Exception/404.php
index c81b1cdf..dd898617 100644
--- a/application/classes/HTTP/Exception/404.php
+++ b/application/classes/HTTP/Exception/404.php
@@ -3,12 +3,11 @@
 /**
  * This class overrides Kohana's 404 Exception
  *
- * @package    lnApp/Modifications
- * @category   Classes
+ * @package    OSB
  * @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 HTTP_Exception_404 extends Kohana_HTTP_Exception_404 {
 	public function get_response() {
diff --git a/application/classes/Kohana.php b/application/classes/Kohana.php
index 05bae198..74b52840 100644
--- a/application/classes/Kohana.php
+++ b/application/classes/Kohana.php
@@ -3,12 +3,11 @@
 /**
  * This class overrides Kohana's Core
  *
- * @package    OSB/Modifications
- * @category   Classes
- * @category   Helpers
+ * @package    OSB
+ * @category   Modifications
  * @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 Kohana extends Kohana_Core {
 	/**
diff --git a/application/classes/Minion/Task.php b/application/classes/Minion/Task.php
index 789a02a1..b2b102d1 100644
--- a/application/classes/Minion/Task.php
+++ b/application/classes/Minion/Task.php
@@ -3,12 +3,11 @@
 /**
  * This class overrides Kohana's Minion CLI Module
  *
- * @package    OSB/Modifications
- * @category   Classes
+ * @package    OSB
  * @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
  */
 abstract class Minion_Task extends Kohana_Minion_Task {
 	protected $_options = array(
diff --git a/application/classes/Model/Account.php b/application/classes/Model/Account.php
index bdfe4e43..8c48bf22 100644
--- a/application/classes/Model/Account.php
+++ b/application/classes/Model/Account.php
@@ -1,12 +1,12 @@
 <?php defined('SYSPATH') or die('No direct access allowed.');
 
 /**
- * @package    lnApp
- * @subpackage Auth
+ *
+ * @package    OSB
  * @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_Account extends Model_Auth_UserDefault {
 	// Relationships
diff --git a/application/classes/Model/Account/Log.php b/application/classes/Model/Account/Log.php
index 498d993e..b4b909c2 100644
--- a/application/classes/Model/Account/Log.php
+++ b/application/classes/Model/Account/Log.php
@@ -4,10 +4,9 @@
  * This class supports Account Login Logging
  *
  * @package    OSB
- * @subpackage Account
  * @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_Account_Log extends ORM_OSB {
diff --git a/application/classes/Model/Affiliate.php b/application/classes/Model/Affiliate.php
index bca497f3..eaf6c0a2 100644
--- a/application/classes/Model/Affiliate.php
+++ b/application/classes/Model/Affiliate.php
@@ -4,11 +4,10 @@
  * OSB Affiliate
  *
  * @package    OSB
- * @subpackage Modules
  * @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_Affiliate extends ORM_OSB {
 }
diff --git a/application/classes/Model/Auth/RoleDefault.php b/application/classes/Model/Auth/RoleDefault.php
index fa357f32..57d29408 100644
--- a/application/classes/Model/Auth/RoleDefault.php
+++ b/application/classes/Model/Auth/RoleDefault.php
@@ -1,12 +1,12 @@
 <?php defined('SYSPATH') or die('No direct access allowed.');
 
 /**
- * @package    lnApp
- * @subpackage Auth
+ *
+ * @package    OSB
  * @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_Auth_RoleDefault extends Model_Auth_Role {
 }
diff --git a/application/classes/Model/Auth/UserDefault.php b/application/classes/Model/Auth/UserDefault.php
index b6aa1521..7ebbc53e 100644
--- a/application/classes/Model/Auth/UserDefault.php
+++ b/application/classes/Model/Auth/UserDefault.php
@@ -1,12 +1,12 @@
 <?php defined('SYSPATH') or die('No direct access allowed.');
 
 /**
+ *
  * @package    OSB
- * @subpackage Auth
  * @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_Auth_UserDefault extends Model_Auth_User {
 	// Validation rules
diff --git a/application/classes/Model/Country.php b/application/classes/Model/Country.php
index 52cd7ea0..0ea2d2bd 100644
--- a/application/classes/Model/Country.php
+++ b/application/classes/Model/Country.php
@@ -4,11 +4,10 @@
  * OSB Country Model
  *
  * @package    OSB
- * @subpackage Modules
  * @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_Country extends ORM_OSB {
 	public function currency() {
diff --git a/application/classes/Model/Currency.php b/application/classes/Model/Currency.php
index fcb102e8..8248ecce 100644
--- a/application/classes/Model/Currency.php
+++ b/application/classes/Model/Currency.php
@@ -4,11 +4,10 @@
  * OSB Currency Model
  *
  * @package    OSB
- * @subpackage Modules
  * @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_Currency extends ORM_OSB {
 }
diff --git a/application/classes/Model/Group.php b/application/classes/Model/Group.php
index 64788183..f6ef0656 100644
--- a/application/classes/Model/Group.php
+++ b/application/classes/Model/Group.php
@@ -1,12 +1,12 @@
 <?php defined('SYSPATH') or die('No direct access allowed.');
 
 /**
- * @package    lnApp
- * @subpackage Auth
+ *
+ * @package    OSB
  * @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_Group extends Model_Auth_RoleDefault {
 	// Relationships
diff --git a/application/classes/Model/Group/Method.php b/application/classes/Model/Group/Method.php
index 0c63e3f2..1db20700 100644
--- a/application/classes/Model/Group/Method.php
+++ b/application/classes/Model/Group/Method.php
@@ -4,11 +4,10 @@
  * OSB Application Module Method Model
  *
  * @package    OSB
- * @subpackage Modules
  * @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_Group_Method extends ORM_OSB {
 	// Relationships
diff --git a/application/classes/Model/Language.php b/application/classes/Model/Language.php
index 5b469a9b..22d28446 100644
--- a/application/classes/Model/Language.php
+++ b/application/classes/Model/Language.php
@@ -4,11 +4,10 @@
  * OSB Language Model
  *
  * @package    OSB
- * @subpackage Modules
  * @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_Language extends ORM_OSB {
 	protected $_form = array('id'=>'id','value'=>'name');
diff --git a/application/classes/Model/Module.php b/application/classes/Model/Module.php
index b999d7a9..4a7a223f 100644
--- a/application/classes/Model/Module.php
+++ b/application/classes/Model/Module.php
@@ -7,11 +7,10 @@
  * OSB initialisation.
  *
  * @package    OSB
- * @subpackage Modules
  * @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_Module extends ORM_OSB {
 	// Relationships
diff --git a/application/classes/Model/Module/Method.php b/application/classes/Model/Module/Method.php
index 932a2127..1124aa4e 100644
--- a/application/classes/Model/Module/Method.php
+++ b/application/classes/Model/Module/Method.php
@@ -4,11 +4,10 @@
  * OSB Application Module Method Model
  *
  * @package    OSB
- * @subpackage Modules
  * @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_Module_Method extends ORM_OSB {
 	// Relationships
diff --git a/application/classes/Model/Module/Method/Token.php b/application/classes/Model/Module/Method/Token.php
index 749feaa9..dc47f564 100644
--- a/application/classes/Model/Module/Method/Token.php
+++ b/application/classes/Model/Module/Method/Token.php
@@ -4,11 +4,10 @@
  * OSB Application Module Method Token Model
  *
  * @package    OSB
- * @subpackage Modules
  * @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_Module_Method_Token extends ORM_OSB {
 	// Relationships
diff --git a/application/classes/Model/Record/Id.php b/application/classes/Model/Record/Id.php
index b502b67e..f2819415 100644
--- a/application/classes/Model/Record/Id.php
+++ b/application/classes/Model/Record/Id.php
@@ -1,12 +1,12 @@
 <?php defined('SYSPATH') or die('No direct access allowed.');
 
 /**
+ *
  * @package    OSB
- * @subpackage Modules
  * @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_Record_Id extends ORM_OSB {
 	protected $_primary_key = 'module_id';
diff --git a/application/classes/Model/Setup.php b/application/classes/Model/Setup.php
index 0d64273c..f8938aee 100644
--- a/application/classes/Model/Setup.php
+++ b/application/classes/Model/Setup.php
@@ -7,11 +7,10 @@
  * OSB initialisation.
  *
  * @package    OSB
- * @subpackage Modules
  * @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_Setup extends ORM_OSB {
 	// Setup doesnt use the update column
diff --git a/application/classes/ORM.php b/application/classes/ORM.php
index 38a7d7d5..fd9ff97d 100644
--- a/application/classes/ORM.php
+++ b/application/classes/ORM.php
@@ -3,12 +3,11 @@
 /**
  * This class overrides Kohana's ORM
  *
- * @package    OSB/Modifications
- * @category   Classes
- * @category   Helpers
+ * @package    OSB
+ * @category   Modifications
  * @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
  *
  * This file contains enhancements for Kohana, that should be considered upstream and maybe havent been yet.
  * It also contains some functionality for OSB, which cannot be covered in ORM_OSB.
diff --git a/application/classes/ORM/OSB.php b/application/classes/ORM/OSB.php
index 24e51983..5ee02fe2 100644
--- a/application/classes/ORM/OSB.php
+++ b/application/classes/ORM/OSB.php
@@ -4,10 +4,9 @@
  * This class extends Kohana's [ORM] class to create defaults for OSB.
  *
  * @package    OSB
- * @subpackage Core
- * @category   ORM
+ * @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 ORM_OSB extends ORM {
diff --git a/application/classes/Period.php b/application/classes/Period.php
index 00f9d5a0..13f8aae9 100644
--- a/application/classes/Period.php
+++ b/application/classes/Period.php
@@ -4,11 +4,10 @@
  * This is class is for calculating date periods.
  *
  * @package    OSB
- * @subpackage Utilities
  * @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 Period {
 	/**
diff --git a/application/classes/Request.php b/application/classes/Request.php
index 2d0b0586..48910874 100644
--- a/application/classes/Request.php
+++ b/application/classes/Request.php
@@ -4,11 +4,11 @@
  * Request. Uses the [Route] class to determine what
  * [Controller] to send the request to.
  *
- * @package    lnApp/Modifications
- * @category   Classes
+ * @package    OSB
+ * @category   Modifications
  * @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 Request extends Kohana_Request {
 	/**
diff --git a/application/classes/Response.php b/application/classes/Response.php
index 62f0e8c5..731d23b6 100644
--- a/application/classes/Response.php
+++ b/application/classes/Response.php
@@ -3,12 +3,11 @@
 /**
  * This class overrides Kohana's Response
  *
- * @package    lnApp/Modifications
- * @category   Classes
- * @category   Helpers
+ * @package    OSB
+ * @category   Modifications
  * @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 Response extends Kohana_Response {
 	// Append to the body.
diff --git a/application/classes/StaticList.php b/application/classes/StaticList.php
index 6acc55b9..d22700f8 100644
--- a/application/classes/StaticList.php
+++ b/application/classes/StaticList.php
@@ -4,11 +4,10 @@
  * This is class renders standard lists and their values
  *
  * @package    OSB
- * @subpackage Utilities
  * @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
  */
 abstract class StaticList {
 	// This is our list of items that will be rendered
diff --git a/application/classes/StaticList/Module.php b/application/classes/StaticList/Module.php
index c6541ef6..36e92491 100644
--- a/application/classes/StaticList/Module.php
+++ b/application/classes/StaticList/Module.php
@@ -4,11 +4,10 @@
  * This is class renders responses and forms based on the values from a module.
  *
  * @package    OSB
- * @subpackage Utilities
  * @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 StaticList_Module extends StaticListModule {
 	protected function table($module=NULL) {
diff --git a/application/classes/StaticList/PriceType.php b/application/classes/StaticList/PriceType.php
index db981351..9c903af0 100644
--- a/application/classes/StaticList/PriceType.php
+++ b/application/classes/StaticList/PriceType.php
@@ -4,11 +4,10 @@
  * This is class renders Price Type responses and forms.
  *
  * @package    OSB
- * @subpackage Utilities
  * @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 StaticList_PriceType extends StaticList {
 	protected function table() {
diff --git a/application/classes/StaticList/RecurSchedule.php b/application/classes/StaticList/RecurSchedule.php
index 8a38469c..cb613ef1 100644
--- a/application/classes/StaticList/RecurSchedule.php
+++ b/application/classes/StaticList/RecurSchedule.php
@@ -4,11 +4,10 @@
  * This is class renders Recurring Schedule Times on responses and forms.
  *
  * @package    OSB
- * @subpackage Utilities
  * @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 StaticList_RecurSchedule extends StaticList {
 	protected function table() {
diff --git a/application/classes/StaticList/RecurType.php b/application/classes/StaticList/RecurType.php
index 8982629b..cad3a14f 100644
--- a/application/classes/StaticList/RecurType.php
+++ b/application/classes/StaticList/RecurType.php
@@ -4,11 +4,10 @@
  * This is class renders Recurring Schedule Types on responses and forms.
  *
  * @package    OSB
- * @subpackage Utilities
  * @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 StaticList_RecurType extends StaticList {
 	protected function table() {
diff --git a/application/classes/StaticList/SweepType.php b/application/classes/StaticList/SweepType.php
index d2d8244a..e35c079b 100644
--- a/application/classes/StaticList/SweepType.php
+++ b/application/classes/StaticList/SweepType.php
@@ -4,11 +4,10 @@
  * This is class renders Charge Sweep Types on responses and forms.
  *
  * @package    OSB
- * @subpackage Utilities
  * @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 StaticList_SweepType extends StaticList {
 	protected function table() {
diff --git a/application/classes/StaticList/Title.php b/application/classes/StaticList/Title.php
index 38786475..0324ee6f 100644
--- a/application/classes/StaticList/Title.php
+++ b/application/classes/StaticList/Title.php
@@ -4,11 +4,10 @@
  * This is class renders Person Title responses and forms.
  *
  * @package    OSB
- * @subpackage Utilities
  * @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 StaticList_Title extends StaticList {
 	protected function table() {
diff --git a/application/classes/StaticList/YesNo.php b/application/classes/StaticList/YesNo.php
index 9422a58b..e43bb413 100644
--- a/application/classes/StaticList/YesNo.php
+++ b/application/classes/StaticList/YesNo.php
@@ -4,11 +4,10 @@
  * This is class renders Yes/No responses and forms.
  *
  * @package    OSB
- * @subpackage Utilities
  * @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 StaticList_YesNo extends StaticList {
 	protected function table() {
diff --git a/application/classes/StaticListModule.php b/application/classes/StaticListModule.php
index 2bcb3791..d8f15b2a 100644
--- a/application/classes/StaticListModule.php
+++ b/application/classes/StaticListModule.php
@@ -4,11 +4,10 @@
  * This is class is renders standard values based on DB table row values.
  *
  * @package    OSB
- * @subpackage Utilities
  * @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
  */
 abstract class StaticListModule extends StaticList {
 	protected static $record = array();
diff --git a/application/classes/Task.php b/application/classes/Task.php
index 8243efc9..760204c9 100644
--- a/application/classes/Task.php
+++ b/application/classes/Task.php
@@ -3,12 +3,11 @@
 /**
  * This class extends Minions Tasks to require the site option
  *
- * @package    OSB/Modifications
- * @category   Classes
+ * @package    OSB
  * @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
  */
 abstract class Task extends Minion_Task {
 	protected $_options = array(
diff --git a/application/classes/URL.php b/application/classes/URL.php
index 8ef0b9c8..f7fb0a69 100644
--- a/application/classes/URL.php
+++ b/application/classes/URL.php
@@ -3,12 +3,11 @@
 /**
  * This class overrides Kohana's URL
  *
- * @package    OSB/Modifications
- * @category   Classes
- * @category   Helpers
+ * @package    OSB
+ * @category   Modifications
  * @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 URL extends Kohana_URL {
 	// Our method paths for different functions
diff --git a/application/classes/Valid.php b/application/classes/Valid.php
index ba42a612..66b7392b 100644
--- a/application/classes/Valid.php
+++ b/application/classes/Valid.php
@@ -3,11 +3,11 @@
 /**
  * Array and variable validation.
  *
- * @package    lnApp/Modifications
- * @category   Classes
+ * @package    OSB
+ * @category   Modifications
  * @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 Valid extends Kohana_Valid {
 	/**
diff --git a/application/classes/XML.php b/application/classes/XML.php
index 1035f0a4..e6ddff62 100644
--- a/application/classes/XML.php
+++ b/application/classes/XML.php
@@ -1,13 +1,13 @@
 <?php defined('SYSPATH') or die('No direct access allowed.');
+
 /**
  * This class extends the Kohana XML
  *
  * @package    OSB
- * @subpackage XML
- * @category   XML
+ * @category   Modifications
  * @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 XML extends XML_Core {
 	/**
diff --git a/modules/adsl/classes/ADSL.php b/modules/adsl/classes/ADSL.php
index 02898e11..d015ae81 100644
--- 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
diff --git a/modules/adsl/classes/Model/Adsl/Plan.php b/modules/adsl/classes/Model/Adsl/Plan.php
index e7169ac0..fa8c4510 100644
--- 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 {
diff --git a/modules/adsl/classes/Model/Adsl/Supplier.php b/modules/adsl/classes/Model/Adsl/Supplier.php
index 4bdb7b49..ce812da2 100644
--- 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 {
diff --git a/modules/adsl/classes/Model/Adsl/Supplier/Plan.php b/modules/adsl/classes/Model/Adsl/Supplier/Plan.php
index 4a3cdace..f22de340 100644
--- 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 {
diff --git a/modules/adsl/classes/Model/Product/Plugin/ADSL.php b/modules/adsl/classes/Model/Product/Plugin/ADSL.php
index 963c9068..2b285cb1 100644
--- 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 {
diff --git a/modules/adsl/classes/Model/Service/Plugin/Adsl.php b/modules/adsl/classes/Model/Service/Plugin/Adsl.php
index 747a42ae..c11eb31b 100644
--- 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 {
diff --git a/modules/adsl/classes/Model/Service/Plugin/Adsl/Traffic.php b/modules/adsl/classes/Model/Service/Plugin/Adsl/Traffic.php
index 731815a6..bce0028b 100644
--- 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 {
diff --git a/modules/adsl/classes/Service/Traffic/Adsl.php b/modules/adsl/classes/Service/Traffic/Adsl.php
index a7a0dc4d..6c2affa3 100644
--- 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;
diff --git a/modules/adsl/classes/Service/Traffic/Adsl/Exetelhspa.php b/modules/adsl/classes/Service/Traffic/Adsl/Exetelhspa.php
index 0f50177b..b7a1ee18 100644
--- 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 {
diff --git a/modules/adsl/classes/Service/Traffic/Adsl/Exetelpe.php b/modules/adsl/classes/Service/Traffic/Adsl/Exetelpe.php
index bdf5f980..7ccd42b1 100644
--- 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 {
diff --git a/modules/adsl/classes/Service/Traffic/Adsl/Exetelvisp.php b/modules/adsl/classes/Service/Traffic/Adsl/Exetelvisp.php
index 3dacd8ff..cda95b4a 100644
--- 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 {
diff --git a/modules/adsl/classes/Service/Traffic/Adsl/PeopleAgent.php b/modules/adsl/classes/Service/Traffic/Adsl/PeopleAgent.php
index 078ef276..61090b02 100644
--- 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 {
diff --git a/modules/adsl/classes/Service/Traffic/Adsl/iiNetADSL.php b/modules/adsl/classes/Service/Traffic/Adsl/iiNetADSL.php
index d60d271a..ca448c9c 100644
--- 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 {
diff --git a/modules/affiliate/classes/Model/Affiliate.php b/modules/affiliate/classes/Model/Affiliate.php
index 9fb257ad..f5924c48 100644
--- 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 {
diff --git a/modules/cart/classes/Cart.php b/modules/cart/classes/Cart.php
index 816ea108..b8f14bb2 100644
--- 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;
diff --git a/modules/cart/classes/Cart/Item.php b/modules/cart/classes/Cart/Item.php
index 92e6666d..9b2aee41 100644
--- 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
diff --git a/modules/cart/classes/Cartable.php b/modules/cart/classes/Cartable.php
index 1d930154..ab9b2e2d 100644
--- 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.
diff --git a/modules/cart/classes/Controller/Cart.php b/modules/cart/classes/Controller/Cart.php
index 9078b687..5dff9205 100644
--- 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 {
 	/**
diff --git a/modules/cart/classes/Model/Cart.php b/modules/cart/classes/Model/Cart.php
index 3bed881d..d149c935 100644
--- 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 {
diff --git a/modules/charge/classes/Controller/Admin/Charge.php b/modules/charge/classes/Controller/Admin/Charge.php
index dcbbd17f..007ab57b 100644
--- 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 {
diff --git a/modules/charge/classes/Model/Charge.php b/modules/charge/classes/Model/Charge.php
index 9d9560cc..8301484c 100644
--- 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 {
diff --git a/modules/checkout/classes/Checkout/Plugin.php b/modules/checkout/classes/Checkout/Plugin.php
index ce1e9d56..3b85bab6 100644
--- 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 {
diff --git a/modules/checkout/classes/Checkout/Plugin/Paypal.php b/modules/checkout/classes/Checkout/Plugin/Paypal.php
index 37c68b13..cea00c61 100644
--- 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';
diff --git a/modules/checkout/classes/Checkout/Plugin/Paypal/Cart.php b/modules/checkout/classes/Checkout/Plugin/Paypal/Cart.php
index 67b0fc7e..b0c544cd 100644
--- 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;
diff --git a/modules/checkout/classes/Controller/Checkout.php b/modules/checkout/classes/Controller/Checkout.php
index 883a1fe8..33dbbf3c 100644
--- 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 {
diff --git a/modules/checkout/classes/Model/Checkout.php b/modules/checkout/classes/Model/Checkout.php
index f357d241..41c730b2 100644
--- 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 {
diff --git a/modules/checkout/classes/Model/Checkout/Notify.php b/modules/checkout/classes/Model/Checkout/Notify.php
index 8b49600a..9b1130f3 100644
--- 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 {
diff --git a/modules/domain/classes/Domain.php b/modules/domain/classes/Domain.php
index 564ca452..72fdd190 100644
--- 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 {
 	/**
diff --git a/modules/domain/classes/Model/Domain/Registrar.php b/modules/domain/classes/Model/Domain/Registrar.php
index 81037f65..a1b0e57c 100644
--- 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 {
diff --git a/modules/domain/classes/Model/Domain/TLD.php b/modules/domain/classes/Model/Domain/TLD.php
index adbeefc6..566c3c11 100644
--- 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 {
diff --git a/modules/domain/classes/Model/Product/Plugin/DOMAIN.php b/modules/domain/classes/Model/Product/Plugin/DOMAIN.php
index 71b90803..098ee72d 100644
--- 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 {
diff --git a/modules/domain/classes/Model/Service/Plugin/Domain.php b/modules/domain/classes/Model/Service/Plugin/Domain.php
index af43d699..99632f87 100644
--- 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 {
diff --git a/modules/domain/classes/Service/Domain.php b/modules/domain/classes/Service/Domain.php
index 49007fed..4599c192 100644
--- 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;
diff --git a/modules/domain/classes/Service/Domain/Manual.php b/modules/domain/classes/Service/Domain/Manual.php
index f74b37ee..172b1834 100644
--- 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 {
diff --git a/modules/domain/classes/Service/Domain/PlanetDomain.php b/modules/domain/classes/Service/Domain/PlanetDomain.php
index 55ffb97e..685fddc3 100644
--- 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 {
diff --git a/modules/domain/classes/Service/Domain/TPP.php b/modules/domain/classes/Service/Domain/TPP.php
index 96a723cb..970873ac 100644
--- 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 {
diff --git a/modules/email/classes/Controller/Admin/Email.php b/modules/email/classes/Controller/Admin/Email.php
index ca4dd42f..1d227580 100644
--- 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(
diff --git a/modules/email/classes/Controller/Email.php b/modules/email/classes/Controller/Email.php
index fc852b44..ec3f6a37 100644
--- 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 {
 }
diff --git a/modules/email/classes/Controller/Email/Template.php b/modules/email/classes/Controller/Email/Template.php
index cdb86751..d2c602a1 100644
--- 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 {
 }
diff --git a/modules/email/classes/Controller/User/Email.php b/modules/email/classes/Controller/User/Email.php
index 905c352e..79ec996d 100644
--- 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(
diff --git a/modules/email/classes/Email/Template.php b/modules/email/classes/Email/Template.php
index 18b6c474..be8033e5 100644
--- 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
diff --git a/modules/email/classes/Model/Email/Log.php b/modules/email/classes/Model/Email/Log.php
index e0bffc24..0afcc984 100644
--- 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 {
diff --git a/modules/email/classes/Model/Email/Template.php b/modules/email/classes/Model/Email/Template.php
index 6d5a1a42..5e71495c 100644
--- 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(
diff --git a/modules/email/classes/Model/Email/Template/Translate.php b/modules/email/classes/Model/Email/Template/Translate.php
index 2908962c..c919353a 100644
--- 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
diff --git a/modules/export/classes/Controller/Admin/Export.php b/modules/export/classes/Controller/Admin/Export.php
index 51a6cea6..a175989d 100644
--- 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 {
diff --git a/modules/export/classes/Controller/Affiliate/Export.php b/modules/export/classes/Controller/Affiliate/Export.php
index af12c848..138f8539 100644
--- 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 {
diff --git a/modules/export/classes/Controller/Export.php b/modules/export/classes/Controller/Export.php
index bacc9c68..272d50aa 100644
--- 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 {
 }
diff --git a/modules/export/classes/Export.php b/modules/export/classes/Export.php
index ca2fbfc9..ed702b26 100644
--- 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 {
diff --git a/modules/export/classes/Export/Quicken.php b/modules/export/classes/Export/Quicken.php
index 2f2970d8..c192f76b 100644
--- 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 {
diff --git a/modules/export/classes/Model/Export.php b/modules/export/classes/Model/Export.php
index b8f5aec4..40a9abf7 100644
--- 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 {
diff --git a/modules/export/classes/OSBExport.php b/modules/export/classes/OSBExport.php
index 8da23593..5da44eda 100644
--- 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 {
diff --git a/modules/export/classes/Quicken.php b/modules/export/classes/Quicken.php
index a9311752..84f829c8 100644
--- 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 {
diff --git a/modules/export/classes/Quicken/Invoice.php b/modules/export/classes/Quicken/Invoice.php
index 82675e35..d6a21c84 100644
--- 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 {
diff --git a/modules/export/classes/Quicken/InvoiceItem.php b/modules/export/classes/Quicken/InvoiceItem.php
index 7fe00481..52855296 100644
--- 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 {
diff --git a/modules/export/classes/Quicken/Payment.php b/modules/export/classes/Quicken/Payment.php
index 255a9ec4..e77a8d21 100644
--- 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 {
diff --git a/modules/gchart/classes/GoogleChart.php b/modules/gchart/classes/GoogleChart.php
index 3353f769..3fade99c 100644
--- 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 {
diff --git a/modules/gchart/classes/GoogleChart/ComboChart.php b/modules/gchart/classes/GoogleChart/ComboChart.php
index 56675b9d..cf42c9aa 100644
--- 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 {
diff --git a/modules/gchart/classes/GoogleChart/Legacy.php b/modules/gchart/classes/GoogleChart/Legacy.php
index 0ad104db..58bbb93b 100644
--- 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 {
diff --git a/modules/host/classes/Controller/Admin/Host.php b/modules/host/classes/Controller/Admin/Host.php
index ad7d0cec..8fe3f18f 100644
--- 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(
diff --git a/modules/host/classes/Controller/Task/Host.php b/modules/host/classes/Controller/Task/Host.php
index 16ff68de..cb68e64e 100644
--- 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
diff --git a/modules/host/classes/Host/Plugin.php b/modules/host/classes/Host/Plugin.php
index f9b55870..20c06ed7 100644
--- 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
diff --git a/modules/host/classes/Host/Plugin/Plesk.php b/modules/host/classes/Host/Plugin/Plesk.php
index 7b06d4b1..bceea77e 100644
--- 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
diff --git a/modules/host/classes/Host/Plugin/Plesk/10.php b/modules/host/classes/Host/Plugin/Plesk/10.php
index 61454f48..be7cf4f8 100644
--- 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';
diff --git a/modules/host/classes/Host/Plugin/Plesk/9.php b/modules/host/classes/Host/Plugin/Plesk/9.php
index cffcfbff..9b6f7b39 100644
--- 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';
diff --git a/modules/host/classes/Model/Host/Server.php b/modules/host/classes/Model/Host/Server.php
index 4bdbcd84..f594cb18 100644
--- 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 {
diff --git a/modules/host/classes/Model/Host/Server/Affiliate.php b/modules/host/classes/Model/Host/Server/Affiliate.php
index 63297ca4..a61b5590 100644
--- 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 {
diff --git a/modules/host/classes/Model/Product/Plugin/HOST.php b/modules/host/classes/Model/Product/Plugin/Host.php
similarity index 76%
rename from modules/host/classes/Model/Product/Plugin/HOST.php
rename to modules/host/classes/Model/Product/Plugin/Host.php
index 827dfa6d..fe31feca 100644
--- 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() {
 	}
diff --git a/modules/host/classes/Model/Service/Plugin/Host.php b/modules/host/classes/Model/Service/Plugin/Host.php
index 03de0afa..29169af2 100644
--- 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 {
diff --git a/modules/invoice/classes/Controller/Admin/Invoice.php b/modules/invoice/classes/Controller/Admin/Invoice.php
index 665263c5..4dbcfef5 100644
--- 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:
diff --git a/modules/invoice/classes/Controller/Invoice.php b/modules/invoice/classes/Controller/Invoice.php
index e75a7c45..283bf025 100644
--- 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 {
diff --git a/modules/invoice/classes/Controller/Task/Invoice.php b/modules/invoice/classes/Controller/Task/Invoice.php
index 366adb4f..21b30075 100644
--- 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 {
diff --git a/modules/invoice/classes/Controller/User/Invoice.php b/modules/invoice/classes/Controller/User/Invoice.php
index 11695022..96095b78 100644
--- 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(
diff --git a/modules/invoice/classes/Invoice.php b/modules/invoice/classes/Invoice.php
index 69356b04..377dfc89 100644
--- 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
diff --git a/modules/invoice/classes/Invoice/TCPDF.php b/modules/invoice/classes/Invoice/TCPDF.php
index 5575fb0b..7859879f 100644
--- 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;
diff --git a/modules/invoice/classes/Invoice/TCPDF/Default.php b/modules/invoice/classes/Invoice/TCPDF/Default.php
index 0b00df2b..714c044e 100644
--- 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
diff --git a/modules/invoice/classes/Model/Invoice.php b/modules/invoice/classes/Model/Invoice.php
index 8e54da6c..675036a3 100644
--- 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 {
diff --git a/modules/invoice/classes/Model/Invoice/Item.php b/modules/invoice/classes/Model/Invoice/Item.php
index 7ebba19a..2835a9f9 100644
--- 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 {
diff --git a/modules/invoice/classes/Task/Invoice/Complete.php b/modules/invoice/classes/Task/Invoice/Complete.php
index e2b2e929..17f77c60 100644
--- 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 {
diff --git a/modules/lnApp/classes/lnApp/Block.php b/modules/lnApp/classes/lnApp/Block.php
index ea72d15d..55697969 100644
--- 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
  */
diff --git a/modules/lnApp/classes/lnApp/Block/Sub.php b/modules/lnApp/classes/lnApp/Block/Sub.php
index 4b02a6b8..bb038681 100644
--- 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
  */
diff --git a/modules/lnApp/classes/lnApp/BreadCrumb.php b/modules/lnApp/classes/lnApp/BreadCrumb.php
index 8671b636..d6ed3dec 100644
--- 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 {
diff --git a/modules/lnApp/classes/lnApp/Controller/Default.php b/modules/lnApp/classes/lnApp/Controller/Default.php
index 350e87b2..d988e658 100644
--- 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 {
diff --git a/modules/lnApp/classes/lnApp/Controller/Login.php b/modules/lnApp/classes/lnApp/Controller/Login.php
index 7cfad68b..eacb2a55 100644
--- 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]
  */
diff --git a/modules/lnApp/classes/lnApp/Controller/Logout.php b/modules/lnApp/classes/lnApp/Controller/Logout.php
index f67cdd1b..f9b094e7 100644
--- 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]
  */
diff --git a/modules/lnApp/classes/lnApp/Controller/Media.php b/modules/lnApp/classes/lnApp/Controller/Media.php
index 9503b00c..f9ecda82 100644
--- 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 {
diff --git a/modules/lnApp/classes/lnApp/Controller/Task.php b/modules/lnApp/classes/lnApp/Controller/Task.php
index e644b6bd..825af8d6 100644
--- 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 {
diff --git a/modules/lnApp/classes/lnApp/Controller/TemplateDefault.php b/modules/lnApp/classes/lnApp/Controller/TemplateDefault.php
index 25664736..56d443b9 100644
--- 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
diff --git a/modules/lnApp/classes/lnApp/Controller/Tree.php b/modules/lnApp/classes/lnApp/Controller/Tree.php
index 7da7b56b..85cd554b 100644
--- 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 {
 	/**
diff --git a/modules/lnApp/classes/lnApp/HTML.php b/modules/lnApp/classes/lnApp/HTML.php
index e69effdf..920eda58 100644
--- 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 {
diff --git a/modules/lnApp/classes/lnApp/HTMLRender.php b/modules/lnApp/classes/lnApp/HTMLRender.php
index 325c2038..fb3e897d 100644
--- 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 {
diff --git a/modules/lnApp/classes/lnApp/HeadImages.php b/modules/lnApp/classes/lnApp/HeadImages.php
index 37595eb4..26c8199d 100644
--- 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 {
diff --git a/modules/lnApp/classes/lnApp/Meta.php b/modules/lnApp/classes/lnApp/Meta.php
index fe554b44..36df8563 100644
--- 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 {
diff --git a/modules/lnApp/classes/lnApp/PWgen.php b/modules/lnApp/classes/lnApp/PWgen.php
index c6c4862b..d6390b07 100644
--- 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 {
diff --git a/modules/lnApp/classes/lnApp/Random.php b/modules/lnApp/classes/lnApp/Random.php
index 3e0fa1ce..47aa6b2b 100644
--- 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 {
diff --git a/modules/lnApp/classes/lnApp/Script.php b/modules/lnApp/classes/lnApp/Script.php
index 696774bf..301bba7d 100644
--- 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 {
diff --git a/modules/lnApp/classes/lnApp/Sort.php b/modules/lnApp/classes/lnApp/Sort.php
index 051f0e1f..4edef527 100644
--- 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
  */
diff --git a/modules/lnApp/classes/lnApp/Style.php b/modules/lnApp/classes/lnApp/Style.php
index 48c00744..150e90bd 100644
--- 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 {
diff --git a/modules/lnApp/classes/lnApp/SystemMessage.php b/modules/lnApp/classes/lnApp/SystemMessage.php
index d92fa9b7..5f827c4b 100644
--- 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 {
diff --git a/modules/lnApp/classes/lnApp/Table.php b/modules/lnApp/classes/lnApp/Table.php
index ca9017e4..9fd92a7c 100644
--- 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
  */
diff --git a/modules/payment/classes/Controller/Admin/Payment.php b/modules/payment/classes/Controller/Admin/Payment.php
index 9b3650e7..27c77cb6 100644
--- 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 {
diff --git a/modules/payment/classes/Controller/Payment.php b/modules/payment/classes/Controller/Payment.php
index e930dca4..ad224729 100644
--- a/modules/payment/classes/Controller/Payment.php
+++ b/modules/payment/classes/Controller/Payment.php
@@ -3,12 +3,11 @@
 /**
  * This class provides payment management
  *
- * @package    lnApp
- * @subpackage Page/Payment
+ * @package    Payment
  * @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_Payment extends Controller_TemplateDefault {
 }
diff --git a/modules/payment/classes/Controller/User/Payment.php b/modules/payment/classes/Controller/User/Payment.php
index 8be87b10..a1859bbe 100644
--- a/modules/payment/classes/Controller/User/Payment.php
+++ b/modules/payment/classes/Controller/User/Payment.php
@@ -3,12 +3,11 @@
 /**
  * This class provides User Payment functions
  *
- * @package    OSB
- * @subpackage Payment
+ * @package    Payment
  * @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_Payment extends Controller_TemplateDefault_User {
 	protected $secure_actions = array(
diff --git a/modules/payment/classes/Model/Payment.php b/modules/payment/classes/Model/Payment.php
index a509e5bb..cebff03c 100644
--- a/modules/payment/classes/Model/Payment.php
+++ b/modules/payment/classes/Model/Payment.php
@@ -3,11 +3,10 @@
 /**
  * This class supports OSB payments.
  *
- * @package    OSB
- * @subpackage Payment
+ * @package    Payment
  * @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_Payment extends ORM_OSB {
diff --git a/modules/payment/classes/Model/Payment/Item.php b/modules/payment/classes/Model/Payment/Item.php
index 31071c42..b1255b00 100644
--- a/modules/payment/classes/Model/Payment/Item.php
+++ b/modules/payment/classes/Model/Payment/Item.php
@@ -3,11 +3,10 @@
 /**
  * This class supports OSB exporting by rending the exportable items.
  *
- * @package    OSB
- * @subpackage Export
+ * @package    Payment
  * @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_Payment_Item extends ORM_OSB {
diff --git a/modules/payment/classes/Payment/Bulk/Ezypay.php b/modules/payment/classes/Payment/Bulk/Ezypay.php
index 4fe66ffb..c8b1f648 100644
--- a/modules/payment/classes/Payment/Bulk/Ezypay.php
+++ b/modules/payment/classes/Payment/Bulk/Ezypay.php
@@ -3,11 +3,10 @@
 /**
  * This class is for processing Ezypay payments.
  *
- * @package    Payment/Ezypay
- * @subpackage System
+ * @package    Payment
  * @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 Payment_Bulk_Ezypay {
diff --git a/modules/product/classes/Controller/Admin/Product.php b/modules/product/classes/Controller/Admin/Product.php
index af91c378..6cae98eb 100644
--- a/modules/product/classes/Controller/Admin/Product.php
+++ b/modules/product/classes/Controller/Admin/Product.php
@@ -3,11 +3,10 @@
 /**
  * This class provides Admin Product management
  *
- * @package    OSB
- * @subpackage Product
+ * @package    Product
  * @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_Product extends Controller_TemplateDefault_Admin {
diff --git a/modules/product/classes/Controller/Product.php b/modules/product/classes/Controller/Product.php
index 39eae48e..7bc820c9 100644
--- a/modules/product/classes/Controller/Product.php
+++ b/modules/product/classes/Controller/Product.php
@@ -3,12 +3,11 @@
 /**
  * This class provides product categories
  *
- * @package    OSB
- * @subpackage Page
+ * @package    Product
  * @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_Product extends Controller_TemplateDefault {
 	/**
diff --git a/modules/product/classes/Controller/Product/Category.php b/modules/product/classes/Controller/Product/Category.php
index f73ff308..2c9fa454 100644
--- a/modules/product/classes/Controller/Product/Category.php
+++ b/modules/product/classes/Controller/Product/Category.php
@@ -3,12 +3,11 @@
 /**
  * This class provides product categories
  *
- * @package    OSB
- * @subpackage Page
+ * @package    Product
  * @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_Product_Category extends Controller_TemplateDefault {
 	/**
diff --git a/modules/product/classes/Model/Product.php b/modules/product/classes/Model/Product.php
index 760e82d0..e3124acd 100644
--- a/modules/product/classes/Model/Product.php
+++ b/modules/product/classes/Model/Product.php
@@ -3,11 +3,10 @@
 /**
  * This class supports OSB listing products
  *
- * @package    OSB
- * @subpackage Product
+ * @package    Product
  * @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
  *
  * Column Definitions:
diff --git a/modules/product/classes/Model/Product/Category.php b/modules/product/classes/Model/Product/Category.php
index 83d6f1c7..80e1dc5d 100644
--- a/modules/product/classes/Model/Product/Category.php
+++ b/modules/product/classes/Model/Product/Category.php
@@ -3,11 +3,10 @@
 /**
  * This class supports OSB listing products by category.
  *
- * @package    OSB
- * @subpackage Product
+ * @package    Product
  * @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_Category extends ORM_OSB {
diff --git a/modules/product/classes/Model/Product/Category/Translate.php b/modules/product/classes/Model/Product/Category/Translate.php
index e33eca8c..acbd414f 100644
--- a/modules/product/classes/Model/Product/Category/Translate.php
+++ b/modules/product/classes/Model/Product/Category/Translate.php
@@ -3,11 +3,10 @@
 /**
  * This class product access to product category translation.
  *
- * @package    OSB
- * @subpackage Product
+ * @package    Product
  * @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_Category_Translate extends ORM_OSB {
diff --git a/modules/product/classes/Model/Product/Plugin.php b/modules/product/classes/Model/Product/Plugin.php
index 0edd7a6e..9934d828 100644
--- a/modules/product/classes/Model/Product/Plugin.php
+++ b/modules/product/classes/Model/Product/Plugin.php
@@ -3,11 +3,10 @@
 /**
  * This class supports Product Plugins.
  *
- * @package    OSB
- * @subpackage Product/Plugin
+ * @package    Product
  * @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
  */
 abstract class Model_Product_Plugin extends ORM_OSB {
diff --git a/modules/product/classes/Model/Product/Translate.php b/modules/product/classes/Model/Product/Translate.php
index 1c7344b3..01ccbb22 100644
--- a/modules/product/classes/Model/Product/Translate.php
+++ b/modules/product/classes/Model/Product/Translate.php
@@ -3,11 +3,10 @@
 /**
  * This class product access to product translation.
  *
- * @package    OSB
- * @subpackage Product
+ * @package    Product
  * @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_Translate extends ORM_OSB {
diff --git a/modules/service/classes/Controller/Admin/Service.php b/modules/service/classes/Controller/Admin/Service.php
index 13f2c536..baac3842 100644
--- a/modules/service/classes/Controller/Admin/Service.php
+++ b/modules/service/classes/Controller/Admin/Service.php
@@ -3,11 +3,10 @@
 /**
  * This class provides Admin Service functions
  *
- * @package    OSB
- * @subpackage Service
+ * @package    Service
  * @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_Service extends Controller_TemplateDefault_Admin {
diff --git a/modules/service/classes/Controller/Affiliate/Service.php b/modules/service/classes/Controller/Affiliate/Service.php
index 322f5b5b..a21d902d 100644
--- a/modules/service/classes/Controller/Affiliate/Service.php
+++ b/modules/service/classes/Controller/Affiliate/Service.php
@@ -3,11 +3,10 @@
 /**
  * This class provides Affiliate Service functions
  *
- * @package    OSB
- * @subpackage Service
+ * @package    Service
  * @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_Service extends Controller_TemplateDefault_Affiliate {
diff --git a/modules/service/classes/Controller/Service.php b/modules/service/classes/Controller/Service.php
index 9b44367d..c9f36962 100644
--- a/modules/service/classes/Controller/Service.php
+++ b/modules/service/classes/Controller/Service.php
@@ -3,12 +3,11 @@
 /**
  * This class provides service management
  *
- * @package    lnApp
- * @subpackage Page/Service
+ * @package    Service
  * @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_Service extends Controller_TemplateDefault {
 }
diff --git a/modules/service/classes/Controller/Task/Service.php b/modules/service/classes/Controller/Task/Service.php
index 7e4dba8d..5e0922b6 100644
--- a/modules/service/classes/Controller/Task/Service.php
+++ b/modules/service/classes/Controller/Task/Service.php
@@ -3,11 +3,10 @@
 /**
  * This class provides OSB service task capabilities.
  *
- * @package    OSB
- * @subpackage Service
+ * @package    Service
  * @category   Controllers/Task
  * @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_Service extends Controller_Task {
diff --git a/modules/service/classes/Controller/User/Service.php b/modules/service/classes/Controller/User/Service.php
index 82915c6e..34b23b96 100644
--- a/modules/service/classes/Controller/User/Service.php
+++ b/modules/service/classes/Controller/User/Service.php
@@ -3,11 +3,10 @@
 /**
  * This class provides User Service functions
  *
- * @package    OSB
- * @subpackage Service
+ * @package    Service
  * @category   Controllers/User
  * @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_User_Service extends Controller_TemplateDefault_User {
diff --git a/modules/service/classes/Model/Service.php b/modules/service/classes/Model/Service.php
index 51e84571..62287a32 100644
--- a/modules/service/classes/Model/Service.php
+++ b/modules/service/classes/Model/Service.php
@@ -3,11 +3,10 @@
 /**
  * This class supports Services
  *
- * @package    OSB
- * @subpackage Service
+ * @package    Service
  * @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
  *
  * Fields:
diff --git a/modules/service/classes/Model/Service/Billing.php b/modules/service/classes/Model/Service/Billing.php
index d5f2c513..a80bc78d 100644
--- a/modules/service/classes/Model/Service/Billing.php
+++ b/modules/service/classes/Model/Service/Billing.php
@@ -3,11 +3,10 @@
 /**
  * This class supports Service Billing.
  *
- * @package    OSB
- * @subpackage Product/Service
+ * @package    Service
  * @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_Billing extends ORM_OSB {
diff --git a/modules/service/classes/Model/Service/Change.php b/modules/service/classes/Model/Service/Change.php
index 455c14e4..400b9ca0 100644
--- a/modules/service/classes/Model/Service/Change.php
+++ b/modules/service/classes/Model/Service/Change.php
@@ -3,11 +3,10 @@
 /**
  * This class supports Service Product Changes.
  *
- * @package    OSB
- * @subpackage Product/Service
+ * @package    Service
  * @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_Change extends ORM_OSB {
diff --git a/modules/service/classes/Model/Service/Plugin.php b/modules/service/classes/Model/Service/Plugin.php
index 113d5755..dccbbd65 100644
--- a/modules/service/classes/Model/Service/Plugin.php
+++ b/modules/service/classes/Model/Service/Plugin.php
@@ -3,11 +3,10 @@
 /**
  * This class supports Service Plugins.
  *
- * @package    OSB
- * @subpackage Product/Service
+ * @package    Service
  * @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
  */
 abstract class Model_Service_Plugin extends ORM_OSB {
diff --git a/modules/ssl/classes/Controller/Admin/Ssl.php b/modules/ssl/classes/Controller/Admin/Ssl.php
index 3490137c..30cacaf4 100644
--- a/modules/ssl/classes/Controller/Admin/Ssl.php
+++ b/modules/ssl/classes/Controller/Admin/Ssl.php
@@ -3,11 +3,10 @@
 /**
  * This class provides Admin SSL functions
  *
- * @package    OSB
- * @subpackage SSL
+ * @package    SSL
  * @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_SSL extends Controller_TemplateDefault_Admin {
diff --git a/modules/ssl/classes/Controller/User/Ssl.php b/modules/ssl/classes/Controller/User/Ssl.php
index 57367766..b926e203 100644
--- a/modules/ssl/classes/Controller/User/Ssl.php
+++ b/modules/ssl/classes/Controller/User/Ssl.php
@@ -3,11 +3,10 @@
 /**
  * This class provides User SSL functions
  *
- * @package    OSB
- * @subpackage SSL
- * @category   Controllers/Admin
+ * @package    SSL
+ * @category   Controllers/User
  * @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_User_SSL extends Controller_TemplateDefault_User {
diff --git a/modules/ssl/classes/Model/Product/Plugin/SSL.php b/modules/ssl/classes/Model/Product/Plugin/Ssl.php
similarity index 77%
rename from modules/ssl/classes/Model/Product/Plugin/SSL.php
rename to modules/ssl/classes/Model/Product/Plugin/Ssl.php
index c0581066..7388bf1b 100644
--- a/modules/ssl/classes/Model/Product/Plugin/SSL.php
+++ b/modules/ssl/classes/Model/Product/Plugin/Ssl.php
@@ -3,14 +3,13 @@
 /**
  * This class supports SSL products
  *
- * @package    OSB
- * @subpackage Product/SSL
+ * @package    SSL
  * @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_SSL extends Model_Product_Plugin {
+class Model_Product_Plugin_Ssl extends Model_Product_Plugin {
 	protected $_table_name = 'ssl';
 
 	// Our required abstract methods
diff --git a/modules/ssl/classes/Model/SSL.php b/modules/ssl/classes/Model/SSL.php
index a6bef12e..42b0d1a5 100644
--- a/modules/ssl/classes/Model/SSL.php
+++ b/modules/ssl/classes/Model/SSL.php
@@ -3,11 +3,10 @@
 /**
  * This class supports SSL
  *
- * @package    OSB
- * @subpackage SSL
+ * @package    SSL
  * @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_SSL extends ORM_OSB {
diff --git a/modules/ssl/classes/Model/SSL/CA.php b/modules/ssl/classes/Model/SSL/CA.php
index 80e012b9..65e73821 100644
--- a/modules/ssl/classes/Model/SSL/CA.php
+++ b/modules/ssl/classes/Model/SSL/CA.php
@@ -3,11 +3,10 @@
 /**
  * This class supports SSL
  *
- * @package    OSB
- * @subpackage SSL
+ * @package    SSL
  * @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_SSL_CA extends ORM_OSB {
diff --git a/modules/ssl/classes/Model/Service/Plugin/Ssl.php b/modules/ssl/classes/Model/Service/Plugin/Ssl.php
index 7a1575bf..d74a0d0c 100644
--- a/modules/ssl/classes/Model/Service/Plugin/Ssl.php
+++ b/modules/ssl/classes/Model/Service/Plugin/Ssl.php
@@ -3,11 +3,10 @@
 /**
  * This class supports Services
  *
- * @package    OSB
- * @subpackage SSL
+ * @package    SSL
  * @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_Ssl extends Model_Service_Plugin {
diff --git a/modules/ssl/classes/SSL.php b/modules/ssl/classes/SSL.php
index 6c580b0b..62860c95 100644
--- a/modules/ssl/classes/SSL.php
+++ b/modules/ssl/classes/SSL.php
@@ -3,11 +3,10 @@
 /**
  * This class is for access to SSL information
  *
- * @package    OSB
- * @subpackage SSL
+ * @package    SSL
  * @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 SSL {
diff --git a/modules/ssl/classes/Task/SSL/Renew.php b/modules/ssl/classes/Task/SSL/Renew.php
index fadd45e5..a4ea122a 100644
--- a/modules/ssl/classes/Task/SSL/Renew.php
+++ b/modules/ssl/classes/Task/SSL/Renew.php
@@ -3,11 +3,10 @@
 /**
  * Renew an SSL Certificate
  *
- * @package    OSB
- * @subpackage SSL
- * @category   SSL/Task
+ * @package    SSL
+ * @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_SSL_Renew extends Task {
diff --git a/modules/ssl/messages/models/ssl_ca.php b/modules/ssl/messages/models/ssl_ca.php
index a5cdd659..5a325003 100644
--- a/modules/ssl/messages/models/ssl_ca.php
+++ b/modules/ssl/messages/models/ssl_ca.php
@@ -1,4 +1,16 @@
-<?php
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * SSL Certificate validation messages.
+ *
+ * @package    OSB
+ * @subpackage SSL
+ * @category   Validation
+ * @author     Deon George
+ * @copyright  (c) 2010 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
+ */
+
 return array(
 	'sign_cert'=>array(
 		'isCert'=>'This is not a valid certificate',
diff --git a/modules/statement/classes/Controller/Admin/Statement.php b/modules/statement/classes/Controller/Admin/Statement.php
index d703c786..ae344b8e 100644
--- a/modules/statement/classes/Controller/Admin/Statement.php
+++ b/modules/statement/classes/Controller/Admin/Statement.php
@@ -3,12 +3,11 @@
 /**
  * This class provides User Statement functions
  *
- * @package    OSB
- * @subpackage Statement
+ * @package    Statement
  * @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_Statement extends Controller_TemplateDefault_Admin {
 	protected $secure_actions = array(
diff --git a/modules/statement/classes/Controller/Statement.php b/modules/statement/classes/Controller/Statement.php
index eba89708..fa6340fe 100644
--- a/modules/statement/classes/Controller/Statement.php
+++ b/modules/statement/classes/Controller/Statement.php
@@ -3,12 +3,11 @@
 /**
  * This class provides Statement management
  *
- * @package    lnApp
- * @subpackage Page/Statement
+ * @package    Statement
  * @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_Statement extends Controller_TemplateDefault {
 }
diff --git a/modules/statement/classes/Controller/User/Statement.php b/modules/statement/classes/Controller/User/Statement.php
index 4b3a1ff1..e48174cc 100644
--- a/modules/statement/classes/Controller/User/Statement.php
+++ b/modules/statement/classes/Controller/User/Statement.php
@@ -3,12 +3,11 @@
 /**
  * This class provides User Statement functions
  *
- * @package    OSB
- * @subpackage Statement
+ * @package    Statement
  * @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_Statement extends Controller_TemplateDefault_User {
 	protected $secure_actions = array(
diff --git a/modules/task/classes/Controller/Admin/Task.php b/modules/task/classes/Controller/Admin/Task.php
index 8d260932..f5283a79 100644
--- a/modules/task/classes/Controller/Admin/Task.php
+++ b/modules/task/classes/Controller/Admin/Task.php
@@ -3,12 +3,11 @@
 /**
  * This class provides Admin TASK management
  *
- * @package    lnApp
- * @subpackage Page/Task
- * @category   Controllers
+ * @package    Task
+ * @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_Task extends Controller_TemplateDefault_Admin {
 	protected $secure_actions = array(
diff --git a/modules/task/classes/Model/Task.php b/modules/task/classes/Model/Task.php
index 611176a1..32ef1c69 100644
--- a/modules/task/classes/Model/Task.php
+++ b/modules/task/classes/Model/Task.php
@@ -3,11 +3,10 @@
 /**
  * This class supports Tasks
  *
- * @package    OSB
- * @subpackage Task
+ * @package    Task
  * @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_Task extends ORM_OSB {
diff --git a/modules/task/classes/Model/Task/Log.php b/modules/task/classes/Model/Task/Log.php
index 427bf562..1ab89bb6 100644
--- a/modules/task/classes/Model/Task/Log.php
+++ b/modules/task/classes/Model/Task/Log.php
@@ -3,11 +3,10 @@
 /**
  * This class supports Task Logging
  *
- * @package    OSB
- * @subpackage Task
+ * @package    Task
  * @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_Task_Log extends ORM_OSB {
diff --git a/modules/task/classes/Task/Task/Listactive.php b/modules/task/classes/Task/Task/Listactive.php
index 22d54a2b..e03bb4ce 100644
--- a/modules/task/classes/Task/Task/Listactive.php
+++ b/modules/task/classes/Task/Task/Listactive.php
@@ -3,11 +3,10 @@
 /**
  * List all Active Tasks defined in the DB
  *
- * @package    OSB
- * @subpackage Task
- * @category   Task/Task
+ * @package    Task
+ * @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_Task_Listactive extends Task {
diff --git a/modules/task/classes/Task/Task/Run.php b/modules/task/classes/Task/Task/Run.php
index f4f05fcc..f738cb65 100644
--- a/modules/task/classes/Task/Task/Run.php
+++ b/modules/task/classes/Task/Task/Run.php
@@ -3,11 +3,10 @@
 /**
  * Run active tasks according to their CRON schedule
  *
- * @package    OSB
- * @subpackage Task
- * @category   Task/Task
+ * @package    Task
+ * @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_Task_Run extends Task {
diff --git a/modules/tax/classes/Model/Invoice/Item/Tax.php b/modules/tax/classes/Model/Invoice/Item/Tax.php
index 4439e90b..b8de5243 100644
--- a/modules/tax/classes/Model/Invoice/Item/Tax.php
+++ b/modules/tax/classes/Model/Invoice/Item/Tax.php
@@ -3,11 +3,10 @@
 /**
  * This class supports tax calculations
  *
- * @package    OSB
- * @subpackage Tax
+ * @package    Tax
  * @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_Tax extends ORM_OSB {
diff --git a/modules/tax/classes/Model/Tax.php b/modules/tax/classes/Model/Tax.php
index 0ea3e575..19adab47 100644
--- a/modules/tax/classes/Model/Tax.php
+++ b/modules/tax/classes/Model/Tax.php
@@ -3,11 +3,10 @@
 /**
  * This class supports tax calculations
  *
- * @package    OSB
- * @subpackage Tax
+ * @package    Tax
  * @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_Tax extends ORM_OSB {
diff --git a/modules/tax/classes/Tax.php b/modules/tax/classes/Tax.php
index e82c183f..cd7bc46f 100644
--- a/modules/tax/classes/Tax.php
+++ b/modules/tax/classes/Tax.php
@@ -3,12 +3,11 @@
 /**
  * This class provides a tax information
  *
- * @package    OSB
- * @subpackage Tax
+ * @package    Tax
  * @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 Tax {
 	/**