diff --git a/application/controllers/admin/stats.php b/application/controllers/admin/stats.php
@@ -8,7 +8,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author     Ushahidi Team <team@ushahidi.com> 
  * @package    Ushahidi - http://source.ushahididev.com
- * @module     Admin Users Controller  
+ * @subpackage Admin
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license    http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) 
  */
@@ -559,4 +559,4 @@ public function _curl_req( $url )
 
         return $buffer;
     }
-}
+}
diff --git a/application/controllers/admin/upgrade.php b/application/controllers/admin/upgrade.php
@@ -9,7 +9,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author	   Ushahidi Team <team@ushahidi.com>
  * @package	   Ushahidi - http://source .ushahididev.com
- * @module	   Admin Messages Controller
+ * @subpackage Admin
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license	   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL)
  */

diff --git a/application/controllers/admin/users.php b/application/controllers/admin/users.php
@@ -8,7 +8,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author     Ushahidi Team <team@ushahidi.com> 
  * @package    Ushahidi - http://source.ushahididev.com
- * @module     Admin Users Controller  
+ * @subpackage Admin
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license    http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) 
  */

diff --git a/application/controllers/alerts.php b/application/controllers/alerts.php
@@ -8,7 +8,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author     Ushahidi Team <team@ushahidi.com> 
  * @package    Ushahidi - http://source.ushahididev.com
- * @module     Alerts Controller  
+ * @subpackage Controllers
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license    http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) 
  */

diff --git a/application/controllers/api.php b/application/controllers/api.php
@@ -8,9 +8,11 @@
  * LICENSE: This source file is subject to LGPL license
  * that is available through the world-wide-web at the following URI:
  * http://www.gnu.org/copyleft/lesser.html
+ *
+ * Api_Controller
  * @author     Ushahidi Team <team@ushahidi.com>
  * @package    Ushahidi - http://source.ushahididev.com
- * @module     API Controller
+ * @subpackage Controllers
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license    http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL)
  */

diff --git a/application/controllers/contact.php b/application/controllers/contact.php
@@ -8,7 +8,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author     Ushahidi Team <team@ushahidi.com> 
  * @package    Ushahidi - http://source.ushahididev.com
- * @module     Contact Us Controller  
+ * @subpackage Controllers
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license    http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) 
  */
@@ -97,4 +97,4 @@ public function index()
         // Rebuild Header Block
         $this->template->header->header_block = $this->themes->header_block();		
     }	
-}
+}
diff --git a/application/controllers/error.php b/application/controllers/error.php
@@ -8,7 +8,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author     Ushahidi Team <team@ushahidi.com> 
  * @package    Ushahidi - http://source.ushahididev.com
- * @module     Error Controller  
+ * @subpackage Controllers
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license    http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) 
 */

diff --git a/application/controllers/feed.php b/application/controllers/feed.php
@@ -9,7 +9,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author     Ushahidi Team <team@ushahidi.com>
  * @package    Ushahidi - http://source.ushahididev.com
- * @module     Feed Controller
+ * @subpackage Controllers
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license    http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL)
 *

diff --git a/application/controllers/help.php b/application/controllers/help.php
@@ -8,7 +8,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author     Ushahidi Team <team@ushahidi.com> 
  * @package    Ushahidi - http://source.ushahididev.com
- * @module     Help Controller  
+ * @subpackage Controllers
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license    http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) 
  */

diff --git a/application/controllers/j2me.php b/application/controllers/j2me.php
@@ -10,7 +10,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author     Ushahidi Team <team@ushahidi.com> 
  * @package    Ushahidi - http://source.ushahididev.com
- * @module     J2ME Controller  
+ * @subpackage Controllers
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license    http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) 
 */
@@ -152,4 +152,4 @@ public function index()
 		}
 	}
 
-}
+}
diff --git a/application/controllers/json.php b/application/controllers/json.php
@@ -9,7 +9,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author	   Ushahidi Team <team@ushahidi.com>
  * @package	   Ushahidi - http://source.ushahididev.com
- * @module	   JSON Controller
+ * @subpackage Controllers
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license	   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL)
  */
@@ -948,4 +948,4 @@ private function _calculateCenter($cluster)
 			"ne"=>$ne
 		);
 	}
-}
+}
diff --git a/application/controllers/login.php b/application/controllers/login.php
@@ -8,7 +8,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author     Ushahidi Team <team@ushahidi.com> 
  * @package    Ushahidi - http://source.ushahididev.com
- * @module     Login Controller  
+ * @subpackage Controllers
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license    http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) 
  */
