diff --git a/cake/libs/validation.php b/cake/libs/validation.php
index 00e7e8fe1..d4db77ed2 100644
--- a/cake/libs/validation.php
+++ b/cake/libs/validation.php
@@ -18,7 +18,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::uses('Multibyte', 'Core');
+App::uses('Multibyte', 'I18n');
 
 /**
  * Offers different validation methods.
diff --git a/lib/Cake/Controller/Component/EmailComponent.php b/lib/Cake/Controller/Component/EmailComponent.php
index 965084589..47ab6775b 100755
--- a/lib/Cake/Controller/Component/EmailComponent.php
+++ b/lib/Cake/Controller/Component/EmailComponent.php
@@ -17,7 +17,7 @@
  * @since         CakePHP(tm) v 1.2.0.3467
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::uses('Multibyte', 'Core');
+App::uses('Multibyte', 'I18n');
 
 /**
  * EmailComponent
diff --git a/cake/libs/i18n.php b/lib/Cake/I18n/I18n.php
similarity index 100%
rename from cake/libs/i18n.php
rename to lib/Cake/I18n/I18n.php
diff --git a/cake/libs/l10n.php b/lib/Cake/I18n/L10n.php
similarity index 100%
rename from cake/libs/l10n.php
rename to lib/Cake/I18n/L10n.php
diff --git a/cake/libs/multibyte.php b/lib/Cake/I18n/Multibyte.php
similarity index 100%
rename from cake/libs/multibyte.php
rename to lib/Cake/I18n/Multibyte.php
diff --git a/lib/Cake/View/Helper/JsHelper.php b/lib/Cake/View/Helper/JsHelper.php
index 7a605b423..e07c5779c 100644
--- a/lib/Cake/View/Helper/JsHelper.php
+++ b/lib/Cake/View/Helper/JsHelper.php
@@ -19,7 +19,7 @@
  */
 
 App::uses('AppHelper', 'View/Helper');
-App::uses('Multibyte', 'Core');
+App::uses('Multibyte', 'I18n');
 
 /**
  * Javascript Generator helper class for easy use of JavaScript.
diff --git a/lib/Cake/View/Helper/TextHelper.php b/lib/Cake/View/Helper/TextHelper.php
index 11b04c0a2..1d836ae70 100644
--- a/lib/Cake/View/Helper/TextHelper.php
+++ b/lib/Cake/View/Helper/TextHelper.php
@@ -26,7 +26,7 @@
  */
 App::uses('AppHelper', 'View/Helper');
 App::uses('HtmlHelper', 'Helper');
-App::uses('Multibyte', 'Utility');
+App::uses('Multibyte', 'I18n');
 
 /**
  * Text helper library.
diff --git a/lib/Cake/basics.php b/lib/Cake/basics.php
index ca935acde..1b1fbc5a5 100644
--- a/lib/Cake/basics.php
+++ b/lib/Cake/basics.php
@@ -469,9 +469,7 @@ if (!function_exists('sortByKey')) {
 		if (!$singular) {
 			return;
 		}
-		if (!class_exists('I18n')) {
-			App::import('Core', 'i18n');
-		}
+		App::uses('I18n', 'I18n');
 		return I18n::translate($singular);
 	}
 
@@ -489,9 +487,7 @@ if (!function_exists('sortByKey')) {
 		if (!$singular) {
 			return;
 		}
-		if (!class_exists('I18n')) {
-			App::import('Core', 'i18n');
-		}
+		App::uses('I18n', 'I18n');
 		return I18n::translate($singular, $plural, null, 6, $count);
 	}
 
@@ -507,9 +503,7 @@ if (!function_exists('sortByKey')) {
 		if (!$msg) {
 			return;
 		}
-		if (!class_exists('I18n')) {
-			App::import('Core', 'i18n');
-		}
+		App::uses('I18n', 'I18n');
 		return I18n::translate($msg, null, $domain);
 	}
 
@@ -529,9 +523,7 @@ if (!function_exists('sortByKey')) {
 		if (!$singular) {
 			return;
 		}
-		if (!class_exists('I18n')) {
-			App::import('Core', 'i18n');
-		}
+		App::uses('I18n', 'I18n');
 		return I18n::translate($singular, $plural, $domain, 6, $count);
 	}
 
@@ -562,9 +554,7 @@ if (!function_exists('sortByKey')) {
 		if (!$msg) {
 			return;
 		}
-		if (!class_exists('I18n')) {
-			App::import('Core', 'i18n');
-		}
+		App::uses('I18n', 'I18n');
 		return I18n::translate($msg, null, $domain, $category);
 	}
 
@@ -599,9 +589,7 @@ if (!function_exists('sortByKey')) {
 		if (!$singular) {
 			return;
 		}
-		if (!class_exists('I18n')) {
-			App::import('Core', 'i18n');
-		}
+		App::uses('I18n', 'I18n');
 		return I18n::translate($singular, $plural, $domain, $category, $count);
 	}
 
@@ -628,9 +616,7 @@ if (!function_exists('sortByKey')) {
 		if (!$msg) {
 			return;
 		}
-		if (!class_exists('I18n')) {
-			App::import('Core', 'i18n');
-		}
+		App::uses('I18n', 'I18n');
 		return I18n::translate($msg, null, null, $category);
 	}