Add API
Refactor services
Merge pull request #19 from wagnert/master

Add API + Refactor services