Fixed issue where restarting the application caused a deadlock.
Moved localization-related xml and json files to new location within the Locale folder.