bugger...
Revert "bugger..."

This reverts commit cc9e12b578cc84395759353aaf9fc3c7f22cb08f.
Revert "Changed domain namespace"

This reverts commit 65b94ee42d653da4c00ae801cc0e3eebef34a4ed.