diff --git a/classes/gettext.php b/classes/gettext.class.php
similarity index 100%
rename from classes/gettext.php
rename to classes/gettext.class.php
diff --git a/classes/lang.php b/classes/lang.functions.php
similarity index 51%
rename from classes/lang.php
rename to classes/lang.functions.php
index 1506c0b..d4f0a74 100644
--- a/classes/lang.php
+++ b/classes/lang.functions.php
@@ -1,28 +1,11 @@
-<?
-$idiomas = array();
-$idiomas['es_MX'] = "Espa&ntilde;ol de M&eacute;xico";
-$idiomas['en'] = "English";
-
-function esIdioma($test) {
-	global $idiomas;
-	if (isset($idiomas[$test]))
-		return true;
-	else
-		return false;
-}
-
+<?php
 function initIdioma($lang = "en") {
 	global $locale, $l10n;
 
-	if (!esIdioma($locale) && esIdioma($lang)) {
-		$locale = $lang;
-	}
-
 	$input = new FileReader(dirname(__FILE__)."/../idiomas/". $locale ."/lang.mo");
 	$l10n = new gettext_reader($input);
 }
 
-// Standard wrappers for xgettext
 function __($text) {
 	global $l10n;
 	return $l10n->translate($text);
diff --git a/classes/streams.php b/classes/streams.class.php
similarity index 100%
rename from classes/streams.php
rename to classes/streams.class.php