Refactoring to avoid excessive service restarts

Also start services in natural order.