Accomodate restructure

Rename dynamic-text to text
Remove dynamic-element references, use component instead.