diff --git a/trace_viewer.gypi b/trace_viewer.gypi
index 5a119ad..70d9461 100644
--- a/trace_viewer.gypi
+++ b/trace_viewer.gypi
@@ -130,7 +130,6 @@
       'trace_viewer/extras/chrome/layout_object.html',
       'trace_viewer/extras/chrome_config.html',
       'trace_viewer/extras/full_config.html',
-      'trace_viewer/extras/highlighter/vsync_highlighter.html',
       'trace_viewer/extras/importer/battor_importer.html',
       'trace_viewer/extras/importer/ddms_importer.html',
       'trace_viewer/extras/importer/etw/etw_importer.html',
@@ -348,6 +347,7 @@
       'trace_viewer/ui/extras/about_tracing/tracing_controller_client.html',
       'trace_viewer/ui/extras/about_tracing/xhr_based_tracing_controller_client.html',
       'trace_viewer/ui/extras/analysis/sampling_summary.html',
+      'trace_viewer/ui/extras/highlighter/vsync_highlighter.html',
       'trace_viewer/ui/extras/side_panel/alerts_side_panel.html',
       'trace_viewer/ui/extras/side_panel/input_latency_side_panel.html',
       'trace_viewer/ui/extras/side_panel/time_summary_side_panel.html',
diff --git a/trace_viewer/extras/lean_config.html b/trace_viewer/extras/lean_config.html
index d451319..3268f26 100644
--- a/trace_viewer/extras/lean_config.html
+++ b/trace_viewer/extras/lean_config.html
@@ -10,4 +10,4 @@
 json blobs.
 -->
 <link rel="import" href="/extras/importer/trace_event_importer.html">
-<link rel="import" href="/extras/highlighter/vsync_highlighter.html">
+<link rel="import" href="/ui/extras/highlighter/vsync_highlighter.html">
diff --git a/trace_viewer/extras/highlighter/vsync_highlighter.html b/trace_viewer/ui/extras/highlighter/vsync_highlighter.html
similarity index 98%
rename from trace_viewer/extras/highlighter/vsync_highlighter.html
rename to trace_viewer/ui/extras/highlighter/vsync_highlighter.html
index 6582ba3..2dbf976 100644
--- a/trace_viewer/extras/highlighter/vsync_highlighter.html
+++ b/trace_viewer/ui/extras/highlighter/vsync_highlighter.html
@@ -16,7 +16,7 @@
 /**
  * @fileoverview Provides the VSyncHighlighter class.
  */
-tr.exportTo('tr.e.highlighter', function() {
+tr.exportTo('tr.ui.e.highlighter', function() {
 
   var Highlighter = tr.ui.tracks.Highlighter;
 
diff --git a/trace_viewer/extras/highlighter/vsync_highlighter_test.html b/trace_viewer/ui/extras/highlighter/vsync_highlighter_test.html
similarity index 97%
rename from trace_viewer/extras/highlighter/vsync_highlighter_test.html
rename to trace_viewer/ui/extras/highlighter/vsync_highlighter_test.html
index 4cf5b8f..9c51583 100644
--- a/trace_viewer/extras/highlighter/vsync_highlighter_test.html
+++ b/trace_viewer/ui/extras/highlighter/vsync_highlighter_test.html
@@ -6,14 +6,14 @@
 -->
 
 <link rel="import" href="/model/thread.html">
-<link rel="import" href="/extras/highlighter/vsync_highlighter.html">
+<link rel="import" href="/ui/extras/highlighter/vsync_highlighter.html">
 
 <script>
 'use strict';
 
 tr.b.unittest.testSuite(function() {
 
-  var VSyncHighlighter = tr.e.highlighter.VSyncHighlighter;
+  var VSyncHighlighter = tr.ui.e.highlighter.VSyncHighlighter;
 
   var VIEW_L_WORLD = 100;
   var VIEW_R_WORLD = 1000;