Moving services logic into a directive
Add service management to the hypervisors.
Merge branch 'test' into dev