[Telemetry] Reorganize everything.

tools/telemetry/telemetry/page/multi_page_benchmark_runner.py

Index: tools/telemetry/telemetry/page/multi_page_benchmark_runner.py
diff --git a/tools/telemetry/telemetry/multi_page_benchmark_runner.py b/tools/telemetry/telemetry/page/multi_page_benchmark_runner.py
similarity index 85%
rename from tools/telemetry/telemetry/multi_page_benchmark_runner.py
rename to tools/telemetry/telemetry/page/multi_page_benchmark_runner.py
index e1952dd4b53619cad2655eaefdaaecc9dc29217a..93a6da5905408dba1f0dd63f8acebacfa6eb38d2 100755
--- a/tools/telemetry/telemetry/multi_page_benchmark_runner.py
+++ b/tools/telemetry/telemetry/page/multi_page_benchmark_runner.py
@@ -7,15 +7,15 @@ import logging
 import os
 import sys
 
-from telemetry import all_page_actions # pylint: disable=W0611
-from telemetry import block_page_benchmark_results
-from telemetry import browser_finder
-from telemetry import browser_options
-from telemetry import csv_page_benchmark_results
-from telemetry import discover
-from telemetry import multi_page_benchmark
-from telemetry import page_runner
-from telemetry import page_set
+from telemetry.core import browser_finder
+from telemetry.core import browser_options
+from telemetry.page import all_page_actions # pylint: disable=W0611
+from telemetry.page import block_page_benchmark_results
+from telemetry.page import csv_page_benchmark_results
+from telemetry.page import multi_page_benchmark
+from telemetry.page import page_runner
+from telemetry.page import page_set
+from telemetry.test import discover
 
 def Main(benchmark_dir):
   """Turns a MultiPageBenchmark into a command-line program.
@@ -23,7 +23,9 @@ def Main(benchmark_dir):
   Args:
     benchmark_dir: Path to directory containing MultiPageBenchmarks.
   """
-  benchmarks = discover.Discover(benchmark_dir, '',
+  benchmarks = discover.Discover(benchmark_dir,
+                                 os.path.join(benchmark_dir, '..'),
+                                 '',
                                  multi_page_benchmark.MultiPageBenchmark)
 
   # Naively find the benchmark. If we use the browser options parser, we run