Refactor / merge thesaurus directives.
Editor / Form builder / Create directive when requested.