Restructure for multiple languages