Simplify structure based on feedback from Crowdin