@@ -344,4 +344,4 @@ public function _email_newpassword( $email, $name, $username, $password )
 		}
 
 	}	
-}
+}
diff --git a/application/controllers/logout.php b/application/controllers/logout.php
@@ -8,7 +8,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author     Ushahidi Team <team@ushahidi.com> 
  * @package    Ushahidi - http://source.ushahididev.com
- * @module     Login Controller  
+ * @subpackage Controllers
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license    http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) 
  */
@@ -40,4 +40,4 @@ public function front()
 		$this->index();
 
     }
-}
+}
diff --git a/application/controllers/markers.php b/application/controllers/markers.php
@@ -7,9 +7,10 @@
  * LICENSE: This source file is subject to LGPL license 
  * that is available through the world-wide-web at the following URI:
  * http://www.gnu.org/copyleft/lesser.html
+ *
  * @author     Ushahidi Team <team@ushahidi.com> 
  * @package    Ushahidi - http://source.ushahididev.com
- * @module     Markers Controller  
+ * @subpackage Controllers
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license    http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) 
 */

diff --git a/application/controllers/media.php b/application/controllers/media.php
@@ -15,7 +15,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author     Ushahidi Team <team@ushahidi.com>
  * @package    Ushahidi - http://source.ushahididev.com
- * @module     Media Controller
+ * @subpackage Controllers
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license    http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL)
 */
@@ -136,4 +136,4 @@ private function _js_compress($data)
     }
 
 }
-?>
+?>
diff --git a/application/controllers/members.php b/application/controllers/members.php
@@ -8,7 +8,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author	   Ushahidi Team <team@ushahidi.com> 
  * @package    Ushahidi - http://source.ushahididev.com
- * @module	   Members Controller  
+ * @subpackage Controllers
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license    http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) 
  */

diff --git a/application/controllers/members/alerts.php b/application/controllers/members/alerts.php
@@ -9,7 +9,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author	   Ushahidi Team <team@ushahidi.com>
  * @package	   Ushahidi - http://source.ushahididev.com
- * @module	   Member Alerts Controller
+ * @subpackage Members
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license	   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL)
  */
@@ -130,4 +130,4 @@ public function index()
 		$this->template->map_enabled = TRUE;
 		$this->template->js = new View('members/alerts_js');
 	}	
-}
+}
diff --git a/application/controllers/members/checkins.php b/application/controllers/members/checkins.php
@@ -9,7 +9,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author	   Ushahidi Team <team@ushahidi.com>
  * @package	   Ushahidi - http://source.ushahididev.com
- * @module	   Member Checkins Controller
+ * @subpackage Members
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license	   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL)
  */
@@ -103,4 +103,4 @@ function index($page = 1)
 		$this->template->map_enabled = TRUE;
 		$this->template->js = new View('members/checkins_js');
 	}	
-}
+}
diff --git a/application/controllers/members/dashboard.php b/application/controllers/members/dashboard.php
@@ -8,7 +8,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author	   Ushahidi Team <team@ushahidi.com>
  * @package	   Ushahidi - http://source.ushahididev.com
- * @module	   Admin Dashboard Controller
+ * @subpackage Members
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license	   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL)
  */

diff --git a/application/controllers/members/login.php b/application/controllers/members/login.php
@@ -8,7 +8,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author	   Ushahidi Team <team@ushahidi.com> 
  * @package	   Ushahidi - http://source.ushahididev.com
- * @module	   OpenID Login Controller	 
+ * @subpackage Members
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license	   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) 
  */
@@ -670,4 +670,4 @@ private function _email_newpassword( $email, $name, $username, $password )
 		}
 
 	}	
-}
+}
diff --git a/application/controllers/members/private.php b/application/controllers/members/private.php
@@ -9,7 +9,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author	   Ushahidi Team <team@ushahidi.com>
  * @package	   Ushahidi - http://source.ushahididev.com
- * @module	   Member Private Messages Controller
+ * @subpackage Members
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license	   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL)
  */
@@ -307,4 +307,4 @@ private function _user_name_chk( $name, $post )
 			$post->add_error('private_to','exists');
 		}
 	}
-}
+}
diff --git a/application/controllers/members/profile.php b/application/controllers/members/profile.php
@@ -8,7 +8,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author	   Ushahidi Team <team@ushahidi.com>
  * @package	   Ushahidi - http://source.ushahididev.com
- * @module	   Admin Profile Controller
+ * @subpackage Members
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license	   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL)
  */

diff --git a/application/controllers/members/reports.php b/application/controllers/members/reports.php
@@ -9,7 +9,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author	   Ushahidi Team <team@ushahidi.com>
  * @package	   Ushahidi - http://source.ushahididev.com
