Created own Service with DI

Merge Develop to Master