add service interfaces
Modify Domain structure
small (hopefully) fixes