Work on fix language settings bug
Rename files to show which ones are being used.