diff --git a/config/locales/cldr/README.md b/config/locales/cldr/README.md
new file mode 100644
index 000000000..153d10c19
--- /dev/null
+++ b/config/locales/cldr/README.md
@@ -0,0 +1 @@
+DO NOT EDIT THIS FILES. Thanks!
diff --git a/config/locales/cldr/bg_plurals.rb b/config/locales/cldr/bg_plurals.rb
new file mode 100644
index 000000000..642df1b9f
--- /dev/null
+++ b/config/locales/cldr/bg_plurals.rb
@@ -0,0 +1 @@
+{ :bg => { :i18n => {:plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/ca_plurals.rb b/config/locales/cldr/ca_plurals.rb
new file mode 100644
index 000000000..67f246d79
--- /dev/null
+++ b/config/locales/cldr/ca_plurals.rb
@@ -0,0 +1 @@
+{ :ca => { :i18n => {:plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/cs_plurals.rb b/config/locales/cldr/cs_plurals.rb
new file mode 100644
index 000000000..48115c7b2
--- /dev/null
+++ b/config/locales/cldr/cs_plurals.rb
@@ -0,0 +1 @@
+{ :cs => { :i18n => {:plural => { :keys => [:one, :few, :other], :rule => lambda { |n| n == 1 ? :one : [2, 3, 4].include?(n) ? :few : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/cy_plurals.rb b/config/locales/cldr/cy_plurals.rb
new file mode 100644
index 000000000..72ed2ac4d
--- /dev/null
+++ b/config/locales/cldr/cy_plurals.rb
@@ -0,0 +1 @@
+{ :cy => { :i18n => {:plural => { :keys => [:one, :two, :many, :other], :rule => lambda { |n| n == 1 ? :one : n == 2 ? :two : n == 8 || n == 11 ? :many : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/da_plurals.rb b/config/locales/cldr/da_plurals.rb
new file mode 100644
index 000000000..75d97ee78
--- /dev/null
+++ b/config/locales/cldr/da_plurals.rb
@@ -0,0 +1 @@
+{ :da => { :i18n => {:plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/de_plurals.rb b/config/locales/cldr/de_plurals.rb
new file mode 100644
index 000000000..a0f157ce8
--- /dev/null
+++ b/config/locales/cldr/de_plurals.rb
@@ -0,0 +1 @@
+{ :de => { :i18n => {:plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/el_plurals.rb b/config/locales/cldr/el_plurals.rb
new file mode 100644
index 000000000..5f61405a8
--- /dev/null
+++ b/config/locales/cldr/el_plurals.rb
@@ -0,0 +1 @@
+{ :el => { :i18n => {:plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/en_plurals.rb b/config/locales/cldr/en_plurals.rb
new file mode 100644
index 000000000..e66a6117f
--- /dev/null
+++ b/config/locales/cldr/en_plurals.rb
@@ -0,0 +1 @@
+{ :en => { :i18n => {:plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/es_plurals.rb b/config/locales/cldr/es_plurals.rb
new file mode 100644
index 000000000..abfa8cb18
--- /dev/null
+++ b/config/locales/cldr/es_plurals.rb
@@ -0,0 +1 @@
+{ :es => { :i18n => {:plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/eu_plurals.rb b/config/locales/cldr/eu_plurals.rb
new file mode 100644
index 000000000..8f0c5f463
--- /dev/null
+++ b/config/locales/cldr/eu_plurals.rb
@@ -0,0 +1 @@
+{ :eu => { :i18n => {:plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/fi_plurals.rb b/config/locales/cldr/fi_plurals.rb
new file mode 100644
index 000000000..51a57d48c
--- /dev/null
+++ b/config/locales/cldr/fi_plurals.rb
@@ -0,0 +1 @@
+{ :fi => { :i18n => {:plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/fr_plurals.rb b/config/locales/cldr/fr_plurals.rb
new file mode 100644
index 000000000..eb783f238
--- /dev/null
+++ b/config/locales/cldr/fr_plurals.rb
@@ -0,0 +1 @@
+{ :fr => { :i18n => {:plural => { :keys => [:one, :other], :rule => lambda { |n| n && n != 2 ? :one : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/ga_plurals.rb b/config/locales/cldr/ga_plurals.rb
new file mode 100644
index 000000000..1301f8b3e
--- /dev/null
+++ b/config/locales/cldr/ga_plurals.rb
@@ -0,0 +1 @@
+{ :ga => { :i18n => {:plural => { :keys => [:one, :two, :other], :rule => lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/gl_plurals.rb b/config/locales/cldr/gl_plurals.rb
new file mode 100644
index 000000000..f94440a77
--- /dev/null
+++ b/config/locales/cldr/gl_plurals.rb
@@ -0,0 +1 @@
+{ :gl => { :i18n => {:plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/he_plurals.rb b/config/locales/cldr/he_plurals.rb
new file mode 100644
index 000000000..36ea35c26
--- /dev/null
+++ b/config/locales/cldr/he_plurals.rb
@@ -0,0 +1 @@
+{ :he => { :i18n => {:plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/hu_plurals.rb b/config/locales/cldr/hu_plurals.rb
new file mode 100644
index 000000000..31ee31fb9
--- /dev/null
+++ b/config/locales/cldr/hu_plurals.rb
@@ -0,0 +1 @@
+{ :hu => { :i18n => {:plural => { :keys => [:other], :rule => lambda { |n| :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/id_plurals.rb b/config/locales/cldr/id_plurals.rb
new file mode 100644
index 000000000..183ae3cac
--- /dev/null
+++ b/config/locales/cldr/id_plurals.rb
@@ -0,0 +1 @@
+{ :id => { :i18n => {:plural => { :keys => [:other], :rule => lambda { |n| :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/is_plurals.rb b/config/locales/cldr/is_plurals.rb
new file mode 100644
index 000000000..b9b3fb66e
--- /dev/null
+++ b/config/locales/cldr/is_plurals.rb
@@ -0,0 +1 @@
+{ :is => { :i18n => {:plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/it_plurals.rb b/config/locales/cldr/it_plurals.rb
new file mode 100644
index 000000000..4264caa55
--- /dev/null
+++ b/config/locales/cldr/it_plurals.rb
@@ -0,0 +1 @@
+{ :it => { :i18n => {:plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/ko_plurals.rb b/config/locales/cldr/ko_plurals.rb
new file mode 100644
index 000000000..dff9b0543
--- /dev/null
+++ b/config/locales/cldr/ko_plurals.rb
@@ -0,0 +1 @@
+{ :ko => { :i18n => {:plural => { :keys => [:other], :rule => lambda { |n| :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/lt_plurals.rb b/config/locales/cldr/lt_plurals.rb
new file mode 100644
index 000000000..f13f5074b
--- /dev/null
+++ b/config/locales/cldr/lt_plurals.rb
@@ -0,0 +1 @@
+{ :lt => { :i18n => {:plural => { :keys => [:one, :few, :other], :rule => lambda { |n| n % 10 == 1 && ![11, 12, 13, 14, 15, 16, 17, 18, 19].include?(n % 100) ? :one : [2, 3, 4, 5, 6, 7, 8, 9].include?(n % 10) && ![11, 12, 13, 14, 15, 16, 17, 18, 19].include?(n % 100) ? :few : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/mk_plurals.rb b/config/locales/cldr/mk_plurals.rb
new file mode 100644
index 000000000..3b2aeb73c
--- /dev/null
+++ b/config/locales/cldr/mk_plurals.rb
@@ -0,0 +1 @@
+{ :mk => { :i18n => {:plural => { :keys => [:one, :other], :rule => lambda { |n| n % 10 == 1 ? :one : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/ml_plurals.rb b/config/locales/cldr/ml_plurals.rb
new file mode 100644
index 000000000..2815d104c
--- /dev/null
+++ b/config/locales/cldr/ml_plurals.rb
@@ -0,0 +1 @@
+{ :ml => { :i18n => {:plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/nb_plurals.rb b/config/locales/cldr/nb_plurals.rb
new file mode 100644
index 000000000..8da3eaefb
--- /dev/null
+++ b/config/locales/cldr/nb_plurals.rb
@@ -0,0 +1 @@
+{ :nb => { :i18n => {:plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/nl_plurals.rb b/config/locales/cldr/nl_plurals.rb
new file mode 100644
index 000000000..acdb5cdf5
--- /dev/null
+++ b/config/locales/cldr/nl_plurals.rb
@@ -0,0 +1 @@
+{ :nl => { :i18n => {:plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/pa_plurals.rb b/config/locales/cldr/pa_plurals.rb
new file mode 100644
index 000000000..a1e3b3bfa
--- /dev/null
+++ b/config/locales/cldr/pa_plurals.rb
@@ -0,0 +1 @@
+{ :pa => { :i18n => {:plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/pl_plurals.rb b/config/locales/cldr/pl_plurals.rb
new file mode 100644
index 000000000..a27d71967
--- /dev/null
+++ b/config/locales/cldr/pl_plurals.rb
@@ -0,0 +1 @@
+{ :pl => { :i18n => {:plural => { :keys => [:one, :few, :other], :rule => lambda { |n| n == 1 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) && ![22, 23, 24].include?(n % 100) ? :few : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/ro_plurals.rb b/config/locales/cldr/ro_plurals.rb
new file mode 100644
index 000000000..452acb5cc
--- /dev/null
+++ b/config/locales/cldr/ro_plurals.rb
@@ -0,0 +1 @@
+{ :ro => { :i18n => {:plural => { :keys => [:one, :few, :other], :rule => lambda { |n| n == 1 ? :one : n == 0 ? :few : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/ru_plurals.rb b/config/locales/cldr/ru_plurals.rb
new file mode 100644
index 000000000..65156cfba
--- /dev/null
+++ b/config/locales/cldr/ru_plurals.rb
@@ -0,0 +1 @@
+{ :ru => { :i18n => {:plural => { :keys => [:one, :few, :many, :other], :rule => lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :many : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/sk_plurals.rb b/config/locales/cldr/sk_plurals.rb
new file mode 100644
index 000000000..544999796
--- /dev/null
+++ b/config/locales/cldr/sk_plurals.rb
@@ -0,0 +1 @@
+{ :sk => { :i18n => {:plural => { :keys => [:one, :few, :other], :rule => lambda { |n| n == 1 ? :one : [2, 3, 4].include?(n) ? :few : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/sl_plurals.rb b/config/locales/cldr/sl_plurals.rb
new file mode 100644
index 000000000..0ccd47170
--- /dev/null
+++ b/config/locales/cldr/sl_plurals.rb
@@ -0,0 +1 @@
+{ :sl => { :i18n => {:plural => { :keys => [:one, :two, :few, :other], :rule => lambda { |n| n % 100 == 1 ? :one : n % 100 == 2 ? :two : [3, 4].include?(n % 100) ? :few : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/sv_plurals.rb b/config/locales/cldr/sv_plurals.rb
new file mode 100644
index 000000000..9bfa12f24
--- /dev/null
+++ b/config/locales/cldr/sv_plurals.rb
@@ -0,0 +1 @@
+{ :sv => { :i18n => {:plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/cldr/tr_plurals.rb b/config/locales/cldr/tr_plurals.rb
new file mode 100644
index 000000000..b0fb316ee
--- /dev/null
+++ b/config/locales/cldr/tr_plurals.rb
@@ -0,0 +1 @@
+{ :tr => { :i18n => {:plural => { :keys => [:other], :rule => lambda { |n| :other } } } } }
\ No newline at end of file
diff --git a/config/locales/rails-i18n/README b/config/locales/rails-i18n/README.md
similarity index 100%
rename from config/locales/rails-i18n/README
rename to config/locales/rails-i18n/README.md