Move services/shell to services/service_manager

mash/catalog_viewer/main.cc

Index: mash/catalog_viewer/main.cc
diff --git a/mash/catalog_viewer/main.cc b/mash/catalog_viewer/main.cc
index f4202e6713912e9519ec649648f219d9c82a6b62..7a2c0a7d49f5898db8866828b92f70af9277f5c1 100644
--- a/mash/catalog_viewer/main.cc
+++ b/mash/catalog_viewer/main.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "mash/catalog_viewer/catalog_viewer.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/service_runner.h"
 
 MojoResult ServiceMain(MojoHandle service_request_handle) {
   shell::ServiceRunner runner(new mash::catalog_viewer::CatalogViewer);