Major refactoring in the service layer
Merge pull request #1 from Fastlite/master

Major refactoring in the service layer