restucturing dom
version 1.0
Merge branch 'develop'