diff --git a/modules/sportspress-admin-bar.php b/modules/sportspress-admin-bar.php
index e4a94cdc..c2654517 100644
--- a/modules/sportspress-admin-bar.php
+++ b/modules/sportspress-admin-bar.php
@@ -1,12 +1,12 @@
 <?php
-/*
-Plugin Name: SportsPress Admin Bar
-Plugin URI: http://themeboy.com/
-Description: Add an admin bar link to SportsPress.
-Author: ThemeBoy
-Author URI: http://themeboy.com/
-Version: 2.2
-*/
+/**
+ * Admin Bar
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
diff --git a/modules/sportspress-birthdays.php b/modules/sportspress-birthdays.php
index d7b38bee..a2df33cd 100644
--- a/modules/sportspress-birthdays.php
+++ b/modules/sportspress-birthdays.php
@@ -1,12 +1,12 @@
 <?php
-/*
-Plugin Name: SportsPress Birthdays
-Plugin URI: http://themeboy.com/
-Description: Add birthdays to players and staff.
-Author: ThemeBoy
-Author URI: http://themeboy.com/
-Version: 2.7.1
-*/
+/**
+ * Birthdays
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
diff --git a/modules/sportspress-bulk-actions.php b/modules/sportspress-bulk-actions.php
index 7467c293..1c51c70a 100644
--- a/modules/sportspress-bulk-actions.php
+++ b/modules/sportspress-bulk-actions.php
@@ -1,12 +1,12 @@
 <?php
-/*
-Plugin Name: SportsPress Bulk Actions
-Plugin URI: http://themeboy.com/
-Description: Add bulk actions to SportsPress.
-Author: ThemeBoy
-Author URI: http://themeboy.com/
-Version: 2.7.6
-*/
+/**
+ * Bulk Actions
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
diff --git a/modules/sportspress-calendars.php b/modules/sportspress-calendars.php
index ca7a901e..3d93dc93 100644
--- a/modules/sportspress-calendars.php
+++ b/modules/sportspress-calendars.php
@@ -1,12 +1,12 @@
 <?php
-/*
-Plugin Name: SportsPress Calendars
-Plugin URI: http://themeboy.com/
-Description: Add event calendars to SportsPress.
-Author: ThemeBoy
-Author URI: http://themeboy.com/
-Version: 2.6.15
-*/
+/**
+ * Calendars
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
diff --git a/modules/sportspress-comments-scheduled-events.php b/modules/sportspress-comments-scheduled-events.php
index f07dd06a..23668821 100644
--- a/modules/sportspress-comments-scheduled-events.php
+++ b/modules/sportspress-comments-scheduled-events.php
@@ -1,14 +1,16 @@
 <?php
-/*
-Plugin Name: SportsPress Comments on Scheduled Events
-Plugin URI: http://themeboy.com/
-Description: Enable commenting on Scheduled Events.
-Author: Savvas
-Author URI: http://themeboy.com/
-Version: 2.6.8
-*/
+/**
+ * Comments Scheduled Events
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
+
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
+
 if ( ! class_exists( 'SportsPress_Comments_Scheduled_Events' ) ) :
 /**
  * Main SportsPress Comments Scheduled Events Class
diff --git a/modules/sportspress-conditional-equations.php b/modules/sportspress-conditional-equations.php
index bb9d6eea..fccfdd0f 100644
--- a/modules/sportspress-conditional-equations.php
+++ b/modules/sportspress-conditional-equations.php
@@ -1,12 +1,12 @@
 <?php
-/*
-Plugin Name: SportsPress Conditional Equations
-Plugin URI: http://themeboy.com/
-Description: Add conditional equations to SportsPress.
-Author: ThemeBoy
-Author URI: http://themeboy.com/
-Version: 2.6
-*/
+/**
+ * Conditional Equations
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
diff --git a/modules/sportspress-countdowns.php b/modules/sportspress-countdowns.php
index b5bb8f5e..00f31184 100644
--- a/modules/sportspress-countdowns.php
+++ b/modules/sportspress-countdowns.php
@@ -1,12 +1,12 @@
 <?php
-/*
-Plugin Name: SportsPress Countdowns
-Plugin URI: http://themeboy.com/
-Description: Add countdown widgets to SportsPress.
-Author: ThemeBoy
-Author URI: http://themeboy.com/
-Version: 2.7
-*/
+/**
+ * Countdowns
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
diff --git a/modules/sportspress-default-nationality.php b/modules/sportspress-default-nationality.php
index a7ce111b..8799ab6c 100644
--- a/modules/sportspress-default-nationality.php
+++ b/modules/sportspress-default-nationality.php
@@ -1,12 +1,12 @@
 <?php
-/*
-Plugin Name: SportsPress Default Nationality
-Plugin URI: http://themeboy.com/
-Description: Add default nationality option to SportsPress Settings.
-Author: ThemeBoy
-Author URI: http://themeboy.com/
-Version: 2.6.18
-*/
+/**
+ * Default Nationality
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
diff --git a/modules/sportspress-event-specs.php b/modules/sportspress-event-specs.php
index a0ebf5c0..387c7d04 100644
--- a/modules/sportspress-event-specs.php
+++ b/modules/sportspress-event-specs.php
@@ -1,12 +1,12 @@
 <?php
-/*
-Plugin Name: SportsPress Event Specs
-Plugin URI: http://themeboy.com/
-Description: Add event specs/stats to SportsPress.
-Author: ThemeBoy
-Author URI: http://themeboy.com/
-Version: 2.6.15
-*/
+/**
+ * Event Specs
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
diff --git a/modules/sportspress-event-status.php b/modules/sportspress-event-status.php
index ff0505a8..69c34d63 100644
--- a/modules/sportspress-event-status.php
+++ b/modules/sportspress-event-status.php
@@ -1,12 +1,12 @@
 <?php
-/*
-Plugin Name: SportsPress Event Status
-Plugin URI: http://themeboy.com/
-Description: Add a status option to SportsPress events.
-Author: ThemeBoy
-Author URI: http://themeboy.com/
-Version: 2.1
-*/
+/**
+ * Event Status
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
diff --git a/modules/sportspress-event-videos.php b/modules/sportspress-event-videos.php
index 583b7887..f243e9c1 100644
--- a/modules/sportspress-event-videos.php
+++ b/modules/sportspress-event-videos.php
@@ -1,12 +1,12 @@
 <?php
-/*
-Plugin Name: SportsPress Event Videos
-Plugin URI: http://themeboy.com/
-Description: Add videos to SportsPress events.
-Author: ThemeBoy
-Author URI: http://themeboy.com/
-Version: 1.8.3
-*/
+/**
+ * Event Videos
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
diff --git a/modules/sportspress-gutenberg.php b/modules/sportspress-gutenberg.php
index e23d5570..2fc806c2 100644
--- a/modules/sportspress-gutenberg.php
+++ b/modules/sportspress-gutenberg.php
@@ -1,12 +1,12 @@
 <?php
-/*
-Plugin Name: SportsPress Gutenberg
-Plugin URI: http://themeboy.com/
-Description: Add Gutenberg support to SportsPress.
-Author: ThemeBoy
-Author URI: http://themeboy.com/
-Version: 2.6.13
-*/
+/**
+ * Gutenberg
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
diff --git a/modules/sportspress-icons.php b/modules/sportspress-icons.php
index 580f0a3f..e0bc11b6 100644
--- a/modules/sportspress-icons.php
+++ b/modules/sportspress-icons.php
@@ -1,12 +1,12 @@
 <?php
-/*
-Plugin Name: SportsPress Icons
-Plugin URI: http://themeboy.com/
-Description: Add vector performance icons to SportsPress.
-Author: ThemeBoy
-Author URI: http://themeboy.com/
-Version: 2.7
-*/
+/**
+ * Icons
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
diff --git a/modules/sportspress-importers.php b/modules/sportspress-importers.php
index bb9fde6d..06b9d45b 100644
--- a/modules/sportspress-importers.php
+++ b/modules/sportspress-importers.php
@@ -1,12 +1,12 @@
 <?php
-/*
-Plugin Name: SportsPress Importers
-Plugin URI: http://themeboy.com/
-Description: Add importers to SportsPress.
-Author: ThemeBoy
-Author URI: http://themeboy.com/
-Version: 1.8.3
-*/
+/**
+ * Importers
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
diff --git a/modules/sportspress-lazy-loading.php b/modules/sportspress-lazy-loading.php
index 456c55b5..adceea14 100644
--- a/modules/sportspress-lazy-loading.php
+++ b/modules/sportspress-lazy-loading.php
@@ -1,12 +1,12 @@
 <?php
-/*
-Plugin Name: SportsPress Lazy Loading
-Plugin URI: http://tboy.co/pro
-Description: Load players using Ajax to speed up the event edit screen.
-Author: ThemeBoy
-Author URI: http://themeboy.com
-Version: 2.5.5
-*/
+/**
+ * Lazy Loading
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
@@ -17,7 +17,7 @@ if ( ! class_exists( 'SportsPress_Lazy_Loading' ) ) :
  * Main SportsPress Lazy Loading Class
  *
  * @class SportsPress_Lazy_Loading
- * @version	2.3
+ * @version	2.7.9
  */
 class SportsPress_Lazy_Loading {
 
diff --git a/modules/sportspress-league-tables.php b/modules/sportspress-league-tables.php
index 140491ba..0b64bf66 100644
--- a/modules/sportspress-league-tables.php
+++ b/modules/sportspress-league-tables.php
@@ -1,12 +1,12 @@
 <?php
-/*
-Plugin Name: SportsPress League Tables
-Plugin URI: http://themeboy.com/
-Description: Add league tables to SportsPress.
-Author: ThemeBoy
-Author URI: http://themeboy.com/
-Version: 2.6.15
-*/
+/**
+ * League Tables
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
diff --git a/modules/sportspress-next-team-preset.php b/modules/sportspress-next-team-preset.php
index 674d89fb..9a7b169d 100644
--- a/modules/sportspress-next-team-preset.php
+++ b/modules/sportspress-next-team-preset.php
@@ -1,12 +1,12 @@
 <?php
-/*
-Plugin Name: SportsPress Next Team Preset
-Plugin URI: http://themeboy.com/
-Description: Add a Next preset to SportsPress league table column equations.
-Author: ThemeBoy
-Author URI: http://themeboy.com/
-Version: 2.6.3
-*/
+/**
+ * Next Team Preset
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
diff --git a/modules/sportspress-officials.php b/modules/sportspress-officials.php
index 1727173a..ccbdb344 100644
--- a/modules/sportspress-officials.php
+++ b/modules/sportspress-officials.php
@@ -1,12 +1,12 @@
 <?php
-/*
-Plugin Name: SportsPress Officials
-Plugin URI: http://themeboy.com/
-Description: Add officials to SportsPress.
-Author: ThemeBoy
-Author URI: http://themeboy.com/
-Version: 2.6.15
-*/
+/**
+ * Officials
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
@@ -17,7 +17,7 @@ if ( ! class_exists( 'SportsPress_Officials' ) ) :
  * Main SportsPress Officials Class
  *
  * @class SportsPress_Officials
- * @version	2.6.15
+ * @version	2.7.9
  */
 class SportsPress_Officials {
 
@@ -66,7 +66,7 @@ class SportsPress_Officials {
 	*/
 	private function define_constants() {
 		if ( !defined( 'SP_OFFICIALS_VERSION' ) )
-			define( 'SP_OFFICIALS_VERSION', '2.6.15' );
+			define( 'SP_OFFICIALS_VERSION', '2.7.9' );
 
 		if ( !defined( 'SP_OFFICIALS_URL' ) )
 			define( 'SP_OFFICIALS_URL', plugin_dir_url( __FILE__ ) );
diff --git a/modules/sportspress-openstreetmap.php b/modules/sportspress-openstreetmap.php
index fadf3c54..26051a1c 100644
--- a/modules/sportspress-openstreetmap.php
+++ b/modules/sportspress-openstreetmap.php
@@ -1,12 +1,12 @@
 <?php
-/*
-Plugin Name: SportsPress OpenStreetMap Integration
-Plugin URI: http://themeboy.com/
-Description: Integrate OpenStreetMap to SportsPress.
-Author: ThemeBoy
-Author URI: http://themeboy.com/
-Version: 2.7.5
-*/
+/**
+ * OpenStreetMap
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
diff --git a/modules/sportspress-overview.php b/modules/sportspress-overview.php
index d0eb92c1..44e25d2a 100644
--- a/modules/sportspress-overview.php
+++ b/modules/sportspress-overview.php
@@ -1,12 +1,12 @@
 <?php
-/*
-Plugin Name: SportsPress Overview
-Plugin URI: http://themeboy.com/
-Description: Display a visual overview of SportsPress data.
-Author: ThemeBoy
-Author URI: http://themeboy.com/
-Version: 2.5
-*/
+/**
+ * Overview
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
diff --git a/modules/sportspress-player-assignments.php b/modules/sportspress-player-assignments.php
index d802092a..138fde22 100644
--- a/modules/sportspress-player-assignments.php
+++ b/modules/sportspress-player-assignments.php
@@ -1,14 +1,16 @@
 <?php
-/*
-Plugin Name: SportsPress Player Assignments
-Plugin URI: http://themeboy.com/
-Description: Add player assignments support to SportsPress.
-Author: Savvas
-Author URI: http://themeboy.com/
-Version: 2.7.3
-*/
+/**
+ * Player Assignments
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
+
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
+
 if ( ! class_exists( 'SportsPress_Player_Assignments' ) ) :
 /**
  * Main SportsPress Player Assignments Class
diff --git a/modules/sportspress-player-lists.php b/modules/sportspress-player-lists.php
index 4b98cd15..78ecc2d5 100644
--- a/modules/sportspress-player-lists.php
+++ b/modules/sportspress-player-lists.php
@@ -1,12 +1,12 @@
 <?php
-/*
-Plugin Name: SportsPress Player Lists
-Plugin URI: http://themeboy.com/
-Description: Add player lists to SportsPress.
-Author: ThemeBoy
-Author URI: http://themeboy.com/
-Version: 2.6.15
-*/
+/**
+ * Player Lists
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
diff --git a/modules/sportspress-styles.php b/modules/sportspress-styles.php
index fa565db4..3ffce68f 100644
--- a/modules/sportspress-styles.php
+++ b/modules/sportspress-styles.php
@@ -1,12 +1,12 @@
 <?php
-/*
-Plugin Name: SportsPress Styles
-Plugin URI: http://themeboy.com/
-Description: Add frontend styles to SportsPress.
-Author: ThemeBoy
-Author URI: http://themeboy.com/
-Version: 2.7
-*/
+/**
+ * Styles
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
diff --git a/modules/sportspress-template-selector.php b/modules/sportspress-template-selector.php
index 1e5bd6ef..2910a1f0 100644
--- a/modules/sportspress-template-selector.php
+++ b/modules/sportspress-template-selector.php
@@ -1,12 +1,12 @@
 <?php
-/*
-Plugin Name: SportsPress Template Selector
-Plugin URI: http://themeboy.com/
-Description: Add a template selector to SportsPress post types.
-Author: ThemeBoy
-Author URI: http://themeboy.com/
-Version: 2.3
-*/
+/**
+ * Template Selector
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
diff --git a/modules/sportspress-tutorials.php b/modules/sportspress-tutorials.php
index 7dafc858..f9c06107 100644
--- a/modules/sportspress-tutorials.php
+++ b/modules/sportspress-tutorials.php
@@ -1,12 +1,12 @@
 <?php
-/*
-Plugin Name: SportsPress Tutorials
-Plugin URI: http://themeboy.com/
-Description: Display SportsPress video tutorials.
-Author: ThemeBoy
-Author URI: http://themeboy.com/
-Version: 2.5
-*/
+/**
+ * Tutorials
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
diff --git a/modules/sportspress-user-registration.php b/modules/sportspress-user-registration.php
index 32870bd2..e2bc5442 100644
--- a/modules/sportspress-user-registration.php
+++ b/modules/sportspress-user-registration.php
@@ -1,12 +1,12 @@
 <?php
-/*
-Plugin Name: SportsPress User Registration
-Plugin URI: http://themeboy.com/
-Description: Create a new player during user registration.
-Author: ThemeBoy
-Author URI: http://themeboy.com/
-Version: 2.4
-*/
+/**
+ * User Registration
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
diff --git a/modules/sportspress-widget-alignment.php b/modules/sportspress-widget-alignment.php
index 6df29bf7..f050e0df 100644
--- a/modules/sportspress-widget-alignment.php
+++ b/modules/sportspress-widget-alignment.php
@@ -1,12 +1,12 @@
 <?php
-/*
-Plugin Name: SportsPress Widget Alignment
-Plugin URI: http://themeboy.com/
-Description: Add alignment options to SportsPress widgets.
-Author: ThemeBoy
-Author URI: http://themeboy.com
-Version: 1.8.3
-*/
+/**
+ * Widget Alignment
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
diff --git a/modules/sportspress-widgets.php b/modules/sportspress-widgets.php
index 6ca8e4dc..dc7c7f3b 100644
--- a/modules/sportspress-widgets.php
+++ b/modules/sportspress-widgets.php
@@ -1,12 +1,12 @@
 <?php
-/*
-Plugin Name: SportsPress Widgets
-Plugin URI: http://themeboy.com/
-Description: Add widgets to SportsPress.
-Author: ThemeBoy
-Author URI: http://themeboy.com/
-Version: 1.8.3
-*/
+/**
+ * Widgets
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
diff --git a/modules/sportspress-wordpay.php b/modules/sportspress-wordpay.php
index f5dab27e..943eb28a 100644
--- a/modules/sportspress-wordpay.php
+++ b/modules/sportspress-wordpay.php
@@ -1,12 +1,12 @@
 <?php
-/*
-Plugin Name: SportsPress WordPay
-Plugin URI: http://themeboy.com/
-Description: Add team and player registration shortcodes to WordPay.
-Author: ThemeBoy
-Author URI: http://themeboy.com/
-Version: 2.6
-*/
+/**
+ * WordPay
+ *
+ * @author    ThemeBoy
+ * @category  Modules
+ * @package   SportsPress/Modules
+ * @version   2.7.9
+ */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;