diff --git a/packager/media/chunking/chunking.gyp b/packager/media/chunking/chunking.gyp
index eff100192a..65d653ff2a 100644
--- a/packager/media/chunking/chunking.gyp
+++ b/packager/media/chunking/chunking.gyp
@@ -19,6 +19,8 @@
         'cue_alignment_handler.h',
         'sync_point_queue.cc',
         'sync_point_queue.h',
+        'webvtt_segmenter.cc',
+        'webvtt_segmenter.h',
       ],
       'dependencies': [
         '../base/media_base.gyp:media_base',
@@ -30,6 +32,7 @@
       'sources': [
         'chunking_handler_unittest.cc',
         'cue_alignment_handler_unittest.cc',
+        'webvtt_segmenter_unittest.cc',
       ],
       'dependencies': [
         '../../testing/gtest.gyp:gtest',
diff --git a/packager/media/formats/webvtt/webvtt_segmenter.cc b/packager/media/chunking/webvtt_segmenter.cc
similarity index 98%
rename from packager/media/formats/webvtt/webvtt_segmenter.cc
rename to packager/media/chunking/webvtt_segmenter.cc
index 4d561f2721..e6eb320c53 100644
--- a/packager/media/formats/webvtt/webvtt_segmenter.cc
+++ b/packager/media/chunking/webvtt_segmenter.cc
@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "packager/media/formats/webvtt/webvtt_segmenter.h"
+#include "packager/media/chunking/webvtt_segmenter.h"
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/webvtt/webvtt_segmenter.h b/packager/media/chunking/webvtt_segmenter.h
similarity index 88%
rename from packager/media/formats/webvtt/webvtt_segmenter.h
rename to packager/media/chunking/webvtt_segmenter.h
index cf6f0746bd..b0d18b3ec4 100644
--- a/packager/media/formats/webvtt/webvtt_segmenter.h
+++ b/packager/media/chunking/webvtt_segmenter.h
@@ -4,8 +4,8 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef PACKAGER_MEDIA_FORMATS_WEBVTT_WEBVTT_SEGMENTER_H_
-#define PACKAGER_MEDIA_FORMATS_WEBVTT_WEBVTT_SEGMENTER_H_
+#ifndef PACKAGER_MEDIA_CHUNKING_WEBVTT_SEGMENTER_H_
+#define PACKAGER_MEDIA_CHUNKING_WEBVTT_SEGMENTER_H_
 
 #include <stdint.h>
 
@@ -50,4 +50,4 @@ class WebVttSegmenter : public MediaHandler {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // PACKAGER_MEDIA_FORMATS_WEBVTT_WEBVTT_SEGMENTER_H_
+#endif  // PACKAGER_MEDIA_CHUNKING_WEBVTT_SEGMENTER_H_
diff --git a/packager/media/formats/webvtt/webvtt_segmenter_unittest.cc b/packager/media/chunking/webvtt_segmenter_unittest.cc
similarity index 99%
rename from packager/media/formats/webvtt/webvtt_segmenter_unittest.cc
rename to packager/media/chunking/webvtt_segmenter_unittest.cc
index 827e6762b7..be8b919dda 100644
--- a/packager/media/formats/webvtt/webvtt_segmenter_unittest.cc
+++ b/packager/media/chunking/webvtt_segmenter_unittest.cc
@@ -8,7 +8,7 @@
 #include <gtest/gtest.h>
 
 #include "packager/media/base/media_handler_test_base.h"
-#include "packager/media/formats/webvtt/webvtt_segmenter.h"
+#include "packager/media/chunking/webvtt_segmenter.h"
 #include "packager/status_test_util.h"
 
 namespace shaka {
diff --git a/packager/media/formats/webvtt/webvtt.gyp b/packager/media/formats/webvtt/webvtt.gyp
index 0be5f487e4..9b242c52bf 100644
--- a/packager/media/formats/webvtt/webvtt.gyp
+++ b/packager/media/formats/webvtt/webvtt.gyp
@@ -21,8 +21,6 @@
         'webvtt_output_handler.h',
         'webvtt_parser.cc',
         'webvtt_parser.h',
-        'webvtt_segmenter.cc',
-        'webvtt_segmenter.h',
         'webvtt_timestamp.cc',
         'webvtt_timestamp.h',
         'webvtt_to_mp4_handler.cc',
@@ -42,7 +40,6 @@
         'text_readers_unittest.cc',
         'webvtt_output_handler_unittest.cc',
         'webvtt_parser_unittest.cc',
-        'webvtt_segmenter_unittest.cc',
         'webvtt_timestamp_unittest.cc',
         'webvtt_to_mp4_handler_unittest.cc',
       ],
diff --git a/packager/packager.cc b/packager/packager.cc
index 283c771e21..95d23aeb40 100644
--- a/packager/packager.cc
+++ b/packager/packager.cc
@@ -34,6 +34,7 @@
 #include "packager/media/base/muxer_util.h"
 #include "packager/media/chunking/chunking_handler.h"
 #include "packager/media/chunking/cue_alignment_handler.h"
+#include "packager/media/chunking/webvtt_segmenter.h"
 #include "packager/media/crypto/encryption_handler.h"
 #include "packager/media/demuxer/demuxer.h"
 #include "packager/media/event/muxer_listener_factory.h"
@@ -41,7 +42,6 @@
 #include "packager/media/formats/webvtt/text_readers.h"
 #include "packager/media/formats/webvtt/webvtt_output_handler.h"
 #include "packager/media/formats/webvtt/webvtt_parser.h"
-#include "packager/media/formats/webvtt/webvtt_segmenter.h"
 #include "packager/media/formats/webvtt/webvtt_to_mp4_handler.h"
 #include "packager/media/replicator/replicator.h"
 #include "packager/media/trick_play/trick_play_handler.h"