Refactor java packages.

mojo/mojo.gyp

 # Copyright 2013 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.
 
 {
   'target_defaults': {
     'conditions': [
       ['mojo_shell_debug_url != ""', {
         'defines': [
           'MOJO_SHELL_DEBUG=1',
@@ skipping 679 matching lines @@
   'conditions': [
     ['OS=="android"', {
       'targets': [
         {
           'target_name': 'mojo_jni_headers',
           'type': 'none',
           'dependencies': [
             'mojo_java_set_jni_headers',
           ],
           'sources': [
-            'android/javatests/src/org/chromium/mojo/system/MojoTestCase.java',
-            'android/system/src/org/chromium/mojo/system/CoreImpl.java',
+            'android/javatests/src/org/chromium/mojo/MojoTestCase.java',
+            'android/system/src/org/chromium/mojo/system/impl/CoreImpl.java',
             'services/native_viewport/android/src/org/chromium/mojo/NativeViewportAndroid.java',
             'shell/android/apk/src/org/chromium/mojo_shell_apk/MojoMain.java',
           ],
           'variables': {
             'jni_gen_package': 'mojo',
          },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
           'target_name': 'mojo_system_java',
@@ skipping 186 matching lines @@
             'aura/screen_mojo.cc',
             'aura/screen_mojo.h',
             'aura/window_tree_host_mojo.cc',
             'aura/window_tree_host_mojo.h',
           ],
         },
       ],
     }],
   ],
 }