Removed leftover files from merge
Started translationing