diff --git a/common/autoload.php b/common/autoload.php
index fbf4d4d11..efc5a9784 100644
--- a/common/autoload.php
+++ b/common/autoload.php
@@ -104,6 +104,10 @@ spl_autoload_register(function($class_name)
 		case 'rhymix/plu':
 			$filename = RX_BASEDIR . 'plugins/' . substr($lc_class_name, 15) . '.php';
 			break;
+		// Rhymix Module classes.
+		case 'rhymix/mod':
+			$filename = RX_BASEDIR . 'modules/' . substr($lc_class_name, 15) . '.php';
+			break;
 		// XE compatible classes.
 		default:
 			if (isset($GLOBALS['RX_AUTOLOAD_FILE_MAP'][$lc_class_name]))
diff --git a/common/framework/lang.php b/common/framework/lang.php
index ab4e0f518..aebc123da 100644
--- a/common/framework/lang.php
+++ b/common/framework/lang.php
@@ -77,14 +77,14 @@ class Lang
 		{
 			$this->loadDirectory(\RX_BASEDIR . 'common/lang', 'common');
 		}
-		elseif (file_exists(\RX_BASEDIR . "plugins/$name/lang"))
-		{
-			$this->loadDirectory(\RX_BASEDIR . "plugins/$name/lang", $name);
-		}
 		elseif (file_exists(\RX_BASEDIR . "modules/$name/lang"))
 		{
 			$this->loadDirectory(\RX_BASEDIR . "modules/$name/lang", $name);
 		}
+		elseif (file_exists(\RX_BASEDIR . "plugins/$name/lang"))
+		{
+			$this->loadDirectory(\RX_BASEDIR . "plugins/$name/lang", $name);
+		}
 		elseif (file_exists(\RX_BASEDIR . "addons/$name/lang"))
 		{
 			$this->loadDirectory(\RX_BASEDIR . "addons/$name/lang", $name);