Moved Locale to its own category