Restructured the files and formats of the modules.

1 files changed, 6 insertions, 5 deletions

diff --git a/utils/modules.php b/utils/modules.php
index 6983d6b..62e64d3 100644
--- a/utils/modules.php
+++ b/utils/modules.php
@@ -1,8 +1,10 @@
 <?php
 
+$MODULES_DIR = $UTIL_DIR . "/modules";
+
 // Module includes
-include_once($UTIL_DIR . "/news.php");
-include_once($UTIL_DIR . "/events.php");
+include_once($MODULES_DIR . "/news.php");
+include_once($MODULES_DIR . "/events.php");
 
 $modules = array();
 
@@ -10,7 +12,6 @@ $newsmodule = new News($DATA_DIR . "/news.xml");
 $eventsmodule = new Events($DATA_DIR . "/events.xml");
 
 $modules["news"] = $newsmodule;
-$modules["events_coming"] = $eventsmodule;
-$modules["events_old"] = $eventsmodule;
+$modules["events"] = $eventsmodule;
 
-?>
\ No newline at end of file
+?>