Move Service packages from Mojo Applications -> Packages dir

services/catalog/reader.cc

Index: services/catalog/reader.cc
diff --git a/services/catalog/reader.cc b/services/catalog/reader.cc
index 4d08eb034ed960c058e792d9140c635f12163866..7439f30876bb4702afb76312dedb776047ccb831 100644
--- a/services/catalog/reader.cc
+++ b/services/catalog/reader.cc
@@ -27,7 +27,7 @@ base::FilePath GetManifestPath(const base::FilePath& package_dir,
   std::string type = shell::GetNameType(name);
   std::string path = shell::GetNamePath(name);
   if (type == shell::kNameType_Mojo) {
-    return package_dir.AppendASCII(kMojoApplicationsDirName).AppendASCII(
+    return package_dir.AppendASCII(kPackagesDirName).AppendASCII(
         path + "/manifest.json");
   }
   if (type == shell::kNameType_Exe)
@@ -127,7 +127,7 @@ std::unique_ptr<Entry> ReadManifest(const base::FilePath& package_dir,
   if (!entry) {
     entry.reset(new Entry(mojo_name));
     entry->set_path(GetExecutablePath(
-        package_dir.AppendASCII(kMojoApplicationsDirName), mojo_name));
+        package_dir.AppendASCII(kPackagesDirName), mojo_name));
   }
   return entry;
 }