Merge pull request #43 from dbeck/master

moving services to a better place