Refactor the Cmd scripts
Update the Services views
Add new Adapter view (copy of Services)