Added Domain.Api and removed Services.
Merge branch 'more_refactoring' into development