CMS-1472 TypeScript: Remove nested structure