modularize services
Merge branch 'master' of https://github.com/babofitos/babo9000