Add master service
Add Client app
Add ServerDiagnosticsControl