Drop support for localized content, #2213 Restructure some content to match more closely what we have in master, #2542