Moved domains into respective packages
Fixed some import errors