moved services from base to services folder
Merge pull request #20 from ahlen/master

moved services from base to services folder