making new service structure work
Merge pull request #43 from louridas/master

making new service structure work