update structure
dtd update
Merge branch 'new-design'