[Telemetry] Reorganize everything.

tools/telemetry/telemetry/core/extension_unittest.py

Index: tools/telemetry/telemetry/core/extension_unittest.py
diff --git a/tools/telemetry/telemetry/extension_unittest.py b/tools/telemetry/telemetry/core/extension_unittest.py
similarity index 91%
rename from tools/telemetry/telemetry/extension_unittest.py
rename to tools/telemetry/telemetry/core/extension_unittest.py
index 6ce772ee13d6d7145d135f07eaf6462f0b126af6..f1e61bf16140d3134ed000a7751663ab6c4cb4f7 100644
--- a/tools/telemetry/telemetry/extension_unittest.py
+++ b/tools/telemetry/telemetry/core/extension_unittest.py
@@ -6,15 +6,15 @@ import shutil
 import tempfile
 import unittest
 
-from telemetry import browser_finder
-from telemetry import extension_dict_backend
-from telemetry import extension_to_load
-from telemetry import options_for_unittests
+from telemetry.core import browser_finder
+from telemetry.core import extension_to_load
+from telemetry.core.chrome import extension_dict_backend
+from telemetry.test import options_for_unittests
 
 class ExtensionTest(unittest.TestCase):
   def setUp(self):
     extension_path = os.path.join(os.path.dirname(__file__),
-        '..', 'unittest_data', 'simple_extension')
+        '..', '..', 'unittest_data', 'simple_extension')
     load_extension = extension_to_load.ExtensionToLoad(extension_path)
 
     options = options_for_unittests.GetCopy()
@@ -54,14 +54,14 @@ class NonExistentExtensionTest(unittest.TestCase):
   def testNonExistentExtensionPath(self):
     """Test that a non-existent extension path will raise an exception."""
     extension_path = os.path.join(os.path.dirname(__file__),
-        '..', 'unittest_data', 'foo')
+        '..', '..', 'unittest_data', 'foo')
     self.assertRaises(extension_to_load.ExtensionPathNonExistentException,
                       lambda: extension_to_load.ExtensionToLoad(extension_path))
 
   def testExtensionNotLoaded(self):
     """Querying an extension that was not loaded will return None"""
     extension_path = os.path.join(os.path.dirname(__file__),
-        '..', 'unittest_data', 'simple_extension')
+        '..', '..', 'unittest_data', 'simple_extension')
     load_extension = extension_to_load.ExtensionToLoad(extension_path)
     options = options_for_unittests.GetCopy()
     browser_to_create = browser_finder.FindBrowser(options)
@@ -77,7 +77,7 @@ class MultipleExtensionTest(unittest.TestCase):
     self._extension_dirs = [tempfile.mkdtemp()
                             for i in range(3)] # pylint: disable=W0612
     src_extension_dir = os.path.abspath(os.path.join(os.path.dirname(__file__),
-        '..', 'unittest_data', 'simple_extension'))
+        '..', '..', 'unittest_data', 'simple_extension'))
     manifest_path = os.path.join(src_extension_dir, 'manifest.json')
     script_path = os.path.join(src_extension_dir, 'background.js')
     for d in self._extension_dirs: