Restructure for dts and wysiwyg