Updated structure for DOMtastic
Merge pull request #2350 from webpro/patch-2

Updated structure for DOMtastic