Rationalize Dart mojo and sky package structure

mojo/public/tools/bindings/generators/mojom_dart_generator.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Generates dart source files from a mojom.Module."""
 
 import os
 import re
 import shutil
 import sys
@@ skipping 383 matching lines @@
       "structs": self.GetStructs() + self.GetStructsFromMethods(),
       "interfaces": self.GetInterfaces(),
       "imported_interfaces": self.GetImportedInterfaces(),
       "imported_from": self.ImportedFrom(),
     }
 
   @UseJinja("dart_templates/module.lib.tmpl", filters=dart_filters)
   def GenerateLibModule(self, args):
     return self.GetParameters(args)
 
+
   def GenerateFiles(self, args):
     elements = self.module.namespace.split('.')
     elements.append("%s.dart" % self.module.name)
-    path = os.path.join("dart-gen", "mojom", *elements)
+    path = os.path.join("dart-pkg", "mojom/lib", *elements)
+    self.Write(self.GenerateLibModule(args), path)
+    path = os.path.join("dart-gen", "mojom/lib", *elements)
     self.Write(self.GenerateLibModule(args), path)
     link = self.MatchMojomFilePath("%s.dart" % self.module.name)
     if os.path.exists(os.path.join(self.output_dir, link)):
       os.unlink(os.path.join(self.output_dir, link))
     try:
       if sys.platform == "win32":
         shutil.copy(os.path.join(self.output_dir, path),
                     os.path.join(self.output_dir, link))
       else:
         os.symlink(os.path.join(self.output_dir, path),
@@ skipping 33 matching lines @@
         interface_to_import[name] = each_import["unique_name"] + "." + name
     return interface_to_import
 
   def ImportedFrom(self):
     interface_to_import = {}
     for each_import in self.module.imports:
       for each_interface in each_import["module"].interfaces:
         name = each_interface.name
         interface_to_import[name] = each_import["unique_name"] + "."
     return interface_to_import