Improvements to the Lib organization and Locale config