First milestone of the refactoring of the domain layer
First milestone of the refactoring of the domain layer