Refactoring domain layer. #41
Merge pull request #99 from terasolunaorg/issues/41_refactoring-domain-layer

Refactoring domain layer. #41