diff --git a/third_party_mods/libjingle/libjingle.gyp b/third_party_mods/libjingle/libjingle.gyp
index bb8bb027eb..d285ec6525 100644
--- a/third_party_mods/libjingle/libjingle.gyp
+++ b/third_party_mods/libjingle/libjingle.gyp
@@ -594,27 +594,27 @@
         } ],  # inside_chromium_build        
         ['peer_connection_dev==1', {
           'sources': [
-            '<(overrides)/talk/app/webrtc/scoped_refptr.h',
-            '<(libjingle_mods)/source/talk/app/webrtc/audio_device_dev.cc',
-            '<(libjingle_mods)/source/talk/app/webrtc/local_audio_track_impl_dev.cc',
-            '<(libjingle_mods)/source/talk/app/webrtc/local_stream_dev.h',
-            '<(libjingle_mods)/source/talk/app/webrtc/local_stream_dev.cc',
-            '<(libjingle_mods)/source/talk/app/webrtc/local_video_track_impl_dev.cc',
-            '<(libjingle_mods)/source/talk/app/webrtc/media_stream_impl_dev.h',
-            '<(libjingle_mods)/source/talk/app/webrtc/media_stream_impl_dev.cc',
-            '<(libjingle_mods)/source/talk/app/webrtc/peerconnection_dev.h',
-            '<(libjingle_mods)/source/talk/app/webrtc/peerconnection_impl_dev.cc',
-            '<(libjingle_mods)/source/talk/app/webrtc/peerconnection_impl_dev.h',
-            '<(libjingle_mods)/source/talk/app/webrtc/peerconnectionmanager.cc',
-            '<(libjingle_mods)/source/talk/app/webrtc/peerconnectionmanager.h',
-            '<(libjingle_mods)/source/talk/app/webrtc/peerconnectiontransport.cc',
-            '<(libjingle_mods)/source/talk/app/webrtc/peerconnectiontransport.h',
-            '<(libjingle_mods)/source/talk/app/webrtc/ref_count.h',
-            '<(libjingle_mods)/source/talk/app/webrtc/remote_stream_dev.h',
-            '<(libjingle_mods)/source/talk/app/webrtc/remote_stream_dev.cc',
-            '<(libjingle_mods)/source/talk/app/webrtc/stream_dev.h',
-            '<(libjingle_mods)/source/talk/app/webrtc/video_device_dev.cc',
-            '<(libjingle_mods)/source/talk/app/webrtc/video_renderer_dev.cc',
+            '<(overrides)/talk/app/webrtc_dev/scoped_refptr.h',
+            '<(libjingle_mods)/source/talk/app/webrtc_dev/audio_device_dev.cc',
+            '<(libjingle_mods)/source/talk/app/webrtc_dev/local_audio_track_impl_dev.cc',
+            '<(libjingle_mods)/source/talk/app/webrtc_dev/local_stream_dev.h',
+            '<(libjingle_mods)/source/talk/app/webrtc_dev/local_stream_dev.cc',
+            '<(libjingle_mods)/source/talk/app/webrtc_dev/local_video_track_impl_dev.cc',
+            '<(libjingle_mods)/source/talk/app/webrtc_dev/media_stream_impl_dev.h',
+            '<(libjingle_mods)/source/talk/app/webrtc_dev/media_stream_impl_dev.cc',
+            '<(libjingle_mods)/source/talk/app/webrtc_dev/peerconnection_dev.h',
+            '<(libjingle_mods)/source/talk/app/webrtc_dev/peerconnection_impl_dev.cc',
+            '<(libjingle_mods)/source/talk/app/webrtc_dev/peerconnection_impl_dev.h',
+            '<(libjingle_mods)/source/talk/app/webrtc_dev/peerconnectionmanager.cc',
+            '<(libjingle_mods)/source/talk/app/webrtc_dev/peerconnectionmanager.h',
+            '<(libjingle_mods)/source/talk/app/webrtc_dev/peerconnectiontransport.cc',
+            '<(libjingle_mods)/source/talk/app/webrtc_dev/peerconnectiontransport.h',
+            '<(libjingle_mods)/source/talk/app/webrtc_dev/ref_count.h',
+            '<(libjingle_mods)/source/talk/app/webrtc_dev/remote_stream_dev.h',
+            '<(libjingle_mods)/source/talk/app/webrtc_dev/remote_stream_dev.cc',
+            '<(libjingle_mods)/source/talk/app/webrtc_dev/stream_dev.h',
+            '<(libjingle_mods)/source/talk/app/webrtc_dev/video_device_dev.cc',
+            '<(libjingle_mods)/source/talk/app/webrtc_dev/video_renderer_dev.cc',
           ],
         }], # peer_connection_dev
       ],  # conditions
