[Telemetry] Reorganize everything.

tools/telemetry/telemetry/core/browser_options.py

 # Copyright (c) 2012 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.
 import optparse
 import sys
 import shlex
 import logging
 import copy
 
-from telemetry import browser_finder
-from telemetry import wpr_modes
+from telemetry.core import browser_finder
+from telemetry.core import wpr_modes
 
 class BrowserOptions(optparse.Values):
   """Options to be used for discovering and launching a browser."""
 
   def __init__(self, browser_type=None):
     optparse.Values.__init__(self)
 
     self.browser_type = browser_type
     self.browser_executable = None
     self.chrome_root = None
@@ skipping 140 matching lines @@
           self.extra_wpr_args_as_string) # pylint: disable=E1101
         self.extra_wpr_args.extend(tmp)
         delattr(self, 'extra_wpr_args_as_string')
       return ret
     parser.parse_args = ParseArgs
     return parser
 
   def AppendExtraBrowserArg(self, arg):
     if arg not in self.extra_browser_args:
       self.extra_browser_args.append(arg)