refactoring for new dowmain names and new domain structure

Signed-off-by: Thomas Schubert <funthomas424242@gmail.com>