Move Service packages from Mojo Applications -> Packages dir

services/catalog/catalog.cc

Index: services/catalog/catalog.cc
diff --git a/services/catalog/catalog.cc b/services/catalog/catalog.cc
index 501db2db6eb1b6f602307c8b982af1d00cabaddd..8f55425d722cf3d97feb912a8844fb4a413af428 100644
--- a/services/catalog/catalog.cc
+++ b/services/catalog/catalog.cc
@@ -61,7 +61,7 @@ base::FilePath GetPathForApplicationName(const std::string& application_name) {
   base::FilePath base_path;
   PathService::Get(base::DIR_EXE, &base_path);
   // TODO(beng): this won't handle user-specific components.
-  return base_path.AppendASCII(kMojoApplicationsDirName).AppendASCII(path).
+  return base_path.AppendASCII(kPackagesDirName).AppendASCII(path).
       AppendASCII("resources");
 }
 
@@ -98,7 +98,7 @@ Catalog::Catalog(std::unique_ptr<Store> store)
 void Catalog::ScanSystemPackageDir() {
   base::FilePath system_package_dir;
   PathService::Get(base::DIR_MODULE, &system_package_dir);
-  system_package_dir = system_package_dir.AppendASCII(kMojoApplicationsDirName);
+  system_package_dir = system_package_dir.AppendASCII(kPackagesDirName);
   system_reader_->Read(system_package_dir, &system_cache_,
                        base::Bind(&Catalog::SystemPackageDirScanned,
                                   weak_factory_.GetWeakPtr()));