Second Pull Request to primary lom repository

43 Tests are running + refactoring of service layer (Entity).