Locale files reorganization