Merge pull request #1 from Fastlite/master

Major refactoring in the service layer
Added missing solution.
Merge pull request #1 from TravisTroyer/master

Update Fork