Refactor service layer to not use each other's method to avoid unwanted linking #66

Closed LBlocki closed 5 years ago