Remove services and propage framework
Merge pull request #59 from camael24/f/rebuild

F/rebuild