diff --git a/lib/format/README.md b/lib/format/README.md
new file mode 100644
index 00000000..5267e2db
--- /dev/null
+++ b/lib/format/README.md
@@ -0,0 +1,3 @@
+To be consist with proper eager loading, this directory's
+structure needed to be corrected. Yes, it looks weird but allows us to 
+avoid rewriting anything.
\ No newline at end of file
diff --git a/lib/format/address.rb b/lib/format/format/address.rb
similarity index 100%
rename from lib/format/address.rb
rename to lib/format/format/address.rb
diff --git a/lib/format/csv.rb b/lib/format/format/csv.rb
similarity index 100%
rename from lib/format/csv.rb
rename to lib/format/format/csv.rb
diff --git a/lib/format/currency.rb b/lib/format/format/currency.rb
similarity index 100%
rename from lib/format/currency.rb
rename to lib/format/format/currency.rb
diff --git a/lib/format/date.rb b/lib/format/format/date.rb
similarity index 100%
rename from lib/format/date.rb
rename to lib/format/format/date.rb
diff --git a/lib/format/dedication.rb b/lib/format/format/dedication.rb
similarity index 100%
rename from lib/format/dedication.rb
rename to lib/format/format/dedication.rb
diff --git a/lib/format/geography.rb b/lib/format/format/geography.rb
similarity index 100%
rename from lib/format/geography.rb
rename to lib/format/format/geography.rb
diff --git a/lib/format/html.rb b/lib/format/format/html.rb
similarity index 100%
rename from lib/format/html.rb
rename to lib/format/format/html.rb
diff --git a/lib/format/indefinitize.rb b/lib/format/format/indefinitize.rb
similarity index 100%
rename from lib/format/indefinitize.rb
rename to lib/format/format/indefinitize.rb
diff --git a/lib/format/interpolate.rb b/lib/format/format/interpolate.rb
similarity index 100%
rename from lib/format/interpolate.rb
rename to lib/format/format/interpolate.rb
diff --git a/lib/format/name.rb b/lib/format/format/name.rb
similarity index 100%
rename from lib/format/name.rb
rename to lib/format/format/name.rb
diff --git a/lib/format/phone.rb b/lib/format/format/phone.rb
similarity index 100%
rename from lib/format/phone.rb
rename to lib/format/format/phone.rb
diff --git a/lib/format/remove_diacritics.rb b/lib/format/format/remove_diacritics.rb
similarity index 100%
rename from lib/format/remove_diacritics.rb
rename to lib/format/format/remove_diacritics.rb
diff --git a/lib/format/timezone.rb b/lib/format/format/timezone.rb
similarity index 100%
rename from lib/format/timezone.rb
rename to lib/format/format/timezone.rb
diff --git a/lib/format/url.rb b/lib/format/format/url.rb
similarity index 100%
rename from lib/format/url.rb
rename to lib/format/format/url.rb