solved problem of double build, refactoring services