@svu @whot Here's what I mean by a cleaner organization. It looks like the structure was set up to be agnostic of country from the beginning, and some layouts are grouped by language already (e.g., Arabic).