Pull from master + simplify structure (only language files)