@@ -625,7 +625,7 @@
         ['peer_connection_dev==1 and OS=="linux"', {
           'type': 'executable',
           'sources': [
-            '<(libjingle_mods)/source/talk/app/webrtc/peerconnection_client_dev.cc',
+            '<(libjingle_mods)/source/talk/app/peer_connection_dev/peerconnection_client_dev.cc',
           ],
           'libraries': [
             '-lXext',
@@ -656,9 +656,9 @@
         ['peer_connection_dev==1', {
           'type': 'executable',
           'sources': [
-            '<(libjingle_mods)/source/talk/app/webrtc/peerconnection_unittests.cc',
-            '<(libjingle_mods)/source/talk/app/webrtc/local_stream_dev_unittest.cc',
-            '<(libjingle_mods)/source/talk/app/webrtc/remote_stream_dev_unittest.cc',
+            '<(libjingle_mods)/source/talk/app/peer_connection_dev/peerconnection_unittests.cc',
+            '<(libjingle_mods)/source/talk/app/peer_connection_dev/local_stream_dev_unittest.cc',
+            '<(libjingle_mods)/source/talk/app/peer_connection_dev/remote_stream_dev_unittest.cc',
           ],
         }, {
           'type': 'none',
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/audio_device_dev.cc b/third_party_mods/libjingle/source/talk/app/webrtc_dev/audio_device_dev.cc
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/audio_device_dev.cc
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/audio_device_dev.cc
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/local_audio_track_impl_dev.cc b/third_party_mods/libjingle/source/talk/app/webrtc_dev/local_audio_track_impl_dev.cc
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/local_audio_track_impl_dev.cc
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/local_audio_track_impl_dev.cc
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/local_stream_dev.cc b/third_party_mods/libjingle/source/talk/app/webrtc_dev/local_stream_dev.cc
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/local_stream_dev.cc
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/local_stream_dev.cc
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/local_stream_dev.h b/third_party_mods/libjingle/source/talk/app/webrtc_dev/local_stream_dev.h
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/local_stream_dev.h
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/local_stream_dev.h
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/local_stream_dev_unittest.cc b/third_party_mods/libjingle/source/talk/app/webrtc_dev/local_stream_dev_unittest.cc
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/local_stream_dev_unittest.cc
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/local_stream_dev_unittest.cc
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/local_video_track_impl_dev.cc b/third_party_mods/libjingle/source/talk/app/webrtc_dev/local_video_track_impl_dev.cc
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/local_video_track_impl_dev.cc
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/local_video_track_impl_dev.cc
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/media_stream_impl_dev.cc b/third_party_mods/libjingle/source/talk/app/webrtc_dev/media_stream_impl_dev.cc
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/media_stream_impl_dev.cc
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/media_stream_impl_dev.cc
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/media_stream_impl_dev.h b/third_party_mods/libjingle/source/talk/app/webrtc_dev/media_stream_impl_dev.h
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/media_stream_impl_dev.h
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/media_stream_impl_dev.h
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/notifier_impl.h b/third_party_mods/libjingle/source/talk/app/webrtc_dev/notifier_impl.h
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/notifier_impl.h
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/notifier_impl.h
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/peerconnection_client_dev.cc b/third_party_mods/libjingle/source/talk/app/webrtc_dev/peerconnection_client_dev.cc
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/peerconnection_client_dev.cc
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/peerconnection_client_dev.cc
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/peerconnection_dev.cc b/third_party_mods/libjingle/source/talk/app/webrtc_dev/peerconnection_dev.cc
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/peerconnection_dev.cc
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/peerconnection_dev.cc
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/peerconnection_dev.h b/third_party_mods/libjingle/source/talk/app/webrtc_dev/peerconnection_dev.h
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/peerconnection_dev.h
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/peerconnection_dev.h
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/peerconnection_impl_dev.cc b/third_party_mods/libjingle/source/talk/app/webrtc_dev/peerconnection_impl_dev.cc
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/peerconnection_impl_dev.cc
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/peerconnection_impl_dev.cc
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/peerconnection_impl_dev.h b/third_party_mods/libjingle/source/talk/app/webrtc_dev/peerconnection_impl_dev.h
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/peerconnection_impl_dev.h
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/peerconnection_impl_dev.h
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/peerconnectionmanager.cc b/third_party_mods/libjingle/source/talk/app/webrtc_dev/peerconnectionmanager.cc
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/peerconnectionmanager.cc
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/peerconnectionmanager.cc
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/peerconnectionmanager.h b/third_party_mods/libjingle/source/talk/app/webrtc_dev/peerconnectionmanager.h
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/peerconnectionmanager.h
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/peerconnectionmanager.h
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/peerconnectiontransport.cc b/third_party_mods/libjingle/source/talk/app/webrtc_dev/peerconnectiontransport.cc
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/peerconnectiontransport.cc
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/peerconnectiontransport.cc
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/peerconnectiontransport.h b/third_party_mods/libjingle/source/talk/app/webrtc_dev/peerconnectiontransport.h
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/peerconnectiontransport.h
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/peerconnectiontransport.h
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/ref_count.h b/third_party_mods/libjingle/source/talk/app/webrtc_dev/ref_count.h
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/ref_count.h
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/ref_count.h
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/remote_stream_dev.cc b/third_party_mods/libjingle/source/talk/app/webrtc_dev/remote_stream_dev.cc
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/remote_stream_dev.cc
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/remote_stream_dev.cc
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/remote_stream_dev.h b/third_party_mods/libjingle/source/talk/app/webrtc_dev/remote_stream_dev.h
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/remote_stream_dev.h
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/remote_stream_dev.h
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/remote_stream_dev_unittest.cc b/third_party_mods/libjingle/source/talk/app/webrtc_dev/remote_stream_dev_unittest.cc
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/remote_stream_dev_unittest.cc
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/remote_stream_dev_unittest.cc
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/scoped_refptr.h b/third_party_mods/libjingle/source/talk/app/webrtc_dev/scoped_refptr.h
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/scoped_refptr.h
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/scoped_refptr.h
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/stream_dev.h b/third_party_mods/libjingle/source/talk/app/webrtc_dev/stream_dev.h
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/stream_dev.h
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/stream_dev.h
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/video_device_dev.cc b/third_party_mods/libjingle/source/talk/app/webrtc_dev/video_device_dev.cc
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/video_device_dev.cc
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/video_device_dev.cc
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/video_renderer_dev.cc b/third_party_mods/libjingle/source/talk/app/webrtc_dev/video_renderer_dev.cc
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/video_renderer_dev.cc
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/video_renderer_dev.cc
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/webrtcsessionchannel.cc b/third_party_mods/libjingle/source/talk/app/webrtc_dev/webrtcsessionchannel.cc
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/webrtcsessionchannel.cc
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/webrtcsessionchannel.cc
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/webrtcsessionchannel.h b/third_party_mods/libjingle/source/talk/app/webrtc_dev/webrtcsessionchannel.h
similarity index 100%
rename from third_party_mods/libjingle/source/talk/app/webrtc/webrtcsessionchannel.h
rename to third_party_mods/libjingle/source/talk/app/webrtc_dev/webrtcsessionchannel.h