- * @module	   Admin Reports Controller
+ * @subpackage Members
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license	   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL)
  */

diff --git a/application/controllers/page.php b/application/controllers/page.php
@@ -8,7 +8,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author	   Ushahidi Team <team@ushahidi.com>
  * @package	   Ushahidi - http://source.ushahididev.com
- * @module	   Pages Controller
+ * @subpackage Controllers
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license	   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL)
  */
@@ -53,4 +53,4 @@ public function index($page_id = 1)
 		$this->template->header->header_block = $this->themes->header_block();
 	}
 
-}
+}
diff --git a/application/controllers/scheduler.php b/application/controllers/scheduler.php
@@ -9,7 +9,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author     Ushahidi Team <team@ushahidi.com> 
  * @package    Ushahidi - http://source.ushahididev.com
- * @module     Scheduler Controller  
+ * @subpackage Controllers
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license    http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) 
 */
@@ -159,4 +159,4 @@ public function index()
             );
         }
     }
-}
+}
diff --git a/application/controllers/scheduler/s_alerts.php b/application/controllers/scheduler/s_alerts.php
@@ -8,7 +8,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author	   Ushahidi Team <team@ushahidi.com> 
  * @package	   Ushahidi - http://source.ushahididev.com
- * @module	   Alerts Controller  
+ * @subpackage Scheduler
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license	   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) 
 */

diff --git a/application/controllers/scheduler/s_cleanup.php b/application/controllers/scheduler/s_cleanup.php
@@ -8,7 +8,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author	   Ushahidi Team <team@ushahidi.com>
  * @package	   Ushahidi - http://source.ushahididev.com
- * @module	   Cleanup Scheduler Controller
+ * @subpackage Scheduler
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license	   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL)
 */
@@ -91,4 +91,4 @@ public function index()
 			closedir($dhandle);
 		}
 	}
-}
+}
diff --git a/application/controllers/scheduler/s_email.php b/application/controllers/scheduler/s_email.php
@@ -8,7 +8,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author	   Ushahidi Team <team@ushahidi.com> 
  * @package	   Ushahidi - http://source.ushahididev.com
- * @module	   Email Controller	 
+ * @subpackage Scheduler
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license	   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) 
 */

diff --git a/application/controllers/scheduler/s_feeds.php b/application/controllers/scheduler/s_feeds.php
@@ -8,7 +8,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author     Ushahidi Team <team@ushahidi.com> 
  * @package    Ushahidi - http://source.ushahididev.com
- * @module     Feeds Controller  
+ * @subpackage Scheduler
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license    http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) 
 */
@@ -121,4 +121,4 @@ public function index()
 			$feed->save();
 		}
 	}
-}
+}
diff --git a/application/controllers/scheduler/s_sharing.php b/application/controllers/scheduler/s_sharing.php
@@ -8,7 +8,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author     Ushahidi Team <team@ushahidi.com>
  * @package    Ushahidi - http://source.ushahididev.com
- * @module     Sharing Scheduler Controller
+ * @subpackage Scheduler
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license    http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL)
 */
@@ -126,4 +126,4 @@ private function _parse_json($sharing_id = NULL, $sharing_url = NULL)
 			->where('sharing_id', $sharing_id)
 			->delete_all();
 	}
-}
+}
diff --git a/application/controllers/scheduler/s_twitter.php b/application/controllers/scheduler/s_twitter.php
@@ -8,7 +8,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author	   Ushahidi Team <team@ushahidi.com>
  * @package	   Ushahidi - http://source.ushahididev.com
- * @module	   Twitter Controller
+ * @subpackage Scheduler
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license	   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL)
 */
@@ -228,4 +228,4 @@ private function _unlock()
 	{
 		$this->cache->delete(Kohana::config('settings.subdomain')."_twitter_lock");
 	}
-}
+}
diff --git a/application/controllers/search.php b/application/controllers/search.php
@@ -223,4 +223,4 @@ public function index($page = 1)
 		// Rebuild Header Block
 		$this->template->header->header_block = $this->themes->header_block();
     }
-}
+}
diff --git a/application/controllers/swatch.php b/application/controllers/swatch.php
@@ -8,7 +8,7 @@
  * http://www.gnu.org/copyleft/lesser.html
  * @author     Ushahidi Team <team@ushahidi.com> 
  * @package    Ushahidi - http://source.ushahididev.com
- * @module     Swatch Controller  
+ * @subpackage Controllers
  * @copyright  Ushahidi - http://www.ushahidi.com
  * @license    http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License (LGPL) 
 */