More renaming
Translations and moving files
Fix conflict